From 32eb3248d41feb58be055f27e3e86213d750310c Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 17 Jul 2023 14:26:44 +0200
Subject: [PATCH 001/116] feat(editor): Ask AI tab and CLi connection

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/cli/src/Server.ts                    |   2 +
 packages/cli/src/controllers/ai.controller.ts |  41 +++++++
 packages/cli/src/controllers/index.ts         |   1 +
 packages/editor-ui/src/api/ai.ts              |  13 ++
 .../src/components/CodeNodeEditor/AskAI.vue   | 114 ++++++++++++++++++
 .../CodeNodeEditor/CodeNodeEditor.vue         |  84 +++++++++++--
 .../src/components/RunDataSchema.vue          |  17 +--
 packages/editor-ui/src/composables/index.ts   |   1 +
 .../src/composables/useDataSchema.ts          |  84 +++++++++++++
 .../src/plugins/i18n/locales/en.json          |   9 ++
 10 files changed, 345 insertions(+), 21 deletions(-)
 create mode 100644 packages/cli/src/controllers/ai.controller.ts
 create mode 100644 packages/editor-ui/src/api/ai.ts
 create mode 100644 packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
 create mode 100644 packages/editor-ui/src/composables/useDataSchema.ts

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 9f0ec4c58b6e6..2da5c6f80fe56 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -97,6 +97,7 @@ import {
 	TagsController,
 	TranslationController,
 	UsersController,
+	AiController,
 } from '@/controllers';
 
 import { executionsController } from '@/executions/executions.controller';
@@ -502,6 +503,7 @@ export class Server extends AbstractServer {
 			}),
 			new SamlController(samlService),
 			new SourceControlController(sourceControlService, sourceControlPreferencesService),
+			new AiController(),
 		];
 
 		if (isLdapEnabled()) {
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
new file mode 100644
index 0000000000000..3584f965241aa
--- /dev/null
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -0,0 +1,41 @@
+import type { Request } from 'express';
+import { Authorized, Post, RestController } from '@/decorators';
+import type { IDataObject } from 'n8n-workflow';
+import { Script } from 'vm';
+
+type GenerateCodeRequest = Request<
+	{},
+	{},
+	{
+		prompt: string;
+		schema: IDataObject;
+	}
+>;
+
+@Authorized()
+@RestController('/ai')
+export class AiController {
+	@Post('/generate-code')
+	async generatePrompt(req: GenerateCodeRequest) {
+		console.log('Received: ', req.body.prompt, req.body.schema);
+		const generatedCode = 'console.log("Hello world!")';
+
+		return {
+			code: generatedCode,
+			isValid: this.validateGeneratedCode(generatedCode),
+		};
+	}
+
+	// Validates the generated code by setting it up in a sandbox
+	// this doesn't execute it, just checks if it's valid
+	validateGeneratedCode(code: string) {
+		try {
+			new Script(code);
+
+			return true;
+		} catch (error) {
+			console.log('Generated code is invalid: ', error);
+			return false;
+		}
+	}
+}
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
index 04b46af5f13df..b7d89731d3ec4 100644
--- a/packages/cli/src/controllers/index.ts
+++ b/packages/cli/src/controllers/index.ts
@@ -8,3 +8,4 @@ export { PasswordResetController } from './passwordReset.controller';
 export { TagsController } from './tags.controller';
 export { TranslationController } from './translation.controller';
 export { UsersController } from './users.controller';
+export { AiController } from './ai.controller';
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
new file mode 100644
index 0000000000000..237b7d975e4d5
--- /dev/null
+++ b/packages/editor-ui/src/api/ai.ts
@@ -0,0 +1,13 @@
+import type { IRestApiContext } from '@/Interface';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { IDataObject } from 'n8n-workflow';
+
+export async function generateCodeForPrompt(
+	context: IRestApiContext,
+	{ prompt, schema }: { prompt: string; schema: IDataObject },
+): Promise<{ code: string }> {
+	return makeRestApiRequest(context, 'POST', '/ai/generate-code', {
+		prompt,
+		schema: JSON.stringify(schema),
+	} as IDataObject);
+}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
new file mode 100644
index 0000000000000..3cf6c0c4918f6
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -0,0 +1,114 @@
+<script setup lang="ts">
+import { N8nButton, N8nInput } from 'n8n-design-system/components';
+import { ref, defineEmits } from 'vue';
+import { useDataSchema } from '@/composables';
+import { generateCodeForPrompt } from '@/api/ai';
+import { useRootStore } from '@/stores';
+
+const emit = defineEmits<{
+	submit: (code: string) => void;
+}>();
+const { getWorkflowSchema } = useDataSchema();
+const maxLength = 600;
+const prompt = ref('');
+
+async function onSubmit() {
+	const schema = getWorkflowSchema();
+	try {
+		const { getRestApiContext } = useRootStore();
+		const { code } = await generateCodeForPrompt(getRestApiContext, {
+			prompt: prompt.value,
+			schema,
+		});
+
+		emit('replaceCode', code);
+	} catch (error) {
+		console.log('Failed to generate code', error);
+	}
+}
+</script>
+
+<template>
+	<div>
+		<p :class="$style.intro" v-text="$locale.baseText('codeNodeEditor.askAi.intro')" />
+		<div :class="$style.inputContainer">
+			<div :class="$style.meta">
+				<span
+					v-show="prompt.length > 1"
+					:class="$style.counter"
+					v-text="`${prompt.length} / ${maxLength}`"
+				/>
+				<n8n-tooltip placement="bottom">
+					<template #content>
+						<div>
+							{{ $locale.baseText('settings.communityNodes.upToDate.tooltip') }}
+						</div>
+					</template>
+					<span :class="$style.help"
+						><n8n-icon icon="question-circle" color="text-light" size="large" />{{
+							$locale.baseText('codeNodeEditor.askAi.help')
+						}}
+					</span>
+				</n8n-tooltip>
+			</div>
+			<N8nInput
+				v-model="prompt"
+				:class="$style.input"
+				type="textarea"
+				:rows="7"
+				:maxlength="maxLength"
+				:placeholder="$locale.baseText('codeNodeEditor.askAi.placeholder')"
+			/>
+		</div>
+		<div :class="$style.controls">
+			<N8nButton :disabled="!prompt" @click="onSubmit">{{
+				$locale.baseText('codeNodeEditor.askAi.generateCode')
+			}}</N8nButton>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.input * {
+	border: 0 !important;
+}
+.input textarea {
+	padding-bottom: var(--spacing-l);
+}
+.intro {
+	font-size: var(--font-size-2xs);
+	font-weight: var(--font-weight-bold);
+	color: var(--color-text-dark);
+	padding: var(--spacing-2xs) var(--spacing-xs) 0;
+}
+.inputContainer {
+	position: relative;
+}
+.help {
+	text-decoration: underline;
+	margin-left: auto;
+}
+.meta {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	bottom: var(--spacing-2xs);
+	left: var(--spacing-xs);
+	right: var(--spacing-xs);
+	z-index: 1;
+
+	* {
+		font-size: var(--font-size-2xs);
+		line-height: 1;
+	}
+}
+.counter {
+	color: var(--color-text-light);
+}
+.controls {
+	padding: var(--spacing-2xs) var(--spacing-xs);
+	display: flex;
+	justify-content: flex-end;
+	border-top: 1px solid var(--color-foreground-dark);
+}
+</style>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 9deed663d1d9c..63af99750be7c 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -5,16 +5,21 @@
 		@mouseout="onMouseOut"
 		ref="codeNodeEditorContainer"
 	>
-		<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture"></div>
-		<n8n-button
-			v-if="aiButtonEnabled && (isEditorHovered || isEditorFocused)"
-			size="small"
-			type="tertiary"
-			:class="$style['ask-ai-button']"
-			@mousedown="onAskAiButtonClick"
+		<el-tabs
+			type="card"
+			ref="tabs"
+			v-model="activeTab"
+			v-if="askAiEnabled && language === 'javaScript'"
 		>
-			{{ $locale.baseText('codeNodeEditor.askAi') }}
-		</n8n-button>
+			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code">
+				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
+			</el-tab-pane>
+			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
+				<AskAI @replaceCode="onReplaceCode" />
+			</el-tab-pane>
+		</el-tabs>
+		<!-- If AskAi not enabled, there's no point in rendering tabs -->
+		<div v-else ref="codeNodeEditor" class="code-node-editor-input ph-no-capture" />
 	</div>
 </template>
 
@@ -22,7 +27,6 @@
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
-
 import type { LanguageSupport } from '@codemirror/language';
 import type { Extension } from '@codemirror/state';
 import { Compartment, EditorState } from '@codemirror/state';
@@ -44,10 +48,14 @@ import { CODE_PLACEHOLDERS } from './constants';
 import { linterExtension } from './linter';
 import { completerExtension } from './completer';
 import { codeNodeEditorTheme } from './theme';
+import AskAI from './AskAI.vue';
 
 export default defineComponent({
 	name: 'code-node-editor',
 	mixins: [linterExtension, completerExtension, workflowHelpers],
+	components: {
+		AskAI,
+	},
 	props: {
 		aiButtonEnabled: {
 			type: Boolean,
@@ -77,6 +85,9 @@ export default defineComponent({
 			linterCompartment: new Compartment(),
 			isEditorHovered: false,
 			isEditorFocused: false,
+			tabs: ['code', 'ask-ai'],
+			activeTab: 'code',
+			initialValue: this.value,
 		};
 	},
 	watch: {
@@ -105,6 +116,10 @@ export default defineComponent({
 
 			return this.editor.state.doc.toString();
 		},
+		askAiEnabled(): boolean {
+			// TODO: Do this based on ENV?
+			return true;
+		},
 		placeholder(): string {
 			return CODE_PLACEHOLDERS[this.language]?.[this.mode] ?? '';
 		},
@@ -120,6 +135,32 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		async onReplaceCode(code: string) {
+			const hasChanges = this.initialValue !== this.content;
+
+			if (hasChanges) {
+				const confirmModal = await this.alert(
+					this.$locale.baseText('codeNodeEditor.askAi.areYouSureToReplace'),
+					{
+						title: this.$locale.baseText('codeNodeEditor.askAi.replaceCurrentCode'),
+						confirmButtonText: this.$locale.baseText('codeNodeEditor.askAi.generateCodeAndReplace'),
+						showClose: true,
+					},
+				);
+
+				if (confirmModal === 'cancel') {
+					this.activeTab = 'code';
+					return;
+				}
+			}
+
+			this.editor?.dispatch({
+				changes: { from: 0, to: this.content.length, insert: code },
+			});
+
+			this.initialValue = this.content;
+			this.activeTab = 'code';
+		},
 		onMouseOver(event: MouseEvent) {
 			const fromElement = event.relatedTarget as HTMLElement;
 			const ref = this.$refs.codeNodeEditorContainer as HTMLDivElement | undefined;
@@ -264,6 +305,29 @@ export default defineComponent({
 </script>
 
 <style lang="scss" module>
+:global(.el-tabs__content) {
+	border: 1px solid var(--color-foreground-base);
+	border-radius: 0px var(--border-radius-base) var(--border-radius-base);
+}
+:global(.el-tabs__header) {
+	border-bottom: 0;
+}
+:global(.el-tabs__nav) {
+	padding: 0;
+}
+:global(.el-tabs__item) {
+	padding: var(--spacing-5xs) var(--spacing-2xs);
+	height: auto;
+	line-height: var(--font-line-height-xloose);
+
+	&:not([aria-selected='true']) {
+		background-color: var(--color-background-base);
+		border-bottom: 1px solid var(--color-foreground-base) !important;
+	}
+}
+:global(.code-editor-tabs .cm-editor) {
+	border: 0;
+}
 .code-node-editor-container {
 	position: relative;
 
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 2296f2171e855..64af9db9886a8 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -1,17 +1,16 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import { merge } from 'lodash-es';
-import type { INodeUi, Schema } from '@/Interface';
+import type { INodeUi } from '@/Interface';
 import RunDataSchemaItem from '@/components/RunDataSchemaItem.vue';
 import Draggable from '@/components/Draggable.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWebhooksStore } from '@/stores/webhooks.store';
 import { telemetry } from '@/plugins/telemetry';
 import type { IDataObject } from 'n8n-workflow';
-import { getSchema, isEmpty, runExternalHook } from '@/utils';
+import { isEmpty, runExternalHook } from '@/utils';
 import { i18n } from '@/plugins/i18n';
 import MappingPill from './MappingPill.vue';
-
+import { useDataSchema } from '@/composables';
 type Props = {
 	data: IDataObject[];
 	mappingEnabled: boolean;
@@ -29,15 +28,11 @@ const props = withDefaults(defineProps<Props>(), {
 const draggingPath = ref<string>('');
 const ndvStore = useNDVStore();
 const webhooksStore = useWebhooksStore();
+const { getSchemaForExecutionData } = useDataSchema();
 
-const schema = computed<Schema>(() => {
-	const [head, ...tail] = props.data;
-	return getSchema(merge({}, head, ...tail, head));
-});
+const schema = computed(() => getSchemaForExecutionData(props.data));
 
-const isDataEmpty = computed(() => {
-	return isEmpty(props.data);
-});
+const isDataEmpty = computed(() => isEmpty(props.data));
 
 const onDragStart = (el: HTMLElement) => {
 	if (el && el.dataset?.path) {
diff --git a/packages/editor-ui/src/composables/index.ts b/packages/editor-ui/src/composables/index.ts
index 6f2ac9255f351..042d79f7b7ec2 100644
--- a/packages/editor-ui/src/composables/index.ts
+++ b/packages/editor-ui/src/composables/index.ts
@@ -12,3 +12,4 @@ export * from './useTelemetry';
 export * from './useTitleChange';
 export * from './useToast';
 export * from './useNodeSpecificationValues';
+export * from './useDataSchema';
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
new file mode 100644
index 0000000000000..3ba9097020f42
--- /dev/null
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -0,0 +1,84 @@
+import type { Optional, Primitives, Schema } from '@/Interface';
+import type { IDataObject } from 'n8n-workflow';
+import { merge } from 'lodash-es';
+import { generatePath } from '@/utils/mappingUtils';
+import { isObj } from '@/utils/typeGuards';
+import { useWorkflowsStore } from '@/stores';
+
+export function useDataSchema() {
+	function getSchema(input: Optional<Primitives | object>, path = ''): Schema {
+		let schema: Schema = { type: 'undefined', value: 'undefined', path };
+		switch (typeof input) {
+			case 'object':
+				if (input === null) {
+					schema = { type: 'null', value: '[null]', path };
+				} else if (input instanceof Date) {
+					schema = { type: 'string', value: input.toISOString(), path };
+				} else if (Array.isArray(input)) {
+					schema = {
+						type: 'array',
+						value: input.map((item, index) => ({
+							key: index.toString(),
+							...getSchema(item, `${path}[${index}]`),
+						})),
+						path,
+					};
+				} else if (isObj(input)) {
+					schema = {
+						type: 'object',
+						value: Object.entries(input).map(([k, v]) => ({
+							key: k,
+							...getSchema(v, generatePath(path, [k])),
+						})),
+						path,
+					};
+				}
+				break;
+			case 'function':
+				schema = { type: 'function', value: '', path };
+				break;
+			default:
+				schema = { type: typeof input, value: String(input), path };
+		}
+
+		return schema;
+	}
+
+	function getSchemaForExecutionData(data: IDataObject[]) {
+		const [head, ...tail] = data;
+
+		return getSchema(merge({}, head, ...tail, head));
+	}
+
+	function getWorkflowSchema() {
+		const { allNodes } = useWorkflowsStore();
+
+		const schemas = allNodes.reduce((acc: IDataObject, curr) => {
+			const { name } = curr;
+			const nodeRunData = useWorkflowsStore().getWorkflowResultDataByNodeName(name)?.[0];
+
+			if (nodeRunData?.executionStatus === 'success' && nodeRunData.data !== undefined) {
+				const outputs = Object.keys(nodeRunData.data);
+
+				// Nodes might have several outputs, we need to get the schema for each input
+				const outputsSchema = outputs.reduce((outputsAcc: IDataObject, inputName) => {
+					const inputRunData = nodeRunData.data?.[inputName]?.[0]?.map((item) => item?.json);
+					if (inputRunData === undefined) return outputsAcc;
+
+					outputsAcc[inputName] = getSchemaForExecutionData(inputRunData);
+					return outputsAcc;
+				}, {});
+
+				acc[name] = outputsSchema;
+			}
+
+			return acc;
+		}, {});
+
+		return schemas;
+	}
+	return {
+		getSchemaForExecutionData,
+		getWorkflowSchema,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 216d066333d59..02a93a480d457 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -271,6 +271,15 @@
 	"codeNodeEditor.linter.eachItem.unavailableItems": "Legacy `items` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.eachItem.unavailableMethod": "Method `$input.{method}()` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.bothModes.syntaxError": "Syntax error",
+	"codeNodeEditor.askAi.placeholder": "Tell AI what you want the code to achieve. You can also reference input data such as firstName or user.email",
+	"codeNodeEditor.askAi.intro": "Hey AI, generate JavaScript code that...",
+	"codeNodeEditor.askAi.help": "Help",
+	"codeNodeEditor.askAi.generateCode": "Generate Code",
+	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
+	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",
+	"codeNodeEditor.askAi.areYouSureToReplace": "Are you sure you want to generate new code? Your current code will be replaced.",
+	"codeNodeEditor.tabs.askAi": "✨ Ask AI",
+	"codeNodeEditor.tabs.code": "Code",
 	"collectionParameter.choose": "Choose...",
 	"collectionParameter.noProperties": "No properties",
 	"credentialEdit.credentialConfig.accountConnected": "Account connected",

From fca2b52b3b03127ce8fc378c4c82498e893a5fa8 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 17 Jul 2023 14:54:08 +0200
Subject: [PATCH 002/116] Remove old getSchema util method

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../__tests__/useDataSchema.test.ts           | 355 ++++++++++++++++++
 .../src/composables/useDataSchema.ts          |   1 +
 .../src/utils/__tests__/typesUtils.test.ts    | 353 +----------------
 packages/editor-ui/src/utils/typesUtils.ts    |  41 --
 4 files changed, 357 insertions(+), 393 deletions(-)
 create mode 100644 packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts

diff --git a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
new file mode 100644
index 0000000000000..fb5a089d7c328
--- /dev/null
+++ b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
@@ -0,0 +1,355 @@
+import jp from 'jsonpath';
+import { useDataSchema } from '@/composables';
+import type { Schema } from '@/Interface';
+
+describe('useDataSchema', () => {
+	const getSchema = useDataSchema().getSchema;
+	describe('getSchema', () => {
+		test.each([
+			[, { type: 'undefined', value: 'undefined', path: '' }],
+			[undefined, { type: 'undefined', value: 'undefined', path: '' }],
+			[null, { type: 'null', value: '[null]', path: '' }],
+			['John', { type: 'string', value: 'John', path: '' }],
+			['123', { type: 'string', value: '123', path: '' }],
+			[123, { type: 'number', value: '123', path: '' }],
+			[true, { type: 'boolean', value: 'true', path: '' }],
+			[false, { type: 'boolean', value: 'false', path: '' }],
+			[() => {}, { type: 'function', value: '', path: '' }],
+			[{}, { type: 'object', value: [], path: '' }],
+			[[], { type: 'array', value: [], path: '' }],
+			[
+				new Date('2022-11-22T00:00:00.000Z'),
+				{ type: 'string', value: '2022-11-22T00:00:00.000Z', path: '' },
+			],
+			[Symbol('x'), { type: 'symbol', value: 'Symbol(x)', path: '' }],
+			[1n, { type: 'bigint', value: '1', path: '' }],
+			[
+				['John', 1, true],
+				{
+					type: 'array',
+					value: [
+						{ type: 'string', value: 'John', key: '0', path: '[0]' },
+						{ type: 'number', value: '1', key: '1', path: '[1]' },
+						{ type: 'boolean', value: 'true', key: '2', path: '[2]' },
+					],
+					path: '',
+				},
+			],
+			[
+				{ people: ['Joe', 'John'] },
+				{
+					type: 'object',
+					value: [
+						{
+							type: 'array',
+							key: 'people',
+							value: [
+								{ type: 'string', value: 'Joe', key: '0', path: '.people[0]' },
+								{ type: 'string', value: 'John', key: '1', path: '.people[1]' },
+							],
+							path: '.people',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				{ 'with space': [], 'with.dot': 'test' },
+				{
+					type: 'object',
+					value: [
+						{
+							type: 'array',
+							key: 'with space',
+							value: [],
+							path: "['with space']",
+						},
+						{
+							type: 'string',
+							key: 'with.dot',
+							value: 'test',
+							path: "['with.dot']",
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					{ name: 'John', age: 22 },
+					{ name: 'Joe', age: 33 },
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'object',
+							key: '0',
+							value: [
+								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
+								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
+							],
+							path: '[0]',
+						},
+						{
+							type: 'object',
+							key: '1',
+							value: [
+								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
+								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
+							],
+							path: '[1]',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
+					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'object',
+							key: '0',
+							value: [
+								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
+								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
+								{
+									type: 'array',
+									key: 'hobbies',
+									value: [
+										{ type: 'string', key: '0', value: 'surfing', path: '[0].hobbies[0]' },
+										{ type: 'string', key: '1', value: 'traveling', path: '[0].hobbies[1]' },
+									],
+									path: '[0].hobbies',
+								},
+							],
+							path: '[0]',
+						},
+						{
+							type: 'object',
+							key: '1',
+							value: [
+								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
+								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
+								{
+									type: 'array',
+									key: 'hobbies',
+									value: [
+										{ type: 'string', key: '0', value: 'skateboarding', path: '[1].hobbies[0]' },
+										{ type: 'string', key: '1', value: 'gaming', path: '[1].hobbies[1]' },
+									],
+									path: '[1].hobbies',
+								},
+							],
+							path: '[1]',
+						},
+					],
+					path: '',
+				},
+			],
+			[[], { type: 'array', value: [], path: '' }],
+			[
+				[[1, 2]],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'array',
+							key: '0',
+							value: [
+								{ type: 'number', key: '0', value: '1', path: '[0][0]' },
+								{ type: 'number', key: '1', value: '2', path: '[0][1]' },
+							],
+							path: '[0]',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					[
+						{ name: 'John', age: 22 },
+						{ name: 'Joe', age: 33 },
+					],
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'array',
+							key: '0',
+							value: [
+								{
+									type: 'object',
+									key: '0',
+									value: [
+										{ type: 'string', key: 'name', value: 'John', path: '[0][0].name' },
+										{ type: 'number', key: 'age', value: '22', path: '[0][0].age' },
+									],
+									path: '[0][0]',
+								},
+								{
+									type: 'object',
+									key: '1',
+									value: [
+										{ type: 'string', key: 'name', value: 'Joe', path: '[0][1].name' },
+										{ type: 'number', key: 'age', value: '33', path: '[0][1].age' },
+									],
+									path: '[0][1]',
+								},
+							],
+							path: '[0]',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				[
+					{
+						dates: [
+							[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
+							[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
+						],
+					},
+				],
+				{
+					type: 'array',
+					value: [
+						{
+							type: 'object',
+							key: '0',
+							value: [
+								{
+									type: 'array',
+									key: 'dates',
+									value: [
+										{
+											type: 'array',
+											key: '0',
+											value: [
+												{
+													type: 'string',
+													key: '0',
+													value: '2022-11-22T00:00:00.000Z',
+													path: '[0].dates[0][0]',
+												},
+												{
+													type: 'string',
+													key: '1',
+													value: '2022-11-23T00:00:00.000Z',
+													path: '[0].dates[0][1]',
+												},
+											],
+											path: '[0].dates[0]',
+										},
+										{
+											type: 'array',
+											key: '1',
+											value: [
+												{
+													type: 'string',
+													key: '0',
+													value: '2022-12-22T00:00:00.000Z',
+													path: '[0].dates[1][0]',
+												},
+												{
+													type: 'string',
+													key: '1',
+													value: '2022-12-23T00:00:00.000Z',
+													path: '[0].dates[1][1]',
+												},
+											],
+											path: '[0].dates[1]',
+										},
+									],
+									path: '[0].dates',
+								},
+							],
+							path: '[0]',
+						},
+					],
+					path: '',
+				},
+			],
+		])('should return the correct json schema for %s', (input, schema) => {
+			expect(getSchema(input)).toEqual(schema);
+		});
+
+		it('should return the correct data when using the generated json path on an object', () => {
+			const input = { people: ['Joe', 'John'] };
+			const schema = getSchema(input) as Schema;
+			const pathData = jp.query(
+				input,
+				`$${((schema.value as Schema[])[0].value as Schema[])[0].path}`,
+			);
+			expect(pathData).toEqual(['Joe']);
+		});
+
+		it('should return the correct data when using the generated json path on a list', () => {
+			const input = [
+				{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
+				{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
+			];
+			const schema = getSchema(input) as Schema;
+			const pathData = jp.query(
+				input,
+				`$${(((schema.value as Schema[])[0].value as Schema[])[2].value as Schema[])[1].path}`,
+			);
+			expect(pathData).toEqual(['traveling']);
+		});
+
+		it('should return the correct data when using the generated json path on a list of list', () => {
+			const input = [[1, 2]];
+			const schema = getSchema(input) as Schema;
+			const pathData = jp.query(
+				input,
+				`$${((schema.value as Schema[])[0].value as Schema[])[1].path}`,
+			);
+			expect(pathData).toEqual([2]);
+		});
+
+		it('should return the correct data when using the generated json path on a list of list of objects', () => {
+			const input = [
+				[
+					{ name: 'John', age: 22 },
+					{ name: 'Joe', age: 33 },
+				],
+			];
+			const schema = getSchema(input) as Schema;
+			const pathData = jp.query(
+				input,
+				`$${(((schema.value as Schema[])[0].value as Schema[])[1].value as Schema[])[1].path}`,
+			);
+			expect(pathData).toEqual([33]);
+		});
+
+		it('should return the correct data when using the generated json path on a list of objects with a list of date tuples', () => {
+			const input = [
+				{
+					dates: [
+						[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
+						[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
+					],
+				},
+			];
+			const schema = getSchema(input) as Schema;
+			const pathData = jp.query(
+				input,
+				`$${
+					(
+						(((schema.value as Schema[])[0].value as Schema[])[0].value as Schema[])[0]
+							.value as Schema[]
+					)[0].path
+				}`,
+			);
+			expect(pathData).toEqual([new Date('2022-11-22T00:00:00.000Z')]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index 3ba9097020f42..39734fe7dc985 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -78,6 +78,7 @@ export function useDataSchema() {
 		return schemas;
 	}
 	return {
+		getSchema,
 		getSchemaForExecutionData,
 		getWorkflowSchema,
 	};
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
index d914146b0d3cb..ed6c429bd4e02 100644
--- a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
@@ -1,6 +1,4 @@
-import jp from 'jsonpath';
-import { isEmpty, intersection, getSchema, isValidDate } from '@/utils';
-import type { Schema } from '@/Interface';
+import { isEmpty, intersection, isValidDate } from '@/utils';
 
 describe('Types Utils', () => {
 	describe('isEmpty', () => {
@@ -43,355 +41,6 @@ describe('Types Utils', () => {
 		});
 	});
 
-	describe('getSchema', () => {
-		test.each([
-			[, { type: 'undefined', value: 'undefined', path: '' }],
-			[undefined, { type: 'undefined', value: 'undefined', path: '' }],
-			[null, { type: 'null', value: '[null]', path: '' }],
-			['John', { type: 'string', value: 'John', path: '' }],
-			['123', { type: 'string', value: '123', path: '' }],
-			[123, { type: 'number', value: '123', path: '' }],
-			[true, { type: 'boolean', value: 'true', path: '' }],
-			[false, { type: 'boolean', value: 'false', path: '' }],
-			[() => {}, { type: 'function', value: '', path: '' }],
-			[{}, { type: 'object', value: [], path: '' }],
-			[[], { type: 'array', value: [], path: '' }],
-			[
-				new Date('2022-11-22T00:00:00.000Z'),
-				{ type: 'string', value: '2022-11-22T00:00:00.000Z', path: '' },
-			],
-			[Symbol('x'), { type: 'symbol', value: 'Symbol(x)', path: '' }],
-			[1n, { type: 'bigint', value: '1', path: '' }],
-			[
-				['John', 1, true],
-				{
-					type: 'array',
-					value: [
-						{ type: 'string', value: 'John', key: '0', path: '[0]' },
-						{ type: 'number', value: '1', key: '1', path: '[1]' },
-						{ type: 'boolean', value: 'true', key: '2', path: '[2]' },
-					],
-					path: '',
-				},
-			],
-			[
-				{ people: ['Joe', 'John'] },
-				{
-					type: 'object',
-					value: [
-						{
-							type: 'array',
-							key: 'people',
-							value: [
-								{ type: 'string', value: 'Joe', key: '0', path: '.people[0]' },
-								{ type: 'string', value: 'John', key: '1', path: '.people[1]' },
-							],
-							path: '.people',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				{ 'with space': [], 'with.dot': 'test' },
-				{
-					type: 'object',
-					value: [
-						{
-							type: 'array',
-							key: 'with space',
-							value: [],
-							path: "['with space']",
-						},
-						{
-							type: 'string',
-							key: 'with.dot',
-							value: 'test',
-							path: "['with.dot']",
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					{ name: 'John', age: 22 },
-					{ name: 'Joe', age: 33 },
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'object',
-							key: '0',
-							value: [
-								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
-								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
-							],
-							path: '[0]',
-						},
-						{
-							type: 'object',
-							key: '1',
-							value: [
-								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
-								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
-							],
-							path: '[1]',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'object',
-							key: '0',
-							value: [
-								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
-								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
-								{
-									type: 'array',
-									key: 'hobbies',
-									value: [
-										{ type: 'string', key: '0', value: 'surfing', path: '[0].hobbies[0]' },
-										{ type: 'string', key: '1', value: 'traveling', path: '[0].hobbies[1]' },
-									],
-									path: '[0].hobbies',
-								},
-							],
-							path: '[0]',
-						},
-						{
-							type: 'object',
-							key: '1',
-							value: [
-								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
-								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
-								{
-									type: 'array',
-									key: 'hobbies',
-									value: [
-										{ type: 'string', key: '0', value: 'skateboarding', path: '[1].hobbies[0]' },
-										{ type: 'string', key: '1', value: 'gaming', path: '[1].hobbies[1]' },
-									],
-									path: '[1].hobbies',
-								},
-							],
-							path: '[1]',
-						},
-					],
-					path: '',
-				},
-			],
-			[[], { type: 'array', value: [], path: '' }],
-			[
-				[[1, 2]],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'array',
-							key: '0',
-							value: [
-								{ type: 'number', key: '0', value: '1', path: '[0][0]' },
-								{ type: 'number', key: '1', value: '2', path: '[0][1]' },
-							],
-							path: '[0]',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					[
-						{ name: 'John', age: 22 },
-						{ name: 'Joe', age: 33 },
-					],
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'array',
-							key: '0',
-							value: [
-								{
-									type: 'object',
-									key: '0',
-									value: [
-										{ type: 'string', key: 'name', value: 'John', path: '[0][0].name' },
-										{ type: 'number', key: 'age', value: '22', path: '[0][0].age' },
-									],
-									path: '[0][0]',
-								},
-								{
-									type: 'object',
-									key: '1',
-									value: [
-										{ type: 'string', key: 'name', value: 'Joe', path: '[0][1].name' },
-										{ type: 'number', key: 'age', value: '33', path: '[0][1].age' },
-									],
-									path: '[0][1]',
-								},
-							],
-							path: '[0]',
-						},
-					],
-					path: '',
-				},
-			],
-			[
-				[
-					{
-						dates: [
-							[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
-							[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
-						],
-					},
-				],
-				{
-					type: 'array',
-					value: [
-						{
-							type: 'object',
-							key: '0',
-							value: [
-								{
-									type: 'array',
-									key: 'dates',
-									value: [
-										{
-											type: 'array',
-											key: '0',
-											value: [
-												{
-													type: 'string',
-													key: '0',
-													value: '2022-11-22T00:00:00.000Z',
-													path: '[0].dates[0][0]',
-												},
-												{
-													type: 'string',
-													key: '1',
-													value: '2022-11-23T00:00:00.000Z',
-													path: '[0].dates[0][1]',
-												},
-											],
-											path: '[0].dates[0]',
-										},
-										{
-											type: 'array',
-											key: '1',
-											value: [
-												{
-													type: 'string',
-													key: '0',
-													value: '2022-12-22T00:00:00.000Z',
-													path: '[0].dates[1][0]',
-												},
-												{
-													type: 'string',
-													key: '1',
-													value: '2022-12-23T00:00:00.000Z',
-													path: '[0].dates[1][1]',
-												},
-											],
-											path: '[0].dates[1]',
-										},
-									],
-									path: '[0].dates',
-								},
-							],
-							path: '[0]',
-						},
-					],
-					path: '',
-				},
-			],
-		])('should return the correct json schema for %s', (input, schema) => {
-			expect(getSchema(input)).toEqual(schema);
-		});
-
-		it('should return the correct data when using the generated json path on an object', () => {
-			const input = { people: ['Joe', 'John'] };
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${((schema.value as Schema[])[0].value as Schema[])[0].path}`,
-			);
-			expect(pathData).toEqual(['Joe']);
-		});
-
-		it('should return the correct data when using the generated json path on a list', () => {
-			const input = [
-				{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-				{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-			];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${(((schema.value as Schema[])[0].value as Schema[])[2].value as Schema[])[1].path}`,
-			);
-			expect(pathData).toEqual(['traveling']);
-		});
-
-		it('should return the correct data when using the generated json path on a list of list', () => {
-			const input = [[1, 2]];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${((schema.value as Schema[])[0].value as Schema[])[1].path}`,
-			);
-			expect(pathData).toEqual([2]);
-		});
-
-		it('should return the correct data when using the generated json path on a list of list of objects', () => {
-			const input = [
-				[
-					{ name: 'John', age: 22 },
-					{ name: 'Joe', age: 33 },
-				],
-			];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${(((schema.value as Schema[])[0].value as Schema[])[1].value as Schema[])[1].path}`,
-			);
-			expect(pathData).toEqual([33]);
-		});
-
-		it('should return the correct data when using the generated json path on a list of objects with a list of date tuples', () => {
-			const input = [
-				{
-					dates: [
-						[new Date('2022-11-22T00:00:00.000Z'), new Date('2022-11-23T00:00:00.000Z')],
-						[new Date('2022-12-22T00:00:00.000Z'), new Date('2022-12-23T00:00:00.000Z')],
-					],
-				},
-			];
-			const schema = getSchema(input) as Schema;
-			const pathData = jp.query(
-				input,
-				`$${
-					(
-						(((schema.value as Schema[])[0].value as Schema[])[0].value as Schema[])[0]
-							.value as Schema[]
-					)[0].path
-				}`,
-			);
-			expect(pathData).toEqual([new Date('2022-11-22T00:00:00.000Z')]);
-		});
-	});
-
 	describe('dateTests', () => {
 		test.each([
 			'04-08-2021',
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index 2135d869c9f82..dbf3369d59d11 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -1,9 +1,6 @@
 import dateformat from 'dateformat';
 import type { IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
-import type { Schema, Optional, Primitives } from '@/Interface';
-import { isObj } from '@/utils/typeGuards';
-import { generatePath } from '@/utils/mappingUtils';
 
 /*
 	Constants and utility functions than can be used to manipulate different data types and objects
@@ -162,41 +159,3 @@ export const isValidDate = (input: string | number | Date): boolean => {
 
 export const getObjectKeys = <T extends object, K extends keyof T>(o: T): K[] =>
 	Object.keys(o) as K[];
-
-export const getSchema = (input: Optional<Primitives | object>, path = ''): Schema => {
-	let schema: Schema = { type: 'undefined', value: 'undefined', path };
-	switch (typeof input) {
-		case 'object':
-			if (input === null) {
-				schema = { type: 'null', value: '[null]', path };
-			} else if (input instanceof Date) {
-				schema = { type: 'string', value: input.toISOString(), path };
-			} else if (Array.isArray(input)) {
-				schema = {
-					type: 'array',
-					value: input.map((item, index) => ({
-						key: index.toString(),
-						...getSchema(item, `${path}[${index}]`),
-					})),
-					path,
-				};
-			} else if (isObj(input)) {
-				schema = {
-					type: 'object',
-					value: Object.entries(input).map(([k, v]) => ({
-						key: k,
-						...getSchema(v, generatePath(path, [k])),
-					})),
-					path,
-				};
-			}
-			break;
-		case 'function':
-			schema = { type: 'function', value: '', path };
-			break;
-		default:
-			schema = { type: typeof input, value: String(input), path };
-	}
-
-	return schema;
-};

From f1c3b8a5d6b5312378c4a7c84fcd0e18d98decb5 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 17 Jul 2023 15:11:28 +0200
Subject: [PATCH 003/116] Increase CSS specificity of the CodeNodeEditor global
 overrides

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../CodeNodeEditor/CodeNodeEditor.vue         | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 63af99750be7c..c78ed8e942901 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -305,28 +305,30 @@ export default defineComponent({
 </script>
 
 <style lang="scss" module>
-:global(.el-tabs__content) {
-	border: 1px solid var(--color-foreground-base);
-	border-radius: 0px var(--border-radius-base) var(--border-radius-base);
-}
-:global(.el-tabs__header) {
-	border-bottom: 0;
-}
-:global(.el-tabs__nav) {
-	padding: 0;
-}
-:global(.el-tabs__item) {
-	padding: var(--spacing-5xs) var(--spacing-2xs);
-	height: auto;
-	line-height: var(--font-line-height-xloose);
-
-	&:not([aria-selected='true']) {
-		background-color: var(--color-background-base);
-		border-bottom: 1px solid var(--color-foreground-base) !important;
+:global(.el-tabs) {
+	:global(.el-tabs__content) {
+		border: 1px solid var(--color-foreground-base);
+		border-radius: 0px var(--border-radius-base) var(--border-radius-base);
+	}
+	:global(.el-tabs__header) {
+		border-bottom: 0;
+	}
+	:global(.el-tabs__nav) {
+		padding: 0;
+	}
+	:global(.el-tabs__item) {
+		padding: var(--spacing-5xs) var(--spacing-2xs);
+		height: auto;
+		line-height: var(--font-line-height-xloose);
+
+		&:not([aria-selected='true']) {
+			background-color: var(--color-background-base);
+			border-bottom: 1px solid var(--color-foreground-base) !important;
+		}
+	}
+	:global(.code-editor-tabs .cm-editor) {
+		border: 0;
 	}
-}
-:global(.code-editor-tabs .cm-editor) {
-	border: 0;
 }
 .code-node-editor-container {
 	position: relative;

From c8d84ba3af47e6f5757b3695d9bf97b4b1b438a5 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 18 Jul 2023 14:45:34 +0200
Subject: [PATCH 004/116] feat(editor): Magic Connect

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/cli/src/Server.ts                    |   5 +-
 packages/cli/src/config/schema.ts             |  21 +++
 packages/cli/src/controllers/ai.controller.ts |  56 +++++-
 packages/editor-ui/src/Interface.ts           |   8 +-
 packages/editor-ui/src/api/ai.ts              |  10 ++
 .../src/components/AiImportCurlModal.vue      | 135 ++++++++++++++
 .../src/components/AiImportParameter.vue      |  34 ++++
 .../src/components/ImportCurlModal.vue        | 165 +++---------------
 .../src/components/ImportParameter.vue        |  24 +--
 packages/editor-ui/src/components/Modals.vue  |   8 +
 .../editor-ui/src/components/NodeSettings.vue |  53 ++++--
 .../src/components/ParameterInputList.vue     |  16 +-
 packages/editor-ui/src/composables/index.ts   |   1 +
 .../src/composables/useImportCurl.ts          | 120 +++++++++++++
 packages/editor-ui/src/constants.ts           |   1 +
 .../src/plugins/i18n/locales/en.json          |  12 ++
 packages/editor-ui/src/stores/ui.store.ts     |  20 ++-
 .../HttpRequest/V3/HttpRequestV3.node.ts      |   6 +
 packages/workflow/src/Interfaces.ts           |   4 +
 19 files changed, 518 insertions(+), 181 deletions(-)
 create mode 100644 packages/editor-ui/src/components/AiImportCurlModal.vue
 create mode 100644 packages/editor-ui/src/components/AiImportParameter.vue
 create mode 100644 packages/editor-ui/src/composables/useImportCurl.ts

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index fd336b0362bee..1b998abfbff63 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -322,6 +322,9 @@ export class Server extends AbstractServer {
 			banners: {
 				dismissed: [],
 			},
+			ai: {
+				enabled: config.getEnv('ai.enabled'),
+			},
 		};
 	}
 
@@ -495,7 +498,7 @@ export class Server extends AbstractServer {
 				logger,
 				postHog,
 			}),
-			new AiController(),
+			new AiController({ logger }),
 			Container.get(SamlController),
 			Container.get(SourceControlController),
 		];
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index e6aedf836905b..1fb7d943e56ea 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1095,4 +1095,25 @@ export const schema = {
 			},
 		},
 	},
+
+	ai: {
+		enabled: {
+			doc: 'Whether AI features are enabled.',
+			format: Boolean,
+			default: false,
+			env: 'N8N_AI_ENABLED',
+		},
+		endpoint: {
+			doc: 'Endpoint to retrieve AI information from.',
+			format: String,
+			default: '',
+			env: 'N8N_AI_ENDPOINT',
+		},
+		authorization: {
+			doc: 'Authorization header to use for AI endpoint.',
+			format: String,
+			default: '',
+			env: 'N8N_AI_AUTHORIZATION',
+		},
+	},
 };
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index 3584f965241aa..980b6844bcc7b 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -1,7 +1,9 @@
 import type { Request } from 'express';
 import { Authorized, Post, RestController } from '@/decorators';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, ILogger } from 'n8n-workflow';
 import { Script } from 'vm';
+import config from '@/config';
+import axios from 'axios';
 
 type GenerateCodeRequest = Request<
 	{},
@@ -12,9 +14,37 @@ type GenerateCodeRequest = Request<
 	}
 >;
 
+type GenerateCurlRequest = Request<
+	{},
+	{},
+	{
+		prompt: string;
+		service: string;
+	}
+>;
+
+if (!config.getEnv('ai.enabled')) {
+	console.error('AI endpoints only allowed when AI is enabled');
+	process.exit(1);
+} else {
+	console.log('AI endpoints enabled');
+}
+
 @Authorized()
 @RestController('/ai')
 export class AiController {
+	private readonly logger: ILogger;
+
+	private readonly endpoint: string;
+
+	private readonly authorization: string;
+
+	constructor({ logger }: { logger: ILogger }) {
+		this.logger = logger;
+		this.authorization = config.getEnv('ai.authorization');
+		this.endpoint = config.getEnv('ai.endpoint');
+	}
+
 	@Post('/generate-code')
 	async generatePrompt(req: GenerateCodeRequest) {
 		console.log('Received: ', req.body.prompt, req.body.schema);
@@ -26,6 +56,28 @@ export class AiController {
 		};
 	}
 
+	@Post('/generate-curl')
+	async generateCurl(req: GenerateCurlRequest) {
+		try {
+			const { prompt, service } = req.body;
+			const resp = await axios({
+				method: 'post',
+				url: `${this.endpoint}/generate-curl`,
+				data: {
+					prompt,
+					service,
+				},
+				headers: {
+					authorization: this.authorization,
+				},
+			});
+
+			return resp.data as { curl: string };
+		} catch (error) {
+			throw new Error(`Failed to generate curl: ${error}`);
+		}
+	}
+
 	// Validates the generated code by setting it up in a sandbox
 	// this doesn't execute it, just checks if it's valid
 	validateGeneratedCode(code: string) {
@@ -34,7 +86,7 @@ export class AiController {
 
 			return true;
 		} catch (error) {
-			console.log('Generated code is invalid: ', error);
+			this.logger.error(`Generated code is invalid: ${error}`);
 			return false;
 		}
 	}
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 7e0d39a1f38cb..d54fa60c4d8af 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1,4 +1,4 @@
-import type { CREDENTIAL_EDIT_MODAL_KEY } from './constants';
+import type { AI_CONNECT_MODAL_KEY, CREDENTIAL_EDIT_MODAL_KEY } from './constants';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { IMenuItem } from 'n8n-design-system';
 import type {
@@ -979,6 +979,7 @@ export interface ITagsState {
 
 export type Modals = {
 	[CREDENTIAL_EDIT_MODAL_KEY]: NewCredentialsModal;
+	[AI_CONNECT_MODAL_KEY]: AiConnectModal;
 	[key: string]: ModalState;
 };
 
@@ -991,6 +992,11 @@ export type ModalState = {
 	httpNodeParameters?: string;
 };
 
+export type AiConnectModal = ModalState & {
+	prompt: string;
+	service: string;
+};
+
 export type NewCredentialsModal = ModalState & {
 	showAuthSelector?: boolean;
 };
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index 237b7d975e4d5..e4a8bbbedbe75 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -11,3 +11,13 @@ export async function generateCodeForPrompt(
 		schema: JSON.stringify(schema),
 	} as IDataObject);
 }
+
+export async function generateCurlCommand(
+	context: IRestApiContext,
+	{ prompt, service }: { prompt: string; service: string },
+): Promise<{ curl: string }> {
+	return makeRestApiRequest(context, 'POST', '/ai/generate-curl', {
+		prompt,
+		service,
+	} as IDataObject);
+}
diff --git a/packages/editor-ui/src/components/AiImportCurlModal.vue b/packages/editor-ui/src/components/AiImportCurlModal.vue
new file mode 100644
index 0000000000000..90157d598b9f9
--- /dev/null
+++ b/packages/editor-ui/src/components/AiImportCurlModal.vue
@@ -0,0 +1,135 @@
+<template>
+	<Modal
+		width="700px"
+		:title="$locale.baseText('aiImportCurlModal.title')"
+		:eventBus="modalBus"
+		:name="AI_CONNECT_MODAL_KEY"
+		:center="true"
+	>
+		<template #content>
+			<n8n-notice :class="$style.notice" :content="$locale.baseText('aiImportCurlModal.notice')" />
+			<div :class="$style.container">
+				<n8n-input-label
+					:label="$locale.baseText('aiImportCurlModal.input.service.label')"
+					color="text-dark"
+				>
+					<n8n-input
+						:placeholder="$locale.baseText('aiImportCurlModal.input.service.placeholder')"
+						v-model="service"
+						@focus="$event.target.select()"
+						ref="input"
+					/>
+				</n8n-input-label>
+				<n8n-input-label
+					:label="$locale.baseText('aiImportCurlModal.input.prompt.label')"
+					color="text-dark"
+				>
+					<n8n-input
+						:placeholder="$locale.baseText('aiImportCurlModal.input.prompt.placeholder')"
+						v-model="prompt"
+						@focus="$event.target.select()"
+					/>
+				</n8n-input-label>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style.modalFooter">
+				<n8n-button
+					@click="onSubmit"
+					float="right"
+					:loading="loading"
+					:label="$locale.baseText('aiImportCurlModal.button.label')"
+				/>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<script setup lang="ts">
+import Modal from '@/components/Modal.vue';
+
+import { onMounted, ref } from 'vue';
+import { useUIStore } from '@/stores/ui.store';
+import { createEventBus } from 'n8n-design-system';
+import { useI18n, useImportCurl, useToast } from '@/composables';
+import { AI_CONNECT_MODAL_KEY } from '@/constants';
+import { useTelemetry } from '@/composables';
+import { useRootStore } from '@/stores';
+import { generateCurlCommand } from '@/api/ai';
+
+const rootStore = useRootStore();
+const uiStore = useUIStore();
+const { i18n } = useI18n();
+const { showError, showToast } = useToast();
+const { track } = useTelemetry();
+const { importCurlCommand } = useImportCurl(track, AI_CONNECT_MODAL_KEY);
+
+const modalBus = createEventBus();
+const loading = ref(false);
+const service = ref('');
+const prompt = ref('');
+
+function closeDialog() {
+	loading.value = false;
+	modalBus.emit('close');
+
+	uiStore.setModalData({
+		name: AI_CONNECT_MODAL_KEY,
+		data: {
+			service: service.value,
+			prompt: prompt.value,
+		},
+	});
+
+	showToast({
+		type: 'success',
+		title: i18n.baseText('aiImportCurlModal.toast.success.title'),
+		message: i18n.baseText('aiImportCurlModal.toast.success.message'),
+	});
+}
+
+async function onSubmit() {
+	loading.value = true;
+
+	try {
+		const { curl } = await generateCurlCommand(rootStore.getRestApiContext, {
+			service: service.value,
+			prompt: prompt.value,
+		});
+
+		if (await importCurlCommand(curl)) {
+			closeDialog();
+		}
+	} catch (error) {
+		showError(
+			error,
+			i18n.baseText('aiImportCurlModal.toast.error.title'),
+			i18n.baseText('aiImportCurlModal.toast.error.message'),
+		);
+	}
+}
+
+onMounted(() => {
+	service.value = (uiStore.getModalData(AI_CONNECT_MODAL_KEY)?.service as string) || '';
+	prompt.value = (uiStore.getModalData(AI_CONNECT_MODAL_KEY)?.prompt as string) || '';
+});
+</script>
+
+<style module lang="scss">
+.modalFooter {
+	justify-content: flex-end;
+	display: flex;
+	flex-direction: row;
+}
+
+.notice {
+	margin-top: 0;
+}
+
+.container > * {
+	margin-bottom: var(--spacing-s);
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/AiImportParameter.vue b/packages/editor-ui/src/components/AiImportParameter.vue
new file mode 100644
index 0000000000000..af375e8627e0c
--- /dev/null
+++ b/packages/editor-ui/src/components/AiImportParameter.vue
@@ -0,0 +1,34 @@
+<template>
+	<n8n-button
+		type="secondary"
+		:label="$locale.baseText('aiImportParameter.label')"
+		:disabled="isReadOnly"
+		size="mini"
+		@click="onImportCurlClicked"
+	/>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { AI_CONNECT_MODAL_KEY } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { mapStores } from 'pinia';
+
+export default defineComponent({
+	name: 'ai-import-parameter',
+	props: {
+		isReadOnly: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		...mapStores(useUIStore),
+	},
+	methods: {
+		onImportCurlClicked() {
+			this.uiStore.openModal(AI_CONNECT_MODAL_KEY);
+		},
+	},
+});
+</script>
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 7384559dffad0..26e7ab5747168 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -10,11 +10,10 @@
 			<div :class="$style.container">
 				<n8n-input-label :label="$locale.baseText('importCurlModal.input.label')" color="text-dark">
 					<n8n-input
-						:value="curlCommand"
 						type="textarea"
 						:rows="5"
 						:placeholder="$locale.baseText('importCurlModal.input.placeholder')"
-						@input="onInput"
+						v-model="curlCommand"
 						@focus="$event.target.select()"
 						ref="input"
 					/>
@@ -29,7 +28,7 @@
 				/>
 				<div>
 					<n8n-button
-						@click="importCurlCommand"
+						@click="onSubmit"
 						float="right"
 						:label="$locale.baseText('importCurlModal.button.label')"
 					/>
@@ -39,149 +38,39 @@
 	</Modal>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import Modal from '@/components/Modal.vue';
-import {
-	IMPORT_CURL_MODAL_KEY,
-	CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS,
-	CURL_IMPORT_NODES_PROTOCOLS,
-} from '@/constants';
-import { useToast } from '@/composables';
-import { defineComponent } from 'vue';
-import type { INodeUi } from '@/Interface';
-import { mapStores } from 'pinia';
+
+import { onMounted, ref } from 'vue';
 import { useUIStore } from '@/stores/ui.store';
-import { useNDVStore } from '@/stores/ndv.store';
 import { createEventBus } from 'n8n-design-system';
+import { useImportCurl } from '@/composables';
+import { IMPORT_CURL_MODAL_KEY } from '@/constants';
+import { useTelemetry } from '@/composables';
 
-export default defineComponent({
-	name: 'ImportCurlModal',
-	components: {
-		Modal,
-	},
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	data() {
-		return {
-			IMPORT_CURL_MODAL_KEY,
-			curlCommand: '',
-			modalBus: createEventBus(),
-		};
-	},
-	computed: {
-		...mapStores(useNDVStore, useUIStore),
-		node(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-	},
-	methods: {
-		closeDialog(): void {
-			this.modalBus.emit('close');
-		},
-		onInput(value: string): void {
-			this.curlCommand = value;
-		},
-		async importCurlCommand(): Promise<void> {
-			const curlCommand = this.curlCommand;
-			if (curlCommand === '') return;
-
-			try {
-				const parameters = await this.uiStore.getCurlToJson(curlCommand);
-				const url = parameters['parameters.url'];
-
-				const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
-					url.includes(`${p}://`),
-				);
-
-				if (!invalidProtocol) {
-					this.uiStore.setHttpNodeParameters({
-						name: IMPORT_CURL_MODAL_KEY,
-						parameters: JSON.stringify(parameters),
-					});
+const uiStore = useUIStore();
+const { track } = useTelemetry();
+const { importCurlCommand } = useImportCurl(track, IMPORT_CURL_MODAL_KEY);
 
-					this.closeDialog();
+const modalBus = createEventBus();
+const curlCommand = ref('');
+const input = ref();
 
-					this.sendTelemetry();
-
-					return;
-					// if we have a node that supports the invalid protocol
-					// suggest that one
-				} else if (CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol]) {
-					const useNode = CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol];
+function closeDialog() {
+	modalBus.emit('close');
+}
 
-					this.showProtocolErrorWithSupportedNode(invalidProtocol, useNode);
-					// we do not have a node that supports the use protocol
-				} else {
-					this.showProtocolError(invalidProtocol);
-				}
-				this.sendTelemetry({ success: false, invalidProtocol: true, protocol: invalidProtocol });
-			} catch (e) {
-				this.showInvalidcURLCommandError();
+async function onSubmit() {
+	if (await importCurlCommand(curlCommand.value)) {
+		closeDialog();
+	}
+}
 
-				this.sendTelemetry({ success: false, invalidProtocol: false });
-			} finally {
-				this.uiStore.setCurlCommand({ name: IMPORT_CURL_MODAL_KEY, command: this.curlCommand });
-			}
-		},
-		showProtocolErrorWithSupportedNode(protocol: string, node: string): void {
-			this.showToast({
-				title: this.$locale.baseText('importParameter.showError.invalidProtocol1.title', {
-					interpolate: {
-						node,
-					},
-				}),
-				message: this.$locale.baseText('importParameter.showError.invalidProtocol.message', {
-					interpolate: {
-						protocol: protocol.toUpperCase(),
-					},
-				}),
-				type: 'error',
-				duration: 0,
-			});
-		},
-		showProtocolError(protocol: string): void {
-			this.showToast({
-				title: this.$locale.baseText('importParameter.showError.invalidProtocol2.title'),
-				message: this.$locale.baseText('importParameter.showError.invalidProtocol.message', {
-					interpolate: {
-						protocol,
-					},
-				}),
-				type: 'error',
-				duration: 0,
-			});
-		},
-		showInvalidcURLCommandError(): void {
-			this.showToast({
-				title: this.$locale.baseText('importParameter.showError.invalidCurlCommand.title'),
-				message: this.$locale.baseText('importParameter.showError.invalidCurlCommand.message'),
-				type: 'error',
-				duration: 0,
-			});
-		},
-		sendTelemetry(
-			data: { success: boolean; invalidProtocol: boolean; protocol?: string } = {
-				success: true,
-				invalidProtocol: false,
-				protocol: '',
-			},
-		): void {
-			this.$telemetry.track('User imported curl command', {
-				success: data.success,
-				invalidProtocol: data.invalidProtocol,
-				protocol: data.protocol,
-			});
-		},
-	},
-	mounted() {
-		this.curlCommand = this.uiStore.getCurlCommand || '';
-		setTimeout(() => {
-			(this.$refs.input as HTMLTextAreaElement).focus();
-		});
-	},
+onMounted(() => {
+	curlCommand.value = uiStore.getCurlCommand(IMPORT_CURL_MODAL_KEY) || '';
+	setTimeout(() => {
+		(input.value as HTMLTextAreaElement)?.focus();
+	});
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ImportParameter.vue b/packages/editor-ui/src/components/ImportParameter.vue
index 3f9448765fb63..d51880f76a67a 100644
--- a/packages/editor-ui/src/components/ImportParameter.vue
+++ b/packages/editor-ui/src/components/ImportParameter.vue
@@ -1,13 +1,11 @@
 <template>
-	<div :class="$style.importSection">
-		<n8n-button
-			type="secondary"
-			:label="$locale.baseText('importParameter.label')"
-			:disabled="isReadOnly"
-			size="mini"
-			@click="onImportCurlClicked"
-		/>
-	</div>
+	<n8n-button
+		type="secondary"
+		:label="$locale.baseText('importParameter.label')"
+		:disabled="isReadOnly"
+		size="mini"
+		@click="onImportCurlClicked"
+	/>
 </template>
 
 <script lang="ts">
@@ -34,11 +32,3 @@ export default defineComponent({
 	},
 });
 </script>
-
-<style module lang="scss">
-.importSection {
-	display: flex;
-	flex-direction: row-reverse;
-	margin-top: 10px;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 3746992e6bf1e..4dc61750807a7 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -91,6 +91,10 @@
 			<ImportCurlModal />
 		</ModalRoot>
 
+		<ModalRoot :name="AI_CONNECT_MODAL_KEY">
+			<AiImportCurlModal />
+		</ModalRoot>
+
 		<ModalRoot :name="COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY">
 			<template #default="{ modalName, activeId, mode }">
 				<CommunityPackageManageConfirmModal
@@ -149,6 +153,7 @@ import {
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 	IMPORT_CURL_MODAL_KEY,
+	AI_CONNECT_MODAL_KEY,
 	LOG_STREAM_MODAL_KEY,
 	ASK_AI_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
@@ -176,6 +181,7 @@ import DeleteUserModal from './DeleteUserModal.vue';
 import ExecutionsModal from './ExecutionsModal.vue';
 import ActivationModal from './ActivationModal.vue';
 import ImportCurlModal from './ImportCurlModal.vue';
+import AiImportCurlModal from './AiImportCurlModal.vue';
 import WorkflowShareModal from './WorkflowShareModal.ee.vue';
 import EventDestinationSettingsModal from '@/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue';
 import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
@@ -209,6 +215,7 @@ export default defineComponent({
 		EventDestinationSettingsModal,
 		SourceControlPushModal,
 		SourceControlPullModal,
+		AiImportCurlModal,
 	},
 	data: () => ({
 		COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
@@ -232,6 +239,7 @@ export default defineComponent({
 		EXECUTIONS_MODAL_KEY,
 		WORKFLOW_ACTIVE_MODAL_KEY,
 		IMPORT_CURL_MODAL_KEY,
+		AI_CONNECT_MODAL_KEY,
 		LOG_STREAM_MODAL_KEY,
 		SOURCE_CONTROL_PUSH_MODAL_KEY,
 		SOURCE_CONTROL_PULL_MODAL_KEY,
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index feb7d0809c8c1..8962cc4d16dea 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -100,15 +100,27 @@
 					@activate="onWorkflowActivate"
 					@parameterBlur="onParameterBlur"
 				>
-					<node-credentials
-						:node="node"
-						:readonly="isReadOnly"
-						:showAll="true"
-						@credentialSelected="credentialSelected"
-						@valueChanged="valueChanged"
-						@blur="onParameterBlur"
-						:hide-issues="hiddenIssuesInputs.includes('credentials')"
-					/>
+					<template>
+						<div
+							:class="$style.parametersControls"
+							v-if="
+								nodeTypeName === 'n8n-nodes-base.httpRequest' &&
+								(ndvStore.activeNode?.typeVersion || 1) >= 3
+							"
+						>
+							<ai-import-parameter :isReadOnly="isReadOnly" @valueChanged="valueChanged" />
+							<import-parameter :isReadOnly="isReadOnly" @valueChanged="valueChanged" />
+						</div>
+						<node-credentials
+							:node="node"
+							:readonly="isReadOnly"
+							:showAll="true"
+							@credentialSelected="credentialSelected"
+							@valueChanged="valueChanged"
+							@blur="onParameterBlur"
+							:hide-issues="hiddenIssuesInputs.includes('credentials')"
+						/>
+					</template>
 				</parameter-input-list>
 				<div v-if="parametersNoneSetting.length === 0" class="no-parameters">
 					<n8n-text>
@@ -179,12 +191,16 @@ import {
 	CUSTOM_NODES_DOCS_URL,
 	MAIN_NODE_PANEL_WIDTH,
 	IMPORT_CURL_MODAL_KEY,
+	AI_CONNECT_MODAL_KEY,
 } from '@/constants';
 
 import NodeTitle from '@/components/NodeTitle.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
 import NodeCredentials from '@/components/NodeCredentials.vue';
 import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
+import ImportParameter from '@/components/ImportParameter.vue';
+import AiImportParameter from '@/components/AiImportParameter.vue';
+
 import NodeWebhooks from '@/components/NodeWebhooks.vue';
 import { get, set, unset } from 'lodash-es';
 
@@ -213,6 +229,8 @@ export default defineComponent({
 		NodeSettingsTabs,
 		NodeWebhooks,
 		NodeExecuteButton,
+		ImportParameter,
+		AiImportParameter,
 	},
 	computed: {
 		...mapStores(
@@ -225,7 +243,10 @@ export default defineComponent({
 			useWorkflowsEEStore,
 		),
 		isCurlImportModalOpen(): boolean {
-			return this.uiStore.isModalOpen(IMPORT_CURL_MODAL_KEY);
+			return (
+				this.uiStore.isModalOpen(IMPORT_CURL_MODAL_KEY) ||
+				this.uiStore.isModalOpen(AI_CONNECT_MODAL_KEY)
+			);
 		},
 		isReadOnly(): boolean {
 			return this.readOnly || this.hasForeignCredential;
@@ -465,7 +486,10 @@ export default defineComponent({
 		},
 		isCurlImportModalOpen(newValue, oldValue) {
 			if (newValue === false) {
-				let parameters = this.uiStore.getHttpNodeParameters || '';
+				let parameters =
+					this.uiStore.getHttpNodeParameters(IMPORT_CURL_MODAL_KEY) ||
+					this.uiStore.getHttpNodeParameters(AI_CONNECT_MODAL_KEY) ||
+					'';
 
 				if (!parameters) return;
 
@@ -483,6 +507,7 @@ export default defineComponent({
 					});
 
 					this.uiStore.setHttpNodeParameters({ name: IMPORT_CURL_MODAL_KEY, parameters: '' });
+					this.uiStore.setHttpNodeParameters({ name: AI_CONNECT_MODAL_KEY, parameters: '' });
 				} catch {}
 			}
 		},
@@ -972,6 +997,12 @@ export default defineComponent({
 	display: flex;
 	flex-direction: column;
 }
+.parametersControls {
+	display: flex;
+	justify-content: flex-end;
+	gap: var(--spacing-xs);
+	margin-top: var(--spacing-xs);
+}
 </style>
 
 <style lang="scss">
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 6aa377f7372be..452ee53604e5a 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -22,16 +22,13 @@
 				/>
 			</div>
 
-			<import-parameter
+			<!-- Prevent rendering of import buttons as individual parameters -->
+			<template
 				v-else-if="
-					parameter.type === 'curlImport' &&
-					nodeTypeName === 'n8n-nodes-base.httpRequest' &&
-					nodeTypeVersion >= 3
+					['curlImport', 'aiImport'].includes(parameter.type) &&
+					nodeTypeName === 'n8n-nodes-base.httpRequest'
 				"
-				:isReadOnly="isReadOnly"
-				@valueChanged="valueChanged"
 			/>
-
 			<n8n-notice
 				v-else-if="parameter.type === 'notice'"
 				class="parameter-item"
@@ -143,6 +140,7 @@ import MultipleParameter from '@/components/MultipleParameter.vue';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ImportParameter from '@/components/ImportParameter.vue';
+import AiImportParameter from '@/components/AiImportParameter.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import { get, set } from 'lodash-es';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -159,6 +157,7 @@ export default defineComponent({
 		FixedCollectionParameter: async () => import('./FixedCollectionParameter.vue'),
 		CollectionParameter: async () => import('./CollectionParameter.vue'),
 		ImportParameter,
+		AiImportParameter,
 		ResourceMapper,
 	},
 	props: {
@@ -467,6 +466,9 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.inline-parameter {
+	display: inline-block;
+}
 .parameter-input-list-wrapper {
 	.delete-option {
 		display: none;
diff --git a/packages/editor-ui/src/composables/index.ts b/packages/editor-ui/src/composables/index.ts
index 042d79f7b7ec2..5c82715936d8a 100644
--- a/packages/editor-ui/src/composables/index.ts
+++ b/packages/editor-ui/src/composables/index.ts
@@ -13,3 +13,4 @@ export * from './useTitleChange';
 export * from './useToast';
 export * from './useNodeSpecificationValues';
 export * from './useDataSchema';
+export * from './useImportCurl';
diff --git a/packages/editor-ui/src/composables/useImportCurl.ts b/packages/editor-ui/src/composables/useImportCurl.ts
new file mode 100644
index 0000000000000..d4d1540a995c9
--- /dev/null
+++ b/packages/editor-ui/src/composables/useImportCurl.ts
@@ -0,0 +1,120 @@
+import { CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS, CURL_IMPORT_NODES_PROTOCOLS } from '@/constants';
+
+import { useI18n } from './useI18n';
+import { useToast } from './useToast';
+import { useUIStore } from '@/stores/ui.store';
+import type { ITelemetryTrackProperties } from 'n8n-workflow';
+
+export function useImportCurl(
+	track: (event: string, data?: ITelemetryTrackProperties) => void,
+	modalKey: string,
+) {
+	const uiStore = useUIStore();
+	const { showToast } = useToast();
+	const { i18n } = useI18n();
+
+	async function importCurlCommand(curlCommand: string): Promise<boolean> {
+		console.log('🚀 ~ file: useImportCurl.ts:18 ~ importCurlCommand ~ curlCommand:', curlCommand);
+		if (curlCommand === '') return false;
+
+		try {
+			const parameters = await uiStore.getCurlToJson(curlCommand);
+			console.log('🚀 ~ file: useImportCurl.ts:23 ~ importCurlCommand ~ parameters:', parameters);
+			const url = parameters['parameters.url'];
+
+			const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
+				url.includes(`${p}://`),
+			);
+
+			if (!invalidProtocol) {
+				uiStore.setHttpNodeParameters({
+					name: modalKey,
+					parameters: JSON.stringify(parameters),
+				});
+
+				// this.closeDialog();
+
+				sendTelemetry();
+
+				return true;
+				// if we have a node that supports the invalid protocol
+				// suggest that one
+			} else if (CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol]) {
+				const useNode = CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol];
+
+				showProtocolErrorWithSupportedNode(invalidProtocol, useNode);
+				// we do not have a node that supports the use protocol
+			} else {
+				showProtocolError(invalidProtocol);
+			}
+			sendTelemetry({ success: false, invalidProtocol: true, protocol: invalidProtocol });
+		} catch (e) {
+			console.log('🚀 ~ file: useImportCurl.ts:52 ~ importCurlCommand ~ e:', e);
+			showInvalidcURLCommandError();
+
+			sendTelemetry({ success: false, invalidProtocol: false });
+			return false;
+		} finally {
+			uiStore.setCurlCommand({ name: modalKey, command: curlCommand });
+			return true;
+		}
+	}
+
+	function showProtocolErrorWithSupportedNode(protocol: string, node: string): void {
+		showToast({
+			title: i18n.baseText('importParameter.showError.invalidProtocol1.title', {
+				interpolate: {
+					node,
+				},
+			}),
+			message: i18n.baseText('importParameter.showError.invalidProtocol.message', {
+				interpolate: {
+					protocol: protocol.toUpperCase(),
+				},
+			}),
+			type: 'error',
+			duration: 0,
+		});
+	}
+
+	function showProtocolError(protocol: string): void {
+		showToast({
+			title: i18n.baseText('importParameter.showError.invalidProtocol2.title'),
+			message: i18n.baseText('importParameter.showError.invalidProtocol.message', {
+				interpolate: {
+					protocol,
+				},
+			}),
+			type: 'error',
+			duration: 0,
+		});
+	}
+
+	function showInvalidcURLCommandError(): void {
+		showToast({
+			title: i18n.baseText('importParameter.showError.invalidCurlCommand.title'),
+			message: i18n.baseText('importParameter.showError.invalidCurlCommand.message'),
+			type: 'error',
+			duration: 0,
+		});
+	}
+
+	function sendTelemetry(
+		data: { success: boolean; invalidProtocol: boolean; protocol?: string } = {
+			success: true,
+			invalidProtocol: false,
+			protocol: '',
+		},
+	): void {
+		// TODO: Fix this
+		// track('User imported curl command', {
+		// 	success: data.success,
+		// 	invalidProtocol: data.invalidProtocol,
+		// 	protocol: data.protocol,
+		// });
+	}
+
+	return {
+		importCurlCommand,
+	};
+}
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 8934dd179cb00..dcc6d1c6262f7 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -46,6 +46,7 @@ export const ONBOARDING_CALL_SIGNUP_MODAL_KEY = 'onboardingCallSignup';
 export const COMMUNITY_PACKAGE_INSTALL_MODAL_KEY = 'communityPackageInstall';
 export const COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY = 'communityPackageManageConfirm';
 export const IMPORT_CURL_MODAL_KEY = 'importCurl';
+export const AI_CONNECT_MODAL_KEY = 'aiImport';
 export const LOG_STREAM_MODAL_KEY = 'settingsLogStream';
 
 export const SOURCE_CONTROL_PUSH_MODAL_KEY = 'sourceControlPush';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 3fe61ae75a167..39f1e8a68a78f 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1723,7 +1723,19 @@
 	"importCurlModal.input.placeholder": "Paste the cURL command here",
 	"ImportCurlModal.notice.content": "This will overwrite any changes you have already made",
 	"importCurlModal.button.label": "Import",
+	"aiImportCurlModal.title": "AI Connect",
+	"aiImportCurlModal.notice": "Our AI Connect feature has a knowledge cutoff in September 2021",
+	"aiImportCurlModal.input.service.label": "To which service do you want to connect to?",
+	"aiImportCurlModal.input.service.placeholder": "E.g. Slack",
+	"aiImportCurlModal.input.prompt.label": "What do you want to do?",
+	"aiImportCurlModal.input.prompt.placeholder": "E.g. I want to send a message to the #updates channel",
+	"aiImportCurlModal.button.label": "Connect",
+	"aiImportCurlModal.toast.success.title": "Successfully generated connection data",
+	"aiImportCurlModal.toast.success.message": "Please check the node editor for the generated data, make sure to use the correct credentials",
+	"aiImportCurlModal.toast.error.title": "Couldn’t generate connection data",
+	"aiImportCurlModal.toast.error.message": "Please modify your prompt and try again",
 	"importParameter.label": "Import cURL",
+	"aiImportParameter.label": "AI Connect (BETA)",
 	"importParameter.showError.invalidCurlCommand.title": "Couldn’t import cURL command",
 	"importParameter.showError.invalidCurlCommand.message": "This command is in an unsupported format",
 	"importParameter.showError.invalidProtocol1.title": "Use the {node} node",
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 3a6cda482d2dc..d43aa6e3e4237 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -32,6 +32,7 @@ import {
 	WORKFLOW_SHARE_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
 	SOURCE_CONTROL_PULL_MODAL_KEY,
+	AI_CONNECT_MODAL_KEY,
 } from '@/constants';
 import type {
 	CloudUpdateLinkSourceType,
@@ -129,6 +130,13 @@ export const useUIStore = defineStore(STORES.UI, {
 				curlCommand: '',
 				httpNodeParameters: '',
 			},
+			[AI_CONNECT_MODAL_KEY]: {
+				open: false,
+				curlCommand: '',
+				httpNodeParameters: '',
+				prompt: '',
+				service: '',
+			},
 			[LOG_STREAM_MODAL_KEY]: {
 				open: false,
 				data: undefined,
@@ -260,11 +268,11 @@ export const useUIStore = defineStore(STORES.UI, {
 			}
 			return null;
 		},
-		getCurlCommand(): string | undefined {
-			return this.modals[IMPORT_CURL_MODAL_KEY].curlCommand;
+		getCurlCommand() {
+			return (modalKey: string) => this.modals[modalKey].curlCommand;
 		},
-		getHttpNodeParameters(): string | undefined {
-			return this.modals[IMPORT_CURL_MODAL_KEY].httpNodeParameters;
+		getHttpNodeParameters() {
+			return (modalKey: string) => this.modals[modalKey].httpNodeParameters;
 		},
 		areExpressionsDisabled(): boolean {
 			return this.currentView === VIEWS.DEMO;
@@ -375,6 +383,10 @@ export const useUIStore = defineStore(STORES.UI, {
 			} as NewCredentialsModal;
 		},
 		setModalData(payload: { name: keyof Modals; data: Record<string, unknown> }) {
+			console.log(
+				'🚀 ~ file: ui.store.ts:387 ~ setModalData ~ this.modals[payload.name]:',
+				this.modals[payload.name],
+			);
 			this.modals[payload.name] = {
 				...this.modals[payload.name],
 				data: payload.data,
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 691344ee7db6e..0fee3bfa6c8b6 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -63,6 +63,12 @@ export class HttpRequestV3 implements INodeType {
 					type: 'curlImport',
 					default: '',
 				},
+				{
+					displayName: '',
+					name: 'aiImport',
+					type: 'aiImport',
+					default: '',
+				},
 				{
 					displayName: 'Method',
 					name: 'method',
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index dbdbfae89a7a2..e5c53155648ca 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1020,6 +1020,7 @@ export type NodePropertyTypes =
 	| 'credentialsSelect'
 	| 'resourceLocator'
 	| 'curlImport'
+	| 'aiImport'
 	| 'resourceMapper';
 
 export type CodeAutocompleteTypes = 'function' | 'functionItem';
@@ -2165,6 +2166,9 @@ export interface IN8nUISettings {
 	banners: {
 		dismissed: string[];
 	};
+	ai: {
+		enabled: boolean;
+	};
 }
 
 export type Banners = 'V1' | 'TRIAL_OVER' | 'TRIAL';

From d01439add26a50c9c7a46c78a11f9ea9b929de88 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 25 Jul 2023 17:19:00 +0200
Subject: [PATCH 005/116] Improve AI controller, load conditionally, UX modal
 imporvements

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/cli/src/Server.ts                    |   6 +-
 packages/cli/src/controllers/ai.controller.ts |  33 ++---
 packages/editor-ui/src/api/ai.ts              |   4 +-
 .../src/components/AiImportCurlModal.vue      |  14 +-
 .../src/components/CodeNodeEditor/AskAI.vue   | 139 ++++++++++++++++--
 .../CodeNodeEditor/CircleLoader.vue           |  63 ++++++++
 .../CodeNodeEditor/CodeNodeEditor.vue         |  34 ++++-
 .../src/composables/useDataSchema.ts          |  39 +++--
 .../src/plugins/i18n/locales/en.json          |   1 +
 9 files changed, 272 insertions(+), 61 deletions(-)
 create mode 100644 packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 1b998abfbff63..00735439e28f8 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -498,11 +498,15 @@ export class Server extends AbstractServer {
 				logger,
 				postHog,
 			}),
-			new AiController({ logger }),
+
 			Container.get(SamlController),
 			Container.get(SourceControlController),
 		];
 
+		if (config.getEnv('ai.enabled')) {
+			controllers.push(new AiController({ logger }));
+		}
+
 		if (isLdapEnabled()) {
 			const { service, sync } = LdapManager.getInstance();
 			controllers.push(new LdapController(service, sync, internalHooks));
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index 980b6844bcc7b..c677d8d61fa69 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -23,13 +23,6 @@ type GenerateCurlRequest = Request<
 	}
 >;
 
-if (!config.getEnv('ai.enabled')) {
-	console.error('AI endpoints only allowed when AI is enabled');
-	process.exit(1);
-} else {
-	console.log('AI endpoints enabled');
-}
-
 @Authorized()
 @RestController('/ai')
 export class AiController {
@@ -48,33 +41,31 @@ export class AiController {
 	@Post('/generate-code')
 	async generatePrompt(req: GenerateCodeRequest) {
 		console.log('Received: ', req.body.prompt, req.body.schema);
-		const generatedCode = 'console.log("Hello world!")';
+		const { prompt, schema } = req.body;
 
-		return {
-			code: generatedCode,
-			isValid: this.validateGeneratedCode(generatedCode),
-		};
-	}
-
-	@Post('/generate-curl')
-	async generateCurl(req: GenerateCurlRequest) {
 		try {
-			const { prompt, service } = req.body;
 			const resp = await axios({
 				method: 'post',
-				url: `${this.endpoint}/generate-curl`,
+				url: this.endpoint,
 				data: {
 					prompt,
-					service,
+					schema,
 				},
 				headers: {
 					authorization: this.authorization,
 				},
 			});
 
-			return resp.data as { curl: string };
+			const code = (resp.data as { code: string }).code;
+			const mode = (resp.data as { mode: string }).mode;
+
+			return {
+				code,
+				mode,
+				isValid: this.validateGeneratedCode(code),
+			};
 		} catch (error) {
-			throw new Error(`Failed to generate curl: ${error}`);
+			throw new Error(`Failed to generate code: ${error}`);
 		}
 	}
 
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index e4a8bbbedbe75..d1603ca6b8934 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -1,11 +1,11 @@
 import type { IRestApiContext } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type { IDataObject } from 'n8n-workflow';
+import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
 
 export async function generateCodeForPrompt(
 	context: IRestApiContext,
 	{ prompt, schema }: { prompt: string; schema: IDataObject },
-): Promise<{ code: string }> {
+): Promise<{ code: string; mode: CodeExecutionMode }> {
 	return makeRestApiRequest(context, 'POST', '/ai/generate-code', {
 		prompt,
 		schema: JSON.stringify(schema),
diff --git a/packages/editor-ui/src/components/AiImportCurlModal.vue b/packages/editor-ui/src/components/AiImportCurlModal.vue
index 90157d598b9f9..9a1a08f9d7350 100644
--- a/packages/editor-ui/src/components/AiImportCurlModal.vue
+++ b/packages/editor-ui/src/components/AiImportCurlModal.vue
@@ -37,6 +37,7 @@
 				<n8n-button
 					@click="onSubmit"
 					float="right"
+					:disabled="service.length === 0 || prompt.length === 0"
 					:loading="loading"
 					:label="$locale.baseText('aiImportCurlModal.button.label')"
 				/>
@@ -80,12 +81,6 @@ function closeDialog() {
 			prompt: prompt.value,
 		},
 	});
-
-	showToast({
-		type: 'success',
-		title: i18n.baseText('aiImportCurlModal.toast.success.title'),
-		message: i18n.baseText('aiImportCurlModal.toast.success.message'),
-	});
 }
 
 async function onSubmit() {
@@ -97,8 +92,13 @@ async function onSubmit() {
 			prompt: prompt.value,
 		});
 
-		if (await importCurlCommand(curl)) {
+		if ((await importCurlCommand(curl)) === true) {
 			closeDialog();
+			showToast({
+				type: 'success',
+				title: i18n.baseText('aiImportCurlModal.toast.success.title'),
+				message: i18n.baseText('aiImportCurlModal.toast.success.message'),
+			});
 		}
 	} catch (error) {
 		showError(
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 3cf6c0c4918f6..8ba96975a88fc 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,31 +1,105 @@
 <script setup lang="ts">
-import { N8nButton, N8nInput } from 'n8n-design-system/components';
-import { ref, defineEmits } from 'vue';
+import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
+import { ref, defineEmits, computed } from 'vue';
 import { useDataSchema } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
-import { useRootStore } from '@/stores';
+import { useNDVStore, useRootStore } from '@/stores';
+import CircleLoader from './CircleLoader.vue';
 
 const emit = defineEmits<{
 	submit: (code: string) => void;
 }>();
-const { getWorkflowSchema } = useDataSchema();
+const { getWorkflowSchema, getSchemaForExecutionData } = useDataSchema();
 const maxLength = 600;
+const loadingDurationMs = 10000;
+const loadingPhrase = ref([
+	'AI cogs whirring, almost there…',
+	'up up down down left right b a start…',
+	'Consulting Jan Oberhauser…',
+	'Gathering bytes and pieces…',
+	'Checking if another AI knows the answer…',
+	'Checking on Stack Overflow…',
+	'Crunching data, AI-style…',
+	'Stand by, AI magic at work…',
+]);
+const loadingPhraseIndex = ref(0);
+const loaderProgress = ref(0);
+
+const isLoading = ref(false);
 const prompt = ref('');
 
+const hasExecutionData = computed(() => useNDVStore().ndvInputData.length > 0);
 async function onSubmit() {
+	startLoading();
 	const schema = getWorkflowSchema();
+
 	try {
+		const { ndvInputData } = useNDVStore();
+
 		const { getRestApiContext } = useRootStore();
-		const { code } = await generateCodeForPrompt(getRestApiContext, {
+		const { code, mode } = await generateCodeForPrompt(getRestApiContext, {
 			prompt: prompt.value,
 			schema,
 		});
-
-		emit('replaceCode', code);
+		// await new Promise((resolve) => setTimeout(resolve, 3000));
+		stopLoading();
+		emit('replaceCode', { code, mode });
 	} catch (error) {
 		console.log('Failed to generate code', error);
+		stopLoading();
 	}
 }
+
+function triggerLoadingPhraseChange() {
+	let start: number | null = null;
+	let lastPhraseChange = 0;
+
+	const step = (timestamp: number) => {
+		if (!start) start = timestamp;
+
+		if (!lastPhraseChange || timestamp - lastPhraseChange >= 2000) {
+			loadingPhraseIndex.value = Math.floor(Math.random() * loadingPhrase.value.length);
+			lastPhraseChange = timestamp;
+		}
+
+		if (!isLoading.value) return;
+
+		window.requestAnimationFrame(step);
+	};
+	window.requestAnimationFrame(step);
+}
+
+function triggerLoaderProgressChange() {
+	let start: number | null = null;
+
+	const step = (timestamp: number) => {
+		if (!start) start = timestamp;
+		const elapsed = timestamp - start;
+
+		loaderProgress.value = Math.min((elapsed / loadingDurationMs) * 100, 100);
+
+		if (!isLoading.value) return;
+
+		if (loaderProgress.value < 100) {
+			window.requestAnimationFrame(step);
+		}
+	};
+	window.requestAnimationFrame(step);
+}
+
+function startLoading() {
+	loaderProgress.value = 0;
+	isLoading.value = true;
+	triggerLoadingPhraseChange();
+	triggerLoaderProgressChange();
+}
+
+function stopLoading() {
+	loaderProgress.value = 100;
+	setTimeout(() => {
+		isLoading.value = false;
+	}, 200);
+}
 </script>
 
 <template>
@@ -61,26 +135,65 @@ async function onSubmit() {
 			/>
 		</div>
 		<div :class="$style.controls">
-			<N8nButton :disabled="!prompt" @click="onSubmit">{{
-				$locale.baseText('codeNodeEditor.askAi.generateCode')
-			}}</N8nButton>
+			<div :class="$style.loader" v-if="isLoading">
+				<transition name="text-fade-in-out" mode="out-in">
+					<div v-text="loadingPhrase[loadingPhraseIndex]" :key="loadingPhraseIndex" />
+				</transition>
+				<CircleLoader :radius="8" :progress="loaderProgress" :stroke-width="3" />
+			</div>
+			<n8n-tooltip>
+				<div>
+					<N8nButton :disabled="!hasExecutionData || !prompt" @click="onSubmit">{{
+						$locale.baseText('codeNodeEditor.askAi.generateCode')
+					}}</N8nButton>
+				</div>
+				<template #content>
+					<span
+						v-if="!hasExecutionData"
+						v-text="$locale.baseText('codeNodeEditor.askAi.noInputData')"
+					/>
+				</template>
+			</n8n-tooltip>
 		</div>
 	</div>
 </template>
 
+<style scoped>
+.text-fade-in-out-enter-active,
+.text-fade-in-out-leave-active {
+	transition: opacity 0.5s ease-in-out, transform 0.5s ease-in-out;
+}
+.text-fade-in-out-enter,
+.text-fade-in-out-leave-to {
+	opacity: 0;
+	transform: translateX(10px);
+}
+.text-fade-in-out-enter-to,
+.text-fade-in-out-leave {
+	opacity: 1;
+}
+</style>
+
 <style module lang="scss">
 .input * {
 	border: 0 !important;
 }
 .input textarea {
-	padding-bottom: var(--spacing-l);
+	padding-bottom: var(--spacing-2xl);
 }
 .intro {
-	font-size: var(--font-size-2xs);
 	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
 	color: var(--color-text-dark);
 	padding: var(--spacing-2xs) var(--spacing-xs) 0;
 }
+.loader {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-2xs);
+}
 .inputContainer {
 	position: relative;
 }
@@ -94,7 +207,7 @@ async function onSubmit() {
 	position: absolute;
 	bottom: var(--spacing-2xs);
 	left: var(--spacing-xs);
-	right: var(--spacing-xs);
+	right: var(--spacing-m);
 	z-index: 1;
 
 	* {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue b/packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue
new file mode 100644
index 0000000000000..33c2524d5ad14
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue
@@ -0,0 +1,63 @@
+<template>
+	<div class="progress-circle">
+		<svg class="progress-ring" :width="diameter" :height="diameter">
+			<circle
+				class="progress-ring-circle"
+				:stroke-width="strokeWidth"
+				stroke="#DCDFE6"
+				fill="transparent"
+				:r="radius"
+				v-bind="{ cx, cy }"
+			/>
+			<circle
+				class="progress-ring-circle"
+				stroke="#5C4EC2"
+				:stroke-width="strokeWidth"
+				fill="transparent"
+				:r="radius"
+				v-bind="{ cx, cy, style }"
+			/>
+		</svg>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+const props = defineProps({
+	radius: {
+		type: Number,
+		required: true,
+	},
+	progress: {
+		type: Number,
+		required: true,
+	},
+	strokeWidth: {
+		type: Number,
+		default: 4,
+	},
+});
+
+// for SVG viewbox and stroke array
+const diameter = computed(() => 2 * (props.radius + props.strokeWidth));
+const circumference = computed(() => 2 * Math.PI * props.radius);
+
+const strokeDashoffset = computed(
+	() => circumference.value - (props.progress / 100) * circumference.value,
+);
+
+const cx = computed(() => props.radius + props.strokeWidth);
+const cy = computed(() => props.radius + props.strokeWidth);
+const style = computed(() => ({
+	strokeDasharray: `${circumference.value}`,
+	strokeDashoffset: `${strokeDashoffset.value}`,
+}));
+</script>
+
+<style scoped>
+.progress-ring-circle {
+	transition: stroke-dashoffset 0.35s linear;
+	transform: rotate(-90deg);
+	transform-origin: 50% 50%;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index c78ed8e942901..e43d81e702b9e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -9,7 +9,7 @@
 			type="card"
 			ref="tabs"
 			v-model="activeTab"
-			v-if="askAiEnabled && language === 'javaScript'"
+			v-if="aiEnabled && language === 'javaScript'"
 		>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code">
 				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
@@ -26,6 +26,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
+import jsParser from 'prettier/parser-babel';
+import prettier from 'prettier/standalone';
 import { mapStores } from 'pinia';
 import type { LanguageSupport } from '@codemirror/language';
 import type { Extension } from '@codemirror/state';
@@ -116,13 +118,13 @@ export default defineComponent({
 
 			return this.editor.state.doc.toString();
 		},
-		askAiEnabled(): boolean {
-			// TODO: Do this based on ENV?
-			return true;
+		aiEnabled(): boolean {
+			return this.settingsStore.settings.ai.enabled === true;
 		},
 		placeholder(): string {
 			return CODE_PLACEHOLDERS[this.language]?.[this.mode] ?? '';
 		},
+		// eslint-disable-next-line vue/return-in-computed-property
 		languageExtensions(): [LanguageSupport, ...Extension[]] {
 			switch (this.language) {
 				case 'json':
@@ -135,7 +137,7 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		async onReplaceCode(code: string) {
+		async onReplaceCode({ code, mode }: { code: string; mode: CodeExecutionMode }) {
 			const hasChanges = this.initialValue !== this.content;
 
 			if (hasChanges) {
@@ -154,12 +156,24 @@ export default defineComponent({
 				}
 			}
 
+			this.workflowsStore.updateNodeProperties({
+				name: this.ndvStore.activeNode.name,
+				properties: { parameters: { mode } },
+			});
+
 			this.editor?.dispatch({
 				changes: { from: 0, to: this.content.length, insert: code },
 			});
 
 			this.initialValue = this.content;
 			this.activeTab = 'code';
+			this.formatCode();
+		},
+		switchMode(mode: string) {
+			this.workflowsStore.updateNodeProperties({
+				name: this.ndvStore.activeNode.name,
+				properties: { parameters: { mode } },
+			});
 		},
 		onMouseOver(event: MouseEvent) {
 			const fromElement = event.relatedTarget as HTMLElement;
@@ -209,6 +223,16 @@ export default defineComponent({
 				selection: { anchor: this.editor.state.doc.line(line).from },
 			});
 		},
+		formatCode() {
+			const formattedCode = prettier.format(this.content, {
+				parser: 'babel',
+				plugins: [jsParser],
+			});
+
+			this.editor?.dispatch({
+				changes: { from: 0, to: this.content.length, insert: formattedCode },
+			});
+		},
 		trackCompletion(viewUpdate: ViewUpdate) {
 			const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
 
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index 39734fe7dc985..e40980e334603 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -1,12 +1,16 @@
 import type { Optional, Primitives, Schema } from '@/Interface';
-import type { IDataObject } from 'n8n-workflow';
+import { isObjectEmpty, type IDataObject } from 'n8n-workflow';
 import { merge } from 'lodash-es';
 import { generatePath } from '@/utils/mappingUtils';
 import { isObj } from '@/utils/typeGuards';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore, useNDVStore } from '@/stores';
 
 export function useDataSchema() {
-	function getSchema(input: Optional<Primitives | object>, path = ''): Schema {
+	function getSchema(
+		input: Optional<Primitives | object>,
+		path = '',
+		excludeValues = false,
+	): Schema {
 		let schema: Schema = { type: 'undefined', value: 'undefined', path };
 		switch (typeof input) {
 			case 'object':
@@ -19,7 +23,7 @@ export function useDataSchema() {
 						type: 'array',
 						value: input.map((item, index) => ({
 							key: index.toString(),
-							...getSchema(item, `${path}[${index}]`),
+							...getSchema(item, `${path}[${index}]`, excludeValues),
 						})),
 						path,
 					};
@@ -28,7 +32,7 @@ export function useDataSchema() {
 						type: 'object',
 						value: Object.entries(input).map(([k, v]) => ({
 							key: k,
-							...getSchema(v, generatePath(path, [k])),
+							...getSchema(v, generatePath(path, [k]), excludeValues),
 						})),
 						path,
 					};
@@ -38,38 +42,49 @@ export function useDataSchema() {
 				schema = { type: 'function', value: '', path };
 				break;
 			default:
-				schema = { type: typeof input, value: String(input), path };
+				schema = {
+					type: typeof input,
+					value: excludeValues ? '__REDACTED__' : String(input),
+					path,
+				};
 		}
 
 		return schema;
 	}
 
-	function getSchemaForExecutionData(data: IDataObject[]) {
+	function getSchemaForExecutionData(data: IDataObject[], excludeValues = false) {
 		const [head, ...tail] = data;
 
-		return getSchema(merge({}, head, ...tail, head));
+		return getSchema(merge({}, head, ...tail, head), undefined, excludeValues);
 	}
 
 	function getWorkflowSchema() {
+		const { activeNode } = useNDVStore();
 		const { allNodes } = useWorkflowsStore();
 
 		const schemas = allNodes.reduce((acc: IDataObject, curr) => {
 			const { name } = curr;
 			const nodeRunData = useWorkflowsStore().getWorkflowResultDataByNodeName(name)?.[0];
 
+			if (name === activeNode?.name) return acc;
+
 			if (nodeRunData?.executionStatus === 'success' && nodeRunData.data !== undefined) {
 				const outputs = Object.keys(nodeRunData.data);
 
 				// Nodes might have several outputs, we need to get the schema for each input
 				const outputsSchema = outputs.reduce((outputsAcc: IDataObject, inputName) => {
-					const inputRunData = nodeRunData.data?.[inputName]?.[0]?.map((item) => item?.json);
-					if (inputRunData === undefined) return outputsAcc;
+					const inputRunData = nodeRunData.data?.[inputName]?.[0]
+						?.map((item) => item?.json)
+						?.filter((item) => item !== undefined && !isObjectEmpty(item));
+					if (inputRunData === undefined || inputRunData.length === 0) return outputsAcc;
 
-					outputsAcc[inputName] = getSchemaForExecutionData(inputRunData);
+					outputsAcc[inputName] = getSchemaForExecutionData(inputRunData, true);
 					return outputsAcc;
 				}, {});
 
-				acc[name] = outputsSchema;
+				if (Object.values(outputsSchema).length > 0) {
+					acc[name] = outputsSchema;
+				}
 			}
 
 			return acc;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 39f1e8a68a78f..fe0fddbda4207 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -276,6 +276,7 @@
 	"codeNodeEditor.askAi.intro": "Hey AI, generate JavaScript code that...",
 	"codeNodeEditor.askAi.help": "Help",
 	"codeNodeEditor.askAi.generateCode": "Generate Code",
+	"codeNodeEditor.askAi.noInputData": "No input data yet. Please execute the input node first",
 	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
 	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",
 	"codeNodeEditor.askAi.areYouSureToReplace": "Are you sure you want to generate new code? Your current code will be replaced.",

From 0e39fee4885df8d1f9cd0e50bf284e991148c8cb Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 25 Jul 2023 17:23:38 +0200
Subject: [PATCH 006/116] Extract-out AI curl

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/cli/src/controllers/ai.controller.ts |   9 -
 packages/editor-ui/src/Interface.ts           |   8 +-
 packages/editor-ui/src/api/ai.ts              |  10 --
 .../src/components/AiImportCurlModal.vue      | 135 --------------
 .../src/components/AiImportParameter.vue      |  34 ----
 .../src/components/ImportCurlModal.vue        | 165 +++++++++++++++---
 .../src/components/ImportParameter.vue        |  24 ++-
 packages/editor-ui/src/components/Modals.vue  |   8 -
 .../editor-ui/src/components/NodeSettings.vue |  53 ++----
 .../src/components/ParameterInputList.vue     |  16 +-
 packages/editor-ui/src/composables/index.ts   |   1 -
 .../src/composables/useImportCurl.ts          | 120 -------------
 packages/editor-ui/src/constants.ts           |   1 -
 .../src/plugins/i18n/locales/en.json          |  12 --
 packages/editor-ui/src/stores/ui.store.ts     |  20 +--
 .../HttpRequest/V3/HttpRequestV3.node.ts      |   6 -
 packages/workflow/src/Interfaces.ts           |   5 +-
 17 files changed, 179 insertions(+), 448 deletions(-)
 delete mode 100644 packages/editor-ui/src/components/AiImportCurlModal.vue
 delete mode 100644 packages/editor-ui/src/components/AiImportParameter.vue
 delete mode 100644 packages/editor-ui/src/composables/useImportCurl.ts

diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index c677d8d61fa69..1faef080b39f9 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -14,15 +14,6 @@ type GenerateCodeRequest = Request<
 	}
 >;
 
-type GenerateCurlRequest = Request<
-	{},
-	{},
-	{
-		prompt: string;
-		service: string;
-	}
->;
-
 @Authorized()
 @RestController('/ai')
 export class AiController {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index d54fa60c4d8af..7e0d39a1f38cb 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1,4 +1,4 @@
-import type { AI_CONNECT_MODAL_KEY, CREDENTIAL_EDIT_MODAL_KEY } from './constants';
+import type { CREDENTIAL_EDIT_MODAL_KEY } from './constants';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { IMenuItem } from 'n8n-design-system';
 import type {
@@ -979,7 +979,6 @@ export interface ITagsState {
 
 export type Modals = {
 	[CREDENTIAL_EDIT_MODAL_KEY]: NewCredentialsModal;
-	[AI_CONNECT_MODAL_KEY]: AiConnectModal;
 	[key: string]: ModalState;
 };
 
@@ -992,11 +991,6 @@ export type ModalState = {
 	httpNodeParameters?: string;
 };
 
-export type AiConnectModal = ModalState & {
-	prompt: string;
-	service: string;
-};
-
 export type NewCredentialsModal = ModalState & {
 	showAuthSelector?: boolean;
 };
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index d1603ca6b8934..a0a9168a5f967 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -11,13 +11,3 @@ export async function generateCodeForPrompt(
 		schema: JSON.stringify(schema),
 	} as IDataObject);
 }
-
-export async function generateCurlCommand(
-	context: IRestApiContext,
-	{ prompt, service }: { prompt: string; service: string },
-): Promise<{ curl: string }> {
-	return makeRestApiRequest(context, 'POST', '/ai/generate-curl', {
-		prompt,
-		service,
-	} as IDataObject);
-}
diff --git a/packages/editor-ui/src/components/AiImportCurlModal.vue b/packages/editor-ui/src/components/AiImportCurlModal.vue
deleted file mode 100644
index 9a1a08f9d7350..0000000000000
--- a/packages/editor-ui/src/components/AiImportCurlModal.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-	<Modal
-		width="700px"
-		:title="$locale.baseText('aiImportCurlModal.title')"
-		:eventBus="modalBus"
-		:name="AI_CONNECT_MODAL_KEY"
-		:center="true"
-	>
-		<template #content>
-			<n8n-notice :class="$style.notice" :content="$locale.baseText('aiImportCurlModal.notice')" />
-			<div :class="$style.container">
-				<n8n-input-label
-					:label="$locale.baseText('aiImportCurlModal.input.service.label')"
-					color="text-dark"
-				>
-					<n8n-input
-						:placeholder="$locale.baseText('aiImportCurlModal.input.service.placeholder')"
-						v-model="service"
-						@focus="$event.target.select()"
-						ref="input"
-					/>
-				</n8n-input-label>
-				<n8n-input-label
-					:label="$locale.baseText('aiImportCurlModal.input.prompt.label')"
-					color="text-dark"
-				>
-					<n8n-input
-						:placeholder="$locale.baseText('aiImportCurlModal.input.prompt.placeholder')"
-						v-model="prompt"
-						@focus="$event.target.select()"
-					/>
-				</n8n-input-label>
-			</div>
-		</template>
-		<template #footer>
-			<div :class="$style.modalFooter">
-				<n8n-button
-					@click="onSubmit"
-					float="right"
-					:disabled="service.length === 0 || prompt.length === 0"
-					:loading="loading"
-					:label="$locale.baseText('aiImportCurlModal.button.label')"
-				/>
-			</div>
-		</template>
-	</Modal>
-</template>
-
-<script setup lang="ts">
-import Modal from '@/components/Modal.vue';
-
-import { onMounted, ref } from 'vue';
-import { useUIStore } from '@/stores/ui.store';
-import { createEventBus } from 'n8n-design-system';
-import { useI18n, useImportCurl, useToast } from '@/composables';
-import { AI_CONNECT_MODAL_KEY } from '@/constants';
-import { useTelemetry } from '@/composables';
-import { useRootStore } from '@/stores';
-import { generateCurlCommand } from '@/api/ai';
-
-const rootStore = useRootStore();
-const uiStore = useUIStore();
-const { i18n } = useI18n();
-const { showError, showToast } = useToast();
-const { track } = useTelemetry();
-const { importCurlCommand } = useImportCurl(track, AI_CONNECT_MODAL_KEY);
-
-const modalBus = createEventBus();
-const loading = ref(false);
-const service = ref('');
-const prompt = ref('');
-
-function closeDialog() {
-	loading.value = false;
-	modalBus.emit('close');
-
-	uiStore.setModalData({
-		name: AI_CONNECT_MODAL_KEY,
-		data: {
-			service: service.value,
-			prompt: prompt.value,
-		},
-	});
-}
-
-async function onSubmit() {
-	loading.value = true;
-
-	try {
-		const { curl } = await generateCurlCommand(rootStore.getRestApiContext, {
-			service: service.value,
-			prompt: prompt.value,
-		});
-
-		if ((await importCurlCommand(curl)) === true) {
-			closeDialog();
-			showToast({
-				type: 'success',
-				title: i18n.baseText('aiImportCurlModal.toast.success.title'),
-				message: i18n.baseText('aiImportCurlModal.toast.success.message'),
-			});
-		}
-	} catch (error) {
-		showError(
-			error,
-			i18n.baseText('aiImportCurlModal.toast.error.title'),
-			i18n.baseText('aiImportCurlModal.toast.error.message'),
-		);
-	}
-}
-
-onMounted(() => {
-	service.value = (uiStore.getModalData(AI_CONNECT_MODAL_KEY)?.service as string) || '';
-	prompt.value = (uiStore.getModalData(AI_CONNECT_MODAL_KEY)?.prompt as string) || '';
-});
-</script>
-
-<style module lang="scss">
-.modalFooter {
-	justify-content: flex-end;
-	display: flex;
-	flex-direction: row;
-}
-
-.notice {
-	margin-top: 0;
-}
-
-.container > * {
-	margin-bottom: var(--spacing-s);
-	&:last-child {
-		margin-bottom: 0;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/AiImportParameter.vue b/packages/editor-ui/src/components/AiImportParameter.vue
deleted file mode 100644
index af375e8627e0c..0000000000000
--- a/packages/editor-ui/src/components/AiImportParameter.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-	<n8n-button
-		type="secondary"
-		:label="$locale.baseText('aiImportParameter.label')"
-		:disabled="isReadOnly"
-		size="mini"
-		@click="onImportCurlClicked"
-	/>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { AI_CONNECT_MODAL_KEY } from '@/constants';
-import { useUIStore } from '@/stores/ui.store';
-import { mapStores } from 'pinia';
-
-export default defineComponent({
-	name: 'ai-import-parameter',
-	props: {
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-	methods: {
-		onImportCurlClicked() {
-			this.uiStore.openModal(AI_CONNECT_MODAL_KEY);
-		},
-	},
-});
-</script>
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 26e7ab5747168..7384559dffad0 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -10,10 +10,11 @@
 			<div :class="$style.container">
 				<n8n-input-label :label="$locale.baseText('importCurlModal.input.label')" color="text-dark">
 					<n8n-input
+						:value="curlCommand"
 						type="textarea"
 						:rows="5"
 						:placeholder="$locale.baseText('importCurlModal.input.placeholder')"
-						v-model="curlCommand"
+						@input="onInput"
 						@focus="$event.target.select()"
 						ref="input"
 					/>
@@ -28,7 +29,7 @@
 				/>
 				<div>
 					<n8n-button
-						@click="onSubmit"
+						@click="importCurlCommand"
 						float="right"
 						:label="$locale.baseText('importCurlModal.button.label')"
 					/>
@@ -38,39 +39,149 @@
 	</Modal>
 </template>
 
-<script setup lang="ts">
+<script lang="ts">
 import Modal from '@/components/Modal.vue';
-
-import { onMounted, ref } from 'vue';
+import {
+	IMPORT_CURL_MODAL_KEY,
+	CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS,
+	CURL_IMPORT_NODES_PROTOCOLS,
+} from '@/constants';
+import { useToast } from '@/composables';
+import { defineComponent } from 'vue';
+import type { INodeUi } from '@/Interface';
+import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
+import { useNDVStore } from '@/stores/ndv.store';
 import { createEventBus } from 'n8n-design-system';
-import { useImportCurl } from '@/composables';
-import { IMPORT_CURL_MODAL_KEY } from '@/constants';
-import { useTelemetry } from '@/composables';
 
-const uiStore = useUIStore();
-const { track } = useTelemetry();
-const { importCurlCommand } = useImportCurl(track, IMPORT_CURL_MODAL_KEY);
+export default defineComponent({
+	name: 'ImportCurlModal',
+	components: {
+		Modal,
+	},
+	setup() {
+		return {
+			...useToast(),
+		};
+	},
+	data() {
+		return {
+			IMPORT_CURL_MODAL_KEY,
+			curlCommand: '',
+			modalBus: createEventBus(),
+		};
+	},
+	computed: {
+		...mapStores(useNDVStore, useUIStore),
+		node(): INodeUi | null {
+			return this.ndvStore.activeNode;
+		},
+	},
+	methods: {
+		closeDialog(): void {
+			this.modalBus.emit('close');
+		},
+		onInput(value: string): void {
+			this.curlCommand = value;
+		},
+		async importCurlCommand(): Promise<void> {
+			const curlCommand = this.curlCommand;
+			if (curlCommand === '') return;
 
-const modalBus = createEventBus();
-const curlCommand = ref('');
-const input = ref();
+			try {
+				const parameters = await this.uiStore.getCurlToJson(curlCommand);
+				const url = parameters['parameters.url'];
 
-function closeDialog() {
-	modalBus.emit('close');
-}
+				const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
+					url.includes(`${p}://`),
+				);
 
-async function onSubmit() {
-	if (await importCurlCommand(curlCommand.value)) {
-		closeDialog();
-	}
-}
+				if (!invalidProtocol) {
+					this.uiStore.setHttpNodeParameters({
+						name: IMPORT_CURL_MODAL_KEY,
+						parameters: JSON.stringify(parameters),
+					});
+
+					this.closeDialog();
+
+					this.sendTelemetry();
+
+					return;
+					// if we have a node that supports the invalid protocol
+					// suggest that one
+				} else if (CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol]) {
+					const useNode = CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol];
+
+					this.showProtocolErrorWithSupportedNode(invalidProtocol, useNode);
+					// we do not have a node that supports the use protocol
+				} else {
+					this.showProtocolError(invalidProtocol);
+				}
+				this.sendTelemetry({ success: false, invalidProtocol: true, protocol: invalidProtocol });
+			} catch (e) {
+				this.showInvalidcURLCommandError();
 
-onMounted(() => {
-	curlCommand.value = uiStore.getCurlCommand(IMPORT_CURL_MODAL_KEY) || '';
-	setTimeout(() => {
-		(input.value as HTMLTextAreaElement)?.focus();
-	});
+				this.sendTelemetry({ success: false, invalidProtocol: false });
+			} finally {
+				this.uiStore.setCurlCommand({ name: IMPORT_CURL_MODAL_KEY, command: this.curlCommand });
+			}
+		},
+		showProtocolErrorWithSupportedNode(protocol: string, node: string): void {
+			this.showToast({
+				title: this.$locale.baseText('importParameter.showError.invalidProtocol1.title', {
+					interpolate: {
+						node,
+					},
+				}),
+				message: this.$locale.baseText('importParameter.showError.invalidProtocol.message', {
+					interpolate: {
+						protocol: protocol.toUpperCase(),
+					},
+				}),
+				type: 'error',
+				duration: 0,
+			});
+		},
+		showProtocolError(protocol: string): void {
+			this.showToast({
+				title: this.$locale.baseText('importParameter.showError.invalidProtocol2.title'),
+				message: this.$locale.baseText('importParameter.showError.invalidProtocol.message', {
+					interpolate: {
+						protocol,
+					},
+				}),
+				type: 'error',
+				duration: 0,
+			});
+		},
+		showInvalidcURLCommandError(): void {
+			this.showToast({
+				title: this.$locale.baseText('importParameter.showError.invalidCurlCommand.title'),
+				message: this.$locale.baseText('importParameter.showError.invalidCurlCommand.message'),
+				type: 'error',
+				duration: 0,
+			});
+		},
+		sendTelemetry(
+			data: { success: boolean; invalidProtocol: boolean; protocol?: string } = {
+				success: true,
+				invalidProtocol: false,
+				protocol: '',
+			},
+		): void {
+			this.$telemetry.track('User imported curl command', {
+				success: data.success,
+				invalidProtocol: data.invalidProtocol,
+				protocol: data.protocol,
+			});
+		},
+	},
+	mounted() {
+		this.curlCommand = this.uiStore.getCurlCommand || '';
+		setTimeout(() => {
+			(this.$refs.input as HTMLTextAreaElement).focus();
+		});
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ImportParameter.vue b/packages/editor-ui/src/components/ImportParameter.vue
index d51880f76a67a..3f9448765fb63 100644
--- a/packages/editor-ui/src/components/ImportParameter.vue
+++ b/packages/editor-ui/src/components/ImportParameter.vue
@@ -1,11 +1,13 @@
 <template>
-	<n8n-button
-		type="secondary"
-		:label="$locale.baseText('importParameter.label')"
-		:disabled="isReadOnly"
-		size="mini"
-		@click="onImportCurlClicked"
-	/>
+	<div :class="$style.importSection">
+		<n8n-button
+			type="secondary"
+			:label="$locale.baseText('importParameter.label')"
+			:disabled="isReadOnly"
+			size="mini"
+			@click="onImportCurlClicked"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
@@ -32,3 +34,11 @@ export default defineComponent({
 	},
 });
 </script>
+
+<style module lang="scss">
+.importSection {
+	display: flex;
+	flex-direction: row-reverse;
+	margin-top: 10px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 4dc61750807a7..3746992e6bf1e 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -91,10 +91,6 @@
 			<ImportCurlModal />
 		</ModalRoot>
 
-		<ModalRoot :name="AI_CONNECT_MODAL_KEY">
-			<AiImportCurlModal />
-		</ModalRoot>
-
 		<ModalRoot :name="COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY">
 			<template #default="{ modalName, activeId, mode }">
 				<CommunityPackageManageConfirmModal
@@ -153,7 +149,6 @@ import {
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 	IMPORT_CURL_MODAL_KEY,
-	AI_CONNECT_MODAL_KEY,
 	LOG_STREAM_MODAL_KEY,
 	ASK_AI_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
@@ -181,7 +176,6 @@ import DeleteUserModal from './DeleteUserModal.vue';
 import ExecutionsModal from './ExecutionsModal.vue';
 import ActivationModal from './ActivationModal.vue';
 import ImportCurlModal from './ImportCurlModal.vue';
-import AiImportCurlModal from './AiImportCurlModal.vue';
 import WorkflowShareModal from './WorkflowShareModal.ee.vue';
 import EventDestinationSettingsModal from '@/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue';
 import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
@@ -215,7 +209,6 @@ export default defineComponent({
 		EventDestinationSettingsModal,
 		SourceControlPushModal,
 		SourceControlPullModal,
-		AiImportCurlModal,
 	},
 	data: () => ({
 		COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
@@ -239,7 +232,6 @@ export default defineComponent({
 		EXECUTIONS_MODAL_KEY,
 		WORKFLOW_ACTIVE_MODAL_KEY,
 		IMPORT_CURL_MODAL_KEY,
-		AI_CONNECT_MODAL_KEY,
 		LOG_STREAM_MODAL_KEY,
 		SOURCE_CONTROL_PUSH_MODAL_KEY,
 		SOURCE_CONTROL_PULL_MODAL_KEY,
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 8962cc4d16dea..feb7d0809c8c1 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -100,27 +100,15 @@
 					@activate="onWorkflowActivate"
 					@parameterBlur="onParameterBlur"
 				>
-					<template>
-						<div
-							:class="$style.parametersControls"
-							v-if="
-								nodeTypeName === 'n8n-nodes-base.httpRequest' &&
-								(ndvStore.activeNode?.typeVersion || 1) >= 3
-							"
-						>
-							<ai-import-parameter :isReadOnly="isReadOnly" @valueChanged="valueChanged" />
-							<import-parameter :isReadOnly="isReadOnly" @valueChanged="valueChanged" />
-						</div>
-						<node-credentials
-							:node="node"
-							:readonly="isReadOnly"
-							:showAll="true"
-							@credentialSelected="credentialSelected"
-							@valueChanged="valueChanged"
-							@blur="onParameterBlur"
-							:hide-issues="hiddenIssuesInputs.includes('credentials')"
-						/>
-					</template>
+					<node-credentials
+						:node="node"
+						:readonly="isReadOnly"
+						:showAll="true"
+						@credentialSelected="credentialSelected"
+						@valueChanged="valueChanged"
+						@blur="onParameterBlur"
+						:hide-issues="hiddenIssuesInputs.includes('credentials')"
+					/>
 				</parameter-input-list>
 				<div v-if="parametersNoneSetting.length === 0" class="no-parameters">
 					<n8n-text>
@@ -191,16 +179,12 @@ import {
 	CUSTOM_NODES_DOCS_URL,
 	MAIN_NODE_PANEL_WIDTH,
 	IMPORT_CURL_MODAL_KEY,
-	AI_CONNECT_MODAL_KEY,
 } from '@/constants';
 
 import NodeTitle from '@/components/NodeTitle.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
 import NodeCredentials from '@/components/NodeCredentials.vue';
 import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
-import ImportParameter from '@/components/ImportParameter.vue';
-import AiImportParameter from '@/components/AiImportParameter.vue';
-
 import NodeWebhooks from '@/components/NodeWebhooks.vue';
 import { get, set, unset } from 'lodash-es';
 
@@ -229,8 +213,6 @@ export default defineComponent({
 		NodeSettingsTabs,
 		NodeWebhooks,
 		NodeExecuteButton,
-		ImportParameter,
-		AiImportParameter,
 	},
 	computed: {
 		...mapStores(
@@ -243,10 +225,7 @@ export default defineComponent({
 			useWorkflowsEEStore,
 		),
 		isCurlImportModalOpen(): boolean {
-			return (
-				this.uiStore.isModalOpen(IMPORT_CURL_MODAL_KEY) ||
-				this.uiStore.isModalOpen(AI_CONNECT_MODAL_KEY)
-			);
+			return this.uiStore.isModalOpen(IMPORT_CURL_MODAL_KEY);
 		},
 		isReadOnly(): boolean {
 			return this.readOnly || this.hasForeignCredential;
@@ -486,10 +465,7 @@ export default defineComponent({
 		},
 		isCurlImportModalOpen(newValue, oldValue) {
 			if (newValue === false) {
-				let parameters =
-					this.uiStore.getHttpNodeParameters(IMPORT_CURL_MODAL_KEY) ||
-					this.uiStore.getHttpNodeParameters(AI_CONNECT_MODAL_KEY) ||
-					'';
+				let parameters = this.uiStore.getHttpNodeParameters || '';
 
 				if (!parameters) return;
 
@@ -507,7 +483,6 @@ export default defineComponent({
 					});
 
 					this.uiStore.setHttpNodeParameters({ name: IMPORT_CURL_MODAL_KEY, parameters: '' });
-					this.uiStore.setHttpNodeParameters({ name: AI_CONNECT_MODAL_KEY, parameters: '' });
 				} catch {}
 			}
 		},
@@ -997,12 +972,6 @@ export default defineComponent({
 	display: flex;
 	flex-direction: column;
 }
-.parametersControls {
-	display: flex;
-	justify-content: flex-end;
-	gap: var(--spacing-xs);
-	margin-top: var(--spacing-xs);
-}
 </style>
 
 <style lang="scss">
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 452ee53604e5a..6aa377f7372be 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -22,13 +22,16 @@
 				/>
 			</div>
 
-			<!-- Prevent rendering of import buttons as individual parameters -->
-			<template
+			<import-parameter
 				v-else-if="
-					['curlImport', 'aiImport'].includes(parameter.type) &&
-					nodeTypeName === 'n8n-nodes-base.httpRequest'
+					parameter.type === 'curlImport' &&
+					nodeTypeName === 'n8n-nodes-base.httpRequest' &&
+					nodeTypeVersion >= 3
 				"
+				:isReadOnly="isReadOnly"
+				@valueChanged="valueChanged"
 			/>
+
 			<n8n-notice
 				v-else-if="parameter.type === 'notice'"
 				class="parameter-item"
@@ -140,7 +143,6 @@ import MultipleParameter from '@/components/MultipleParameter.vue';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ImportParameter from '@/components/ImportParameter.vue';
-import AiImportParameter from '@/components/AiImportParameter.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import { get, set } from 'lodash-es';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -157,7 +159,6 @@ export default defineComponent({
 		FixedCollectionParameter: async () => import('./FixedCollectionParameter.vue'),
 		CollectionParameter: async () => import('./CollectionParameter.vue'),
 		ImportParameter,
-		AiImportParameter,
 		ResourceMapper,
 	},
 	props: {
@@ -466,9 +467,6 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.inline-parameter {
-	display: inline-block;
-}
 .parameter-input-list-wrapper {
 	.delete-option {
 		display: none;
diff --git a/packages/editor-ui/src/composables/index.ts b/packages/editor-ui/src/composables/index.ts
index 5c82715936d8a..042d79f7b7ec2 100644
--- a/packages/editor-ui/src/composables/index.ts
+++ b/packages/editor-ui/src/composables/index.ts
@@ -13,4 +13,3 @@ export * from './useTitleChange';
 export * from './useToast';
 export * from './useNodeSpecificationValues';
 export * from './useDataSchema';
-export * from './useImportCurl';
diff --git a/packages/editor-ui/src/composables/useImportCurl.ts b/packages/editor-ui/src/composables/useImportCurl.ts
deleted file mode 100644
index d4d1540a995c9..0000000000000
--- a/packages/editor-ui/src/composables/useImportCurl.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS, CURL_IMPORT_NODES_PROTOCOLS } from '@/constants';
-
-import { useI18n } from './useI18n';
-import { useToast } from './useToast';
-import { useUIStore } from '@/stores/ui.store';
-import type { ITelemetryTrackProperties } from 'n8n-workflow';
-
-export function useImportCurl(
-	track: (event: string, data?: ITelemetryTrackProperties) => void,
-	modalKey: string,
-) {
-	const uiStore = useUIStore();
-	const { showToast } = useToast();
-	const { i18n } = useI18n();
-
-	async function importCurlCommand(curlCommand: string): Promise<boolean> {
-		console.log('🚀 ~ file: useImportCurl.ts:18 ~ importCurlCommand ~ curlCommand:', curlCommand);
-		if (curlCommand === '') return false;
-
-		try {
-			const parameters = await uiStore.getCurlToJson(curlCommand);
-			console.log('🚀 ~ file: useImportCurl.ts:23 ~ importCurlCommand ~ parameters:', parameters);
-			const url = parameters['parameters.url'];
-
-			const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
-				url.includes(`${p}://`),
-			);
-
-			if (!invalidProtocol) {
-				uiStore.setHttpNodeParameters({
-					name: modalKey,
-					parameters: JSON.stringify(parameters),
-				});
-
-				// this.closeDialog();
-
-				sendTelemetry();
-
-				return true;
-				// if we have a node that supports the invalid protocol
-				// suggest that one
-			} else if (CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol]) {
-				const useNode = CURL_IMPORT_NODES_PROTOCOLS[invalidProtocol];
-
-				showProtocolErrorWithSupportedNode(invalidProtocol, useNode);
-				// we do not have a node that supports the use protocol
-			} else {
-				showProtocolError(invalidProtocol);
-			}
-			sendTelemetry({ success: false, invalidProtocol: true, protocol: invalidProtocol });
-		} catch (e) {
-			console.log('🚀 ~ file: useImportCurl.ts:52 ~ importCurlCommand ~ e:', e);
-			showInvalidcURLCommandError();
-
-			sendTelemetry({ success: false, invalidProtocol: false });
-			return false;
-		} finally {
-			uiStore.setCurlCommand({ name: modalKey, command: curlCommand });
-			return true;
-		}
-	}
-
-	function showProtocolErrorWithSupportedNode(protocol: string, node: string): void {
-		showToast({
-			title: i18n.baseText('importParameter.showError.invalidProtocol1.title', {
-				interpolate: {
-					node,
-				},
-			}),
-			message: i18n.baseText('importParameter.showError.invalidProtocol.message', {
-				interpolate: {
-					protocol: protocol.toUpperCase(),
-				},
-			}),
-			type: 'error',
-			duration: 0,
-		});
-	}
-
-	function showProtocolError(protocol: string): void {
-		showToast({
-			title: i18n.baseText('importParameter.showError.invalidProtocol2.title'),
-			message: i18n.baseText('importParameter.showError.invalidProtocol.message', {
-				interpolate: {
-					protocol,
-				},
-			}),
-			type: 'error',
-			duration: 0,
-		});
-	}
-
-	function showInvalidcURLCommandError(): void {
-		showToast({
-			title: i18n.baseText('importParameter.showError.invalidCurlCommand.title'),
-			message: i18n.baseText('importParameter.showError.invalidCurlCommand.message'),
-			type: 'error',
-			duration: 0,
-		});
-	}
-
-	function sendTelemetry(
-		data: { success: boolean; invalidProtocol: boolean; protocol?: string } = {
-			success: true,
-			invalidProtocol: false,
-			protocol: '',
-		},
-	): void {
-		// TODO: Fix this
-		// track('User imported curl command', {
-		// 	success: data.success,
-		// 	invalidProtocol: data.invalidProtocol,
-		// 	protocol: data.protocol,
-		// });
-	}
-
-	return {
-		importCurlCommand,
-	};
-}
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index dcc6d1c6262f7..8934dd179cb00 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -46,7 +46,6 @@ export const ONBOARDING_CALL_SIGNUP_MODAL_KEY = 'onboardingCallSignup';
 export const COMMUNITY_PACKAGE_INSTALL_MODAL_KEY = 'communityPackageInstall';
 export const COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY = 'communityPackageManageConfirm';
 export const IMPORT_CURL_MODAL_KEY = 'importCurl';
-export const AI_CONNECT_MODAL_KEY = 'aiImport';
 export const LOG_STREAM_MODAL_KEY = 'settingsLogStream';
 
 export const SOURCE_CONTROL_PUSH_MODAL_KEY = 'sourceControlPush';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index fe0fddbda4207..bc36330185d26 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1724,19 +1724,7 @@
 	"importCurlModal.input.placeholder": "Paste the cURL command here",
 	"ImportCurlModal.notice.content": "This will overwrite any changes you have already made",
 	"importCurlModal.button.label": "Import",
-	"aiImportCurlModal.title": "AI Connect",
-	"aiImportCurlModal.notice": "Our AI Connect feature has a knowledge cutoff in September 2021",
-	"aiImportCurlModal.input.service.label": "To which service do you want to connect to?",
-	"aiImportCurlModal.input.service.placeholder": "E.g. Slack",
-	"aiImportCurlModal.input.prompt.label": "What do you want to do?",
-	"aiImportCurlModal.input.prompt.placeholder": "E.g. I want to send a message to the #updates channel",
-	"aiImportCurlModal.button.label": "Connect",
-	"aiImportCurlModal.toast.success.title": "Successfully generated connection data",
-	"aiImportCurlModal.toast.success.message": "Please check the node editor for the generated data, make sure to use the correct credentials",
-	"aiImportCurlModal.toast.error.title": "Couldn’t generate connection data",
-	"aiImportCurlModal.toast.error.message": "Please modify your prompt and try again",
 	"importParameter.label": "Import cURL",
-	"aiImportParameter.label": "AI Connect (BETA)",
 	"importParameter.showError.invalidCurlCommand.title": "Couldn’t import cURL command",
 	"importParameter.showError.invalidCurlCommand.message": "This command is in an unsupported format",
 	"importParameter.showError.invalidProtocol1.title": "Use the {node} node",
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index d43aa6e3e4237..3a6cda482d2dc 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -32,7 +32,6 @@ import {
 	WORKFLOW_SHARE_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
 	SOURCE_CONTROL_PULL_MODAL_KEY,
-	AI_CONNECT_MODAL_KEY,
 } from '@/constants';
 import type {
 	CloudUpdateLinkSourceType,
@@ -130,13 +129,6 @@ export const useUIStore = defineStore(STORES.UI, {
 				curlCommand: '',
 				httpNodeParameters: '',
 			},
-			[AI_CONNECT_MODAL_KEY]: {
-				open: false,
-				curlCommand: '',
-				httpNodeParameters: '',
-				prompt: '',
-				service: '',
-			},
 			[LOG_STREAM_MODAL_KEY]: {
 				open: false,
 				data: undefined,
@@ -268,11 +260,11 @@ export const useUIStore = defineStore(STORES.UI, {
 			}
 			return null;
 		},
-		getCurlCommand() {
-			return (modalKey: string) => this.modals[modalKey].curlCommand;
+		getCurlCommand(): string | undefined {
+			return this.modals[IMPORT_CURL_MODAL_KEY].curlCommand;
 		},
-		getHttpNodeParameters() {
-			return (modalKey: string) => this.modals[modalKey].httpNodeParameters;
+		getHttpNodeParameters(): string | undefined {
+			return this.modals[IMPORT_CURL_MODAL_KEY].httpNodeParameters;
 		},
 		areExpressionsDisabled(): boolean {
 			return this.currentView === VIEWS.DEMO;
@@ -383,10 +375,6 @@ export const useUIStore = defineStore(STORES.UI, {
 			} as NewCredentialsModal;
 		},
 		setModalData(payload: { name: keyof Modals; data: Record<string, unknown> }) {
-			console.log(
-				'🚀 ~ file: ui.store.ts:387 ~ setModalData ~ this.modals[payload.name]:',
-				this.modals[payload.name],
-			);
 			this.modals[payload.name] = {
 				...this.modals[payload.name],
 				data: payload.data,
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 0fee3bfa6c8b6..691344ee7db6e 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -63,12 +63,6 @@ export class HttpRequestV3 implements INodeType {
 					type: 'curlImport',
 					default: '',
 				},
-				{
-					displayName: '',
-					name: 'aiImport',
-					type: 'aiImport',
-					default: '',
-				},
 				{
 					displayName: 'Method',
 					name: 'method',
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index e5c53155648ca..83e50466359ca 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1020,7 +1020,6 @@ export type NodePropertyTypes =
 	| 'credentialsSelect'
 	| 'resourceLocator'
 	| 'curlImport'
-	| 'aiImport'
 	| 'resourceMapper';
 
 export type CodeAutocompleteTypes = 'function' | 'functionItem';
@@ -2012,6 +2011,7 @@ export interface ResourceMapperField {
 	type?: FieldType;
 	removed?: boolean;
 	options?: INodePropertyOptions[];
+	readOnly?: boolean;
 }
 
 export type FieldType =
@@ -2166,9 +2166,6 @@ export interface IN8nUISettings {
 	banners: {
 		dismissed: string[];
 	};
-	ai: {
-		enabled: boolean;
-	};
 }
 
 export type Banners = 'V1' | 'TRIAL_OVER' | 'TRIAL';

From 88628a7ce69a3acc088017edb1156d128ea5deea Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Wed, 26 Jul 2023 09:43:48 +0200
Subject: [PATCH 007/116] Move loading phrases to locale, add support for ask
 ai experiment

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/cli/src/controllers/ai.controller.ts | 21 ++++++----
 packages/editor-ui/src/api/ai.ts              |  3 +-
 .../src/components/CodeNodeEditor/AskAI.vue   | 42 +++++++++----------
 .../CodeNodeEditor/CodeNodeEditor.vue         | 12 ++++--
 packages/editor-ui/src/constants.ts           | 13 +++++-
 .../src/plugins/i18n/locales/en.json          |  8 ++++
 6 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index 1faef080b39f9..743b65754912e 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -1,6 +1,6 @@
 import type { Request } from 'express';
 import { Authorized, Post, RestController } from '@/decorators';
-import type { IDataObject, ILogger } from 'n8n-workflow';
+import type { CodeExecutionMode, IDataObject, ILogger } from 'n8n-workflow';
 import { Script } from 'vm';
 import config from '@/config';
 import axios from 'axios';
@@ -10,10 +10,16 @@ type GenerateCodeRequest = Request<
 	{},
 	{
 		prompt: string;
+		model: 'gpt-3.5-turbo-16k' | 'gpt-4';
 		schema: IDataObject;
 	}
 >;
 
+type GenerateCodeResponse = {
+	code: string;
+	mode: CodeExecutionMode;
+};
+
 @Authorized()
 @RestController('/ai')
 export class AiController {
@@ -32,28 +38,27 @@ export class AiController {
 	@Post('/generate-code')
 	async generatePrompt(req: GenerateCodeRequest) {
 		console.log('Received: ', req.body.prompt, req.body.schema);
-		const { prompt, schema } = req.body;
+		const { prompt, schema, model } = req.body;
 
 		try {
-			const resp = await axios({
+			const response: { data: GenerateCodeResponse } = await axios({
 				method: 'post',
-				url: this.endpoint,
+				url: this.endpoint + '/generate-code',
 				data: {
 					prompt,
+					model,
 					schema,
 				},
 				headers: {
 					authorization: this.authorization,
 				},
 			});
+			const { code, mode } = response.data;
 
-			const code = (resp.data as { code: string }).code;
-			const mode = (resp.data as { mode: string }).mode;
-
+			// TODO: Validate the generated code and retry if invalid?
 			return {
 				code,
 				mode,
-				isValid: this.validateGeneratedCode(code),
 			};
 		} catch (error) {
 			throw new Error(`Failed to generate code: ${error}`);
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index a0a9168a5f967..71a24f4e93148 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -4,10 +4,11 @@ import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
 
 export async function generateCodeForPrompt(
 	context: IRestApiContext,
-	{ prompt, schema }: { prompt: string; schema: IDataObject },
+	{ prompt, schema, model }: { prompt: string; schema: IDataObject; model: string },
 ): Promise<{ code: string; mode: CodeExecutionMode }> {
 	return makeRestApiRequest(context, 'POST', '/ai/generate-code', {
 		prompt,
 		schema: JSON.stringify(schema),
+		model,
 	} as IDataObject);
 }
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 8ba96975a88fc..815ece755b0da 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,47 +1,48 @@
 <script setup lang="ts">
 import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { ref, defineEmits, computed } from 'vue';
-import { useDataSchema } from '@/composables';
+import { useDataSchema, useI18n } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
-import { useNDVStore, useRootStore } from '@/stores';
+import { useNDVStore, usePostHog, useRootStore } from '@/stores';
 import CircleLoader from './CircleLoader.vue';
+import { ASK_AI_EXPERIMENT } from '@/constants';
 
 const emit = defineEmits<{
 	submit: (code: string) => void;
 }>();
 const { getWorkflowSchema, getSchemaForExecutionData } = useDataSchema();
+const { i18n } = useI18n();
 const maxLength = 600;
 const loadingDurationMs = 10000;
-const loadingPhrase = ref([
-	'AI cogs whirring, almost there…',
-	'up up down down left right b a start…',
-	'Consulting Jan Oberhauser…',
-	'Gathering bytes and pieces…',
-	'Checking if another AI knows the answer…',
-	'Checking on Stack Overflow…',
-	'Crunching data, AI-style…',
-	'Stand by, AI magic at work…',
-]);
+
 const loadingPhraseIndex = ref(0);
 const loaderProgress = ref(0);
 
 const isLoading = ref(false);
 const prompt = ref('');
 
-const hasExecutionData = computed(() => useNDVStore().ndvInputData.length > 0);
+const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
+const loadingString = computed(() =>
+	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}`),
+);
 async function onSubmit() {
 	startLoading();
 	const schema = getWorkflowSchema();
 
 	try {
 		const { ndvInputData } = useNDVStore();
+		const model =
+			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
+				? 'gpt-4'
+				: 'gpt-3.5-turbo-16k';
 
 		const { getRestApiContext } = useRootStore();
 		const { code, mode } = await generateCodeForPrompt(getRestApiContext, {
 			prompt: prompt.value,
 			schema,
+			model,
 		});
-		// await new Promise((resolve) => setTimeout(resolve, 3000));
+
 		stopLoading();
 		emit('replaceCode', { code, mode });
 	} catch (error) {
@@ -58,7 +59,7 @@ function triggerLoadingPhraseChange() {
 		if (!start) start = timestamp;
 
 		if (!lastPhraseChange || timestamp - lastPhraseChange >= 2000) {
-			loadingPhraseIndex.value = Math.floor(Math.random() * loadingPhrase.value.length);
+			loadingPhraseIndex.value = Math.floor(Math.random() * 8);
 			lastPhraseChange = timestamp;
 		}
 
@@ -137,21 +138,18 @@ function stopLoading() {
 		<div :class="$style.controls">
 			<div :class="$style.loader" v-if="isLoading">
 				<transition name="text-fade-in-out" mode="out-in">
-					<div v-text="loadingPhrase[loadingPhraseIndex]" :key="loadingPhraseIndex" />
+					<div v-text="loadingString" :key="loadingPhraseIndex" />
 				</transition>
 				<CircleLoader :radius="8" :progress="loaderProgress" :stroke-width="3" />
 			</div>
-			<n8n-tooltip>
+			<n8n-tooltip :disabled="hasExecutionData" v-else>
 				<div>
 					<N8nButton :disabled="!hasExecutionData || !prompt" @click="onSubmit">{{
 						$locale.baseText('codeNodeEditor.askAi.generateCode')
 					}}</N8nButton>
 				</div>
-				<template #content>
-					<span
-						v-if="!hasExecutionData"
-						v-text="$locale.baseText('codeNodeEditor.askAi.noInputData')"
-					/>
+				<template #content v-if="!hasExecutionData">
+					<span v-text="$locale.baseText('codeNodeEditor.askAi.noInputData')" />
 				</template>
 			</n8n-tooltip>
 		</div>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index e43d81e702b9e..31e9a5b6e431d 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -41,9 +41,9 @@ import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import { CODE_EXECUTION_MODES, CODE_LANGUAGES } from 'n8n-workflow';
 
 import { workflowHelpers } from '@/mixins/workflowHelpers'; // for json field completions
-import { ASK_AI_MODAL_KEY, CODE_NODE_TYPE } from '@/constants';
+import { ASK_AI_EXPERIMENT, ASK_AI_MODAL_KEY, CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
-import { useRootStore } from '@/stores/n8nRoot.store';
+import { useRootStore, usePostHog } from '@/stores';
 
 import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
 import { CODE_PLACEHOLDERS } from './constants';
@@ -112,14 +112,18 @@ export default defineComponent({
 		},
 	},
 	computed: {
-		...mapStores(useRootStore),
+		...mapStores(useRootStore, usePostHog),
 		content(): string {
 			if (!this.editor) return '';
 
 			return this.editor.state.doc.toString();
 		},
 		aiEnabled(): boolean {
-			return this.settingsStore.settings.ai.enabled === true;
+			const isAiExperimentDisabled = this.posthogStore.isVariantEnabled(
+				ASK_AI_EXPERIMENT.name,
+				ASK_AI_EXPERIMENT.control,
+			);
+			return !isAiExperimentDisabled && this.settingsStore.settings.ai.enabled === true;
 		},
 		placeholder(): string {
 			return CODE_PLACEHOLDERS[this.language]?.[this.mode] ?? '';
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 8934dd179cb00..85a0369adfbdf 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -539,7 +539,18 @@ export const ONBOARDING_EXPERIMENT = {
 	variant: 'variant',
 };
 
-export const EXPERIMENTS_TO_TRACK = [TEMPLATES_EXPERIMENT.name, ONBOARDING_EXPERIMENT.name];
+export const ASK_AI_EXPERIMENT = {
+	name: '011_ask_AI',
+	control: 'control',
+	gpt3: 'gpt3',
+	gpt4: 'gpt4',
+};
+
+export const EXPERIMENTS_TO_TRACK = [
+	TEMPLATES_EXPERIMENT.name,
+	ONBOARDING_EXPERIMENT.name,
+	ASK_AI_EXPERIMENT.name,
+];
 
 export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [FILTER_NODE_TYPE];
 
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index bc36330185d26..395ca54776318 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -280,6 +280,14 @@
 	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
 	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",
 	"codeNodeEditor.askAi.areYouSureToReplace": "Are you sure you want to generate new code? Your current code will be replaced.",
+	"codeNodeEditor.askAi.loadingPhrase0": "AI cogs whirring, almost there…",
+	"codeNodeEditor.askAi.loadingPhrase1": "up up down down left right b a start…",
+	"codeNodeEditor.askAi.loadingPhrase2": "Consulting Jan Oberhauser…",
+	"codeNodeEditor.askAi.loadingPhrase3": "Gathering bytes and pieces…",
+	"codeNodeEditor.askAi.loadingPhrase4": "Checking if another AI knows the answer…",
+	"codeNodeEditor.askAi.loadingPhrase5": "Checking on Stack Overflow…",
+	"codeNodeEditor.askAi.loadingPhrase6": "Crunching data, AI-style…",
+	"codeNodeEditor.askAi.loadingPhrase7": "Stand by, AI magic at work…",
 	"codeNodeEditor.tabs.askAi": "✨ Ask AI",
 	"codeNodeEditor.tabs.code": "Code",
 	"collectionParameter.choose": "Choose...",

From 6215d97e445b890bebabb5210dde76c1ca478a33 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Wed, 26 Jul 2023 09:49:53 +0200
Subject: [PATCH 008/116] fix build

---
 packages/workflow/src/Interfaces.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 83e50466359ca..bf1d463cdd5a6 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2166,6 +2166,9 @@ export interface IN8nUISettings {
 	banners: {
 		dismissed: string[];
 	};
+	ai: {
+		enabled: boolean;
+	};
 }
 
 export type Banners = 'V1' | 'TRIAL_OVER' | 'TRIAL';

From 96bd0d4d76ad0664fad60327db6bfaca05a21ddd Mon Sep 17 00:00:00 2001
From: ricardo <ricardoespinoza105@gmail.com>
Date: Tue, 1 Aug 2023 12:11:47 -0400
Subject: [PATCH 009/116] adjust communication

---
 packages/cli/src/Server.ts                    |  5 --
 packages/cli/src/config/schema.ts             |  2 +-
 packages/cli/src/controllers/ai.controller.ts | 80 -------------------
 packages/cli/src/controllers/index.ts         |  1 -
 packages/editor-ui/src/api/ai.ts              | 16 ++--
 .../src/components/CodeNodeEditor/AskAI.vue   | 10 ++-
 6 files changed, 18 insertions(+), 96 deletions(-)
 delete mode 100644 packages/cli/src/controllers/ai.controller.ts

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 00735439e28f8..1913b594a8f27 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -97,7 +97,6 @@ import {
 	TagsController,
 	TranslationController,
 	UsersController,
-	AiController,
 } from '@/controllers';
 
 import { executionsController } from '@/executions/executions.controller';
@@ -503,10 +502,6 @@ export class Server extends AbstractServer {
 			Container.get(SourceControlController),
 		];
 
-		if (config.getEnv('ai.enabled')) {
-			controllers.push(new AiController({ logger }));
-		}
-
 		if (isLdapEnabled()) {
 			const { service, sync } = LdapManager.getInstance();
 			controllers.push(new LdapController(service, sync, internalHooks));
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 1fb7d943e56ea..1dba9c82c02b7 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1100,7 +1100,7 @@ export const schema = {
 		enabled: {
 			doc: 'Whether AI features are enabled.',
 			format: Boolean,
-			default: false,
+			default: true,
 			env: 'N8N_AI_ENABLED',
 		},
 		endpoint: {
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
deleted file mode 100644
index 743b65754912e..0000000000000
--- a/packages/cli/src/controllers/ai.controller.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import type { Request } from 'express';
-import { Authorized, Post, RestController } from '@/decorators';
-import type { CodeExecutionMode, IDataObject, ILogger } from 'n8n-workflow';
-import { Script } from 'vm';
-import config from '@/config';
-import axios from 'axios';
-
-type GenerateCodeRequest = Request<
-	{},
-	{},
-	{
-		prompt: string;
-		model: 'gpt-3.5-turbo-16k' | 'gpt-4';
-		schema: IDataObject;
-	}
->;
-
-type GenerateCodeResponse = {
-	code: string;
-	mode: CodeExecutionMode;
-};
-
-@Authorized()
-@RestController('/ai')
-export class AiController {
-	private readonly logger: ILogger;
-
-	private readonly endpoint: string;
-
-	private readonly authorization: string;
-
-	constructor({ logger }: { logger: ILogger }) {
-		this.logger = logger;
-		this.authorization = config.getEnv('ai.authorization');
-		this.endpoint = config.getEnv('ai.endpoint');
-	}
-
-	@Post('/generate-code')
-	async generatePrompt(req: GenerateCodeRequest) {
-		console.log('Received: ', req.body.prompt, req.body.schema);
-		const { prompt, schema, model } = req.body;
-
-		try {
-			const response: { data: GenerateCodeResponse } = await axios({
-				method: 'post',
-				url: this.endpoint + '/generate-code',
-				data: {
-					prompt,
-					model,
-					schema,
-				},
-				headers: {
-					authorization: this.authorization,
-				},
-			});
-			const { code, mode } = response.data;
-
-			// TODO: Validate the generated code and retry if invalid?
-			return {
-				code,
-				mode,
-			};
-		} catch (error) {
-			throw new Error(`Failed to generate code: ${error}`);
-		}
-	}
-
-	// Validates the generated code by setting it up in a sandbox
-	// this doesn't execute it, just checks if it's valid
-	validateGeneratedCode(code: string) {
-		try {
-			new Script(code);
-
-			return true;
-		} catch (error) {
-			this.logger.error(`Generated code is invalid: ${error}`);
-			return false;
-		}
-	}
-}
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
index b7d89731d3ec4..04b46af5f13df 100644
--- a/packages/cli/src/controllers/index.ts
+++ b/packages/cli/src/controllers/index.ts
@@ -8,4 +8,3 @@ export { PasswordResetController } from './passwordReset.controller';
 export { TagsController } from './tags.controller';
 export { TranslationController } from './translation.controller';
 export { UsersController } from './users.controller';
-export { AiController } from './ai.controller';
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index 71a24f4e93148..b0ef718c06070 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -3,12 +3,18 @@ import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
 
 export async function generateCodeForPrompt(
-	context: IRestApiContext,
-	{ prompt, schema, model }: { prompt: string; schema: IDataObject; model: string },
+	ctx: IRestApiContext,
+	{
+		question,
+		context,
+		model,
+		n8nVersion,
+	}: { question: string; context: { schema: IDataObject }; model: string; n8nVersion: string },
 ): Promise<{ code: string; mode: CodeExecutionMode }> {
-	return makeRestApiRequest(context, 'POST', '/ai/generate-code', {
-		prompt,
-		schema: JSON.stringify(schema),
+	return makeRestApiRequest(ctx, 'POST', '/ask-ai', {
+		question,
+		context,
 		model,
+		n8nVersion,
 	} as IDataObject);
 }
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 815ece755b0da..10a76c9e3d63f 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -31,20 +31,22 @@ async function onSubmit() {
 
 	try {
 		const { ndvInputData } = useNDVStore();
+		const version = useRootStore().versionCli;
 		const model =
 			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
 				? 'gpt-4'
 				: 'gpt-3.5-turbo-16k';
 
 		const { getRestApiContext } = useRootStore();
-		const { code, mode } = await generateCodeForPrompt(getRestApiContext, {
-			prompt: prompt.value,
-			schema,
+		const { code } = await generateCodeForPrompt(getRestApiContext, {
+			question: prompt.value,
+			context: { schema },
 			model,
+			n8nVersion: version,
 		});
 
 		stopLoading();
-		emit('replaceCode', { code, mode });
+		emit('replaceCode', { code });
 	} catch (error) {
 		console.log('Failed to generate code', error);
 		stopLoading();

From 334121725ae4d336a20aebcddc8391c45d5e615d Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Mon, 17 Jul 2023 17:03:27 +0300
Subject: [PATCH 010/116] fix: Remove duplicate source control preferences
 fetching (no-changelog) (#6675)

fix: remove duplicate source control preferences fetching (no-changelog)
---
 packages/editor-ui/src/App.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index e5ed5fa0ed3fc..f61cefc2765da 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -257,9 +257,6 @@ export default defineComponent({
 		await this.checkForCloudPlanData();
 		await this.initBanners();
 
-		if (this.sourceControlStore.isEnterpriseSourceControlEnabled) {
-			await this.sourceControlStore.getPreferences();
-		}
 		void this.checkForCloudPlanData();
 		void this.postAuthenticate();
 

From 535dc9779aa7254e11cc26ff5430cc3570eaea41 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 17 Jul 2023 17:07:28 +0200
Subject: [PATCH 011/116] fix(Slack Node): Add UTM params to n8n reference in
 Slack message (no-changelog) (#6668)

fix(Slack Node): Add UTM params to n8n reference in Slack message
---
 packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index a556713c66467..2a22d54d08d2b 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -143,7 +143,7 @@ export function getMessageContent(
 	) as IDataObject;
 
 	const { id } = this.getWorkflow();
-	const automatedMessage = `_Automated with this <${this.getInstanceBaseUrl()}workflow/${id}|n8n workflow>_`;
+	const automatedMessage = `_Automated with this <${this.getInstanceBaseUrl()}workflow/${id}?utm_source=n8n&utm_medium=slackNode|n8n workflow>_`;
 	const messageType = this.getNodeParameter('messageType', i) as string;
 
 	let content: IDataObject = {};

From 67752a61af4ec98fd2c0d8dc40e2dce5a815ee26 Mon Sep 17 00:00:00 2001
From: Romain Dunand <romain@1-more-thing.com>
Date: Mon, 17 Jul 2023 18:05:28 +0200
Subject: [PATCH 012/116] fix(FileMaker Node): Improve returned error responses
 (#6585)

---
 .../nodes/FileMaker/FileMaker.node.ts         |  10 +++---
 .../nodes/FileMaker/GenericFunctions.ts       |  34 +++++++-----------
 .../nodes-base/nodes/FileMaker/filemaker.png  | Bin 4452 -> 63297 bytes
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 53ddcc1297334..fb438bac5404f 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -698,10 +698,11 @@ export class FileMaker implements INodeType {
 		const credentials = await this.getCredentials('fileMaker');
 
 		let token;
+
 		try {
 			token = await getToken.call(this);
 		} catch (error) {
-			throw new NodeOperationError(this.getNode(), new Error('Login fail', { cause: error }));
+			throw new NodeOperationError(this.getNode(), error as string);
 		}
 
 		let requestOptions: OptionsWithUri;
@@ -818,21 +819,19 @@ export class FileMaker implements INodeType {
 				try {
 					response = await this.helpers.request(requestOptions);
 				} catch (error) {
-					response = error.response.body;
+					response = error.error;
 				}
 
 				if (typeof response === 'string') {
 					throw new NodeOperationError(
 						this.getNode(),
-						'Response body is not valid JSON. Change "Response Format" to "String"',
+						'DataAPI response body is not valid JSON. Is the DataAPI enabled?',
 						{ itemIndex: i },
 					);
 				}
 				returnData.push({ json: response });
 			}
 		} catch (error) {
-			await logout.call(this, token as string);
-
 			if (error.node) {
 				throw error;
 			}
@@ -843,6 +842,7 @@ export class FileMaker implements INodeType {
 			);
 		}
 
+		await logout.call(this, token as string);
 		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index bab9888743714..2b689ce8f782c 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -70,13 +70,22 @@ export async function getToken(
 		if (typeof response === 'string') {
 			throw new NodeOperationError(
 				this.getNode(),
-				'Response body is not valid JSON. Change "Response Format" to "String"',
+				'DataAPI response body is not valid JSON. Is the DataAPI enabled?',
 			);
 		}
 
 		return response.response.token;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
+		let message
+		if ( error.statusCode === 502 ) {
+			message = 'The server is not responding. Is the DataAPI enabled?'
+		}
+		else if (error.error ) {
+			message = error.error.messages[0].code + ' - ' + error.error.messages[0].message
+		} else {
+			message = error.message;
+		}
+		throw new Error(message);
 	}
 }
 
@@ -257,25 +266,8 @@ export async function logout(
 		//rejectUnauthorized: !this.getNodeParameter('allowUnauthorizedCerts', itemIndex, false) as boolean,
 	};
 
-	try {
-		const response = await this.helpers.request(requestOptions);
-
-		if (typeof response === 'string') {
-			throw new NodeOperationError(
-				this.getNode(),
-				'Response body is not valid JSON. Change "Response Format" to "String"',
-			);
-		}
-
-		return response;
-	} catch (error) {
-		const errorMessage = `${error.response.body.messages[0].message}'(' + ${error.response.body.messages[0].message}')'`;
-
-		if (errorMessage !== undefined) {
-			throw new Error(errorMessage);
-		}
-		throw error.response.body;
-	}
+	const response = await this.helpers.request(requestOptions);
+	return response
 }
 
 export function parseSort(this: IExecuteFunctions, i: number): object | null {
diff --git a/packages/nodes-base/nodes/FileMaker/filemaker.png b/packages/nodes-base/nodes/FileMaker/filemaker.png
index 64664575e437d8bb93f4b3346d0fc878e237e457..a305c0653530724f858a6c1a878dbe805aea4ebb 100644
GIT binary patch
literal 63297
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

literal 4452
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


From 2a751367838851761fccc120307ed7201f4cf711 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Mon, 17 Jul 2023 17:06:30 +0100
Subject: [PATCH 013/116] fix(Microsoft Outlook Node): Fix issue with category
 not correctly applying (#6583)

---
 .../nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index bbbe54d857892..5d1f7e8ad3904 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -120,7 +120,7 @@ export class MicrosoftOutlook implements INodeType {
 				for (const category of categories) {
 					returnData.push({
 						name: category.displayName as string,
-						value: category.id as string,
+						value: category.displayName as string,
 					});
 				}
 				return returnData;

From 7e21d6cd41afff9228f1ff1a2063148498cad3d9 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 17 Jul 2023 19:42:30 +0300
Subject: [PATCH 014/116] feat(Airtable Node): Overhaul (#6200)

---
 cypress/e2e/17-sharing.cy.ts                  |   4 +-
 cypress/e2e/5-ndv.cy.ts                       |  10 +-
 .../ResourceMapper/MappingFields.vue          |  16 +-
 .../ResourceMapper/MatchingColumnsSelect.vue  |   2 +-
 .../ResourceMapper/ResourceMapper.vue         |   6 +-
 .../AirtableTokenApi.credentials.ts           |  10 +
 .../nodes/Airtable/Airtable.node.ts           | 879 +-----------------
 .../nodes/Airtable/AirtableTrigger.node.ts    |  17 +-
 .../test/v2/node/base/getMany.test.ts         | 116 +++
 .../test/v2/node/base/getSchema.test.ts       |  48 +
 .../nodes/Airtable/test/v2/node/helpers.ts    |  35 +
 .../test/v2/node/record/create.test.ts        | 171 ++++
 .../test/v2/node/record/deleteRecord.test.ts  |  54 ++
 .../Airtable/test/v2/node/record/get.test.ts  |  76 ++
 .../test/v2/node/record/search.test.ts        | 160 ++++
 .../test/v2/node/record/update.test.ts        | 120 +++
 .../nodes/Airtable/test/v2/utils.test.ts      | 125 +++
 .../nodes/Airtable/v1/AirtableV1.node.ts      | 872 +++++++++++++++++
 .../Airtable/{ => v1}/GenericFunctions.ts     |   0
 .../nodes/Airtable/v2/AirtableV2.node.ts      |  32 +
 .../Airtable/v2/actions/base/Base.resource.ts |  37 +
 .../v2/actions/base/getMany.operation.ts      | 115 +++
 .../v2/actions/base/getSchema.operation.ts    |  57 ++
 .../v2/actions/common.descriptions.ts         | 207 +++++
 .../nodes/Airtable/v2/actions/node.type.ts    |   9 +
 .../v2/actions/record/Record.resource.ts      |  87 ++
 .../v2/actions/record/create.operation.ts     |  97 ++
 .../actions/record/deleteRecord.operation.ts  |  67 ++
 .../v2/actions/record/get.operation.ts        | 103 ++
 .../v2/actions/record/search.operation.ts     | 220 +++++
 .../v2/actions/record/update.operation.ts     | 150 +++
 .../v2/actions/record/upsert.operation.ts     | 158 ++++
 .../nodes/Airtable/v2/actions/router.ts       |  59 ++
 .../Airtable/v2/actions/versionDescription.ts |  81 ++
 .../nodes/Airtable/v2/helpers/interfaces.ts   |  25 +
 .../nodes/Airtable/v2/helpers/utils.ts        |  83 ++
 .../nodes/Airtable/v2/methods/index.ts        |   3 +
 .../nodes/Airtable/v2/methods/listSearch.ts   | 149 +++
 .../nodes/Airtable/v2/methods/loadOptions.ts  |  99 ++
 .../Airtable/v2/methods/resourceMapping.ts    | 136 +++
 .../nodes/Airtable/v2/transport/index.ts      | 164 ++++
 41 files changed, 3988 insertions(+), 871 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
 rename packages/nodes-base/nodes/Airtable/{ => v1}/GenericFunctions.ts (100%)
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/router.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/methods/index.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
 create mode 100644 packages/nodes-base/nodes/Airtable/v2/transport/index.ts

diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 9af0bb5fe2e1e..cf0f4ccd3598b 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -69,9 +69,9 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 
 		cy.visit(credentialsPage.url);
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
-		credentialsModal.getters.newCredentialTypeOption('Airtable API').click();
+		credentialsModal.getters.newCredentialTypeOption('Airtable Personal Access Token API').click();
 		credentialsModal.getters.newCredentialTypeButton().click();
-		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
+		credentialsModal.getters.connectionParameter('Access Token').type('1234567890');
 		credentialsModal.actions.setName('Credential C2');
 		credentialsModal.actions.changeTab('Sharing');
 		credentialsModal.actions.addUser(INSTANCE_OWNER.email);
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 0b6ded4635ff5..6e3f38ca5bcb4 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -64,15 +64,15 @@ describe('NDV', () => {
 
 	it('should show validation errors only after blur or re-opening of NDV', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
-		workflowPage.actions.addNodeToCanvas('Airtable', true, true, 'Read data from a table');
+		workflowPage.actions.addNodeToCanvas('Airtable', true, true, 'Search records');
 		ndv.getters.container().should('be.visible');
-		cy.get('.has-issues').should('have.length', 0);
+		// cy.get('.has-issues').should('have.length', 0);
 		ndv.getters.parameterInput('table').find('input').eq(1).focus().blur();
-		ndv.getters.parameterInput('application').find('input').eq(1).focus().blur();
-		cy.get('.has-issues').should('have.length', 2);
+		ndv.getters.parameterInput('base').find('input').eq(1).focus().blur();
+		cy.get('.has-issues').should('have.length', 0);
 		ndv.getters.backToCanvas().click();
 		workflowPage.actions.openNode('Airtable');
-		cy.get('.has-issues').should('have.length', 3);
+		cy.get('.has-issues').should('have.length', 2);
 		cy.get('[class*=hasIssues]').should('have.length', 1);
 	});
 
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 2d0e0517c98ac..56786442bbd93 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -51,7 +51,16 @@ const emit = defineEmits<{
 
 const ndvStore = useNDVStore();
 
-const fieldsUi = computed<INodeProperties[]>(() => {
+function markAsReadOnly(field: ResourceMapperField): boolean {
+	if (
+		isMatchingField(field.id, props.paramValue.matchingColumns, props.showMatchingColumnsSelector)
+	) {
+		return false;
+	}
+	return field.readOnly || false;
+}
+
+const fieldsUi = computed<Array<Partial<INodeProperties> & { readOnly?: boolean }>>(() => {
 	return props.fieldsToMap
 		.filter((field) => field.display !== false && field.removed !== true)
 		.map((field) => {
@@ -64,11 +73,12 @@ const fieldsUi = computed<INodeProperties[]>(() => {
 				required: field.required,
 				description: getFieldDescription(field),
 				options: field.options,
+				readOnly: markAsReadOnly(field),
 			};
 		});
 });
 
-const orderedFields = computed<INodeProperties[]>(() => {
+const orderedFields = computed<Array<Partial<INodeProperties> & { readOnly?: boolean }>>(() => {
 	// Sort so that matching columns are first
 	if (props.paramValue.matchingColumns) {
 		fieldsUi.value.forEach((field, i) => {
@@ -333,7 +343,7 @@ defineExpose({
 					:value="getParameterValue(field.name)"
 					:displayOptions="true"
 					:path="`${props.path}.${field.name}`"
-					:isReadOnly="refreshInProgress"
+					:isReadOnly="refreshInProgress || field.readOnly"
 					:hideIssues="true"
 					:nodeValues="nodeValues"
 					:class="$style.parameterInputFull"
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index 1356cbbd667f6..40dec46807ce0 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -48,7 +48,7 @@ const emit = defineEmits<{
 
 const availableMatchingFields = computed<ResourceMapperField[]>(() => {
 	return props.fieldsToMap.filter((field) => {
-		return field.canBeUsedToMatch !== false && field.display !== false;
+		return (field.canBeUsedToMatch || field.defaultMatch) && field.display !== false;
 	});
 });
 
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index dac617090f9bf..4954236057967 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -167,7 +167,9 @@ const hasAvailableMatchingColumns = computed<boolean>(() => {
 		return (
 			state.paramValue.schema.filter(
 				(field) =>
-					field.canBeUsedToMatch !== false && field.display !== false && field.removed !== true,
+					(field.canBeUsedToMatch || field.defaultMatch) &&
+					field.display !== false &&
+					field.removed !== true,
 			).length > 0
 		);
 	}
@@ -178,7 +180,7 @@ const defaultSelectedMatchingColumns = computed<string[]>(() => {
 	return state.paramValue.schema.length === 1
 		? [state.paramValue.schema[0].id]
 		: state.paramValue.schema.reduce((acc, field) => {
-				if (field.defaultMatch && field.canBeUsedToMatch === true) {
+				if (field.defaultMatch) {
 					acc.push(field.id);
 				}
 				return acc;
diff --git a/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts b/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts
index b63a80d236033..31030e41a18fb 100644
--- a/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts
+++ b/packages/nodes-base/credentials/AirtableTokenApi.credentials.ts
@@ -20,6 +20,16 @@ export class AirtableTokenApi implements ICredentialType {
 			typeOptions: { password: true },
 			default: '',
 		},
+		{
+			displayName: `Make sure you enabled the following scopes for your token:<br>
+				<code>data.records:read</code><br>
+				<code>data.records:write</code><br>
+				<code>schema.bases:read</code><br>
+				`,
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
 	];
 
 	authenticate: IAuthenticateGeneric = {
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 096b8bfe982e4..5c3d15d0d9261 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -1,858 +1,25 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import type { IRecord } from './GenericFunctions';
-import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
-
-export class Airtable implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Airtable',
-		name: 'airtable',
-		icon: 'file:airtable.svg',
-		group: ['input'],
-		version: 1,
-		description: 'Read, update, write and delete data from Airtable',
-		defaults: {
-			name: 'Airtable',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'airtableApi',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['airtableApi'],
-					},
-				},
-			},
-			{
-				name: 'airtableTokenApi',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['airtableTokenApi'],
-					},
-				},
-			},
-			{
-				name: 'airtableOAuth2Api',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['airtableOAuth2Api'],
-					},
-				},
-			},
-		],
-		properties: [
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'API Key',
-						value: 'airtableApi',
-					},
-					{
-						name: 'Access Token',
-						value: 'airtableTokenApi',
-					},
-					{
-						name: 'OAuth2',
-						value: 'airtableOAuth2Api',
-					},
-				],
-				default: 'airtableApi',
-			},
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Append',
-						value: 'append',
-						description: 'Append the data to a table',
-						action: 'Append data to a table',
-					},
-					{
-						name: 'Delete',
-						value: 'delete',
-						description: 'Delete data from a table',
-						action: 'Delete data from a table',
-					},
-					{
-						name: 'List',
-						value: 'list',
-						description: 'List data from a table',
-						action: 'List data from a table',
-					},
-					{
-						name: 'Read',
-						value: 'read',
-						description: 'Read data from a table',
-						action: 'Read data from a table',
-					},
-					{
-						name: 'Update',
-						value: 'update',
-						description: 'Update data in a table',
-						action: 'Update data in a table',
-					},
-				],
-				default: 'read',
-			},
-
-			// ----------------------------------
-			//         All
-			// ----------------------------------
-
-			{
-				displayName: 'Base',
-				name: 'application',
-				type: 'resourceLocator',
-				default: { mode: 'url', value: '' },
-				required: true,
-				description: 'The Airtable Base in which to operate on',
-				modes: [
-					{
-						displayName: 'By URL',
-						name: 'url',
-						type: 'string',
-						placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: 'https://airtable.com/([a-zA-Z0-9]{2,})/.*',
-									errorMessage: 'Not a valid Airtable Base URL',
-								},
-							},
-						],
-						extractValue: {
-							type: 'regex',
-							regex: 'https://airtable.com/([a-zA-Z0-9]{2,})',
-						},
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9]{2,}',
-									errorMessage: 'Not a valid Airtable Base ID',
-								},
-							},
-						],
-						placeholder: 'appD3dfaeidke',
-						url: '=https://airtable.com/{{$value}}',
-					},
-				],
-			},
-			{
-				displayName: 'Table',
-				name: 'table',
-				type: 'resourceLocator',
-				default: { mode: 'url', value: '' },
-				required: true,
-				modes: [
-					{
-						displayName: 'By URL',
-						name: 'url',
-						type: 'string',
-						placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
-									errorMessage: 'Not a valid Airtable Table URL',
-								},
-							},
-						],
-						extractValue: {
-							type: 'regex',
-							regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
-						},
-					},
-					{
-						displayName: 'ID',
-						name: 'id',
-						type: 'string',
-						validation: [
-							{
-								type: 'regex',
-								properties: {
-									regex: '[a-zA-Z0-9]{2,}',
-									errorMessage: 'Not a valid Airtable Table ID',
-								},
-							},
-						],
-						placeholder: 'tbl3dirwqeidke',
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         append
-			// ----------------------------------
-			{
-				displayName: 'Add All Fields',
-				name: 'addAllFields',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['append'],
-					},
-				},
-				default: true,
-				description: 'Whether all fields should be sent to Airtable or only specific ones',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'string',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add Field',
-				},
-				requiresDataPath: 'single',
-				displayOptions: {
-					show: {
-						addAllFields: [false],
-						operation: ['append'],
-					},
-				},
-				default: [],
-				placeholder: 'Name',
-				required: true,
-				description: 'The name of fields for which data should be sent to Airtable',
-			},
-
-			// ----------------------------------
-			//         delete
-			// ----------------------------------
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['delete'],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'ID of the record to delete',
-			},
-
-			// ----------------------------------
-			//         list
-			// ----------------------------------
-			{
-				displayName: 'Return All',
-				name: 'returnAll',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-					},
-				},
-				default: true,
-				description: 'Whether to return all results or only up to a given limit',
-			},
-			{
-				displayName: 'Limit',
-				name: 'limit',
-				type: 'number',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						returnAll: [false],
-					},
-				},
-				typeOptions: {
-					minValue: 1,
-					maxValue: 100,
-				},
-				default: 100,
-				description: 'Max number of results to return',
-			},
-			{
-				displayName: 'Download Attachments',
-				name: 'downloadAttachments',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-					},
-				},
-				default: false,
-				description: "Whether the attachment fields define in 'Download Fields' will be downloaded",
-			},
-			{
-				displayName: 'Download Fields',
-				name: 'downloadFieldNames',
-				type: 'string',
-				required: true,
-				requiresDataPath: 'multiple',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-						downloadAttachments: [true],
-					},
-				},
-				default: '',
-				description:
-					"Name of the fields of type 'attachment' that should be downloaded. Multiple ones can be defined separated by comma. Case sensitive and cannot include spaces after a comma.",
-			},
-			{
-				displayName: 'Additional Options',
-				name: 'additionalOptions',
-				type: 'collection',
-				displayOptions: {
-					show: {
-						operation: ['list'],
-					},
-				},
-				default: {},
-				description: 'Additional options which decide which records should be returned',
-				placeholder: 'Add Option',
-				options: [
-					{
-						displayName: 'Fields',
-						name: 'fields',
-						type: 'string',
-						requiresDataPath: 'single',
-						typeOptions: {
-							multipleValues: true,
-							multipleValueButtonText: 'Add Field',
-						},
-						default: [],
-						placeholder: 'Name',
-						description:
-							'Only data for fields whose names are in this list will be included in the records',
-					},
-					{
-						displayName: 'Filter By Formula',
-						name: 'filterByFormula',
-						type: 'string',
-						default: '',
-						placeholder: "NOT({Name} = '')",
-						description:
-							'A formula used to filter records. The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response.',
-					},
-					{
-						displayName: 'Sort',
-						name: 'sort',
-						placeholder: 'Add Sort Rule',
-						description: 'Defines how the returned records should be ordered',
-						type: 'fixedCollection',
-						typeOptions: {
-							multipleValues: true,
-						},
-						default: {},
-						options: [
-							{
-								name: 'property',
-								displayName: 'Property',
-								values: [
-									{
-										displayName: 'Field',
-										name: 'field',
-										type: 'string',
-										default: '',
-										description: 'Name of the field to sort on',
-									},
-									{
-										displayName: 'Direction',
-										name: 'direction',
-										type: 'options',
-										options: [
-											{
-												name: 'ASC',
-												value: 'asc',
-												description: 'Sort in ascending order (small -> large)',
-											},
-											{
-												name: 'DESC',
-												value: 'desc',
-												description: 'Sort in descending order (large -> small)',
-											},
-										],
-										default: 'asc',
-										description: 'The sort direction',
-									},
-								],
-							},
-						],
-					},
-					{
-						displayName: 'View',
-						name: 'view',
-						type: 'string',
-						default: '',
-						placeholder: 'All Stories',
-						description:
-							'The name or ID of a view in the Stories table. If set, only the records in that view will be returned. The records will be sorted according to the order of the view.',
-					},
-				],
-			},
-
-			// ----------------------------------
-			//         read
-			// ----------------------------------
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['read'],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'ID of the record to return',
-			},
-
-			// ----------------------------------
-			//         update
-			// ----------------------------------
-			{
-				displayName: 'ID',
-				name: 'id',
-				type: 'string',
-				displayOptions: {
-					show: {
-						operation: ['update'],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'ID of the record to update',
-			},
-			{
-				displayName: 'Update All Fields',
-				name: 'updateAllFields',
-				type: 'boolean',
-				displayOptions: {
-					show: {
-						operation: ['update'],
-					},
-				},
-				default: true,
-				description: 'Whether all fields should be sent to Airtable or only specific ones',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'string',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add Field',
-				},
-				requiresDataPath: 'single',
-				displayOptions: {
-					show: {
-						updateAllFields: [false],
-						operation: ['update'],
-					},
-				},
-				default: [],
-				placeholder: 'Name',
-				required: true,
-				description: 'The name of fields for which data should be sent to Airtable',
-			},
-
-			// ----------------------------------
-			//         append + delete + update
-			// ----------------------------------
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Option',
-				displayOptions: {
-					show: {
-						operation: ['append', 'delete', 'update'],
-					},
-				},
-				default: {},
-				options: [
-					{
-						displayName: 'Bulk Size',
-						name: 'bulkSize',
-						type: 'number',
-						typeOptions: {
-							minValue: 1,
-							maxValue: 10,
-						},
-						default: 10,
-						description: 'Number of records to process at once',
-					},
-					{
-						displayName: 'Ignore Fields',
-						name: 'ignoreFields',
-						type: 'string',
-						requiresDataPath: 'multiple',
-						displayOptions: {
-							show: {
-								'/operation': ['update'],
-								'/updateAllFields': [true],
-							},
-						},
-						default: '',
-						description: 'Comma-separated list of fields to ignore',
-					},
-					{
-						displayName: 'Typecast',
-						name: 'typecast',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['append', 'update'],
-							},
-						},
-						default: false,
-						description:
-							'Whether the Airtable API should attempt mapping of string values for linked records & select options',
-					},
-				],
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		let responseData;
-
-		const operation = this.getNodeParameter('operation', 0);
-
-		const application = this.getNodeParameter('application', 0, undefined, {
-			extractValue: true,
-		}) as string;
-
-		const table = encodeURI(
-			this.getNodeParameter('table', 0, undefined, {
-				extractValue: true,
-			}) as string,
-		);
-
-		let returnAll = false;
-		let endpoint = '';
-		let requestMethod = '';
-
-		const body: IDataObject = {};
-		const qs: IDataObject = {};
-
-		if (operation === 'append') {
-			// ----------------------------------
-			//         append
-			// ----------------------------------
-
-			requestMethod = 'POST';
-			endpoint = `${application}/${table}`;
-
-			let addAllFields: boolean;
-			let fields: string[];
-			let options: IDataObject;
-
-			const rows: IDataObject[] = [];
-			let bulkSize = 10;
-
-			for (let i = 0; i < items.length; i++) {
-				try {
-					addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
-					options = this.getNodeParameter('options', i, {});
-					bulkSize = (options.bulkSize as number) || bulkSize;
-
-					const row: IDataObject = {};
-
-					if (addAllFields) {
-						// Add all the fields the item has
-						row.fields = { ...items[i].json };
-						delete (row.fields as any).id;
-					} else {
-						// Add only the specified fields
-						const rowFields: IDataObject = {};
-
-						fields = this.getNodeParameter('fields', i, []) as string[];
-
-						for (const fieldName of fields) {
-							rowFields[fieldName] = items[i].json[fieldName];
-						}
-
-						row.fields = rowFields;
-					}
-
-					rows.push(row);
-
-					if (rows.length === bulkSize || i === items.length - 1) {
-						if (options.typecast === true) {
-							body.typecast = true;
-						}
-
-						body.records = rows;
-
-						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-						returnData.push(...executionData);
-						// empty rows
-						rows.length = 0;
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else if (operation === 'delete') {
-			requestMethod = 'DELETE';
-
-			const rows: string[] = [];
-			const options = this.getNodeParameter('options', 0, {});
-			const bulkSize = (options.bulkSize as number) || 10;
-
-			for (let i = 0; i < items.length; i++) {
-				try {
-					const id = this.getNodeParameter('id', i) as string;
-
-					rows.push(id);
-
-					if (rows.length === bulkSize || i === items.length - 1) {
-						endpoint = `${application}/${table}`;
-
-						// Make one request after another. This is slower but makes
-						// sure that we do not run into the rate limit they have in
-						// place and so block for 30 seconds. Later some global
-						// functionality in core should make it easy to make requests
-						// according to specific rules like not more than 5 requests
-						// per seconds.
-						qs.records = rows;
-
-						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-						// empty rows
-						rows.length = 0;
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else if (operation === 'list') {
-			// ----------------------------------
-			//         list
-			// ----------------------------------
-			try {
-				requestMethod = 'GET';
-				endpoint = `${application}/${table}`;
-
-				returnAll = this.getNodeParameter('returnAll', 0);
-
-				const downloadAttachments = this.getNodeParameter('downloadAttachments', 0);
-
-				const additionalOptions = this.getNodeParameter('additionalOptions', 0, {}) as IDataObject;
-
-				for (const key of Object.keys(additionalOptions)) {
-					if (key === 'sort' && (additionalOptions.sort as IDataObject).property !== undefined) {
-						qs[key] = (additionalOptions[key] as IDataObject).property;
-					} else {
-						qs[key] = additionalOptions[key];
-					}
-				}
-
-				if (returnAll) {
-					responseData = await apiRequestAllItems.call(this, requestMethod, endpoint, body, qs);
-				} else {
-					qs.maxRecords = this.getNodeParameter('limit', 0);
-					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-				}
-
-				returnData.push.apply(returnData, responseData.records as INodeExecutionData[]);
-
-				if (downloadAttachments === true) {
-					const downloadFieldNames = (
-						this.getNodeParameter('downloadFieldNames', 0) as string
-					).split(',');
-					const data = await downloadRecordAttachments.call(
-						this,
-						responseData.records as IRecord[],
-						downloadFieldNames,
-					);
-					return [data];
-				}
-
-				// We can return from here
-				return [
-					this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
-						itemData: { item: 0 },
-					}),
-				];
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({ json: { error: error.message } });
-				} else {
-					throw error;
-				}
-			}
-		} else if (operation === 'read') {
-			// ----------------------------------
-			//         read
-			// ----------------------------------
-
-			requestMethod = 'GET';
-
-			let id: string;
-			for (let i = 0; i < items.length; i++) {
-				id = this.getNodeParameter('id', i) as string;
-
-				endpoint = `${application}/${table}/${id}`;
-
-				// Make one request after another. This is slower but makes
-				// sure that we do not run into the rate limit they have in
-				// place and so block for 30 seconds. Later some global
-				// functionality in core should make it easy to make requests
-				// according to specific rules like not more than 5 requests
-				// per seconds.
-				try {
-					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-
-					returnData.push(...executionData);
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else if (operation === 'update') {
-			// ----------------------------------
-			//         update
-			// ----------------------------------
-
-			requestMethod = 'PATCH';
-
-			let updateAllFields: boolean;
-			let fields: string[];
-			let options: IDataObject;
-
-			const rows: IDataObject[] = [];
-			let bulkSize = 10;
-
-			for (let i = 0; i < items.length; i++) {
-				try {
-					updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
-					options = this.getNodeParameter('options', i, {});
-					bulkSize = (options.bulkSize as number) || bulkSize;
-
-					const row: IDataObject = {};
-					row.fields = {} as IDataObject;
-
-					if (updateAllFields) {
-						// Update all the fields the item has
-						row.fields = { ...items[i].json };
-						// remove id field
-						delete (row.fields as any).id;
-
-						if (options.ignoreFields && options.ignoreFields !== '') {
-							const ignoreFields = (options.ignoreFields as string)
-								.split(',')
-								.map((field) => field.trim())
-								.filter((field) => !!field);
-							if (ignoreFields.length) {
-								// From: https://stackoverflow.com/questions/17781472/how-to-get-a-subset-of-a-javascript-objects-properties
-								row.fields = Object.entries(items[i].json)
-									.filter(([key]) => !ignoreFields.includes(key))
-									.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
-							}
-						}
-					} else {
-						fields = this.getNodeParameter('fields', i, []) as string[];
-
-						const rowFields: IDataObject = {};
-						for (const fieldName of fields) {
-							rowFields[fieldName] = items[i].json[fieldName];
-						}
-
-						row.fields = rowFields;
-					}
-
-					row.id = this.getNodeParameter('id', i) as string;
-
-					rows.push(row);
-
-					if (rows.length === bulkSize || i === items.length - 1) {
-						endpoint = `${application}/${table}`;
-
-						// Make one request after another. This is slower but makes
-						// sure that we do not run into the rate limit they have in
-						// place and so block for 30 seconds. Later some global
-						// functionality in core should make it easy to make requests
-						// according to specific rules like not more than 5 requests
-						// per seconds.
-
-						const data = { records: rows, typecast: options.typecast ? true : false };
-
-						responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
-
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
-							{ itemData: { item: i } },
-						);
-
-						returnData.push(...executionData);
-
-						// empty rows
-						rows.length = 0;
-					}
-				} catch (error) {
-					if (this.continueOnFail()) {
-						returnData.push({ json: { error: error.message } });
-						continue;
-					}
-					throw error;
-				}
-			}
-		} else {
-			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
-		}
-
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { AirtableV1 } from './v1/AirtableV1.node';
+import { AirtableV2 } from './v2/AirtableV2.node';
+
+export class Airtable extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Airtable',
+			name: 'airtable',
+			icon: 'file:airtable.svg',
+			group: ['input'],
+			description: 'Read, update, write and delete data from Airtable',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new AirtableV1(baseDescription),
+			2: new AirtableV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index ce3b868c4f559..a60ae12bdbb64 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -7,8 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { IRecord } from './GenericFunctions';
-import { apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
+import type { IRecord } from './v1/GenericFunctions';
+import { apiRequestAllItems, downloadRecordAttachments } from './v1/GenericFunctions';
 
 import moment from 'moment';
 
@@ -43,6 +43,15 @@ export class AirtableTrigger implements INodeType {
 					},
 				},
 			},
+			{
+				name: 'airtableOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['airtableOAuth2Api'],
+					},
+				},
+			},
 		],
 		polling: true,
 		inputs: [],
@@ -61,6 +70,10 @@ export class AirtableTrigger implements INodeType {
 						name: 'Access Token',
 						value: 'airtableTokenApi',
 					},
+					{
+						name: 'OAuth2',
+						value: 'airtableOAuth2Api',
+					},
 				],
 				default: 'airtableApi',
 			},
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
new file mode 100644
index 0000000000000..6a1e6daf7b712
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
@@ -0,0 +1,116 @@
+import nock from 'nock';
+
+import * as getMany from '../../../../v2/actions/base/getMany.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+const bases = [
+	{
+		id: 'appXXX',
+		name: 'base 1',
+		permissionLevel: 'create',
+	},
+	{
+		id: 'appYYY',
+		name: 'base 2',
+		permissionLevel: 'edit',
+	},
+	{
+		id: 'appZZZ',
+		name: 'base 3',
+		permissionLevel: 'create',
+	},
+];
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return { bases };
+		}),
+	};
+});
+
+describe('Test AirtableV2, base => getMany', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should return all bases', async () => {
+		const nodeParameters = {
+			resource: 'base',
+			returnAll: true,
+			options: {},
+		};
+
+		const response = await getMany.execute.call(createMockExecuteFunction(nodeParameters));
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'meta/bases');
+
+		expect(response).toEqual([
+			{
+				json: {
+					id: 'appXXX',
+					name: 'base 1',
+					permissionLevel: 'create',
+				},
+				pairedItem: {
+					item: 0,
+				},
+			},
+			{
+				json: {
+					id: 'appYYY',
+					name: 'base 2',
+					permissionLevel: 'edit',
+				},
+				pairedItem: {
+					item: 0,
+				},
+			},
+			{
+				json: {
+					id: 'appZZZ',
+					name: 'base 3',
+					permissionLevel: 'create',
+				},
+				pairedItem: {
+					item: 0,
+				},
+			},
+		]);
+	});
+
+	it('should return one base with edit permission', async () => {
+		const nodeParameters = {
+			resource: 'base',
+			returnAll: false,
+			limit: 2,
+			options: { permissionLevel: ['edit'] },
+		};
+
+		const response = await getMany.execute.call(createMockExecuteFunction(nodeParameters));
+
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'meta/bases');
+
+		expect(response).toEqual([
+			{
+				json: {
+					id: 'appYYY',
+					name: 'base 2',
+					permissionLevel: 'edit',
+				},
+				pairedItem: {
+					item: 0,
+				},
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
new file mode 100644
index 0000000000000..df3b8ed930470
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
@@ -0,0 +1,48 @@
+import nock from 'nock';
+
+import * as getSchema from '../../../../v2/actions/base/getSchema.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('Test AirtableV2, base => getSchema', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should return all bases', async () => {
+		const nodeParameters = {
+			resource: 'base',
+			operation: 'getSchema',
+			base: {
+				value: 'appYobase',
+			},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		await getSchema.execute.call(createMockExecuteFunction(nodeParameters), items);
+
+		expect(transport.apiRequest).toBeCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'meta/bases/appYobase/tables');
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
new file mode 100644
index 0000000000000..d9f6a21806e39
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
@@ -0,0 +1,35 @@
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
+import { get } from 'lodash';
+import { constructExecutionMetaData } from 'n8n-core';
+
+export const node: INode = {
+	id: '11',
+	name: 'Airtable node',
+	typeVersion: 2,
+	type: 'n8n-nodes-base.airtable',
+	position: [42, 42],
+	parameters: {
+		operation: 'create',
+	},
+};
+
+export const createMockExecuteFunction = (nodeParameters: IDataObject) => {
+	const fakeExecuteFunction = {
+		getNodeParameter(
+			parameterName: string,
+			_itemIndex: number,
+			fallbackValue?: IDataObject | undefined,
+			options?: IGetNodeParameterOptions | undefined,
+		) {
+			const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+			return get(nodeParameters, parameter, fallbackValue);
+		},
+		getNode() {
+			return node;
+		},
+		helpers: { constructExecutionMetaData },
+		continueOnFail: () => false,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
new file mode 100644
index 0000000000000..1b17b25ea7711
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
@@ -0,0 +1,171 @@
+import nock from 'nock';
+
+import * as create from '../../../../v2/actions/record/create.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('Test AirtableV2, create operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should create a record, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'create',
+			columns: {
+				mappingMode: 'autoMapInputData',
+				value: {
+					bar: 'bar 1',
+					foo: 'foo 1',
+					spam: 'eggs',
+				},
+				matchingColumns: [],
+				schema: [
+					{
+						id: 'foo',
+						displayName: 'foo',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+					{
+						id: 'bar',
+						displayName: 'bar',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+					{
+						id: 'spam',
+						displayName: 'spam',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+				],
+			},
+			options: {
+				typecast: true,
+				ignoreFields: 'spam',
+			},
+		};
+
+		const items = [
+			{
+				json: {
+					foo: 'foo 1',
+					spam: 'eggs',
+					bar: 'bar 1',
+				},
+			},
+			{
+				json: {
+					foo: 'foo 2',
+					spam: 'eggs',
+					bar: 'bar 2',
+				},
+			},
+		];
+
+		await create.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', 'appYoLbase/tblltable', {
+			fields: {
+				foo: 'foo 1',
+				bar: 'bar 1',
+			},
+			typecast: true,
+		});
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', 'appYoLbase/tblltable', {
+			fields: {
+				foo: 'foo 2',
+				bar: 'bar 2',
+			},
+			typecast: true,
+		});
+	});
+
+	it('should create a record, defineBelow', async () => {
+		const nodeParameters = {
+			operation: 'create',
+			columns: {
+				mappingMode: 'defineBelow',
+				value: {
+					bar: 'bar 1',
+					foo: 'foo 1',
+				},
+				matchingColumns: [],
+				schema: [
+					{
+						id: 'foo',
+						displayName: 'foo',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+					{
+						id: 'bar',
+						displayName: 'bar',
+						required: false,
+						defaultMatch: false,
+						display: true,
+						type: 'string',
+					},
+				],
+			},
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		await create.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', 'appYoLbase/tblltable', {
+			fields: {
+				foo: 'foo 1',
+				bar: 'bar 1',
+			},
+			typecast: false,
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
new file mode 100644
index 0000000000000..2ea8b11d75ca5
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
@@ -0,0 +1,54 @@
+import nock from 'nock';
+
+import * as deleteRecord from '../../../../v2/actions/record/deleteRecord.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+	};
+});
+
+describe('Test AirtableV2, deleteRecord operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should delete a record', async () => {
+		const nodeParameters = {
+			operation: 'deleteRecord',
+			id: 'recXXX',
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		await deleteRecord.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('DELETE', 'appYoLbase/tblltable/recXXX');
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
new file mode 100644
index 0000000000000..3d8c709abd450
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
@@ -0,0 +1,76 @@
+import nock from 'nock';
+
+import * as get from '../../../../v2/actions/record/get.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					id: 'recXXX',
+					fields: {
+						foo: 'foo 1',
+						bar: 'bar 1',
+					},
+				};
+			}
+		}),
+	};
+});
+
+describe('Test AirtableV2, create operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	afterEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	it('should create a record, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'get',
+			id: 'recXXX',
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		const responce = await get.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', 'appYoLbase/tblltable/recXXX');
+
+		expect(responce).toEqual([
+			{
+				json: {
+					id: 'recXXX',
+					foo: 'foo 1',
+					bar: 'bar 1',
+				},
+				pairedItem: {
+					item: 0,
+				},
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
new file mode 100644
index 0000000000000..8105323641fbd
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
@@ -0,0 +1,160 @@
+import nock from 'nock';
+
+import * as search from '../../../../v2/actions/record/search.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					records: [
+						{
+							id: 'recYYY',
+							fields: {
+								foo: 'foo 2',
+								bar: 'bar 2',
+							},
+						},
+					],
+				};
+			}
+		}),
+		apiRequestAllItems: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					records: [
+						{
+							id: 'recYYY',
+							fields: {
+								foo: 'foo 2',
+								bar: 'bar 2',
+							},
+						},
+						{
+							id: 'recXXX',
+							fields: {
+								foo: 'foo 1',
+								bar: 'bar 1',
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test AirtableV2, search operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should return all records', async () => {
+		const nodeParameters = {
+			operation: 'search',
+			filterByFormula: 'foo',
+			returnAll: true,
+			options: {
+				fields: ['foo', 'bar'],
+				view: {
+					value: 'viwView',
+					mode: 'list',
+				},
+			},
+			sort: {
+				property: [
+					{
+						field: 'bar',
+						direction: 'desc',
+					},
+				],
+			},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		const result = await search.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequestAllItems).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequestAllItems).toHaveBeenCalledWith(
+			'GET',
+			'appYoLbase/tblltable',
+			{},
+			{
+				fields: ['foo', 'bar'],
+				filterByFormula: 'foo',
+				sort: [{ direction: 'desc', field: 'bar' }],
+				view: 'viwView',
+			},
+		);
+
+		expect(result).toHaveLength(2);
+		expect(result[0]).toEqual({
+			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
+			pairedItem: {
+				item: 0,
+			},
+		});
+	});
+
+	it('should return all records', async () => {
+		const nodeParameters = {
+			operation: 'search',
+			filterByFormula: 'foo',
+			returnAll: false,
+			limit: 1,
+			options: {
+				fields: ['foo', 'bar'],
+			},
+			sort: {},
+		};
+
+		const items = [
+			{
+				json: {},
+			},
+		];
+
+		const result = await search.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.apiRequest).toHaveBeenCalledWith(
+			'GET',
+			'appYoLbase/tblltable',
+			{},
+			{ fields: ['foo', 'bar'], filterByFormula: 'foo', maxRecords: 1 },
+		);
+
+		expect(result).toHaveLength(1);
+		expect(result[0]).toEqual({
+			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
+			pairedItem: {
+				item: 0,
+			},
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
new file mode 100644
index 0000000000000..afe736c914441
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
@@ -0,0 +1,120 @@
+import nock from 'nock';
+
+import * as update from '../../../../v2/actions/record/update.operation';
+
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction } from '../helpers';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(async function () {
+			return {};
+		}),
+		batchUpdate: jest.fn(async function () {
+			return {};
+		}),
+		apiRequestAllItems: jest.fn(async function (method: string) {
+			if (method === 'GET') {
+				return {
+					records: [
+						{
+							id: 'recYYY',
+							fields: {
+								foo: 'foo 2',
+								bar: 'bar 2',
+							},
+						},
+						{
+							id: 'recXXX',
+							fields: {
+								foo: 'foo 1',
+								bar: 'bar 1',
+							},
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Test AirtableV2, update operation', () => {
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../v2/transport');
+	});
+
+	it('should update a record by id, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'update',
+			columns: {
+				mappingMode: 'autoMapInputData',
+				matchingColumns: ['id'],
+			},
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {
+					id: 'recXXX',
+					foo: 'foo 1',
+					bar: 'bar 1',
+				},
+			},
+		];
+
+		await update.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.batchUpdate).toHaveBeenCalledWith(
+			'appYoLbase/tblltable',
+			{ typecast: false },
+			[{ fields: { bar: 'bar 1', foo: 'foo 1' }, id: 'recXXX' }],
+		);
+	});
+
+	it('should update a record by field name, autoMapInputData', async () => {
+		const nodeParameters = {
+			operation: 'update',
+			columns: {
+				mappingMode: 'autoMapInputData',
+				matchingColumns: ['foo'],
+			},
+			options: {},
+		};
+
+		const items = [
+			{
+				json: {
+					id: 'recXXX',
+					foo: 'foo 1',
+					bar: 'bar 1',
+				},
+			},
+		];
+
+		await update.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			items,
+			'appYoLbase',
+			'tblltable',
+		);
+
+		expect(transport.batchUpdate).toHaveBeenCalledWith(
+			'appYoLbase/tblltable',
+			{ typecast: false },
+			[{ fields: { bar: 'bar 1', foo: 'foo 1', id: 'recXXX' }, id: 'recXXX' }],
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts
new file mode 100644
index 0000000000000..e8028cd7c2e4a
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/test/v2/utils.test.ts
@@ -0,0 +1,125 @@
+import { findMatches, removeIgnored } from '../../v2/helpers/utils';
+
+describe('test AirtableV2, removeIgnored', () => {
+	it('should remove ignored fields', () => {
+		const data = {
+			foo: 'foo',
+			baz: 'baz',
+			spam: 'spam',
+		};
+
+		const ignore = 'baz,spam';
+
+		const result = removeIgnored(data, ignore);
+
+		expect(result).toEqual({
+			foo: 'foo',
+		});
+	});
+	it('should return the same data if ignore field does not present', () => {
+		const data = {
+			foo: 'foo',
+		};
+
+		const ignore = 'bar';
+
+		const result = removeIgnored(data, ignore);
+
+		expect(result).toEqual(data);
+	});
+	it('should return the same data if empty string', () => {
+		const data = {
+			foo: 'foo',
+		};
+
+		const ignore = '';
+
+		const result = removeIgnored(data, ignore);
+
+		expect(result).toEqual(data);
+	});
+});
+
+describe('test AirtableV2, findMatches', () => {
+	it('should find match', () => {
+		const data = [
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+			{
+				fields: {
+					id: 'rec456',
+					data: 'data 2',
+				},
+			},
+		];
+
+		const key = 'id';
+
+		const result = findMatches(data, [key], {
+			id: 'rec123',
+			data: 'data 1',
+		});
+
+		expect(result).toEqual([
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+		]);
+	});
+	it('should find all matches', () => {
+		const data = [
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+			{
+				fields: {
+					id: 'rec456',
+					data: 'data 2',
+				},
+			},
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 3',
+				},
+			},
+		];
+
+		const key = 'id';
+
+		const result = findMatches(
+			data,
+			[key],
+			{
+				id: 'rec123',
+				data: 'data 1',
+			},
+			true,
+		);
+
+		expect(result).toEqual([
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 1',
+				},
+			},
+			{
+				fields: {
+					id: 'rec123',
+					data: 'data 3',
+				},
+			},
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
new file mode 100644
index 0000000000000..3ed973c4fe452
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -0,0 +1,872 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import type { IRecord } from './GenericFunctions';
+import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
+
+import { oldVersionNotice } from '../../../utils/descriptions';
+
+const versionDescription: INodeTypeDescription = {
+	displayName: 'Airtable',
+	name: 'airtable',
+	icon: 'file:airtable.svg',
+	group: ['input'],
+	version: 1,
+	description: 'Read, update, write and delete data from Airtable',
+	defaults: {
+		name: 'Airtable',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'airtableApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableApi'],
+				},
+			},
+		},
+		{
+			name: 'airtableTokenApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableTokenApi'],
+				},
+			},
+		},
+		{
+			name: 'airtableOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableOAuth2Api'],
+				},
+			},
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					name: 'API Key',
+					value: 'airtableApi',
+				},
+				{
+					name: 'Access Token',
+					value: 'airtableTokenApi',
+				},
+				{
+					name: 'OAuth2',
+					value: 'airtableOAuth2Api',
+				},
+			],
+			default: 'airtableApi',
+		},
+		oldVersionNotice,
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Append',
+					value: 'append',
+					description: 'Append the data to a table',
+					action: 'Append data to a table',
+				},
+				{
+					name: 'Delete',
+					value: 'delete',
+					description: 'Delete data from a table',
+					action: 'Delete data from a table',
+				},
+				{
+					name: 'List',
+					value: 'list',
+					description: 'List data from a table',
+					action: 'List data from a table',
+				},
+				{
+					name: 'Read',
+					value: 'read',
+					description: 'Read data from a table',
+					action: 'Read data from a table',
+				},
+				{
+					name: 'Update',
+					value: 'update',
+					description: 'Update data in a table',
+					action: 'Update data in a table',
+				},
+			],
+			default: 'read',
+		},
+
+		// ----------------------------------
+		//         All
+		// ----------------------------------
+
+		{
+			displayName: 'Base',
+			name: 'application',
+			type: 'resourceLocator',
+			default: { mode: 'url', value: '' },
+			required: true,
+			description: 'The Airtable Base in which to operate on',
+			modes: [
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: 'https://airtable.com/([a-zA-Z0-9]{2,})/.*',
+								errorMessage: 'Not a valid Airtable Base URL',
+							},
+						},
+					],
+					extractValue: {
+						type: 'regex',
+						regex: 'https://airtable.com/([a-zA-Z0-9]{2,})',
+					},
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9]{2,}',
+								errorMessage: 'Not a valid Airtable Base ID',
+							},
+						},
+					],
+					placeholder: 'appD3dfaeidke',
+					url: '=https://airtable.com/{{$value}}',
+				},
+			],
+		},
+		{
+			displayName: 'Table',
+			name: 'table',
+			type: 'resourceLocator',
+			default: { mode: 'url', value: '' },
+			required: true,
+			modes: [
+				{
+					displayName: 'By URL',
+					name: 'url',
+					type: 'string',
+					placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
+								errorMessage: 'Not a valid Airtable Table URL',
+							},
+						},
+					],
+					extractValue: {
+						type: 'regex',
+						regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
+					},
+				},
+				{
+					displayName: 'ID',
+					name: 'id',
+					type: 'string',
+					validation: [
+						{
+							type: 'regex',
+							properties: {
+								regex: '[a-zA-Z0-9]{2,}',
+								errorMessage: 'Not a valid Airtable Table ID',
+							},
+						},
+					],
+					placeholder: 'tbl3dirwqeidke',
+				},
+			],
+		},
+
+		// ----------------------------------
+		//         append
+		// ----------------------------------
+		{
+			displayName: 'Add All Fields',
+			name: 'addAllFields',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['append'],
+				},
+			},
+			default: true,
+			description: 'Whether all fields should be sent to Airtable or only specific ones',
+		},
+		{
+			displayName: 'Fields',
+			name: 'fields',
+			type: 'string',
+			typeOptions: {
+				multipleValues: true,
+				multipleValueButtonText: 'Add Field',
+			},
+			requiresDataPath: 'single',
+			displayOptions: {
+				show: {
+					addAllFields: [false],
+					operation: ['append'],
+				},
+			},
+			default: [],
+			placeholder: 'Name',
+			required: true,
+			description: 'The name of fields for which data should be sent to Airtable',
+		},
+
+		// ----------------------------------
+		//         delete
+		// ----------------------------------
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			displayOptions: {
+				show: {
+					operation: ['delete'],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'ID of the record to delete',
+		},
+
+		// ----------------------------------
+		//         list
+		// ----------------------------------
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+				},
+			},
+			default: true,
+			description: 'Whether to return all results or only up to a given limit',
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					returnAll: [false],
+				},
+			},
+			typeOptions: {
+				minValue: 1,
+				maxValue: 100,
+			},
+			default: 100,
+			description: 'Max number of results to return',
+		},
+		{
+			displayName: 'Download Attachments',
+			name: 'downloadAttachments',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+				},
+			},
+			default: false,
+			description: "Whether the attachment fields define in 'Download Fields' will be downloaded",
+		},
+		{
+			displayName: 'Download Fields',
+			name: 'downloadFieldNames',
+			type: 'string',
+			required: true,
+			requiresDataPath: 'multiple',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+					downloadAttachments: [true],
+				},
+			},
+			default: '',
+			description:
+				"Name of the fields of type 'attachment' that should be downloaded. Multiple ones can be defined separated by comma. Case sensitive and cannot include spaces after a comma.",
+		},
+		{
+			displayName: 'Additional Options',
+			name: 'additionalOptions',
+			type: 'collection',
+			displayOptions: {
+				show: {
+					operation: ['list'],
+				},
+			},
+			default: {},
+			description: 'Additional options which decide which records should be returned',
+			placeholder: 'Add Option',
+			options: [
+				{
+					displayName: 'Fields',
+					name: 'fields',
+					type: 'string',
+					requiresDataPath: 'single',
+					typeOptions: {
+						multipleValues: true,
+						multipleValueButtonText: 'Add Field',
+					},
+					default: [],
+					placeholder: 'Name',
+					description:
+						'Only data for fields whose names are in this list will be included in the records',
+				},
+				{
+					displayName: 'Filter By Formula',
+					name: 'filterByFormula',
+					type: 'string',
+					default: '',
+					placeholder: "NOT({Name} = '')",
+					description:
+						'A formula used to filter records. The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response.',
+				},
+				{
+					displayName: 'Sort',
+					name: 'sort',
+					placeholder: 'Add Sort Rule',
+					description: 'Defines how the returned records should be ordered',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					default: {},
+					options: [
+						{
+							name: 'property',
+							displayName: 'Property',
+							values: [
+								{
+									displayName: 'Field',
+									name: 'field',
+									type: 'string',
+									default: '',
+									description: 'Name of the field to sort on',
+								},
+								{
+									displayName: 'Direction',
+									name: 'direction',
+									type: 'options',
+									options: [
+										{
+											name: 'ASC',
+											value: 'asc',
+											description: 'Sort in ascending order (small -> large)',
+										},
+										{
+											name: 'DESC',
+											value: 'desc',
+											description: 'Sort in descending order (large -> small)',
+										},
+									],
+									default: 'asc',
+									description: 'The sort direction',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'View',
+					name: 'view',
+					type: 'string',
+					default: '',
+					placeholder: 'All Stories',
+					description:
+						'The name or ID of a view in the Stories table. If set, only the records in that view will be returned. The records will be sorted according to the order of the view.',
+				},
+			],
+		},
+
+		// ----------------------------------
+		//         read
+		// ----------------------------------
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			displayOptions: {
+				show: {
+					operation: ['read'],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'ID of the record to return',
+		},
+
+		// ----------------------------------
+		//         update
+		// ----------------------------------
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			displayOptions: {
+				show: {
+					operation: ['update'],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'ID of the record to update',
+		},
+		{
+			displayName: 'Update All Fields',
+			name: 'updateAllFields',
+			type: 'boolean',
+			displayOptions: {
+				show: {
+					operation: ['update'],
+				},
+			},
+			default: true,
+			description: 'Whether all fields should be sent to Airtable or only specific ones',
+		},
+		{
+			displayName: 'Fields',
+			name: 'fields',
+			type: 'string',
+			typeOptions: {
+				multipleValues: true,
+				multipleValueButtonText: 'Add Field',
+			},
+			requiresDataPath: 'single',
+			displayOptions: {
+				show: {
+					updateAllFields: [false],
+					operation: ['update'],
+				},
+			},
+			default: [],
+			placeholder: 'Name',
+			required: true,
+			description: 'The name of fields for which data should be sent to Airtable',
+		},
+
+		// ----------------------------------
+		//         append + delete + update
+		// ----------------------------------
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			displayOptions: {
+				show: {
+					operation: ['append', 'delete', 'update'],
+				},
+			},
+			default: {},
+			options: [
+				{
+					displayName: 'Bulk Size',
+					name: 'bulkSize',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
+						maxValue: 10,
+					},
+					default: 10,
+					description: 'Number of records to process at once',
+				},
+				{
+					displayName: 'Ignore Fields',
+					name: 'ignoreFields',
+					type: 'string',
+					requiresDataPath: 'multiple',
+					displayOptions: {
+						show: {
+							'/operation': ['update'],
+							'/updateAllFields': [true],
+						},
+					},
+					default: '',
+					description: 'Comma-separated list of fields to ignore',
+				},
+				{
+					displayName: 'Typecast',
+					name: 'typecast',
+					type: 'boolean',
+					displayOptions: {
+						show: {
+							'/operation': ['append', 'update'],
+						},
+					},
+					default: false,
+					description:
+						'Whether the Airtable API should attempt mapping of string values for linked records & select options',
+				},
+			],
+		},
+	],
+};
+
+export class AirtableV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		let responseData;
+
+		const operation = this.getNodeParameter('operation', 0);
+
+		const application = this.getNodeParameter('application', 0, undefined, {
+			extractValue: true,
+		}) as string;
+
+		const table = encodeURI(
+			this.getNodeParameter('table', 0, undefined, {
+				extractValue: true,
+			}) as string,
+		);
+
+		let returnAll = false;
+		let endpoint = '';
+		let requestMethod = '';
+
+		const body: IDataObject = {};
+		const qs: IDataObject = {};
+
+		if (operation === 'append') {
+			// ----------------------------------
+			//         append
+			// ----------------------------------
+
+			requestMethod = 'POST';
+			endpoint = `${application}/${table}`;
+
+			let addAllFields: boolean;
+			let fields: string[];
+			let options: IDataObject;
+
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
+			for (let i = 0; i < items.length; i++) {
+				try {
+					addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
+					options = this.getNodeParameter('options', i, {});
+					bulkSize = (options.bulkSize as number) || bulkSize;
+
+					const row: IDataObject = {};
+
+					if (addAllFields) {
+						// Add all the fields the item has
+						row.fields = { ...items[i].json };
+						delete (row.fields as any).id;
+					} else {
+						// Add only the specified fields
+						const rowFields: IDataObject = {};
+
+						fields = this.getNodeParameter('fields', i, []) as string[];
+
+						for (const fieldName of fields) {
+							rowFields[fieldName] = items[i].json[fieldName];
+						}
+
+						row.fields = rowFields;
+					}
+
+					rows.push(row);
+
+					if (rows.length === bulkSize || i === items.length - 1) {
+						if (options.typecast === true) {
+							body.typecast = true;
+						}
+
+						body.records = rows;
+
+						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+						// empty rows
+						rows.length = 0;
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else if (operation === 'delete') {
+			requestMethod = 'DELETE';
+
+			const rows: string[] = [];
+			const options = this.getNodeParameter('options', 0, {});
+			const bulkSize = (options.bulkSize as number) || 10;
+
+			for (let i = 0; i < items.length; i++) {
+				try {
+					const id = this.getNodeParameter('id', i) as string;
+
+					rows.push(id);
+
+					if (rows.length === bulkSize || i === items.length - 1) {
+						endpoint = `${application}/${table}`;
+
+						// Make one request after another. This is slower but makes
+						// sure that we do not run into the rate limit they have in
+						// place and so block for 30 seconds. Later some global
+						// functionality in core should make it easy to make requests
+						// according to specific rules like not more than 5 requests
+						// per seconds.
+						qs.records = rows;
+
+						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+						// empty rows
+						rows.length = 0;
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else if (operation === 'list') {
+			// ----------------------------------
+			//         list
+			// ----------------------------------
+			try {
+				requestMethod = 'GET';
+				endpoint = `${application}/${table}`;
+
+				returnAll = this.getNodeParameter('returnAll', 0);
+
+				const downloadAttachments = this.getNodeParameter('downloadAttachments', 0);
+
+				const additionalOptions = this.getNodeParameter('additionalOptions', 0, {}) as IDataObject;
+
+				for (const key of Object.keys(additionalOptions)) {
+					if (key === 'sort' && (additionalOptions.sort as IDataObject).property !== undefined) {
+						qs[key] = (additionalOptions[key] as IDataObject).property;
+					} else {
+						qs[key] = additionalOptions[key];
+					}
+				}
+
+				if (returnAll) {
+					responseData = await apiRequestAllItems.call(this, requestMethod, endpoint, body, qs);
+				} else {
+					qs.maxRecords = this.getNodeParameter('limit', 0);
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+				}
+
+				returnData.push.apply(returnData, responseData.records as INodeExecutionData[]);
+
+				if (downloadAttachments === true) {
+					const downloadFieldNames = (
+						this.getNodeParameter('downloadFieldNames', 0) as string
+					).split(',');
+					const data = await downloadRecordAttachments.call(
+						this,
+						responseData.records as IRecord[],
+						downloadFieldNames,
+					);
+					return [data];
+				}
+
+				// We can return from here
+				return [
+					this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
+						itemData: { item: 0 },
+					}),
+				];
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message } });
+				} else {
+					throw error;
+				}
+			}
+		} else if (operation === 'read') {
+			// ----------------------------------
+			//         read
+			// ----------------------------------
+
+			requestMethod = 'GET';
+
+			let id: string;
+			for (let i = 0; i < items.length; i++) {
+				id = this.getNodeParameter('id', i) as string;
+
+				endpoint = `${application}/${table}/${id}`;
+
+				// Make one request after another. This is slower but makes
+				// sure that we do not run into the rate limit they have in
+				// place and so block for 30 seconds. Later some global
+				// functionality in core should make it easy to make requests
+				// according to specific rules like not more than 5 requests
+				// per seconds.
+				try {
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{ itemData: { item: i } },
+					);
+
+					returnData.push(...executionData);
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else if (operation === 'update') {
+			// ----------------------------------
+			//         update
+			// ----------------------------------
+
+			requestMethod = 'PATCH';
+
+			let updateAllFields: boolean;
+			let fields: string[];
+			let options: IDataObject;
+
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
+			for (let i = 0; i < items.length; i++) {
+				try {
+					updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
+					options = this.getNodeParameter('options', i, {});
+					bulkSize = (options.bulkSize as number) || bulkSize;
+
+					const row: IDataObject = {};
+					row.fields = {} as IDataObject;
+
+					if (updateAllFields) {
+						// Update all the fields the item has
+						row.fields = { ...items[i].json };
+						// remove id field
+						delete (row.fields as any).id;
+
+						if (options.ignoreFields && options.ignoreFields !== '') {
+							const ignoreFields = (options.ignoreFields as string)
+								.split(',')
+								.map((field) => field.trim())
+								.filter((field) => !!field);
+							if (ignoreFields.length) {
+								// From: https://stackoverflow.com/questions/17781472/how-to-get-a-subset-of-a-javascript-objects-properties
+								row.fields = Object.entries(items[i].json)
+									.filter(([key]) => !ignoreFields.includes(key))
+									.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
+							}
+						}
+					} else {
+						fields = this.getNodeParameter('fields', i, []) as string[];
+
+						const rowFields: IDataObject = {};
+						for (const fieldName of fields) {
+							rowFields[fieldName] = items[i].json[fieldName];
+						}
+
+						row.fields = rowFields;
+					}
+
+					row.id = this.getNodeParameter('id', i) as string;
+
+					rows.push(row);
+
+					if (rows.length === bulkSize || i === items.length - 1) {
+						endpoint = `${application}/${table}`;
+
+						// Make one request after another. This is slower but makes
+						// sure that we do not run into the rate limit they have in
+						// place and so block for 30 seconds. Later some global
+						// functionality in core should make it easy to make requests
+						// according to specific rules like not more than 5 requests
+						// per seconds.
+
+						const data = { records: rows, typecast: options.typecast ? true : false };
+
+						responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
+
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+
+						returnData.push(...executionData);
+
+						// empty rows
+						rows.length = 0;
+					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnData.push({ json: { error: error.message } });
+						continue;
+					}
+					throw error;
+				}
+			}
+		} else {
+			throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+		}
+
+		return this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/v1/GenericFunctions.ts
similarity index 100%
rename from packages/nodes-base/nodes/Airtable/GenericFunctions.ts
rename to packages/nodes-base/nodes/Airtable/v1/GenericFunctions.ts
diff --git a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
new file mode 100644
index 0000000000000..336ce44a2ddfa
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
@@ -0,0 +1,32 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+
+import { versionDescription } from './actions/versionDescription';
+import { router } from './actions/router';
+import { listSearch, loadOptions, resourceMapping } from './methods';
+
+export class AirtableV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		listSearch,
+		loadOptions,
+		resourceMapping,
+	};
+
+	async execute(this: IExecuteFunctions) {
+		return router.call(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts
new file mode 100644
index 0000000000000..11de16a87eaa6
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/Base.resource.ts
@@ -0,0 +1,37 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as getMany from './getMany.operation';
+import * as getSchema from './getSchema.operation';
+
+export { getMany, getSchema };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Get Many',
+				value: 'getMany',
+				description: 'List all the bases',
+				action: 'Get many bases',
+			},
+			{
+				name: 'Get Schema',
+				value: 'getSchema',
+				description: 'Get the schema of the tables in a base',
+				action: 'Get base schema',
+			},
+		],
+		default: 'getMany',
+		displayOptions: {
+			show: {
+				resource: ['base'],
+			},
+		},
+	},
+	...getMany.description,
+	...getSchema.description,
+];
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
new file mode 100644
index 0000000000000..d29dd10960e6c
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
@@ -0,0 +1,115 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Permission Level',
+				name: 'permissionLevel',
+				type: 'multiOptions',
+				options: [
+					{
+						name: 'Comment',
+						value: 'comment',
+					},
+					{
+						name: 'Create',
+						value: 'create',
+					},
+					{
+						name: 'Edit',
+						value: 'edit',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+					{
+						name: 'Read',
+						value: 'read',
+					},
+				],
+				default: [],
+				description: 'Filter the returned bases by one or more permission levels',
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['base'],
+		operation: ['getMany'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
+	const returnAll = this.getNodeParameter('returnAll', 0);
+
+	const endpoint = 'meta/bases';
+	let bases: IDataObject[] = [];
+
+	if (returnAll) {
+		let offset: string | undefined = undefined;
+		do {
+			const responseData = await apiRequest.call(this, 'GET', endpoint);
+			bases.push(...(responseData.bases as IDataObject[]));
+			offset = responseData.offset;
+		} while (offset);
+	} else {
+		const responseData = await apiRequest.call(this, 'GET', endpoint);
+
+		const limit = this.getNodeParameter('limit', 0);
+		if (limit && responseData.bases?.length) {
+			bases = responseData.bases.slice(0, limit);
+		}
+	}
+
+	const permissionLevel = this.getNodeParameter('options.permissionLevel', 0, []) as string[];
+	if (permissionLevel.length) {
+		bases = bases.filter((base) => permissionLevel.includes(base.permissionLevel as string));
+	}
+
+	const returnData = this.helpers.constructExecutionMetaData(wrapData(bases), {
+		itemData: { item: 0 },
+	});
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
new file mode 100644
index 0000000000000..d4ec44f614d35
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
@@ -0,0 +1,57 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+import { baseRLC } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		...baseRLC,
+		description: 'The Airtable Base to retrieve the schema from',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['base'],
+		operation: ['getSchema'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const baseId = this.getNodeParameter('base', 0, undefined, {
+				extractValue: true,
+			}) as string;
+
+			const responseData = await apiRequest.call(this, 'GET', `meta/bases/${baseId}/tables`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.tables as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
new file mode 100644
index 0000000000000..22654c8635e98
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
@@ -0,0 +1,207 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const baseRLC: INodeProperties = {
+	displayName: 'Base',
+	name: 'base',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	// description: 'The Airtable Base in which to operate on',
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'baseSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'e.g. https://airtable.com/app12DiScdfes/tbl9WvGeEPa6lZyVq/viwHdfasdfeieg5p',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https://airtable.com/([a-zA-Z0-9]{2,})/.*',
+						errorMessage: 'Not a valid Airtable Base URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://airtable.com/([a-zA-Z0-9]{2,})',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable Base ID',
+					},
+				},
+			],
+			placeholder: 'e.g. appD3dfaeidke',
+			url: '=https://airtable.com/{{$value}}',
+		},
+	],
+};
+
+export const tableRLC: INodeProperties = {
+	displayName: 'Table',
+	name: 'table',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	required: true,
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'tableSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
+						errorMessage: 'Not a valid Airtable Table URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable Table ID',
+					},
+				},
+			],
+			placeholder: 'tbl3dirwqeidke',
+		},
+	],
+};
+
+export const viewRLC: INodeProperties = {
+	displayName: 'View',
+	name: 'view',
+	type: 'resourceLocator',
+	default: { mode: 'list', value: '' },
+	modes: [
+		{
+			displayName: 'From List',
+			name: 'list',
+			type: 'list',
+			typeOptions: {
+				searchListMethod: 'viewSearch',
+				searchable: true,
+			},
+		},
+		{
+			displayName: 'By URL',
+			name: 'url',
+			type: 'string',
+			placeholder: 'https://airtable.com/app12DiScdfes/tblAAAAAAAAAAAAA/viwHdfasdfeieg5p',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})/.*',
+						errorMessage: 'Not a valid Airtable View URL',
+					},
+				},
+			],
+			extractValue: {
+				type: 'regex',
+				regex: 'https://airtable.com/[a-zA-Z0-9]{2,}/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})',
+			},
+		},
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable View ID',
+					},
+				},
+			],
+			placeholder: 'viw3dirwqeidke',
+		},
+	],
+};
+
+export const insertUpdateOptions: INodeProperties[] = [
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		options: [
+			{
+				displayName: 'Typecast',
+				name: 'typecast',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the Airtable API should attempt mapping of string values for linked records & select options',
+			},
+			{
+				displayName: 'Ignore Fields From Input',
+				name: 'ignoreFields',
+				type: 'string',
+				requiresDataPath: 'multiple',
+				displayOptions: {
+					show: {
+						'/columns.mappingMode': ['autoMapInputData'],
+					},
+				},
+				default: '',
+				description: 'Comma-separated list of fields in input to ignore when updating',
+			},
+			{
+				displayName: 'Update All Matches',
+				name: 'updateAllMatches',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to update all records matching the value in the "Column to Match On". If not set, only the first matching record will be updated.',
+				displayOptions: {
+					show: {
+						'/operation': ['update', 'upsert'],
+					},
+				},
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts b/packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts
new file mode 100644
index 0000000000000..b74b71a64c125
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/node.type.ts
@@ -0,0 +1,9 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	record: 'create' | 'upsert' | 'deleteRecord' | 'get' | 'search' | 'update';
+	base: 'getMany' | 'getSchema';
+	table: 'create';
+};
+
+export type AirtableType = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
new file mode 100644
index 0000000000000..3ac6c7e4c750e
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
@@ -0,0 +1,87 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { baseRLC, tableRLC } from '../common.descriptions';
+
+import * as create from './create.operation';
+import * as deleteRecord from './deleteRecord.operation';
+import * as get from './get.operation';
+import * as search from './search.operation';
+import * as update from './update.operation';
+import * as upsert from './upsert.operation';
+
+export { create, deleteRecord, get, search, update, upsert };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new record in a table',
+				action: 'Create a record',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-option-name-wrong-for-upsert
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+				action: 'Create or update a record',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteRecord',
+				description: 'Delete a record from a table',
+				action: 'Delete a record',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve a record from a table',
+				action: 'Get a record',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				description: 'Search for specific records or list all',
+				action: 'Search records',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a record in a table',
+				action: 'Update record',
+			},
+		],
+		default: 'read',
+		displayOptions: {
+			show: {
+				resource: ['record'],
+			},
+		},
+	},
+	{
+		...baseRLC,
+		displayOptions: {
+			show: {
+				resource: ['record'],
+			},
+		},
+	},
+	{
+		...tableRLC,
+		displayOptions: {
+			show: {
+				resource: ['record'],
+			},
+		},
+	},
+	...create.description,
+	...deleteRecord.description,
+	...get.description,
+	...search.description,
+	...update.description,
+	...upsert.description,
+];
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
new file mode 100644
index 0000000000000..801e5bbfeccef
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
@@ -0,0 +1,97 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+import { insertUpdateOptions } from '../common.descriptions';
+import { removeIgnored } from '../../helpers/utils';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		noDataExpression: true,
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'base.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getColumns',
+				mode: 'add',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+	...insertUpdateOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const endpoint = `${base}/${table}`;
+
+	const dataMode = this.getNodeParameter('columns.mappingMode', 0) as string;
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const options = this.getNodeParameter('options', i, {});
+
+			const body: IDataObject = {
+				typecast: options.typecast ? true : false,
+			};
+
+			if (dataMode === 'autoMapInputData') {
+				body.fields = removeIgnored(items[i].json, options.ignoreFields as string);
+			}
+
+			if (dataMode === 'defineBelow') {
+				const fields = this.getNodeParameter('columns.value', i, []) as IDataObject;
+
+				body.fields = fields;
+			}
+
+			const responseData = await apiRequest.call(this, 'POST', endpoint, body);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
new file mode 100644
index 0000000000000..af934a8bf0d9b
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
@@ -0,0 +1,67 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	NodeApiError,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
+import { processAirtableError } from '../../helpers/utils';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Record ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. recf7EaZp707CEc8g',
+		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
+		description:
+			'ID of the record to delete. <a href="https://support.airtable.com/docs/record-id" target="_blank">More info</a>.',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['deleteRecord'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		let id;
+		try {
+			id = this.getNodeParameter('id', i) as string;
+
+			const responseData = await apiRequest.call(this, 'DELETE', `${base}/${table}/${id}`);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, id);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
new file mode 100644
index 0000000000000..88767da22f4c9
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
@@ -0,0 +1,103 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	NodeApiError,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest, downloadRecordAttachments } from '../../transport';
+import { flattenOutput, processAirtableError } from '../../helpers/utils';
+import type { IRecord } from '../../helpers/interfaces';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Record ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		placeholder: 'e.g. recf7EaZp707CEc8g',
+		required: true,
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
+		description:
+			'ID of the record to get. <a href="https://support.airtable.com/docs/record-id" target="_blank">More info</a>.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		description: 'Additional options which decide which records should be returned',
+		placeholder: 'Add Option',
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Download Attachments',
+				name: 'downloadFields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getAttachmentColumns',
+					loadOptionsDependsOn: ['base.value', 'table.value'],
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description: "The fields of type 'attachment' that should be downloaded",
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		let id;
+		try {
+			id = this.getNodeParameter('id', i) as string;
+
+			const responseData = await apiRequest.call(this, 'GET', `${base}/${table}/${id}`);
+
+			const options = this.getNodeParameter('options', 0, {});
+
+			if (options.downloadFields) {
+				const itemWithAttachments = await downloadRecordAttachments.call(
+					this,
+					[responseData] as IRecord[],
+					options.downloadFields as string[],
+				);
+				returnData.push(...itemWithAttachments);
+				continue;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(flattenOutput(responseData as IDataObject)),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, id);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { error: error.message } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
new file mode 100644
index 0000000000000..a46aedf182fa8
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
@@ -0,0 +1,220 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
+import type { IRecord } from '../../helpers/interfaces';
+import { flattenOutput } from '../../helpers/utils';
+import { viewRLC } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Filter By Formula',
+		name: 'filterByFormula',
+		type: 'string',
+		default: '',
+		placeholder: "e.g. NOT({Name} = 'Admin')",
+		hint: 'If empty, all the records will be returned',
+		description:
+			'The formula will be evaluated for each record, and if the result is not 0, false, "", NaN, [], or #Error! the record will be included in the response. <a href="https://support.airtable.com/docs/formula-field-reference" target="_blank">More info</a>.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: true,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		default: {},
+		description: 'Additional options which decide which records should be returned',
+		placeholder: 'Add Option',
+		options: [
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Download Attachments',
+				name: 'downloadFields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getAttachmentColumns',
+					loadOptionsDependsOn: ['base.value', 'table.value'],
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description: "The fields of type 'attachment' that should be downloaded",
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+				displayName: 'Output Fields',
+				name: 'fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+					loadOptionsDependsOn: ['base.value', 'table.value'],
+				},
+				default: [],
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+				description: 'The fields you want to include in the output',
+			},
+			viewRLC,
+		],
+	},
+	{
+		displayName: 'Sort',
+		name: 'sort',
+		placeholder: 'Add Sort Rule',
+		description: 'Defines how the returned records should be ordered',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				name: 'property',
+				displayName: 'Property',
+				values: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
+						displayName: 'Field',
+						name: 'field',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getColumns',
+							loadOptionsDependsOn: ['base.value', 'table.value'],
+						},
+						default: '',
+						description:
+							'Name of the field to sort on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Direction',
+						name: 'direction',
+						type: 'options',
+						options: [
+							{
+								name: 'ASC',
+								value: 'asc',
+								description: 'Sort in ascending order (small -> large)',
+							},
+							{
+								name: 'DESC',
+								value: 'desc',
+								description: 'Sort in descending order (large -> small)',
+							},
+						],
+						default: 'asc',
+						description: 'The sort direction',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['search'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	let returnData: INodeExecutionData[] = [];
+
+	const body: IDataObject = {};
+	const qs: IDataObject = {};
+
+	const endpoint = `${base}/${table}`;
+
+	try {
+		const returnAll = this.getNodeParameter('returnAll', 0);
+		const options = this.getNodeParameter('options', 0, {});
+		const sort = this.getNodeParameter('sort', 0, {}) as IDataObject;
+		const filterByFormula = this.getNodeParameter('filterByFormula', 0) as string;
+
+		if (filterByFormula) {
+			qs.filterByFormula = filterByFormula;
+		}
+
+		if (options.fields) {
+			if (typeof options.fields === 'string') {
+				qs.fields = options.fields.split(',').map((field) => field.trim());
+			} else {
+				qs.fields = options.fields as string[];
+			}
+		}
+
+		if (sort.property) {
+			qs.sort = sort.property;
+		}
+
+		if (options.view) {
+			qs.view = (options.view as IDataObject).value as string;
+		}
+
+		let responseData;
+
+		if (returnAll) {
+			responseData = await apiRequestAllItems.call(this, 'GET', endpoint, body, qs);
+		} else {
+			qs.maxRecords = this.getNodeParameter('limit', 0);
+			responseData = await apiRequest.call(this, 'GET', endpoint, body, qs);
+		}
+
+		returnData = responseData.records as INodeExecutionData[];
+
+		if (options.downloadFields) {
+			return await downloadRecordAttachments.call(
+				this,
+				responseData.records as IRecord[],
+				options.downloadFields as string[],
+			);
+		}
+
+		returnData = returnData.map((record) => ({
+			json: flattenOutput(record as IDataObject),
+		}));
+
+		returnData = this.helpers.constructExecutionMetaData(returnData, {
+			itemData: { item: 0 },
+		});
+	} catch (error) {
+		if (this.continueOnFail()) {
+			returnData.push({ json: { message: error.message, error } });
+		} else {
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
new file mode 100644
index 0000000000000..7c3f431cfe53d
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
@@ -0,0 +1,150 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	NodeApiError,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequestAllItems, batchUpdate } from '../../transport';
+import { findMatches, processAirtableError, removeIgnored } from '../../helpers/utils';
+import type { UpdateRecord } from '../../helpers/interfaces';
+import { insertUpdateOptions } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'base.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getColumnsWithRecordId',
+				mode: 'update',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+	...insertUpdateOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const endpoint = `${base}/${table}`;
+
+	const dataMode = this.getNodeParameter('columns.mappingMode', 0) as string;
+
+	const columnsToMatchOn = this.getNodeParameter('columns.matchingColumns', 0) as string[];
+
+	let tableData: UpdateRecord[] = [];
+	if (!columnsToMatchOn.includes('id')) {
+		const response = await apiRequestAllItems.call(
+			this,
+			'GET',
+			endpoint,
+			{},
+			{ fields: columnsToMatchOn },
+		);
+		tableData = response.records as UpdateRecord[];
+	}
+
+	for (let i = 0; i < items.length; i++) {
+		let recordId = '';
+		try {
+			const records: UpdateRecord[] = [];
+			const options = this.getNodeParameter('options', i, {});
+
+			if (dataMode === 'autoMapInputData') {
+				if (columnsToMatchOn.includes('id')) {
+					const { id, ...fields } = items[i].json;
+					recordId = id as string;
+
+					records.push({
+						id: recordId,
+						fields: removeIgnored(fields, options.ignoreFields as string),
+					});
+				} else {
+					const matches = findMatches(
+						tableData,
+						columnsToMatchOn,
+						items[i].json,
+						options.updateAllMatches as boolean,
+					);
+
+					for (const match of matches) {
+						const id = match.id as string;
+						const fields = items[i].json;
+						records.push({ id, fields: removeIgnored(fields, options.ignoreFields as string) });
+					}
+				}
+			}
+
+			if (dataMode === 'defineBelow') {
+				if (columnsToMatchOn.includes('id')) {
+					const { id, ...fields } = this.getNodeParameter('columns.value', i, []) as IDataObject;
+					records.push({ id: id as string, fields });
+				} else {
+					const fields = this.getNodeParameter('columns.value', i, []) as IDataObject;
+
+					const matches = findMatches(
+						tableData,
+						columnsToMatchOn,
+						fields,
+						options.updateAllMatches as boolean,
+					);
+
+					for (const match of matches) {
+						const id = match.id as string;
+						records.push({ id, fields: removeIgnored(fields, columnsToMatchOn) });
+					}
+				}
+			}
+
+			const body: IDataObject = { typecast: options.typecast ? true : false };
+
+			const responseData = await batchUpdate.call(this, endpoint, body, records);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.records as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			error = processAirtableError(error as NodeApiError, recordId);
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
new file mode 100644
index 0000000000000..b91cfa03372a1
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
@@ -0,0 +1,158 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { apiRequest, apiRequestAllItems, batchUpdate } from '../../transport';
+import { removeIgnored } from '../../helpers/utils';
+import type { UpdateRecord } from '../../helpers/interfaces';
+import { insertUpdateOptions } from '../common.descriptions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Columns',
+		name: 'columns',
+		type: 'resourceMapper',
+		noDataExpression: true,
+		default: {
+			mappingMode: 'defineBelow',
+			value: null,
+		},
+		required: true,
+		typeOptions: {
+			loadOptionsDependsOn: ['table.value', 'base.value'],
+			resourceMapper: {
+				resourceMapperMethod: 'getColumnsWithRecordId',
+				mode: 'update',
+				fieldWords: {
+					singular: 'column',
+					plural: 'columns',
+				},
+				addAllFields: true,
+				multiKeyMatch: true,
+			},
+		},
+	},
+	...insertUpdateOptions,
+];
+
+const displayOptions = {
+	show: {
+		resource: ['record'],
+		operation: ['upsert'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+	base: string,
+	table: string,
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	const endpoint = `${base}/${table}`;
+
+	const dataMode = this.getNodeParameter('columns.mappingMode', 0) as string;
+
+	const columnsToMatchOn = this.getNodeParameter('columns.matchingColumns', 0) as string[];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const records: UpdateRecord[] = [];
+			const options = this.getNodeParameter('options', i, {});
+
+			if (dataMode === 'autoMapInputData') {
+				if (columnsToMatchOn.includes('id')) {
+					const { id, ...fields } = items[i].json;
+
+					records.push({
+						id: id as string,
+						fields: removeIgnored(fields, options.ignoreFields as string),
+					});
+				} else {
+					records.push({ fields: removeIgnored(items[i].json, options.ignoreFields as string) });
+				}
+			}
+
+			if (dataMode === 'defineBelow') {
+				const fields = this.getNodeParameter('columns.value', i, []) as IDataObject;
+
+				if (columnsToMatchOn.includes('id')) {
+					const id = fields.id as string;
+					delete fields.id;
+					records.push({ id, fields });
+				} else {
+					records.push({ fields });
+				}
+			}
+
+			const body: IDataObject = {
+				typecast: options.typecast ? true : false,
+			};
+
+			if (!columnsToMatchOn.includes('id')) {
+				body.performUpsert = { fieldsToMergeOn: columnsToMatchOn };
+			}
+
+			let responseData;
+			try {
+				responseData = await batchUpdate.call(this, endpoint, body, records);
+			} catch (error) {
+				if (error.httpCode === '422' && columnsToMatchOn.includes('id')) {
+					const createBody = {
+						...body,
+						records: records.map(({ fields }) => ({ fields })),
+					};
+					responseData = await apiRequest.call(this, 'POST', endpoint, createBody);
+				} else if (error?.description?.includes('Cannot update more than one record')) {
+					const conditions = columnsToMatchOn
+						.map((column) => `{${column}} = '${records[0].fields[column]}'`)
+						.join(',');
+					const response = await apiRequestAllItems.call(
+						this,
+						'GET',
+						endpoint,
+						{},
+						{
+							fields: columnsToMatchOn,
+							filterByFormula: `AND(${conditions})`,
+						},
+					);
+					const matches = response.records as UpdateRecord[];
+
+					const updateRecords: UpdateRecord[] = [];
+
+					if (options.updateAllMatches) {
+						updateRecords.push(...matches.map(({ id }) => ({ id, fields: records[0].fields })));
+					} else {
+						updateRecords.push({ id: matches[0].id, fields: records[0].fields });
+					}
+
+					responseData = await batchUpdate.call(this, endpoint, body, updateRecords);
+				} else {
+					throw error;
+				}
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.records as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/router.ts b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
new file mode 100644
index 0000000000000..64262e08612f1
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
@@ -0,0 +1,59 @@
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import type { AirtableType } from './node.type';
+
+import * as record from './record/Record.resource';
+import * as base from './base/Base.resource';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	let returnData: INodeExecutionData[] = [];
+
+	const items = this.getInputData();
+	const resource = this.getNodeParameter<AirtableType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const airtableNodeData = {
+		resource,
+		operation,
+	} as AirtableType;
+
+	try {
+		switch (airtableNodeData.resource) {
+			case 'record':
+				const baseId = this.getNodeParameter('base', 0, undefined, {
+					extractValue: true,
+				}) as string;
+
+				const table = encodeURI(
+					this.getNodeParameter('table', 0, undefined, {
+						extractValue: true,
+					}) as string,
+				);
+				returnData = await record[airtableNodeData.operation].execute.call(
+					this,
+					items,
+					baseId,
+					table,
+				);
+				break;
+			case 'base':
+				returnData = await base[airtableNodeData.operation].execute.call(this, items);
+				break;
+			default:
+				throw new NodeOperationError(
+					this.getNode(),
+					`The operation "${operation}" is not supported!`,
+				);
+		}
+	} catch (error) {
+		if (
+			error.description &&
+			(error.description as string).includes('cannot accept the provided value')
+		) {
+			error.description = `${error.description}. Consider using 'Typecast' option`;
+		}
+		throw error;
+	}
+
+	return this.prepareOutputData(returnData);
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..3665469456b4c
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
@@ -0,0 +1,81 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as record from './record/Record.resource';
+import * as base from './base/Base.resource';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Airtable',
+	name: 'airtable',
+	icon: 'file:airtable.svg',
+	group: ['input'],
+	version: 2,
+	subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
+	description: 'Read, update, write and delete data from Airtable',
+	defaults: {
+		name: 'Airtable',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'airtableTokenApi',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableTokenApi'],
+				},
+			},
+		},
+		{
+			name: 'airtableOAuth2Api',
+			required: true,
+			displayOptions: {
+				show: {
+					authentication: ['airtableOAuth2Api'],
+				},
+			},
+		},
+	],
+	properties: [
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'options',
+			options: [
+				{
+					name: 'Access Token',
+					value: 'airtableTokenApi',
+				},
+				{
+					name: 'OAuth2',
+					value: 'airtableOAuth2Api',
+				},
+			],
+			default: 'airtableTokenApi',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Base',
+					value: 'base',
+				},
+				{
+					name: 'Record',
+					value: 'record',
+				},
+				// {
+				// 	name: 'Table',
+				// 	value: 'table',
+				// },
+			],
+			default: 'record',
+		},
+		...record.description,
+		...base.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts
new file mode 100644
index 0000000000000..882f8f9212487
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/interfaces.ts
@@ -0,0 +1,25 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export interface IAttachment {
+	url: string;
+	filename: string;
+	type: string;
+}
+
+export interface IRecord {
+	fields: {
+		[key: string]: string | IAttachment[];
+	};
+}
+
+export type UpdateRecord = {
+	fields: IDataObject;
+	id?: string;
+};
+export type UpdateBody = {
+	records: UpdateRecord[];
+	performUpsert?: {
+		fieldsToMergeOn: string[];
+	};
+	typecast?: boolean;
+};
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
new file mode 100644
index 0000000000000..fb43c3df4ac06
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
@@ -0,0 +1,83 @@
+import type { IDataObject, NodeApiError } from 'n8n-workflow';
+import type { UpdateRecord } from './interfaces';
+
+export function removeIgnored(data: IDataObject, ignore: string | string[]) {
+	if (ignore) {
+		let ignoreFields: string[] = [];
+
+		if (typeof ignore === 'string') {
+			ignoreFields = ignore.split(',').map((field) => field.trim());
+		} else {
+			ignoreFields = ignore;
+		}
+
+		const newData: IDataObject = {};
+
+		for (const field of Object.keys(data)) {
+			if (!ignoreFields.includes(field)) {
+				newData[field] = data[field];
+			}
+		}
+
+		return newData;
+	} else {
+		return data;
+	}
+}
+
+export function findMatches(
+	data: UpdateRecord[],
+	keys: string[],
+	fields: IDataObject,
+	updateAll?: boolean,
+) {
+	if (updateAll) {
+		const matches = data.filter((record) => {
+			for (const key of keys) {
+				if (record.fields[key] !== fields[key]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+		if (!matches?.length) {
+			throw new Error('No records match provided keys');
+		}
+
+		return matches;
+	} else {
+		const match = data.find((record) => {
+			for (const key of keys) {
+				if (record.fields[key] !== fields[key]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+		if (!match) {
+			throw new Error('Record matching provided keys was not found');
+		}
+
+		return [match];
+	}
+}
+
+export function processAirtableError(error: NodeApiError, id?: string) {
+	if (error.description === 'NOT_FOUND' && id) {
+		error.description = `${id} is not a valid Record ID`;
+	}
+	if (error.description?.includes('You must provide an array of up to 10 record objects') && id) {
+		error.description = `${id} is not a valid Record ID`;
+	}
+	return error;
+}
+
+export const flattenOutput = (record: IDataObject) => {
+	const { fields, ...rest } = record;
+	return {
+		...rest,
+		...(fields as IDataObject),
+	};
+};
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/index.ts b/packages/nodes-base/nodes/Airtable/v2/methods/index.ts
new file mode 100644
index 0000000000000..9c4a59c911ccc
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/index.ts
@@ -0,0 +1,3 @@
+export * as listSearch from './listSearch';
+export * as loadOptions from './loadOptions';
+export * as resourceMapping from './resourceMapping';
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
new file mode 100644
index 0000000000000..3b0f0a60d89f3
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
@@ -0,0 +1,149 @@
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { apiRequest } from '../transport';
+
+export async function baseSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let qs;
+	if (paginationToken) {
+		qs = {
+			offset: paginationToken,
+		};
+	}
+
+	const response = await apiRequest.call(this, 'GET', 'meta/bases', undefined, qs);
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const base of response.bases || []) {
+			if ((base.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: base.name as string,
+					value: base.id as string,
+					url: `https://airtable.com/${base.id}`,
+				});
+			}
+		}
+
+		return {
+			results,
+			paginationToken: response.offset,
+		};
+	} else {
+		return {
+			results: (response.bases || []).map((base: IDataObject) => ({
+				name: base.name as string,
+				value: base.id as string,
+				url: `https://airtable.com/${base.id}`,
+			})),
+			paginationToken: response.offset,
+		};
+	}
+}
+
+export async function tableSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const baseId = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	let qs;
+	if (paginationToken) {
+		qs = {
+			offset: paginationToken,
+		};
+	}
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${baseId}/tables`, undefined, qs);
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const table of response.tables || []) {
+			if ((table.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: table.name as string,
+					value: table.id as string,
+					url: `https://airtable.com/${baseId}/${table.id}`,
+				});
+			}
+		}
+
+		return {
+			results,
+			paginationToken: response.offset,
+		};
+	} else {
+		return {
+			results: (response.tables || []).map((table: IDataObject) => ({
+				name: table.name as string,
+				value: table.id as string,
+				url: `https://airtable.com/${baseId}/${table.id}`,
+			})),
+			paginationToken: response.offset,
+		};
+	}
+}
+
+export async function viewSearch(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const baseId = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${baseId}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+	}
+
+	if (filter) {
+		const results: INodeListSearchItems[] = [];
+
+		for (const view of (tableData.views as IDataObject[]) || []) {
+			if ((view.name as string)?.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: view.name as string,
+					value: view.id as string,
+					url: `https://airtable.com/${baseId}/${tableId}/${view.id}`,
+				});
+			}
+		}
+
+		return {
+			results,
+		};
+	} else {
+		return {
+			results: ((tableData.views as IDataObject[]) || []).map((view) => ({
+				name: view.name as string,
+				value: view.id as string,
+				url: `https://airtable.com/${baseId}/${tableId}/${view.id}`,
+			})),
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
new file mode 100644
index 0000000000000..7f2f00f33fe2a
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
@@ -0,0 +1,99 @@
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { apiRequest } from '../transport';
+
+export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const base = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${base}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+	}
+
+	const result: INodePropertyOptions[] = [];
+
+	for (const field of tableData.fields as IDataObject[]) {
+		result.push({
+			name: field.name as string,
+			value: field.name as string,
+			description: `Type: ${field.type}`,
+		});
+	}
+
+	return result;
+}
+
+export async function getColumnsWithRecordId(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData = await getColumns.call(this);
+	return [
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased-id, n8n-nodes-base/node-param-display-name-miscased
+			name: 'id',
+			value: 'id' as string,
+			description: 'Type: primaryFieldId',
+		},
+		...returnData,
+	];
+}
+
+export async function getColumnsWithoutColumnToMatchOn(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const columnToMatchOn = this.getNodeParameter('columnToMatchOn') as string;
+	const returnData = await getColumns.call(this);
+	return returnData.filter((column) => column.value !== columnToMatchOn);
+}
+
+export async function getAttachmentColumns(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const base = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${base}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+	}
+
+	const result: INodePropertyOptions[] = [];
+
+	for (const field of tableData.fields as IDataObject[]) {
+		if (!(field.type as string)?.toLowerCase()?.includes('attachment')) {
+			continue;
+		}
+		result.push({
+			name: field.name as string,
+			value: field.name as string,
+			description: `Type: ${field.type}`,
+		});
+	}
+
+	return result;
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
new file mode 100644
index 0000000000000..abe6b9030363e
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
@@ -0,0 +1,136 @@
+import type {
+	FieldType,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	ResourceMapperField,
+	ResourceMapperFields,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { apiRequest } from '../transport';
+
+type AirtableSchema = {
+	id: string;
+	name: string;
+	type: string;
+	options?: IDataObject;
+};
+
+type TypesMap = Partial<Record<FieldType, string[]>>;
+
+const airtableReadOnlyFields = [
+	'autoNumber',
+	'button',
+	'count',
+	'createdBy',
+	'createdTime',
+	'formula',
+	'lastModifiedBy',
+	'lastModifiedTime',
+	'lookup',
+	'rollup',
+	'externalSyncSource',
+	'multipleLookupValues',
+	'multipleRecordLinks',
+];
+
+const airtableTypesMap: TypesMap = {
+	string: ['singleLineText', 'multilineText', 'richText', 'email', 'phoneNumber', 'url'],
+	number: ['rating', 'percent', 'number', 'duration', 'currency'],
+	boolean: ['checkbox'],
+	dateTime: ['dateTime', 'date'],
+	time: [],
+	object: ['multipleAttachments'],
+	options: ['singleSelect'],
+	array: ['multipleSelects'],
+};
+
+function mapForeignType(foreignType: string, typesMap: TypesMap): FieldType {
+	let type: FieldType = 'string';
+
+	for (const nativeType of Object.keys(typesMap)) {
+		const mappedForeignTypes = typesMap[nativeType as FieldType];
+
+		if (mappedForeignTypes?.includes(foreignType)) {
+			type = nativeType as FieldType;
+			break;
+		}
+	}
+
+	return type;
+}
+
+export async function getColumns(this: ILoadOptionsFunctions): Promise<ResourceMapperFields> {
+	const base = this.getNodeParameter('base', undefined, {
+		extractValue: true,
+	}) as string;
+
+	const tableId = encodeURI(
+		this.getNodeParameter('table', undefined, {
+			extractValue: true,
+		}) as string,
+	);
+
+	const response = await apiRequest.call(this, 'GET', `meta/bases/${base}/tables`);
+
+	const tableData = ((response.tables as IDataObject[]) || []).find((table: IDataObject) => {
+		return table.id === tableId;
+	});
+
+	if (!tableData) {
+		throw new NodeOperationError(this.getNode(), 'Table information could not be found!');
+	}
+
+	const fields: ResourceMapperField[] = [];
+
+	const constructOptions = (field: AirtableSchema) => {
+		if (field?.options?.choices) {
+			return (field.options.choices as IDataObject[]).map((choice) => ({
+				name: choice.name,
+				value: choice.name,
+			})) as INodePropertyOptions[];
+		}
+
+		return undefined;
+	};
+
+	for (const field of tableData.fields as AirtableSchema[]) {
+		const type = mapForeignType(field.type, airtableTypesMap);
+		const isReadOnly = airtableReadOnlyFields.includes(field.type);
+		const options = constructOptions(field);
+		fields.push({
+			id: field.name,
+			displayName: field.name,
+			required: false,
+			defaultMatch: false,
+			canBeUsedToMatch: true,
+			display: true,
+			type,
+			options,
+			readOnly: isReadOnly,
+			removed: isReadOnly,
+		});
+	}
+
+	return { fields };
+}
+
+export async function getColumnsWithRecordId(
+	this: ILoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const returnData = await getColumns.call(this);
+	return {
+		fields: [
+			{
+				id: 'id',
+				displayName: 'id',
+				required: false,
+				defaultMatch: true,
+				display: true,
+				type: 'string',
+				readOnly: true,
+			},
+			...returnData.fields,
+		],
+	};
+}
diff --git a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
new file mode 100644
index 0000000000000..63ea8757f865d
--- /dev/null
+++ b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
@@ -0,0 +1,164 @@
+import type { OptionsWithUri } from 'request';
+
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	IPollFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+} from 'n8n-workflow';
+import type { IAttachment, IRecord } from '../helpers/interfaces';
+import { flattenOutput } from '../helpers/utils';
+
+/**
+ * Make an API request to Airtable
+ *
+ */
+export async function apiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	query?: IDataObject,
+	uri?: string,
+	option: IDataObject = {},
+) {
+	query = query || {};
+
+	const options: OptionsWithUri = {
+		headers: {},
+		method,
+		body,
+		qs: query,
+		uri: uri || `https://api.airtable.com/v0/${endpoint}`,
+		useQuerystring: false,
+		json: true,
+	};
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+
+	const authenticationMethod = this.getNodeParameter('authentication', 0) as string;
+	return this.helpers.requestWithAuthentication.call(this, authenticationMethod, options);
+}
+
+/**
+ * Make an API request to paginated Airtable endpoint
+ * and return all results
+ *
+ * @param {(IExecuteFunctions | IExecuteFunctions)} this
+ */
+export async function apiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
+	method: string,
+	endpoint: string,
+	body?: IDataObject,
+	query?: IDataObject,
+) {
+	if (query === undefined) {
+		query = {};
+	}
+	query.pageSize = 100;
+
+	const returnData: IDataObject[] = [];
+
+	let responseData;
+
+	do {
+		responseData = await apiRequest.call(this, method, endpoint, body, query);
+		returnData.push.apply(returnData, responseData.records as IDataObject[]);
+
+		query.offset = responseData.offset;
+	} while (responseData.offset !== undefined);
+
+	return {
+		records: returnData,
+	};
+}
+
+export async function downloadRecordAttachments(
+	this: IExecuteFunctions | IPollFunctions,
+	records: IRecord[],
+	fieldNames: string | string[],
+): Promise<INodeExecutionData[]> {
+	if (typeof fieldNames === 'string') {
+		fieldNames = fieldNames.split(',').map((item) => item.trim());
+	}
+	if (!fieldNames.length) {
+		throw new Error("Specify field to download in 'Download Attachments' option");
+	}
+	const elements: INodeExecutionData[] = [];
+	for (const record of records) {
+		const element: INodeExecutionData = { json: {}, binary: {} };
+		element.json = flattenOutput(record as unknown as IDataObject);
+		for (const fieldName of fieldNames) {
+			if (record.fields[fieldName] !== undefined) {
+				for (const [index, attachment] of (record.fields[fieldName] as IAttachment[]).entries()) {
+					const file = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
+						json: false,
+						encoding: null,
+					});
+					element.binary![`${fieldName}_${index}`] = await this.helpers.prepareBinaryData(
+						Buffer.from(file as string),
+						attachment.filename,
+						attachment.type,
+					);
+				}
+			}
+		}
+		if (Object.keys(element.binary as IBinaryKeyData).length === 0) {
+			delete element.binary;
+		}
+		elements.push(element);
+	}
+	return elements;
+}
+
+export async function batchUpdate(
+	this: IExecuteFunctions | IPollFunctions,
+	endpoint: string,
+	body: IDataObject,
+	updateRecords: IDataObject[],
+) {
+	if (!updateRecords.length) {
+		return { records: [] };
+	}
+
+	let responseData: IDataObject;
+
+	if (updateRecords.length && updateRecords.length <= 10) {
+		const updateBody = {
+			...body,
+			records: updateRecords,
+		};
+
+		responseData = await apiRequest.call(this, 'PATCH', endpoint, updateBody);
+		return responseData;
+	}
+
+	const batchSize = 10;
+	const batches = Math.ceil(updateRecords.length / batchSize);
+	const updatedRecords: IDataObject[] = [];
+
+	for (let j = 0; j < batches; j++) {
+		const batch = updateRecords.slice(j * batchSize, (j + 1) * batchSize);
+
+		const updateBody = {
+			...body,
+			records: batch,
+		};
+
+		const updateResponse = await apiRequest.call(this, 'PATCH', endpoint, updateBody);
+		updatedRecords.push(...((updateResponse.records as IDataObject[]) || []));
+	}
+
+	responseData = { records: updatedRecords };
+
+	return responseData;
+}

From 949937d0f7c65990784fc205087dfc0f3a7ae5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:51:22 +0200
Subject: [PATCH 015/116] fix(core): Deleting manual executions should defer
 deleting binary data (#6680)

deleting manual executions should defer deleting binary data
---
 .../cli/src/WorkflowExecuteAdditionalData.ts   |  2 +-
 .../repositories/execution.repository.ts       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index b55d8a039fe67..2ad83109fc03b 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -578,7 +578,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 
 					if (isManualMode && !saveManualExecutions && !fullRunData.waitTill) {
 						// Data is always saved, so we remove from database
-						await Container.get(ExecutionRepository).deleteExecution(this.executionId);
+						await Container.get(ExecutionRepository).deleteExecution(this.executionId, true);
 
 						return;
 					}
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index 5db7130aca476..07215d4701908 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -66,11 +66,11 @@ function parseFiltersToQueryBuilder(
 
 @Service()
 export class ExecutionRepository extends Repository<ExecutionEntity> {
-	private executionDataRepository: ExecutionDataRepository;
-
-	constructor(dataSource: DataSource, executionDataRepository: ExecutionDataRepository) {
+	constructor(
+		dataSource: DataSource,
+		private readonly executionDataRepository: ExecutionDataRepository,
+	) {
 		super(ExecutionEntity, dataSource.manager);
-		this.executionDataRepository = executionDataRepository;
 	}
 
 	async findMultipleExecutions(
@@ -238,9 +238,13 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		}
 	}
 
-	async deleteExecution(executionId: string) {
-		// TODO: Should this be awaited? Should we add a catch in case it fails?
-		await BinaryDataManager.getInstance().deleteBinaryDataByExecutionIds([executionId]);
+	async deleteExecution(executionId: string, deferBinaryDataDeletion = false) {
+		const binaryDataManager = BinaryDataManager.getInstance();
+		if (deferBinaryDataDeletion) {
+			await binaryDataManager.markDataForDeletionByExecutionId(executionId);
+		} else {
+			await binaryDataManager.deleteBinaryDataByExecutionIds([executionId]);
+		}
 		return this.delete({ id: executionId });
 	}
 

From 64b48a2955f51b5109793a1d7c2b8397406a0498 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 18 Jul 2023 11:18:07 +0200
Subject: [PATCH 016/116] fix(editor): Add paywall state to non owner users for
 Variables (#6679)

* fix(editor): Add paywall state to non owner users for Variables

* fix(editor): Add variables view tests

* fix(editor): remove link from paywall state for non owner

* fix(editor): fix displaying logic
---
 .../src/plugins/i18n/locales/en.json          |  2 +
 .../editor-ui/src/views/VariablesView.vue     | 15 ++++-
 .../src/views/__tests__/VariablesView.spec.ts | 67 ++++++++++++++++---
 3 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 395ca54776318..327c6a8bfefbe 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1747,6 +1747,8 @@
 	"variables.empty.heading.userNotSetup": "Set up a variable",
 	"variables.empty.description": "Variables can be used to store data that can be referenced easily across multiple workflows.",
 	"variables.empty.button": "Add first variable",
+	"variables.empty.notAllowedToCreate.heading": "{name}, start using variables",
+	"variables.empty.notAllowedToCreate.description": "Ask your n8n instance owner to create the variables you need. Once configured, you can utilize them in your workflows using the syntax $vars.MY_VAR.",
 	"variables.noResults": "No variables found",
 	"variables.sort.nameAsc": "Sort by name (A-Z)",
 	"variables.sort.nameDesc": "Sort by name (Z-A)",
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 9d7442f2e02fd..9e1f742f8a512 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -278,8 +278,9 @@ onBeforeUnmount(() => {
 				@click="goToUpgrade"
 			/>
 		</template>
-		<template v-if="!isFeatureEnabled" #empty>
+		<template v-if="!isFeatureEnabled || (isFeatureEnabled && !canCreateVariables)" #empty>
 			<n8n-action-box
+				v-if="!isFeatureEnabled"
 				data-test-id="unavailable-resources-list"
 				emoji="👋"
 				:heading="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.title)"
@@ -290,6 +291,18 @@ onBeforeUnmount(() => {
 				buttonType="secondary"
 				@click="goToUpgrade"
 			/>
+			<n8n-action-box
+				v-else-if="!canCreateVariables"
+				data-test-id="cannot-create-variables"
+				emoji="👋"
+				:heading="
+					$locale.baseText('variables.empty.notAllowedToCreate.heading', {
+						interpolate: { name: usersStore.currentUser.firstName },
+					})
+				"
+				:description="$locale.baseText('variables.empty.notAllowedToCreate.description')"
+				@click="goToUpgrade"
+			/>
 		</template>
 		<template #default="{ data }">
 			<VariablesRow
diff --git a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
index 99833feaae530..6afc35de1edcd 100644
--- a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
+++ b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
@@ -1,13 +1,16 @@
-import { afterAll, beforeAll } from 'vitest';
+import { afterAll, beforeAll, vi } from 'vitest';
 import { setActivePinia, createPinia } from 'pinia';
+import { waitFor } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
 import VariablesView from '@/views/VariablesView.vue';
 import { useSettingsStore, useUsersStore } from '@/stores';
 import { renderComponent } from '@/__tests__/utils';
 
-describe('store', () => {
+describe('VariablesView', () => {
 	let server: ReturnType<typeof setupServer>;
 	let pinia: ReturnType<typeof createPinia>;
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let usersStore: ReturnType<typeof useUsersStore>;
 
 	beforeAll(() => {
 		server = setupServer();
@@ -17,9 +20,11 @@ describe('store', () => {
 		pinia = createPinia();
 		setActivePinia(pinia);
 
-		await useSettingsStore().getSettings();
-		await useUsersStore().fetchUsers();
-		await useUsersStore().loginWithCookie();
+		settingsStore = useSettingsStore();
+		usersStore = useUsersStore();
+		await settingsStore.getSettings();
+		await usersStore.fetchUsers();
+		await usersStore.loginWithCookie();
 	});
 
 	afterAll(() => {
@@ -32,11 +37,51 @@ describe('store', () => {
 		expect(wrapper.container.querySelectorAll('.n8n-loading')).toHaveLength(3);
 	});
 
-	it('should render empty state', async () => {
-		const wrapper = renderComponent(VariablesView, { pinia });
+	describe('should render empty state', () => {
+		it('when feature is enabled and logged in user is owner', async () => {
+			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
+				isOwner: true,
+			});
+
+			const { queryByTestId } = renderComponent(VariablesView, { pinia });
+
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).toBeVisible();
+				expect(queryByTestId('unavailable-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('cannot-create-variables')).not.toBeInTheDocument();
+			});
+		});
+
+		it('when feature is disabled and logged in user is owner', async () => {
+			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(false);
+			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
+				isOwner: true,
+			});
+
+			const { queryByTestId } = renderComponent(VariablesView, { pinia });
+
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('unavailable-resources-list')).toBeVisible();
+				expect(queryByTestId('cannot-create-variables')).not.toBeInTheDocument();
+			});
+		});
+
+		it('when feature is eanbled and logged in user is not owner', async () => {
+			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
+				isDefaultUser: true,
+			});
+
+			const { queryByTestId } = renderComponent(VariablesView, { pinia });
 
-		await wrapper.findByTestId('empty-resources-list');
-		expect(wrapper.getByTestId('empty-resources-list')).toBeVisible();
+			await waitFor(() => {
+				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('unavailable-resources-list')).not.toBeInTheDocument();
+				expect(queryByTestId('cannot-create-variables')).toBeVisible();
+			});
+		});
 	});
 
 	it('should render variable entries', async () => {
@@ -44,8 +89,8 @@ describe('store', () => {
 
 		const wrapper = renderComponent(VariablesView, { pinia });
 
-		await wrapper.findByTestId('resources-table');
-		expect(wrapper.getByTestId('resources-table')).toBeVisible();
+		const table = await wrapper.findByTestId('resources-table');
+		expect(table).toBeVisible();
 		expect(wrapper.container.querySelectorAll('tr')).toHaveLength(4);
 	});
 });

From 551b9a894db979ad7b33acfe61f845f8f2f7868d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 18 Jul 2023 11:28:24 +0200
Subject: [PATCH 017/116] refactor(core): Refactor WorkflowStatistics code
 (no-changelog) (#6617)

refactor(core): Refactor WorkflowStatistics code
---
 packages/cli/src/Interfaces.ts                |  14 --
 packages/cli/src/InternalHooks.ts             |  11 +-
 packages/cli/src/Server.ts                    |  12 +-
 packages/cli/src/WebhookHelpers.ts            |   7 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  61 ++----
 packages/cli/src/api/workflowStats.api.ts     | 187 ------------------
 packages/cli/src/commands/execute.ts          |   4 -
 packages/cli/src/commands/executeBatch.ts     |   4 -
 packages/cli/src/controllers/index.ts         |   1 +
 .../workflowStatistics.controller.ts          | 124 ++++++++++++
 .../workflowStatistics.repository.ts          |  86 +++++++-
 .../eventbus/MessageEventBus/recoverEvents.ts |  13 +-
 packages/cli/src/events/WorkflowStatistics.ts | 187 ------------------
 packages/cli/src/events/index.ts              |  14 --
 packages/cli/src/push/abstract.push.ts        |   2 -
 packages/cli/src/push/index.ts                |   4 +-
 packages/cli/src/services/events.service.ts   | 123 ++++++++++++
 .../events.service.test.ts}                   | 131 ++++++------
 packages/core/src/EventEmitter.ts             |  15 --
 packages/core/src/index.ts                    |   3 +-
 20 files changed, 432 insertions(+), 571 deletions(-)
 delete mode 100644 packages/cli/src/api/workflowStats.api.ts
 create mode 100644 packages/cli/src/controllers/workflowStatistics.controller.ts
 delete mode 100644 packages/cli/src/events/WorkflowStatistics.ts
 delete mode 100644 packages/cli/src/events/index.ts
 create mode 100644 packages/cli/src/services/events.service.ts
 rename packages/cli/test/unit/{Events.test.ts => services/events.service.test.ts} (54%)
 delete mode 100644 packages/core/src/EventEmitter.ts

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index c57ee5df271bd..8aa68566636d2 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -655,24 +655,10 @@ export interface IWorkflowExecuteProcess {
 	workflowExecute: WorkflowExecute;
 }
 
-export interface IWorkflowStatisticsCounts {
-	productionSuccess: number;
-	productionError: number;
-	manualSuccess: number;
-	manualError: number;
-}
-
 export interface IWorkflowStatisticsDataLoaded {
 	dataLoaded: boolean;
 }
 
-export interface IWorkflowStatisticsTimestamps {
-	productionSuccess: Date | null;
-	productionError: Date | null;
-	manualSuccess: Date | null;
-	manualError: Date | null;
-}
-
 export type WhereClause = Record<string, { [key: string]: string | FindOperator<unknown> }>;
 
 // ----------------------------------
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index c148e6c4d1315..913bad4b0b0ed 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -27,6 +27,7 @@ import { Telemetry } from '@/telemetry';
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
 import { RoleService } from './role/role.service';
 import { eventBus } from './eventbus';
+import { EventsService } from '@/services/events.service';
 import type { User } from '@db/entities/User';
 import { N8N_VERSION } from '@/constants';
 import { NodeTypes } from './NodeTypes';
@@ -58,7 +59,15 @@ export class InternalHooks implements IInternalHooksClass {
 		private nodeTypes: NodeTypes,
 		private roleService: RoleService,
 		private executionRepository: ExecutionRepository,
-	) {}
+		eventsService: EventsService,
+	) {
+		eventsService.on('telemetry.onFirstProductionWorkflowSuccess', async (metrics) =>
+			this.onFirstProductionWorkflowSuccess(metrics),
+		);
+		eventsService.on('telemetry.onFirstWorkflowDataLoad', async (metrics) =>
+			this.onFirstWorkflowDataLoad(metrics),
+		);
+	}
 
 	async init(instanceId: string) {
 		this.instanceId = instanceId;
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 1913b594a8f27..160aac85bb8fa 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -97,10 +97,10 @@ import {
 	TagsController,
 	TranslationController,
 	UsersController,
+	WorkflowStatisticsController,
 } from '@/controllers';
 
 import { executionsController } from '@/executions/executions.controller';
-import { workflowStatsController } from '@/api/workflowStats.api';
 import { isApiEnabled, loadPublicApiVersions } from '@/PublicApi';
 import {
 	getInstanceBaseUrl,
@@ -136,7 +136,6 @@ import { isLogStreamingEnabled } from '@/eventbus/MessageEventBus/MessageEventBu
 import { licenseController } from './license/license.controller';
 import { Push, setupPushServer, setupPushHandler } from '@/push';
 import { setupAuthMiddlewares } from './middlewares';
-import { initEvents } from './events';
 import {
 	getLdapLoginLabel,
 	handleLdapInit,
@@ -386,9 +385,6 @@ export class Server extends AbstractServer {
 			saml_enabled: isSamlCurrentAuthenticationMethod(),
 		};
 
-		// Set up event handling
-		initEvents();
-
 		if (inDevelopment && process.env.N8N_DEV_RELOAD === 'true') {
 			const { reloadNodesAndCredentials } = await import('@/ReloadNodesAndCredentials');
 			await reloadNodesAndCredentials(this.loadNodesAndCredentials, this.nodeTypes, this.push);
@@ -500,6 +496,7 @@ export class Server extends AbstractServer {
 
 			Container.get(SamlController),
 			Container.get(SourceControlController),
+			Container.get(WorkflowStatisticsController),
 		];
 
 		if (isLdapEnabled()) {
@@ -608,11 +605,6 @@ export class Server extends AbstractServer {
 		// ----------------------------------------
 		this.app.use(`/${this.restEndpoint}/license`, licenseController);
 
-		// ----------------------------------------
-		// Workflow Statistics
-		// ----------------------------------------
-		this.app.use(`/${this.restEndpoint}/workflow-stats`, workflowStatsController);
-
 		// ----------------------------------------
 		// SAML
 		// ----------------------------------------
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index 3d007cf574034..c286d12a9ecc6 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -17,8 +17,9 @@ import type express from 'express';
 import get from 'lodash/get';
 import stream from 'stream';
 import { promisify } from 'util';
+import { Container } from 'typedi';
 
-import { BinaryDataManager, NodeExecuteFunctions, eventEmitter } from 'n8n-core';
+import { BinaryDataManager, NodeExecuteFunctions } from 'n8n-core';
 
 import type {
 	IBinaryData,
@@ -60,7 +61,7 @@ import { ActiveExecutions } from '@/ActiveExecutions';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
-import { Container } from 'typedi';
+import { EventsService } from '@/services/events.service';
 
 const pipeline = promisify(stream.pipeline);
 
@@ -243,7 +244,7 @@ export async function executeWebhook(
 				NodeExecuteFunctions,
 				executionMode,
 			);
-			eventEmitter.emit(eventEmitter.types.nodeFetchedData, workflow.id, workflowStartNode);
+			Container.get(EventsService).emit('nodeFetchedData', workflow.id, workflowStartNode);
 		} catch (err) {
 			// Send error response to webhook caller
 			const errorMessage = 'Workflow Webhook Error: Workflow could not be started!';
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 2ad83109fc03b..448a8dc3fafad 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -15,7 +15,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable func-names */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { BinaryDataManager, eventEmitter, UserSettings, WorkflowExecute } from 'n8n-core';
+import { BinaryDataManager, UserSettings, WorkflowExecute } from 'n8n-core';
 
 import type {
 	IDataObject,
@@ -43,6 +43,7 @@ import {
 } from 'n8n-workflow';
 
 import pick from 'lodash/pick';
+import { Container } from 'typedi';
 import type { FindOptionsWhere } from 'typeorm';
 import { LessThanOrEqual, In } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
@@ -67,10 +68,10 @@ import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
 import { WorkflowsService } from './workflows/workflows.services';
-import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
 import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
 import { ExecutionRepository } from '@db/repositories';
+import { EventsService } from '@/services/events.service';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
@@ -273,6 +274,7 @@ export async function saveExecutionMetadata(
  *
  */
 function hookFunctionsPush(): IWorkflowExecuteHooks {
+	const pushInstance = Container.get(Push);
 	return {
 		nodeExecuteBefore: [
 			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
@@ -289,7 +291,6 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = Container.get(Push);
 				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, sessionId);
 			},
 		],
@@ -307,7 +308,6 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = Container.get(Push);
 				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, sessionId);
 			},
 		],
@@ -324,7 +324,6 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				if (sessionId === undefined) {
 					return;
 				}
-				const pushInstance = Container.get(Push);
 				pushInstance.send(
 					'executionStarted',
 					{
@@ -390,7 +389,6 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					retryOf,
 				};
 
-				const pushInstance = Container.get(Push);
 				pushInstance.send('executionFinished', sendData, sessionId);
 			},
 		],
@@ -399,7 +397,6 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 
 export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowExecuteHooks {
 	const externalHooks = Container.get(ExternalHooks);
-
 	return {
 		workflowExecuteBefore: [
 			async function (this: WorkflowHooks, workflow: Workflow): Promise<void> {
@@ -514,23 +511,17 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
  *
  */
 function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
+	const internalHooks = Container.get(InternalHooks);
+	const eventsService = Container.get(EventsService);
 	return {
 		nodeExecuteBefore: [
 			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				void Container.get(InternalHooks).onNodeBeforeExecute(
-					this.executionId,
-					this.workflowData,
-					nodeName,
-				);
+				void internalHooks.onNodeBeforeExecute(this.executionId, this.workflowData, nodeName);
 			},
 		],
 		nodeExecuteAfter: [
 			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				void Container.get(InternalHooks).onNodePostExecute(
-					this.executionId,
-					this.workflowData,
-					nodeName,
-				);
+				void internalHooks.onNodePostExecute(this.executionId, this.workflowData, nodeName);
 			},
 		],
 		workflowExecuteBefore: [],
@@ -711,17 +702,13 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						);
 					}
 				} finally {
-					eventEmitter.emit(
-						eventEmitter.types.workflowExecutionCompleted,
-						this.workflowData,
-						fullRunData,
-					);
+					eventsService.emit('workflowExecutionCompleted', this.workflowData, fullRunData);
 				}
 			},
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
-				eventEmitter.emit(eventEmitter.types.nodeFetchedData, workflowId, node);
+				eventsService.emit('nodeFetchedData', workflowId, node);
 			},
 		],
 	};
@@ -734,6 +721,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
  *
  */
 function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
+	const eventsService = Container.get(EventsService);
 	return {
 		nodeExecuteBefore: [],
 		nodeExecuteAfter: [],
@@ -834,17 +822,13 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						this.retryOf,
 					);
 				} finally {
-					eventEmitter.emit(
-						eventEmitter.types.workflowExecutionCompleted,
-						this.workflowData,
-						fullRunData,
-					);
+					eventsService.emit('workflowExecutionCompleted', this.workflowData, fullRunData);
 				}
 			},
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
-				eventEmitter.emit(eventEmitter.types.nodeFetchedData, workflowId, node);
+				eventsService.emit('nodeFetchedData', workflowId, node);
 			},
 		],
 	};
@@ -951,10 +935,12 @@ async function executeWorkflow(
 		parentWorkflowSettings?: IWorkflowSettings;
 	},
 ): Promise<Array<INodeExecutionData[] | null> | IWorkflowExecuteProcess> {
+	const internalHooks = Container.get(InternalHooks);
 	const externalHooks = Container.get(ExternalHooks);
 	await externalHooks.init();
 
 	const nodeTypes = Container.get(NodeTypes);
+	const activeExecutions = Container.get(ActiveExecutions);
 
 	const workflowData =
 		options.loadedWorkflowData ??
@@ -984,10 +970,10 @@ async function executeWorkflow(
 		executionId =
 			options.parentExecutionId !== undefined
 				? options.parentExecutionId
-				: await Container.get(ActiveExecutions).add(runData);
+				: await activeExecutions.add(runData);
 	}
 
-	void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId || '', runData);
+	void internalHooks.onWorkflowBeforeExecute(executionId || '', runData);
 
 	let data;
 	try {
@@ -1077,7 +1063,7 @@ async function executeWorkflow(
 		}
 
 		// remove execution from active executions
-		Container.get(ActiveExecutions).remove(executionId, fullRunData);
+		activeExecutions.remove(executionId, fullRunData);
 
 		await Container.get(ExecutionRepository).updateExistingExecution(
 			executionId,
@@ -1092,21 +1078,16 @@ async function executeWorkflow(
 
 	await externalHooks.run('workflow.postExecute', [data, workflowData, executionId]);
 
-	void Container.get(InternalHooks).onWorkflowPostExecute(
-		executionId,
-		workflowData,
-		data,
-		additionalData.userId,
-	);
+	void internalHooks.onWorkflowPostExecute(executionId, workflowData, data, additionalData.userId);
 
 	if (data.finished === true) {
 		// Workflow did finish successfully
 
-		Container.get(ActiveExecutions).remove(executionId, data);
+		activeExecutions.remove(executionId, data);
 		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
 		return returnData!.data!.main;
 	}
-	Container.get(ActiveExecutions).remove(executionId, data);
+	activeExecutions.remove(executionId, data);
 	// Workflow did fail
 	const { error } = data.data.resultData;
 	// eslint-disable-next-line @typescript-eslint/no-throw-literal
diff --git a/packages/cli/src/api/workflowStats.api.ts b/packages/cli/src/api/workflowStats.api.ts
deleted file mode 100644
index ed16888efea6d..0000000000000
--- a/packages/cli/src/api/workflowStats.api.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import type { User } from '@db/entities/User';
-import { whereClause } from '@/UserManagement/UserManagementHelper';
-import express from 'express';
-import { LoggerProxy } from 'n8n-workflow';
-import * as Db from '@/Db';
-import * as ResponseHelper from '@/ResponseHelper';
-import type {
-	IWorkflowStatisticsCounts,
-	IWorkflowStatisticsDataLoaded,
-	IWorkflowStatisticsTimestamps,
-} from '@/Interfaces';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
-import { getLogger } from '../Logger';
-import type { ExecutionRequest } from '../requests';
-
-export const workflowStatsController = express.Router();
-
-// Helper function that validates the ID, return a flag stating whether the request is allowed
-async function checkWorkflowId(workflowId: string, user: User): Promise<boolean> {
-	// Check permissions
-	const shared = await Db.collections.SharedWorkflow.findOne({
-		relations: ['workflow'],
-		where: whereClause({
-			user,
-			entityType: 'workflow',
-			entityId: workflowId,
-		}),
-	});
-
-	if (!shared) {
-		LoggerProxy.verbose('User attempted to read a workflow without permissions', {
-			workflowId,
-			userId: user.id,
-		});
-		return false;
-	}
-	return true;
-}
-
-/**
- * Initialize Logger if needed
- */
-workflowStatsController.use((req, res, next) => {
-	try {
-		LoggerProxy.getInstance();
-	} catch (error) {
-		LoggerProxy.init(getLogger());
-	}
-
-	next();
-});
-
-/**
- * Check that the workflow ID is valid and allowed to be read by the user
- */
-workflowStatsController.use(async (req: ExecutionRequest.Get, res, next) => {
-	const allowed = await checkWorkflowId(req.params.id, req.user);
-	if (allowed) {
-		next();
-	} else {
-		// Otherwise, make and return an error
-		const response = new ResponseHelper.NotFoundError(`Workflow ${req.params.id} does not exist.`);
-		next(response);
-	}
-});
-
-/**
- * GET /workflow-stats/:id/counts/
- */
-workflowStatsController.get(
-	'/:id/counts/',
-	ResponseHelper.send(async (req: ExecutionRequest.Get): Promise<IWorkflowStatisticsCounts> => {
-		// Get counts from DB
-		const workflowId = req.params.id;
-
-		// Find the stats for this workflow
-		const stats = await Db.collections.WorkflowStatistics.find({
-			select: ['count', 'name'],
-			where: {
-				workflowId,
-			},
-		});
-
-		const data: IWorkflowStatisticsCounts = {
-			productionSuccess: 0,
-			productionError: 0,
-			manualSuccess: 0,
-			manualError: 0,
-		};
-
-		// There will be a maximum of 4 stats (currently)
-		stats.forEach(({ count, name }) => {
-			switch (name) {
-				case StatisticsNames.manualError:
-					data.manualError = count;
-					break;
-
-				case StatisticsNames.manualSuccess:
-					data.manualSuccess = count;
-					break;
-
-				case StatisticsNames.productionError:
-					data.productionError = count;
-					break;
-
-				case StatisticsNames.productionSuccess:
-					data.productionSuccess = count;
-			}
-		});
-
-		return data;
-	}),
-);
-
-/**
- * GET /workflow-stats/:id/times/
- */
-workflowStatsController.get(
-	'/:id/times/',
-	ResponseHelper.send(async (req: ExecutionRequest.Get): Promise<IWorkflowStatisticsTimestamps> => {
-		// Get times from DB
-		const workflowId = req.params.id;
-
-		// Find the stats for this workflow
-		const stats = await Db.collections.WorkflowStatistics.find({
-			select: ['latestEvent', 'name'],
-			where: {
-				workflowId,
-			},
-		});
-
-		const data: IWorkflowStatisticsTimestamps = {
-			productionSuccess: null,
-			productionError: null,
-			manualSuccess: null,
-			manualError: null,
-		};
-
-		// There will be a maximum of 4 stats (currently)
-		stats.forEach(({ latestEvent, name }) => {
-			switch (name) {
-				case StatisticsNames.manualError:
-					data.manualError = latestEvent;
-					break;
-
-				case StatisticsNames.manualSuccess:
-					data.manualSuccess = latestEvent;
-					break;
-
-				case StatisticsNames.productionError:
-					data.productionError = latestEvent;
-					break;
-
-				case StatisticsNames.productionSuccess:
-					data.productionSuccess = latestEvent;
-			}
-		});
-
-		return data;
-	}),
-);
-
-/**
- * GET /workflow-stats/:id/data-loaded/
- */
-workflowStatsController.get(
-	'/:id/data-loaded/',
-	ResponseHelper.send(async (req: ExecutionRequest.Get): Promise<IWorkflowStatisticsDataLoaded> => {
-		// Get flag
-		const workflowId = req.params.id;
-
-		// Get the flag
-		const stats = await Db.collections.WorkflowStatistics.findOne({
-			select: ['latestEvent'],
-			where: {
-				workflowId,
-				name: StatisticsNames.dataLoaded,
-			},
-		});
-
-		const data: IWorkflowStatisticsDataLoaded = {
-			dataLoaded: stats ? true : false,
-		};
-
-		return data;
-	}),
-);
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 16631a962e0e2..fbccee762cd89 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -10,7 +10,6 @@ import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart, isWorkflowIdValid } from '@/utils';
-import { initEvents } from '@/events';
 import { BaseCommand } from './BaseCommand';
 import { Container } from 'typedi';
 
@@ -36,9 +35,6 @@ export class Execute extends BaseCommand {
 		await super.init();
 		await this.initBinaryManager();
 		await this.initExternalHooks();
-
-		// Add event handlers
-		initEvents();
 	}
 
 	async run() {
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index df34d32392c01..b1586b895a31d 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -15,7 +15,6 @@ import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { User } from '@db/entities/User';
 import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart } from '@/utils';
-import { initEvents } from '@/events';
 import { BaseCommand } from './BaseCommand';
 import { Container } from 'typedi';
 import type {
@@ -183,9 +182,6 @@ export class ExecuteBatch extends BaseCommand {
 		await super.init();
 		await this.initBinaryManager();
 		await this.initExternalHooks();
-
-		// Add event handlers
-		initEvents();
 	}
 
 	async run() {
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
index 04b46af5f13df..c3e742924e998 100644
--- a/packages/cli/src/controllers/index.ts
+++ b/packages/cli/src/controllers/index.ts
@@ -8,3 +8,4 @@ export { PasswordResetController } from './passwordReset.controller';
 export { TagsController } from './tags.controller';
 export { TranslationController } from './translation.controller';
 export { UsersController } from './users.controller';
+export { WorkflowStatisticsController } from './workflowStatistics.controller';
diff --git a/packages/cli/src/controllers/workflowStatistics.controller.ts b/packages/cli/src/controllers/workflowStatistics.controller.ts
new file mode 100644
index 0000000000000..d4760c605d13b
--- /dev/null
+++ b/packages/cli/src/controllers/workflowStatistics.controller.ts
@@ -0,0 +1,124 @@
+import { Service } from 'typedi';
+import { Response, NextFunction } from 'express';
+import { ILogger } from 'n8n-workflow';
+import { Get, Middleware, RestController } from '@/decorators';
+import type { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
+import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import { SharedWorkflowRepository, WorkflowStatisticsRepository } from '@db/repositories';
+import { ExecutionRequest } from '@/requests';
+import { whereClause } from '@/UserManagement/UserManagementHelper';
+import { NotFoundError } from '@/ResponseHelper';
+import type { IWorkflowStatisticsDataLoaded } from '@/Interfaces';
+
+interface WorkflowStatisticsData<T> {
+	productionSuccess: T;
+	productionError: T;
+	manualSuccess: T;
+	manualError: T;
+}
+
+@Service()
+@RestController('/workflow-stats')
+export class WorkflowStatisticsController {
+	constructor(
+		private sharedWorkflowRepository: SharedWorkflowRepository,
+		private workflowStatisticsRepository: WorkflowStatisticsRepository,
+		private readonly logger: ILogger,
+	) {}
+
+	/**
+	 * Check that the workflow ID is valid and allowed to be read by the user
+	 */
+	// TODO: move this into a new decorator `@ValidateWorkflowPermission`
+	@Middleware()
+	async hasWorkflowAccess(req: ExecutionRequest.Get, res: Response, next: NextFunction) {
+		const { user } = req;
+		const workflowId = req.params.id;
+		const allowed = await this.sharedWorkflowRepository.exist({
+			relations: ['workflow'],
+			where: whereClause({
+				user,
+				entityType: 'workflow',
+				entityId: workflowId,
+			}),
+		});
+
+		if (allowed) {
+			next();
+		} else {
+			this.logger.verbose('User attempted to read a workflow without permissions', {
+				workflowId,
+				userId: user.id,
+			});
+			// Otherwise, make and return an error
+			throw new NotFoundError(`Workflow ${workflowId} does not exist.`);
+		}
+	}
+
+	@Get('/:id/counts/')
+	async getCounts(req: ExecutionRequest.Get): Promise<WorkflowStatisticsData<number>> {
+		return this.getData(req.params.id, 'count', 0);
+	}
+
+	@Get('/:id/times/')
+	async getTimes(req: ExecutionRequest.Get): Promise<WorkflowStatisticsData<Date | null>> {
+		return this.getData(req.params.id, 'latestEvent', null);
+	}
+
+	@Get('/:id/data-loaded/')
+	async getDataLoaded(req: ExecutionRequest.Get): Promise<IWorkflowStatisticsDataLoaded> {
+		// Get flag
+		const workflowId = req.params.id;
+
+		// Get the flag
+		const stats = await this.workflowStatisticsRepository.findOne({
+			select: ['latestEvent'],
+			where: {
+				workflowId,
+				name: StatisticsNames.dataLoaded,
+			},
+		});
+
+		return {
+			dataLoaded: stats ? true : false,
+		};
+	}
+
+	private async getData<
+		C extends 'count' | 'latestEvent',
+		D = WorkflowStatistics[C] extends number ? 0 : null,
+	>(workflowId: string, columnName: C, defaultValue: WorkflowStatistics[C] | D) {
+		const stats = await this.workflowStatisticsRepository.find({
+			select: [columnName, 'name'],
+			where: { workflowId },
+		});
+
+		const data: WorkflowStatisticsData<WorkflowStatistics[C] | D> = {
+			productionSuccess: defaultValue,
+			productionError: defaultValue,
+			manualSuccess: defaultValue,
+			manualError: defaultValue,
+		};
+
+		stats.forEach(({ name, [columnName]: value }) => {
+			switch (name) {
+				case StatisticsNames.manualError:
+					data.manualError = value;
+					break;
+
+				case StatisticsNames.manualSuccess:
+					data.manualSuccess = value;
+					break;
+
+				case StatisticsNames.productionError:
+					data.productionError = value;
+					break;
+
+				case StatisticsNames.productionSuccess:
+					data.productionSuccess = value;
+			}
+		});
+
+		return data;
+	}
+}
diff --git a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
index 90ebd510d0e74..3ce4ea6d8348b 100644
--- a/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
+++ b/packages/cli/src/databases/repositories/workflowStatistics.repository.ts
@@ -1,10 +1,94 @@
 import { Service } from 'typedi';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, QueryFailedError, Repository } from 'typeorm';
+import config from '@/config';
+import type { StatisticsNames } from '../entities/WorkflowStatistics';
 import { WorkflowStatistics } from '../entities/WorkflowStatistics';
 
+type StatisticsInsertResult = 'insert' | 'failed';
+type StatisticsUpsertResult = StatisticsInsertResult | 'update';
+
 @Service()
 export class WorkflowStatisticsRepository extends Repository<WorkflowStatistics> {
+	private readonly dbType = config.getEnv('database.type');
+
 	constructor(dataSource: DataSource) {
 		super(WorkflowStatistics, dataSource.manager);
 	}
+
+	async insertWorkflowStatistics(
+		eventName: StatisticsNames,
+		workflowId: string,
+	): Promise<StatisticsInsertResult> {
+		// Try to insert the data loaded statistic
+		try {
+			await this.insert({
+				workflowId,
+				name: eventName,
+				count: 1,
+				latestEvent: new Date(),
+			});
+			return 'insert';
+		} catch (error) {
+			// if it's a duplicate key error then that's fine, otherwise throw the error
+			if (!(error instanceof QueryFailedError)) {
+				throw error;
+			}
+			// If it is a query failed error, we return
+			return 'failed';
+		}
+	}
+
+	async upsertWorkflowStatistics(
+		eventName: StatisticsNames,
+		workflowId: string,
+	): Promise<StatisticsUpsertResult> {
+		const { tableName } = this.metadata;
+		try {
+			if (this.dbType === 'sqlite') {
+				await this.query(
+					`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
+					VALUES (1, "${eventName}", "${workflowId}", CURRENT_TIMESTAMP)
+					ON CONFLICT (workflowId, name)
+					DO UPDATE SET count = count + 1, latestEvent = CURRENT_TIMESTAMP`,
+				);
+				// SQLite does not offer a reliable way to know whether or not an insert or update happened.
+				// We'll use a naive approach in this case. Query again after and it might cause us to miss the
+				// first production execution sometimes due to concurrency, but it's the only way.
+				const counter = await this.findOne({
+					select: ['count'],
+					where: {
+						name: eventName,
+						workflowId,
+					},
+				});
+
+				return counter?.count === 1 ? 'insert' : 'failed';
+			} else if (this.dbType === 'postgresdb') {
+				const queryResult = (await this.query(
+					`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
+					VALUES (1, '${eventName}', '${workflowId}', CURRENT_TIMESTAMP)
+					ON CONFLICT ("name", "workflowId")
+					DO UPDATE SET "count" = "${tableName}"."count" + 1, "latestEvent" = CURRENT_TIMESTAMP
+					RETURNING *;`,
+				)) as Array<{
+					count: number;
+				}>;
+				return queryResult[0].count === 1 ? 'insert' : 'update';
+			} else {
+				const queryResult = (await this.query(
+					`INSERT INTO \`${tableName}\` (count, name, workflowId, latestEvent)
+					VALUES (1, "${eventName}", "${workflowId}", NOW())
+					ON DUPLICATE KEY
+					UPDATE count = count + 1, latestEvent = NOW();`,
+				)) as {
+					affectedRows: number;
+				};
+				// MySQL returns 2 affected rows on update
+				return queryResult.affectedRows === 1 ? 'insert' : 'update';
+			}
+		} catch (error) {
+			if (error instanceof QueryFailedError) return 'failed';
+			throw error;
+		}
+	}
 }
diff --git a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
index 9e155d29f1480..2cb718b8f8287 100644
--- a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
@@ -3,9 +3,6 @@ import { NodeOperationError, WorkflowOperationError } from 'n8n-workflow';
 import type { EventMessageTypes, EventNamesTypes } from '../EventMessageClasses';
 import type { DateTime } from 'luxon';
 import { Push } from '@/push';
-import type { IPushDataExecutionRecovered } from '../../Interfaces';
-import { workflowExecutionCompleted } from '../../events/WorkflowStatistics';
-import { eventBus } from './MessageEventBus';
 import { Container } from 'typedi';
 import { InternalHooks } from '@/InternalHooks';
 import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData';
@@ -193,16 +190,12 @@ export async function recoverExecutionDataFromEventLogMessages(
 			// execute workflowExecuteAfter hook to trigger error workflow
 			await workflowHooks.executeHookFunctions('workflowExecuteAfter', [iRunData]);
 
-			// calling workflowExecutionCompleted directly because the eventEmitter is not up yet at this point
-			await workflowExecutionCompleted(executionEntry.workflowData, iRunData);
-
+			const push = Container.get(Push);
 			// wait for UI to be back up and send the execution data
-			eventBus.once('editorUiConnected', function handleUiBackUp() {
+			push.once('editorUiConnected', function handleUiBackUp() {
 				// add a small timeout to make sure the UI is back up
 				setTimeout(() => {
-					Container.get(Push).send('executionRecovered', {
-						executionId,
-					} as IPushDataExecutionRecovered);
+					push.send('executionRecovered', { executionId });
 				}, 1000);
 			});
 		}
diff --git a/packages/cli/src/events/WorkflowStatistics.ts b/packages/cli/src/events/WorkflowStatistics.ts
deleted file mode 100644
index b2a15b491912c..0000000000000
--- a/packages/cli/src/events/WorkflowStatistics.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-import * as Db from '@/Db';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
-import { QueryFailedError } from 'typeorm';
-import { Container } from 'typedi';
-import { InternalHooks } from '@/InternalHooks';
-import config from '@/config';
-import { UserService } from '@/user/user.service';
-
-const enum StatisticsUpsertResult {
-	insert = 'insert',
-	update = 'update',
-	failed = 'failed',
-}
-
-async function upsertWorkflowStatistics(
-	eventName: StatisticsNames,
-	workflowId: string,
-): Promise<StatisticsUpsertResult> {
-	const dbType = config.getEnv('database.type');
-	const { tableName } = Db.collections.WorkflowStatistics.metadata;
-	try {
-		if (dbType === 'sqlite') {
-			await Db.collections.WorkflowStatistics.query(
-				`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
-					VALUES (1, "${eventName}", "${workflowId}", CURRENT_TIMESTAMP)
-					ON CONFLICT (workflowId, name)
-					DO UPDATE SET count = count + 1, latestEvent = CURRENT_TIMESTAMP`,
-			);
-			// SQLite does not offer a reliable way to know whether or not an insert or update happened.
-			// We'll use a naive approach in this case. Query again after and it might cause us to miss the
-			// first production execution sometimes due to concurrency, but it's the only way.
-
-			const counter = await Db.collections.WorkflowStatistics.findOne({
-				select: ['count'],
-				where: {
-					name: eventName,
-					workflowId,
-				},
-			});
-
-			if (counter?.count === 1) {
-				return StatisticsUpsertResult.insert;
-			}
-			return StatisticsUpsertResult.update;
-		} else if (dbType === 'postgresdb') {
-			const queryResult = (await Db.collections.WorkflowStatistics.query(
-				`INSERT INTO "${tableName}" ("count", "name", "workflowId", "latestEvent")
-					VALUES (1, '${eventName}', '${workflowId}', CURRENT_TIMESTAMP)
-					ON CONFLICT ("name", "workflowId")
-					DO UPDATE SET "count" = "${tableName}"."count" + 1, "latestEvent" = CURRENT_TIMESTAMP
-					RETURNING *;`,
-			)) as Array<{
-				count: number;
-			}>;
-			if (queryResult[0].count === 1) {
-				return StatisticsUpsertResult.insert;
-			}
-			return StatisticsUpsertResult.update;
-		} else {
-			const queryResult = (await Db.collections.WorkflowStatistics.query(
-				`INSERT INTO \`${tableName}\` (count, name, workflowId, latestEvent)
-					VALUES (1, "${eventName}", "${workflowId}", NOW())
-					ON DUPLICATE KEY
-					UPDATE count = count + 1, latestEvent = NOW();`,
-			)) as {
-				affectedRows: number;
-			};
-			if (queryResult.affectedRows === 1) {
-				return StatisticsUpsertResult.insert;
-			}
-			// MySQL returns 2 affected rows on update
-			return StatisticsUpsertResult.update;
-		}
-	} catch (error) {
-		if (error instanceof QueryFailedError) return StatisticsUpsertResult.failed;
-		throw error;
-	}
-}
-
-export async function workflowExecutionCompleted(
-	workflowData: IWorkflowBase,
-	runData: IRun,
-): Promise<void> {
-	// Determine the name of the statistic
-	const finished = runData.finished ? runData.finished : false;
-	const manual = runData.mode === 'manual';
-	let name: StatisticsNames;
-
-	if (finished) {
-		if (manual) name = StatisticsNames.manualSuccess;
-		else name = StatisticsNames.productionSuccess;
-	} else {
-		if (manual) name = StatisticsNames.manualError;
-		else name = StatisticsNames.productionError;
-	}
-
-	// Get the workflow id
-	const workflowId = workflowData.id;
-	if (!workflowId) return;
-
-	try {
-		const upsertResult = await upsertWorkflowStatistics(name, workflowId);
-
-		if (
-			name === StatisticsNames.productionSuccess &&
-			upsertResult === StatisticsUpsertResult.insert
-		) {
-			const owner = await getWorkflowOwner(workflowId);
-			const metrics = {
-				user_id: owner.id,
-				workflow_id: workflowId,
-			};
-
-			if (!owner.settings?.userActivated) {
-				await UserService.updateUserSettings(owner.id, {
-					firstSuccessfulWorkflowId: workflowId,
-					userActivated: true,
-				});
-			}
-
-			// Send the metrics
-			await Container.get(InternalHooks).onFirstProductionWorkflowSuccess(metrics);
-		}
-	} catch (error) {
-		LoggerProxy.verbose('Unable to fire first workflow success telemetry event');
-	}
-}
-
-export async function nodeFetchedData(
-	workflowId: string | undefined | null,
-	node: INode,
-): Promise<void> {
-	if (!workflowId) return;
-
-	const hasLoadedDataPreviously = await Db.collections.WorkflowStatistics.findOne({
-		select: ['count'],
-		where: {
-			workflowId,
-			name: StatisticsNames.dataLoaded,
-		},
-	});
-
-	if (hasLoadedDataPreviously) {
-		return;
-	}
-
-	// Try to insert the data loaded statistic
-	try {
-		await Db.collections.WorkflowStatistics.createQueryBuilder('workflowStatistics')
-			.insert()
-			.values({
-				workflowId,
-				name: StatisticsNames.dataLoaded,
-				count: 1,
-				latestEvent: new Date(),
-			})
-			.orIgnore()
-			.execute();
-	} catch (error) {
-		LoggerProxy.warn('Failed saving loaded data statistics');
-	}
-
-	// Compile the metrics since this was a new data loaded event
-	const owner = await getWorkflowOwner(workflowId);
-	let metrics = {
-		user_id: owner.id,
-		workflow_id: workflowId,
-		node_type: node.type,
-		node_id: node.id,
-	};
-
-	// This is probably naive but I can't see a way for a node to have multiple credentials attached so..
-	if (node.credentials) {
-		Object.entries(node.credentials).forEach(([credName, credDetails]) => {
-			metrics = Object.assign(metrics, {
-				credential_type: credName,
-				credential_id: credDetails.id,
-			});
-		});
-	}
-
-	// Send metrics to posthog
-	await Container.get(InternalHooks).onFirstWorkflowDataLoad(metrics);
-}
diff --git a/packages/cli/src/events/index.ts b/packages/cli/src/events/index.ts
deleted file mode 100644
index a73a848f75d92..0000000000000
--- a/packages/cli/src/events/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { eventEmitter } from 'n8n-core';
-import { nodeFetchedData, workflowExecutionCompleted } from './WorkflowStatistics';
-
-export function initEvents() {
-	if ('SKIP_STATISTICS_EVENTS' in process.env) return;
-
-	// Check for undefined as during testing these functions end up undefined for some reason
-	if (nodeFetchedData) {
-		eventEmitter.on(eventEmitter.types.nodeFetchedData, nodeFetchedData);
-	}
-	if (workflowExecutionCompleted) {
-		eventEmitter.on(eventEmitter.types.workflowExecutionCompleted, workflowExecutionCompleted);
-	}
-}
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index a9022bdc5cbd5..8216e0c3b20d4 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,6 +1,5 @@
 import { jsonStringify, LoggerProxy as Logger } from 'n8n-workflow';
 import type { IPushDataType } from '@/Interfaces';
-import { eventBus } from '../eventbus';
 
 export abstract class AbstractPush<T> {
 	protected connections: Record<string, T> = {};
@@ -11,7 +10,6 @@ export abstract class AbstractPush<T> {
 	protected add(sessionId: string, connection: T): void {
 		const { connections } = this;
 		Logger.debug('Add editor-UI session', { sessionId });
-		eventBus.emit('editorUiConnected', sessionId);
 
 		const existingConnection = connections[sessionId];
 		if (existingConnection) {
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index 72289e79e3fb7..09af08799dc21 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -1,3 +1,4 @@
+import { EventEmitter } from 'events';
 import { ServerResponse } from 'http';
 import type { Server } from 'http';
 import type { Socket } from 'net';
@@ -16,7 +17,7 @@ import type { IPushDataType } from '@/Interfaces';
 const useWebSockets = config.getEnv('push.backend') === 'websocket';
 
 @Service()
-export class Push {
+export class Push extends EventEmitter {
 	private backend = useWebSockets ? new WebSocketPush() : new SSEPush();
 
 	handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) {
@@ -27,6 +28,7 @@ export class Push {
 		} else {
 			res.status(401).send('Unauthorized');
 		}
+		this.emit('editorUiConnected', req.query.sessionId);
 	}
 
 	send<D>(type: IPushDataType, data: D, sessionId: string | undefined = undefined) {
diff --git a/packages/cli/src/services/events.service.ts b/packages/cli/src/services/events.service.ts
new file mode 100644
index 0000000000000..ec288fa23bb21
--- /dev/null
+++ b/packages/cli/src/services/events.service.ts
@@ -0,0 +1,123 @@
+import { EventEmitter } from 'events';
+import { Service } from 'typedi';
+import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
+import { LoggerProxy } from 'n8n-workflow';
+import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import { WorkflowStatisticsRepository } from '@db/repositories';
+import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { UserService } from '@/user/user.service';
+
+@Service()
+export class EventsService extends EventEmitter {
+	constructor(private repository: WorkflowStatisticsRepository) {
+		super({ captureRejections: true });
+		if ('SKIP_STATISTICS_EVENTS' in process.env) return;
+
+		this.on('nodeFetchedData', async (workflowId, node) => this.nodeFetchedData(workflowId, node));
+		this.on('workflowExecutionCompleted', async (workflowData, runData) =>
+			this.workflowExecutionCompleted(workflowData, runData),
+		);
+	}
+
+	async workflowExecutionCompleted(workflowData: IWorkflowBase, runData: IRun): Promise<void> {
+		// Determine the name of the statistic
+		const finished = runData.finished ? runData.finished : false;
+		const manual = runData.mode === 'manual';
+		let name: StatisticsNames;
+
+		if (finished) {
+			if (manual) name = StatisticsNames.manualSuccess;
+			else name = StatisticsNames.productionSuccess;
+		} else {
+			if (manual) name = StatisticsNames.manualError;
+			else name = StatisticsNames.productionError;
+		}
+
+		// Get the workflow id
+		const workflowId = workflowData.id;
+		if (!workflowId) return;
+
+		try {
+			const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId);
+
+			if (name === 'production_success' && upsertResult === 'insert') {
+				const owner = await getWorkflowOwner(workflowId);
+				const metrics = {
+					user_id: owner.id,
+					workflow_id: workflowId,
+				};
+
+				if (!owner.settings?.userActivated) {
+					await UserService.updateUserSettings(owner.id, {
+						firstSuccessfulWorkflowId: workflowId,
+						userActivated: true,
+					});
+				}
+
+				// Send the metrics
+				this.emit('telemetry.onFirstProductionWorkflowSuccess', metrics);
+			}
+		} catch (error) {
+			LoggerProxy.verbose('Unable to fire first workflow success telemetry event');
+		}
+	}
+
+	async nodeFetchedData(workflowId: string | undefined | null, node: INode): Promise<void> {
+		if (!workflowId) return;
+
+		const insertResult = await this.repository.insertWorkflowStatistics(
+			StatisticsNames.dataLoaded,
+			workflowId,
+		);
+		if (insertResult === 'failed') return;
+
+		// Compile the metrics since this was a new data loaded event
+		const owner = await getWorkflowOwner(workflowId);
+
+		let metrics = {
+			user_id: owner.id,
+			workflow_id: workflowId,
+			node_type: node.type,
+			node_id: node.id,
+		};
+
+		// This is probably naive but I can't see a way for a node to have multiple credentials attached so..
+		if (node.credentials) {
+			Object.entries(node.credentials).forEach(([credName, credDetails]) => {
+				metrics = Object.assign(metrics, {
+					credential_type: credName,
+					credential_id: credDetails.id,
+				});
+			});
+		}
+
+		// Send metrics to posthog
+		this.emit('telemetry.onFirstWorkflowDataLoad', metrics);
+	}
+}
+
+export declare interface EventsService {
+	on(
+		event: 'nodeFetchedData',
+		listener: (workflowId: string | undefined | null, node: INode) => void,
+	): this;
+	on(
+		event: 'workflowExecutionCompleted',
+		listener: (workflowData: IWorkflowBase, runData: IRun) => void,
+	): this;
+	on(
+		event: 'telemetry.onFirstProductionWorkflowSuccess',
+		listener: (metrics: { user_id: string; workflow_id: string }) => void,
+	): this;
+	on(
+		event: 'telemetry.onFirstWorkflowDataLoad',
+		listener: (metrics: {
+			user_id: string;
+			workflow_id: string;
+			node_type: string;
+			node_id: string;
+			credential_type?: string;
+			credential_id?: string;
+		}) => void,
+	): this;
+}
diff --git a/packages/cli/test/unit/Events.test.ts b/packages/cli/test/unit/services/events.service.test.ts
similarity index 54%
rename from packages/cli/test/unit/Events.test.ts
rename to packages/cli/test/unit/services/events.service.test.ts
index 452014a739779..027e180cebf7d 100644
--- a/packages/cli/test/unit/Events.test.ts
+++ b/packages/cli/test/unit/services/events.service.test.ts
@@ -1,75 +1,61 @@
-import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
+import type { IRun, WorkflowExecuteMode, ILogger } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
+import {
+	QueryFailedError,
+	type DataSource,
+	type EntityManager,
+	type EntityMetadata,
+} from 'typeorm';
+import { mocked } from 'jest-mock';
 import { mock } from 'jest-mock-extended';
 
 import config from '@/config';
-import * as Db from '@/Db';
-import { User } from '@db/entities/User';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
+import type { User } from '@db/entities/User';
 import type { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
-import type { WorkflowStatisticsRepository } from '@db/repositories';
-import { nodeFetchedData, workflowExecutionCompleted } from '@/events/WorkflowStatistics';
-import * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
-import { getLogger } from '@/Logger';
-import { InternalHooks } from '@/InternalHooks';
-
-import { mockInstance } from '../integration/shared/utils/';
+import { WorkflowStatisticsRepository } from '@db/repositories';
+import { EventsService } from '@/services/events.service';
 import { UserService } from '@/user/user.service';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-
-jest.mock('@/Db', () => {
-	return {
-		collections: {
-			WorkflowStatistics: mock<WorkflowStatisticsRepository>({
-				metadata: { tableName: 'workflow_statistics' },
-			}),
-		},
-	};
-});
+import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 
-jest.spyOn(UserService, 'updateUserSettings').mockImplementation();
+jest.mock('@/UserManagement/UserManagementHelper', () => ({ getWorkflowOwner: jest.fn() }));
 
-describe('Events', () => {
+describe('EventsService', () => {
 	const dbType = config.getEnv('database.type');
-	const fakeUser = Object.assign(new User(), { id: 'abcde-fghij' });
-	const internalHooks = mockInstance(InternalHooks);
-
-	jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockResolvedValue(fakeUser);
+	const fakeUser = mock<User>({ id: 'abcde-fghij' });
+
+	const entityManager = mock<EntityManager>();
+	const dataSource = mock<DataSource>({
+		manager: entityManager,
+		getMetadata: () =>
+			mock<EntityMetadata>({
+				tableName: 'workflow_statistics',
+			}),
+	});
+	Object.assign(entityManager, { connection: dataSource });
 
-	const workflowStatisticsRepository = Db.collections.WorkflowStatistics as ReturnType<
-		typeof mock<WorkflowStatisticsRepository>
-	>;
+	LoggerProxy.init(mock<ILogger>());
+	config.set('diagnostics.enabled', true);
+	config.set('deployment.type', 'n8n-testing');
+	mocked(getWorkflowOwner).mockResolvedValue(fakeUser);
+	const updateUserSettingsMock = jest.spyOn(UserService, 'updateUserSettings').mockImplementation();
 
-	beforeAll(() => {
-		config.set('diagnostics.enabled', true);
-		config.set('deployment.type', 'n8n-testing');
-		LoggerProxy.init(getLogger());
-	});
+	const eventsService = new EventsService(new WorkflowStatisticsRepository(dataSource));
 
-	afterAll(() => {
-		jest.clearAllTimers();
-		jest.useRealTimers();
-	});
+	const onFirstProductionWorkflowSuccess = jest.fn();
+	const onFirstWorkflowDataLoad = jest.fn();
+	eventsService.on('telemetry.onFirstProductionWorkflowSuccess', onFirstProductionWorkflowSuccess);
+	eventsService.on('telemetry.onFirstWorkflowDataLoad', onFirstWorkflowDataLoad);
 
 	beforeEach(() => {
-		if (dbType === 'sqlite') {
-			workflowStatisticsRepository.findOne.mockClear();
-		} else {
-			workflowStatisticsRepository.query.mockClear();
-		}
-
-		internalHooks.onFirstProductionWorkflowSuccess.mockClear();
-		internalHooks.onFirstWorkflowDataLoad.mockClear();
+		jest.clearAllMocks();
 	});
 
 	const mockDBCall = (count = 1) => {
 		if (dbType === 'sqlite') {
-			workflowStatisticsRepository.findOne.mockResolvedValueOnce(
-				mock<WorkflowStatistics>({ count }),
-			);
+			entityManager.findOne.mockResolvedValueOnce(mock<WorkflowStatistics>({ count }));
 		} else {
 			const result = dbType === 'postgresdb' ? [{ count }] : { affectedRows: count };
-			workflowStatisticsRepository.query.mockImplementationOnce(async (query) =>
+			entityManager.query.mockImplementationOnce(async (query) =>
 				query.startsWith('INSERT INTO') ? result : null,
 			);
 		}
@@ -96,9 +82,10 @@ describe('Events', () => {
 			};
 			mockDBCall();
 
-			await workflowExecutionCompleted(workflow, runData);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(1);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
+			await eventsService.workflowExecutionCompleted(workflow, runData);
+			expect(updateUserSettingsMock).toHaveBeenCalledTimes(1);
+			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(1);
+			expect(onFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
 				user_id: fakeUser.id,
 				workflow_id: workflow.id,
 			});
@@ -122,8 +109,8 @@ describe('Events', () => {
 				mode: 'internal' as WorkflowExecuteMode,
 				startedAt: new Date(),
 			};
-			await workflowExecutionCompleted(workflow, runData);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+			await eventsService.workflowExecutionCompleted(workflow, runData);
+			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
 		});
 
 		test('should not send metrics for updated entries', async () => {
@@ -145,8 +132,8 @@ describe('Events', () => {
 				startedAt: new Date(),
 			};
 			mockDBCall(2);
-			await workflowExecutionCompleted(workflow, runData);
-			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+			await eventsService.workflowExecutionCompleted(workflow, runData);
+			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
 		});
 	});
 
@@ -162,9 +149,9 @@ describe('Events', () => {
 				position: [0, 0] as [number, number],
 				parameters: {},
 			};
-			await nodeFetchedData(workflowId, node);
-			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(internalHooks.onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
+			await eventsService.nodeFetchedData(workflowId, node);
+			expect(onFirstWorkflowDataLoad).toBeCalledTimes(1);
+			expect(onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
 				user_id: fakeUser.id,
 				workflow_id: workflowId,
 				node_type: node.type,
@@ -189,9 +176,9 @@ describe('Events', () => {
 					},
 				},
 			};
-			await nodeFetchedData(workflowId, node);
-			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(internalHooks.onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
+			await eventsService.nodeFetchedData(workflowId, node);
+			expect(onFirstWorkflowDataLoad).toBeCalledTimes(1);
+			expect(onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
 				user_id: fakeUser.id,
 				workflow_id: workflowId,
 				node_type: node.type,
@@ -203,15 +190,7 @@ describe('Events', () => {
 
 		test('should not send metrics for entries that already have the flag set', async () => {
 			// Fetch data for workflow 2 which is set up to not be altered in the mocks
-			workflowStatisticsRepository.findOne.mockImplementationOnce(async () => {
-				return {
-					count: 1,
-					name: StatisticsNames.dataLoaded,
-					latestEvent: new Date(),
-					workflowId: '2',
-					workflow: new WorkflowEntity(),
-				};
-			});
+			entityManager.insert.mockRejectedValueOnce(new QueryFailedError('', undefined, ''));
 			const workflowId = '1';
 			const node = {
 				id: 'abcde',
@@ -221,8 +200,8 @@ describe('Events', () => {
 				position: [0, 0] as [number, number],
 				parameters: {},
 			};
-			await nodeFetchedData(workflowId, node);
-			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(0);
+			await eventsService.nodeFetchedData(workflowId, node);
+			expect(onFirstWorkflowDataLoad).toBeCalledTimes(0);
 		});
 	});
 });
diff --git a/packages/core/src/EventEmitter.ts b/packages/core/src/EventEmitter.ts
deleted file mode 100644
index a5e71633564bc..0000000000000
--- a/packages/core/src/EventEmitter.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import EventEmitter from 'events';
-
-interface EventTypes {
-	nodeFetchedData: string;
-	workflowExecutionCompleted: string;
-}
-
-class N8NEventEmitter extends EventEmitter {
-	types: EventTypes = {
-		nodeFetchedData: 'nodeFetchedData',
-		workflowExecutionCompleted: 'workflowExecutionCompleted',
-	};
-}
-
-export const eventEmitter = new N8NEventEmitter();
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 516c30282eabb..2b441605eeb0d 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,4 +1,3 @@
-import { eventEmitter } from './EventEmitter';
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 import * as UserSettings from './UserSettings';
 
@@ -14,5 +13,5 @@ export * from './LoadNodeParameterOptions';
 export * from './LoadNodeListSearch';
 export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
-export { eventEmitter, NodeExecuteFunctions, UserSettings };
+export { NodeExecuteFunctions, UserSettings };
 export * from './errors';

From 3a672b986e041798f0b339f65f4a6ee10de151ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 18 Jul 2023 11:43:07 +0200
Subject: [PATCH 018/116] fix(editor): Hide Execute Node button for unknown
 nodes (#6684)

---
 packages/editor-ui/src/components/NodeSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index feb7d0809c8c1..9bda6d0614c55 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -17,7 +17,7 @@
 				></NodeTitle>
 				<div v-if="isExecutable">
 					<NodeExecuteButton
-						v-if="!blockUI"
+						v-if="!blockUI && node && nodeValid"
 						data-test-id="node-execute-button"
 						:nodeName="node.name"
 						:disabled="outputPanelEditMode.enabled && !isTriggerNode"

From e0cc835e4edaa7eccaa3168280fea4d2aa6bca29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 18 Jul 2023 11:43:28 +0200
Subject: [PATCH 019/116] feat: Allow hiding credential params on cloud (#6687)

---
 .../src/components/CredentialEdit/CredentialEdit.vue          | 4 ++++
 .../credentials/GoogleSheetsOAuth2Api.credentials.ts          | 3 +++
 .../credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts   | 3 +++
 packages/workflow/src/Interfaces.ts                           | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 02dcf89a8a522..1afeede923f2b 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -554,6 +554,10 @@ export default defineComponent({
 				return false;
 			}
 
+			if (parameter.displayOptions?.hideOnCloud && this.settingsStore.isCloudDeployment) {
+				return false;
+			}
+
 			if (parameter.displayOptions === undefined) {
 				// If it is not defined no need to do a proper check
 				return true;
diff --git a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
index 1744613a59e84..a80b5c761623a 100644
--- a/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSheetsOAuth2Api.credentials.ts
@@ -28,6 +28,9 @@ export class GoogleSheetsOAuth2Api implements ICredentialType {
 			name: 'notice',
 			type: 'notice',
 			default: '',
+			displayOptions: {
+				hideOnCloud: true,
+			},
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts
index b5ee15101f197..f5d83423edd53 100644
--- a/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleSheetsTriggerOAuth2Api.credentials.ts
@@ -29,6 +29,9 @@ export class GoogleSheetsTriggerOAuth2Api implements ICredentialType {
 			name: 'notice',
 			type: 'notice',
 			default: '',
+			displayOptions: {
+				hideOnCloud: true,
+			},
 		},
 	];
 }
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index bf1d463cdd5a6..1908e2a87dca8 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1090,6 +1090,8 @@ export interface IDisplayOptions {
 	show?: {
 		[key: string]: NodeParameterValue[] | undefined;
 	};
+
+	hideOnCloud?: boolean;
 }
 
 export interface INodeProperties {

From cfc25ec8726e4c1d097fdd210775e05ac8cf2ab5 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Tue, 18 Jul 2023 11:58:53 +0200
Subject: [PATCH 020/116] fix: Stop n8n from complaining about credentials when
 saving a new workflow form a template (#6671)

---
 packages/editor-ui/src/views/NodeView.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index b5c637fc1aa81..83dfc33c8639b 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -866,6 +866,12 @@ export default defineComponent({
 
 			data.workflow.nodes = NodeViewUtils.getFixedNodesList(data.workflow.nodes) as INodeUi[];
 
+			data.workflow.nodes?.forEach((node) => {
+				if (node.credentials) {
+					delete node.credentials;
+				}
+			});
+
 			this.blankRedirect = true;
 			void this.$router.replace({ name: VIEWS.NEW_WORKFLOW, query: { templateId } });
 

From 89998ffd9dea8c2cc87ab81b367fe693c8afd9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 18 Jul 2023 12:43:49 +0200
Subject: [PATCH 021/116] fix(core): Upgrade semver to address CVE-2022-25883
 (#6689)

* fix(core): Upgrade semver to address CVE-2022-25883

[GH Advisory](https://github.com/advisories/GHSA-c2qf-rxjj-qqgw)

* enforce the patched version of semver everywhere in the dev setup
---
 .github/scripts/package.json     |   2 +-
 package.json                     |   1 +
 packages/cli/package.json        |   2 +-
 packages/nodes-base/package.json |   2 +-
 pnpm-lock.yaml                   | 153 ++++++++++++++-----------------
 5 files changed, 72 insertions(+), 88 deletions(-)

diff --git a/.github/scripts/package.json b/.github/scripts/package.json
index 679eeebead667..3d48686a5fe0d 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -3,7 +3,7 @@
     "add-stream": "^1.0.0",
     "conventional-changelog": "^4.0.0",
     "glob": "^10.3.0",
-    "semver": "^7.5.2",
+    "semver": "^7.5.4",
     "tempfile": "^5.0.0",
     "typescript": "*"
   }
diff --git a/package.json b/package.json
index e37ae4779adf4..1d902685de674 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
       "http-cache-semantics": "4.1.1",
       "jsonwebtoken": "9.0.0",
       "prettier": "^2.8.3",
+      "semver": "^7.5.4",
       "tough-cookie": "^4.1.3",
       "tslib": "^2.5.0",
       "ts-node": "^10.9.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3949647730754..c57f8639baf58 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -171,7 +171,7 @@
     "reflect-metadata": "^0.1.13",
     "replacestream": "^4.0.3",
     "samlify": "^2.8.9",
-    "semver": "^7.3.8",
+    "semver": "^7.5.4",
     "shelljs": "^0.8.5",
     "simple-git": "^3.17.0",
     "source-map-support": "^0.5.21",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 95ec20661d373..3fcae99d34114 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -835,7 +835,7 @@
     "redis": "^3.1.1",
     "rhea": "^1.0.11",
     "rss-parser": "^3.7.0",
-    "semver": "^7.3.8",
+    "semver": "^7.5.4",
     "showdown": "^2.0.3",
     "simple-git": "^3.17.0",
     "snowflake-sdk": "^1.6.23",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97b70cccadfab..c732f0e8a6bc2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,6 +18,7 @@ overrides:
   http-cache-semantics: 4.1.1
   jsonwebtoken: 9.0.0
   prettier: ^2.8.3
+  semver: ^7.5.4
   tough-cookie: ^4.1.3
   tslib: ^2.5.0
   ts-node: ^10.9.1
@@ -409,8 +410,8 @@ importers:
         specifier: ^2.8.9
         version: 2.8.9
       semver:
-        specifier: ^7.3.8
-        version: 7.3.8
+        specifier: ^7.5.4
+        version: 7.5.4
       shelljs:
         specifier: ^0.8.5
         version: 0.8.5
@@ -1158,8 +1159,8 @@ importers:
         specifier: ^3.7.0
         version: 3.12.0
       semver:
-        specifier: ^7.3.8
-        version: 7.3.8
+        specifier: ^7.5.4
+        version: 7.5.4
       showdown:
         specifier: ^2.0.3
         version: 2.1.0
@@ -1689,7 +1690,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1712,7 +1713,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1762,7 +1763,7 @@ packages:
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.21.4
       lru-cache: 5.1.1
-      semver: 6.3.0
+      semver: 7.5.4
     dev: true
 
   /@babel/helper-compilation-targets@7.21.5(@babel/core@7.20.12):
@@ -1776,7 +1777,7 @@ packages:
       '@babel/helper-validator-option': 7.21.0
       browserslist: 4.21.4
       lru-cache: 5.1.1
-      semver: 6.3.0
+      semver: 7.5.4
     dev: true
 
   /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.8):
@@ -1790,7 +1791,7 @@ packages:
       '@babel/helper-validator-option': 7.21.0
       browserslist: 4.21.4
       lru-cache: 5.1.1
-      semver: 6.3.0
+      semver: 7.5.4
     dev: true
 
   /@babel/helper-create-class-features-plugin@7.20.12(@babel/core@7.20.12):
@@ -1846,7 +1847,7 @@ packages:
       '@babel/helper-replace-supers': 7.21.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
       '@babel/helper-split-export-declaration': 7.18.6
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1884,7 +1885,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1900,7 +1901,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.1
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3809,7 +3810,7 @@ packages:
       babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.20.12)
       babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.20.12)
       core-js-compat: 3.27.1
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3896,7 +3897,7 @@ packages:
       babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.21.8)
       babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.21.8)
       core-js-compat: 3.27.1
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -5194,7 +5195,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.5.4
       tar: 6.1.13
     transitivePeerDependencies:
       - encoding
@@ -5323,7 +5324,7 @@ packages:
     resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.3.8
+      semver: 7.5.4
     dev: false
     optional: true
 
@@ -5348,7 +5349,7 @@ packages:
       '@oclif/help': 1.0.3(supports-color@8.1.1)
       '@oclif/parser': 3.8.8
       debug: 4.3.4(supports-color@8.1.1)
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -5364,7 +5365,7 @@ packages:
       '@oclif/help': 1.0.3(supports-color@8.1.1)
       '@oclif/parser': 3.8.8
       debug: 4.3.4(supports-color@8.1.1)
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -5380,7 +5381,7 @@ packages:
       '@oclif/help': 1.0.3(supports-color@8.1.1)
       '@oclif/parser': 3.8.8
       debug: 4.3.4(supports-color@8.1.1)
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
 
@@ -5435,7 +5436,7 @@ packages:
       natural-orderby: 2.0.3
       object-treeify: 1.1.33
       password-prompt: 1.1.2
-      semver: 7.3.8
+      semver: 7.5.4
       string-width: 4.2.3
       strip-ansi: 6.0.1
       supports-color: 8.1.1
@@ -6225,7 +6226,7 @@ packages:
       process: 0.11.10
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
-      semver: 7.3.8
+      semver: 7.5.4
       style-loader: 3.3.1(webpack@5.75.0)
       terser-webpack-plugin: 5.3.6(esbuild@0.17.18)(webpack@5.75.0)
       ts-dedent: 2.2.0
@@ -6313,7 +6314,7 @@ packages:
       prompts: 2.4.2
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
-      semver: 7.3.8
+      semver: 7.5.4
       shelljs: 0.8.5
       simple-update-notifier: 1.0.7
       strip-json-comments: 3.1.1
@@ -6484,7 +6485,7 @@ packages:
       pretty-hrtime: 1.0.3
       prompts: 2.4.2
       read-pkg-up: 7.0.1
-      semver: 7.3.8
+      semver: 7.5.4
       serve-favicon: 2.5.0
       telejson: 7.0.4
       ts-dedent: 2.2.0
@@ -6588,7 +6589,7 @@ packages:
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
-      semver: 7.3.8
+      semver: 7.5.4
       store2: 2.14.2
       telejson: 7.0.4
       ts-dedent: 2.2.0
@@ -7752,7 +7753,7 @@ packages:
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
-      semver: 7.3.8
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@5.1.3)
       typescript: 5.1.3
     transitivePeerDependencies:
@@ -7780,7 +7781,7 @@ packages:
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
-      semver: 7.3.8
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@5.1.3)
       typescript: 5.1.3
     transitivePeerDependencies:
@@ -7920,7 +7921,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@5.1.3)
       typescript: 5.1.3
     transitivePeerDependencies:
@@ -7941,7 +7942,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@5.1.3)
       typescript: 5.1.3
     transitivePeerDependencies:
@@ -7962,7 +7963,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@5.1.3)
       typescript: 5.1.3
     transitivePeerDependencies:
@@ -7983,7 +7984,7 @@ packages:
       eslint: 8.39.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0(eslint@8.39.0)
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -8003,7 +8004,7 @@ packages:
       '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.1.3)
       eslint: 8.39.0
       eslint-scope: 5.1.1
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -8023,7 +8024,7 @@ packages:
       '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.3)
       eslint: 8.39.0
       eslint-scope: 5.1.1
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -9077,7 +9078,7 @@ packages:
       node-fetch: 2.6.8
       parse-github-url: 1.0.2
       regenerator-runtime: 0.13.9
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - encoding
     dev: false
@@ -9251,7 +9252,7 @@ packages:
       '@babel/compat-data': 7.21.7
       '@babel/core': 7.20.12
       '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -9264,7 +9265,7 @@ packages:
       '@babel/compat-data': 7.21.7
       '@babel/core': 7.21.8
       '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8)
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -9691,7 +9692,7 @@ packages:
       lodash: 4.17.21
       p-timeout: 3.2.0
       promise.prototype.finally: 3.1.3
-      semver: 7.3.8
+      semver: 7.5.4
       util.promisify: 1.1.1
       uuid: 8.3.2
     transitivePeerDependencies:
@@ -9709,7 +9710,7 @@ packages:
       lodash: 4.17.21
       msgpackr: 1.8.1
       p-timeout: 3.2.0
-      semver: 7.3.8
+      semver: 7.5.4
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -10138,7 +10139,7 @@ packages:
       natural-orderby: 2.0.3
       object-treeify: 1.1.33
       password-prompt: 1.1.2
-      semver: 7.3.8
+      semver: 7.5.4
       string-width: 4.2.3
       strip-ansi: 6.0.1
       supports-color: 8.1.1
@@ -10839,7 +10840,7 @@ packages:
     dependencies:
       nice-try: 1.0.5
       path-key: 2.0.1
-      semver: 5.7.1
+      semver: 7.5.4
       shebang-command: 1.2.0
       which: 1.3.1
 
@@ -10892,7 +10893,7 @@ packages:
       postcss-modules-values: 3.0.0
       postcss-value-parser: 4.2.0
       schema-utils: 2.7.1
-      semver: 6.3.0
+      semver: 7.5.4
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
 
@@ -10909,7 +10910,7 @@ packages:
       postcss-modules-scope: 3.0.0(postcss@8.4.21)
       postcss-modules-values: 4.0.0(postcss@8.4.21)
       postcss-value-parser: 4.2.0
-      semver: 7.3.8
+      semver: 7.5.4
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
 
@@ -11030,7 +11031,7 @@ packages:
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
       request-progress: 3.0.0
-      semver: 7.3.8
+      semver: 7.5.4
       supports-color: 8.1.1
       tmp: 0.2.1
       untildify: 4.0.0
@@ -11559,7 +11560,7 @@ packages:
     dependencies:
       commander: 2.20.3
       lru-cache: 4.1.5
-      semver: 5.7.1
+      semver: 7.5.4
       sigmund: 1.0.1
     dev: true
 
@@ -11953,7 +11954,7 @@ packages:
       eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
       object.assign: 4.1.4
       object.entries: 1.1.5
-      semver: 6.3.0
+      semver: 7.5.4
     dev: true
 
   /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0):
@@ -12082,7 +12083,7 @@ packages:
       minimatch: 3.1.2
       object.values: 1.1.6
       resolve: 1.22.1
-      semver: 6.3.0
+      semver: 7.5.4
       tsconfig-paths: 3.14.1
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
@@ -12149,7 +12150,7 @@ packages:
       regexp-tree: 0.1.25
       regjsparser: 0.9.1
       safe-regex: 2.1.1
-      semver: 7.3.8
+      semver: 7.5.4
       strip-indent: 3.0.0
     dev: true
 
@@ -12179,7 +12180,7 @@ packages:
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.11
-      semver: 7.3.8
+      semver: 7.5.4
       vue-eslint-parser: 9.3.0(eslint@8.39.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
@@ -13012,7 +13013,7 @@ packages:
       memfs: 3.4.13
       minimatch: 3.1.2
       schema-utils: 2.7.0
-      semver: 7.3.8
+      semver: 7.5.4
       tapable: 1.1.3
       typescript: 5.1.3
       vue-template-compiler: 2.7.14
@@ -14717,7 +14718,7 @@ packages:
       '@babel/parser': 7.21.8
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -15214,7 +15215,7 @@ packages:
       jest-util: 29.5.0
       natural-compare: 1.4.0
       pretty-format: 29.5.0
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -15656,7 +15657,7 @@ packages:
       jws: 3.2.2
       lodash: 4.17.21
       ms: 2.1.3
-      semver: 7.3.8
+      semver: 7.5.4
 
   /jsprim@1.4.2:
     resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
@@ -16311,14 +16312,14 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       pify: 4.0.1
-      semver: 5.7.1
+      semver: 7.5.4
     dev: true
 
   /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
-      semver: 6.3.0
+      semver: 7.5.4
 
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -17086,7 +17087,7 @@ packages:
       nopt: 5.0.0
       npmlog: 6.0.2
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.5.4
       tar: 6.1.13
       which: 2.0.2
     transitivePeerDependencies:
@@ -17165,7 +17166,7 @@ packages:
       ignore-by-default: 1.0.1
       minimatch: 3.1.2
       pstree.remy: 1.1.8
-      semver: 5.7.1
+      semver: 7.5.4
       simple-update-notifier: 1.0.7
       supports-color: 5.5.0
       touch: 3.1.0
@@ -17200,7 +17201,7 @@ packages:
     dependencies:
       hosted-git-info: 2.8.9
       resolve: 1.22.1
-      semver: 5.7.1
+      semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
 
@@ -17210,7 +17211,7 @@ packages:
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.11.0
-      semver: 7.3.8
+      semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
 
@@ -18142,7 +18143,7 @@ packages:
       loader-utils: 2.0.4
       postcss: 7.0.39
       schema-utils: 3.1.1
-      semver: 7.3.8
+      semver: 7.5.4
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
 
@@ -19603,26 +19604,8 @@ packages:
       sver-compat: 1.5.0
     dev: true
 
-  /semver@5.3.0:
-    resolution: {integrity: sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw==}
-    hasBin: true
-    dev: false
-
-  /semver@5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
-    hasBin: true
-
-  /semver@6.3.0:
-    resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
-    hasBin: true
-
-  /semver@7.0.0:
-    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
-    hasBin: true
-    dev: true
-
-  /semver@7.3.8:
-    resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
+  /semver@7.5.4:
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
@@ -19808,7 +19791,7 @@ packages:
     resolution: {integrity: sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==}
     engines: {node: '>=8.10.0'}
     dependencies:
-      semver: 7.0.0
+      semver: 7.5.4
     dev: true
 
   /sisteransi@1.0.5:
@@ -20545,7 +20528,7 @@ packages:
       methods: 1.1.2
       mime: 2.6.0
       qs: 6.11.0
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -21088,7 +21071,7 @@ packages:
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
-      semver: 7.3.8
+      semver: 7.5.4
       typescript: 5.1.3
       yargs-parser: 21.1.1
     dev: true
@@ -21103,7 +21086,7 @@ packages:
       chalk: 4.1.2
       enhanced-resolve: 5.13.0
       micromatch: 4.0.5
-      semver: 7.3.8
+      semver: 7.5.4
       typescript: 5.1.3
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
@@ -21710,7 +21693,7 @@ packages:
   /utf7@1.0.2:
     resolution: {integrity: sha512-qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==}
     dependencies:
-      semver: 5.3.0
+      semver: 7.5.4
     dev: false
 
   /utf8@2.1.2:
@@ -22090,7 +22073,7 @@ packages:
       espree: 9.5.1
       esquery: 1.5.0
       lodash: 4.17.21
-      semver: 7.3.8
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -22493,7 +22476,7 @@ packages:
     resolution: {integrity: sha512-iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw==}
     engines: {node: '>=0.10.0'}
     dependencies:
-      semver: 5.7.1
+      semver: 7.5.4
     dev: false
 
   /winston-transport@4.5.0:

From d8eac0948af5e910174f602118e8235dbda4fab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 18 Jul 2023 12:54:05 +0200
Subject: [PATCH 022/116] ci: Fix test checker glob (no changelog) (#6682)

ci: Fix test checker glob
---
 .github/scripts/check-tests.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/check-tests.mjs b/.github/scripts/check-tests.mjs
index 1694fad35d43b..3dc119896f92e 100644
--- a/.github/scripts/check-tests.mjs
+++ b/.github/scripts/check-tests.mjs
@@ -60,7 +60,7 @@ const main = async () => {
 		.then(({stdout}) => stdout.trim().split('\n').filter(Boolean));
 
   // Get all .spec.ts and .test.ts files from the packages
-	const specAndTestTsFiles = await glob('packages/*/**/{test,__tests__}/*.{spec,test}.ts');
+	const specAndTestTsFiles = await glob('packages/*/**/{test,__tests__}/**/*.{spec,test}.ts');
 	const specAndTestTsFilesNames = specAndTestTsFiles.map(file => path.parse(file).name.replace(/\.(test|spec)/, ''));
 
   // Filter out the .ts and .vue files from the changed files

From 8a67978da372d23f9854eb1bee240464b58013d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 18 Jul 2023 14:03:19 +0200
Subject: [PATCH 023/116] fix(API): Do not add starting node on workflow
 creation (#6686)

* fix(API): Do not add starting node on workflow creation

* chore: Remove comment
---
 packages/cli/src/ActiveWorkflowRunner.ts      |  4 +--
 .../handlers/workflows/workflows.handler.ts   | 10 ------
 .../handlers/workflows/workflows.service.ts   | 22 -------------
 packages/cli/src/PublicApi/v1/openapi.yml     |  2 +-
 packages/cli/src/constants.ts                 |  2 +-
 packages/cli/src/utils.ts                     |  4 +--
 .../integration/publicApi/workflows.test.ts   | 31 +++++++++++++++++++
 7 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 58a08fba82c83..1b1c8bb716585 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -64,7 +64,7 @@ import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExternalHooks } from '@/ExternalHooks';
 import { whereClause } from './UserManagement/UserManagementHelper';
 import { WorkflowsService } from './workflows/workflows.services';
-import { START_NODES } from './constants';
+import { STARTING_NODES } from './constants';
 import { webhookNotFoundErrorMessage } from './utils';
 import { In } from 'typeorm';
 
@@ -793,7 +793,7 @@ export class ActiveWorkflowRunner {
 				settings: workflowData.settings,
 			});
 
-			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(START_NODES);
+			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(STARTING_NODES);
 			if (!canBeActivated) {
 				Logger.error(`Unable to activate workflow "${workflowData.name}"`);
 				throw new Error(
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index 7305b23cb73cd..d428b6396604a 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -18,8 +18,6 @@ import {
 	setWorkflowAsActive,
 	setWorkflowAsInactive,
 	updateWorkflow,
-	hasStartNode,
-	getStartNode,
 	getSharedWorkflows,
 	createWorkflow,
 	getWorkflowIdsViaTags,
@@ -37,10 +35,6 @@ export = {
 
 			workflow.active = false;
 
-			if (!hasStartNode(workflow)) {
-				workflow.nodes.push(getStartNode());
-			}
-
 			await replaceInvalidCredentials(workflow);
 
 			addNodeIds(workflow);
@@ -164,10 +158,6 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			if (!hasStartNode(updateData)) {
-				updateData.nodes.push(getStartNode());
-			}
-
 			await replaceInvalidCredentials(updateData);
 			addNodeIds(updateData);
 
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
index df9515ecdbf3c..6afe5e8918c40 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
@@ -1,8 +1,6 @@
 import type { FindManyOptions, UpdateResult } from 'typeorm';
 import { In } from 'typeorm';
 import intersection from 'lodash/intersection';
-import type { INode } from 'n8n-workflow';
-import { v4 as uuid } from 'uuid';
 
 import * as Db from '@/Db';
 import type { User } from '@db/entities/User';
@@ -10,7 +8,6 @@ import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import type { Role } from '@db/entities/Role';
 import config from '@/config';
-import { START_NODES } from '@/constants';
 
 function insertIf(condition: boolean, elements: string[]): string[] {
 	return condition ? elements : [];
@@ -122,25 +119,6 @@ export async function updateWorkflow(
 	return Db.collections.Workflow.update(workflowId, updateData);
 }
 
-export function hasStartNode(workflow: WorkflowEntity): boolean {
-	if (!workflow.nodes.length) return false;
-
-	const found = workflow.nodes.find((node) => START_NODES.includes(node.type));
-
-	return Boolean(found);
-}
-
-export function getStartNode(): INode {
-	return {
-		id: uuid(),
-		parameters: {},
-		name: 'Start',
-		type: 'n8n-nodes-base.start',
-		typeVersion: 1,
-		position: [240, 300],
-	};
-}
-
 export function parseTagNames(tags: string): string[] {
 	return tags.split(',').map((tag) => tag.trim());
 }
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index a8b46cb7fb967..d5839d03074bd 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -9,7 +9,7 @@ info:
   license:
     name: Sustainable Use License
     url: https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md
-  version: 1.1.0
+  version: 1.1.1
 externalDocs:
   description: n8n API documentation
   url: https://docs.n8n.io/api/
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index a871d7e5ed4b6..4eb63e67a21e0 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -26,7 +26,7 @@ export function getN8nPackageJson() {
 	return jsonParse<n8n.PackageJson>(readFileSync(join(CLI_DIR, 'package.json'), 'utf8'));
 }
 
-export const START_NODES = ['n8n-nodes-base.start', 'n8n-nodes-base.manualTrigger'];
+export const STARTING_NODES = ['n8n-nodes-base.start', 'n8n-nodes-base.manualTrigger'];
 
 export const N8N_VERSION = getN8nPackageJson().version;
 
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index 5ceeeeb732ead..c4a094ef1e507 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { CliWorkflowOperationError, SubworkflowOperationError } from 'n8n-workflow';
 import type { INode } from 'n8n-workflow';
-import { START_NODES } from './constants';
+import { STARTING_NODES } from './constants';
 
 /**
  * Returns if the given id is a valid workflow id
@@ -19,7 +19,7 @@ function findWorkflowStart(executionMode: 'integrated' | 'cli') {
 
 		if (executeWorkflowTriggerNode) return executeWorkflowTriggerNode;
 
-		const startNode = nodes.find((node) => START_NODES.includes(node.type));
+		const startNode = nodes.find((node) => STARTING_NODES.includes(node.type));
 
 		if (startNode) return startNode;
 
diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts
index cc8e9d234aa3e..910bfbb3970c8 100644
--- a/packages/cli/test/integration/publicApi/workflows.test.ts
+++ b/packages/cli/test/integration/publicApi/workflows.test.ts
@@ -8,6 +8,8 @@ import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { randomApiKey } from '../shared/random';
 import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
+import type { INode } from 'n8n-workflow';
+import { STARTING_NODES } from '@/constants';
 
 let workflowOwnerRole: Role;
 let owner: User;
@@ -676,6 +678,35 @@ describe('POST /workflows', () => {
 		expect(sharedWorkflow?.workflow.createdAt.toISOString()).toBe(createdAt);
 		expect(sharedWorkflow?.role).toEqual(workflowOwnerRole);
 	});
+
+	test('should not add a starting node if the payload has no starting nodes', async () => {
+		const response = await authMemberAgent.post('/workflows').send({
+			name: 'testing',
+			nodes: [
+				{
+					id: 'uuid-1234',
+					parameters: {},
+					name: 'Hacker News',
+					type: 'n8n-nodes-base.hackerNews',
+					typeVersion: 1,
+					position: [240, 300],
+				},
+			],
+			connections: {},
+			settings: {
+				saveExecutionProgress: true,
+				saveManualExecutions: true,
+				saveDataErrorExecution: 'all',
+				saveDataSuccessExecution: 'all',
+				executionTimeout: 3600,
+				timezone: 'America/New_York',
+			},
+		});
+
+		const found = response.body.nodes.find((node: INode) => STARTING_NODES.includes(node.type));
+
+		expect(found).toBeUndefined();
+	});
 });
 
 describe('PUT /workflows/:id', () => {

From 34e1a1ba8cbded5adf8075ec058f8f3e0daf6834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 18 Jul 2023 15:57:14 +0200
Subject: [PATCH 024/116] fix(core): Filter out workflows that failed to
 activate on startup (#6676)

* fix(core): Deactivate on init workflow that should not be retried

* fix(core): Filter out workflows with activation errors
---
 .vscode/launch.json                           |  1 +
 packages/cli/src/ActiveWorkflowRunner.ts      | 16 +++++---
 .../test/unit/ActiveWorkflowRunner.test.ts    | 37 +++++++++++++++++--
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6e814517875a9..448d745236cbc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -26,6 +26,7 @@
 			"name": "Launch n8n with debug",
 			"program": "${workspaceFolder}/packages/cli/bin/n8n",
 			"cwd": "${workspaceFolder}/packages/cli/bin",
+			// "args": ["start", "--tunnel"],
 			"request": "launch",
 			"skipFiles": ["<node_internals>/**"],
 			"type": "node",
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 1b1c8bb716585..66f90b326260d 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -134,7 +134,7 @@ export class ActiveWorkflowRunner {
 				} catch (error) {
 					ErrorReporter.error(error);
 					Logger.info(
-						'     => ERROR: Workflow could not be activated on first try, keep on trying',
+						'     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue',
 					);
 					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					Logger.info(`               ${error.message}`);
@@ -148,8 +148,10 @@ export class ActiveWorkflowRunner {
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 					this.executeErrorWorkflow(error, workflowData, 'internal');
 
-					// Keep on trying to activate the workflow
-					this.addQueuedWorkflowActivation('init', workflowData);
+					if (!error.message.includes('Authorization')) {
+						// Keep on trying to activate the workflow if not an auth issue
+						this.addQueuedWorkflowActivation('init', workflowData);
+					}
 				}
 			}
 			Logger.verbose('Finished initializing active workflows (startup)');
@@ -350,7 +352,9 @@ export class ActiveWorkflowRunner {
 				select: ['id'],
 				where: { active: true },
 			});
-			return activeWorkflows.map((workflow) => workflow.id.toString());
+			return activeWorkflows
+				.map((workflow) => workflow.id)
+				.filter((workflowId) => !this.activationErrors[workflowId]);
 		} else {
 			const active = await Db.collections.Workflow.find({
 				select: ['id'],
@@ -366,7 +370,9 @@ export class ActiveWorkflowRunner {
 				select: ['workflowId'],
 				where,
 			});
-			return shared.map((id) => id.workflowId.toString());
+			return shared
+				.map((id) => id.workflowId)
+				.filter((workflowId) => !this.activationErrors[workflowId]);
 		}
 	}
 
diff --git a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
index 055795936b17c..39b22221484d0 100644
--- a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
+++ b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
@@ -1,8 +1,8 @@
 import { v4 as uuid } from 'uuid';
 import { mocked } from 'jest-mock';
 
-import type { ICredentialTypes, INodesAndCredentials } from 'n8n-workflow';
-import { LoggerProxy, NodeOperationError, Workflow } from 'n8n-workflow';
+import type { ICredentialTypes, INode, INodesAndCredentials } from 'n8n-workflow';
+import { LoggerProxy, NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';
 
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
@@ -51,7 +51,7 @@ const generateWorkflows = (count: number): WorkflowEntity[] => {
 	for (let i = 0; i < count; i++) {
 		const workflow = new WorkflowEntity();
 		Object.assign(workflow, {
-			id: i + 1,
+			id: (i + 1).toString(),
 			name: randomName(),
 			active: true,
 			createdAt: new Date(),
@@ -260,4 +260,35 @@ describe('ActiveWorkflowRunner', () => {
 		activeWorkflowRunner.executeErrorWorkflow(error, workflowData, 'trigger');
 		expect(workflowExecuteAdditionalDataExecuteErrorWorkflowSpy).toHaveBeenCalledTimes(1);
 	});
+
+	describe('init()', () => {
+		it('should execute error workflow on failure to activate due to 401', async () => {
+			databaseActiveWorkflowsCount = 1;
+
+			jest.spyOn(ActiveWorkflowRunner.prototype, 'add').mockImplementation(() => {
+				throw new NodeApiError(
+					{
+						id: 'a75dcd1b-9fed-4643-90bd-75933d67936c',
+						name: 'Github Trigger',
+						type: 'n8n-nodes-base.githubTrigger',
+						typeVersion: 1,
+						position: [0, 0],
+					} as INode,
+					{
+						httpCode: '401',
+						message: 'Authorization failed - please check your credentials',
+					},
+				);
+			});
+
+			const executeSpy = jest.spyOn(ActiveWorkflowRunner.prototype, 'executeErrorWorkflow');
+
+			await activeWorkflowRunner.init();
+
+			const [error, workflow] = executeSpy.mock.calls[0];
+
+			expect(error.message).toContain('Authorization');
+			expect(workflow.id).toBe('1');
+		});
+	});
 });

From dc889ce4d6ebfeb207196764fffb55b31574987f Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 18 Jul 2023 16:01:56 +0200
Subject: [PATCH 025/116] fix(core): Load SAML libraries dynamically (#6690)

load SAML dynamically
---
 .../src/sso/saml/routes/saml.controller.ee.ts |   2 +-
 packages/cli/src/sso/saml/saml.service.ee.ts  | 122 +++++++++---------
 packages/cli/src/sso/saml/samlValidator.ts    | 110 ++++++++++------
 .../cli/src/sso/saml/serviceProvider.ee.ts    |   9 +-
 4 files changed, 136 insertions(+), 107 deletions(-)

diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
index d0d27730f3b87..f7229f75d4888 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -184,7 +184,7 @@ export class SamlController {
 	}
 
 	private async handleInitSSO(res: express.Response, relayState?: string) {
-		const result = this.samlService.getLoginRequestUrl(relayState);
+		const result = await this.samlService.getLoginRequestUrl(relayState);
 		if (result?.binding === 'redirect') {
 			return result.context.context;
 		} else if (result?.binding === 'post') {
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index fa63646f9d5a1..8e9eaad2cbfff 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -10,11 +10,12 @@ import { isSsoJustInTimeProvisioningEnabled } from '../ssoHelpers';
 import type { SamlPreferences } from './types/samlPreferences';
 import { SAML_PREFERENCES_DB_KEY } from './constants';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
-import { IdentityProvider, setSchemaValidator } from 'samlify';
+import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
 import {
 	createUserFromSamlAttributes,
 	getMappedSamlAttributesFromFlowResult,
 	getSamlLoginLabel,
+	isSamlLicensedAndEnabled,
 	isSamlLoginEnabled,
 	setSamlLoginEnabled,
 	setSamlLoginLabel,
@@ -24,7 +25,6 @@ import type { Settings } from '@db/entities/Settings';
 import axios from 'axios';
 import https from 'https';
 import type { SamlLoginBinding } from './types';
-import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
 import { validateMetadata, validateResponse } from './samlValidator';
 import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
 
@@ -32,6 +32,9 @@ import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
 export class SamlService {
 	private identityProviderInstance: IdentityProviderInstance | undefined;
 
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	private samlify: typeof import('samlify') | undefined;
+
 	private _samlPreferences: SamlPreferences = {
 		mapping: {
 			email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
@@ -68,8 +71,20 @@ export class SamlService {
 	}
 
 	async init(): Promise<void> {
-		await this.loadFromDbAndApplySamlPreferences();
-		setSchemaValidator({
+		// load preferences first but do not apply so as to not load samlify unnecessarily
+		await this.loadFromDbAndApplySamlPreferences(false);
+		if (isSamlLicensedAndEnabled()) {
+			await this.loadSamlify();
+			await this.loadFromDbAndApplySamlPreferences(true);
+		}
+	}
+
+	async loadSamlify() {
+		if (this.samlify === undefined) {
+			LoggerProxy.debug('Loading samlify library into memory');
+			this.samlify = await import('samlify');
+		}
+		this.samlify.setSchemaValidator({
 			validate: async (response: string) => {
 				const valid = await validateResponse(response);
 				if (!valid) {
@@ -80,8 +95,11 @@ export class SamlService {
 	}
 
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
+		if (this.samlify === undefined) {
+			throw new Error('Samlify is not initialized');
+		}
 		if (this.identityProviderInstance === undefined || forceRecreate) {
-			this.identityProviderInstance = IdentityProvider({
+			this.identityProviderInstance = this.samlify.IdentityProvider({
 				metadata: this._samlPreferences.metadata,
 			});
 		}
@@ -90,16 +108,20 @@ export class SamlService {
 	}
 
 	getServiceProviderInstance(): ServiceProviderInstance {
-		return getServiceProviderInstance(this._samlPreferences);
+		if (this.samlify === undefined) {
+			throw new Error('Samlify is not initialized');
+		}
+		return getServiceProviderInstance(this._samlPreferences, this.samlify);
 	}
 
-	getLoginRequestUrl(
+	async getLoginRequestUrl(
 		relayState?: string,
 		binding?: SamlLoginBinding,
-	): {
+	): Promise<{
 		binding: SamlLoginBinding;
 		context: BindingContext | PostBindingContext;
-	} {
+	}> {
+		await this.loadSamlify();
 		if (binding === undefined) binding = this._samlPreferences.loginBinding ?? 'redirect';
 		if (binding === 'post') {
 			return {
@@ -192,6 +214,25 @@ export class SamlService {
 	}
 
 	async setSamlPreferences(prefs: SamlPreferences): Promise<SamlPreferences | undefined> {
+		await this.loadSamlify();
+		await this.loadPreferencesWithoutValidation(prefs);
+		if (prefs.metadataUrl) {
+			const fetchedMetadata = await this.fetchMetadataFromUrl();
+			if (fetchedMetadata) {
+				this._samlPreferences.metadata = fetchedMetadata;
+			}
+		} else if (prefs.metadata) {
+			const validationResult = await validateMetadata(prefs.metadata);
+			if (!validationResult) {
+				throw new Error('Invalid SAML metadata');
+			}
+		}
+		this.getIdentityProviderInstance(true);
+		const result = await this.saveSamlPreferencesToDb();
+		return result;
+	}
+
+	async loadPreferencesWithoutValidation(prefs: SamlPreferences) {
 		this._samlPreferences.loginBinding = prefs.loginBinding ?? this._samlPreferences.loginBinding;
 		this._samlPreferences.metadata = prefs.metadata ?? this._samlPreferences.metadata;
 		this._samlPreferences.mapping = prefs.mapping ?? this._samlPreferences.mapping;
@@ -207,34 +248,27 @@ export class SamlService {
 			prefs.wantMessageSigned ?? this._samlPreferences.wantMessageSigned;
 		if (prefs.metadataUrl) {
 			this._samlPreferences.metadataUrl = prefs.metadataUrl;
-			const fetchedMetadata = await this.fetchMetadataFromUrl();
-			if (fetchedMetadata) {
-				this._samlPreferences.metadata = fetchedMetadata;
-			}
 		} else if (prefs.metadata) {
 			// remove metadataUrl if metadata is set directly
 			this._samlPreferences.metadataUrl = undefined;
-			const validationResult = await validateMetadata(prefs.metadata);
-			if (!validationResult) {
-				throw new Error('Invalid SAML metadata');
-			}
 			this._samlPreferences.metadata = prefs.metadata;
 		}
 		await setSamlLoginEnabled(prefs.loginEnabled ?? isSamlLoginEnabled());
 		setSamlLoginLabel(prefs.loginLabel ?? getSamlLoginLabel());
-		this.getIdentityProviderInstance(true);
-		const result = await this.saveSamlPreferencesToDb();
-		return result;
 	}
 
-	async loadFromDbAndApplySamlPreferences(): Promise<SamlPreferences | undefined> {
+	async loadFromDbAndApplySamlPreferences(apply = true): 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) {
-				await this.setSamlPreferences(prefs);
+				if (apply) {
+					await this.setSamlPreferences(prefs);
+				} else {
+					await this.loadPreferencesWithoutValidation(prefs);
+				}
 				return prefs;
 			}
 		}
@@ -262,6 +296,7 @@ export class SamlService {
 	}
 
 	async fetchMetadataFromUrl(): Promise<string | undefined> {
+		await this.loadSamlify();
 		if (!this._samlPreferences.metadataUrl)
 			throw new BadRequestError('Error fetching SAML Metadata, no Metadata URL set');
 		try {
@@ -297,6 +332,7 @@ export class SamlService {
 		if (!this._samlPreferences.mapping)
 			throw new BadRequestError('Error fetching SAML Attributes, no Attribute mapping set');
 		try {
+			await this.loadSamlify();
 			parsedSamlResponse = await this.getServiceProviderInstance().parseLoginResponse(
 				this.getIdentityProviderInstance(),
 				binding,
@@ -324,46 +360,4 @@ export class SamlService {
 		}
 		return attributes;
 	}
-
-	async testSamlConnection(): Promise<boolean> {
-		try {
-			// TODO:SAML: this will not work once axios is upgraded to > 1.2.0 (see checkServerIdentity)
-			const agent = new https.Agent({
-				rejectUnauthorized: !this._samlPreferences.ignoreSSL,
-			});
-			const requestContext = this.getLoginRequestUrl();
-			if (!requestContext) return false;
-			if (requestContext.binding === 'redirect') {
-				const fetchResult = await axios.get(requestContext.context.context, { httpsAgent: agent });
-				if (fetchResult.status !== 200) {
-					LoggerProxy.debug('SAML: Error while testing SAML connection.');
-					return false;
-				}
-			} else if (requestContext.binding === 'post') {
-				const context = requestContext.context as PostBindingContext;
-				const endpoint = context.entityEndpoint;
-				const params = new URLSearchParams();
-				params.append(context.type, context.context);
-				if (context.relayState) {
-					params.append('RelayState', context.relayState);
-				}
-				const fetchResult = await axios.post(endpoint, params, {
-					headers: {
-						// eslint-disable-next-line @typescript-eslint/naming-convention
-						'Content-type': 'application/x-www-form-urlencoded',
-					},
-					httpsAgent: agent,
-				});
-				if (fetchResult.status !== 200) {
-					LoggerProxy.debug('SAML: Error while testing SAML connection.');
-					return false;
-				}
-			}
-			return true;
-		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			LoggerProxy.debug('SAML: Error while testing SAML connection: ', error);
-		}
-		return false;
-	}
 }
diff --git a/packages/cli/src/sso/saml/samlValidator.ts b/packages/cli/src/sso/saml/samlValidator.ts
index 2eaa3505ae851..9c46effb6969a 100644
--- a/packages/cli/src/sso/saml/samlValidator.ts
+++ b/packages/cli/src/sso/saml/samlValidator.ts
@@ -1,46 +1,76 @@
 import { LoggerProxy } from 'n8n-workflow';
 import type { XMLFileInfo } from 'xmllint-wasm';
-import { validateXML } from 'xmllint-wasm';
-import { xsdSamlSchemaAssertion20 } from './schema/saml-schema-assertion-2.0.xsd';
-import { xsdSamlSchemaMetadata20 } from './schema/saml-schema-metadata-2.0.xsd';
-import { xsdSamlSchemaProtocol20 } from './schema/saml-schema-protocol-2.0.xsd';
-import { xsdXenc } from './schema/xenc-schema.xsd';
-import { xsdXml } from './schema/xml.xsd';
-import { xsdXmldsigCore } from './schema/xmldsig-core-schema.xsd';
 
-const xml: XMLFileInfo = {
-	fileName: 'xml.xsd',
-	contents: xsdXml,
-};
+let xml: XMLFileInfo;
+let xmldsigCore: XMLFileInfo;
+let xmlXenc: XMLFileInfo;
+let xmlMetadata: XMLFileInfo;
+let xmlAssertion: XMLFileInfo;
+let xmlProtocol: XMLFileInfo;
 
-const xmldsigCore: XMLFileInfo = {
-	fileName: 'xmldsig-core-schema.xsd',
-	contents: xsdXmldsigCore,
-};
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+let xmllintWasm: typeof import('xmllint-wasm') | undefined;
 
-const xmlXenc: XMLFileInfo = {
-	fileName: 'xenc-schema.xsd',
-	contents: xsdXenc,
-};
-
-const xmlMetadata: XMLFileInfo = {
-	fileName: 'saml-schema-metadata-2.0.xsd',
-	contents: xsdSamlSchemaMetadata20,
-};
-
-const xmlAssertion: XMLFileInfo = {
-	fileName: 'saml-schema-assertion-2.0.xsd',
-	contents: xsdSamlSchemaAssertion20,
-};
+// dynamically load schema files
+async function loadSchemas(): Promise<void> {
+	if (!xml || xml.contents === '') {
+		LoggerProxy.debug('Loading XML schema files for SAML validation into memory');
+		const f = await import('./schema/xml.xsd');
+		xml = {
+			fileName: 'xml.xsd',
+			contents: f.xsdXml,
+		};
+	}
+	if (!xmldsigCore || xmldsigCore.contents === '') {
+		const f = await import('./schema/xmldsig-core-schema.xsd');
+		xmldsigCore = {
+			fileName: 'xmldsig-core-schema.xsd',
+			contents: f.xsdXmldsigCore,
+		};
+	}
+	if (!xmlXenc || xmlXenc.contents === '') {
+		const f = await import('./schema/xenc-schema.xsd');
+		xmlXenc = {
+			fileName: 'xenc-schema.xsd',
+			contents: f.xsdXenc,
+		};
+	}
+	if (!xmlMetadata || xmlMetadata.contents === '') {
+		const f = await import('./schema/saml-schema-metadata-2.0.xsd');
+		xmlMetadata = {
+			fileName: 'saml-schema-metadata-2.0.xsd',
+			contents: f.xsdSamlSchemaMetadata20,
+		};
+	}
+	if (!xmlAssertion || xmlAssertion.contents === '') {
+		const f = await import('./schema/saml-schema-assertion-2.0.xsd');
+		xmlAssertion = {
+			fileName: 'saml-schema-assertion-2.0.xsd',
+			contents: f.xsdSamlSchemaAssertion20,
+		};
+	}
+	if (!xmlProtocol || xmlProtocol.contents === '') {
+		const f = await import('./schema/saml-schema-protocol-2.0.xsd');
+		xmlProtocol = {
+			fileName: 'saml-schema-protocol-2.0.xsd',
+			contents: f.xsdSamlSchemaProtocol20,
+		};
+	}
+}
 
-const xmlProtocol: XMLFileInfo = {
-	fileName: 'saml-schema-protocol-2.0.xsd',
-	contents: xsdSamlSchemaProtocol20,
-};
+// dynamically load xmllint-wasm
+async function loadXmllintWasm(): Promise<void> {
+	if (xmllintWasm === undefined) {
+		LoggerProxy.debug('Loading xmllint-wasm library into memory');
+		xmllintWasm = await import('xmllint-wasm');
+	}
+}
 
 export async function validateMetadata(metadata: string): Promise<boolean> {
 	try {
-		const validationResult = await validateXML({
+		await loadXmllintWasm();
+		await loadSchemas();
+		const validationResult = await xmllintWasm?.validateXML({
 			xml: [
 				{
 					fileName: 'metadata.xml',
@@ -51,12 +81,12 @@ export async function validateMetadata(metadata: string): Promise<boolean> {
 			schema: [xmlMetadata],
 			preload: [xmlProtocol, xmlAssertion, xmldsigCore, xmlXenc, xml],
 		});
-		if (validationResult.valid) {
+		if (validationResult?.valid) {
 			LoggerProxy.debug('SAML Metadata is valid');
 			return true;
 		} else {
 			LoggerProxy.warn('SAML Validate Metadata: Invalid metadata');
-			LoggerProxy.warn(validationResult.errors.join('\n'));
+			LoggerProxy.warn(validationResult ? validationResult.errors.join('\n') : '');
 		}
 	} catch (error) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -67,7 +97,9 @@ export async function validateMetadata(metadata: string): Promise<boolean> {
 
 export async function validateResponse(response: string): Promise<boolean> {
 	try {
-		const validationResult = await validateXML({
+		await loadXmllintWasm();
+		await loadSchemas();
+		const validationResult = await xmllintWasm?.validateXML({
 			xml: [
 				{
 					fileName: 'response.xml',
@@ -78,12 +110,12 @@ export async function validateResponse(response: string): Promise<boolean> {
 			schema: [xmlProtocol],
 			preload: [xmlMetadata, xmlAssertion, xmldsigCore, xmlXenc, xml],
 		});
-		if (validationResult.valid) {
+		if (validationResult?.valid) {
 			LoggerProxy.debug('SAML Response is valid');
 			return true;
 		} else {
 			LoggerProxy.warn('SAML Validate Response: Failed');
-			LoggerProxy.warn(validationResult.errors.join('\n'));
+			LoggerProxy.warn(validationResult ? validationResult.errors.join('\n') : '');
 		}
 	} catch (error) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
diff --git a/packages/cli/src/sso/saml/serviceProvider.ee.ts b/packages/cli/src/sso/saml/serviceProvider.ee.ts
index f6d707eaf86be..fa1fde62832d7 100644
--- a/packages/cli/src/sso/saml/serviceProvider.ee.ts
+++ b/packages/cli/src/sso/saml/serviceProvider.ee.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
 import type { ServiceProviderInstance } from 'samlify';
-import { ServiceProvider } from 'samlify';
 import { SamlUrls } from './constants';
 import type { SamlPreferences } from './types/samlPreferences';
 
@@ -20,9 +19,13 @@ export function getServiceProviderConfigTestReturnUrl(): string {
 }
 
 // TODO:SAML: make these configurable for the end user
-export function getServiceProviderInstance(prefs: SamlPreferences): ServiceProviderInstance {
+export function getServiceProviderInstance(
+	prefs: SamlPreferences,
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	samlify: typeof import('samlify'),
+): ServiceProviderInstance {
 	if (serviceProviderInstance === undefined) {
-		serviceProviderInstance = ServiceProvider({
+		serviceProviderInstance = samlify.ServiceProvider({
 			entityID: getServiceProviderEntityId(),
 			authnRequestsSigned: prefs.authnRequestsSigned,
 			wantAssertionsSigned: prefs.wantAssertionsSigned,

From bb63027ee8e7711cf60c7f11d5a697407279b481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 18 Jul 2023 17:18:06 +0200
Subject: [PATCH 026/116] fix(crowd.dev Node): Fix documentation urls for
 crowd.dev credentials and nodes (#6696)

---
 packages/nodes-base/credentials/CrowdDevApi.credentials.ts   | 2 +-
 packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json        | 4 ++--
 packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
index a6ee085a02683..640b3c09ff3ba 100644
--- a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
+++ b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
@@ -10,7 +10,7 @@ export class CrowdDevApi implements ICredentialType {
 
 	displayName = 'crowd.dev API';
 
-	documentationUrl = 'crowdDev';
+	documentationUrl = 'crowddev';
 
 	properties: INodeProperties[] = [
 		{
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
index 8c03ebe23e9ce..1ae517e18eb3f 100644
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
@@ -6,12 +6,12 @@
 	"resources": {
 		"credentialDocumentation": [
 			{
-				"url": "https://docs.n8n.io/credentials/crowdDev"
+				"url": "https://docs.n8n.io/credentials/crowddev"
 			}
 		],
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.crowdDev/"
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.crowddev/"
 			}
 		]
 	}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
index 2e37220b0c6ce..99afbd25f1036 100644
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"credentialDocumentation": [
 			{
-				"url": "https://docs.n8n.io/credentials/crowdDev"
+				"url": "https://docs.n8n.io/credentials/crowddev"
 			}
 		],
 		"primaryDocumentation": [

From cecaac281ab40cc4ad021ea1d18462a744d75f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 18 Jul 2023 20:07:29 +0200
Subject: [PATCH 027/116] feat(Read PDF Node): Replace pdf-parse with pdfjs,
 and add support for streaming and encrypted PDFs (#6640)

---
 packages/core/src/NodeExecuteFunctions.ts     |   5 +
 packages/editor-ui/package.json               |   1 -
 .../nodes-base/nodes/ReadPdf/ReadPDF.node.ts  |  99 ++++++++++++++----
 .../test/ReadPDF-encrypted.workflow.json      |  87 +++++++++++++++
 .../nodes/ReadPdf/test/ReadPDF.test.ts        |  61 ++---------
 .../nodes/ReadPdf/test/ReadPDF.workflow.json  |  74 ++++++++-----
 .../nodes/ReadPdf/test/sample-encrypted.pdf   | Bin 0 -> 18861 bytes
 packages/nodes-base/package.json              |   3 +-
 packages/nodes-base/test/nodes/Helpers.ts     |  17 +++
 packages/workflow/src/Interfaces.ts           |   1 +
 pnpm-lock.yaml                                |  50 ++++-----
 11 files changed, 267 insertions(+), 131 deletions(-)
 create mode 100644 packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json
 create mode 100644 packages/nodes-base/nodes/ReadPdf/test/sample-encrypted.pdf

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 2c2541285cc56..f49bc046a970e 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -861,6 +861,10 @@ async function httpRequest(
 	return result.data;
 }
 
+export function getBinaryPath(binaryDataId: string): string {
+	return BinaryDataManager.getInstance().getBinaryPath(binaryDataId);
+}
+
 /**
  * Returns binary file metadata
  */
@@ -2262,6 +2266,7 @@ const getNodeHelperFunctions = ({
 const getBinaryHelperFunctions = ({
 	executionId,
 }: IWorkflowExecuteAdditionalData): BinaryHelperFunctions => ({
+	getBinaryPath,
 	getBinaryStream,
 	getBinaryMetadata,
 	binaryToBuffer,
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 520a991704147..fdf1dc01a1464 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -85,7 +85,6 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/user-event": "^14.4.3",
     "@testing-library/vue": "^5.8.3",
-    "@types/canvas-confetti": "^1.6.0",
     "@types/dateformat": "^3.0.0",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
index 6626c94e53575..0379f06293cf4 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -1,12 +1,32 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
+import {
+	BINARY_ENCODING,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import pdf from 'pdf-parse';
+import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
+
+type Document = Awaited<ReturnType<Awaited<typeof readPDF>>['promise']>;
+type Page = Awaited<ReturnType<Awaited<Document['getPage']>>>;
+type TextContent = Awaited<ReturnType<Page['getTextContent']>>;
+
+const parseText = (textContent: TextContent) => {
+	let lastY = undefined;
+	const text = [];
+	for (const item of textContent.items) {
+		if ('str' in item) {
+			if (lastY == item.transform[5] || !lastY) {
+				text.push(item.str);
+			} else {
+				text.push(`\n${item.str}`);
+			}
+			lastY = item.transform[5];
+		}
+	}
+	return text.join('');
+};
 
 export class ReadPDF implements INodeType {
 	description: INodeTypeDescription = {
@@ -32,6 +52,26 @@ export class ReadPDF implements INodeType {
 				required: true,
 				description: 'Name of the binary property from which to read the PDF file',
 			},
+			{
+				displayName: 'Encrypted',
+				name: 'encrypted',
+				type: 'boolean',
+				default: false,
+				required: true,
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				type: 'string',
+				typeOptions: { password: true },
+				default: '',
+				description: 'Password to decrypt the PDF file with',
+				displayOptions: {
+					show: {
+						encrypted: [true],
+					},
+				},
+			},
 		],
 	};
 
@@ -40,27 +80,50 @@ export class ReadPDF implements INodeType {
 
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
-		let item: INodeExecutionData;
 
 		for (let itemIndex = 0; itemIndex < length; itemIndex++) {
 			try {
-				item = items[itemIndex];
 				const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
+				const binaryData = this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
+
+				const params: { password?: string; url?: URL; data?: ArrayBuffer } = {};
 
-				if (item.binary === undefined) {
-					item.binary = {};
+				if (this.getNodeParameter('encrypted', itemIndex) === true) {
+					params.password = this.getNodeParameter('password', itemIndex) as string;
 				}
 
-				const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-					itemIndex,
-					binaryPropertyName,
-				);
-				returnData.push({
-					binary: item.binary,
+				if (binaryData.id) {
+					const binaryPath = this.helpers.getBinaryPath(binaryData.id);
+					params.url = new URL(`file://${binaryPath}`);
+				} else {
+					params.data = Buffer.from(binaryData.data, BINARY_ENCODING).buffer;
+				}
 
-					json: (await pdf(binaryDataBuffer)) as unknown as IDataObject,
+				const document = await readPDF(params).promise;
+				const { info, metadata } = await document
+					.getMetadata()
+					.catch(() => ({ info: null, metadata: null }));
+
+				const pages = [];
+				for (let i = 1; i <= document.numPages; i++) {
+					const page = await document.getPage(i);
+					const text = await page.getTextContent().then(parseText);
+					pages.push(text);
+				}
+
+				returnData.push({
+					binary: items[itemIndex].binary,
+					json: {
+						numpages: document.numPages,
+						numrender: document.numPages,
+						info,
+						metadata: metadata?.getAll(),
+						text: pages.join('\n\n'),
+						version: pdfJsVersion,
+					},
 				});
 			} catch (error) {
+				console.log(error);
 				if (this.continueOnFail()) {
 					returnData.push({
 						json: {
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json
new file mode 100644
index 0000000000000..7258819ead32b
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF-encrypted.workflow.json
@@ -0,0 +1,87 @@
+{
+	"nodes": [
+		{
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"parameters": {},
+			"position": [660, 580]
+		},
+		{
+			"name": "Read sample-encrypted.pdf",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"parameters": {
+				"filePath": "C:\\Test\\sample-encrypted.pdf"
+			},
+			"position": [880, 780]
+		},
+		{
+			"name": "Read PDF (encrypted)",
+			"type": "n8n-nodes-base.readPDF",
+			"typeVersion": 1,
+			"parameters": {
+				"encrypted": true,
+				"password": "ReaderPassword"
+			},
+			"position": [1100, 780]
+		}
+	],
+	"pinData": {
+		"Read PDF (encrypted)": [
+			{
+				"binary": {
+					"data": {
+						"fileExtension": "pdf",
+						"fileName": "sample-encrypted.pdf",
+						"fileSize": "18.9 kB",
+						"mimeType": "application/pdf"
+					}
+				},
+				"json": {
+					"numpages": 1,
+					"numrender": 1,
+					"info": {
+						"PDFFormatVersion": "1.7",
+						"Language": null,
+						"EncryptFilterName": "Standard",
+						"IsLinearized": false,
+						"IsAcroFormPresent": false,
+						"IsXFAPresent": false,
+						"IsCollectionPresent": false,
+						"IsSignaturesPresent": false,
+						"ModDate": "D:20230210122750Z",
+						"Producer": "iLovePDF",
+						"Title": "sample"
+					},
+					"text": "N8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.",
+					"version": "2.16.105"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read sample-encrypted.pdf",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read sample-encrypted.pdf": {
+			"main": [
+				[
+					{
+						"node": "Read PDF (encrypted)",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
index efe6c44f1107a..cd91f69a1df06 100644
--- a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
@@ -1,60 +1,11 @@
-/* eslint-disable @typescript-eslint/no-loop-func */
-import * as Helpers from '@test/nodes/Helpers';
-import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-import path from 'path';
+import { getWorkflowFilenames, initBinaryDataManager, testWorkflows } from '@test/nodes/Helpers';
 
 describe('Test Read PDF Node', () => {
-	beforeEach(async () => {
-		await Helpers.initBinaryDataManager();
-	});
-
-	const workflow = Helpers.readJsonFileSync('nodes/ReadPdf/test/ReadPDF.workflow.json');
-	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
-	node.parameters.filePath = path.join(__dirname, 'sample.pdf');
-
-	const testData: WorkflowTestData = {
-		description: 'nodes/ReadPdf/test/ReadPDF.workflow.json',
-		input: {
-			workflowData: workflow,
-		},
-		output: {
-			nodeData: {
-				'Read PDF': [
-					[
-						{
-							json: {
-								numpages: 1,
-								numrender: 1,
-								info: {
-									PDFFormatVersion: '1.4',
-									IsAcroFormPresent: false,
-									IsXFAPresent: false,
-									Title: 'sample',
-									Producer: 'iLovePDF',
-									ModDate: 'D:20230210122750Z',
-								},
-								metadata: null,
-								text: '\n\nN8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.',
-								version: '1.10.100',
-							},
-						},
-					],
-				],
-			},
-		},
-	};
-
-	const nodeTypes = Helpers.setup(testData);
+	const workflows = getWorkflowFilenames(__dirname);
 
-	test(testData.description, async () => {
-		const { result } = await executeWorkflow(testData, nodeTypes);
-		const resultNodeData = Helpers.getResultNodeData(result, testData);
-
-		// delete binary data because we test against json only
-		delete resultNodeData[0].resultData[0]![0].binary;
-		expect(resultNodeData[0].resultData).toEqual(testData.output.nodeData['Read PDF']);
-
-		expect(result.finished).toEqual(true);
+	beforeAll(async () => {
+		await initBinaryDataManager();
 	});
+
+	testWorkflows(workflows);
 });
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
index 9d6aaf0c1fd2b..4a5664010842e 100644
--- a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
@@ -1,47 +1,75 @@
 {
-	"name": "Read PDF node unit test",
 	"nodes": [
 		{
-			"parameters": {},
-			"id": "0c9db33c-dd15-4088-9d12-b9f3b8f1fa96",
 			"name": "When clicking \"Execute Workflow\"",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [960, 540]
-		},
-		{
 			"parameters": {},
-			"id": "86abdc3b-206d-4b67-a37f-6b67b6bd3bbc",
-			"name": "Read PDF",
-			"type": "n8n-nodes-base.readPDF",
-			"typeVersion": 1,
-			"position": [1400, 540]
+			"position": [660, 580]
 		},
 		{
+			"name": "Read sample.pdf",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
 			"parameters": {
 				"filePath": "C:\\Test\\sample.pdf"
 			},
-			"id": "2f6d241e-44a4-4213-b49a-166201946a89",
-			"name": "Read Binary File",
-			"type": "n8n-nodes-base.readBinaryFile",
+			"position": [880, 580]
+		},
+		{
+			"name": "Read PDF",
+			"type": "n8n-nodes-base.readPDF",
 			"typeVersion": 1,
-			"position": [1180, 540]
+			"parameters": {},
+			"position": [1100, 580]
 		}
 	],
-	"pinData": {},
+	"pinData": {
+		"Read PDF": [
+			{
+				"binary": {
+					"data": {
+						"fileExtension": "pdf",
+						"fileName": "sample.pdf",
+						"fileSize": "17.8 kB",
+						"mimeType": "application/pdf"
+					}
+				},
+				"json": {
+					"numpages": 1,
+					"numrender": 1,
+					"info": {
+						"PDFFormatVersion": "1.4",
+						"Language": null,
+						"EncryptFilterName": null,
+						"IsLinearized": false,
+						"IsAcroFormPresent": false,
+						"IsXFAPresent": false,
+						"IsCollectionPresent": false,
+						"IsSignaturesPresent": false,
+						"Title": "sample",
+						"Producer": "iLovePDF",
+						"ModDate": "D:20230210122750Z"
+					},
+					"text": "N8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.",
+					"version": "2.16.105"
+				}
+			}
+		]
+	},
 	"connections": {
 		"When clicking \"Execute Workflow\"": {
 			"main": [
 				[
 					{
-						"node": "Read Binary File",
+						"node": "Read sample.pdf",
 						"type": "main",
 						"index": 0
 					}
 				]
 			]
 		},
-		"Read Binary File": {
+		"Read sample.pdf": {
 			"main": [
 				[
 					{
@@ -52,13 +80,5 @@
 				]
 			]
 		}
-	},
-	"active": false,
-	"settings": {},
-	"versionId": "9802b48d-727a-40ef-ad87-d544a9a648a7",
-	"id": "188",
-	"meta": {
-		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
-	},
-	"tags": []
+	}
 }
diff --git a/packages/nodes-base/nodes/ReadPdf/test/sample-encrypted.pdf b/packages/nodes-base/nodes/ReadPdf/test/sample-encrypted.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..52d7fe80e8a399b6f61968ef68fd1a6c8d33c522
GIT binary patch
literal 18861
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

literal 0
HcmV?d00001

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3fcae99d34114..8513350c6423a 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -770,7 +770,6 @@
     "@types/mssql": "^6.0.2",
     "@types/node-ssh": "^7.0.1",
     "@types/nodemailer": "^6.4.0",
-    "@types/pdf-parse": "^1.1.1",
     "@types/promise-ftp": "^1.3.4",
     "@types/redis": "^2.8.11",
     "@types/request-promise-native": "~1.0.15",
@@ -826,7 +825,7 @@
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",
     "otpauth": "^9.1.1",
-    "pdf-parse": "^1.1.1",
+    "pdfjs-dist": "^2.16.105",
     "pg": "^8.3.0",
     "pg-promise": "^10.5.8",
     "pretty-bytes": "^5.6.0",
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index b30e6acd346db..dc359391dd10a 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -321,6 +321,15 @@ export const equalityTest = async (testData: WorkflowTestData, types: INodeTypes
 	const resultNodeData = getResultNodeData(result, testData);
 	resultNodeData.forEach(({ nodeName, resultData }) => {
 		const msg = `Equality failed for "${testData.description}" at node "${nodeName}"`;
+		resultData.forEach((item) => {
+			item?.forEach(({ binary }) => {
+				if (binary) {
+					// @ts-ignore
+					delete binary.data.data;
+					delete binary.data.directory;
+				}
+			});
+		});
 		return expect(resultData, msg).toEqual(testData.output.nodeData[nodeName]);
 	});
 
@@ -345,6 +354,14 @@ export const workflowToTests = (workflowFiles: string[]) => {
 	for (const filePath of workflowFiles) {
 		const description = filePath.replace('.json', '');
 		const workflowData = readJsonFileSync<IWorkflowBase>(filePath);
+		const testDir = path.join(baseDir, path.dirname(filePath));
+		workflowData.nodes.forEach((node) => {
+			if (node.parameters) {
+				node.parameters = JSON.parse(
+					JSON.stringify(node.parameters).replace(/"C:\\\\Test\\\\(.*)"/, `"${testDir}/$1"`),
+				);
+			}
+		});
 		if (workflowData.pinData === undefined) {
 			throw new Error('Workflow data does not contain pinData');
 		}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 1908e2a87dca8..6550e54b56f3e 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -683,6 +683,7 @@ export interface BinaryHelperFunctions {
 	setBinaryDataBuffer(data: IBinaryData, binaryData: Buffer): Promise<IBinaryData>;
 	copyBinaryFile(): Promise<never>;
 	binaryToBuffer(body: Buffer | Readable): Promise<Buffer>;
+	getBinaryPath(binaryDataId: string): string;
 	getBinaryStream(binaryDataId: string, chunkSize?: number): Readable;
 	getBinaryMetadata(binaryDataId: string): Promise<BinaryMetadata>;
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c732f0e8a6bc2..b361326851d33 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -926,9 +926,6 @@ importers:
       '@testing-library/vue':
         specifier: ^5.8.3
         version: 5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14)
-      '@types/canvas-confetti':
-        specifier: ^1.6.0
-        version: 1.6.0
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
@@ -1131,9 +1128,9 @@ importers:
       otpauth:
         specifier: ^9.1.1
         version: 9.1.1
-      pdf-parse:
-        specifier: ^1.1.1
-        version: 1.1.1
+      pdfjs-dist:
+        specifier: ^2.16.105
+        version: 2.16.105
       pg:
         specifier: ^8.3.0
         version: 8.8.0
@@ -1246,9 +1243,6 @@ importers:
       '@types/nodemailer':
         specifier: ^6.4.0
         version: 6.4.6
-      '@types/pdf-parse':
-        specifier: ^1.1.1
-        version: 1.1.1
       '@types/promise-ftp':
         specifier: ^1.3.4
         version: 1.3.4
@@ -7016,10 +7010,6 @@ packages:
       '@types/connect': 3.4.35
       '@types/node': 18.16.16
 
-  /@types/canvas-confetti@1.6.0:
-    resolution: {integrity: sha512-Yq6rIccwcco0TLD5SMUrIM7Fk7Fe/C0jmNRxJJCLtAF6gebDkPuUjK5EHedxecm69Pi/aA+It39Ux4OHmFhjRw==}
-    dev: true
-
   /@types/caseless@0.12.2:
     resolution: {integrity: sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==}
     dev: true
@@ -7443,10 +7433,6 @@ packages:
       '@types/express': 4.17.14
     dev: true
 
-  /@types/pdf-parse@1.1.1:
-    resolution: {integrity: sha512-lDBKAslCwvfK2uvS1Uk+UCpGvw+JRy5vnBFANPKFSY92n/iEnunXi0KVBjPJXhsM4jtdcPnS7tuZ0zjA9x6piQ==}
-    dev: true
-
   /@types/prettier@2.7.1:
     resolution: {integrity: sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==}
     dev: true
@@ -11470,6 +11456,11 @@ packages:
     dependencies:
       domelementtype: 2.3.0
 
+  /dommatrix@1.0.3:
+    resolution: {integrity: sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==}
+    deprecated: dommatrix is no longer maintained. Please use @thednp/dommatrix.
+    dev: false
+
   /domutils@2.8.0:
     resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
     dependencies:
@@ -17046,10 +17037,6 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /node-ensure@0.0.0:
-    resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==}
-    dev: false
-
   /node-fetch-native@1.0.1:
     resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==}
     dev: true
@@ -17909,14 +17896,16 @@ packages:
     resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
     dev: false
 
-  /pdf-parse@1.1.1:
-    resolution: {integrity: sha512-v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==}
-    engines: {node: '>=6.8.1'}
+  /pdfjs-dist@2.16.105:
+    resolution: {integrity: sha512-J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A==}
+    peerDependencies:
+      worker-loader: ^3.0.8
+    peerDependenciesMeta:
+      worker-loader:
+        optional: true
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-      node-ensure: 0.0.0
-    transitivePeerDependencies:
-      - supports-color
+      dommatrix: 1.0.3
+      web-streams-polyfill: 3.2.1
     dev: false
 
   /peek-readable@4.1.0:
@@ -22296,6 +22285,11 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
+  /web-streams-polyfill@3.2.1:
+    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
+    engines: {node: '>= 8'}
+    dev: false
+
   /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 

From 23ac8b5a50a295137e5464cc40d9d4418730499a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 19 Jul 2023 09:35:10 +0200
Subject: [PATCH 028/116] feat: Allow `eslint-config` to be externally
 consumable (#6694)

* feat: Allow `eslint-config` to be externally consumable

* refactor: Adjust import styles
---
 packages/@n8n/client-oauth2/.eslintrc.js | 2 +-
 packages/@n8n_io/eslint-config/shared.js | 2 +-
 packages/cli/.eslintrc.js                | 2 +-
 packages/core/.eslintrc.js               | 2 +-
 packages/design-system/.eslintrc.js      | 2 +-
 packages/editor-ui/.eslintrc.js          | 2 +-
 packages/node-dev/.eslintrc.js           | 2 +-
 packages/nodes-base/.eslintrc.js         | 2 +-
 packages/workflow/.eslintrc.js           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/@n8n/client-oauth2/.eslintrc.js b/packages/@n8n/client-oauth2/.eslintrc.js
index fe7469cf3c7af..825e65949a5d1 100644
--- a/packages/@n8n/client-oauth2/.eslintrc.js
+++ b/packages/@n8n/client-oauth2/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/@n8n_io/eslint-config/shared.js b/packages/@n8n_io/eslint-config/shared.js
index 27f9292eb01a4..0332606f0c6a2 100644
--- a/packages/@n8n_io/eslint-config/shared.js
+++ b/packages/@n8n_io/eslint-config/shared.js
@@ -1,7 +1,7 @@
 /**
  * @type {(dir: string, mode: 'frontend' | undefined) => import('@types/eslint').ESLint.ConfigData}
  */
-exports.sharedOptions = (tsconfigRootDir, mode) => {
+module.exports = (tsconfigRootDir, mode) => {
 	const isFrontend = mode === 'frontend';
 	const parser = isFrontend ? 'vue-eslint-parser' : '@typescript-eslint/parser';
 	const extraParserOptions = isFrontend
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index 20c82ed9952b1..1b194182669fb 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
index 4d68086144d56..e6441f9071e3f 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index 4e93b1a773621..fbf2795ffe585 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index 0a86924fc5cbf..2961530515154 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/node-dev/.eslintrc.js b/packages/node-dev/.eslintrc.js
index 228cb3e921520..0964f88b030e2 100644
--- a/packages/node-dev/.eslintrc.js
+++ b/packages/node-dev/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index a3cf1ef0fc6f5..bdb2bee4aa0d7 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
diff --git a/packages/workflow/.eslintrc.js b/packages/workflow/.eslintrc.js
index 51b395f058b56..ed914e6f9621d 100644
--- a/packages/workflow/.eslintrc.js
+++ b/packages/workflow/.eslintrc.js
@@ -1,4 +1,4 @@
-const { sharedOptions } = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n_io/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}

From 7763aed35edde80c1b23d1f16036c7b185d4948b Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 19 Jul 2023 09:41:50 +0100
Subject: [PATCH 029/116] fix(Contentful Node): Fix typo in credential name
 (no-changelog) (#6692)

---
 .../credentials/ContentfulApi.credentials.ts           |  2 +-
 .../nodes-base/nodes/Contentful/Contentful.node.ts     | 10 +++++-----
 .../nodes-base/nodes/Contentful/GenericFunctions.ts    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/credentials/ContentfulApi.credentials.ts b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
index 9ca5456c469b8..b6d47fa8c1ca3 100644
--- a/packages/nodes-base/credentials/ContentfulApi.credentials.ts
+++ b/packages/nodes-base/credentials/ContentfulApi.credentials.ts
@@ -4,7 +4,7 @@ import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 export class ContentfulApi implements ICredentialType {
 	name = 'contentfulApi';
 
-	displayName = 'Contenful API';
+	displayName = 'Contentful API';
 
 	documentationUrl = 'contentful';
 
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index c49d4b9b674b8..83d54932e6d58 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -6,7 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { contenfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
+import { contentfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
 
 import * as SpaceDescription from './SpaceDescription';
 import * as ContentTypeDescription from './ContentTypeDescription';
@@ -23,7 +23,7 @@ export class Contentful implements INodeType {
 		icon: 'file:contentful.png',
 		group: ['input'],
 		version: 1,
-		description: 'Consume Contenful API',
+		description: 'Consume Contentful API',
 		defaults: {
 			name: 'Contentful',
 		},
@@ -187,7 +187,7 @@ export class Contentful implements INodeType {
 						}
 
 						if (returnAll) {
-							responseData = await contenfulApiRequestAllItems.call(
+							responseData = await contentfulApiRequestAllItems.call(
 								this,
 								'items',
 								'GET',
@@ -286,7 +286,7 @@ export class Contentful implements INodeType {
 						}
 
 						if (returnAll) {
-							responseData = await contenfulApiRequestAllItems.call(
+							responseData = await contentfulApiRequestAllItems.call(
 								this,
 								'items',
 								'GET',
@@ -335,7 +335,7 @@ export class Contentful implements INodeType {
 						const env = this.getNodeParameter('environmentId', i) as string;
 
 						if (returnAll) {
-							responseData = await contenfulApiRequestAllItems.call(
+							responseData = await contentfulApiRequestAllItems.call(
 								this,
 								'items',
 								'GET',
diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
index 210876500ca47..d2fdf44329a5d 100644
--- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
@@ -44,7 +44,7 @@ export async function contentfulApiRequest(
 	}
 }
 
-export async function contenfulApiRequestAllItems(
+export async function contentfulApiRequestAllItems(
 	this: ILoadOptionsFunctions | IExecuteFunctions,
 	propertyName: string,
 	method: string,

From e1adaa59cbaec6ea90fbba20b59f6db61ad69dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 19 Jul 2023 12:08:43 +0200
Subject: [PATCH 030/116] fix(editor): Ensure default credential values are not
 detected as dirty state (#6677)

* fix(editor): Ensure default credential values are not detected as dirty state

* chore: Remove logging

* refactor: Improve comment
---
 .../editor-ui/src/components/CredentialEdit/CredentialEdit.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 1afeede923f2b..658f145ddc388 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -674,6 +674,9 @@ export default defineComponent({
 		},
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		onDataChange({ name, value }: { name: string; value: any }) {
+			// skip update if new value matches the current
+			if (this.credentialData[name] === value) return;
+
 			this.hasUnsavedChanges = true;
 
 			const { oauthTokenData, ...credData } = this.credentialData;

From 9fff0ee863523d4f0fc16e92c8ff3fb98dba8c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 19 Jul 2023 12:54:31 +0200
Subject: [PATCH 031/116] feat(Google Cloud Storage Node): Use streaming for
 file uploads (#6462)

fix(Google Cloud Storage Node): Use streaming for file uploads
---
 packages/core/src/NodeExecuteFunctions.ts     |  2 +-
 .../Google/CloudStorage/ObjectDescription.ts  | 30 ++++++++++++++-----
 packages/workflow/package.json                |  1 +
 packages/workflow/src/Interfaces.ts           |  2 +-
 packages/workflow/src/utils.ts                |  2 ++
 pnpm-lock.yaml                                |  3 ++
 6 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index f49bc046a970e..7f2e66265d121 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -732,7 +732,7 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 	// Destructure properties with the same name first.
 	const { headers, method, timeout, auth, proxy, url } = n8nRequest;
 
-	const axiosRequest = {
+	const axiosRequest: AxiosRequestConfig = {
 		headers: headers ?? {},
 		method,
 		timeout,
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index afede1685115e..1a875b3baf008 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -1,5 +1,11 @@
 import FormData from 'form-data';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type { Readable } from 'stream';
+import {
+	BINARY_ENCODING,
+	type IDataObject,
+	type INodeExecutionData,
+	type INodeProperties,
+} from 'n8n-workflow';
 
 // Define these because we'll be using them in two separate places
 const metagenerationFilters: INodeProperties[] = [
@@ -144,23 +150,31 @@ export const objectOperations: INodeProperties[] = [
 								});
 
 								// Determine content and content type
-								let content: string | Buffer;
+								let content: string | Buffer | Readable;
 								let contentType: string;
+								let contentLength: number;
 								if (useBinary) {
 									const binaryPropertyName = this.getNodeParameter(
 										'createBinaryPropertyName',
 									) as string;
 
 									const binaryData = this.helpers.assertBinaryData(binaryPropertyName);
-
-									// Decode from base64 for upload
-									content = Buffer.from(binaryData.data, 'base64');
-									contentType = binaryData.mimeType;
+									if (binaryData.id) {
+										content = this.helpers.getBinaryStream(binaryData.id);
+										const binaryMetadata = await this.helpers.getBinaryMetadata(binaryData.id);
+										contentType = binaryMetadata.mimeType ?? 'application/octet-stream';
+										contentLength = binaryMetadata.fileSize;
+									} else {
+										content = Buffer.from(binaryData.data, BINARY_ENCODING);
+										contentType = binaryData.mimeType;
+										contentLength = content.length;
+									}
 								} else {
 									content = this.getNodeParameter('createContent') as string;
 									contentType = 'text/plain';
+									contentLength = content.length;
 								}
-								body.append('file', content, { contentType });
+								body.append('file', content, { contentType, knownLength: contentLength });
 
 								// Set the headers
 								if (!requestOptions.headers) requestOptions.headers = {};
@@ -170,7 +184,7 @@ export const objectOperations: INodeProperties[] = [
 								] = `multipart/related; boundary=${body.getBoundary()}`;
 
 								// Return the request data
-								requestOptions.body = body.getBuffer();
+								requestOptions.body = body;
 								return requestOptions;
 							},
 						],
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 63cdb96ce9907..59e667038327a 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -53,6 +53,7 @@
     "crypto-js": "^4.1.1",
     "deep-equal": "^2.2.0",
     "esprima-next": "5.8.4",
+    "form-data": "^4.0.0",
     "jmespath": "^0.16.0",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 6550e54b56f3e..33a68c849a4f1 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line max-classes-per-file
 import type * as express from 'express';
-import type * as FormData from 'form-data';
+import type FormData from 'form-data';
 import type { IncomingHttpHeaders } from 'http';
 import type { Readable } from 'stream';
 import type { URLSearchParams } from 'url';
diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index a12b5699a1d40..03e1f57472a5a 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -1,3 +1,4 @@
+import FormData from 'form-data';
 import type { BinaryFileType, JsonObject } from './Interfaces';
 
 const readStreamClasses = new Set(['ReadStream', 'Readable', 'ReadableStream']);
@@ -5,6 +6,7 @@ const readStreamClasses = new Set(['ReadStream', 'Readable', 'ReadableStream']);
 export const isObjectEmpty = (obj: object | null | undefined): boolean => {
 	if (obj === undefined || obj === null) return true;
 	if (typeof obj === 'object') {
+		if (obj instanceof FormData) return obj.getLengthSync() === 0;
 		if (Array.isArray(obj)) return obj.length === 0;
 		if (obj instanceof Set || obj instanceof Map) return obj.size === 0;
 		if (ArrayBuffer.isView(obj) || obj instanceof ArrayBuffer) return obj.byteLength === 0;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b361326851d33..dace0742e46c9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1297,6 +1297,9 @@ importers:
       esprima-next:
         specifier: 5.8.4
         version: 5.8.4
+      form-data:
+        specifier: ^4.0.0
+        version: 4.0.0
       jmespath:
         specifier: ^0.16.0
         version: 0.16.0

From e3e9e8a8bc4e85d78ab0aa84784c4827e2a88c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Wed, 19 Jul 2023 13:07:39 +0200
Subject: [PATCH 032/116] fix(editor): Prevent RMC from loading schema if it's
 already cached (#6695)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(editor): Prevent RMC from loading schema if it's already cached
* ✅ Adding new tests for RMC
* 👕 Fixing lint errors
* 👌 Updating inline loader styling
---
 .../src/components/ParameterOptions.vue       | 10 +++-
 .../ResourceMapper/ResourceMapper.vue         |  5 +-
 .../__tests__/ResourceMapper.test.ts          | 57 +++++++++++++++++--
 3 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index a00bb5c22da48..2d3f2fba89d17 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -199,10 +199,14 @@ export default defineComponent({
 .container {
 	display: flex;
 }
-.loader > span {
-	line-height: 1em;
-}
 
+.loader {
+	padding-bottom: var(--spacing-4xs);
+
+	& > span {
+		line-height: 1em;
+	}
+}
 .controlsContainer {
 	display: flex;
 }
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 4954236057967..77c8307a1fcff 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -111,7 +111,10 @@ onMounted(async () => {
 			matchingColumns: nodeValues.matchingColumns,
 		};
 	}
-	await initFetching(hasSchema);
+	if (!hasSchema) {
+		// Only fetch a schema if it's not already set
+		await initFetching();
+	}
 	// Set default values if this is the first time the parameter is being set
 	if (!state.paramValue.value) {
 		setDefaultFieldValues();
diff --git a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
index fdb4e8497ec34..91566b1a292df 100644
--- a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
@@ -12,8 +12,10 @@ import { waitAllPromises } from '@/__tests__/utils';
 import * as workflowHelpers from '@/mixins/workflowHelpers';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import userEvent from '@testing-library/user-event';
+import type { SpyInstance } from 'vitest';
 
 let nodeTypeStore: ReturnType<typeof useNodeTypesStore>;
+let fetchFieldsSpy: SpyInstance, resolveParameterSpy: SpyInstance;
 
 const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
 	render(ResourceMapper, merge(DEFAULT_SETUP, renderOptions), (vue) => {
@@ -21,10 +23,14 @@ const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
 	});
 
 describe('ResourceMapper.vue', () => {
-	beforeEach(() => {
+	beforeAll(() => {
 		nodeTypeStore = useNodeTypesStore();
-		vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue(NODE_PARAMETER_VALUES);
-		vi.spyOn(nodeTypeStore, 'getResourceMapperFields').mockResolvedValue(MAPPING_COLUMNS_RESPONSE);
+		fetchFieldsSpy = vi
+			.spyOn(nodeTypeStore, 'getResourceMapperFields')
+			.mockResolvedValue(MAPPING_COLUMNS_RESPONSE);
+		resolveParameterSpy = vi
+			.spyOn(workflowHelpers, 'resolveParameter')
+			.mockReturnValue(NODE_PARAMETER_VALUES);
 	});
 
 	afterEach(() => {
@@ -199,11 +205,11 @@ describe('ResourceMapper.vue', () => {
 			},
 		});
 		await waitAllPromises();
-		// There should be 5 fields rendered and only 2 of them should have remove button
+		// There should be 4 fields rendered and only 1 of them should have remove button
 		expect(
 			getByTestId('mapping-fields-container').querySelectorAll('.parameter-input').length,
-		).toBe(5);
-		expect(queryAllByTestId('remove-field-button').length).toBe(2);
+		).toBe(4);
+		expect(queryAllByTestId('remove-field-button').length).toBe(1);
 	});
 
 	it('should render correct options based on saved schema', async () => {
@@ -229,4 +235,43 @@ describe('ResourceMapper.vue', () => {
 		// Should have one option in the bottom dropdown for one removed field
 		expect(getByTestId('add-fields-select').querySelectorAll('li').length).toBe(1);
 	});
+
+	it('should fetch fields if there is no cached schema', async () => {
+		renderComponent({
+			props: {
+				node: {
+					parameters: {
+						columns: {
+							schema: null,
+						},
+					},
+				},
+			},
+		});
+		await waitAllPromises();
+		expect(fetchFieldsSpy).toHaveBeenCalledTimes(1);
+	});
+
+	it('should not fetch fields if schema is already fetched', async () => {
+		renderComponent({
+			props: {
+				node: {
+					parameters: {
+						columns: {
+							schema: UPDATED_SCHEMA,
+						},
+					},
+				},
+				parameter: {
+					typeOptions: {
+						resourceMapper: {
+							mode: 'add',
+						},
+					},
+				},
+			},
+		});
+		await waitAllPromises();
+		expect(fetchFieldsSpy).not.toHaveBeenCalled();
+	});
 });

From 655e55fe322bc1a7e0440f80760157ea208ec180 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 19 Jul 2023 13:02:35 +0100
Subject: [PATCH 033/116] fix(API): Fix issue with workflow setting not
 supporting newer nanoids (#6699)

---
 .../v1/handlers/workflows/spec/schemas/workflowSettings.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml
index d14bba0741844..49f8e72066ff4 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml
@@ -16,8 +16,8 @@ properties:
     example: 3600
     maxLength: 3600
   errorWorkflow:
-    type: number
-    example: 10
+    type: string
+    example: 'VzqKEW0ShTXA5vPj'
     description: The ID of the workflow that contains the error trigger node.
   timezone:
     type: string

From 80ae27562002a81bca1b4d23e9ff91ed486e0413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 19 Jul 2023 14:15:38 +0200
Subject: [PATCH 034/116] ci: Fix test workflows (no-changelog) (#6698)

* ci: Fix test workflows (no-changelog)

We removed `pdf-parse` in #6640, so we need to get these test PDF files from the `test-workflows` repo instead ([which has been updated to include these files](https://github.com/n8n-io/test-workflows/commit/0f6ef1c804e3f1e919b097bdf061ea9ea095b1e2))

* remove `\n` from ids and skipList text files
---
 .github/workflows/test-workflows.yml      |  3 +--
 packages/cli/src/commands/executeBatch.ts | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 8f23d10a1b22e..78fa52e28a6e0 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -64,8 +64,7 @@ jobs:
         run: |
           cp n8n/assets/n8n-logo.png /tmp/n8n-logo.png
           cp n8n/assets/n8n-screenshot.png /tmp/n8n-screenshot.png
-          cp n8n/node_modules/pdf-parse/test/data/05-versions-space.pdf /tmp/05-versions-space.pdf
-          cp n8n/node_modules/pdf-parse/test/data/04-valid.pdf /tmp/04-valid.pdf
+          cp test-workflows/testData/pdfs/*.pdf /tmp/
         shell: bash
 
       - name: Run tests
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index b1586b895a31d..cc2470c7410aa 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -232,7 +232,12 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.ids !== undefined) {
 			if (fs.existsSync(flags.ids)) {
 				const contents = fs.readFileSync(flags.ids, { encoding: 'utf-8' });
-				ids.push(...contents.split(',').filter((id) => re.exec(id)));
+				ids.push(
+					...contents
+						.trimEnd()
+						.split(',')
+						.filter((id) => re.exec(id)),
+				);
 			} else {
 				const paramIds = flags.ids.split(',');
 				const matchedIds = paramIds.filter((id) => re.exec(id));
@@ -251,7 +256,12 @@ export class ExecuteBatch extends BaseCommand {
 		if (flags.skipList !== undefined) {
 			if (fs.existsSync(flags.skipList)) {
 				const contents = fs.readFileSync(flags.skipList, { encoding: 'utf-8' });
-				skipIds.push(...contents.split(',').filter((id) => re.exec(id)));
+				skipIds.push(
+					...contents
+						.trimEnd()
+						.split(',')
+						.filter((id) => re.exec(id)),
+				);
 			} else {
 				console.log('Skip list file not found. Exiting.');
 				return;

From 407b4fb9c307d7a7ca288da73df7d78d5806c7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 19 Jul 2023 15:59:49 +0200
Subject: [PATCH 035/116] fix(core): Banner dismissal should also work for
 users migrating to v1 (no-changelog) (#6700)

---
 .../repositories/settings.repository.ts       | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/packages/cli/src/databases/repositories/settings.repository.ts b/packages/cli/src/databases/repositories/settings.repository.ts
index b7a802c2f432f..82630bffdb1b1 100644
--- a/packages/cli/src/databases/repositories/settings.repository.ts
+++ b/packages/cli/src/databases/repositories/settings.repository.ts
@@ -1,5 +1,6 @@
 import { Service } from 'typedi';
 import { DataSource, Repository } from 'typeorm';
+import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 import { Settings } from '../entities/Settings';
 import config from '@/config';
 
@@ -10,32 +11,24 @@ export class SettingsRepository extends Repository<Settings> {
 	}
 
 	async dismissBanner({ bannerName }: { bannerName: string }): Promise<{ success: boolean }> {
-		const dismissedBannersSetting = await this.findOneBy({ key: 'ui.banners.dismissed' });
-
-		if (dismissedBannersSetting) {
-			try {
+		const key = 'ui.banners.dismissed';
+		const dismissedBannersSetting = await this.findOneBy({ key });
+		try {
+			let value: string;
+			if (dismissedBannersSetting) {
 				const dismissedBanners = JSON.parse(dismissedBannersSetting.value) as string[];
-				await this.saveSetting(
-					'ui.banners.dismissed',
-					JSON.stringify([...dismissedBanners, bannerName]),
-				);
-				return { success: true };
-			} catch (error) {
-				return { success: false };
+				const updatedValue = [...new Set([...dismissedBanners, bannerName].sort())];
+				value = JSON.stringify(updatedValue);
+				await this.update({ key }, { value, loadOnStartup: true });
+			} else {
+				value = JSON.stringify([bannerName]);
+				await this.save({ key, value, loadOnStartup: true });
 			}
+			config.set(key, value);
+			return { success: true };
+		} catch (error) {
+			ErrorReporter.error(error);
 		}
 		return { success: false };
 	}
-
-	async saveSetting(key: string, value: string, loadOnStartup = true) {
-		const setting = await this.findOneBy({ key });
-
-		if (setting) {
-			await this.update({ key }, { value, loadOnStartup });
-		} else {
-			await this.save({ key, value, loadOnStartup });
-		}
-
-		if (loadOnStartup) config.set('ui.banners.dismissed', value);
-	}
 }

From 1f03bfdb30a4dcd645e8bf76387e927eb6bcfdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 19 Jul 2023 16:15:43 +0200
Subject: [PATCH 036/116] fix(Postgres Node): For select queries, empty result
 should be be replaced with `{"success":true}` (#6703)

* fix(Postgres Node): For select queries, empty result should be be replaced with `{"success":true}`

* :zap: less checks

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 packages/nodes-base/nodes/Postgres/v2/actions/router.ts | 1 +
 packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts  | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index a52cd27eaf4b7..ca061b752428e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -17,6 +17,7 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 	const credentials = await this.getCredentials('postgres');
 	const options = this.getNodeParameter('options', 0, {});
 	options.nodeVersion = this.getNode().typeVersion;
+	options.operation = operation;
 
 	const { db, pgp, sshClient } = await configurePostgres(credentials, options);
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index adf4c3eadf45b..86a5cda18ebc5 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -208,6 +208,7 @@ export function configureQueryRunner(
 ) {
 	return async (queries: QueryWithValues[], items: INodeExecutionData[], options: IDataObject) => {
 		let returnData: INodeExecutionData[] = [];
+		const emptyReturnData = options.operation === 'select' ? [] : [{ json: { success: true } }];
 
 		const queryBatching = (options.queryBatching as QueryMode) || 'single';
 
@@ -220,7 +221,7 @@ export function configureQueryRunner(
 						});
 					})
 					.flat();
-				returnData = returnData.length ? returnData : [{ json: { success: true } }];
+				returnData = returnData.length ? returnData : emptyReturnData;
 			} catch (err) {
 				const error = parsePostgresError(node, err, queries);
 				if (!continueOnFail) throw error;
@@ -247,7 +248,7 @@ export function configureQueryRunner(
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							wrapData(transactionResult.length ? transactionResult : [{ success: true }]),
+							wrapData(transactionResult.length ? transactionResult : emptyReturnData),
 							{ itemData: { item: i } },
 						);
 
@@ -274,7 +275,7 @@ export function configureQueryRunner(
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							wrapData(transactionResult.length ? transactionResult : [{ success: true }]),
+							wrapData(transactionResult.length ? transactionResult : emptyReturnData),
 							{ itemData: { item: i } },
 						);
 

From d94101f688c867bfd9f62709aa302f577294deeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Wed, 19 Jul 2023 16:51:49 +0200
Subject: [PATCH 037/116] feat(editor): Removing `ph-no-capture` class from
 some elements (#6674)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(editor): Remove `.ph-no-capture` class from some of the fields
* ✔️ Updating test snapshots
* ⚡ Redacting expressions preview in credentials form
* 🔧 Disable posthog input masking
* 🚨 Testing PostHog iFrame settings
* Reverting iframe test
* ⚡ Hiding API key in PostHog recordings
* ✅ Added tests for redacted values
* ✔️ Updating checkbox snapshots after label component update
* ✔️ Updating test snapshots in editor-ui
* 👕 Fix lint errors
---
 .../__snapshots__/Checkbox.spec.ts.snap       |  2 +
 .../src/components/N8nInput/Input.vue         |  9 ++--
 .../N8nInput/__tests__/Input.spec.ts          | 18 +++++++
 .../components/N8nInputLabel/InputLabel.vue   |  2 +-
 .../src/components/N8nMarkdown/Markdown.vue   |  1 -
 .../src/components/N8nSticky/Sticky.vue       | 10 +---
 .../src/components/N8nUserInfo/UserInfo.vue   |  2 +-
 .../src/components/N8nUsersList/UsersList.vue |  1 -
 packages/editor-ui/src/Interface.ts           |  4 ++
 .../editor-ui/src/components/CopyInput.vue    | 11 +++-
 .../src/components/CredentialCard.vue         |  2 +-
 .../CredentialEdit/CredentialConfig.vue       |  3 +-
 .../src/components/ExecutionFilter.vue        |  2 +-
 .../src/components/ExecutionsList.vue         |  2 +-
 .../src/components/ExpressionEdit.vue         | 13 +++--
 .../ExpressionEditorModalInput.vue            |  2 +-
 .../ExpressionEditorModalOutput.vue           |  2 +-
 .../src/components/HtmlEditor/HtmlEditor.vue  |  2 +-
 .../InlineExpressionEditorInput.vue           |  2 +-
 .../InlineExpressionEditorOutput.vue          |  2 +-
 .../src/components/InlineNameEdit.vue         |  2 +-
 .../editor-ui/src/components/InputPanel.vue   |  2 +-
 packages/editor-ui/src/components/Node.vue    |  2 +-
 .../editor-ui/src/components/NodeTitle.vue    |  2 +-
 .../src/components/ParameterInput.vue         | 19 ++++---
 .../src/components/ParameterInputWrapper.vue  |  3 +-
 .../ResourceLocatorDropdown.vue               |  1 -
 .../editor-ui/src/components/RunDataHtml.vue  |  2 +-
 .../editor-ui/src/components/RunDataJson.vue  |  5 +-
 .../src/components/RunDataSchemaItem.vue      |  2 +-
 .../editor-ui/src/components/RunDataTable.vue |  9 ++--
 .../EventDestinationCard.ee.vue               |  2 +-
 .../src/components/SqlEditor/SqlEditor.vue    |  2 +-
 .../src/components/VariableSelector.vue       |  3 +-
 .../src/components/VariableSelectorItem.vue   |  5 +-
 .../editor-ui/src/components/WorkflowCard.vue |  8 +--
 .../components/__tests__/CopyInput.test.ts    | 51 +++++++++++++++++++
 .../components/__tests__/RunDataJson.test.ts  | 13 -----
 .../PersonalizationModal.spec.ts.snap         | 10 ++--
 .../__snapshots__/RunDataJson.test.ts.snap    | 30 ++++-------
 .../__snapshots__/RunDataSchema.test.ts.snap  | 12 ++---
 .../__snapshots__/VariablesRow.spec.ts.snap   |  4 +-
 .../editor-ui/src/stores/posthog.store.ts     |  3 ++
 .../editor-ui/src/views/SettingsApiView.vue   |  3 +-
 .../src/views/SettingsPersonalView.vue        |  2 +-
 45 files changed, 172 insertions(+), 117 deletions(-)
 create mode 100644 packages/editor-ui/src/components/__tests__/CopyInput.test.ts

diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
index 9a7a248acca0d..73f5989d6ff95 100644
--- a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
@@ -27,6 +27,7 @@ exports[`components > N8nCheckbox > should render with both child and label 1`]
       </strong>
       <div
         class="container"
+        data-test-id="input-label"
       >
         <label
           class="n8n-input-label inputLabel heading medium"
@@ -108,6 +109,7 @@ exports[`components > N8nCheckbox > should render with label 1`] = `
     >
       <div
         class="container"
+        data-test-id="input-label"
       >
         <label
           class="n8n-input-label inputLabel heading medium"
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index 68e617d590f16..1236d0f6ad97d 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -85,11 +85,14 @@ export default defineComponent({
 			return this.size;
 		},
 		classes(): string[] {
+			const classes = [];
 			if (this.size === 'xlarge') {
-				return ['xlarge'];
+				classes.push('xlarge');
 			}
-
-			return [];
+			if (this.type === 'password') {
+				classes.push('ph-no-capture');
+			}
+			return classes;
 		},
 	},
 	methods: {
diff --git a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
index 0bd6e2d35e74c..8026fab588239 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
+++ b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
@@ -6,4 +6,22 @@ describe('N8nInput', () => {
 		const wrapper = render(N8nInput);
 		expect(wrapper.html()).toMatchSnapshot();
 	});
+
+	it('should add .ph-no-capture class on password input', () => {
+		const { container } = render(N8nInput, {
+			props: {
+				type: 'password',
+			},
+		});
+		expect(container.firstChild).toHaveClass('ph-no-capture');
+	});
+
+	it('should not add .ph-no-capture class on other input types', () => {
+		const { container } = render(N8nInput, {
+			props: {
+				type: 'number',
+			},
+		});
+		expect(container.firstChild).not.toHaveClass('ph-no-capture');
+	});
 });
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index eb460161ad4ed..6e96e49252783 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="$style.container" v-on="$listeners">
+	<div :class="$style.container" v-on="$listeners" data-test-id="input-label">
 		<label
 			v-if="label || $slots.options"
 			:for="inputName"
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index d35f1ee575784..09be1747242f6 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -3,7 +3,6 @@
 		<div
 			v-if="!loading"
 			ref="editor"
-			class="ph-no-capture"
 			:class="$style[theme]"
 			v-html="htmlContent"
 			@click="onClick"
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 1c18ce051ca6d..c5952fb835ffe 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -17,12 +17,7 @@
 			@resizestart="onResizeStart"
 		>
 			<template>
-				<div
-					v-show="!editMode"
-					class="ph-no-capture"
-					:class="$style.wrapper"
-					@dblclick.stop="onDoubleClick"
-				>
+				<div v-show="!editMode" :class="$style.wrapper" @dblclick.stop="onDoubleClick">
 					<n8n-markdown
 						theme="sticky"
 						:content="content"
@@ -38,8 +33,7 @@
 					@keydown.esc="onInputBlur"
 					@keydown.stop
 					@wheel.stop
-					class="sticky-textarea ph-no-capture"
-					:class="{ 'full-height': !shouldShowFooter }"
+					:class="{ 'full-height': !shouldShowFooter, 'sticky-textarea': true }"
 				>
 					<n8n-input
 						:value="content"
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
index ec780a157752e..4f609aa9a9745 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="ph-no-capture" :class="classes">
+	<div :class="classes">
 		<div :class="$style.avatarContainer">
 			<n8n-avatar :firstName="firstName" :lastName="lastName" />
 		</div>
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.vue b/packages/design-system/src/components/N8nUsersList/UsersList.vue
index 9ab256dd412f2..64d3f13d58c18 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.vue
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.vue
@@ -3,7 +3,6 @@
 		<div
 			v-for="(user, i) in sortedUsers"
 			:key="user.id"
-			class="ph-no-capture"
 			:class="i === sortedUsers.length - 1 ? $style.itemContainer : $style.itemWithBorder"
 			:data-test-id="`user-list-item-${user.email}`"
 		>
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 7e0d39a1f38cb..9a36b6284d6e3 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -62,6 +62,10 @@ declare global {
 						isIdentifiedID?: boolean;
 						featureFlags: FeatureFlags;
 					};
+					session_recording?: {
+						maskAllInputs?: boolean;
+						maskInputFn?: ((text: string, element?: HTMLElement) => string) | null;
+					};
 				},
 			): void;
 			isFeatureEnabled?(flagName: string): boolean;
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/editor-ui/src/components/CopyInput.vue
index 4b071ade30283..71e7b9030734c 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -2,7 +2,12 @@
 	<div>
 		<n8n-input-label :label="label">
 			<div
-				:class="{ [$style.copyText]: true, [$style[size]]: true, [$style.collapsed]: collapse }"
+				:class="{
+					[$style.copyText]: true,
+					[$style[size]]: true,
+					[$style.collapsed]: collapse,
+					'ph-no-capture': redactValue,
+				}"
 				@click="copy"
 				data-test-id="copy-input"
 			>
@@ -56,6 +61,10 @@ export default defineComponent({
 			type: String,
 			default: 'large',
 		},
+		redactValue: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	setup() {
 		return {
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index 338aef999e997..87a8255969687 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -4,7 +4,7 @@
 			<credential-icon :credential-type-name="credentialType ? credentialType.name : ''" />
 		</template>
 		<template #header>
-			<n8n-heading tag="h2" bold class="ph-no-capture" :class="$style['card-heading']">
+			<n8n-heading tag="h2" bold :class="$style['card-heading']">
 				{{ data.name }}
 			</n8n-heading>
 		</template>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index e33117ea65a40..71b87c0f00be5 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -88,10 +88,11 @@
 				:toastTitle="
 					$locale.baseText('credentialEdit.credentialConfig.redirectUrlCopiedToClipboard')
 				"
+				:redactValue="true"
 			/>
 		</template>
 		<enterprise-edition v-else :features="[EnterpriseEditionFeature.Sharing]">
-			<div class="ph-no-capture">
+			<div>
 				<n8n-info-tip :bold="false">
 					{{
 						$locale.baseText('credentialEdit.credentialEdit.info.sharee', {
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
index 7d0258ee83786..9f8dd8f641113 100644
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ b/packages/editor-ui/src/components/ExecutionFilter.vue
@@ -176,7 +176,7 @@ onBeforeMount(() => {
 						filterable
 						data-test-id="executions-filter-workflows-select"
 					>
-						<div class="ph-no-capture">
+						<div>
 							<n8n-option
 								v-for="(item, idx) in props.workflows"
 								:key="idx"
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index c2ddce3619a8d..ac01067fa3d26 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -79,7 +79,7 @@
 							/>
 						</td>
 						<td>
-							<span class="ph-no-capture" @click.stop="displayExecution(execution)"
+							<span @click.stop="displayExecution(execution)"
 								><a href="#" :class="$style.link">{{
 									execution.workflowName || $locale.baseText('executionsList.unsavedWorkflow')
 								}}</a></span
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index c7110a45acb6b..612b3a7ac8f16 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -20,7 +20,11 @@
 					</div>
 
 					<div class="variable-selector">
-						<variable-selector :path="path" @itemSelected="itemSelected"></variable-selector>
+						<variable-selector
+							:path="path"
+							:redactValues="redactValues"
+							@itemSelected="itemSelected"
+						></variable-selector>
 					</div>
 				</el-col>
 				<el-col :span="16" class="right-side">
@@ -42,11 +46,12 @@
 								</n8n-link>
 							</div>
 						</div>
-						<div class="expression-editor ph-no-capture">
+						<div class="expression-editor">
 							<ExpressionEditorModalInput
 								:value="value"
 								:isReadOnly="isReadOnlyRoute"
 								:path="path"
+								:class="{ 'ph-no-capture': redactValues }"
 								@change="valueChanged"
 								@close="closeDialog"
 								ref="inputFieldExpression"
@@ -59,7 +64,7 @@
 						<div class="editor-description">
 							{{ $locale.baseText('expressionEdit.resultOfItem1') }}
 						</div>
-						<div class="ph-no-capture">
+						<div :class="{ 'ph-no-capture': redactValues }">
 							<ExpressionEditorModalOutput
 								:segments="segments"
 								ref="expressionResult"
@@ -97,7 +102,7 @@ import type { Segment } from '@/types/expressions';
 export default defineComponent({
 	name: 'ExpressionEdit',
 	mixins: [externalHooks, genericHelpers, debounceHelper],
-	props: ['dialogVisible', 'parameter', 'path', 'value', 'eventSource'],
+	props: ['dialogVisible', 'parameter', 'path', 'value', 'eventSource', 'redactValues'],
 	components: {
 		ExpressionEditorModalInput,
 		ExpressionEditorModalOutput,
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index 88cf944b74d73..943fe2db3c2d0 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -1,5 +1,5 @@
 <template>
-	<div ref="root" class="ph-no-capture" @keydown.stop></div>
+	<div ref="root" @keydown.stop></div>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
index 8c1d9f3ad3bf1..d4e28945f3976 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
@@ -1,5 +1,5 @@
 <template>
-	<div ref="root" class="ph-no-capture"></div>
+	<div ref="root"></div>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 04c6b0dfc6f05..fd3e57ed4f0ad 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -1,5 +1,5 @@
 <template>
-	<div ref="htmlEditor" class="ph-no-capture"></div>
+	<div ref="htmlEditor"></div>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index ae6f185b7ec18..646b3f3c2b97d 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -1,5 +1,5 @@
 <template>
-	<div ref="root" class="ph-no-capture" data-test-id="inline-expression-editor-input"></div>
+	<div ref="root" data-test-id="inline-expression-editor-input"></div>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index 472fef3ed2e03..cf139c1e7a810 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -4,7 +4,7 @@
 			{{ $locale.baseText('parameterInput.resultForItem') }} {{ hoveringItemNumber }}
 		</n8n-text>
 		<n8n-text :class="$style.body">
-			<div ref="root" class="ph-no-capture" data-test-id="inline-expression-editor-output"></div>
+			<div ref="root" data-test-id="inline-expression-editor-output"></div>
 		</n8n-text>
 		<div :class="$style.footer">
 			<n8n-text size="small" compact>
diff --git a/packages/editor-ui/src/components/InlineNameEdit.vue b/packages/editor-ui/src/components/InlineNameEdit.vue
index 0e14aaba0d9d5..04c0e7b5119e5 100644
--- a/packages/editor-ui/src/components/InlineNameEdit.vue
+++ b/packages/editor-ui/src/components/InlineNameEdit.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="ph-no-capture" :class="$style.container">
+	<div :class="$style.container">
 		<span v-if="readonly" :class="$style.headline">
 			{{ name }}
 		</span>
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 25d62b36573cf..14cf1f06c3c9d 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -45,7 +45,7 @@
 						:label="`${truncate(node.name)} ${getMultipleNodesText(node.name)}`"
 						data-test-id="ndv-input-option"
 					>
-						<span class="ph-no-capture">{{ truncate(node.name) }}&nbsp;</span>
+						<span>{{ truncate(node.name) }}&nbsp;</span>
 						<span v-if="getMultipleNodesText(node.name)">{{
 							getMultipleNodesText(node.name)
 						}}</span>
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 1a41ef9d9b7aa..6f318630b8306 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -155,7 +155,7 @@
 			></div>
 		</div>
 		<div class="node-description">
-			<div class="node-name ph-no-capture" :title="nodeTitle">
+			<div class="node-name" :title="nodeTitle">
 				<p data-test-id="canvas-node-box-title">
 					{{ nodeTitle }}
 				</p>
diff --git a/packages/editor-ui/src/components/NodeTitle.vue b/packages/editor-ui/src/components/NodeTitle.vue
index 7e344c115c467..67c3ef33a629b 100644
--- a/packages/editor-ui/src/components/NodeTitle.vue
+++ b/packages/editor-ui/src/components/NodeTitle.vue
@@ -28,7 +28,7 @@
 				</div>
 			</div>
 			<template #reference>
-				<div class="ph-no-capture" :class="{ [$style.title]: true, [$style.hoverable]: editable }">
+				<div :class="{ [$style.title]: true, [$style.hoverable]: editable }">
 					{{ value }}
 					<div :class="$style.editIconContainer">
 						<font-awesome-icon :class="$style.editIcon" icon="pencil-alt" v-if="editable" />
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index c886160c02399..63262863029f7 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -9,6 +9,7 @@
 			:path="path"
 			:eventSource="eventSource || 'ndv'"
 			:isReadOnly="isReadOnly"
+			:redactValues="shouldRedactValue"
 			@closeDialog="closeExpressionEditDialog"
 			@valueChanged="expressionUpdated"
 		></expression-edit>
@@ -41,6 +42,7 @@
 				:title="displayTitle"
 				:isReadOnly="isReadOnly"
 				:path="path"
+				:class="{ 'ph-no-capture': shouldRedactValue }"
 				@valueChanged="expressionUpdated"
 				@modalOpenerClick="openExpressionEditorModal"
 				@focus="setFocus"
@@ -114,11 +116,7 @@
 					@valueChanged="valueChangedDebounced"
 				/>
 
-				<div
-					v-else-if="editorType"
-					class="readonly-code clickable ph-no-capture"
-					@click="displayEditDialog()"
-				>
+				<div v-else-if="editorType" class="readonly-code clickable" @click="displayEditDialog()">
 					<code-node-editor
 						v-if="!codeEditDialogVisible"
 						:value="value"
@@ -131,7 +129,7 @@
 					v-else
 					v-model="tempValue"
 					ref="inputField"
-					class="input-with-opener"
+					:class="{ 'input-with-opener': true, 'ph-no-capture': shouldRedactValue }"
 					:size="inputSize"
 					:type="getStringInputType"
 					:rows="getArgument('rows')"
@@ -204,6 +202,7 @@
 						: $locale.baseText('parameterInput.selectDateAndTime')
 				"
 				:picker-options="dateTimePickerOptions"
+				:class="{ 'ph-no-capture': shouldRedactValue }"
 				@change="valueChanged"
 				@focus="setFocus"
 				@blur="onBlur"
@@ -220,6 +219,7 @@
 				:min="getArgument('minValue')"
 				:precision="getArgument('numberPrecision')"
 				:disabled="isReadOnly"
+				:class="{ 'ph-no-capture': shouldRedactValue }"
 				@change="valueChanged"
 				@input="onTextInputChange"
 				@focus="setFocus"
@@ -274,7 +274,7 @@
 				>
 					<div class="list-option">
 						<div
-							class="option-headline ph-no-capture"
+							class="option-headline"
 							:class="{ 'remote-parameter-option': isRemoteParameterOption(option) }"
 						>
 							{{ getOptionsOptionDisplayName(option) }}
@@ -331,7 +331,7 @@
 			/>
 			<el-switch
 				v-else-if="parameter.type === 'boolean'"
-				class="switch-input"
+				:class="{ 'switch-input': true, 'ph-no-capture': shouldRedactValue }"
 				ref="inputField"
 				active-color="#13ce66"
 				:value="displayValue"
@@ -830,6 +830,9 @@ export default defineComponent({
 		remoteParameterOptionsKeys(): string[] {
 			return (this.remoteParameterOptions || []).map((o) => o.name);
 		},
+		shouldRedactValue(): boolean {
+			return this.getStringInputType === 'password' || this.isForCredential;
+		},
 	},
 	methods: {
 		isRemoteParameterOption(option: INodePropertyOptions) {
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index a8d794eb98ac7..a163ceec024b2 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -27,9 +27,8 @@
 		/>
 		<input-hint
 			v-if="expressionOutput"
-			:class="$style.hint"
+			:class="{ [$style.hint]: true, 'ph-no-capture': isForCredential }"
 			data-test-id="parameter-expression-preview"
-			class="ph-no-capture"
 			:highlight="!!(expressionOutput && targetItem) && isInputParentOfActiveNode"
 			:hint="expressionOutput"
 			:singleLine="true"
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index b5bcd9fa4a695..f8feb2b17936b 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -48,7 +48,6 @@
 					[$style.selected]: result.value === value,
 					[$style.hovering]: hoverIndex === i,
 				}"
-				class="ph-no-capture"
 				@click="() => onItemClick(result.value)"
 				@mouseenter="() => onItemHover(i)"
 				@mouseleave="() => onItemHoverLeave()"
diff --git a/packages/editor-ui/src/components/RunDataHtml.vue b/packages/editor-ui/src/components/RunDataHtml.vue
index 805fa67a1dca5..8221d6985f3fa 100644
--- a/packages/editor-ui/src/components/RunDataHtml.vue
+++ b/packages/editor-ui/src/components/RunDataHtml.vue
@@ -1,5 +1,5 @@
 <template>
-	<iframe class="__html-display ph-no-capture" :srcdoc="html" />
+	<iframe class="__html-display" :srcdoc="html" />
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 6f4a8d7d9fce9..cd51f62c02cf7 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -45,9 +45,7 @@
 						>
 					</template>
 					<template #nodeValue="{ node }">
-						<span v-if="isNaN(node.index)" class="ph-no-capture">{{
-							getContent(node.content)
-						}}</span>
+						<span v-if="isNaN(node.index)">{{ getContent(node.content) }}</span>
 						<span
 							v-else
 							data-target="mappable"
@@ -59,7 +57,6 @@
 								[$style.mappable]: mappingEnabled,
 								[$style.dragged]: draggingPath === node.path,
 							}"
-							class="ph-no-capture"
 							>{{ getContent(node.content) }}</span
 						>
 					</template>
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
index b9d0ae7d39182..6ea7485aded75 100644
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ b/packages/editor-ui/src/components/RunDataSchemaItem.vue
@@ -96,7 +96,7 @@ const getIconBySchemaType = (type: Schema['type']): string => {
 				<span v-if="key" :class="{ [$style.arrayIndex]: isSchemaParentTypeArray }">{{ key }}</span>
 			</span>
 		</div>
-		<span v-if="text" :class="$style.text" class="ph-no-capture">{{ text }}</span>
+		<span v-if="text" :class="$style.text">{{ text }}</span>
 		<input v-if="level > 0 && isSchemaValueArray" :id="subKey" type="checkbox" checked />
 		<label v-if="level > 0 && isSchemaValueArray" :class="$style.toggle" :for="subKey">
 			<font-awesome-icon icon="angle-up" />
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index f6852c679b9d1..b69522fd70ce7 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -121,7 +121,6 @@
 							<span
 								v-if="isSimple(data)"
 								:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
-								class="ph-no-capture"
 								>{{ getValueToRender(data) }}</span
 							>
 							<n8n-tree :nodeClass="$style.nodeClass" v-else :value="data">
@@ -143,11 +142,9 @@
 									>
 								</template>
 								<template #value="{ value }">
-									<span
-										:class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }"
-										class="ph-no-capture"
-										>{{ getValueToRender(value) }}</span
-									>
+									<span :class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }">
+										{{ getValueToRender(value) }}
+									</span>
 								</template>
 							</n8n-tree>
 						</td>
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index bf40eba811ab3..9c977a984c6ee 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -2,7 +2,7 @@
 	<n8n-card :class="$style.cardLink" data-test-id="destination-card" @click="onClick">
 		<template #header>
 			<div>
-				<n8n-heading tag="h2" bold class="ph-no-capture" :class="$style.cardHeading">
+				<n8n-heading tag="h2" bold :class="$style.cardHeading">
 					{{ destination.label }}
 				</n8n-heading>
 				<div :class="$style.cardDescription">
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 09cee368d0bec..596cbdb908dd4 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="$style.sqlEditor" v-click-outside="onBlur">
-		<div ref="sqlEditor" data-test-id="sql-editor-container" class="ph-no-capture"></div>
+		<div ref="sqlEditor" data-test-id="sql-editor-container"></div>
 		<InlineExpressionEditorOutput
 			:segments="segments"
 			:value="query"
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
index ed9de7342a8a3..6601bf9958772 100644
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ b/packages/editor-ui/src/components/VariableSelector.vue
@@ -16,6 +16,7 @@
 				v-for="option in currentResults"
 				:key="option.key"
 				:extendAll="extendAll"
+				:redactValues="redactValues"
 				@itemSelected="forwardItemSelected"
 			></variable-selector-item>
 		</div>
@@ -59,7 +60,7 @@ export default defineComponent({
 	components: {
 		VariableSelectorItem,
 	},
-	props: ['path'],
+	props: ['path', 'redactValues'],
 	data() {
 		return {
 			variableFilter: '',
diff --git a/packages/editor-ui/src/components/VariableSelectorItem.vue b/packages/editor-ui/src/components/VariableSelectorItem.vue
index a944483fea794..5569673ef5879 100644
--- a/packages/editor-ui/src/components/VariableSelectorItem.vue
+++ b/packages/editor-ui/src/components/VariableSelectorItem.vue
@@ -41,6 +41,7 @@
 					:key="option.key"
 					:extendAll="extendAll"
 					:allowParentSelect="option.allowParentSelect"
+					:redactValues="redactValues"
 					class="sub-level"
 					@itemSelected="forwardItemSelected"
 				></variable-selector-item>
@@ -51,7 +52,7 @@
 				{{ item.name }}:
 				<font-awesome-icon icon="dot-circle" title="Select Item" />
 			</div>
-			<div class="item-value ph-no-capture">
+			<div :class="{ 'ph-no-capture': redactValues, 'item-value': true }">
 				{{ item.value !== undefined ? item.value : $locale.baseText('variableSelectorItem.empty') }}
 			</div>
 		</div>
@@ -66,7 +67,7 @@ import { externalHooks } from '@/mixins/externalHooks';
 export default defineComponent({
 	name: 'VariableSelectorItem',
 	mixins: [externalHooks],
-	props: ['allowParentSelect', 'extendAll', 'item'],
+	props: ['allowParentSelect', 'extendAll', 'item', 'redactValues'],
 	mounted() {
 		if (this.extended) return;
 
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 21b8873d6b0bb..c3438942b4c4d 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -1,13 +1,7 @@
 <template>
 	<n8n-card :class="$style.cardLink" @click="onClick">
 		<template #header>
-			<n8n-heading
-				tag="h2"
-				bold
-				class="ph-no-capture"
-				:class="$style.cardHeading"
-				data-test-id="workflow-card-name"
-			>
+			<n8n-heading tag="h2" bold :class="$style.cardHeading" data-test-id="workflow-card-name">
 				{{ data.name }}
 			</n8n-heading>
 		</template>
diff --git a/packages/editor-ui/src/components/__tests__/CopyInput.test.ts b/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
new file mode 100644
index 0000000000000..93991153b2679
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
@@ -0,0 +1,51 @@
+import { PiniaVuePlugin } from 'pinia';
+import { render } from '@testing-library/vue';
+import { merge } from 'lodash-es';
+
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+
+import { createTestingPinia } from '@pinia/testing';
+import CopyInput from '@/components/CopyInput.vue';
+
+const DEFAULT_SETUP = {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+			},
+		},
+	}),
+	props: {
+		copyButtonText: 'Click to copy',
+		label: 'Copy Input test',
+	},
+};
+
+const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
+	render(CopyInput, merge(DEFAULT_SETUP, renderOptions), (vue) => {
+		vue.use(PiniaVuePlugin);
+	});
+
+describe('BannerStack', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render default configuration', async () => {
+		const { getByTestId } = renderComponent();
+		expect(getByTestId('input-label')).toHaveTextContent('Copy Input test');
+		expect(getByTestId('copy-input')).toHaveTextContent('Click to copy');
+	});
+
+	it('should render redacted version', async () => {
+		const { container, getByTestId } = renderComponent(
+			merge(DEFAULT_SETUP, {
+				props: {
+					redactValue: true,
+				},
+			}),
+		);
+		expect(getByTestId('copy-input')).toHaveClass('ph-no-capture');
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts b/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
index 22a87e6cdbf07..88f73367bbaf6 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
@@ -65,17 +65,4 @@ describe('RunDataJson.vue', () => {
 		expect(screen.getByText('null')).toBeInTheDocument();
 		expect(screen.queryByText('undefined')).not.toBeInTheDocument();
 	});
-
-	it('sets ph-no-capture class correctly', () => {
-		render(RunDataJson, DEFAULT_SETUP);
-
-		expect(screen.getByText('"list"')).not.toHaveClass('ph-no-capture');
-		expect(screen.getByText('"record"')).not.toHaveClass('ph-no-capture');
-		expect(screen.getByText('"myStringNumber"')).not.toHaveClass('ph-no-capture');
-
-		expect(screen.getByText('123')).toHaveClass('ph-no-capture');
-		expect(screen.getByText('"456"')).toHaveClass('ph-no-capture');
-		expect(screen.getByText('"abc"')).toHaveClass('ph-no-capture');
-		expect(screen.getByText('null')).toHaveClass('ph-no-capture');
-	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
index e7241c7063f74..a60c0d7529f2c 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
@@ -21,7 +21,7 @@ exports[`PersonalizationModal.vue > should render correctly 1`] = `
             <div>
               <div class=\\"grid\\">
                 <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"companyType\\"><label for=\\"companyType\\" class=\\"n8n-input-label inputLabel heading medium\\">
+                  <div data-test-id=\\"companyType\\" class=\\"container\\"><label for=\\"companyType\\" class=\\"n8n-input-label inputLabel heading medium\\">
                       <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> What best describes your company? <!----></span></div>
                       <!---->
                       <!---->
@@ -71,7 +71,7 @@ exports[`PersonalizationModal.vue > should render correctly 1`] = `
                   </div>
                 </div>
                 <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"role\\"><label for=\\"role\\" class=\\"n8n-input-label inputLabel heading medium\\">
+                  <div data-test-id=\\"role\\" class=\\"container\\"><label for=\\"role\\" class=\\"n8n-input-label inputLabel heading medium\\">
                       <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Which role best describes you? <!----></span></div>
                       <!---->
                       <!---->
@@ -123,7 +123,7 @@ exports[`PersonalizationModal.vue > should render correctly 1`] = `
                   </div>
                 </div>
                 <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"automationBeneficiary\\"><label for=\\"automationBeneficiary\\" class=\\"n8n-input-label inputLabel heading medium\\">
+                  <div data-test-id=\\"automationBeneficiary\\" class=\\"container\\"><label for=\\"automationBeneficiary\\" class=\\"n8n-input-label inputLabel heading medium\\">
                       <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Who will your automations mainly be for? <!----></span></div>
                       <!---->
                       <!---->
@@ -169,7 +169,7 @@ exports[`PersonalizationModal.vue > should render correctly 1`] = `
                   </div>
                 </div>
                 <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"companySize\\"><label for=\\"companySize\\" class=\\"n8n-input-label inputLabel heading medium\\">
+                  <div data-test-id=\\"companySize\\" class=\\"container\\"><label for=\\"companySize\\" class=\\"n8n-input-label inputLabel heading medium\\">
                       <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How big is your company? <!----></span></div>
                       <!---->
                       <!---->
@@ -218,7 +218,7 @@ exports[`PersonalizationModal.vue > should render correctly 1`] = `
                   </div>
                 </div>
                 <div class=\\"\\">
-                  <div class=\\"container\\" data-test-id=\\"reportedSource\\"><label for=\\"reportedSource\\" class=\\"n8n-input-label inputLabel heading medium\\">
+                  <div data-test-id=\\"reportedSource\\" class=\\"container\\"><label for=\\"reportedSource\\" class=\\"n8n-input-label inputLabel heading medium\\">
                       <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How did you hear about n8n? <!----></span></div>
                       <!---->
                       <!---->
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
index a0116bd5ec97c..b4ea061a334d9 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
@@ -138,7 +138,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                     class="vjs-value vjs-value-number"
                   >
                     <span
-                      class="ph-no-capture mappable"
+                      class="mappable"
                       data-depth="3"
                       data-name="list[0]"
                       data-path="[0].list[0]"
@@ -180,7 +180,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                     class="vjs-value vjs-value-number"
                   >
                     <span
-                      class="ph-no-capture mappable"
+                      class="mappable"
                       data-depth="3"
                       data-name="list[1]"
                       data-path="[0].list[1]"
@@ -222,7 +222,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                     class="vjs-value vjs-value-number"
                   >
                     <span
-                      class="ph-no-capture mappable"
+                      class="mappable"
                       data-depth="3"
                       data-name="list[2]"
                       data-path="[0].list[2]"
@@ -351,9 +351,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                   <span
                     class="vjs-value vjs-value-string"
                   >
-                    <span
-                      class="ph-no-capture"
-                    >
+                    <span>
                       "Joe"
                     </span>
                   </span>
@@ -429,9 +427,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                   <span
                     class="vjs-value vjs-value-number"
                   >
-                    <span
-                      class="ph-no-capture"
-                    >
+                    <span>
                       123
                     </span>
                   </span>
@@ -479,9 +475,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                   <span
                     class="vjs-value vjs-value-string"
                   >
-                    <span
-                      class="ph-no-capture"
-                    >
+                    <span>
                       "456"
                     </span>
                   </span>
@@ -529,9 +523,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                   <span
                     class="vjs-value vjs-value-string"
                   >
-                    <span
-                      class="ph-no-capture"
-                    >
+                    <span>
                       "abc"
                     </span>
                   </span>
@@ -579,9 +571,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                   <span
                     class="vjs-value vjs-value-null"
                   >
-                    <span
-                      class="ph-no-capture"
-                    >
+                    <span>
                       null
                     </span>
                   </span>
@@ -629,9 +619,7 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
                   <span
                     class="vjs-value vjs-value-undefined"
                   >
-                    <span
-                      class="ph-no-capture"
-                    >
+                    <span>
                       
                     </span>
                   </span>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
index 317edebadbe10..32223d9b399a3 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
@@ -52,7 +52,7 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                 </span>
               </div>
               <span
-                class="ph-no-capture text"
+                class="text"
               >
                 John
               </span>
@@ -90,7 +90,7 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                 </span>
               </div>
               <span
-                class="ph-no-capture text"
+                class="text"
               >
                 22
               </span>
@@ -176,7 +176,7 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                     </span>
                   </div>
                   <span
-                    class="ph-no-capture text"
+                    class="text"
                   >
                     surfing
                   </span>
@@ -216,7 +216,7 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                     </span>
                   </div>
                   <span
-                    class="ph-no-capture text"
+                    class="text"
                   >
                     traveling
                   </span>
@@ -458,7 +458,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                             </span>
                           </div>
                           <span
-                            class="ph-no-capture text"
+                            class="text"
                           >
                             1
                           </span>
@@ -498,7 +498,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         </span>
                       </div>
                       <span
-                        class="ph-no-capture text"
+                        class="text"
                       >
                         ignore
                       </span>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
index 0ade8504236bd..c4309d245103b 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
@@ -32,7 +32,7 @@ exports[`VariablesRow > should show key and value inputs in edit mode 1`] = `
 "<tr data-test-id=\\"variables-row\\" class=\\"variablesRow\\">
   <td class=\\"variables-key-column\\">
     <div>
-      <div class=\\"container\\" data-test-id=\\"variable-row-key-input\\">
+      <div data-test-id=\\"variable-row-key-input\\" class=\\"container\\">
         <!---->
         <div class=\\"\\">
           <div class=\\"el-input el-input--large n8n-input\\">
@@ -49,7 +49,7 @@ exports[`VariablesRow > should show key and value inputs in edit mode 1`] = `
   </td>
   <td class=\\"variables-value-column\\">
     <div>
-      <div class=\\"container\\" data-test-id=\\"variable-row-value-input\\">
+      <div data-test-id=\\"variable-row-value-input\\" class=\\"container\\">
         <!---->
         <div class=\\"\\">
           <div class=\\"el-input el-input--large n8n-input\\">
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/editor-ui/src/stores/posthog.store.ts
index 3728db62539c0..1626437f97584 100644
--- a/packages/editor-ui/src/stores/posthog.store.ts
+++ b/packages/editor-ui/src/stores/posthog.store.ts
@@ -118,6 +118,9 @@ export const usePostHog = defineStore('posthog', () => {
 			autocapture: config.autocapture,
 			disable_session_recording: config.disableSessionRecording,
 			debug: config.debug,
+			session_recording: {
+				maskAllInputs: false,
+			},
 		};
 
 		window.posthog?.init(config.apiKey, options);
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index ff78c47e3c782..ed863a2a30002 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -36,12 +36,13 @@
 						{{ $locale.baseText('generic.delete') }}
 					</n8n-link>
 				</span>
-				<div class="ph-no-capture">
+				<div>
 					<CopyInput
 						:label="$locale.baseText('settings.api.view.myKey')"
 						:value="apiKey"
 						:copy-button-text="$locale.baseText('generic.clickToCopy')"
 						:toast-title="$locale.baseText('settings.api.view.copy.toast')"
+						:redactValue="true"
 						@copy="onCopy"
 					/>
 				</div>
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 7dd49c763ba62..d86ceede04444 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -4,7 +4,7 @@
 			<n8n-heading size="2xlarge">{{
 				$locale.baseText('settings.personal.personalSettings')
 			}}</n8n-heading>
-			<div class="ph-no-capture" :class="$style.user">
+			<div :class="$style.user">
 				<span :class="$style.username" data-test-id="current-user-name">
 					<n8n-text color="text-light">{{ currentUser.fullName }}</n8n-text>
 				</span>

From 69c0f2f26e79675081ba5f61d2379bb6e793ce7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Thu, 20 Jul 2023 09:30:30 +0200
Subject: [PATCH 038/116] fix(editor): Remove global link styling in v1 banner
 (#6705)

---
 .../editor-ui/src/components/banners/V1Banner.vue    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/components/banners/V1Banner.vue b/packages/editor-ui/src/components/banners/V1Banner.vue
index c263ec7f88207..cf3df23d55d28 100644
--- a/packages/editor-ui/src/components/banners/V1Banner.vue
+++ b/packages/editor-ui/src/components/banners/V1Banner.vue
@@ -14,7 +14,7 @@ async function dismissPermanently() {
 </script>
 
 <template>
-	<base-banner customIcon="info-circle" theme="warning" name="V1">
+	<base-banner customIcon="info-circle" theme="warning" name="V1" :class="$style.v1container">
 		<template #mainContent>
 			<span v-html="locale.baseText('banners.v1.message')"></span>
 			<a
@@ -30,9 +30,11 @@ async function dismissPermanently() {
 </template>
 
 <style lang="scss" module>
-a,
-.link {
-	font-weight: var(--font-weight-bold);
-	text-decoration: underline;
+.v1container {
+	a,
+	.link {
+		font-weight: var(--font-weight-bold);
+		text-decoration: underline;
+	}
 }
 </style>

From 5a6d48f14bb7623d1e682f65b4ab27d8f09d2c68 Mon Sep 17 00:00:00 2001
From: Val <68596159+valya@users.noreply.github.com>
Date: Thu, 20 Jul 2023 10:34:45 +0100
Subject: [PATCH 039/116] fix: Add missing indices on sqlite (#6673)

* fix: enforce tag name uniqueness on sqlite

* rename migration and add other missing indices

* add tags tests
---
 ...-FixMissingIndicesFromStringIdMigration.ts | 40 +++++++++++++++++++
 .../src/databases/migrations/sqlite/index.ts  |  2 +
 packages/cli/test/integration/shared/types.ts |  3 +-
 .../integration/shared/utils/testServer.ts    |  9 +++++
 .../cli/test/integration/tags.api.test.ts     | 38 ++++++++++++++++++
 5 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts
 create mode 100644 packages/cli/test/integration/tags.api.test.ts

diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts b/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts
new file mode 100644
index 0000000000000..f950ff70da432
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000020-FixMissingIndicesFromStringIdMigration.ts
@@ -0,0 +1,40 @@
+import type { IrreversibleMigration, MigrationContext } from '@db/types';
+
+export class FixMissingIndicesFromStringIdMigration1690000000020 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext): Promise<void> {
+		const toMerge = (await queryRunner.query(
+			`SELECT id, name, COUNT(*) c FROM ${tablePrefix}tag_entity GROUP BY name HAVING c > 1`,
+		)) as Array<{ id: string; name: string }>;
+
+		for (const m of toMerge) {
+			const tags = (await queryRunner.query(
+				`SELECT id FROM ${tablePrefix}tag_entity WHERE name = ?`,
+				[m.name],
+			)) as Array<{ id: string }>;
+			for (const t of tags) {
+				if (t.id === m.id) {
+					continue;
+				}
+				await queryRunner.query(
+					`UPDATE ${tablePrefix}workflows_tags SET tagId = ? WHERE tagId = ?`,
+					[m.id, t.id],
+				);
+				await queryRunner.query(`DELETE FROM ${tablePrefix}tag_entity WHERE id = ?`, [t.id]);
+			}
+		}
+
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "IDX_${tablePrefix}8f949d7a3a984759044054e89b" ON "${tablePrefix}tag_entity" ("name") `,
+		);
+
+		await queryRunner.query(
+			`CREATE INDEX 'IDX_${tablePrefix}b94b45ce2c73ce46c54f20b5f9' ON '${tablePrefix}execution_entity' ('waitTill', 'id');`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX 'IDX_${tablePrefix}81fc04c8a17de15835713505e4' ON '${tablePrefix}execution_entity' ('workflowId', 'id');`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX 'IDX_${tablePrefix}8b6f3f9ae234f137d707b98f3bf43584' ON '${tablePrefix}execution_entity' ('status', 'workflowId');`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index b0a98fa10b4e7..f23ce876655cb 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -38,6 +38,7 @@ import { AddUserActivatedProperty1681134145996 } from './1681134145996-AddUserAc
 import { MigrateIntegerKeysToString1690000000002 } from './1690000000002-MigrateIntegerKeysToString';
 import { SeparateExecutionData1690000000010 } from './1690000000010-SeparateExecutionData';
 import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
+import { FixMissingIndicesFromStringIdMigration1690000000020 } from './1690000000020-FixMissingIndicesFromStringIdMigration';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -79,6 +80,7 @@ const sqliteMigrations: Migration[] = [
 	MigrateIntegerKeysToString1690000000002,
 	SeparateExecutionData1690000000010,
 	RemoveSkipOwnerSetup1681134145997,
+	FixMissingIndicesFromStringIdMigration1690000000020,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
index 8e25c62a5b394..b507749e23b5e 100644
--- a/packages/cli/test/integration/shared/types.ts
+++ b/packages/cli/test/integration/shared/types.ts
@@ -24,7 +24,8 @@ export type EndpointGroup =
 	| 'sourceControl'
 	| 'eventBus'
 	| 'license'
-	| 'variables';
+	| 'variables'
+	| 'tags';
 
 export interface SetupProps {
 	applyAuth?: boolean;
diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts
index 8f77ee75dfaa8..ac7f8076b6307 100644
--- a/packages/cli/test/integration/shared/utils/testServer.ts
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -28,6 +28,7 @@ import {
 	NodesController,
 	OwnerController,
 	PasswordResetController,
+	TagsController,
 	UsersController,
 } from '@/controllers';
 import { setupAuthMiddlewares } from '@/middlewares';
@@ -261,6 +262,14 @@ export const setupTestServer = ({
 								logger,
 							}),
 						);
+						break;
+					case 'tags':
+						registerController(
+							app,
+							config,
+							new TagsController({ config, externalHooks, repositories }),
+						);
+						break;
 				}
 			}
 		}
diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts
new file mode 100644
index 0000000000000..a8aa61a8ba8e0
--- /dev/null
+++ b/packages/cli/test/integration/tags.api.test.ts
@@ -0,0 +1,38 @@
+import * as Db from '@/Db';
+import * as utils from './shared/utils/';
+import * as testDb from './shared/testDb';
+import type { SuperAgentTest } from 'supertest';
+
+let authOwnerAgent: SuperAgentTest;
+const testServer = utils.setupTestServer({ endpointGroups: ['tags'] });
+
+beforeAll(async () => {
+	const globalOwnerRole = await testDb.getGlobalOwnerRole();
+	const ownerShell = await testDb.createUserShell(globalOwnerRole);
+	authOwnerAgent = testServer.authAgentFor(ownerShell);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['Tag']);
+});
+
+describe('POST /tags', () => {
+	test('should create tag', async () => {
+		const resp = await authOwnerAgent.post('/tags').send({ name: 'test' });
+		expect(resp.statusCode).toBe(200);
+
+		const dbTag = await Db.collections.Tag.findBy({ name: 'test' });
+		expect(dbTag.length === 1);
+	});
+
+	test('should not create duplicate tag', async () => {
+		const newTag = Db.collections.Tag.create({ name: 'test' });
+		await Db.collections.Tag.save(newTag);
+
+		const resp = await authOwnerAgent.post('/tags').send({ name: 'test' });
+		expect(resp.status).toBe(500);
+
+		const dbTag = await Db.collections.Tag.findBy({ name: 'test' });
+		expect(dbTag.length).toBe(1);
+	});
+});

From 351184b0a65bd1971d22022759fe8fc9e84d86bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 20 Jul 2023 17:05:43 +0200
Subject: [PATCH 040/116] test: Move test timeout to `/cli` (no-changelog)
 (#6712)

---
 jest.config.js              | 1 -
 packages/cli/jest.config.js | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index e6eb3e16c85a8..729d2d3a59d5a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -26,7 +26,6 @@ const config = {
 	collectCoverage: true,
 	coverageReporters: [process.env.COVERAGE_REPORT === 'true' ? 'text' : 'text-summary'],
 	collectCoverageFrom: ['src/**/*.ts'],
-	testTimeout: 10_000,
 };
 
 if (process.env.CI === 'true') {
diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js
index 8f61a80caa969..9cbb4a4f919f6 100644
--- a/packages/cli/jest.config.js
+++ b/packages/cli/jest.config.js
@@ -12,4 +12,5 @@ module.exports = {
 		'^@db/(.*)$': '<rootDir>/src/databases/$1',
 	},
 	coveragePathIgnorePatterns: ['/src/databases/migrations/'],
+	testTimeout: 10_000,
 };

From 835588cbbdb7620a0e01d8ba828b201ae30be780 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Thu, 20 Jul 2023 17:23:29 +0200
Subject: [PATCH 041/116] fix(core): Redirect user to previous url after SSO
 signin (#6710)

redirect user to previous url after SSO signin
---
 .../src/sso/saml/routes/saml.controller.ee.ts | 22 +++++++++++++++++--
 packages/cli/src/sso/saml/saml.service.ee.ts  |  4 ----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
index f7229f75d4888..67d441a37c7a1 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -25,6 +25,8 @@ import {
 import { getSamlConnectionTestSuccessView } from '../views/samlConnectionTestSuccess';
 import { getSamlConnectionTestFailedView } from '../views/samlConnectionTestFailed';
 import { InternalHooks } from '@/InternalHooks';
+import url from 'url';
+import querystring from 'querystring';
 
 @Service()
 @RestController('/sso/saml')
@@ -138,7 +140,8 @@ export class SamlController {
 					if (loginResult.onboardingRequired) {
 						return res.redirect(getInstanceBaseUrl() + SamlUrls.samlOnboarding);
 					} else {
-						return res.redirect(getInstanceBaseUrl() + SamlUrls.defaultRedirect);
+						const redirectUrl = req.body?.RelayState ?? SamlUrls.defaultRedirect;
+						return res.redirect(getInstanceBaseUrl() + redirectUrl);
 					}
 				} else {
 					return res.status(202).send(loginResult.attributes);
@@ -169,7 +172,22 @@ export class SamlController {
 	@NoAuthRequired()
 	@Get(SamlUrls.initSSO, { middlewares: [samlLicensedAndEnabledMiddleware] })
 	async initSsoGet(req: express.Request, res: express.Response) {
-		return this.handleInitSSO(res);
+		let redirectUrl = '';
+		try {
+			const refererUrl = req.headers.referer;
+			if (refererUrl) {
+				const parsedUrl = url.parse(refererUrl);
+				if (parsedUrl?.query) {
+					const parsedQueryParams = querystring.parse(parsedUrl.query);
+					if (parsedQueryParams.redirect && typeof parsedQueryParams.redirect === 'string') {
+						redirectUrl = querystring.unescape(parsedQueryParams.redirect);
+					}
+				}
+			}
+		} catch {
+			// ignore
+		}
+		return this.handleInitSSO(res, redirectUrl);
 	}
 
 	/**
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index 8e9eaad2cbfff..5e1c2847a7f5c 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -140,8 +140,6 @@ export class SamlService {
 		const sp = this.getServiceProviderInstance();
 		sp.entitySetting.relayState = relayState ?? getInstanceBaseUrl();
 		const loginRequest = sp.createLoginRequest(this.getIdentityProviderInstance(), 'redirect');
-		//TODO:SAML: debug logging
-		LoggerProxy.debug(loginRequest.context);
 		return loginRequest;
 	}
 
@@ -152,8 +150,6 @@ export class SamlService {
 			this.getIdentityProviderInstance(),
 			'post',
 		) as PostBindingContext;
-		//TODO:SAML: debug logging
-		LoggerProxy.debug(loginRequest.context);
 		return loginRequest;
 	}
 

From acb8cb064a8251f69455aea7a46035e84856ea1e Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Fri, 21 Jul 2023 11:07:49 +0200
Subject: [PATCH 042/116] fix(FTP Node): List recursive ignore . and .. to
 prevent infinite loops (#6707)

ignore . and .. to prevent infinite loop

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 packages/nodes-base/nodes/Ftp/Ftp.node.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index d71f9b4d195cd..84bbf0d4ff7fd 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -64,6 +64,10 @@ async function callRecursiveList(
 
 		// Is directory
 		if (item.type === 'd') {
+			// ignore . and .. to prevent infinite loop
+			if (item.name === '.' || item.name === '..') {
+				return;
+			}
 			pathArray.push(currentPath);
 		}
 

From 77a7d76f5ec9fbe9e8b9e89e6090eccb8af09332 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, 21 Jul 2023 11:48:23 +0200
Subject: [PATCH 043/116] ci: Fix running e2e tests in dev mode (no-changelog)
 (#6717)

---
 cypress/constants.ts        |  1 -
 cypress/support/commands.ts | 19 +++++++++++++------
 cypress/support/e2e.ts      |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cypress/constants.ts b/cypress/constants.ts
index dcb96b5ffdb1c..06ccbd71306a2 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -1,6 +1,5 @@
 import { randFirstName, randLastName } from '@ngneat/falso';
 
-export const BASE_URL = 'http://localhost:5678';
 export const BACKEND_BASE_URL = 'http://localhost:5678';
 export const N8N_AUTH_COOKIE = 'n8n-auth';
 
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 505022934a20a..6c7adaea8f84b 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -1,6 +1,6 @@
 import 'cypress-real-events';
 import { WorkflowPage } from '../pages';
-import { BASE_URL, N8N_AUTH_COOKIE } from '../constants';
+import { BACKEND_BASE_URL, N8N_AUTH_COOKIE } from '../constants';
 
 Cypress.Commands.add('getByTestId', (selector, ...args) => {
 	return cy.get(`[data-test-id="${selector}"]`, ...args);
@@ -41,11 +41,15 @@ Cypress.Commands.add('waitForLoad', (waitForIntercepts = true) => {
 
 Cypress.Commands.add('signin', ({ email, password }) => {
 	Cypress.session.clearAllSavedSessions();
-	cy.session([email, password], () => cy.request('POST', '/rest/login', { email, password }), {
-		validate() {
-			cy.getCookie(N8N_AUTH_COOKIE).should('exist');
+	cy.session(
+		[email, password],
+		() => cy.request('POST', `${BACKEND_BASE_URL}/rest/login`, { email, password }),
+		{
+			validate() {
+				cy.getCookie(N8N_AUTH_COOKIE).should('exist');
+			},
 		},
-	});
+	);
 });
 
 Cypress.Commands.add('signout', () => {
@@ -58,7 +62,10 @@ Cypress.Commands.add('interceptREST', (method, url) => {
 });
 
 const setFeature = (feature: string, enabled: boolean) =>
-	cy.request('PATCH', `${BASE_URL}/rest/e2e/feature`, { feature: `feat:${feature}`, enabled });
+	cy.request('PATCH', `${BACKEND_BASE_URL}/rest/e2e/feature`, {
+		feature: `feat:${feature}`,
+		enabled,
+	});
 
 Cypress.Commands.add('enableFeature', (feature: string) => setFeature(feature, true));
 Cypress.Commands.add('disableFeature', (feature): string => setFeature(feature, false));
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 456ba9efd9c23..dc3079282f232 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -1,8 +1,8 @@
-import { BASE_URL, INSTANCE_MEMBERS, INSTANCE_OWNER } from '../constants';
+import { BACKEND_BASE_URL, INSTANCE_MEMBERS, INSTANCE_OWNER } from '../constants';
 import './commands';
 
 before(() => {
-	cy.request('POST', `${BASE_URL}/rest/e2e/reset`, {
+	cy.request('POST', `${BACKEND_BASE_URL}/rest/e2e/reset`, {
 		owner: INSTANCE_OWNER,
 		members: INSTANCE_MEMBERS,
 	});

From 5196f37318c550a886d991e32c8e70de302bad01 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 21 Jul 2023 13:28:26 +0300
Subject: [PATCH 044/116] fix(Google BigQuery Node): Error description
 improvement (#6715)

---
 .../v2/actions/database/executeQuery.operation.ts  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
index b08920cdb139a..bbc61c9dc9e8f 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
@@ -91,7 +91,7 @@ const properties: INodeProperties[] = [
 				},
 			},
 			{
-				displayName: 'Location',
+				displayName: 'Location (Region)',
 				name: 'location',
 				type: 'string',
 				default: '',
@@ -248,9 +248,13 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				returnData.push(...executionErrorData);
 				continue;
 			}
-			throw new NodeOperationError(this.getNode(), error.message as string, {
+			if ((error.message as string).includes('location')) {
+				error.description =
+					"Are you sure your table is in that region? You can specify the region using the 'Location' parameter from options.";
+			}
+			throw new NodeOperationError(this.getNode(), error as Error, {
 				itemIndex: i,
-				description: error?.description,
+				description: error.description,
 			});
 		}
 	}
@@ -293,9 +297,9 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					returnData.push(...executionErrorData);
 					continue;
 				}
-				throw new NodeOperationError(this.getNode(), error.message as string, {
+				throw new NodeOperationError(this.getNode(), error as Error, {
 					itemIndex: job.i,
-					description: error?.description,
+					description: error.description,
 				});
 			}
 		}

From c6f7bb22aa8799cc7b075de6d1d8c7994acc623b Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:09:48 +0200
Subject: [PATCH 045/116] fix(GitLab Trigger Node): Fix trigger activation 404
 error  (#6711)

* fix webhook checkExists not deleting static data

* improve webhook checkExists not deleting static data
---
 packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 910759349463a..3b781ed8053a7 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -195,7 +195,7 @@ export class GitlabTrigger implements INodeType {
 				try {
 					await gitlabApiRequest.call(this, 'GET', endpoint, {});
 				} catch (error) {
-					if (error.cause.httpCode === '404') {
+					if (error.cause.httpCode === '404' || error.description.includes('404')) {
 						// Webhook does not exist
 						delete webhookData.webhookId;
 						delete webhookData.webhookEvents;

From 8fa9263c743ba24ddc90415fbdbfd31a5dbeafda Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Fri, 21 Jul 2023 23:31:52 +0200
Subject: [PATCH 046/116] fix(core): Support redis cluster in queue mode
 (#6708)

* support redis cluster

* cleanup, fix config schema

* set default prefix to bull
---
 packages/cli/src/AbstractServer.ts | 77 +++++++++++++++++++-----------
 packages/cli/src/GenericHelpers.ts | 24 ++++++++++
 packages/cli/src/Queue.ts          | 52 ++++++++++++++++----
 packages/cli/src/config/schema.ts  | 10 +++-
 4 files changed, 126 insertions(+), 37 deletions(-)

diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index ab27a710c53ae..02f02becaf822 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -10,7 +10,7 @@ import parseUrl from 'parseurl';
 import type { RedisOptions } from 'ioredis';
 
 import type { WebhookHttpMethod } from 'n8n-workflow';
-import { LoggerProxy as Logger } from 'n8n-workflow';
+import { LoggerProxy } from 'n8n-workflow';
 import config from '@/config';
 import { N8N_VERSION, inDevelopment } from '@/constants';
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
@@ -27,6 +27,7 @@ import { corsMiddleware } from '@/middlewares';
 import { TestWebhooks } from '@/TestWebhooks';
 import { WaitingWebhooks } from '@/WaitingWebhooks';
 import { WEBHOOK_METHODS } from '@/WebhookHelpers';
+import { getRedisClusterNodes } from './GenericHelpers';
 
 const emptyBuffer = Buffer.alloc(0);
 
@@ -187,42 +188,64 @@ export abstract class AbstractServer {
 		let lastTimer = 0;
 		let cumulativeTimeout = 0;
 		const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
+		const clusterNodes = getRedisClusterNodes();
 		const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
-
-		const redis = new Redis({
-			host,
-			port,
-			db,
+		const usesRedisCluster = clusterNodes.length > 0;
+		LoggerProxy.debug(
+			usesRedisCluster
+				? `Initialising Redis cluster connection with nodes: ${clusterNodes
+						.map((e) => `${e.host}:${e.port}`)
+						.join(',')}`
+				: `Initialising Redis client connection with host: ${host ?? 'localhost'} and port: ${
+						port ?? '6379'
+				  }`,
+		);
+		const sharedRedisOptions: RedisOptions = {
 			username,
 			password,
-			retryStrategy: (): number | null => {
-				const now = Date.now();
-				if (now - lastTimer > 30000) {
-					// Means we had no timeout at all or last timeout was temporary and we recovered
-					lastTimer = now;
-					cumulativeTimeout = 0;
-				} else {
-					cumulativeTimeout += now - lastTimer;
-					lastTimer = now;
-					if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-						Logger.error(
-							`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
-						);
-						process.exit(1);
-					}
-				}
-				return 500;
-			},
-		});
+			db,
+			enableReadyCheck: false,
+			maxRetriesPerRequest: null,
+		};
+		const redis = usesRedisCluster
+			? new Redis.Cluster(
+					clusterNodes.map((node) => ({ host: node.host, port: node.port })),
+					{
+						redisOptions: sharedRedisOptions,
+					},
+			  )
+			: new Redis({
+					host,
+					port,
+					...sharedRedisOptions,
+					retryStrategy: (): number | null => {
+						const now = Date.now();
+						if (now - lastTimer > 30000) {
+							// Means we had no timeout at all or last timeout was temporary and we recovered
+							lastTimer = now;
+							cumulativeTimeout = 0;
+						} else {
+							cumulativeTimeout += now - lastTimer;
+							lastTimer = now;
+							if (cumulativeTimeout > redisConnectionTimeoutLimit) {
+								LoggerProxy.error(
+									`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
+								);
+								process.exit(1);
+							}
+						}
+						return 500;
+					},
+			  });
 
 		redis.on('close', () => {
-			Logger.warn('Redis unavailable - trying to reconnect...');
+			LoggerProxy.warn('Redis unavailable - trying to reconnect...');
 		});
 
 		redis.on('error', (error) => {
 			if (!String(error).includes('ECONNREFUSED')) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-				Logger.warn('Error with Redis: ', error);
+				LoggerProxy.warn('Error with Redis: ', error);
 			}
 		});
 	}
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index e012accd58be0..56d6c9ce97b6c 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -199,4 +199,28 @@ export async function createErrorExecution(
 	await Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
 }
 
+export function getRedisClusterNodes(): Array<{ host: string; port: number }> {
+	const clusterNodePairs = config
+		.getEnv('queue.bull.redis.clusterNodes')
+		.split(',')
+		.filter((e) => e);
+	return clusterNodePairs.map((pair) => {
+		const [host, port] = pair.split(':');
+		return { host, port: parseInt(port) };
+	});
+}
+
+export function getRedisPrefix(): string {
+	let prefix = config.getEnv('queue.bull.prefix');
+	if (prefix && getRedisClusterNodes().length > 0) {
+		if (!prefix.startsWith('{')) {
+			prefix = '{' + prefix;
+		}
+		if (!prefix.endsWith('}')) {
+			prefix += '}';
+		}
+	}
+	return prefix;
+}
+
 export const DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index 1bd7fb5fcf4c0..c1af79b7e0e86 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -1,10 +1,11 @@
 import type Bull from 'bull';
-import type { RedisOptions } from 'ioredis';
+import { type RedisOptions } from 'ioredis';
 import { Service } from 'typedi';
-import type { IExecuteResponsePromiseData } from 'n8n-workflow';
+import { LoggerProxy, type IExecuteResponsePromiseData } from 'n8n-workflow';
 import config from '@/config';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import * as WebhookHelpers from '@/WebhookHelpers';
+import { getRedisClusterNodes, getRedisPrefix } from './GenericHelpers';
 
 export type JobId = Bull.JobId;
 export type Job = Bull.Job<JobData>;
@@ -31,19 +32,54 @@ export class Queue {
 	constructor(private activeExecutions: ActiveExecutions) {}
 
 	async init() {
-		const prefix = config.getEnv('queue.bull.prefix');
-		const redisOptions: RedisOptions = config.getEnv('queue.bull.redis');
-
+		const prefix = getRedisPrefix();
+		const clusterNodes = getRedisClusterNodes();
+		const usesRedisCluster = clusterNodes.length > 0;
+		const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
 		// eslint-disable-next-line @typescript-eslint/naming-convention
 		const { default: Bull } = await import('bull');
-
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		const { default: Redis } = await import('ioredis');
 		// Disabling ready check is necessary as it allows worker to
 		// quickly reconnect to Redis if Redis crashes or is unreachable
 		// for some time. With it enabled, worker might take minutes to realize
 		// redis is back up and resume working.
 		// More here: https://github.com/OptimalBits/bull/issues/890
-		// @ts-ignore
-		this.jobQueue = new Bull('jobs', { prefix, redis: redisOptions, enableReadyCheck: false });
+
+		LoggerProxy.debug(
+			usesRedisCluster
+				? `Initialising Redis cluster connection with nodes: ${clusterNodes
+						.map((e) => `${e.host}:${e.port}`)
+						.join(',')}`
+				: `Initialising Redis client connection with host: ${host ?? 'localhost'} and port: ${
+						port ?? '6379'
+				  }`,
+		);
+		const sharedRedisOptions: RedisOptions = {
+			username,
+			password,
+			db,
+			enableReadyCheck: false,
+			maxRetriesPerRequest: null,
+		};
+		this.jobQueue = new Bull('jobs', {
+			prefix,
+			createClient: (type, clientConfig) =>
+				usesRedisCluster
+					? new Redis.Cluster(
+							clusterNodes.map((node) => ({ host: node.host, port: node.port })),
+							{
+								...clientConfig,
+								redisOptions: sharedRedisOptions,
+							},
+					  )
+					: new Redis({
+							...clientConfig,
+							host,
+							port,
+							...sharedRedisOptions,
+					  }),
+		});
 
 		this.jobQueue.on('global:progress', (jobId, progress: WebhookResponse) => {
 			this.activeExecutions.resolveResponsePromise(
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 1dba9c82c02b7..46639fdbae93c 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -353,9 +353,9 @@ export const schema = {
 		},
 		bull: {
 			prefix: {
-				doc: 'Prefix for all queue keys',
+				doc: 'Prefix for all queue keys (wrap in {} for cluster mode)',
 				format: String,
-				default: '',
+				default: 'bull',
 				env: 'QUEUE_BULL_PREFIX',
 			},
 			redis: {
@@ -395,6 +395,12 @@ export const schema = {
 					default: '',
 					env: 'QUEUE_BULL_REDIS_USERNAME',
 				},
+				clusterNodes: {
+					doc: 'Redis Cluster startup nodes (comma separated list of host:port pairs)',
+					format: String,
+					default: '',
+					env: 'QUEUE_BULL_REDIS_CLUSTER_NODES',
+				},
 			},
 			queueRecoveryInterval: {
 				doc: 'If > 0 enables an active polling to the queue that can recover for Redis crashes. Given in seconds; 0 is disabled. May increase Redis traffic significantly.',

From a4d3eafd38caefba62ca57070fa24a251ee6203f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 24 Jul 2023 11:12:52 +0200
Subject: [PATCH 047/116] fix(editor): Skip error line highlighting if out of
 range (#6721)

---
 .../CodeNodeEditor/CodeNodeEditor.vue         | 19 +++++++++++++++----
 .../src/components/SqlEditor/SqlEditor.vue    | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 31e9a5b6e431d..fb27f721c7716 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -30,7 +30,7 @@ import jsParser from 'prettier/parser-babel';
 import prettier from 'prettier/standalone';
 import { mapStores } from 'pinia';
 import type { LanguageSupport } from '@codemirror/language';
-import type { Extension } from '@codemirror/state';
+import type { Extension, Line } from '@codemirror/state';
 import { Compartment, EditorState } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
 import { EditorView } from '@codemirror/view';
@@ -213,18 +213,29 @@ export default defineComponent({
 				changes: { from: 0, to: this.content.length, insert: this.placeholder },
 			});
 		},
-		highlightLine(line: number | 'final') {
+		line(lineNumber: number): Line | null {
+			try {
+				return this.editor?.state.doc.line(lineNumber) ?? null;
+			} catch {
+				return null;
+			}
+		},
+		highlightLine(lineNumber: number | 'final') {
 			if (!this.editor) return;
 
-			if (line === 'final') {
+			if (lineNumber === 'final') {
 				this.editor.dispatch({
 					selection: { anchor: this.content.length },
 				});
 				return;
 			}
 
+			const line = this.line(lineNumber);
+
+			if (!line) return;
+
 			this.editor.dispatch({
-				selection: { anchor: this.editor.state.doc.line(line).from },
+				selection: { anchor: line.from },
 			});
 		},
 		formatCode() {
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 596cbdb908dd4..77b5c9e8ff0a9 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -17,6 +17,7 @@ import { acceptCompletion, autocompletion, ifNotIn } from '@codemirror/autocompl
 import { indentWithTab, history, redo, toggleComment } from '@codemirror/commands';
 import { bracketMatching, foldGutter, indentOnInput, LanguageSupport } from '@codemirror/language';
 import { EditorState } from '@codemirror/state';
+import type { Line } from '@codemirror/state';
 import type { Extension } from '@codemirror/state';
 import {
 	dropCursor,
@@ -189,18 +190,29 @@ export default defineComponent({
 		onBlur() {
 			this.isFocused = false;
 		},
-		highlightLine(line: number | 'final') {
+		line(lineNumber: number): Line | null {
+			try {
+				return this.editor?.state.doc.line(lineNumber) ?? null;
+			} catch {
+				return null;
+			}
+		},
+		highlightLine(lineNumber: number | 'final') {
 			if (!this.editor) return;
 
-			if (line === 'final') {
+			if (lineNumber === 'final') {
 				this.editor.dispatch({
 					selection: { anchor: this.query.length },
 				});
 				return;
 			}
 
+			const line = this.line(lineNumber);
+
+			if (!line) return;
+
 			this.editor.dispatch({
-				selection: { anchor: this.editor.state.doc.line(line).from },
+				selection: { anchor: line.from },
 			});
 		},
 	},

From 64ea002b46ec5f6bebc5817d1ca70863c4866d91 Mon Sep 17 00:00:00 2001
From: Jordan Hall <Jordan@libertyware.co.uk>
Date: Mon, 24 Jul 2023 11:35:05 +0100
Subject: [PATCH 048/116] fix(AwsS3 Node): Fix issue if bucket name contains a
 '.' (#6542)

---
 .../nodes/Aws/S3/V2/AwsS3V2.node.ts           | 106 ++++++++++--------
 1 file changed, 62 insertions(+), 44 deletions(-)

diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index 67352e1bdc736..6c09d2a900b77 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -215,6 +215,8 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
 					if (operation === 'search') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const returnAll = this.getNodeParameter('returnAll', 0);
 						const additionalFields = this.getNodeParameter('additionalFields', 0);
 
@@ -243,8 +245,7 @@ export class AwsS3V2 implements INodeType {
 						}
 
 						qs['list-type'] = 2;
-
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -254,9 +255,9 @@ export class AwsS3V2 implements INodeType {
 							responseData = await awsApiRequestRESTAllItems.call(
 								this,
 								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
+								servicePath,
 								'GET',
-								'',
+								basePath,
 								'',
 								qs,
 								{},
@@ -267,9 +268,9 @@ export class AwsS3V2 implements INodeType {
 							qs['max-keys'] = this.getNodeParameter('limit', 0);
 							responseData = await awsApiRequestREST.call(
 								this,
-								`${bucketName}.s3`,
+								servicePath,
 								'GET',
-								'',
+								basePath,
 								'',
 								qs,
 								{},
@@ -282,6 +283,7 @@ export class AwsS3V2 implements INodeType {
 							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						returnData.push(...executionData);
 					}
 				}
@@ -289,9 +291,11 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
 					if (operation === 'create') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const folderName = this.getNodeParameter('folderName', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
-						let path = `/${folderName}/`;
+						let path = `${basePath}/${folderName}/`;
 
 						if (additionalFields.requesterPays) {
 							headers['x-amz-request-payer'] = 'requester';
@@ -304,7 +308,7 @@ export class AwsS3V2 implements INodeType {
 								additionalFields.storageClass as string,
 							).toUpperCase();
 						}
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -312,7 +316,7 @@ export class AwsS3V2 implements INodeType {
 
 						responseData = await awsApiRequestREST.call(
 							this,
-							`${bucketName}.s3`,
+							servicePath,
 							'PUT',
 							path,
 							'',
@@ -330,9 +334,11 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
 					if (operation === 'delete') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const folderKey = this.getNodeParameter('folderKey', i) as string;
 
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -341,9 +347,9 @@ export class AwsS3V2 implements INodeType {
 						responseData = await awsApiRequestRESTAllItems.call(
 							this,
 							'ListBucketResult.Contents',
-							`${bucketName}.s3`,
+							servicePath,
 							'GET',
-							'/',
+							basePath,
 							'',
 							{ 'list-type': 2, prefix: folderKey },
 							{},
@@ -355,9 +361,9 @@ export class AwsS3V2 implements INodeType {
 						if (responseData.length === 0) {
 							responseData = await awsApiRequestREST.call(
 								this,
-								`${bucketName}.s3`,
+								servicePath,
 								'DELETE',
-								`/${folderKey}`,
+								`${basePath}/${folderKey}`,
 								'',
 								qs,
 								{},
@@ -393,9 +399,9 @@ export class AwsS3V2 implements INodeType {
 
 							responseData = await awsApiRequestREST.call(
 								this,
-								`${bucketName}.s3`,
+								servicePath,
 								'POST',
-								'/',
+								`${basePath}/`,
 								data,
 								{ delete: '' },
 								headers,
@@ -414,6 +420,8 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
 					if (operation === 'getAll') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const returnAll = this.getNodeParameter('returnAll', 0);
 						const options = this.getNodeParameter('options', 0);
 
@@ -427,7 +435,7 @@ export class AwsS3V2 implements INodeType {
 
 						qs['list-type'] = 2;
 
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -437,9 +445,9 @@ export class AwsS3V2 implements INodeType {
 							responseData = await awsApiRequestRESTAllItems.call(
 								this,
 								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
+								servicePath,
 								'GET',
-								'',
+								basePath,
 								'',
 								qs,
 								{},
@@ -451,9 +459,9 @@ export class AwsS3V2 implements INodeType {
 							responseData = await awsApiRequestRESTAllItems.call(
 								this,
 								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
+								servicePath,
 								'GET',
-								'',
+								basePath,
 								'',
 								qs,
 								{},
@@ -561,10 +569,12 @@ export class AwsS3V2 implements INodeType {
 						const destinationParts = destinationPath.split('/');
 
 						const bucketName = destinationParts[1];
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 
-						const destination = `/${destinationParts.slice(2, destinationParts.length).join('/')}`;
+						const destination = `${basePath}/${destinationParts.slice(2, destinationParts.length).join('/')}`;
 
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -572,7 +582,7 @@ export class AwsS3V2 implements INodeType {
 
 						responseData = await awsApiRequestREST.call(
 							this,
-							`${bucketName}.s3`,
+							servicePath,
 							'PUT',
 							destination,
 							'',
@@ -590,6 +600,8 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
 					if (operation === 'download') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 
 						const fileKey = this.getNodeParameter('fileKey', i) as string;
 
@@ -602,7 +614,7 @@ export class AwsS3V2 implements INodeType {
 							);
 						}
 
-						let region = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						let region = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -610,9 +622,9 @@ export class AwsS3V2 implements INodeType {
 
 						const response = await awsApiRequestREST.call(
 							this,
-							`${bucketName}.s3`,
+							servicePath,
 							'GET',
-							`/${fileKey}`,
+							`${basePath}/${fileKey}`,
 							'',
 							qs,
 							{},
@@ -652,6 +664,8 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html
 					if (operation === 'delete') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 
 						const fileKey = this.getNodeParameter('fileKey', i) as string;
 
@@ -661,7 +675,7 @@ export class AwsS3V2 implements INodeType {
 							qs.versionId = options.versionId as string;
 						}
 
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -669,9 +683,9 @@ export class AwsS3V2 implements INodeType {
 
 						responseData = await awsApiRequestREST.call(
 							this,
-							`${bucketName}.s3`,
+							servicePath,
 							'DELETE',
-							`/${fileKey}`,
+							`${basePath}/${fileKey}`,
 							'',
 							qs,
 							{},
@@ -687,6 +701,8 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
 					if (operation === 'getAll') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const returnAll = this.getNodeParameter('returnAll', 0);
 						const options = this.getNodeParameter('options', 0);
 
@@ -702,7 +718,7 @@ export class AwsS3V2 implements INodeType {
 
 						qs['list-type'] = 2;
 
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 
@@ -712,9 +728,9 @@ export class AwsS3V2 implements INodeType {
 							responseData = await awsApiRequestRESTAllItems.call(
 								this,
 								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
+								servicePath,
 								'GET',
-								'',
+								basePath,
 								'',
 								qs,
 								{},
@@ -726,9 +742,9 @@ export class AwsS3V2 implements INodeType {
 							responseData = await awsApiRequestRESTAllItems.call(
 								this,
 								'ListBucketResult.Contents',
-								`${bucketName}.s3`,
+								servicePath,
 								'GET',
-								'',
+								basePath,
 								'',
 								qs,
 								{},
@@ -754,12 +770,14 @@ export class AwsS3V2 implements INodeType {
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
 					if (operation === 'upload') {
 						const bucketName = this.getNodeParameter('bucketName', i) as string;
+						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
+						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 						const fileName = this.getNodeParameter('fileName', i) as string;
 						const isBinaryData = this.getNodeParameter('binaryData', i);
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						const tagsValues = (this.getNodeParameter('tagsUi', i) as IDataObject)
 							.tagsValues as IDataObject[];
-						let path = '';
+						let path = `${basePath}/`;
 						let body;
 
 						const multipartHeaders: IDataObject = {};
@@ -839,7 +857,7 @@ export class AwsS3V2 implements INodeType {
 							multipartHeaders['x-amz-tagging'] = tags.join('&');
 						}
 						// Get the region of the bucket
-						responseData = await awsApiRequestREST.call(this, `${bucketName}.s3`, 'GET', '', '', {
+						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
 						});
 						const region = responseData.LocationConstraint._;
@@ -853,7 +871,7 @@ export class AwsS3V2 implements INodeType {
 								uploadData = this.helpers.getBinaryStream(binaryPropertyData.id, UPLOAD_CHUNK_SIZE);
 								const createMultiPartUpload = await awsApiRequestREST.call(
 									this,
-									`${bucketName}.s3`,
+									servicePath,
 									'POST',
 									`/${path}?uploads`,
 									body,
@@ -875,7 +893,7 @@ export class AwsS3V2 implements INodeType {
 									try {
 										await awsApiRequestREST.call(
 											this,
-											`${bucketName}.s3`,
+											servicePath,
 											'PUT',
 											`/${path}?partNumber=${part}&uploadId=${uploadId}`,
 											chunk,
@@ -889,7 +907,7 @@ export class AwsS3V2 implements INodeType {
 										try {
 											await awsApiRequestREST.call(
 												this,
-												`${bucketName}.s3`,
+												servicePath,
 												'DELETE',
 												`/${path}?uploadId=${uploadId}`,
 											);
@@ -902,7 +920,7 @@ export class AwsS3V2 implements INodeType {
 
 								const listParts = (await awsApiRequestREST.call(
 									this,
-									`${bucketName}.s3`,
+									servicePath,
 									'GET',
 									`/${path}?max-parts=${900}&part-number-marker=0&uploadId=${uploadId}`,
 									'',
@@ -954,7 +972,7 @@ export class AwsS3V2 implements INodeType {
 								const data = builder.buildObject(body);
 								const completeUpload = (await awsApiRequestREST.call(
 									this,
-									`${bucketName}.s3`,
+									servicePath,
 									'POST',
 									`/${path}?uploadId=${uploadId}`,
 									data,
@@ -991,7 +1009,7 @@ export class AwsS3V2 implements INodeType {
 
 								responseData = await awsApiRequestREST.call(
 									this,
-									`${bucketName}.s3`,
+									servicePath,
 									'PUT',
 									`/${path || binaryPropertyData.fileName}`,
 									body,
@@ -1019,7 +1037,7 @@ export class AwsS3V2 implements INodeType {
 
 							responseData = await awsApiRequestREST.call(
 								this,
-								`${bucketName}.s3`,
+								servicePath,
 								'PUT',
 								`/${path}`,
 								body,

From f68a7796f84a0a3bcf3f84c9a1bcaf178a13874c Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Mon, 24 Jul 2023 15:38:37 +0200
Subject: [PATCH 049/116] test(editor): Add canvas actions E2E tests (#6723)

* test(editor): Add canvas actions E2E tests

* test(editor): Open category items in node creator when category dropped on canvas

* test(editor): Have new position counted only once in drag

* test(editor): rename test
---
 cypress/e2e/12-canvas-actions.cy.ts           | 36 +++++++++++++++++++
 cypress/pages/workflow.ts                     |  3 ++
 cypress/support/commands.ts                   | 32 +++++++++++------
 cypress/support/index.ts                      |  2 +-
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |  4 +++
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index d336294f48c53..3f23f90484e59 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -78,6 +78,42 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 	});
 
+	it('should add a connected node dragging from node creator', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		cy.get('.plus-endpoint').should('be.visible').click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
+		cy.drag(
+			WorkflowPage.getters.nodeCreatorNodeItems().first(),
+			[100, 100],
+			{
+				realMouse: true,
+				abs: true
+			}
+		);
+		cy.get('body').type('{esc}');
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+	});
+
+	it('should open a category when trying to drag and drop it on the canvas', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		cy.get('.plus-endpoint').should('be.visible').click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
+		cy.drag(
+			WorkflowPage.getters.nodeCreatorActionItems().first(),
+			[100, 100],
+			{
+				realMouse: true,
+				abs: true
+			}
+		);
+		WorkflowPage.getters.nodeCreatorCategoryItems().its('length').should('be.gt', 0);
+		WorkflowPage.getters.canvasNodes().should('have.length', 1);
+		WorkflowPage.getters.nodeConnections().should('have.length', 0);
+	});
+
 	it('should add disconnected node if nothing is selected', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		// Deselect nodes
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index d324314dcc2d0..e269ce09fd8c9 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -96,6 +96,9 @@ export class WorkflowPage extends BasePage {
 		nodeCredentialsSelect: () => cy.getByTestId('node-credentials-select'),
 		nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'),
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
+		nodeCreatorNodeItems: () => cy.getByTestId('node-creator-node-item'),
+		nodeCreatorActionItems: () => cy.getByTestId('node-creator-action-item'),
+		nodeCreatorCategoryItems: () => cy.getByTestId('node-creator-category-item'),
 		ndvParameters: () => cy.getByTestId('parameter-item'),
 		nodeCredentialsLabel: () => cy.getByTestId('credentials-label'),
 		getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 6c7adaea8f84b..812404ff7ad53 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -103,19 +103,31 @@ Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) =>
 Cypress.Commands.add('drag', (selector, pos, options) => {
 	const index = options?.index || 0;
 	const [xDiff, yDiff] = pos;
-	const element = cy.get(selector).eq(index);
+	const element = typeof selector === 'string' ? cy.get(selector).eq(index) : selector;
 	element.should('exist');
 
-	const originalLocation = Cypress.$(selector)[index].getBoundingClientRect();
-
-	element.trigger('mousedown', { force: true });
-	element.trigger('mousemove', {
-		which: 1,
-		pageX: options?.abs ? xDiff : originalLocation.right + xDiff,
-		pageY: options?.abs ? yDiff : originalLocation.top + yDiff,
-		force: true,
+	element.then(([$el]) => {
+		const originalLocation = $el.getBoundingClientRect();
+		const newPosition = {
+			x: options?.abs ? xDiff : originalLocation.x + xDiff,
+			y: options?.abs ? yDiff : originalLocation.y + yDiff,
+		}
+
+		if(options?.realMouse) {
+			element.realMouseDown();
+			element.realMouseMove(newPosition.x, newPosition.y);
+			element.realMouseUp();
+		} else {
+			element.trigger('mousedown', {force: true});
+			element.trigger('mousemove', {
+				which: 1,
+				pageX: newPosition.x,
+				pageY: newPosition.y,
+				force: true,
+			});
+			element.trigger('mouseup', {force: true});
+		}
 	});
-	element.trigger('mouseup', { force: true });
 });
 
 Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 196a14d9ec083..f1602b3e06989 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -31,7 +31,7 @@ declare global {
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
-			drag(selector: string, target: [number, number], options?: {abs?: true, index?: number}): void;
+			drag(selector: string | Cypress.Chainable<JQuery<HTMLElement>>, target: [number, number], options?: {abs?: boolean, index?: number, realMouse?: boolean}): void;
 			draganddrop(draggableSelector: string, droppableSelector: string): void;
 		}
 	}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index dd5a427f17ec2..8554a1a080a68 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -9,6 +9,7 @@
 		:title="displayName"
 		:show-action-arrow="showActionArrow"
 		:is-trigger="isTrigger"
+		:data-test-id="dataTestId"
 	>
 		<template #icon>
 			<node-icon :nodeType="nodeType" />
@@ -74,6 +75,9 @@ const description = computed<string>(() => {
 	}) as string;
 });
 const showActionArrow = computed(() => hasActions.value);
+const dataTestId = computed(() =>
+	hasActions.value ? 'node-creator-action-item' : 'node-creator-node-item',
+);
 
 const hasActions = computed(() => {
 	return nodeActions.value.length > 1;

From 88e54e61b76af524fda2871ec22df3d4a7c96db4 Mon Sep 17 00:00:00 2001
From: qg-horie <36725144+qg-horie@users.noreply.github.com>
Date: Mon, 24 Jul 2023 23:01:49 +0900
Subject: [PATCH 050/116] feat(Rundeck Node): Add support for node filters 
 (#5633)

---
 .../nodes-base/nodes/Rundeck/Rundeck.node.ts   | 18 +++++++++++++++++-
 .../nodes-base/nodes/Rundeck/RundeckApi.ts     |  9 +++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 1ad253620fa83..1f9d76c53c9c8 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -119,6 +119,21 @@ export class Rundeck implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'Filter',
+				name: 'filter',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: ['execute'],
+						resource: ['job'],
+					},
+				},
+				default: '',
+				placeholder: 'Add Filters',
+				required: false,
+				description: 'Filter Rundeck nodes by name',
+			},
 
 			// ----------------------------------
 			//         job:getMetadata
@@ -161,7 +176,8 @@ export class Rundeck implements INodeType {
 					const jobid = this.getNodeParameter('jobid', i) as string;
 					const rundeckArguments = (this.getNodeParameter('arguments', i) as IDataObject)
 						.arguments as IDataObject[];
-					const response = await rundeckApi.executeJob(jobid, rundeckArguments);
+					const filter = this.getNodeParameter('filter', i) as string;
+					const response = await rundeckApi.executeJob(jobid, rundeckArguments, filter);
 
 					returnData.push(response);
 				} else if (operation === 'getMetadata') {
diff --git a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
index fe85acde4eac7..ff2cb11e6ff48 100644
--- a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
+++ b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
@@ -49,7 +49,7 @@ export class RundeckApi {
 		this.credentials = credentials as unknown as RundeckCredentials;
 	}
 
-	async executeJob(jobId: string, args: IDataObject[]): Promise<IDataObject> {
+	async executeJob(jobId: string, args: IDataObject[], filter?: string): Promise<IDataObject> {
 		let params = '';
 
 		if (args) {
@@ -62,7 +62,12 @@ export class RundeckApi {
 			argString: params,
 		};
 
-		return this.request('POST', `/api/14/job/${jobId}/run`, body, {});
+		const query: IDataObject = {};
+		if (filter) {
+			query.filter = filter;
+		}
+
+		return this.request('POST', `/api/14/job/${jobId}/run`, body, query);
 	}
 
 	async getJobMetadata(jobId: string): Promise<IDataObject> {

From cddd47e84a2cec2e864117d26b9f71275885a1b2 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 24 Jul 2023 17:29:38 +0300
Subject: [PATCH 051/116] fix(Gmail Trigger Node): Early returns in case of no
 data (#6727)

---
 .../nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index 83c89147fce04..40b1f28484281 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -257,8 +257,9 @@ export class GmailTrigger implements INodeType {
 			);
 			responseData = responseData.messages;
 
-			if (responseData === undefined) {
-				responseData = [];
+			if (!responseData?.length) {
+				webhookData.lastTimeChecked = endDate;
+				return null;
 			}
 
 			const simple = this.getNodeParameter('simple') as boolean;
@@ -312,6 +313,11 @@ export class GmailTrigger implements INodeType {
 			);
 		}
 
+		if (!responseData?.length) {
+			webhookData.lastTimeChecked = endDate;
+			return null;
+		}
+
 		const getEmailDateAsSeconds = (email: IDataObject) => {
 			const { internalDate, date } = email;
 			return internalDate

From 4e09ae10246f1ff4e79474fd22f0af2abf8c628d Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Mon, 24 Jul 2023 17:40:17 -0400
Subject: [PATCH 052/116] fix(core): Use JWT as reset password token (#6714)

* use jwt to reset password

* increase expiration time to 1d

* drop user id query string

* refactor

* use service instead of package in tests

* sqlite migration

* postgres migration

* mysql migration

* remove unused properties

* remove userId from FE

* fix test for users.api

* move migration to the common folder

* move type assertion to the jwt.service

* Add jwt secret as a readonly property

* use signData instead of sign in user.controller

* remove base class

* remove base class

* add tests
---
 packages/cli/src/Server.ts                    |  4 +
 .../UserManagement/UserManagementHelper.ts    | 10 +--
 packages/cli/src/auth/jwt.ts                  |  1 -
 .../controllers/passwordReset.controller.ts   | 85 ++++++++++++-------
 .../cli/src/controllers/users.controller.ts   | 18 +++-
 packages/cli/src/databases/entities/User.ts   |  7 --
 ...690000000030-RemoveResetPasswordColumns.ts | 29 +++++++
 .../src/databases/migrations/mysqldb/index.ts |  2 +
 .../databases/migrations/postgresdb/index.ts  |  2 +
 .../src/databases/migrations/sqlite/index.ts  |  2 +
 packages/cli/src/services/jwt.service.ts      | 18 ++++
 packages/cli/src/user/user.service.ts         | 15 +---
 .../integration/passwordReset.api.test.ts     | 62 +++-----------
 .../integration/shared/utils/testServer.ts    |  4 +
 .../cli/test/integration/users.api.test.ts    |  8 +-
 .../test/unit/services/jwt.service.test.ts    | 42 +++++++++
 packages/editor-ui/src/api/users.ts           |  4 +-
 packages/editor-ui/src/stores/users.store.ts  |  8 +-
 .../src/views/ChangePasswordView.vue          | 34 +++-----
 19 files changed, 209 insertions(+), 146 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
 create mode 100644 packages/cli/src/services/jwt.service.ts
 create mode 100644 packages/cli/test/unit/services/jwt.service.test.ts

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 160aac85bb8fa..855d48dde6f87 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -169,6 +169,7 @@ import { SourceControlService } from '@/environments/sourceControl/sourceControl
 import { SourceControlController } from '@/environments/sourceControl/sourceControl.controller.ee';
 import { ExecutionRepository } from '@db/repositories';
 import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import { JwtService } from './services/jwt.service';
 
 const exec = promisify(callbackExec);
 
@@ -466,6 +467,7 @@ export class Server extends AbstractServer {
 		const internalHooks = Container.get(InternalHooks);
 		const mailer = Container.get(UserManagementMailer);
 		const postHog = this.postHog;
+		const jwtService = Container.get(JwtService);
 
 		const controllers: object[] = [
 			new EventBusController(),
@@ -480,6 +482,7 @@ export class Server extends AbstractServer {
 				mailer,
 				repositories,
 				logger,
+				jwtService,
 			}),
 			new TagsController({ config, repositories, externalHooks }),
 			new TranslationController(config, this.credentialTypes),
@@ -492,6 +495,7 @@ export class Server extends AbstractServer {
 				activeWorkflowRunner,
 				logger,
 				postHog,
+				jwtService,
 			}),
 
 			Container.get(SamlController),
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
index 1f5a3c09aadbc..6b23f1207ce6d 100644
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -111,15 +111,7 @@ export function validatePassword(password?: string): string {
  * Remove sensitive properties from the user to return to the client.
  */
 export function sanitizeUser(user: User, withoutKeys?: string[]): PublicUser {
-	const {
-		password,
-		resetPasswordToken,
-		resetPasswordTokenExpiration,
-		updatedAt,
-		apiKey,
-		authIdentities,
-		...rest
-	} = user;
+	const { password, updatedAt, apiKey, authIdentities, ...rest } = user;
 	if (withoutKeys) {
 		withoutKeys.forEach((key) => {
 			// @ts-ignore
diff --git a/packages/cli/src/auth/jwt.ts b/packages/cli/src/auth/jwt.ts
index 1fb305cfe62b2..3c80c1d865a51 100644
--- a/packages/cli/src/auth/jwt.ts
+++ b/packages/cli/src/auth/jwt.ts
@@ -38,7 +38,6 @@ export function issueJWT(user: User): JwtToken {
 
 	const signedToken = jwt.sign(payload, config.getEnv('userManagement.jwtSecret'), {
 		expiresIn: expiresIn / 1000 /* in seconds */,
-		algorithm: 'HS256',
 	});
 
 	return {
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index afb4bf69a5a7e..16aef76648e2c 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -1,4 +1,4 @@
-import { IsNull, MoreThanOrEqual, Not } from 'typeorm';
+import { IsNull, Not } from 'typeorm';
 import validator from 'validator';
 import { Get, Post, RestController } from '@/decorators';
 import {
@@ -28,6 +28,8 @@ import { UserService } from '@/user/user.service';
 import { License } from '@/License';
 import { Container } from 'typedi';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { TokenExpiredError } from 'jsonwebtoken';
+import type { JwtService, JwtPayload } from '@/services/jwt.service';
 
 @RestController()
 export class PasswordResetController {
@@ -43,6 +45,8 @@ export class PasswordResetController {
 
 	private readonly userRepository: UserRepository;
 
+	private readonly jwtService: JwtService;
+
 	constructor({
 		config,
 		logger,
@@ -50,6 +54,7 @@ export class PasswordResetController {
 		internalHooks,
 		mailer,
 		repositories,
+		jwtService,
 	}: {
 		config: Config;
 		logger: ILogger;
@@ -57,6 +62,7 @@ export class PasswordResetController {
 		internalHooks: IInternalHooksClass;
 		mailer: UserManagementMailer;
 		repositories: Pick<IDatabaseCollections, 'User'>;
+		jwtService: JwtService;
 	}) {
 		this.config = config;
 		this.logger = logger;
@@ -64,6 +70,7 @@ export class PasswordResetController {
 		this.internalHooks = internalHooks;
 		this.mailer = mailer;
 		this.userRepository = repositories.User;
+		this.jwtService = jwtService;
 	}
 
 	/**
@@ -139,7 +146,15 @@ export class PasswordResetController {
 
 		const baseUrl = getInstanceBaseUrl();
 		const { id, firstName, lastName } = user;
-		const url = await UserService.generatePasswordResetUrl(user);
+
+		const resetPasswordToken = this.jwtService.signData(
+			{ sub: id },
+			{
+				expiresIn: '1d',
+			},
+		);
+
+		const url = await UserService.generatePasswordResetUrl(baseUrl, resetPasswordToken);
 
 		try {
 			await this.mailer.passwordReset({
@@ -175,11 +190,11 @@ export class PasswordResetController {
 	 */
 	@Get('/resolve-password-token')
 	async resolvePasswordToken(req: PasswordResetRequest.Credentials) {
-		const { token: resetPasswordToken, userId: id } = req.query;
+		const { token: resetPasswordToken } = req.query;
 
-		if (!resetPasswordToken || !id) {
+		if (!resetPasswordToken) {
 			this.logger.debug(
-				'Request to resolve password token failed because of missing password reset token or user ID in query string',
+				'Request to resolve password token failed because of missing password reset token',
 				{
 					queryString: req.query,
 				},
@@ -187,47 +202,46 @@ export class PasswordResetController {
 			throw new BadRequestError('');
 		}
 
-		// Timestamp is saved in seconds
-		const currentTimestamp = Math.floor(Date.now() / 1000);
+		const decodedToken = this.verifyResetPasswordToken(resetPasswordToken);
 
 		const user = await this.userRepository.findOne({
 			where: {
-				id,
-				resetPasswordToken,
-				resetPasswordTokenExpiration: MoreThanOrEqual(currentTimestamp),
+				id: decodedToken.sub,
 			},
 			relations: ['globalRole'],
 		});
+
 		if (!user?.isOwner && !Container.get(License).isWithinUsersLimit()) {
 			this.logger.debug(
 				'Request to resolve password token failed because the user limit was reached',
-				{ userId: id },
+				{ userId: decodedToken.sub },
 			);
 			throw new UnauthorizedError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 		}
+
 		if (!user) {
 			this.logger.debug(
-				'Request to resolve password token failed because no user was found for the provided user ID and reset password token',
+				'Request to resolve password token failed because no user was found for the provided user ID',
 				{
-					userId: id,
+					userId: decodedToken.sub,
 					resetPasswordToken,
 				},
 			);
 			throw new NotFoundError('');
 		}
 
-		this.logger.info('Reset-password token resolved successfully', { userId: id });
+		this.logger.info('Reset-password token resolved successfully', { userId: user.id });
 		void this.internalHooks.onUserPasswordResetEmailClick({ user });
 	}
 
 	/**
-	 * Verify password reset token and user ID and update password.
+	 * Verify password reset token and update password.
 	 */
 	@Post('/change-password')
 	async changePassword(req: PasswordResetRequest.NewPassword, res: Response) {
-		const { token: resetPasswordToken, userId, password } = req.body;
+		const { token: resetPasswordToken, password } = req.body;
 
-		if (!resetPasswordToken || !userId || !password) {
+		if (!resetPasswordToken || !password) {
 			this.logger.debug(
 				'Request to change password failed because of missing user ID or password or reset password token in payload',
 				{
@@ -239,23 +253,17 @@ export class PasswordResetController {
 
 		const validPassword = validatePassword(password);
 
-		// Timestamp is saved in seconds
-		const currentTimestamp = Math.floor(Date.now() / 1000);
+		const decodedToken = this.verifyResetPasswordToken(resetPasswordToken);
 
 		const user = await this.userRepository.findOne({
-			where: {
-				id: userId,
-				resetPasswordToken,
-				resetPasswordTokenExpiration: MoreThanOrEqual(currentTimestamp),
-			},
+			where: { id: decodedToken.sub },
 			relations: ['authIdentities'],
 		});
 
 		if (!user) {
 			this.logger.debug(
-				'Request to resolve password token failed because no user was found for the provided user ID and reset password token',
+				'Request to resolve password token failed because no user was found for the provided user ID',
 				{
-					userId,
 					resetPasswordToken,
 				},
 			);
@@ -264,13 +272,11 @@ export class PasswordResetController {
 
 		const passwordHash = await hashPassword(validPassword);
 
-		await this.userRepository.update(userId, {
+		await this.userRepository.update(user.id, {
 			password: passwordHash,
-			resetPasswordToken: null,
-			resetPasswordTokenExpiration: null,
 		});
 
-		this.logger.info('User password updated successfully', { userId });
+		this.logger.info('User password updated successfully', { userId: user.id });
 
 		await issueCookie(res, user);
 
@@ -290,4 +296,23 @@ export class PasswordResetController {
 
 		await this.externalHooks.run('user.password.update', [user.email, passwordHash]);
 	}
+
+	private verifyResetPasswordToken(resetPasswordToken: string) {
+		let decodedToken: JwtPayload;
+		try {
+			decodedToken = this.jwtService.verifyToken(resetPasswordToken);
+			return decodedToken;
+		} catch (e) {
+			if (e instanceof TokenExpiredError) {
+				this.logger.debug('Reset password token expired', {
+					resetPasswordToken,
+				});
+				throw new NotFoundError('');
+			}
+			this.logger.debug('Error verifying token', {
+				resetPasswordToken,
+			});
+			throw new BadRequestError('');
+		}
+	}
 }
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index d97aa55fd433e..cef9e9fa7156f 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -49,6 +49,7 @@ import { plainToInstance } from 'class-transformer';
 import { License } from '@/License';
 import { Container } from 'typedi';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import type { JwtService } from '@/services/jwt.service';
 
 @Authorized(['global', 'owner'])
 @RestController('/users')
@@ -73,6 +74,8 @@ export class UsersController {
 
 	private mailer: UserManagementMailer;
 
+	private jwtService: JwtService;
+
 	private postHog?: PostHogClient;
 
 	constructor({
@@ -83,6 +86,7 @@ export class UsersController {
 		repositories,
 		activeWorkflowRunner,
 		mailer,
+		jwtService,
 		postHog,
 	}: {
 		config: Config;
@@ -95,6 +99,7 @@ export class UsersController {
 		>;
 		activeWorkflowRunner: ActiveWorkflowRunner;
 		mailer: UserManagementMailer;
+		jwtService: JwtService;
 		postHog?: PostHogClient;
 	}) {
 		this.config = config;
@@ -107,6 +112,7 @@ export class UsersController {
 		this.sharedWorkflowRepository = repositories.SharedWorkflow;
 		this.activeWorkflowRunner = activeWorkflowRunner;
 		this.mailer = mailer;
+		this.jwtService = jwtService;
 		this.postHog = postHog;
 	}
 
@@ -382,7 +388,17 @@ export class UsersController {
 		if (!user) {
 			throw new NotFoundError('User not found');
 		}
-		const link = await UserService.generatePasswordResetUrl(user);
+
+		const resetPasswordToken = this.jwtService.signData(
+			{ sub: user.id },
+			{
+				expiresIn: '1d',
+			},
+		);
+
+		const baseUrl = getInstanceBaseUrl();
+
+		const link = await UserService.generatePasswordResetUrl(baseUrl, resetPasswordToken);
 		return {
 			link,
 		};
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index 1ee1570f8f2ef..029275902ff31 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -55,13 +55,6 @@ export class User extends AbstractEntity implements IUser {
 	@IsString({ message: 'Password must be of type string.' })
 	password: string;
 
-	@Column({ type: String, nullable: true })
-	resetPasswordToken?: string | null;
-
-	// Expiration timestamp saved in seconds
-	@Column({ type: Number, nullable: true })
-	resetPasswordTokenExpiration?: number | null;
-
 	@Column({
 		type: jsonColumnType,
 		nullable: true,
diff --git a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
new file mode 100644
index 0000000000000..73f572c1685e2
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
@@ -0,0 +1,29 @@
+import type { MigrationContext, ReversibleMigration } from '@db/types';
+import { TableColumn } from 'typeorm';
+
+export class RemoveResetPasswordColumns1690000000030 implements ReversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.dropColumn(`${tablePrefix}user`, 'resetPasswordToken');
+		await queryRunner.dropColumn(`${tablePrefix}user`, 'resetPasswordTokenExpiration');
+	}
+
+	async down({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.addColumn(
+			`${tablePrefix}user`,
+			new TableColumn({
+				name: 'resetPasswordToken',
+				type: 'varchar',
+				isNullable: true,
+			}),
+		);
+
+		await queryRunner.addColumn(
+			`${tablePrefix}user`,
+			new TableColumn({
+				name: 'resetPasswordTokenExpiration',
+				type: 'int',
+				isNullable: true,
+			}),
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 18e666a1454e2..c450adf946bfa 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -42,6 +42,7 @@ import { MigrateIntegerKeysToString1690000000001 } from './1690000000001-Migrate
 import { SeparateExecutionData1690000000030 } from './1690000000030-SeparateExecutionData';
 import { FixExecutionDataType1690000000031 } from './1690000000031-FixExecutionDataType';
 import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
+import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -87,4 +88,5 @@ export const mysqlMigrations: Migration[] = [
 	SeparateExecutionData1690000000030,
 	FixExecutionDataType1690000000031,
 	RemoveSkipOwnerSetup1681134145997,
+	RemoveResetPasswordColumns1690000000030,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 460c33213c554..53066755a9a21 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -39,6 +39,7 @@ import { AddUserActivatedProperty1681134145996 } from './1681134145996-AddUserAc
 import { MigrateIntegerKeysToString1690000000000 } from './1690000000000-MigrateIntegerKeysToString';
 import { SeparateExecutionData1690000000020 } from './1690000000020-SeparateExecutionData';
 import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
+import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -81,4 +82,5 @@ export const postgresMigrations: Migration[] = [
 	MigrateIntegerKeysToString1690000000000,
 	SeparateExecutionData1690000000020,
 	RemoveSkipOwnerSetup1681134145997,
+	RemoveResetPasswordColumns1690000000030,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index f23ce876655cb..b5f554107a268 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -39,6 +39,7 @@ import { MigrateIntegerKeysToString1690000000002 } from './1690000000002-Migrate
 import { SeparateExecutionData1690000000010 } from './1690000000010-SeparateExecutionData';
 import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
 import { FixMissingIndicesFromStringIdMigration1690000000020 } from './1690000000020-FixMissingIndicesFromStringIdMigration';
+import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -81,6 +82,7 @@ const sqliteMigrations: Migration[] = [
 	SeparateExecutionData1690000000010,
 	RemoveSkipOwnerSetup1681134145997,
 	FixMissingIndicesFromStringIdMigration1690000000020,
+	RemoveResetPasswordColumns1690000000030,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/services/jwt.service.ts b/packages/cli/src/services/jwt.service.ts
new file mode 100644
index 0000000000000..094b595d8d832
--- /dev/null
+++ b/packages/cli/src/services/jwt.service.ts
@@ -0,0 +1,18 @@
+import { Service } from 'typedi';
+import * as jwt from 'jsonwebtoken';
+import config from '@/config';
+
+@Service()
+export class JwtService {
+	private readonly userManagementSecret = config.getEnv('userManagement.jwtSecret');
+
+	public signData(payload: object, options: jwt.SignOptions = {}): string {
+		return jwt.sign(payload, this.userManagementSecret, options);
+	}
+
+	public verifyToken(token: string, options: jwt.VerifyOptions = {}) {
+		return jwt.verify(token, this.userManagementSecret, options) as jwt.JwtPayload;
+	}
+}
+
+export type JwtPayload = jwt.JwtPayload;
diff --git a/packages/cli/src/user/user.service.ts b/packages/cli/src/user/user.service.ts
index 6183a97e59d59..cb04758e3b931 100644
--- a/packages/cli/src/user/user.service.ts
+++ b/packages/cli/src/user/user.service.ts
@@ -1,10 +1,8 @@
 import type { EntityManager, FindOptionsWhere } from 'typeorm';
 import { In } from 'typeorm';
-import { v4 as uuid } from 'uuid';
 import * as Db from '@/Db';
 import { User } from '@db/entities/User';
 import type { IUserSettings } from 'n8n-workflow';
-import { getInstanceBaseUrl } from '../UserManagement/UserManagementHelper';
 
 export class UserService {
 	static async get(where: FindOptionsWhere<User>): Promise<User | null> {
@@ -25,16 +23,9 @@ export class UserService {
 		return Db.collections.User.update(id, { settings: { ...currentSettings, ...userSettings } });
 	}
 
-	static async generatePasswordResetUrl(user: User): Promise<string> {
-		user.resetPasswordToken = uuid();
-		const { id, resetPasswordToken } = user;
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 7200;
-		await Db.collections.User.update(id, { resetPasswordToken, resetPasswordTokenExpiration });
-
-		const baseUrl = getInstanceBaseUrl();
-		const url = new URL(`${baseUrl}/change-password`);
-		url.searchParams.append('userId', id);
-		url.searchParams.append('token', resetPasswordToken);
+	static async generatePasswordResetUrl(instanceBaseUrl: string, token: string): Promise<string> {
+		const url = new URL(`${instanceBaseUrl}/change-password`);
+		url.searchParams.append('token', token);
 		return url.toString();
 	}
 }
diff --git a/packages/cli/test/integration/passwordReset.api.test.ts b/packages/cli/test/integration/passwordReset.api.test.ts
index 0e9e345cc6dc8..61a7c891f5df2 100644
--- a/packages/cli/test/integration/passwordReset.api.test.ts
+++ b/packages/cli/test/integration/passwordReset.api.test.ts
@@ -10,13 +10,17 @@ import {
 	randomEmail,
 	randomInvalidPassword,
 	randomName,
+	randomString,
 	randomValidPassword,
 } from './shared/random';
 import * as testDb from './shared/testDb';
 import { setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
+import { JwtService } from '@/services/jwt.service';
+import { Container } from 'typedi';
 
 jest.mock('@/UserManagement/email/NodeMailer');
+config.set('userManagement.jwtSecret', randomString(5, 10));
 
 let globalOwnerRole: Role;
 let globalMemberRole: Role;
@@ -24,6 +28,7 @@ let owner: User;
 
 const externalHooks = utils.mockInstance(ExternalHooks);
 const testServer = utils.setupTestServer({ endpointGroups: ['passwordReset'] });
+const jwtService = Container.get(JwtService);
 
 beforeAll(async () => {
 	globalOwnerRole = await testDb.getGlobalOwnerRole();
@@ -51,10 +56,6 @@ describe('POST /forgot-password', () => {
 
 				expect(response.statusCode).toBe(200);
 				expect(response.body).toEqual({});
-
-				const user = await Db.collections.User.findOneByOrFail({ email: payload.email });
-				expect(user.resetPasswordToken).toBeDefined();
-				expect(user.resetPasswordTokenExpiration).toBeGreaterThan(Math.ceil(Date.now() / 1000));
 			}),
 		);
 	});
@@ -66,9 +67,6 @@ describe('POST /forgot-password', () => {
 			.post('/forgot-password')
 			.send({ email: owner.email })
 			.expect(500);
-
-		const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
-		expect(storedOwner.resetPasswordToken).toBeNull();
 	});
 
 	test('should fail if SAML is authentication method', async () => {
@@ -84,8 +82,6 @@ describe('POST /forgot-password', () => {
 			.send({ email: member.email })
 			.expect(403);
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ email: member.email });
-		expect(storedOwner.resetPasswordToken).toBeNull();
 		await setCurrentAuthenticationMethod('email');
 	});
 
@@ -100,8 +96,6 @@ describe('POST /forgot-password', () => {
 		expect(response.statusCode).toBe(200);
 		expect(response.body).toEqual({});
 
-		const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
-		expect(storedOwner.resetPasswordToken).not.toBeNull();
 		await setCurrentAuthenticationMethod('email');
 	});
 
@@ -119,9 +113,6 @@ describe('POST /forgot-password', () => {
 		for (const invalidPayload of invalidPayloads) {
 			const response = await testServer.authlessAgent.post('/forgot-password').send(invalidPayload);
 			expect(response.statusCode).toBe(400);
-
-			const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
-			expect(storedOwner.resetPasswordToken).toBeNull();
 		}
 	});
 
@@ -142,13 +133,7 @@ describe('GET /resolve-password-token', () => {
 	});
 
 	test('should succeed with valid inputs', async () => {
-		const resetPasswordToken = uuid();
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 100;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const resetPasswordToken = jwtService.signData({ sub: owner.id });
 
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
@@ -172,21 +157,17 @@ describe('GET /resolve-password-token', () => {
 	});
 
 	test('should fail if user is not found', async () => {
+		const token = jwtService.signData({ sub: 'test' });
+
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
-			.query({ userId: owner.id, token: uuid() });
+			.query({ userId: owner.id, token });
 
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should fail if token is expired', async () => {
-		const resetPasswordToken = uuid();
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) - 1;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const resetPasswordToken = jwtService.signData({ sub: owner.id }, { expiresIn: '-1h' });
 
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
@@ -197,17 +178,10 @@ describe('GET /resolve-password-token', () => {
 });
 
 describe('POST /change-password', () => {
-	const resetPasswordToken = uuid();
 	const passwordToStore = randomValidPassword();
 
 	test('should succeed with valid inputs', async () => {
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 100;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
-
+		const resetPasswordToken = jwtService.signData({ sub: owner.id });
 		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
 			userId: owner.id,
@@ -234,12 +208,7 @@ describe('POST /change-password', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) + 100;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const resetPasswordToken = jwtService.signData({ sub: owner.id });
 
 		const invalidPayloads = [
 			{ token: uuid() },
@@ -272,12 +241,7 @@ describe('POST /change-password', () => {
 	});
 
 	test('should fail when token has expired', async () => {
-		const resetPasswordTokenExpiration = Math.floor(Date.now() / 1000) - 1;
-
-		await Db.collections.User.update(owner.id, {
-			resetPasswordToken,
-			resetPasswordTokenExpiration,
-		});
+		const resetPasswordToken = jwtService.signData({ sub: owner.id }, { expiresIn: '-1h' });
 
 		const response = await testServer.authlessAgent.post('/change-password').send({
 			token: resetPasswordToken,
diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts
index ac7f8076b6307..cf86bcda6be33 100644
--- a/packages/cli/test/integration/shared/utils/testServer.ts
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -50,6 +50,7 @@ import * as testDb from '../../shared/testDb';
 import { AUTHLESS_ENDPOINTS, PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants';
 import type { EndpointGroup, SetupProps, TestServer } from '../types';
 import { mockInstance } from './mocking';
+import { JwtService } from '@/services/jwt.service';
 
 /**
  * Plugin to prefix a path segment into a request URL pathname.
@@ -182,6 +183,7 @@ export const setupTestServer = ({
 			const externalHooks = Container.get(ExternalHooks);
 			const internalHooks = Container.get(InternalHooks);
 			const mailer = Container.get(UserManagementMailer);
+			const jwtService = Container.get(JwtService);
 			const repositories = Db.collections;
 
 			for (const group of functionEndpoints) {
@@ -238,6 +240,7 @@ export const setupTestServer = ({
 								internalHooks,
 								mailer,
 								repositories,
+								jwtService,
 							}),
 						);
 						break;
@@ -260,6 +263,7 @@ export const setupTestServer = ({
 								repositories,
 								activeWorkflowRunner: Container.get(ActiveWorkflowRunner),
 								logger,
+								jwtService,
 							}),
 						);
 						break;
diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts
index f0baf4e26db33..0f56258883a15 100644
--- a/packages/cli/test/integration/users.api.test.ts
+++ b/packages/cli/test/integration/users.api.test.ts
@@ -78,7 +78,6 @@ describe('GET /users', () => {
 				personalizationAnswers,
 				globalRole,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = user;
@@ -89,7 +88,6 @@ describe('GET /users', () => {
 			expect(lastName).toBeDefined();
 			expect(personalizationAnswers).toBeUndefined();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(globalRole).toBeDefined();
 			expect(apiKey).not.toBeDefined();
@@ -254,7 +252,6 @@ describe('POST /users/:id', () => {
 			lastName,
 			personalizationAnswers,
 			password,
-			resetPasswordToken,
 			globalRole,
 			isPending,
 			apiKey,
@@ -266,7 +263,6 @@ describe('POST /users/:id', () => {
 		expect(lastName).toBe(memberData.lastName);
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
 		expect(isPending).toBe(false);
 		expect(globalRole).toBeDefined();
 		expect(apiKey).not.toBeDefined();
@@ -404,14 +400,12 @@ describe('POST /users', () => {
 			}
 
 			const storedUser = await Db.collections.User.findOneByOrFail({ id });
-			const { firstName, lastName, personalizationAnswers, password, resetPasswordToken } =
-				storedUser;
+			const { firstName, lastName, personalizationAnswers, password } = storedUser;
 
 			expect(firstName).toBeNull();
 			expect(lastName).toBeNull();
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeNull();
-			expect(resetPasswordToken).toBeNull();
 		}
 	});
 
diff --git a/packages/cli/test/unit/services/jwt.service.test.ts b/packages/cli/test/unit/services/jwt.service.test.ts
new file mode 100644
index 0000000000000..c3dde6be5d03a
--- /dev/null
+++ b/packages/cli/test/unit/services/jwt.service.test.ts
@@ -0,0 +1,42 @@
+import config from '@/config';
+import { JwtService } from '@/services/jwt.service';
+import { randomString } from '../../integration/shared/random';
+import * as jwt from 'jsonwebtoken';
+
+describe('JwtService', () => {
+	config.set('userManagement.jwtSecret', randomString(5, 10));
+
+	const jwtService = new JwtService();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	test('Should sign input with user management secret', async () => {
+		const userId = 1;
+
+		const token = jwtService.signData({ sub: userId });
+		expect(typeof token).toBe('string');
+
+		const secret = config.get('userManagement.jwtSecret');
+
+		const decodedToken = jwt.verify(token, secret);
+
+		expect(decodedToken).toHaveProperty('sub');
+		expect(decodedToken).toHaveProperty('iat');
+		expect(decodedToken?.sub).toBe(userId);
+	});
+
+	test('Should verify token with user management secret', async () => {
+		const userId = 1;
+
+		const secret = config.get('userManagement.jwtSecret');
+
+		const token = jwt.sign({ sub: userId }, secret);
+
+		const decodedToken = jwt.verify(token, secret);
+
+		expect(decodedToken).toHaveProperty('sub');
+		expect(decodedToken?.sub).toBe(userId);
+	});
+});
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index 18da881afea31..74b717f280905 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -67,14 +67,14 @@ export async function sendForgotPasswordEmail(
 
 export async function validatePasswordToken(
 	context: IRestApiContext,
-	params: { token: string; userId: string },
+	params: { token: string },
 ): Promise<void> {
 	await makeRestApiRequest(context, 'GET', '/resolve-password-token', params);
 }
 
 export async function changePassword(
 	context: IRestApiContext,
-	params: { token: string; password: string; userId: string },
+	params: { token: string; password: string },
 ): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/change-password', params);
 }
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index ff54eebc1c6e5..74e3672969171 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -226,15 +226,11 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			const rootStore = useRootStore();
 			await sendForgotPasswordEmail(rootStore.getRestApiContext, params);
 		},
-		async validatePasswordToken(params: { token: string; userId: string }): Promise<void> {
+		async validatePasswordToken(params: { token: string }): Promise<void> {
 			const rootStore = useRootStore();
 			await validatePasswordToken(rootStore.getRestApiContext, params);
 		},
-		async changePassword(params: {
-			token: string;
-			password: string;
-			userId: string;
-		}): Promise<void> {
+		async changePassword(params: { token: string; password: string }): Promise<void> {
 			const rootStore = useRootStore();
 			await changePassword(rootStore.getRestApiContext, params);
 		},
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/editor-ui/src/views/ChangePasswordView.vue
index 92aeee733d0a7..8975566c80db1 100644
--- a/packages/editor-ui/src/views/ChangePasswordView.vue
+++ b/packages/editor-ui/src/views/ChangePasswordView.vue
@@ -75,23 +75,15 @@ export default defineComponent({
 				},
 			],
 		};
-		const token =
-			!this.$route.query.token || typeof this.$route.query.token !== 'string'
-				? null
-				: this.$route.query.token;
-		const userId =
-			!this.$route.query.userId || typeof this.$route.query.userId !== 'string'
-				? null
-				: this.$route.query.userId;
+
+		const token = this.getResetToken();
+
 		try {
 			if (!token) {
 				throw new Error(this.$locale.baseText('auth.changePassword.missingTokenError'));
 			}
-			if (!userId) {
-				throw new Error(this.$locale.baseText('auth.changePassword.missingUserIdError'));
-			}
 
-			await this.usersStore.validatePasswordToken({ token, userId });
+			await this.usersStore.validatePasswordToken({ token });
 		} catch (e) {
 			this.showMessage({
 				title: this.$locale.baseText('auth.changePassword.tokenValidationError'),
@@ -118,20 +110,18 @@ export default defineComponent({
 				this.password = e.value;
 			}
 		},
+		getResetToken(): string | null {
+			return !this.$route.query.token || typeof this.$route.query.token !== 'string'
+				? null
+				: this.$route.query.token;
+		},
 		async onSubmit() {
 			try {
 				this.loading = true;
-				const token =
-					!this.$route.query.token || typeof this.$route.query.token !== 'string'
-						? null
-						: this.$route.query.token;
-				const userId =
-					!this.$route.query.userId || typeof this.$route.query.userId !== 'string'
-						? null
-						: this.$route.query.userId;
+				const token = this.getResetToken();
 
-				if (token && userId) {
-					await this.usersStore.changePassword({ token, userId, password: this.password });
+				if (token) {
+					await this.usersStore.changePassword({ token, password: this.password });
 
 					this.showMessage({
 						type: 'success',

From 77f00e1f27b9e86ac32b5e04fab60adaea6e0151 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?=
 <aditya@netroy.in>
Date: Tue, 25 Jul 2023 00:11:33 +0200
Subject: [PATCH 053/116] ci: Fix tests on postgres (no-changelog)

---
 .../cli/test/integration/passwordReset.api.test.ts     |  2 +-
 .../cli/test/integration/publicApi/credentials.test.ts | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/cli/test/integration/passwordReset.api.test.ts b/packages/cli/test/integration/passwordReset.api.test.ts
index 61a7c891f5df2..5140820b30bce 100644
--- a/packages/cli/test/integration/passwordReset.api.test.ts
+++ b/packages/cli/test/integration/passwordReset.api.test.ts
@@ -157,7 +157,7 @@ describe('GET /resolve-password-token', () => {
 	});
 
 	test('should fail if user is not found', async () => {
-		const token = jwtService.signData({ sub: 'test' });
+		const token = jwtService.signData({ sub: uuid() });
 
 		const response = await testServer.authlessAgent
 			.get('/resolve-password-token')
diff --git a/packages/cli/test/integration/publicApi/credentials.test.ts b/packages/cli/test/integration/publicApi/credentials.test.ts
index 30ea0dbf2d867..aa611d0d78e03 100644
--- a/packages/cli/test/integration/publicApi/credentials.test.ts
+++ b/packages/cli/test/integration/publicApi/credentials.test.ts
@@ -82,12 +82,10 @@ describe('POST /credentials', () => {
 	});
 
 	test('should fail with invalid inputs', async () => {
-		await Promise.all(
-			INVALID_PAYLOADS.map(async (invalidPayload) => {
-				const response = await authOwnerAgent.post('/credentials').send(invalidPayload);
-				expect(response.statusCode === 400 || response.statusCode === 415).toBe(true);
-			}),
-		);
+		for (const invalidPayload of INVALID_PAYLOADS) {
+			const response = await authOwnerAgent.post('/credentials').send(invalidPayload);
+			expect(response.statusCode === 400 || response.statusCode === 415).toBe(true);
+		}
 	});
 
 	test('should fail with missing encryption key', async () => {

From e1120cb923f289e0326da87d00371d569fe46eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 25 Jul 2023 10:22:32 +0200
Subject: [PATCH 054/116] refactor(core): Prevent community packages queries if
 feature is disabled (#6728)

---
 packages/cli/src/commands/start.ts | 90 ++++++++++++++++--------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 1b203c7c4eab2..95d56062bdd65 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -221,23 +221,6 @@ export class Start extends BaseCommand {
 
 		await this.loadNodesAndCredentials.generateTypesForFrontend();
 
-		const installedPackages = await getAllInstalledPackages();
-		const missingPackages = new Set<{
-			packageName: string;
-			version: string;
-		}>();
-		installedPackages.forEach((installedPackage) => {
-			installedPackage.installedNodes.forEach((installedNode) => {
-				if (!this.loadNodesAndCredentials.known.nodes[installedNode.type]) {
-					// Leave the list ready for installing in case we need.
-					missingPackages.add({
-						packageName: installedPackage.packageName,
-						version: installedPackage.installedVersion,
-					});
-				}
-			});
-		});
-
 		await UserSettings.getEncryptionKey();
 
 		// Load settings from database and set them to config.
@@ -246,36 +229,57 @@ export class Start extends BaseCommand {
 			config.set(setting.key, jsonParse(setting.value, { fallbackValue: setting.value }));
 		});
 
-		config.set('nodes.packagesMissing', '');
-		if (missingPackages.size) {
-			LoggerProxy.error(
-				'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
-			);
+		const areCommunityPackagesEnabled = config.getEnv('nodes.communityPackages.enabled');
+
+		if (areCommunityPackagesEnabled) {
+			const installedPackages = await getAllInstalledPackages();
+			const missingPackages = new Set<{
+				packageName: string;
+				version: string;
+			}>();
+			installedPackages.forEach((installedPackage) => {
+				installedPackage.installedNodes.forEach((installedNode) => {
+					if (!this.loadNodesAndCredentials.known.nodes[installedNode.type]) {
+						// Leave the list ready for installing in case we need.
+						missingPackages.add({
+							packageName: installedPackage.packageName,
+							version: installedPackage.installedVersion,
+						});
+					}
+				});
+			});
 
-			if (flags.reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
-				LoggerProxy.info('Attempting to reinstall missing packages', { missingPackages });
-				try {
-					// Optimistic approach - stop if any installation fails
-					// eslint-disable-next-line no-restricted-syntax
-					for (const missingPackage of missingPackages) {
-						await this.loadNodesAndCredentials.installNpmModule(
-							missingPackage.packageName,
-							missingPackage.version,
-						);
-						missingPackages.delete(missingPackage);
+			config.set('nodes.packagesMissing', '');
+			if (missingPackages.size) {
+				LoggerProxy.error(
+					'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
+				);
+
+				if (flags.reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
+					LoggerProxy.info('Attempting to reinstall missing packages', { missingPackages });
+					try {
+						// Optimistic approach - stop if any installation fails
+						// eslint-disable-next-line no-restricted-syntax
+						for (const missingPackage of missingPackages) {
+							await this.loadNodesAndCredentials.installNpmModule(
+								missingPackage.packageName,
+								missingPackage.version,
+							);
+							missingPackages.delete(missingPackage);
+						}
+						LoggerProxy.info('Packages reinstalled successfully. Resuming regular initialization.');
+					} catch (error) {
+						LoggerProxy.error('n8n was unable to install the missing packages.');
 					}
-					LoggerProxy.info('Packages reinstalled successfully. Resuming regular initialization.');
-				} catch (error) {
-					LoggerProxy.error('n8n was unable to install the missing packages.');
 				}
-			}
 
-			config.set(
-				'nodes.packagesMissing',
-				Array.from(missingPackages)
-					.map((missingPackage) => `${missingPackage.packageName}@${missingPackage.version}`)
-					.join(' '),
-			);
+				config.set(
+					'nodes.packagesMissing',
+					Array.from(missingPackages)
+						.map((missingPackage) => `${missingPackage.packageName}@${missingPackage.version}`)
+						.join(' '),
+				);
+			}
 		}
 
 		const dbType = config.getEnv('database.type');

From 1198d8b474d7d9c4fe7299d9f70adcbe5feb3ac5 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 25 Jul 2023 11:56:38 +0200
Subject: [PATCH 055/116] feat(core): Add cache service (#6729)

* add cache service

* PR adjustments

* switch to maxSize for memory cache
---
 packages/cli/package.json                     |   4 +-
 packages/cli/src/config/schema.ts             |  36 ++++
 packages/cli/src/services/cache.service.ts    | 175 ++++++++++++++++++
 .../test/unit/services/cache.service.test.ts  | 137 ++++++++++++++
 pnpm-lock.yaml                                |  45 +++++
 5 files changed, 396 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/services/cache.service.ts
 create mode 100644 packages/cli/test/unit/services/cache.service.test.ts

diff --git a/packages/cli/package.json b/packages/cli/package.json
index c57f8639baf58..f0d9f7f97ec06 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -116,6 +116,8 @@
     "body-parser": "^1.20.1",
     "body-parser-xml": "^2.0.3",
     "bull": "^4.10.2",
+    "cache-manager": "^5.2.3",
+    "cache-manager-ioredis-yet": "^1.2.2",
     "callsites": "^3.1.0",
     "change-case": "^4.1.1",
     "class-transformer": "^0.5.1",
@@ -163,8 +165,8 @@
     "passport-cookie": "^1.0.9",
     "passport-jwt": "^4.0.0",
     "pg": "^8.8.0",
-    "pkce-challenge": "^3.0.0",
     "picocolors": "^1.0.0",
+    "pkce-challenge": "^3.0.0",
     "posthog-node": "^2.2.2",
     "prom-client": "^13.1.0",
     "psl": "^1.8.0",
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 46639fdbae93c..f1e477495f259 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1122,4 +1122,40 @@ export const schema = {
 			env: 'N8N_AI_AUTHORIZATION',
 		},
 	},
+	cache: {
+		enabled: {
+			doc: 'Whether caching is enabled',
+			format: Boolean,
+			default: true,
+			env: 'N8N_CACHE_ENABLED',
+		},
+		backend: {
+			doc: 'Backend to use for caching',
+			format: ['memory', 'redis', 'auto'] as const,
+			default: 'auto',
+			env: 'N8N_CACHE_BACKEND',
+		},
+		memory: {
+			maxSize: {
+				doc: 'Maximum size of memory cache in bytes',
+				format: Number,
+				default: 3 * 1024 * 1024, // 3 MB
+				env: 'N8N_CACHE_MEMORY_MAX_SIZE',
+			},
+			ttl: {
+				doc: 'Time to live for cached items in memory (in ms)',
+				format: Number,
+				default: 3600 * 1000, // 1 hour
+				env: 'N8N_CACHE_MEMORY_TTL',
+			},
+		},
+		redis: {
+			ttl: {
+				doc: 'Time to live for cached items in redis (in ms), 0 for no TTL',
+				format: Number,
+				default: 0,
+				env: 'N8N_CACHE_REDIS_TTL',
+			},
+		},
+	},
 };
diff --git a/packages/cli/src/services/cache.service.ts b/packages/cli/src/services/cache.service.ts
new file mode 100644
index 0000000000000..64d203106c0a9
--- /dev/null
+++ b/packages/cli/src/services/cache.service.ts
@@ -0,0 +1,175 @@
+import { Service } from 'typedi';
+import config from '@/config';
+import { caching } from 'cache-manager';
+import type { MemoryCache } from 'cache-manager';
+import type { RedisCache } from 'cache-manager-ioredis-yet';
+import type { RedisOptions } from 'ioredis';
+import { getRedisClusterNodes } from '../GenericHelpers';
+import { LoggerProxy, jsonStringify } from 'n8n-workflow';
+
+@Service()
+export class CacheService {
+	private cache: RedisCache | MemoryCache | undefined;
+
+	async init() {
+		if (!config.getEnv('cache.enabled')) {
+			throw new Error('Cache is disabled');
+		}
+
+		const backend = config.getEnv('cache.backend');
+
+		if (
+			backend === 'redis' ||
+			(backend === 'auto' && config.getEnv('executions.mode') === 'queue')
+		) {
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			const { redisInsStore } = await import('cache-manager-ioredis-yet');
+
+			// #region TEMPORARY Redis Client Code
+			/*
+			 * TODO: remove once redis service is ready
+			 * this code is just temporary
+			 */
+			// eslint-disable-next-line @typescript-eslint/naming-convention
+			const { default: Redis } = await import('ioredis');
+			let lastTimer = 0;
+			let cumulativeTimeout = 0;
+			const { host, port, username, password, db }: RedisOptions =
+				config.getEnv('queue.bull.redis');
+			const clusterNodes = getRedisClusterNodes();
+			const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
+			const usesRedisCluster = clusterNodes.length > 0;
+			LoggerProxy.debug(
+				usesRedisCluster
+					? `(Cache Service) Initialising Redis cluster connection with nodes: ${clusterNodes
+							.map((e) => `${e.host}:${e.port}`)
+							.join(',')}`
+					: `(Cache Service) Initialising Redis client connection with host: ${
+							host ?? 'localhost'
+					  } and port: ${port ?? '6379'}`,
+			);
+			const sharedRedisOptions: RedisOptions = {
+				username,
+				password,
+				db,
+				enableReadyCheck: false,
+				maxRetriesPerRequest: null,
+			};
+			const redisClient = usesRedisCluster
+				? new Redis.Cluster(
+						clusterNodes.map((node) => ({ host: node.host, port: node.port })),
+						{
+							redisOptions: sharedRedisOptions,
+						},
+				  )
+				: new Redis({
+						host,
+						port,
+						...sharedRedisOptions,
+						retryStrategy: (): number | null => {
+							const now = Date.now();
+							if (now - lastTimer > 30000) {
+								// Means we had no timeout at all or last timeout was temporary and we recovered
+								lastTimer = now;
+								cumulativeTimeout = 0;
+							} else {
+								cumulativeTimeout += now - lastTimer;
+								lastTimer = now;
+								if (cumulativeTimeout > redisConnectionTimeoutLimit) {
+									LoggerProxy.error(
+										`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
+									);
+									process.exit(1);
+								}
+							}
+							return 500;
+						},
+				  });
+			// #endregion TEMPORARY Redis Client Code
+			const redisStore = redisInsStore(redisClient, {
+				ttl: config.getEnv('cache.redis.ttl'),
+			});
+			this.cache = await caching(redisStore);
+		} else {
+			// using TextEncoder to get the byte length of the string even if it contains unicode characters
+			const textEncoder = new TextEncoder();
+			this.cache = await caching('memory', {
+				ttl: config.getEnv('cache.memory.ttl'),
+				maxSize: config.getEnv('cache.memory.maxSize'),
+				sizeCalculation: (item) => {
+					return textEncoder.encode(jsonStringify(item, { replaceCircularRefs: true })).length;
+				},
+			});
+		}
+	}
+
+	async destroy() {
+		if (this.cache) {
+			await this.reset();
+			this.cache = undefined;
+		}
+	}
+
+	async getCache(): Promise<RedisCache | MemoryCache | undefined> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache;
+	}
+
+	async get<T>(key: string): Promise<T> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.get(key) as T;
+	}
+
+	async set<T>(key: string, value: T, ttl?: number): Promise<void> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.set(key, value, ttl);
+	}
+
+	async delete(key: string): Promise<void> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.del(key);
+	}
+
+	async reset(): Promise<void> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.reset();
+	}
+
+	async keys(): Promise<string[]> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.keys() ?? [];
+	}
+
+	async setMany<T>(values: Array<[string, T]>, ttl?: number): Promise<void> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.mset(values, ttl);
+	}
+
+	async getMany<T>(keys: string[]): Promise<Array<[string, T]>> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.mget(...keys) as Promise<Array<[string, T]>>;
+	}
+
+	async deleteMany(keys: string[]): Promise<void> {
+		if (!this.cache) {
+			await this.init();
+		}
+		return this.cache?.store.mdel(...keys);
+	}
+}
diff --git a/packages/cli/test/unit/services/cache.service.test.ts b/packages/cli/test/unit/services/cache.service.test.ts
new file mode 100644
index 0000000000000..ed68b239d80e1
--- /dev/null
+++ b/packages/cli/test/unit/services/cache.service.test.ts
@@ -0,0 +1,137 @@
+import Container from 'typedi';
+import { CacheService } from '@/services/cache.service';
+import type { MemoryCache } from 'cache-manager';
+// import type { RedisCache } from 'cache-manager-ioredis-yet';
+import config from '@/config';
+
+const cacheService = Container.get(CacheService);
+
+function setDefaultConfig() {
+	config.set('executions.mode', 'regular');
+	config.set('cache.backend', 'auto');
+	config.set('cache.memory.maxSize', 1 * 1024 * 1024);
+}
+
+describe('cacheService', () => {
+	beforeEach(async () => {
+		setDefaultConfig();
+		await Container.get(CacheService).destroy();
+	});
+
+	test('should create a memory cache by default', async () => {
+		await cacheService.init();
+		await expect(cacheService.getCache()).resolves.toBeDefined();
+		const candidate = (await cacheService.getCache()) as MemoryCache;
+		// type guard to check that a MemoryCache is returned and not a RedisCache (which does not have a size property)
+		expect(candidate.store.size).toBeDefined();
+	});
+
+	test('should cache and retrieve a value', async () => {
+		await cacheService.init();
+		await expect(cacheService.getCache()).resolves.toBeDefined();
+		await cacheService.set<string>('testString', 'test');
+		await cacheService.set<number>('testNumber', 123);
+
+		await expect(cacheService.get<string>('testString')).resolves.toBe('test');
+		expect(typeof (await cacheService.get<string>('testString'))).toBe('string');
+		await expect(cacheService.get<number>('testNumber')).resolves.toBe(123);
+		expect(typeof (await cacheService.get<number>('testNumber'))).toBe('number');
+	});
+
+	test('should honour ttl values', async () => {
+		// set default TTL to 10ms
+		config.set('cache.memory.ttl', 10);
+
+		await cacheService.set<string>('testString', 'test');
+		await cacheService.set<number>('testNumber', 123, 1000);
+
+		const store = (await cacheService.getCache())?.store;
+
+		expect(store).toBeDefined();
+
+		await expect(store!.ttl('testString')).resolves.toBeLessThanOrEqual(100);
+		await expect(store!.ttl('testNumber')).resolves.toBeLessThanOrEqual(1000);
+
+		await expect(cacheService.get<string>('testString')).resolves.toBe('test');
+		await expect(cacheService.get<number>('testNumber')).resolves.toBe(123);
+
+		await new Promise((resolve) => setTimeout(resolve, 20));
+
+		await expect(cacheService.get<string>('testString')).resolves.toBeUndefined();
+		await expect(cacheService.get<number>('testNumber')).resolves.toBe(123);
+	});
+
+	test('should set and remove values', async () => {
+		await cacheService.set<string>('testString', 'test');
+		await expect(cacheService.get<string>('testString')).resolves.toBe('test');
+		await cacheService.delete('testString');
+		await expect(cacheService.get<string>('testString')).resolves.toBeUndefined();
+	});
+
+	test('should calculate maxSize', async () => {
+		config.set('cache.memory.maxSize', 16);
+		await cacheService.destroy();
+
+		// 16 bytes because stringify wraps the string in quotes, so 2 bytes for the quotes
+		await cacheService.set<string>('testString', 'withoutUnicode');
+		await expect(cacheService.get<string>('testString')).resolves.toBe('withoutUnicode');
+
+		await cacheService.destroy();
+
+		// should not fit!
+		await cacheService.set<string>('testString', 'withUnicodeԱԲԳ');
+		await expect(cacheService.get<string>('testString')).resolves.toBeUndefined();
+	});
+
+	test('should set and get complex objects', async () => {
+		interface TestObject {
+			test: string;
+			test2: number;
+			test3?: TestObject & { test4: TestObject };
+		}
+
+		const testObject: TestObject = {
+			test: 'test',
+			test2: 123,
+			test3: {
+				test: 'test3',
+				test2: 123,
+				test4: {
+					test: 'test4',
+					test2: 123,
+				},
+			},
+		};
+
+		await cacheService.set<TestObject>('testObject', testObject);
+		await expect(cacheService.get<TestObject>('testObject')).resolves.toMatchObject(testObject);
+	});
+
+	test('should set and get multiple values', async () => {
+		config.set('executions.mode', 'regular');
+		config.set('cache.backend', 'auto');
+
+		await cacheService.setMany<string>([
+			['testString', 'test'],
+			['testString2', 'test2'],
+		]);
+		await cacheService.setMany<number>([
+			['testNumber', 123],
+			['testNumber2', 456],
+		]);
+		await expect(
+			cacheService.getMany<string>(['testString', 'testString2']),
+		).resolves.toStrictEqual(['test', 'test2']);
+		await expect(
+			cacheService.getMany<number>(['testNumber', 'testNumber2']),
+		).resolves.toStrictEqual([123, 456]);
+	});
+	// This test is skipped because it requires the Redis service
+	// test('should create a redis cache if asked', async () => {
+	// 	config.set('cache.backend', 'redis');
+	// 	await cacheService.init();
+	// 	expect(cacheService.getCacheInstance()).toBeDefined();
+	// 	const candidate = cacheService.getCacheInstance() as RedisCache;
+	// 	expect(candidate.store.client).toBeDefined();
+	// });
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dace0742e46c9..ca1dd00054751 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -244,6 +244,12 @@ importers:
       bull:
         specifier: ^4.10.2
         version: 4.10.2
+      cache-manager:
+        specifier: ^5.2.3
+        version: 5.2.3
+      cache-manager-ioredis-yet:
+        specifier: ^1.2.2
+        version: 1.2.2
       callsites:
         specifier: ^3.1.0
         version: 3.1.0
@@ -9786,6 +9792,23 @@ packages:
       unset-value: 1.0.0
     dev: true
 
+  /cache-manager-ioredis-yet@1.2.2:
+    resolution: {integrity: sha512-o03N/tQxfFONZ1XLGgIxOFHuQQpjpRdnSAL1THG1YWZIVp1JMUfjU3ElSAjFN1LjbJXa55IpC8waG+VEoLUCUw==}
+    engines: {node: '>= 16.17.0'}
+    dependencies:
+      cache-manager: 5.2.3
+      ioredis: 5.3.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /cache-manager@5.2.3:
+    resolution: {integrity: sha512-9OErI8fksFkxAMJ8Mco0aiZSdphyd90HcKiOMJQncSlU1yq/9lHHxrT8PDayxrmr9IIIZPOAEfXuGSD7g29uog==}
+    dependencies:
+      lodash.clonedeep: 4.5.0
+      lru-cache: 9.1.2
+    dev: false
+
   /cachedir@2.3.0:
     resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
     engines: {node: '>=6'}
@@ -14213,6 +14236,23 @@ packages:
       - supports-color
     dev: false
 
+  /ioredis@5.3.2:
+    resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
+    engines: {node: '>=12.22.0'}
+    dependencies:
+      '@ioredis/commands': 1.2.0
+      cluster-key-slot: 1.1.1
+      debug: 4.3.4(supports-color@8.1.1)
+      denque: 2.1.0
+      lodash.defaults: 4.2.0
+      lodash.isarguments: 3.1.0
+      redis-errors: 1.2.0
+      redis-parser: 3.0.0
+      standard-as-callback: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /ip@1.1.8:
     resolution: {integrity: sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==}
     dev: false
@@ -16246,6 +16286,11 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
+  /lru-cache@9.1.2:
+    resolution: {integrity: sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==}
+    engines: {node: 14 || >=16.14}
+    dev: false
+
   /lru-memoizer@2.1.4:
     resolution: {integrity: sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==}
     dependencies:

From c2d00b4f27211f01af2076af66a6a2ab6abe2346 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Tue, 25 Jul 2023 13:26:11 +0200
Subject: [PATCH 056/116] Revert "test(editor): Add canvas actions E2E tests"
 (#6736)

Revert "test(editor): Add canvas actions E2E tests (#6723)"

This reverts commit 052d82b2208c1b2e6f62c6004822c6278c15278b.
---
 cypress/e2e/12-canvas-actions.cy.ts           | 36 -------------------
 cypress/pages/workflow.ts                     |  3 --
 cypress/support/commands.ts                   | 32 ++++++-----------
 cypress/support/index.ts                      |  2 +-
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |  4 ---
 5 files changed, 11 insertions(+), 66 deletions(-)

diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index 3f23f90484e59..d336294f48c53 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -78,42 +78,6 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 	});
 
-	it('should add a connected node dragging from node creator', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		cy.get('.plus-endpoint').should('be.visible').click();
-		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
-		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
-		cy.drag(
-			WorkflowPage.getters.nodeCreatorNodeItems().first(),
-			[100, 100],
-			{
-				realMouse: true,
-				abs: true
-			}
-		);
-		cy.get('body').type('{esc}');
-		WorkflowPage.getters.canvasNodes().should('have.length', 2);
-		WorkflowPage.getters.nodeConnections().should('have.length', 1);
-	});
-
-	it('should open a category when trying to drag and drop it on the canvas', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		cy.get('.plus-endpoint').should('be.visible').click();
-		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
-		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
-		cy.drag(
-			WorkflowPage.getters.nodeCreatorActionItems().first(),
-			[100, 100],
-			{
-				realMouse: true,
-				abs: true
-			}
-		);
-		WorkflowPage.getters.nodeCreatorCategoryItems().its('length').should('be.gt', 0);
-		WorkflowPage.getters.canvasNodes().should('have.length', 1);
-		WorkflowPage.getters.nodeConnections().should('have.length', 0);
-	});
-
 	it('should add disconnected node if nothing is selected', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		// Deselect nodes
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index e269ce09fd8c9..d324314dcc2d0 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -96,9 +96,6 @@ export class WorkflowPage extends BasePage {
 		nodeCredentialsSelect: () => cy.getByTestId('node-credentials-select'),
 		nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'),
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
-		nodeCreatorNodeItems: () => cy.getByTestId('node-creator-node-item'),
-		nodeCreatorActionItems: () => cy.getByTestId('node-creator-action-item'),
-		nodeCreatorCategoryItems: () => cy.getByTestId('node-creator-category-item'),
 		ndvParameters: () => cy.getByTestId('parameter-item'),
 		nodeCredentialsLabel: () => cy.getByTestId('credentials-label'),
 		getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 812404ff7ad53..6c7adaea8f84b 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -103,31 +103,19 @@ Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) =>
 Cypress.Commands.add('drag', (selector, pos, options) => {
 	const index = options?.index || 0;
 	const [xDiff, yDiff] = pos;
-	const element = typeof selector === 'string' ? cy.get(selector).eq(index) : selector;
+	const element = cy.get(selector).eq(index);
 	element.should('exist');
 
-	element.then(([$el]) => {
-		const originalLocation = $el.getBoundingClientRect();
-		const newPosition = {
-			x: options?.abs ? xDiff : originalLocation.x + xDiff,
-			y: options?.abs ? yDiff : originalLocation.y + yDiff,
-		}
-
-		if(options?.realMouse) {
-			element.realMouseDown();
-			element.realMouseMove(newPosition.x, newPosition.y);
-			element.realMouseUp();
-		} else {
-			element.trigger('mousedown', {force: true});
-			element.trigger('mousemove', {
-				which: 1,
-				pageX: newPosition.x,
-				pageY: newPosition.y,
-				force: true,
-			});
-			element.trigger('mouseup', {force: true});
-		}
+	const originalLocation = Cypress.$(selector)[index].getBoundingClientRect();
+
+	element.trigger('mousedown', { force: true });
+	element.trigger('mousemove', {
+		which: 1,
+		pageX: options?.abs ? xDiff : originalLocation.right + xDiff,
+		pageY: options?.abs ? yDiff : originalLocation.top + yDiff,
+		force: true,
 	});
+	element.trigger('mouseup', { force: true });
 });
 
 Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index f1602b3e06989..196a14d9ec083 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -31,7 +31,7 @@ declare global {
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
-			drag(selector: string | Cypress.Chainable<JQuery<HTMLElement>>, target: [number, number], options?: {abs?: boolean, index?: number, realMouse?: boolean}): void;
+			drag(selector: string, target: [number, number], options?: {abs?: true, index?: number}): void;
 			draganddrop(draggableSelector: string, droppableSelector: string): void;
 		}
 	}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 8554a1a080a68..dd5a427f17ec2 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -9,7 +9,6 @@
 		:title="displayName"
 		:show-action-arrow="showActionArrow"
 		:is-trigger="isTrigger"
-		:data-test-id="dataTestId"
 	>
 		<template #icon>
 			<node-icon :nodeType="nodeType" />
@@ -75,9 +74,6 @@ const description = computed<string>(() => {
 	}) as string;
 });
 const showActionArrow = computed(() => hasActions.value);
-const dataTestId = computed(() =>
-	hasActions.value ? 'node-creator-action-item' : 'node-creator-node-item',
-);
 
 const hasActions = computed(() => {
 	return nodeActions.value.length > 1;

From 788322b98f4ee0b3b31e88609e14fb72dcb67def Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:34:45 +0300
Subject: [PATCH 057/116] fix(Postgres Node): Arrays in query replacement fix
 (#6718)

---
 .../nodes/Postgres/test/v2/operations.test.ts | 45 ++++++++++--------
 .../database/executeQuery.operation.ts        | 46 ++++++++++++++-----
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
index 4d0e30fa59fef..c2f5d7e57d85d 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -1,4 +1,10 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IGetNodeParameterOptions,
+	INode,
+	INodeParameters,
+} from 'n8n-workflow';
 
 import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
 
@@ -38,6 +44,7 @@ const createMockExecuteFunction = (nodeParameters: IDataObject) => {
 			return get(nodeParameters, parameter, fallbackValue);
 		},
 		getNode() {
+			node.parameters = { ...node.parameters, ...(nodeParameters as INodeParameters) };
 			return node;
 		},
 	} as unknown as IExecuteFunctions;
@@ -252,9 +259,9 @@ describe('Test PostgresV2, insert operation', () => {
 			options: {},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const nodeOptions = nodeParameters.options as IDataObject;
@@ -295,9 +302,9 @@ describe('Test PostgresV2, insert operation', () => {
 			options: {},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const inputItems = [
@@ -505,9 +512,9 @@ describe('Test PostgresV2, update operation', () => {
 			},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const nodeOptions = nodeParameters.options as IDataObject;
@@ -561,9 +568,9 @@ describe('Test PostgresV2, update operation', () => {
 			options: {},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const inputItems = [
@@ -664,9 +671,9 @@ describe('Test PostgresV2, upsert operation', () => {
 			},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const nodeOptions = nodeParameters.options as IDataObject;
@@ -720,9 +727,9 @@ describe('Test PostgresV2, upsert operation', () => {
 			options: {},
 		};
 		const columnsInfo: ColumnInfo[] = [
-			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
-			{ column_name: 'json', data_type: 'json', is_nullable: 'NO' },
-			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
 		];
 
 		const inputItems = [
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
index 4a53c6b16961d..89d115d0eb0c9 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
@@ -61,22 +61,44 @@ export async function execute(
 			query = query.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
 		}
 
-		let values: IDataObject[] = [];
+		let values: Array<IDataObject | string> = [];
 
-		let queryReplacement = this.getNodeParameter('options.queryReplacement', i, '');
+		const queryReplacement = this.getNodeParameter('options.queryReplacement', i, '');
 
 		if (typeof queryReplacement === 'string') {
-			queryReplacement = queryReplacement.split(',').map((entry) => entry.trim());
-		}
-
-		if (Array.isArray(queryReplacement)) {
-			values = queryReplacement as IDataObject[];
+			const node = this.getNode();
+
+			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
+
+			if (rawReplacements) {
+				const rawValues = rawReplacements
+					.replace(/^=+/, '')
+					.split(',')
+					.filter((entry) => entry)
+					.map((entry) => entry.trim());
+
+				for (const rawValue of rawValues) {
+					const resolvables = getResolvables(rawValue);
+
+					if (resolvables.length) {
+						for (const resolvable of resolvables) {
+							values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+						}
+					} else {
+						values.push(rawValue);
+					}
+				}
+			}
 		} else {
-			throw new NodeOperationError(
-				this.getNode(),
-				'Query Replacement must be a string of comma-separated values, or an array of values',
-				{ itemIndex: i },
-			);
+			if (Array.isArray(queryReplacement)) {
+				values = queryReplacement as IDataObject[];
+			} else {
+				throw new NodeOperationError(
+					this.getNode(),
+					'Query Parameters must be a string of comma-separated values or an array of values',
+					{ itemIndex: i },
+				);
+			}
 		}
 
 		queries.push({ query, values });

From 5ae1b730d7363792487fee117b28248deebdf2a6 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 25 Jul 2023 16:59:44 +0300
Subject: [PATCH 058/116] fix(Telegram Trigger Node): Add guard to 'include'
 call on null or undefined (#6730)

---
 packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index ee1252fe153bf..95796e83e8e8c 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -182,7 +182,7 @@ export class TelegramTrigger implements INodeType {
 
 				let allowedUpdates = this.getNodeParameter('updates') as string[];
 
-				if (allowedUpdates.includes('*')) {
+				if ((allowedUpdates || []).includes('*')) {
 					allowedUpdates = [];
 				}
 

From a5f7d51e1d6ee881d367a57c0a99487caad4a253 Mon Sep 17 00:00:00 2001
From: Ali Afsharzadeh <afsharzadeh8@gmail.com>
Date: Tue, 25 Jul 2023 18:38:58 +0330
Subject: [PATCH 059/116] fix(core): Use `exec` in docker images to forward
 signals correctly (#6732)

---
 docker/images/n8n/docker-entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/images/n8n/docker-entrypoint.sh b/docker/images/n8n/docker-entrypoint.sh
index 508655ea33dc6..63a7c1dca6380 100755
--- a/docker/images/n8n/docker-entrypoint.sh
+++ b/docker/images/n8n/docker-entrypoint.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 if [ "$#" -gt 0 ]; then
   # Got started with arguments
-  n8n "$@"
+  exec n8n "$@"
 else
   # Got started without arguments
-  n8n
+  exec n8n
 fi

From 4509bc0731721fbcf115d827c75960866e903ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 25 Jul 2023 18:17:34 +0200
Subject: [PATCH 060/116] refactor(core): Move webhook DB access to repository
 (no-changelog) (#6706)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(core): Move webhook DB access to repository (no-changelog)

* make sure `DataSource` is initialized before it's dependencies

at some point I hope to replace `DataSource` with a custom `DatabaseConnection` service class that can then disconnect and reconnect from DB without having to update all repositories.

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 packages/cli/src/AbstractServer.ts                 |  6 +++---
 packages/cli/src/ActiveWorkflowRunner.ts           | 14 ++++++++------
 packages/cli/src/WorkflowRunnerProcess.ts          |  6 +++---
 .../cli/test/unit/ActiveWorkflowRunner.test.ts     |  7 +++++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index 02f02becaf822..b9dabaa95128e 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -74,9 +74,6 @@ export abstract class AbstractServer {
 		this.endpointWebhook = config.getEnv('endpoints.webhook');
 		this.endpointWebhookTest = config.getEnv('endpoints.webhookTest');
 		this.endpointWebhookWaiting = config.getEnv('endpoints.webhookWaiting');
-
-		this.externalHooks = Container.get(ExternalHooks);
-		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
 	}
 
 	private async setupErrorHandlers() {
@@ -438,6 +435,9 @@ export abstract class AbstractServer {
 
 		await new Promise<void>((resolve) => this.server.listen(PORT, ADDRESS, () => resolve()));
 
+		this.externalHooks = Container.get(ExternalHooks);
+		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
+
 		await this.setupHealthCheck();
 
 		console.log(`n8n ready on ${ADDRESS}, port ${PORT}`);
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 66f90b326260d..051ffcd5a7770 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -67,6 +67,7 @@ import { WorkflowsService } from './workflows/workflows.services';
 import { STARTING_NODES } from './constants';
 import { webhookNotFoundErrorMessage } from './utils';
 import { In } from 'typeorm';
+import { WebhookRepository } from '@db/repositories';
 
 const WEBHOOK_PROD_UNREGISTERED_HINT =
 	"The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
@@ -87,6 +88,7 @@ export class ActiveWorkflowRunner {
 		private activeExecutions: ActiveExecutions,
 		private externalHooks: ExternalHooks,
 		private nodeTypes: NodeTypes,
+		private webhookRepository: WebhookRepository,
 	) {}
 
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
@@ -110,7 +112,7 @@ export class ActiveWorkflowRunner {
 			// This is not officially supported but there is no reason
 			// it should not work.
 			// Clear up active workflow table
-			await Db.collections.Webhook.clear();
+			await this.webhookRepository.clear();
 		}
 
 		if (workflowsData.length !== 0) {
@@ -201,7 +203,7 @@ export class ActiveWorkflowRunner {
 			path = path.slice(0, -1);
 		}
 
-		let webhook = await Db.collections.Webhook.findOneBy({
+		let webhook = await this.webhookRepository.findOneBy({
 			webhookPath: path,
 			method: httpMethod,
 		});
@@ -212,7 +214,7 @@ export class ActiveWorkflowRunner {
 			// check if a dynamic webhook path exists
 			const pathElements = path.split('/');
 			webhookId = pathElements.shift();
-			const dynamicWebhooks = await Db.collections.Webhook.findBy({
+			const dynamicWebhooks = await this.webhookRepository.findBy({
 				webhookId,
 				method: httpMethod,
 				pathLength: pathElements.length,
@@ -333,7 +335,7 @@ export class ActiveWorkflowRunner {
 	 * Gets all request methods associated with a single webhook
 	 */
 	async getWebhookMethods(path: string): Promise<string[]> {
-		const webhooks = await Db.collections.Webhook.find({
+		const webhooks = await this.webhookRepository.find({
 			select: ['method'],
 			where: { webhookPath: path },
 		});
@@ -442,7 +444,7 @@ export class ActiveWorkflowRunner {
 			try {
 				// eslint-disable-next-line no-await-in-loop
 				// TODO: this should happen in a transaction, that way we don't need to manually remove this in `catch`
-				await Db.collections.Webhook.insert(webhook);
+				await this.webhookRepository.insert(webhook);
 				const webhookExists = await workflow.runWebhookMethod(
 					'checkExists',
 					webhookData,
@@ -552,7 +554,7 @@ export class ActiveWorkflowRunner {
 
 		await WorkflowHelpers.saveStaticData(workflow);
 
-		await Db.collections.Webhook.delete({
+		await this.webhookRepository.delete({
 			workflowId: workflowData.id,
 		});
 	}
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 6beba9bcd9c4a..24f0a2c3a2ef5 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -104,6 +104,9 @@ class WorkflowRunnerProcess {
 
 		this.startedAt = new Date();
 
+		// Init db since we need to read the license.
+		await Db.init();
+
 		const userSettings = await UserSettings.prepareUserSettings();
 
 		const loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
@@ -117,9 +120,6 @@ class WorkflowRunnerProcess {
 		const externalHooks = Container.get(ExternalHooks);
 		await externalHooks.init();
 
-		// Init db since we need to read the license.
-		await Db.init();
-
 		const instanceId = userSettings.instanceId ?? '';
 		await Container.get(PostHogClient).init(instanceId);
 		await Container.get(InternalHooks).init(instanceId);
diff --git a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
index 39b22221484d0..db1cc34209abf 100644
--- a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
+++ b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
@@ -24,6 +24,7 @@ import { mockInstance } from '../integration/shared/utils/';
 import { Push } from '@/push';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { NodeTypes } from '@/NodeTypes';
+import type { WebhookRepository } from '@/databases/repositories';
 
 /**
  * TODO:
@@ -139,6 +140,7 @@ const workflowExecuteAdditionalDataExecuteErrorWorkflowSpy = jest.spyOn(
 describe('ActiveWorkflowRunner', () => {
 	let externalHooks: ExternalHooks;
 	let activeWorkflowRunner: ActiveWorkflowRunner;
+	let webhookRepository = mock<WebhookRepository>();
 
 	beforeAll(async () => {
 		LoggerProxy.init(getLogger());
@@ -160,6 +162,7 @@ describe('ActiveWorkflowRunner', () => {
 			new ActiveExecutions(),
 			externalHooks,
 			Container.get(NodeTypes),
+			webhookRepository,
 		);
 	});
 
@@ -174,7 +177,7 @@ describe('ActiveWorkflowRunner', () => {
 		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(0);
 		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
-		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
+		expect(mocked(webhookRepository.clear)).toHaveBeenCalled();
 		expect(externalHooks.run).toHaveBeenCalledTimes(1);
 	});
 
@@ -185,7 +188,7 @@ describe('ActiveWorkflowRunner', () => {
 			databaseActiveWorkflowsCount,
 		);
 		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
-		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
+		expect(mocked(webhookRepository.clear)).toHaveBeenCalled();
 		expect(externalHooks.run).toHaveBeenCalled();
 	});
 

From c065ba0af325e578df4406db6006afe29b4030f8 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Wed, 26 Jul 2023 09:25:01 +0200
Subject: [PATCH 061/116] feat: Environments release using source control
 (#6653)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* initial telemetry setup and adjusted pull return

* quicksave before merge

* feat: add conflicting workflow list to pull modal

* feat: update source control pull modal

* fix: fix linting issue

* feat: add Enter keydown event for submitting source control push modal (no-changelog)

feat: add Enter keydown event for submitting source control push modal

* quicksave

* user workflow table for export

* improve telemetry data

* pull api telemetry

* fix lint

* Copy tweaks.

* remove authorName and authorEmail and pick from user

* rename owners.json to workflow_owners.json

* ignore credential conflicts on pull

* feat: several push/pull flow changes and design update

* pull and push return same data format

* fix: add One last step toast for successful pull

* feat: add up to date pull toast

* fix: add proper Learn more link for push and pull modals

* do not await tracking being sent

* fix import

* fix await

* add more sourcecontrolfile status

* Minor copy tweak for "More info".

* Minor copy tweak for "More info".

* ignore variable_stub conflicts on pull

* ignore whitespace differences

* do not show remote workflows that are not yet created

* fix telemetry

* fix toast when pulling deleted wf

* lint fix

* refactor and make some imports dynamic

* fix variable edit validation

* fix telemetry response

* improve telemetry

* fix unintenional delete commit

* fix status unknown issue

* fix up to date toast

* do not export active state and reapply versionid

* use update instead of upsert

* fix: show all workflows when clicking push to git

* feat: update Up to date pull translation

* fix: update read only env checks

* do not update versionid of only active flag changes

* feat: prevent access to new workflow and templates import when read only env

* feat: send only active state and version if workflow state is not dirty

* fix: Detect when only active state has changed and prevent generation a new version ID

* feat: improve readonly env messages

* make getPreferences public

* fix telemetry issue

* fix: add partial workflow update based on dirty state when changing active state

* update unit tests

* fix: remove unsaved changes check in readOnlyEnv

* fix: disable push to git button when read onyl env

* fix: update readonly toast duration

* fix: fix pinning and title input in protected mode

* initial commit (NOT working)

* working push

* cleanup and implement pull

* fix getstatus

* update import to new method

* var and tag diffs are no conflicts

* only show pull conflict for workflows

* refactor and ignore faulty credentials

* add sanitycheck for missing git folder

* prefer fetch over pull and limit depth to 1

* back to pull...

* fix setting branch on initial connect

* fix test

* remove clean workfolder

* refactor: Remove some unnecessary code

* Fixed links to docs.

* fix getstatus query params

* lint fix

* dialog to show local and remote name on conflict

* only show remote name on conflict

* fix credential expression export

* fix: Broken test

* dont show toast on pull with empty var/tags and refactor

* apply frontend changes from old branch

* fix tag with same name import

* fix buttons shown for non instance owners

* prepare local storage key for removal

* refactor: Change wording on pushing and pulling

* refactor: Change menu item

* test: Fix broken test

* Update packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>

---------

Co-authored-by: Alex Grozav <alex@grozav.com>
Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Omar Ajoue <krynble@gmail.com>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
---
 packages/cli/src/InternalHooks.ts             |  57 ++
 packages/cli/src/Ldap/helpers.ts              |   2 +-
 .../sourceControl/sourceControl.handler.ts    |  18 +-
 .../environments/sourceControl/constants.ts   |   4 +-
 .../sourceControl.controller.ee.ts            | 106 ++-
 .../sourceControl/sourceControl.service.ee.ts | 886 ++++++++++++------
 .../sourceControlExport.service.ee.ts         | 212 ++---
 .../sourceControlGit.service.ee.ts            | 101 +-
 .../sourceControl/sourceControlHelper.ee.ts   | 132 ++-
 .../sourceControlImport.service.ee.ts         | 503 ++++++----
 .../sourceControlPreferences.service.ee.ts    |  10 +-
 .../sourceControl/types/exportResult.ts       |   1 +
 .../sourceControl/types/exportableWorkflow.ts |   2 +-
 .../sourceControl/types/requests.ts           |   2 +
 .../types/sourceControlGetStatus.ts           |  32 +
 .../types/sourceControlPreferences.ts         |  10 +-
 .../types/sourceControlPullWorkFolder.ts      |   2 -
 .../types/sourceControlPushWorkFolder.ts      |  12 +-
 .../types/sourceControlWorkflowVersionId.ts   |   9 +
 .../types/sourceControlledFile.ts             |   3 +
 .../variables/variables.service.ee.ts         |   2 +-
 packages/cli/src/telemetry/index.ts           |  10 +-
 .../cli/src/workflows/workflows.services.ts   |  28 +-
 .../environments/SourceControl.test.ts        |  72 ++
 .../environments/VersionControl.test.ts       |  27 -
 .../workflows.controller.ee.test.ts           |   9 +-
 packages/cli/test/unit/SourceControl.test.ts  | 256 +++++
 packages/cli/test/unit/VersionControl.test.ts |  11 -
 packages/editor-ui/src/Interface.ts           |   2 -
 .../server/endpoints/sourceControl.ts         |   2 -
 packages/editor-ui/src/api/sourceControl.ts   |   7 +-
 .../components/MainHeader/WorkflowDetails.vue |  25 +-
 .../components/MainSidebarSourceControl.vue   |  65 +-
 .../editor-ui/src/components/NodeSettings.vue |   2 +-
 packages/editor-ui/src/components/RunData.vue |  12 +-
 .../src/components/SettingsSidebar.vue        |   1 -
 .../components/SourceControlPullModal.ee.vue  |  80 +-
 .../components/SourceControlPushModal.ee.vue  | 199 ++--
 .../MainSidebarSourceControl.test.ts          |   8 +-
 .../layouts/ResourcesListLayout.vue           |   2 +-
 .../editor-ui/src/event-bus/source-control.ts |   3 +
 .../editor-ui/src/mixins/workflowActivate.ts  |   5 +-
 .../editor-ui/src/mixins/workflowHelpers.ts   |  13 +-
 .../src/plugins/i18n/locales/en.json          |  69 +-
 packages/editor-ui/src/router.ts              |   7 +-
 .../src/stores/sourceControl.store.ts         |  20 +-
 packages/editor-ui/src/stores/ui.store.ts     |  10 -
 packages/editor-ui/src/views/NodeView.vue     |  76 +-
 .../src/views/SettingsSourceControl.vue       |  80 +-
 .../editor-ui/src/views/WorkflowsView.vue     |  18 +
 .../__tests__/SettingsSourceControl.test.ts   |  17 -
 51 files changed, 2194 insertions(+), 1048 deletions(-)
 create mode 100644 packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts
 create mode 100644 packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts
 create mode 100644 packages/cli/test/integration/environments/SourceControl.test.ts
 delete mode 100644 packages/cli/test/integration/environments/VersionControl.test.ts
 create mode 100644 packages/cli/test/unit/SourceControl.test.ts
 delete mode 100644 packages/cli/test/unit/VersionControl.test.ts
 create mode 100644 packages/editor-ui/src/event-bus/source-control.ts

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 913bad4b0b0ed..8fe2bc42f5191 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -54,6 +54,14 @@ function userToPayload(user: User): {
 export class InternalHooks implements IInternalHooksClass {
 	private instanceId: string;
 
+	public get telemetryInstanceId(): string {
+		return this.instanceId;
+	}
+
+	public get telemetryInstance(): Telemetry {
+		return this.telemetry;
+	}
+
 	constructor(
 		private telemetry: Telemetry,
 		private nodeTypes: NodeTypes,
@@ -1043,4 +1051,53 @@ export class InternalHooks implements IInternalHooksClass {
 	async onVariableCreated(createData: { variable_type: string }): Promise<void> {
 		return this.telemetry.track('User created variable', createData);
 	}
+
+	async onSourceControlSettingsUpdated(data: {
+		branch_name: string;
+		read_only_instance: boolean;
+		repo_type: 'github' | 'gitlab' | 'other';
+		connected: boolean;
+	}): Promise<void> {
+		return this.telemetry.track('User updated source control settings', data);
+	}
+
+	async onSourceControlUserStartedPullUI(data: {
+		workflow_updates: number;
+		workflow_conflicts: number;
+		cred_conflicts: number;
+	}): Promise<void> {
+		return this.telemetry.track('User started pull via UI', data);
+	}
+
+	async onSourceControlUserFinishedPullUI(data: { workflow_updates: number }): Promise<void> {
+		return this.telemetry.track('User finished pull via UI', {
+			workflow_updates: data.workflow_updates,
+		});
+	}
+
+	async onSourceControlUserPulledAPI(data: {
+		workflow_updates: number;
+		forced: boolean;
+	}): Promise<void> {
+		return this.telemetry.track('User pulled via API', data);
+	}
+
+	async onSourceControlUserStartedPushUI(data: {
+		workflows_eligible: number;
+		workflows_eligible_with_conflicts: number;
+		creds_eligible: number;
+		creds_eligible_with_conflicts: number;
+		variables_eligible: number;
+	}): Promise<void> {
+		return this.telemetry.track('User started push via UI', data);
+	}
+
+	async onSourceControlUserFinishedPushUI(data: {
+		workflows_eligible: number;
+		workflows_pushed: number;
+		creds_pushed: number;
+		variables_pushed: number;
+	}): Promise<void> {
+		return this.telemetry.track('User finished push via UI', data);
+	}
 }
diff --git a/packages/cli/src/Ldap/helpers.ts b/packages/cli/src/Ldap/helpers.ts
index 664d730081cf4..ee94b22ce0b6c 100644
--- a/packages/cli/src/Ldap/helpers.ts
+++ b/packages/cli/src/Ldap/helpers.ts
@@ -217,7 +217,7 @@ export const handleLdapInit = async (): Promise<void> => {
 	try {
 		await setGlobalLdapConfigVariables(ldapConfig);
 	} catch (error) {
-		Logger.error(
+		Logger.warn(
 			`Cannot set LDAP login enabled state when an authentication method other than email or ldap is active (current: ${getCurrentAuthenticationMethod()})`,
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			error,
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
index 5353a8fdb6280..e0d06b93a880c 100644
--- a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
@@ -6,7 +6,11 @@ import { authorize } from '../../shared/middlewares/global.middleware';
 import type { ImportResult } from '@/environments/sourceControl/types/importResult';
 import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
 import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
-import { isSourceControlLicensed } from '@/environments/sourceControl/sourceControlHelper.ee';
+import {
+	getTrackingInformationFromPullResult,
+	isSourceControlLicensed,
+} from '@/environments/sourceControl/sourceControlHelper.ee';
+import { InternalHooks } from '@/InternalHooks';
 
 export = {
 	pull: [
@@ -32,12 +36,16 @@ export = {
 					force: req.body.force,
 					variables: req.body.variables,
 					userId: req.user.id,
-					importAfterPull: true,
 				});
-				if ((result as ImportResult)?.workflows) {
-					return res.status(200).send(result as ImportResult);
+
+				if (result.statusCode === 200) {
+					void Container.get(InternalHooks).onSourceControlUserPulledAPI({
+						...getTrackingInformationFromPullResult(result.statusResult),
+						forced: req.body.force ?? false,
+					});
+					return res.status(200).send(result.statusResult);
 				} else {
-					return res.status(409).send(result);
+					return res.status(409).send(result.statusResult);
 				}
 			} catch (error) {
 				return res.status(400).send((error as { message: string }).message);
diff --git a/packages/cli/src/environments/sourceControl/constants.ts b/packages/cli/src/environments/sourceControl/constants.ts
index 3ef023f3498da..5b88d858b739c 100644
--- a/packages/cli/src/environments/sourceControl/constants.ts
+++ b/packages/cli/src/environments/sourceControl/constants.ts
@@ -5,7 +5,7 @@ export const SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER = 'workflows';
 export const SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER = 'credential_stubs';
 export const SOURCE_CONTROL_VARIABLES_EXPORT_FILE = 'variable_stubs.json';
 export const SOURCE_CONTROL_TAGS_EXPORT_FILE = 'tags.json';
-export const SOURCE_CONTROL_OWNERS_EXPORT_FILE = 'owners.json';
+export const SOURCE_CONTROL_OWNERS_EXPORT_FILE = 'workflow_owners.json';
 export const SOURCE_CONTROL_SSH_FOLDER = 'ssh';
 export const SOURCE_CONTROL_SSH_KEY_NAME = 'key';
 export const SOURCE_CONTROL_DEFAULT_BRANCH = 'main';
@@ -14,3 +14,5 @@ export const SOURCE_CONTROL_API_ROOT = 'source-control';
 export const SOURCE_CONTROL_README = `
 # n8n Source Control
 `;
+export const SOURCE_CONTROL_DEFAULT_NAME = 'n8n user';
+export const SOURCE_CONTROL_DEFAULT_EMAIL = 'n8n@example.com';
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
index 7c0497d4a6e62..b932673011585 100644
--- a/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
@@ -1,6 +1,3 @@
-import express from 'express';
-import { Service } from 'typedi';
-import type { PullResult, PushResult, StatusResult } from 'simple-git';
 import { Authorized, Get, Post, Patch, RestController } from '@/decorators';
 import {
 	sourceControlLicensedMiddleware,
@@ -8,12 +5,18 @@ import {
 } from './middleware/sourceControlEnabledMiddleware.ee';
 import { SourceControlService } from './sourceControl.service.ee';
 import { SourceControlRequest } from './types/requests';
-import type { SourceControlPreferences } from './types/sourceControlPreferences';
-import { BadRequestError } from '@/ResponseHelper';
-import type { ImportResult } from './types/importResult';
 import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
+import type { SourceControlPreferences } from './types/sourceControlPreferences';
 import type { SourceControlledFile } from './types/sourceControlledFile';
 import { SOURCE_CONTROL_API_ROOT, SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
+import { BadRequestError } from '@/ResponseHelper';
+import type { PullResult } from 'simple-git';
+import express from 'express';
+import type { ImportResult } from './types/importResult';
+import Container, { Service } from 'typedi';
+import { InternalHooks } from '../../InternalHooks';
+import { getRepoType } from './sourceControlHelper.ee';
+import { SourceControlGetStatus } from './types/sourceControlGetStatus';
 
 @Service()
 @RestController(`/${SOURCE_CONTROL_API_ROOT}`)
@@ -23,7 +26,7 @@ export class SourceControlController {
 		private sourceControlPreferencesService: SourceControlPreferencesService,
 	) {}
 
-	@Authorized('any')
+	@Authorized('none')
 	@Get('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
 	async getPreferences(): Promise<SourceControlPreferences> {
 		// returns the settings with the privateKey property redacted
@@ -56,14 +59,17 @@ export class SourceControlController {
 			);
 			if (sanitizedPreferences.initRepo === true) {
 				try {
-					await this.sourceControlService.initializeRepository({
-						...updatedPreferences,
-						branchName:
-							updatedPreferences.branchName === ''
-								? SOURCE_CONTROL_DEFAULT_BRANCH
-								: updatedPreferences.branchName,
-						initRepo: true,
-					});
+					await this.sourceControlService.initializeRepository(
+						{
+							...updatedPreferences,
+							branchName:
+								updatedPreferences.branchName === ''
+									? SOURCE_CONTROL_DEFAULT_BRANCH
+									: updatedPreferences.branchName,
+							initRepo: true,
+						},
+						req.user,
+					);
 					if (this.sourceControlPreferencesService.getPreferences().branchName !== '') {
 						await this.sourceControlPreferencesService.setPreferences({
 							connected: true,
@@ -76,7 +82,17 @@ export class SourceControlController {
 				}
 			}
 			await this.sourceControlService.init();
-			return this.sourceControlPreferencesService.getPreferences();
+			const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
+			// #region Tracking Information
+			// located in controller so as to not call this multiple times when updating preferences
+			void Container.get(InternalHooks).onSourceControlSettingsUpdated({
+				branch_name: resultingPreferences.branchName,
+				connected: resultingPreferences.connected,
+				read_only_instance: resultingPreferences.branchReadOnly,
+				repo_type: getRepoType(resultingPreferences.repositoryUrl),
+			});
+			// #endregion
+			return resultingPreferences;
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
@@ -92,8 +108,6 @@ export class SourceControlController {
 				connected: undefined,
 				publicKey: undefined,
 				repositoryUrl: undefined,
-				authorName: undefined,
-				authorEmail: undefined,
 			};
 			const currentPreferences = this.sourceControlPreferencesService.getPreferences();
 			await this.sourceControlPreferencesService.validateSourceControlPreferences(
@@ -115,7 +129,14 @@ export class SourceControlController {
 				);
 			}
 			await this.sourceControlService.init();
-			return this.sourceControlPreferencesService.getPreferences();
+			const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
+			void Container.get(InternalHooks).onSourceControlSettingsUpdated({
+				branch_name: resultingPreferences.branchName,
+				connected: resultingPreferences.connected,
+				read_only_instance: resultingPreferences.branchReadOnly,
+				repo_type: getRepoType(resultingPreferences.repositoryUrl),
+			});
+			return resultingPreferences;
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
@@ -146,18 +167,18 @@ export class SourceControlController {
 	async pushWorkfolder(
 		req: SourceControlRequest.PushWorkFolder,
 		res: express.Response,
-	): Promise<PushResult | SourceControlledFile[]> {
+	): Promise<SourceControlledFile[]> {
 		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
 			throw new BadRequestError('Cannot push onto read-only branch.');
 		}
 		try {
+			await this.sourceControlService.setGitUserDetails(
+				`${req.user.firstName} ${req.user.lastName}`,
+				req.user.email,
+			);
 			const result = await this.sourceControlService.pushWorkfolder(req.body);
-			if ((result as PushResult).pushed) {
-				res.statusCode = 200;
-			} else {
-				res.statusCode = 409;
-			}
-			return result;
+			res.statusCode = result.statusCode;
+			return result.statusResult;
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
@@ -168,20 +189,15 @@ export class SourceControlController {
 	async pullWorkfolder(
 		req: SourceControlRequest.PullWorkFolder,
 		res: express.Response,
-	): Promise<SourceControlledFile[] | ImportResult | PullResult | StatusResult | undefined> {
+	): Promise<SourceControlledFile[] | ImportResult | PullResult | undefined> {
 		try {
 			const result = await this.sourceControlService.pullWorkfolder({
 				force: req.body.force,
 				variables: req.body.variables,
 				userId: req.user.id,
-				importAfterPull: req.body.importAfterPull ?? true,
 			});
-			if ((result as ImportResult)?.workflows) {
-				res.statusCode = 200;
-			} else {
-				res.statusCode = 409;
-			}
-			return result;
+			res.statusCode = result.statusCode;
+			return result.statusResult;
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
@@ -189,16 +205,9 @@ export class SourceControlController {
 
 	@Authorized(['global', 'owner'])
 	@Get('/reset-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
-	async resetWorkfolder(
-		req: SourceControlRequest.PullWorkFolder,
-	): Promise<ImportResult | undefined> {
+	async resetWorkfolder(): Promise<ImportResult | undefined> {
 		try {
-			return await this.sourceControlService.resetWorkfolder({
-				force: req.body.force,
-				variables: req.body.variables,
-				userId: req.user.id,
-				importAfterPull: req.body.importAfterPull ?? true,
-			});
+			return await this.sourceControlService.resetWorkfolder();
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
@@ -206,9 +215,12 @@ export class SourceControlController {
 
 	@Authorized('any')
 	@Get('/get-status', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
-	async getStatus() {
+	async getStatus(req: SourceControlRequest.GetStatus) {
 		try {
-			return await this.sourceControlService.getStatus();
+			const result = (await this.sourceControlService.getStatus(
+				new SourceControlGetStatus(req.query),
+			)) as SourceControlledFile[];
+			return result;
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
@@ -216,9 +228,9 @@ export class SourceControlController {
 
 	@Authorized('any')
 	@Get('/status', { middlewares: [sourceControlLicensedMiddleware] })
-	async status(): Promise<StatusResult> {
+	async status(req: SourceControlRequest.GetStatus) {
 		try {
-			return await this.sourceControlService.status();
+			return await this.sourceControlService.getStatus(new SourceControlGetStatus(req.query));
 		} catch (error) {
 			throw new BadRequestError((error as { message: string }).message);
 		}
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
index 8dea0e077188a..f3cc7a833b9e9 100644
--- a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
@@ -1,40 +1,44 @@
-import { Service } from 'typedi';
+import Container, { Service } from 'typedi';
 import path from 'path';
 import * as Db from '@/Db';
-import { sourceControlFoldersExistCheck } from './sourceControlHelper.ee';
+import {
+	getTagsPath,
+	getTrackingInformationFromPostPushResult,
+	getTrackingInformationFromPrePushResult,
+	getTrackingInformationFromPullResult,
+	getVariablesPath,
+	sourceControlFoldersExistCheck,
+} from './sourceControlHelper.ee';
 import type { SourceControlPreferences } from './types/sourceControlPreferences';
 import {
-	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
+	SOURCE_CONTROL_DEFAULT_EMAIL,
+	SOURCE_CONTROL_DEFAULT_NAME,
 	SOURCE_CONTROL_GIT_FOLDER,
 	SOURCE_CONTROL_README,
 	SOURCE_CONTROL_SSH_FOLDER,
 	SOURCE_CONTROL_SSH_KEY_NAME,
-	SOURCE_CONTROL_TAGS_EXPORT_FILE,
-	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
-	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
 } from './constants';
 import { LoggerProxy } from 'n8n-workflow';
 import { SourceControlGitService } from './sourceControlGit.service.ee';
 import { UserSettings } from 'n8n-core';
-import type { PushResult, StatusResult } from 'simple-git';
-import type { ExportResult } from './types/exportResult';
+import type { PushResult } from 'simple-git';
 import { SourceControlExportService } from './sourceControlExport.service.ee';
-import { BadRequestError } from '../../ResponseHelper';
+import { BadRequestError } from '@/ResponseHelper';
 import type { ImportResult } from './types/importResult';
 import type { SourceControlPushWorkFolder } from './types/sourceControlPushWorkFolder';
 import type { SourceControllPullOptions } from './types/sourceControlPullWorkFolder';
-import type {
-	SourceControlledFileLocation,
-	SourceControlledFile,
-	SourceControlledFileStatus,
-	SourceControlledFileType,
-} from './types/sourceControlledFile';
+import type { SourceControlledFile } from './types/sourceControlledFile';
 import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
 import { writeFileSync } from 'fs';
 import { SourceControlImportService } from './sourceControlImport.service.ee';
-import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
-
+import type { User } from '@db/entities/User';
+import isEqual from 'lodash/isEqual';
+import type { SourceControlGetStatus } from './types/sourceControlGetStatus';
+import type { TagEntity } from '@db/entities/TagEntity';
+import type { Variables } from '@db/entities/Variables';
+import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
+import type { ExportableCredential } from './types/exportableCredential';
+import { InternalHooks } from '@/InternalHooks';
 @Service()
 export class SourceControlService {
 	private sshKeyName: string;
@@ -59,6 +63,12 @@ export class SourceControlService {
 		this.gitService.resetService();
 		sourceControlFoldersExistCheck([this.gitFolder, this.sshFolder]);
 		await this.sourceControlPreferencesService.loadFromDbAndApplySourceControlPreferences();
+		if (this.sourceControlPreferencesService.isSourceControlLicensedAndEnabled()) {
+			await this.initGitService();
+		}
+	}
+
+	private async initGitService(): Promise<void> {
 		await this.gitService.initService({
 			sourceControlPreferences: this.sourceControlPreferencesService.getPreferences(),
 			gitFolder: this.gitFolder,
@@ -67,6 +77,33 @@ export class SourceControlService {
 		});
 	}
 
+	private async sanityCheck(): Promise<void> {
+		try {
+			const foldersExisted = sourceControlFoldersExistCheck(
+				[this.gitFolder, this.sshFolder],
+				false,
+			);
+			if (!foldersExisted) {
+				throw new Error();
+			}
+			if (!this.gitService.git) {
+				await this.initGitService();
+			}
+			const branches = await this.gitService.getCurrentBranch();
+			if (
+				branches.current === '' ||
+				branches.current !==
+					this.sourceControlPreferencesService.sourceControlPreferences.branchName
+			) {
+				throw new Error();
+			}
+		} catch (error) {
+			throw new BadRequestError(
+				'Source control is not properly set up, please disconnect and reconnect.',
+			);
+		}
+	}
+
 	async disconnect(options: { keepKeyPair?: boolean } = {}) {
 		try {
 			await this.sourceControlPreferencesService.setPreferences({
@@ -84,12 +121,12 @@ export class SourceControlService {
 		}
 	}
 
-	async initializeRepository(preferences: SourceControlPreferences) {
+	async initializeRepository(preferences: SourceControlPreferences, user: User) {
 		if (!this.gitService.git) {
-			await this.init();
+			await this.initGitService();
 		}
 		LoggerProxy.debug('Initializing repository...');
-		await this.gitService.initRepository(preferences);
+		await this.gitService.initRepository(preferences, user);
 		let getBranchesResult;
 		try {
 			getBranchesResult = await this.getBranches();
@@ -115,59 +152,32 @@ export class SourceControlService {
 						force: true,
 					});
 					getBranchesResult = await this.getBranches();
+					await this.gitService.setBranch(preferences.branchName);
 				} catch (fileError) {
 					LoggerProxy.error(`Failed to create initial commit: ${(fileError as Error).message}`);
 				}
-			} else {
-				await this.sourceControlPreferencesService.setPreferences({
-					branchName: '',
-					connected: true,
-				});
 			}
 		}
+		await this.sourceControlPreferencesService.setPreferences({
+			branchName: getBranchesResult.currentBranch,
+			connected: true,
+		});
 		return getBranchesResult;
 	}
 
-	async export() {
-		const result: {
-			tags: ExportResult | undefined;
-			credentials: ExportResult | undefined;
-			variables: ExportResult | undefined;
-			workflows: ExportResult | undefined;
-		} = {
-			credentials: undefined,
-			tags: undefined,
-			variables: undefined,
-			workflows: undefined,
-		};
-		try {
-			// comment next line if needed
-			await this.sourceControlExportService.cleanWorkFolder();
-			result.tags = await this.sourceControlExportService.exportTagsToWorkFolder();
-			result.variables = await this.sourceControlExportService.exportVariablesToWorkFolder();
-			result.workflows = await this.sourceControlExportService.exportWorkflowsToWorkFolder();
-			result.credentials = await this.sourceControlExportService.exportCredentialsToWorkFolder();
-		} catch (error) {
-			throw new BadRequestError((error as { message: string }).message);
-		}
-		return result;
-	}
-
-	async import(options: SourceControllPullOptions): Promise<ImportResult | undefined> {
-		try {
-			return await this.sourceControlImportService.importFromWorkFolder(options);
-		} catch (error) {
-			throw new BadRequestError((error as { message: string }).message);
-		}
-	}
-
 	async getBranches(): Promise<{ branches: string[]; currentBranch: string }> {
 		// fetch first to get include remote changes
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
 		await this.gitService.fetch();
 		return this.gitService.getBranches();
 	}
 
 	async setBranch(branch: string): Promise<{ branches: string[]; currentBranch: string }> {
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
 		await this.sourceControlPreferencesService.setPreferences({
 			branchName: branch,
 			connected: branch?.length > 0,
@@ -177,282 +187,584 @@ export class SourceControlService {
 
 	// will reset the branch to the remote branch and pull
 	// this will discard all local changes
-	async resetWorkfolder(options: SourceControllPullOptions): Promise<ImportResult | undefined> {
-		const currentBranch = await this.gitService.getCurrentBranch();
-		await this.sourceControlExportService.cleanWorkFolder();
-		await this.gitService.resetBranch({
-			hard: true,
-			target: currentBranch.remote,
-		});
-		await this.gitService.pull();
-		if (options.importAfterPull) {
-			return this.import(options);
+	async resetWorkfolder(): Promise<ImportResult | undefined> {
+		if (!this.gitService.git) {
+			await this.initGitService();
+		}
+		try {
+			await this.gitService.resetBranch();
+			await this.gitService.pull();
+		} catch (error) {
+			LoggerProxy.error(`Failed to reset workfolder: ${(error as Error).message}`);
+			throw new Error(
+				'Unable to fetch updates from git - your folder might be out of sync. Try reconnecting from the Source Control settings page.',
+			);
 		}
 		return;
 	}
 
-	async pushWorkfolder(
-		options: SourceControlPushWorkFolder,
-	): Promise<PushResult | SourceControlledFile[]> {
+	async pushWorkfolder(options: SourceControlPushWorkFolder): Promise<{
+		statusCode: number;
+		pushResult: PushResult | undefined;
+		statusResult: SourceControlledFile[];
+	}> {
+		await this.sanityCheck();
+
 		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
 			throw new BadRequestError('Cannot push onto read-only branch.');
 		}
-		if (!options.skipDiff) {
-			const diffResult = await this.getStatus();
-			const possibleConflicts = diffResult?.filter((file) => file.conflict);
-			if (possibleConflicts?.length > 0 && options.force !== true) {
-				await this.unstage();
-				return diffResult;
+
+		// only determine file status if not provided by the frontend
+		let statusResult: SourceControlledFile[] = options.fileNames;
+		if (statusResult.length === 0) {
+			statusResult = (await this.getStatus({
+				direction: 'push',
+				verbose: false,
+				preferLocalVersion: true,
+			})) as SourceControlledFile[];
+		}
+
+		if (!options.force) {
+			const possibleConflicts = statusResult?.filter((file) => file.conflict);
+			if (possibleConflicts?.length > 0) {
+				return {
+					statusCode: 409,
+					pushResult: undefined,
+					statusResult,
+				};
+			}
+		}
+
+		const filesToBePushed = new Set<string>();
+		const filesToBeDeleted = new Set<string>();
+		options.fileNames.forEach((e) => {
+			if (e.status !== 'deleted') {
+				filesToBePushed.add(e.file);
+			} else {
+				filesToBeDeleted.add(e.file);
+			}
+		});
+
+		this.sourceControlExportService.rmFilesFromExportFolder(filesToBeDeleted);
+
+		const workflowsToBeExported = options.fileNames.filter(
+			(e) => e.type === 'workflow' && e.status !== 'deleted',
+		);
+		await this.sourceControlExportService.exportWorkflowsToWorkFolder(workflowsToBeExported);
+
+		const credentialsToBeExported = options.fileNames.filter(
+			(e) => e.type === 'credential' && e.status !== 'deleted',
+		);
+		const credentialExportResult =
+			await this.sourceControlExportService.exportCredentialsToWorkFolder(credentialsToBeExported);
+		if (credentialExportResult.missingIds && credentialExportResult.missingIds.length > 0) {
+			credentialExportResult.missingIds.forEach((id) => {
+				filesToBePushed.delete(this.sourceControlExportService.getCredentialsPath(id));
+				statusResult = statusResult.filter(
+					(e) => e.file !== this.sourceControlExportService.getCredentialsPath(id),
+				);
+			});
+		}
+
+		if (options.fileNames.find((e) => e.type === 'tags')) {
+			await this.sourceControlExportService.exportTagsToWorkFolder();
+		}
+
+		if (options.fileNames.find((e) => e.type === 'variables')) {
+			await this.sourceControlExportService.exportVariablesToWorkFolder();
+		}
+
+		await this.gitService.stage(filesToBePushed, filesToBeDeleted);
+
+		for (let i = 0; i < statusResult.length; i++) {
+			// eslint-disable-next-line @typescript-eslint/no-loop-func
+			if (options.fileNames.find((file) => file.file === statusResult[i].file)) {
+				statusResult[i].pushed = true;
 			}
 		}
-		await this.unstage();
-		await this.stage(options);
+
 		await this.gitService.commit(options.message ?? 'Updated Workfolder');
-		return this.gitService.push({
+
+		const pushResult = await this.gitService.push({
 			branch: this.sourceControlPreferencesService.getBranchName(),
 			force: options.force ?? false,
 		});
+
+		// #region Tracking Information
+		void Container.get(InternalHooks).onSourceControlUserFinishedPushUI(
+			getTrackingInformationFromPostPushResult(statusResult),
+		);
+		// #endregion
+
+		return {
+			statusCode: 200,
+			pushResult,
+			statusResult,
+		};
 	}
 
 	async pullWorkfolder(
 		options: SourceControllPullOptions,
-	): Promise<ImportResult | StatusResult | undefined> {
-		await this.resetWorkfolder({
-			importAfterPull: false,
-			userId: options.userId,
-			force: false,
+	): Promise<{ statusCode: number; statusResult: SourceControlledFile[] }> {
+		await this.sanityCheck();
+
+		const statusResult = (await this.getStatus({
+			direction: 'pull',
+			verbose: false,
+			preferLocalVersion: false,
+		})) as SourceControlledFile[];
+
+		// filter out items that will not effect a local change and thus should not
+		// trigger a conflict warning in the frontend
+		const filteredResult = statusResult.filter((e) => {
+			// locally created credentials will not create a conflict on pull
+			if (e.status === 'created' && e.location === 'local') {
+				return false;
+			}
+			// remotely deleted credentials will not delete local credentials
+			if (e.type === 'credential' && e.status === 'deleted') {
+				return false;
+			}
+			return true;
 		});
-		await this.export(); // refresh workfolder
-		const status = await this.gitService.status();
 
-		if (status.modified.length > 0 && options.force !== true) {
-			return status;
-		}
-		await this.resetWorkfolder({ ...options, importAfterPull: false });
-		if (options.importAfterPull) {
-			return this.import(options);
+		if (options.force !== true) {
+			const possibleConflicts = filteredResult?.filter(
+				(file) => (file.conflict || file.status === 'modified') && file.type === 'workflow',
+			);
+			if (possibleConflicts?.length > 0) {
+				await this.gitService.resetBranch();
+				return {
+					statusCode: 409,
+					statusResult: filteredResult,
+				};
+			}
 		}
-		return;
-	}
 
-	async stage(
-		options: Pick<SourceControlPushWorkFolder, 'fileNames' | 'credentialIds' | 'workflowIds'>,
-	): Promise<{ staged: string[] } | string> {
-		const { fileNames, credentialIds, workflowIds } = options;
-		const status = await this.gitService.status();
-		let mergedFileNames = new Set<string>();
-		fileNames?.forEach((e) => mergedFileNames.add(e));
-		credentialIds?.forEach((e) =>
-			mergedFileNames.add(this.sourceControlExportService.getCredentialsPath(e)),
+		const workflowsToBeImported = statusResult.filter(
+			(e) => e.type === 'workflow' && e.status !== 'deleted',
+		);
+		await this.sourceControlImportService.importWorkflowFromWorkFolder(
+			workflowsToBeImported,
+			options.userId,
+		);
+
+		const credentialsToBeImported = statusResult.filter(
+			(e) => e.type === 'credential' && e.status !== 'deleted',
 		);
-		workflowIds?.forEach((e) =>
-			mergedFileNames.add(this.sourceControlExportService.getWorkflowPath(e)),
+		await this.sourceControlImportService.importCredentialsFromWorkFolder(
+			credentialsToBeImported,
+			options.userId,
 		);
-		if (mergedFileNames.size === 0) {
-			mergedFileNames = new Set<string>([
-				...status.not_added,
-				...status.created,
-				...status.modified,
-			]);
+
+		const tagsToBeImported = statusResult.find((e) => e.type === 'tags');
+		if (tagsToBeImported) {
+			await this.sourceControlImportService.importTagsFromWorkFolder(tagsToBeImported);
 		}
-		mergedFileNames.add(this.sourceControlExportService.getOwnersPath());
-		const deletedFiles = new Set<string>(status.deleted);
-		deletedFiles.forEach((e) => mergedFileNames.delete(e));
-		await this.unstage();
-		const stageResult = await this.gitService.stage(mergedFileNames, deletedFiles);
-		if (!stageResult) {
-			const statusResult = await this.gitService.status();
-			return { staged: statusResult.staged };
+
+		const variablesToBeImported = statusResult.find((e) => e.type === 'variables');
+		if (variablesToBeImported) {
+			await this.sourceControlImportService.importVariablesFromWorkFolder(variablesToBeImported);
 		}
-		return stageResult;
+
+		// #region Tracking Information
+		void Container.get(InternalHooks).onSourceControlUserFinishedPullUI(
+			getTrackingInformationFromPullResult(statusResult),
+		);
+		// #endregion
+
+		return {
+			statusCode: 200,
+			statusResult: filteredResult,
+		};
 	}
 
-	async unstage(): Promise<StatusResult | string> {
-		const stageResult = await this.gitService.resetBranch();
-		if (!stageResult) {
-			return this.gitService.status();
+	/**
+	 * Does a comparison between the local and remote workfolder based on NOT the git status,
+	 * but certain parameters within the items being synced.
+	 * For workflows, it compares the versionIds
+	 * For credentials, it compares the name, type and nodeAccess
+	 * For variables, it compares the name
+	 * For tags, it compares the name and mapping
+	 * @returns either SourceControlledFile[] if verbose is false,
+	 * or multiple SourceControlledFile[] with all determined differences for debugging purposes
+	 */
+	async getStatus(options: SourceControlGetStatus) {
+		await this.sanityCheck();
+
+		const sourceControlledFiles: SourceControlledFile[] = [];
+
+		// fetch and reset hard first
+		await this.resetWorkfolder();
+
+		const {
+			wfRemoteVersionIds,
+			wfLocalVersionIds,
+			wfMissingInLocal,
+			wfMissingInRemote,
+			wfModifiedInEither,
+		} = await this.getStatusWorkflows(options, sourceControlledFiles);
+
+		const { credMissingInLocal, credMissingInRemote, credModifiedInEither } =
+			await this.getStatusCredentials(options, sourceControlledFiles);
+
+		const { varMissingInLocal, varMissingInRemote, varModifiedInEither } =
+			await this.getStatusVariables(options, sourceControlledFiles);
+
+		const {
+			tagsMissingInLocal,
+			tagsMissingInRemote,
+			tagsModifiedInEither,
+			mappingsMissingInLocal,
+			mappingsMissingInRemote,
+		} = await this.getStatusTagsMappings(options, sourceControlledFiles);
+
+		// #region Tracking Information
+		if (options.direction === 'push') {
+			void Container.get(InternalHooks).onSourceControlUserStartedPushUI(
+				getTrackingInformationFromPrePushResult(sourceControlledFiles),
+			);
+		} else if (options.direction === 'pull') {
+			void Container.get(InternalHooks).onSourceControlUserStartedPullUI(
+				getTrackingInformationFromPullResult(sourceControlledFiles),
+			);
 		}
-		return stageResult;
-	}
+		// #endregion
 
-	async status(): Promise<StatusResult> {
-		return this.gitService.status();
+		if (options?.verbose) {
+			return {
+				wfRemoteVersionIds,
+				wfLocalVersionIds,
+				wfMissingInLocal,
+				wfMissingInRemote,
+				wfModifiedInEither,
+				credMissingInLocal,
+				credMissingInRemote,
+				credModifiedInEither,
+				varMissingInLocal,
+				varMissingInRemote,
+				varModifiedInEither,
+				tagsMissingInLocal,
+				tagsMissingInRemote,
+				tagsModifiedInEither,
+				mappingsMissingInLocal,
+				mappingsMissingInRemote,
+				sourceControlledFiles,
+			};
+		} else {
+			return sourceControlledFiles;
+		}
 	}
 
-	private async fileNameToSourceControlledFile(
-		fileName: string,
-		location: SourceControlledFileLocation,
-		statusResult: StatusResult,
-	): Promise<SourceControlledFile | undefined> {
-		let id: string | undefined = undefined;
-		let name = '';
-		let conflict = false;
-		let status: SourceControlledFileStatus = 'unknown';
-		let type: SourceControlledFileType = 'file';
-		let updatedAt = '';
-
-		const allWorkflows: Map<string, WorkflowEntity> = new Map();
-		(await Db.collections.Workflow.find({ select: ['id', 'name', 'updatedAt'] })).forEach(
-			(workflow) => {
-				allWorkflows.set(workflow.id, workflow);
-			},
+	private async getStatusWorkflows(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const wfRemoteVersionIds = await this.sourceControlImportService.getRemoteVersionIdsFromFiles();
+		const wfLocalVersionIds = await this.sourceControlImportService.getLocalVersionIdsFromDb();
+
+		const wfMissingInLocal = wfRemoteVersionIds.filter(
+			(remote) => wfLocalVersionIds.findIndex((local) => local.id === remote.id) === -1,
 		);
-		const allCredentials: Map<string, CredentialsEntity> = new Map();
-		(await Db.collections.Credentials.find({ select: ['id', 'name', 'updatedAt'] })).forEach(
-			(credential) => {
-				allCredentials.set(credential.id, credential);
-			},
+
+		const wfMissingInRemote = wfLocalVersionIds.filter(
+			(local) => wfRemoteVersionIds.findIndex((remote) => remote.id === local.id) === -1,
 		);
 
-		// initialize status from git status result
-		if (statusResult.not_added.find((e) => e === fileName)) status = 'new';
-		else if (statusResult.conflicted.find((e) => e === fileName)) {
-			status = 'conflicted';
-			conflict = true;
-		} else if (statusResult.created.find((e) => e === fileName)) status = 'created';
-		else if (statusResult.deleted.find((e) => e === fileName)) status = 'deleted';
-		else if (statusResult.modified.find((e) => e === fileName)) status = 'modified';
-
-		if (fileName.startsWith(SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER)) {
-			type = 'workflow';
-			if (status === 'deleted') {
-				id = fileName
-					.replace(SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER, '')
-					.replace(/[\/,\\]/, '')
-					.replace('.json', '');
-				if (location === 'remote') {
-					const existingWorkflow = allWorkflows.get(id);
-					if (existingWorkflow) {
-						name = existingWorkflow.name;
-						updatedAt = existingWorkflow.updatedAt.toISOString();
-					}
-				} else {
-					name = '(deleted)';
-					// todo: once we have audit log, this deletion date could be looked up
-				}
-			} else {
-				const workflow = await this.sourceControlExportService.getWorkflowFromFile(fileName);
-				if (!workflow?.id) {
-					if (location === 'local') {
-						return;
-					}
-					id = fileName
-						.replace(SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER + '/', '')
-						.replace('.json', '');
-					status = 'created';
-				} else {
-					id = workflow.id;
-					name = workflow.name;
-				}
-				const existingWorkflow = allWorkflows.get(id);
-				if (existingWorkflow) {
-					name = existingWorkflow.name;
-					updatedAt = existingWorkflow.updatedAt.toISOString();
-				}
+		const wfModifiedInEither: SourceControlWorkflowVersionId[] = [];
+		wfLocalVersionIds.forEach((local) => {
+			const mismatchingIds = wfRemoteVersionIds.find(
+				(remote) => remote.id === local.id && remote.versionId !== local.versionId,
+			);
+			let name = (options?.preferLocalVersion ? local?.name : mismatchingIds?.name) ?? 'Workflow';
+			if (local.name && mismatchingIds?.name && local.name !== mismatchingIds.name) {
+				name = options?.preferLocalVersion
+					? `${local.name} (Remote: ${mismatchingIds.name})`
+					: (name = `${mismatchingIds.name} (Local: ${local.name})`);
 			}
-		}
-		if (fileName.startsWith(SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER)) {
-			type = 'credential';
-			if (status === 'deleted') {
-				id = fileName
-					.replace(SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER, '')
-					.replace(/[\/,\\]/, '')
-					.replace('.json', '');
-				if (location === 'remote') {
-					const existingCredential = allCredentials.get(id);
-					if (existingCredential) {
-						name = existingCredential.name;
-						updatedAt = existingCredential.updatedAt.toISOString();
-					}
-				} else {
-					name = '(deleted)';
-				}
-			} else {
-				const credential = await this.sourceControlExportService.getCredentialFromFile(fileName);
-				if (!credential?.id) {
-					if (location === 'local') {
-						return;
-					}
-					id = fileName
-						.replace(SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER + '/', '')
-						.replace('.json', '');
-					status = 'created';
-				} else {
-					id = credential.id;
-					name = credential.name;
-				}
-				const existingCredential = allCredentials.get(id);
-				if (existingCredential) {
-					name = existingCredential.name;
-					updatedAt = existingCredential.updatedAt.toISOString();
-				}
+			if (mismatchingIds) {
+				wfModifiedInEither.push({
+					...local,
+					name,
+					versionId: options.preferLocalVersion ? local.versionId : mismatchingIds.versionId,
+					localId: local.versionId,
+					remoteId: mismatchingIds.versionId,
+				});
 			}
-		}
+		});
 
-		if (fileName.startsWith(SOURCE_CONTROL_VARIABLES_EXPORT_FILE)) {
-			id = 'variables';
-			name = 'variables';
-			type = 'variables';
-		}
+		wfMissingInLocal.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Workflow',
+				type: 'workflow',
+				status: options.direction === 'push' ? 'deleted' : 'created',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: item.updatedAt ?? new Date().toISOString(),
+			});
+		});
 
-		if (fileName.startsWith(SOURCE_CONTROL_TAGS_EXPORT_FILE)) {
-			const lastUpdatedTag = await Db.collections.Tag.find({
-				order: { updatedAt: 'DESC' },
-				take: 1,
-				select: ['updatedAt'],
+		wfMissingInRemote.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Workflow',
+				type: 'workflow',
+				status: options.direction === 'push' ? 'created' : 'deleted',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: item.updatedAt ?? new Date().toISOString(),
 			});
-			id = 'tags';
-			name = 'tags';
-			type = 'tags';
-			updatedAt = lastUpdatedTag[0]?.updatedAt.toISOString();
-		}
+		});
 
-		if (!id) return;
+		wfModifiedInEither.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Workflow',
+				type: 'workflow',
+				status: 'modified',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: true,
+				file: item.filename,
+				updatedAt: item.updatedAt ?? new Date().toISOString(),
+			});
+		});
 
 		return {
-			file: fileName,
-			id,
-			name,
-			type,
-			status,
-			location,
-			conflict,
-			updatedAt,
+			wfRemoteVersionIds,
+			wfLocalVersionIds,
+			wfMissingInLocal,
+			wfMissingInRemote,
+			wfModifiedInEither,
 		};
 	}
 
-	async getStatus(): Promise<SourceControlledFile[]> {
-		await this.export();
-		await this.stage({});
-		await this.gitService.fetch();
-		const sourceControlledFiles: SourceControlledFile[] = [];
-		const diffRemote = await this.gitService.diffRemote();
-		const diffLocal = await this.gitService.diffLocal();
-		const status = await this.gitService.status();
-		await Promise.all([
-			...(diffRemote?.files.map(async (e) => {
-				const resolvedFile = await this.fileNameToSourceControlledFile(e.file, 'remote', status);
-				if (resolvedFile) {
-					sourceControlledFiles.push(resolvedFile);
-				}
-			}) ?? []),
-			...(diffLocal?.files.map(async (e) => {
-				const resolvedFile = await this.fileNameToSourceControlledFile(e.file, 'local', status);
-				if (resolvedFile) {
-					sourceControlledFiles.push(resolvedFile);
-				}
-			}) ?? []),
-		]);
-		sourceControlledFiles.forEach((e, index, array) => {
-			const similarItems = array.filter(
-				(f) => f.type === e.type && (f.file === e.file || f.id === e.id),
+	private async getStatusCredentials(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const credRemoteIds = await this.sourceControlImportService.getRemoteCredentialsFromFiles();
+		const credLocalIds = await this.sourceControlImportService.getLocalCredentialsFromDb();
+
+		const credMissingInLocal = credRemoteIds.filter(
+			(remote) => credLocalIds.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const credMissingInRemote = credLocalIds.filter(
+			(local) => credRemoteIds.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		// only compares the name, since that is the only change synced for credentials
+		const credModifiedInEither: Array<
+			ExportableCredential & {
+				filename: string;
+			}
+		> = [];
+		credLocalIds.forEach((local) => {
+			const mismatchingCreds = credRemoteIds.find((remote) => {
+				return (
+					remote.id === local.id &&
+					(remote.name !== local.name ||
+						remote.type !== local.type ||
+						!isEqual(remote.nodesAccess, local.nodesAccess))
+				);
+			});
+			if (mismatchingCreds) {
+				credModifiedInEither.push({
+					...local,
+					name: options?.preferLocalVersion ? local.name : mismatchingCreds.name,
+				});
+			}
+		});
+
+		credMissingInLocal.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Credential',
+				type: 'credential',
+				status: options.direction === 'push' ? 'deleted' : 'created',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
+		credMissingInRemote.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Credential',
+				type: 'credential',
+				status: options.direction === 'push' ? 'created' : 'deleted',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: item.filename,
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
+		credModifiedInEither.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name ?? 'Credential',
+				type: 'credential',
+				status: 'modified',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: true,
+				file: item.filename,
+				updatedAt: new Date().toISOString(),
+			});
+		});
+		return {
+			credMissingInLocal,
+			credMissingInRemote,
+			credModifiedInEither,
+		};
+	}
+
+	private async getStatusVariables(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const varRemoteIds = await this.sourceControlImportService.getRemoteVariablesFromFile();
+		const varLocalIds = await this.sourceControlImportService.getLocalVariablesFromDb();
+
+		const varMissingInLocal = varRemoteIds.filter(
+			(remote) => varLocalIds.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const varMissingInRemote = varLocalIds.filter(
+			(local) => varRemoteIds.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		const varModifiedInEither: Variables[] = [];
+		varLocalIds.forEach((local) => {
+			const mismatchingIds = varRemoteIds.find(
+				(remote) =>
+					(remote.id === local.id && remote.key !== local.key) ||
+					(remote.id !== local.id && remote.key === local.key),
 			);
-			if (similarItems.length > 1) {
-				similarItems.forEach((item) => {
-					item.conflict = true;
+			if (mismatchingIds) {
+				varModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
+			}
+		});
+
+		if (
+			varMissingInLocal.length > 0 ||
+			varMissingInRemote.length > 0 ||
+			varModifiedInEither.length > 0
+		) {
+			if (options.direction === 'pull' && varRemoteIds.length === 0) {
+				// if there's nothing to pull, don't show difference as modified
+			} else {
+				sourceControlledFiles.push({
+					id: 'variables',
+					name: 'variables',
+					type: 'variables',
+					status: 'modified',
+					location: options.direction === 'push' ? 'local' : 'remote',
+					conflict: false,
+					file: getVariablesPath(this.gitFolder),
+					updatedAt: new Date().toISOString(),
 				});
 			}
+		}
+		return {
+			varMissingInLocal,
+			varMissingInRemote,
+			varModifiedInEither,
+		};
+	}
+
+	private async getStatusTagsMappings(
+		options: SourceControlGetStatus,
+		sourceControlledFiles: SourceControlledFile[],
+	) {
+		const lastUpdatedTag = await Db.collections.Tag.find({
+			order: { updatedAt: 'DESC' },
+			take: 1,
+			select: ['updatedAt'],
+		});
+
+		const tagMappingsRemote =
+			await this.sourceControlImportService.getRemoteTagsAndMappingsFromFile();
+		const tagMappingsLocal = await this.sourceControlImportService.getLocalTagsAndMappingsFromDb();
+
+		const tagsMissingInLocal = tagMappingsRemote.tags.filter(
+			(remote) => tagMappingsLocal.tags.findIndex((local) => local.id === remote.id) === -1,
+		);
+
+		const tagsMissingInRemote = tagMappingsLocal.tags.filter(
+			(local) => tagMappingsRemote.tags.findIndex((remote) => remote.id === local.id) === -1,
+		);
+
+		const tagsModifiedInEither: TagEntity[] = [];
+		tagMappingsLocal.tags.forEach((local) => {
+			const mismatchingIds = tagMappingsRemote.tags.find(
+				(remote) => remote.id === local.id && remote.name !== local.name,
+			);
+			if (!mismatchingIds) {
+				return;
+			}
+			tagsModifiedInEither.push(options.preferLocalVersion ? local : mismatchingIds);
 		});
-		return sourceControlledFiles;
+
+		const mappingsMissingInLocal = tagMappingsRemote.mappings.filter(
+			(remote) =>
+				tagMappingsLocal.mappings.findIndex(
+					(local) => local.tagId === remote.tagId && local.workflowId === remote.workflowId,
+				) === -1,
+		);
+
+		const mappingsMissingInRemote = tagMappingsLocal.mappings.filter(
+			(local) =>
+				tagMappingsRemote.mappings.findIndex(
+					(remote) => remote.tagId === local.tagId && remote.workflowId === remote.workflowId,
+				) === -1,
+		);
+
+		if (
+			tagsMissingInLocal.length > 0 ||
+			tagsMissingInRemote.length > 0 ||
+			tagsModifiedInEither.length > 0 ||
+			mappingsMissingInLocal.length > 0 ||
+			mappingsMissingInRemote.length > 0
+		) {
+			if (
+				options.direction === 'pull' &&
+				tagMappingsRemote.tags.length === 0 &&
+				tagMappingsRemote.mappings.length === 0
+			) {
+				// if there's nothing to pull, don't show difference as modified
+			} else {
+				sourceControlledFiles.push({
+					id: 'mappings',
+					name: 'tags',
+					type: 'tags',
+					status: 'modified',
+					location: options.direction === 'push' ? 'local' : 'remote',
+					conflict: false,
+					file: getTagsPath(this.gitFolder),
+					updatedAt: lastUpdatedTag[0]?.updatedAt.toISOString(),
+				});
+			}
+		}
+		return {
+			tagsMissingInLocal,
+			tagsMissingInRemote,
+			tagsModifiedInEither,
+			mappingsMissingInLocal,
+			mappingsMissingInRemote,
+		};
+	}
+
+	async setGitUserDetails(
+		name = SOURCE_CONTROL_DEFAULT_NAME,
+		email = SOURCE_CONTROL_DEFAULT_EMAIL,
+	): Promise<void> {
+		await this.sanityCheck();
+		await this.gitService.setGitUserDetails(name, email);
 	}
 }
diff --git a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
index 12806dd67aefe..72715772b95bd 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
@@ -3,23 +3,28 @@ import path from 'path';
 import {
 	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
 	SOURCE_CONTROL_GIT_FOLDER,
-	SOURCE_CONTROL_OWNERS_EXPORT_FILE,
 	SOURCE_CONTROL_TAGS_EXPORT_FILE,
-	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
 	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
 } from './constants';
 import * as Db from '@/Db';
-import glob from 'fast-glob';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-import { LoggerProxy, jsonParse } from 'n8n-workflow';
-import { writeFile as fsWriteFile, readFile as fsReadFile, rm as fsRm } from 'fs/promises';
+import { LoggerProxy } from 'n8n-workflow';
+import { writeFile as fsWriteFile, rm as fsRm } from 'fs/promises';
+import { rmSync } from 'fs';
 import { Credentials, UserSettings } from 'n8n-core';
-import type { IWorkflowToImport } from '@/Interfaces';
 import type { ExportableWorkflow } from './types/exportableWorkflow';
 import type { ExportableCredential } from './types/exportableCredential';
 import type { ExportResult } from './types/exportResult';
-import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
-import { sourceControlFoldersExistCheck } from './sourceControlHelper.ee';
+import {
+	getCredentialExportPath,
+	getVariablesPath,
+	getWorkflowExportPath,
+	sourceControlFoldersExistCheck,
+	stringContainsExpression,
+} from './sourceControlHelper.ee';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import { In } from 'typeorm';
+import type { SourceControlledFile } from './types/sourceControlledFile';
 
 @Service()
 export class SourceControlExportService {
@@ -40,79 +45,11 @@ export class SourceControlExportService {
 	}
 
 	getWorkflowPath(workflowId: string): string {
-		return path.join(this.workflowExportFolder, `${workflowId}.json`);
+		return getWorkflowExportPath(workflowId, this.workflowExportFolder);
 	}
 
 	getCredentialsPath(credentialsId: string): string {
-		return path.join(this.credentialExportFolder, `${credentialsId}.json`);
-	}
-
-	getTagsPath(): string {
-		return path.join(this.gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
-	}
-
-	getOwnersPath(): string {
-		return path.join(this.gitFolder, SOURCE_CONTROL_OWNERS_EXPORT_FILE);
-	}
-
-	getVariablesPath(): string {
-		return path.join(this.gitFolder, SOURCE_CONTROL_VARIABLES_EXPORT_FILE);
-	}
-
-	async getWorkflowFromFile(
-		filePath: string,
-		root = this.gitFolder,
-	): Promise<IWorkflowToImport | undefined> {
-		try {
-			const importedWorkflow = jsonParse<IWorkflowToImport>(
-				await fsReadFile(path.join(root, filePath), { encoding: 'utf8' }),
-			);
-			return importedWorkflow;
-		} catch (error) {
-			return undefined;
-		}
-	}
-
-	async getCredentialFromFile(
-		filePath: string,
-		root = this.gitFolder,
-	): Promise<ExportableCredential | undefined> {
-		try {
-			const credential = jsonParse<ExportableCredential>(
-				await fsReadFile(path.join(root, filePath), { encoding: 'utf8' }),
-			);
-			return credential;
-		} catch (error) {
-			return undefined;
-		}
-	}
-
-	async cleanWorkFolder() {
-		try {
-			const workflowFiles = await glob('*.json', {
-				cwd: this.workflowExportFolder,
-				absolute: true,
-			});
-			const credentialFiles = await glob('*.json', {
-				cwd: this.credentialExportFolder,
-				absolute: true,
-			});
-			const variablesFile = await glob(SOURCE_CONTROL_VARIABLES_EXPORT_FILE, {
-				cwd: this.gitFolder,
-				absolute: true,
-			});
-			const tagsFile = await glob(SOURCE_CONTROL_TAGS_EXPORT_FILE, {
-				cwd: this.gitFolder,
-				absolute: true,
-			});
-			await Promise.all(tagsFile.map(async (e) => fsRm(e)));
-			await Promise.all(variablesFile.map(async (e) => fsRm(e)));
-			await Promise.all(workflowFiles.map(async (e) => fsRm(e)));
-			await Promise.all(credentialFiles.map(async (e) => fsRm(e)));
-			LoggerProxy.debug('Cleaned work folder.');
-		} catch (error) {
-			LoggerProxy.error(`Failed to clean work folder: ${(error as Error).message}`);
-		}
+		return getCredentialExportPath(credentialsId, this.credentialExportFolder);
 	}
 
 	async deleteRepositoryFolder() {
@@ -123,86 +60,73 @@ export class SourceControlExportService {
 		}
 	}
 
-	private async rmDeletedWorkflowsFromExportFolder(
-		workflowsToBeExported: SharedWorkflow[],
-	): Promise<Set<string>> {
-		const sharedWorkflowsFileNames = new Set<string>(
-			workflowsToBeExported.map((e) => this.getWorkflowPath(e?.workflow?.name)),
-		);
-		const existingWorkflowsInFolder = new Set<string>(
-			await glob('*.json', {
-				cwd: this.workflowExportFolder,
-				absolute: true,
-			}),
-		);
-		const deletedWorkflows = new Set(existingWorkflowsInFolder);
-		for (const elem of sharedWorkflowsFileNames) {
-			deletedWorkflows.delete(elem);
-		}
+	public rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Set<string> {
 		try {
-			await Promise.all([...deletedWorkflows].map(async (e) => fsRm(e)));
+			filesToBeDeleted.forEach((e) => rmSync(e));
 		} catch (error) {
 			LoggerProxy.error(`Failed to delete workflows from work folder: ${(error as Error).message}`);
 		}
-		return deletedWorkflows;
+		return filesToBeDeleted;
 	}
 
-	private async writeExportableWorkflowsToExportFolder(workflowsToBeExported: SharedWorkflow[]) {
+	private async writeExportableWorkflowsToExportFolder(
+		workflowsToBeExported: WorkflowEntity[],
+		owners: Record<string, string>,
+	) {
 		await Promise.all(
 			workflowsToBeExported.map(async (e) => {
-				if (!e.workflow) {
-					LoggerProxy.debug(
-						`Found no corresponding workflow ${e.workflowId ?? 'unknown'}, skipping export`,
-					);
-					return;
-				}
-				const fileName = this.getWorkflowPath(e.workflow?.id);
+				const fileName = this.getWorkflowPath(e.id);
 				const sanitizedWorkflow: ExportableWorkflow = {
-					active: e.workflow?.active,
-					id: e.workflow?.id,
-					name: e.workflow?.name,
-					nodes: e.workflow?.nodes,
-					connections: e.workflow?.connections,
-					settings: e.workflow?.settings,
-					triggerCount: e.workflow?.triggerCount,
-					versionId: e.workflow?.versionId,
+					id: e.id,
+					name: e.name,
+					nodes: e.nodes,
+					connections: e.connections,
+					settings: e.settings,
+					triggerCount: e.triggerCount,
+					versionId: e.versionId,
+					owner: owners[e.id],
 				};
-				LoggerProxy.debug(`Writing workflow ${e.workflowId} to ${fileName}`);
+				LoggerProxy.debug(`Writing workflow ${e.id} to ${fileName}`);
 				return fsWriteFile(fileName, JSON.stringify(sanitizedWorkflow, null, 2));
 			}),
 		);
 	}
 
-	async exportWorkflowsToWorkFolder(): Promise<ExportResult> {
+	async exportWorkflowsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult> {
 		try {
 			sourceControlFoldersExistCheck([this.workflowExportFolder]);
+			const workflowIds = candidates.map((e) => e.id);
 			const sharedWorkflows = await Db.collections.SharedWorkflow.find({
-				relations: ['workflow', 'role', 'user'],
+				relations: ['role', 'user'],
 				where: {
 					role: {
 						name: 'owner',
 						scope: 'workflow',
 					},
+					workflowId: In(workflowIds),
+				},
+			});
+			const workflows = await Db.collections.Workflow.find({
+				where: {
+					id: In(workflowIds),
 				},
 			});
 
-			// before exporting, figure out which workflows have been deleted and remove them from the export folder
-			const removedFiles = await this.rmDeletedWorkflowsFromExportFolder(sharedWorkflows);
-			// write the workflows to the export folder as json files
-			await this.writeExportableWorkflowsToExportFolder(sharedWorkflows);
-			// write list of owners to file
-			const ownersFileName = this.getOwnersPath();
+			// determine owner of each workflow to be exported
 			const owners: Record<string, string> = {};
 			sharedWorkflows.forEach((e) => (owners[e.workflowId] = e.user.email));
-			await fsWriteFile(ownersFileName, JSON.stringify(owners, null, 2));
+
+			// write the workflows to the export folder as json files
+			await this.writeExportableWorkflowsToExportFolder(workflows, owners);
+
+			// await fsWriteFile(ownersFileName, JSON.stringify(owners, null, 2));
 			return {
 				count: sharedWorkflows.length,
 				folder: this.workflowExportFolder,
-				files: sharedWorkflows.map((e) => ({
-					id: e?.workflow?.id,
-					name: this.getWorkflowPath(e?.workflow?.name),
+				files: workflows.map((e) => ({
+					id: e?.id,
+					name: this.getWorkflowPath(e?.name),
 				})),
-				removedFiles: [...removedFiles],
 			};
 		} catch (error) {
 			throw Error(`Failed to export workflows to work folder: ${(error as Error).message}`);
@@ -221,7 +145,7 @@ export class SourceControlExportService {
 					files: [],
 				};
 			}
-			const fileName = this.getVariablesPath();
+			const fileName = getVariablesPath(this.gitFolder);
 			const sanitizedVariables = variables.map((e) => ({ ...e, value: '' }));
 			await fsWriteFile(fileName, JSON.stringify(sanitizedVariables, null, 2));
 			return {
@@ -252,7 +176,7 @@ export class SourceControlExportService {
 				};
 			}
 			const mappings = await Db.collections.WorkflowTagMapping.find();
-			const fileName = this.getTagsPath();
+			const fileName = path.join(this.gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
 			await fsWriteFile(
 				fileName,
 				JSON.stringify(
@@ -289,10 +213,7 @@ export class SourceControlExportService {
 				} else if (typeof data[key] === 'object') {
 					data[key] = this.replaceCredentialData(data[key] as ICredentialDataDecryptedObject);
 				} else if (typeof data[key] === 'string') {
-					data[key] =
-						(data[key] as string)?.startsWith('={{') && (data[key] as string)?.includes('$secret')
-							? data[key]
-							: '';
+					data[key] = stringContainsExpression(data[key] as string) ? data[key] : '';
 				} else if (typeof data[key] === 'number') {
 					// TODO: leaving numbers in for now, but maybe we should remove them
 					continue;
@@ -305,23 +226,31 @@ export class SourceControlExportService {
 		return data;
 	};
 
-	async exportCredentialsToWorkFolder(): Promise<ExportResult> {
+	async exportCredentialsToWorkFolder(candidates: SourceControlledFile[]): Promise<ExportResult> {
 		try {
 			sourceControlFoldersExistCheck([this.credentialExportFolder]);
-			const sharedCredentials = await Db.collections.SharedCredentials.find({
+			const credentialIds = candidates.map((e) => e.id);
+			const credentialsToBeExported = await Db.collections.SharedCredentials.find({
 				relations: ['credentials', 'role', 'user'],
+				where: {
+					credentialsId: In(credentialIds),
+				},
 			});
+			let missingIds: string[] = [];
+			if (credentialsToBeExported.length !== credentialIds.length) {
+				const foundCredentialIds = credentialsToBeExported.map((e) => e.credentialsId);
+				missingIds = credentialIds.filter(
+					(remote) => foundCredentialIds.findIndex((local) => local === remote) === -1,
+				);
+			}
 			const encryptionKey = await UserSettings.getEncryptionKey();
 			await Promise.all(
-				sharedCredentials.map(async (sharedCredential) => {
+				credentialsToBeExported.map(async (sharedCredential) => {
 					const { name, type, nodesAccess, data, id } = sharedCredential.credentials;
 					const credentialObject = new Credentials({ id, name }, type, nodesAccess, data);
 					const plainData = credentialObject.getData(encryptionKey);
 					const sanitizedData = this.replaceCredentialData(plainData);
-					const fileName = path.join(
-						this.credentialExportFolder,
-						`${sharedCredential.credentials.id}.json`,
-					);
+					const fileName = this.getCredentialsPath(sharedCredential.credentials.id);
 					const sanitizedCredential: ExportableCredential = {
 						id: sharedCredential.credentials.id,
 						name: sharedCredential.credentials.name,
@@ -334,12 +263,13 @@ export class SourceControlExportService {
 				}),
 			);
 			return {
-				count: sharedCredentials.length,
+				count: credentialsToBeExported.length,
 				folder: this.credentialExportFolder,
-				files: sharedCredentials.map((e) => ({
+				files: credentialsToBeExported.map((e) => ({
 					id: e.credentials.id,
 					name: path.join(this.credentialExportFolder, `${e.credentials.name}.json`),
 				})),
+				missingIds,
 			};
 		} catch (error) {
 			throw Error(`Failed to export credentials to work folder: ${(error as Error).message}`);
diff --git a/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
index 9c1196345802d..b1e42fe936320 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlGit.service.ee.ts
@@ -12,10 +12,16 @@ import type {
 	SimpleGitOptions,
 	StatusResult,
 } from 'simple-git';
-import { simpleGit } from 'simple-git';
 import type { SourceControlPreferences } from './types/sourceControlPreferences';
-import { SOURCE_CONTROL_DEFAULT_BRANCH, SOURCE_CONTROL_ORIGIN } from './constants';
+import {
+	SOURCE_CONTROL_DEFAULT_BRANCH,
+	SOURCE_CONTROL_DEFAULT_EMAIL,
+	SOURCE_CONTROL_DEFAULT_NAME,
+	SOURCE_CONTROL_ORIGIN,
+} from './constants';
 import { sourceControlFoldersExistCheck } from './sourceControlHelper.ee';
+import type { User } from '../../databases/entities/User';
+import { getInstanceOwner } from '../../UserManagement/UserManagementHelper';
 
 @Service()
 export class SourceControlGitService {
@@ -27,7 +33,7 @@ export class SourceControlGitService {
 	 * Run pre-checks before initialising git
 	 * Checks for existence of required binaries (git and ssh)
 	 */
-	preInitCheck(): boolean {
+	private preInitCheck(): boolean {
 		LoggerProxy.debug('GitService.preCheck');
 		try {
 			const gitResult = execSync('git --version', {
@@ -80,6 +86,8 @@ export class SourceControlGitService {
 			trimmed: false,
 		};
 
+		const { simpleGit } = await import('simple-git');
+
 		this.git = simpleGit(this.gitOptions)
 			// Tell git not to ask for any information via the terminal like for
 			// example the username. As nobody will be able to answer it would
@@ -92,7 +100,8 @@ export class SourceControlGitService {
 		}
 		if (!(await this.hasRemote(sourceControlPreferences.repositoryUrl))) {
 			if (sourceControlPreferences.connected && sourceControlPreferences.repositoryUrl) {
-				await this.initRepository(sourceControlPreferences);
+				const user = await getInstanceOwner();
+				await this.initRepository(sourceControlPreferences, user);
 			}
 		}
 	}
@@ -101,9 +110,9 @@ export class SourceControlGitService {
 		this.git = null;
 	}
 
-	async checkRepositorySetup(): Promise<boolean> {
+	private async checkRepositorySetup(): Promise<boolean> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (async)');
 		}
 		if (!(await this.git.checkIsRepo())) {
 			return false;
@@ -116,9 +125,9 @@ export class SourceControlGitService {
 		}
 	}
 
-	async hasRemote(remote: string): Promise<boolean> {
+	private async hasRemote(remote: string): Promise<boolean> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (async)');
 		}
 		try {
 			const remotes = await this.git.getRemotes(true);
@@ -139,11 +148,12 @@ export class SourceControlGitService {
 	async initRepository(
 		sourceControlPreferences: Pick<
 			SourceControlPreferences,
-			'repositoryUrl' | 'authorEmail' | 'authorName' | 'branchName' | 'initRepo'
+			'repositoryUrl' | 'branchName' | 'initRepo'
 		>,
+		user: User,
 	): Promise<void> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (Promise)');
 		}
 		if (sourceControlPreferences.initRepo) {
 			try {
@@ -161,8 +171,10 @@ export class SourceControlGitService {
 				throw error;
 			}
 		}
-		await this.git.addConfig('user.email', sourceControlPreferences.authorEmail);
-		await this.git.addConfig('user.name', sourceControlPreferences.authorName);
+		await this.setGitUserDetails(
+			`${user.firstName} ${user.lastName}` ?? SOURCE_CONTROL_DEFAULT_NAME,
+			user.email ?? SOURCE_CONTROL_DEFAULT_EMAIL,
+		);
 		if (sourceControlPreferences.initRepo) {
 			try {
 				const branches = await this.getBranches();
@@ -175,9 +187,17 @@ export class SourceControlGitService {
 		}
 	}
 
+	async setGitUserDetails(name: string, email: string): Promise<void> {
+		if (!this.git) {
+			throw new Error('Git is not initialized (setGitUserDetails)');
+		}
+		await this.git.addConfig('user.email', name);
+		await this.git.addConfig('user.name', email);
+	}
+
 	async getBranches(): Promise<{ branches: string[]; currentBranch: string }> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (getBranches)');
 		}
 
 		try {
@@ -200,23 +220,16 @@ export class SourceControlGitService {
 
 	async setBranch(branch: string): Promise<{ branches: string[]; currentBranch: string }> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (setBranch)');
 		}
 		await this.git.checkout(branch);
 		await this.git.branch([`--set-upstream-to=${SOURCE_CONTROL_ORIGIN}/${branch}`, branch]);
 		return this.getBranches();
 	}
 
-	async fetch(): Promise<FetchResult> {
-		if (!this.git) {
-			throw new Error('Git is not initialized');
-		}
-		return this.git.fetch();
-	}
-
 	async getCurrentBranch(): Promise<{ current: string; remote: string }> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (getCurrentBranch)');
 		}
 		const currentBranch = (await this.git.branch()).current;
 		return {
@@ -225,49 +238,47 @@ export class SourceControlGitService {
 		};
 	}
 
-	async diff(options?: { target?: string; dots?: '..' | '...' }): Promise<DiffResult> {
-		if (!this.git) {
-			throw new Error('Git is not initialized');
-		}
-		const currentBranch = await this.getCurrentBranch();
-		const target = options?.target ?? currentBranch.remote;
-		const dots = options?.dots ?? '...';
-		return this.git.diffSummary([dots + target]);
-	}
-
 	async diffRemote(): Promise<DiffResult | undefined> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (diffRemote)');
 		}
 		const currentBranch = await this.getCurrentBranch();
 		if (currentBranch.remote) {
 			const target = currentBranch.remote;
-			return this.git.diffSummary(['...' + target]);
+			return this.git.diffSummary(['...' + target, '--ignore-all-space']);
 		}
 		return;
 	}
 
 	async diffLocal(): Promise<DiffResult | undefined> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (diffLocal)');
 		}
 		const currentBranch = await this.getCurrentBranch();
 		if (currentBranch.remote) {
 			const target = currentBranch.current;
-			return this.git.diffSummary([target]);
+			return this.git.diffSummary([target, '--ignore-all-space']);
 		}
 		return;
 	}
 
+	async fetch(): Promise<FetchResult> {
+		if (!this.git) {
+			throw new Error('Git is not initialized (fetch)');
+		}
+		return this.git.fetch();
+	}
+
 	async pull(options: { ffOnly: boolean } = { ffOnly: true }): Promise<PullResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (pull)');
 		}
+		const params = {};
 		if (options.ffOnly) {
 			// eslint-disable-next-line @typescript-eslint/naming-convention
-			return this.git.pull(undefined, undefined, { '--ff-only': null });
+			Object.assign(params, { '--ff-only': true });
 		}
-		return this.git.pull();
+		return this.git.pull(params);
 	}
 
 	async push(
@@ -278,7 +289,7 @@ export class SourceControlGitService {
 	): Promise<PushResult> {
 		const { force, branch } = options;
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized ({)');
 		}
 		if (force) {
 			return this.git.push(SOURCE_CONTROL_ORIGIN, branch, ['-f']);
@@ -288,7 +299,7 @@ export class SourceControlGitService {
 
 	async stage(files: Set<string>, deletedFiles?: Set<string>): Promise<string> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (stage)');
 		}
 		if (deletedFiles?.size) {
 			try {
@@ -301,10 +312,10 @@ export class SourceControlGitService {
 	}
 
 	async resetBranch(
-		options: { hard?: boolean; target: string } = { hard: false, target: 'HEAD' },
+		options: { hard: boolean; target: string } = { hard: true, target: 'HEAD' },
 	): Promise<string> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (Promise)');
 		}
 		if (options?.hard) {
 			return this.git.raw(['reset', '--hard', options.target]);
@@ -316,14 +327,14 @@ export class SourceControlGitService {
 
 	async commit(message: string): Promise<CommitResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (commit)');
 		}
 		return this.git.commit(message);
 	}
 
 	async status(): Promise<StatusResult> {
 		if (!this.git) {
-			throw new Error('Git is not initialized');
+			throw new Error('Git is not initialized (status)');
 		}
 		const statusResult = await this.git.status();
 		return statusResult;
diff --git a/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts
index 18b699330f09c..93ee873173ae3 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlHelper.ee.ts
@@ -1,25 +1,61 @@
-import { Container } from 'typedi';
+import Container from 'typedi';
+import { License } from '@/License';
 import { generateKeyPairSync } from 'crypto';
-import sshpk from 'sshpk';
+import type { KeyPair } from './types/keyPair';
 import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
 import { LoggerProxy } from 'n8n-workflow';
-import { License } from '@/License';
-import type { KeyPair } from './types/keyPair';
-import { SOURCE_CONTROL_GIT_KEY_COMMENT } from './constants';
+import {
+	SOURCE_CONTROL_GIT_KEY_COMMENT,
+	SOURCE_CONTROL_TAGS_EXPORT_FILE,
+	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
+} from './constants';
+import type { SourceControlledFile } from './types/sourceControlledFile';
+import path from 'path';
+
+export function stringContainsExpression(testString: string): boolean {
+	return /^=.*\{\{.*\}\}/.test(testString);
+}
+
+export function getWorkflowExportPath(workflowId: string, workflowExportFolder: string): string {
+	return path.join(workflowExportFolder, `${workflowId}.json`);
+}
 
-export function sourceControlFoldersExistCheck(folders: string[]) {
+export function getCredentialExportPath(
+	credentialId: string,
+	credentialExportFolder: string,
+): string {
+	return path.join(credentialExportFolder, `${credentialId}.json`);
+}
+
+export function getVariablesPath(gitFolder: string): string {
+	return path.join(gitFolder, SOURCE_CONTROL_VARIABLES_EXPORT_FILE);
+}
+
+export function getTagsPath(gitFolder: string): string {
+	return path.join(gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
+}
+
+export function sourceControlFoldersExistCheck(
+	folders: string[],
+	createIfNotExists = true,
+): boolean {
 	// running these file access function synchronously to avoid race conditions
+	let existed = true;
 	folders.forEach((folder) => {
 		try {
 			accessSync(folder, fsConstants.F_OK);
 		} catch {
-			try {
-				mkdirSync(folder);
-			} catch (error) {
-				LoggerProxy.error((error as Error).message);
+			existed = false;
+			if (createIfNotExists) {
+				try {
+					mkdirSync(folder, { recursive: true });
+				} catch (error) {
+					LoggerProxy.error((error as Error).message);
+				}
 			}
 		}
 	});
+	return existed;
 }
 
 export function isSourceControlLicensed() {
@@ -27,7 +63,8 @@ export function isSourceControlLicensed() {
 	return license.isSourceControlLicensed();
 }
 
-export function generateSshKeyPair(keyType: 'ed25519' | 'rsa' = 'ed25519') {
+export async function generateSshKeyPair(keyType: 'ed25519' | 'rsa' = 'ed25519') {
+	const sshpk = await import('sshpk');
 	const keyPair: KeyPair = {
 		publicKey: '',
 		privateKey: '',
@@ -65,3 +102,76 @@ export function generateSshKeyPair(keyType: 'ed25519' | 'rsa' = 'ed25519') {
 		publicKey: keyPair.publicKey,
 	};
 }
+
+export function getRepoType(repoUrl: string): 'github' | 'gitlab' | 'other' {
+	if (repoUrl.includes('github.com')) {
+		return 'github';
+	} else if (repoUrl.includes('gitlab.com')) {
+		return 'gitlab';
+	}
+	return 'other';
+}
+
+function filterSourceControlledFilesUniqueIds(files: SourceControlledFile[]) {
+	return (
+		files.filter((file, index, self) => {
+			return self.findIndex((f) => f.id === file.id) === index;
+		}) || []
+	);
+}
+
+export function getTrackingInformationFromPullResult(result: SourceControlledFile[]): {
+	cred_conflicts: number;
+	workflow_conflicts: number;
+	workflow_updates: number;
+} {
+	const uniques = filterSourceControlledFilesUniqueIds(result);
+	return {
+		cred_conflicts: uniques.filter(
+			(file) =>
+				file.type === 'credential' && file.status === 'modified' && file.location === 'local',
+		).length,
+		workflow_conflicts: uniques.filter(
+			(file) => file.type === 'workflow' && file.status === 'modified' && file.location === 'local',
+		).length,
+		workflow_updates: uniques.filter((file) => file.type === 'workflow').length,
+	};
+}
+
+export function getTrackingInformationFromPrePushResult(result: SourceControlledFile[]): {
+	workflows_eligible: number;
+	workflows_eligible_with_conflicts: number;
+	creds_eligible: number;
+	creds_eligible_with_conflicts: number;
+	variables_eligible: number;
+} {
+	const uniques = filterSourceControlledFilesUniqueIds(result);
+	return {
+		workflows_eligible: uniques.filter((file) => file.type === 'workflow').length,
+		workflows_eligible_with_conflicts: uniques.filter(
+			(file) => file.type === 'workflow' && file.conflict,
+		).length,
+		creds_eligible: uniques.filter((file) => file.type === 'credential').length,
+		creds_eligible_with_conflicts: uniques.filter(
+			(file) => file.type === 'credential' && file.conflict,
+		).length,
+		variables_eligible: uniques.filter((file) => file.type === 'variables').length,
+	};
+}
+
+export function getTrackingInformationFromPostPushResult(result: SourceControlledFile[]): {
+	workflows_eligible: number;
+	workflows_pushed: number;
+	creds_pushed: number;
+	variables_pushed: number;
+} {
+	const uniques = filterSourceControlledFilesUniqueIds(result);
+	return {
+		workflows_pushed: uniques.filter((file) => file.pushed && file.type === 'workflow').length ?? 0,
+		workflows_eligible: uniques.filter((file) => file.type === 'workflow').length ?? 0,
+		creds_pushed:
+			uniques.filter((file) => file.pushed && file.file.startsWith('credential_stubs')).length ?? 0,
+		variables_pushed:
+			uniques.filter((file) => file.pushed && file.file.startsWith('variable_stubs')).length ?? 0,
+	};
+}
diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
index f0977df1d633a..e7126350b2063 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
@@ -3,7 +3,6 @@ import path from 'path';
 import {
 	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
 	SOURCE_CONTROL_GIT_FOLDER,
-	SOURCE_CONTROL_OWNERS_EXPORT_FILE,
 	SOURCE_CONTROL_TAGS_EXPORT_FILE,
 	SOURCE_CONTROL_VARIABLES_EXPORT_FILE,
 	SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER,
@@ -16,15 +15,16 @@ import { Credentials, UserSettings } from 'n8n-core';
 import type { IWorkflowToImport } from '@/Interfaces';
 import type { ExportableCredential } from './types/exportableCredential';
 import { Variables } from '@db/entities/Variables';
-import type { ImportResult } from './types/importResult';
 import { UM_FIX_INSTRUCTION } from '@/commands/BaseCommand';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
 import type { TagEntity } from '@db/entities/TagEntity';
-import { ActiveWorkflowRunner } from '../../ActiveWorkflowRunner';
-import type { SourceControllPullOptions } from './types/sourceControlPullWorkFolder';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { In } from 'typeorm';
-import { isUniqueConstraintError } from '../../ResponseHelper';
+import { isUniqueConstraintError } from '@/ResponseHelper';
+import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
+import { getCredentialExportPath, getWorkflowExportPath } from './sourceControlHelper.ee';
+import type { SourceControlledFile } from './types/sourceControlledFile';
 
 @Service()
 export class SourceControlImportService {
@@ -143,65 +143,113 @@ export class SourceControlImportService {
 		return importCredentialsResult.filter((e) => e !== undefined);
 	}
 
-	private async importVariablesFromFile(valueOverrides?: {
-		[key: string]: string;
-	}): Promise<{ imported: string[] }> {
+	public async getRemoteVersionIdsFromFiles(): Promise<SourceControlWorkflowVersionId[]> {
+		const remoteWorkflowFiles = await glob('*.json', {
+			cwd: this.workflowExportFolder,
+			absolute: true,
+		});
+		const remoteWorkflowFilesParsed = await Promise.all(
+			remoteWorkflowFiles.map(async (file) => {
+				LoggerProxy.debug(`Parsing workflow file ${file}`);
+				const remote = jsonParse<IWorkflowToImport>(await fsReadFile(file, { encoding: 'utf8' }));
+				if (!remote?.id) {
+					return undefined;
+				}
+				return {
+					id: remote.id,
+					versionId: remote.versionId,
+					name: remote.name,
+					remoteId: remote.id,
+					filename: getWorkflowExportPath(remote.id, this.workflowExportFolder),
+				} as SourceControlWorkflowVersionId;
+			}),
+		);
+		return remoteWorkflowFilesParsed.filter(
+			(e) => e !== undefined,
+		) as SourceControlWorkflowVersionId[];
+	}
+
+	public async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
+		const localWorkflows = await Db.collections.Workflow.find({
+			select: ['id', 'name', 'versionId', 'updatedAt'],
+		});
+		return localWorkflows.map((local) => ({
+			id: local.id,
+			versionId: local.versionId,
+			name: local.name,
+			localId: local.id,
+			filename: getWorkflowExportPath(local.id, this.workflowExportFolder),
+			updatedAt: local.updatedAt.toISOString(),
+		})) as SourceControlWorkflowVersionId[];
+	}
+
+	public async getRemoteCredentialsFromFiles(): Promise<
+		Array<ExportableCredential & { filename: string }>
+	> {
+		const remoteCredentialFiles = await glob('*.json', {
+			cwd: this.credentialExportFolder,
+			absolute: true,
+		});
+		const remoteCredentialFilesParsed = await Promise.all(
+			remoteCredentialFiles.map(async (file) => {
+				LoggerProxy.debug(`Parsing credential file ${file}`);
+				const remote = jsonParse<ExportableCredential>(
+					await fsReadFile(file, { encoding: 'utf8' }),
+				);
+				if (!remote?.id) {
+					return undefined;
+				}
+				return {
+					...remote,
+					filename: getCredentialExportPath(remote.id, this.credentialExportFolder),
+				};
+			}),
+		);
+		return remoteCredentialFilesParsed.filter((e) => e !== undefined) as Array<
+			ExportableCredential & { filename: string }
+		>;
+	}
+
+	public async getLocalCredentialsFromDb(): Promise<
+		Array<ExportableCredential & { filename: string }>
+	> {
+		const localCredentials = await Db.collections.Credentials.find({
+			select: ['id', 'name', 'type', 'nodesAccess'],
+		});
+		return localCredentials.map((local) => ({
+			id: local.id,
+			name: local.name,
+			type: local.type,
+			nodesAccess: local.nodesAccess,
+			filename: getCredentialExportPath(local.id, this.credentialExportFolder),
+		})) as Array<ExportableCredential & { filename: string }>;
+	}
+
+	public async getRemoteVariablesFromFile(): Promise<Variables[]> {
 		const variablesFile = await glob(SOURCE_CONTROL_VARIABLES_EXPORT_FILE, {
 			cwd: this.gitFolder,
 			absolute: true,
 		});
-		const result: { imported: string[] } = { imported: [] };
 		if (variablesFile.length > 0) {
 			LoggerProxy.debug(`Importing variables from file ${variablesFile[0]}`);
-			const importedVariables = jsonParse<Array<Partial<Variables>>>(
-				await fsReadFile(variablesFile[0], { encoding: 'utf8' }),
-				{ fallbackValue: [] },
-			);
-			const overriddenKeys = Object.keys(valueOverrides ?? {});
-
-			for (const variable of importedVariables) {
-				if (!variable.key) {
-					continue;
-				}
-				// by default no value is stored remotely, so an empty string is retuned
-				// it must be changed to undefined so as to not overwrite existing values!
-				if (variable.value === '') {
-					variable.value = undefined;
-				}
-				if (overriddenKeys.includes(variable.key) && valueOverrides) {
-					variable.value = valueOverrides[variable.key];
-					overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
-				}
-				try {
-					await Db.collections.Variables.upsert({ ...variable }, ['id']);
-				} catch (errorUpsert) {
-					if (isUniqueConstraintError(errorUpsert as Error)) {
-						LoggerProxy.debug(`Variable ${variable.key} already exists, updating instead`);
-						try {
-							await Db.collections.Variables.update({ key: variable.key }, { ...variable });
-						} catch (errorUpdate) {
-							LoggerProxy.debug(`Failed to update variable ${variable.key}, skipping`);
-							LoggerProxy.debug((errorUpdate as Error).message);
-						}
-					}
-				} finally {
-					result.imported.push(variable.key);
-				}
-			}
-
-			// add remaining overrides as new variables
-			if (overriddenKeys.length > 0 && valueOverrides) {
-				for (const key of overriddenKeys) {
-					result.imported.push(key);
-					const newVariable = new Variables({ key, value: valueOverrides[key] });
-					await Db.collections.Variables.save(newVariable);
-				}
-			}
+			return jsonParse<Variables[]>(await fsReadFile(variablesFile[0], { encoding: 'utf8' }), {
+				fallbackValue: [],
+			});
 		}
-		return result;
+		return [];
+	}
+
+	public async getLocalVariablesFromDb(): Promise<Variables[]> {
+		const localVariables = await Db.collections.Variables.find({
+			select: ['id', 'key', 'type', 'value'],
+		});
+		return localVariables;
 	}
 
-	private async importTagsFromFile() {
+	public async getRemoteTagsAndMappingsFromFile(): Promise<{
+		tags: TagEntity[];
+		mappings: WorkflowTagMapping[];
+	}> {
 		const tagsFile = await glob(SOURCE_CONTROL_TAGS_EXPORT_FILE, {
 			cwd: this.gitFolder,
 			absolute: true,
@@ -212,110 +260,51 @@ export class SourceControlImportService {
 				await fsReadFile(tagsFile[0], { encoding: 'utf8' }),
 				{ fallbackValue: { tags: [], mappings: [] } },
 			);
-			const existingWorkflowIds = new Set(
-				(
-					await Db.collections.Workflow.find({
-						select: ['id'],
-					})
-				).map((e) => e.id),
-			);
-
-			await Promise.all(
-				mappedTags.tags.map(async (tag) => {
-					await Db.collections.Tag.upsert(
-						{
-							...tag,
-						},
-						{
-							skipUpdateIfNoValuesChanged: true,
-							conflictPaths: { id: true },
-						},
-					);
-				}),
-			);
-			await Promise.all(
-				mappedTags.mappings.map(async (mapping) => {
-					if (!existingWorkflowIds.has(String(mapping.workflowId))) return;
-					await Db.collections.WorkflowTagMapping.upsert(
-						{ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) },
-						{
-							skipUpdateIfNoValuesChanged: true,
-							conflictPaths: { tagId: true, workflowId: true },
-						},
-					);
-				}),
-			);
 			return mappedTags;
 		}
 		return { tags: [], mappings: [] };
 	}
 
-	private async importWorkflowsFromFiles(
-		userId: string,
-	): Promise<Array<{ id: string; name: string }>> {
-		const workflowFiles = await glob('*.json', {
-			cwd: this.workflowExportFolder,
-			absolute: true,
+	public async getLocalTagsAndMappingsFromDb(): Promise<{
+		tags: TagEntity[];
+		mappings: WorkflowTagMapping[];
+	}> {
+		const localTags = await Db.collections.Tag.find({
+			select: ['id', 'name'],
 		});
-
-		const existingWorkflows = await Db.collections.Workflow.find({
-			select: ['id', 'name', 'active', 'versionId'],
+		const localMappings = await Db.collections.WorkflowTagMapping.find({
+			select: ['workflowId', 'tagId'],
 		});
+		return { tags: localTags, mappings: localMappings };
+	}
 
+	public async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
 		const ownerWorkflowRole = await this.getOwnerWorkflowRole();
 		const workflowRunner = Container.get(ActiveWorkflowRunner);
-
-		// read owner file if it exists and map workflow ids to owner emails
-		// then find existing users with those emails or fallback to passed in userId
-		const ownerRecords: Record<string, string> = {};
-		const ownersFile = await glob(SOURCE_CONTROL_OWNERS_EXPORT_FILE, {
-			cwd: this.gitFolder,
-			absolute: true,
+		const candidateIds = candidates.map((c) => c.id);
+		const existingWorkflows = await Db.collections.Workflow.find({
+			where: {
+				id: In(candidateIds),
+			},
+			select: ['id', 'name', 'versionId', 'active'],
 		});
-		if (ownersFile.length > 0) {
-			LoggerProxy.debug(`Reading workflow owners from file ${ownersFile[0]}`);
-			const ownerEmails = jsonParse<Record<string, string>>(
-				await fsReadFile(ownersFile[0], { encoding: 'utf8' }),
-				{ fallbackValue: {} },
-			);
-			if (ownerEmails) {
-				const uniqueOwnerEmails = new Set(Object.values(ownerEmails));
-				const existingUsers = await Db.collections.User.find({
-					where: { email: In([...uniqueOwnerEmails]) },
-				});
-				Object.keys(ownerEmails).forEach((workflowId) => {
-					ownerRecords[workflowId] =
-						existingUsers.find((e) => e.email === ownerEmails[workflowId])?.id ?? userId;
-				});
-			}
-		}
-
-		let importWorkflowsResult = new Array<{ id: string; name: string } | undefined>();
-
 		const allSharedWorkflows = await Db.collections.SharedWorkflow.find({
+			where: {
+				workflowId: In(candidateIds),
+			},
 			select: ['workflowId', 'roleId', 'userId'],
 		});
-
-		importWorkflowsResult = await Promise.all(
-			workflowFiles.map(async (file) => {
-				LoggerProxy.debug(`Parsing workflow file ${file}`);
-				const importedWorkflow = jsonParse<IWorkflowToImport>(
-					await fsReadFile(file, { encoding: 'utf8' }),
+		const cachedOwnerIds = new Map<string, string>();
+		const importWorkflowsResult = await Promise.all(
+			candidates.map(async (candidate) => {
+				LoggerProxy.debug(`Parsing workflow file ${candidate.file}`);
+				const importedWorkflow = jsonParse<IWorkflowToImport & { owner: string }>(
+					await fsReadFile(candidate.file, { encoding: 'utf8' }),
 				);
 				if (!importedWorkflow?.id) {
 					return;
 				}
 				const existingWorkflow = existingWorkflows.find((e) => e.id === importedWorkflow.id);
-				if (existingWorkflow?.versionId === importedWorkflow.versionId) {
-					LoggerProxy.debug(
-						`Skipping import of workflow ${importedWorkflow.id ?? 'n/a'} - versionId is up to date`,
-					);
-					return {
-						id: importedWorkflow.id ?? 'n/a',
-						name: 'skipped',
-					};
-				}
-				LoggerProxy.debug(`Importing workflow ${importedWorkflow.id ?? 'n/a'}`);
 				importedWorkflow.active = existingWorkflow?.active ?? false;
 				LoggerProxy.debug(`Updating workflow id ${importedWorkflow.id ?? 'new'}`);
 				const upsertResult = await Db.collections.Workflow.upsert({ ...importedWorkflow }, ['id']);
@@ -324,12 +313,31 @@ export class SourceControlImportService {
 				}
 				// Update workflow owner to the user who exported the workflow, if that user exists
 				// in the instance, and the workflow doesn't already have an owner
-				const workflowOwnerId = ownerRecords[importedWorkflow.id] ?? userId;
+				let workflowOwnerId = userId;
+				if (cachedOwnerIds.has(importedWorkflow.owner)) {
+					workflowOwnerId = cachedOwnerIds.get(importedWorkflow.owner) ?? userId;
+				} else {
+					const foundUser = await Db.collections.User.findOne({
+						where: {
+							email: importedWorkflow.owner,
+						},
+						select: ['id'],
+					});
+					if (foundUser) {
+						cachedOwnerIds.set(importedWorkflow.owner, foundUser.id);
+						workflowOwnerId = foundUser.id;
+					}
+				}
+
 				const existingSharedWorkflowOwnerByRoleId = allSharedWorkflows.find(
-					(e) => e.workflowId === importedWorkflow.id && e.roleId === ownerWorkflowRole.id,
+					(e) =>
+						e.workflowId === importedWorkflow.id &&
+						e.roleId.toString() === ownerWorkflowRole.id.toString(),
 				);
 				const existingSharedWorkflowOwnerByUserId = allSharedWorkflows.find(
-					(e) => e.workflowId === importedWorkflow.id && e.userId === workflowOwnerId,
+					(e) =>
+						e.workflowId === importedWorkflow.id &&
+						e.roleId.toString() === workflowOwnerId.toString(),
 				);
 				if (!existingSharedWorkflowOwnerByUserId && !existingSharedWorkflowOwnerByRoleId) {
 					// no owner exists yet, so create one
@@ -361,39 +369,218 @@ export class SourceControlImportService {
 						// try activating the imported workflow
 						LoggerProxy.debug(`Reactivating workflow id ${existingWorkflow.id}`);
 						await workflowRunner.add(existingWorkflow.id, 'activate');
+						// update the versionId of the workflow to match the imported workflow
 					} catch (error) {
 						LoggerProxy.error(`Failed to activate workflow ${existingWorkflow.id}`, error as Error);
+					} finally {
+						await Db.collections.Workflow.update(
+							{ id: existingWorkflow.id },
+							{ versionId: importedWorkflow.versionId },
+						);
 					}
 				}
 
 				return {
 					id: importedWorkflow.id ?? 'unknown',
-					name: file,
+					name: candidate.file,
 				};
 			}),
 		);
-
 		return importWorkflowsResult.filter((e) => e !== undefined) as Array<{
 			id: string;
 			name: string;
 		}>;
 	}
 
-	async importFromWorkFolder(options: SourceControllPullOptions): Promise<ImportResult> {
+	public async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
+		const candidateIds = candidates.map((c) => c.id);
+		const existingCredentials = await Db.collections.Credentials.find({
+			where: {
+				id: In(candidateIds),
+			},
+			select: ['id', 'name', 'type', 'data'],
+		});
+		const ownerCredentialRole = await this.getOwnerCredentialRole();
+		const ownerGlobalRole = await this.getOwnerGlobalRole();
+		const existingSharedCredentials = await Db.collections.SharedCredentials.find({
+			select: ['userId', 'credentialsId', 'roleId'],
+			where: {
+				credentialsId: In(candidateIds),
+				roleId: In([ownerCredentialRole.id, ownerGlobalRole.id]),
+			},
+		});
+		const encryptionKey = await UserSettings.getEncryptionKey();
+		let importCredentialsResult: Array<{ id: string; name: string; type: string }> = [];
+		importCredentialsResult = await Promise.all(
+			candidates.map(async (candidate) => {
+				LoggerProxy.debug(`Importing credentials file ${candidate.file}`);
+				const credential = jsonParse<ExportableCredential>(
+					await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				);
+				const existingCredential = existingCredentials.find(
+					(e) => e.id === credential.id && e.type === credential.type,
+				);
+				const sharedOwner = existingSharedCredentials.find(
+					(e) => e.credentialsId === credential.id,
+				);
+
+				const { name, type, data, id, nodesAccess } = credential;
+				const newCredentialObject = new Credentials({ id, name }, type, []);
+				if (existingCredential?.data) {
+					newCredentialObject.data = existingCredential.data;
+				} else {
+					newCredentialObject.setData(data, encryptionKey);
+				}
+				newCredentialObject.nodesAccess = nodesAccess || existingCredential?.nodesAccess || [];
+
+				LoggerProxy.debug(`Updating credential id ${newCredentialObject.id as string}`);
+				await Db.collections.Credentials.upsert(newCredentialObject, ['id']);
+
+				if (!sharedOwner) {
+					const newSharedCredential = new SharedCredentials();
+					newSharedCredential.credentialsId = newCredentialObject.id as string;
+					newSharedCredential.userId = userId;
+					newSharedCredential.roleId = ownerCredentialRole.id;
+
+					await Db.collections.SharedCredentials.upsert({ ...newSharedCredential }, [
+						'credentialsId',
+						'userId',
+					]);
+				}
+
+				return {
+					id: newCredentialObject.id as string,
+					name: newCredentialObject.name,
+					type: newCredentialObject.type,
+				};
+			}),
+		);
+		return importCredentialsResult.filter((e) => e !== undefined);
+	}
+
+	public async importTagsFromWorkFolder(candidate: SourceControlledFile) {
+		let mappedTags;
+		try {
+			LoggerProxy.debug(`Importing tags from file ${candidate.file}`);
+			mappedTags = jsonParse<{ tags: TagEntity[]; mappings: WorkflowTagMapping[] }>(
+				await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				{ fallbackValue: { tags: [], mappings: [] } },
+			);
+		} catch (error) {
+			LoggerProxy.error(`Failed to import tags from file ${candidate.file}`, error as Error);
+			return;
+		}
+
+		if (mappedTags.mappings.length === 0 && mappedTags.tags.length === 0) {
+			return;
+		}
+
+		const existingWorkflowIds = new Set(
+			(
+				await Db.collections.Workflow.find({
+					select: ['id'],
+				})
+			).map((e) => e.id),
+		);
+
+		await Promise.all(
+			mappedTags.tags.map(async (tag) => {
+				const findByName = await Db.collections.Tag.findOne({
+					where: { name: tag.name },
+					select: ['id'],
+				});
+				if (findByName && findByName.id !== tag.id) {
+					throw new Error(
+						`A tag with the name <strong>${tag.name}</strong> already exists locally.<br />Please either rename the local tag, or the remote one with the id <strong>${tag.id}</strong> in the tags.json file.`,
+					);
+				}
+				await Db.collections.Tag.upsert(
+					{
+						...tag,
+					},
+					{
+						skipUpdateIfNoValuesChanged: true,
+						conflictPaths: { id: true },
+					},
+				);
+			}),
+		);
+
+		await Promise.all(
+			mappedTags.mappings.map(async (mapping) => {
+				if (!existingWorkflowIds.has(String(mapping.workflowId))) return;
+				await Db.collections.WorkflowTagMapping.upsert(
+					{ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) },
+					{
+						skipUpdateIfNoValuesChanged: true,
+						conflictPaths: { tagId: true, workflowId: true },
+					},
+				);
+			}),
+		);
+
+		return mappedTags;
+	}
+
+	public async importVariablesFromWorkFolder(
+		candidate: SourceControlledFile,
+		valueOverrides?: {
+			[key: string]: string;
+		},
+	) {
+		const result: { imported: string[] } = { imported: [] };
+		let importedVariables;
 		try {
-			const importedVariables = await this.importVariablesFromFile(options.variables);
-			const importedCredentials = await this.importCredentialsFromFiles(options.userId);
-			const importWorkflows = await this.importWorkflowsFromFiles(options.userId);
-			const importTags = await this.importTagsFromFile();
-
-			return {
-				variables: importedVariables,
-				credentials: importedCredentials,
-				workflows: importWorkflows,
-				tags: importTags,
-			};
+			LoggerProxy.debug(`Importing variables from file ${candidate.file}`);
+			importedVariables = jsonParse<Array<Partial<Variables>>>(
+				await fsReadFile(candidate.file, { encoding: 'utf8' }),
+				{ fallbackValue: [] },
+			);
 		} catch (error) {
-			throw Error(`Failed to import workflows from work folder: ${(error as Error).message}`);
+			LoggerProxy.error(`Failed to import tags from file ${candidate.file}`, error as Error);
+			return;
+		}
+		const overriddenKeys = Object.keys(valueOverrides ?? {});
+
+		for (const variable of importedVariables) {
+			if (!variable.key) {
+				continue;
+			}
+			// by default no value is stored remotely, so an empty string is retuned
+			// it must be changed to undefined so as to not overwrite existing values!
+			if (variable.value === '') {
+				variable.value = undefined;
+			}
+			if (overriddenKeys.includes(variable.key) && valueOverrides) {
+				variable.value = valueOverrides[variable.key];
+				overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
+			}
+			try {
+				await Db.collections.Variables.upsert({ ...variable }, ['id']);
+			} catch (errorUpsert) {
+				if (isUniqueConstraintError(errorUpsert as Error)) {
+					LoggerProxy.debug(`Variable ${variable.key} already exists, updating instead`);
+					try {
+						await Db.collections.Variables.update({ key: variable.key }, { ...variable });
+					} catch (errorUpdate) {
+						LoggerProxy.debug(`Failed to update variable ${variable.key}, skipping`);
+						LoggerProxy.debug((errorUpdate as Error).message);
+					}
+				}
+			} finally {
+				result.imported.push(variable.key);
+			}
 		}
+
+		// add remaining overrides as new variables
+		if (overriddenKeys.length > 0 && valueOverrides) {
+			for (const key of overriddenKeys) {
+				result.imported.push(key);
+				const newVariable = new Variables({ key, value: valueOverrides[key] });
+				await Db.collections.Variables.save(newVariable);
+			}
+		}
+
+		return result;
 	}
 }
diff --git a/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
index ef71321aabdad..7e447ef576400 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
@@ -53,6 +53,14 @@ export class SourceControlPreferencesService {
 		);
 	}
 
+	public isSourceControlSetup() {
+		return (
+			this.isSourceControlLicensedAndEnabled() &&
+			this.getPreferences().repositoryUrl &&
+			this.getPreferences().branchName
+		);
+	}
+
 	getPublicKey(): string {
 		try {
 			return fsReadFileSync(this.sshKeyName + '.pub', { encoding: 'utf8' });
@@ -80,7 +88,7 @@ export class SourceControlPreferencesService {
 	 */
 	async generateAndSaveKeyPair(): Promise<SourceControlPreferences> {
 		sourceControlFoldersExistCheck([this.gitFolder, this.sshFolder]);
-		const keyPair = generateSshKeyPair('ed25519');
+		const keyPair = await generateSshKeyPair('ed25519');
 		if (keyPair.publicKey && keyPair.privateKey) {
 			try {
 				await fsWriteFile(this.sshKeyName + '.pub', keyPair.publicKey, {
diff --git a/packages/cli/src/environments/sourceControl/types/exportResult.ts b/packages/cli/src/environments/sourceControl/types/exportResult.ts
index b7c13f3f56492..976b4ca0c325f 100644
--- a/packages/cli/src/environments/sourceControl/types/exportResult.ts
+++ b/packages/cli/src/environments/sourceControl/types/exportResult.ts
@@ -6,4 +6,5 @@ export interface ExportResult {
 		name: string;
 	}>;
 	removedFiles?: string[];
+	missingIds?: string[];
 }
diff --git a/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts b/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts
index 15d405fbb7fa7..26b866ddc0231 100644
--- a/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts
+++ b/packages/cli/src/environments/sourceControl/types/exportableWorkflow.ts
@@ -1,7 +1,6 @@
 import type { INode, IConnections, IWorkflowSettings } from 'n8n-workflow';
 
 export interface ExportableWorkflow {
-	active: boolean;
 	id: string;
 	name: string;
 	nodes: INode[];
@@ -9,4 +8,5 @@ export interface ExportableWorkflow {
 	settings?: IWorkflowSettings;
 	triggerCount: number;
 	versionId: string;
+	owner: string;
 }
diff --git a/packages/cli/src/environments/sourceControl/types/requests.ts b/packages/cli/src/environments/sourceControl/types/requests.ts
index 7e2d0d9f7b2c1..5fa165b5be2d4 100644
--- a/packages/cli/src/environments/sourceControl/types/requests.ts
+++ b/packages/cli/src/environments/sourceControl/types/requests.ts
@@ -8,6 +8,7 @@ import type { SourceControlPushWorkFolder } from './sourceControlPushWorkFolder'
 import type { SourceControlPullWorkFolder } from './sourceControlPullWorkFolder';
 import type { SourceControlDisconnect } from './sourceControlDisconnect';
 import type { SourceControlSetReadOnly } from './sourceControlSetReadOnly';
+import type { SourceControlGetStatus } from './sourceControlGetStatus';
 
 export declare namespace SourceControlRequest {
 	type UpdatePreferences = AuthenticatedRequest<{}, {}, Partial<SourceControlPreferences>, {}>;
@@ -19,4 +20,5 @@ export declare namespace SourceControlRequest {
 	type Disconnect = AuthenticatedRequest<{}, {}, SourceControlDisconnect, {}>;
 	type PushWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPushWorkFolder, {}>;
 	type PullWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPullWorkFolder, {}>;
+	type GetStatus = AuthenticatedRequest<{}, {}, {}, SourceControlGetStatus>;
 }
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts b/packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts
new file mode 100644
index 0000000000000..d8f30edff0e0a
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlGetStatus.ts
@@ -0,0 +1,32 @@
+import { IsBoolean, IsOptional, IsString } from 'class-validator';
+
+function booleanFromString(value: string | boolean): boolean {
+	if (typeof value === 'boolean') {
+		return value;
+	}
+	return value === 'true';
+}
+
+export class SourceControlGetStatus {
+	@IsString()
+	@IsOptional()
+	direction: 'push' | 'pull';
+
+	@IsBoolean()
+	@IsOptional()
+	preferLocalVersion: boolean;
+
+	@IsBoolean()
+	@IsOptional()
+	verbose: boolean;
+
+	constructor(values: {
+		direction: 'push' | 'pull';
+		preferLocalVersion: string | boolean;
+		verbose: string | boolean;
+	}) {
+		this.direction = values.direction || 'push';
+		this.preferLocalVersion = booleanFromString(values.preferLocalVersion) || true;
+		this.verbose = booleanFromString(values.verbose) || false;
+	}
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts
index 5cbecfb134e9d..970507cdfe696 100644
--- a/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPreferences.ts
@@ -1,4 +1,4 @@
-import { IsBoolean, IsEmail, IsHexColor, IsOptional, IsString } from 'class-validator';
+import { IsBoolean, IsHexColor, IsOptional, IsString } from 'class-validator';
 
 export class SourceControlPreferences {
 	constructor(preferences: Partial<SourceControlPreferences> | undefined = undefined) {
@@ -11,12 +11,6 @@ export class SourceControlPreferences {
 	@IsString()
 	repositoryUrl: string;
 
-	@IsString()
-	authorName: string;
-
-	@IsEmail()
-	authorEmail: string;
-
 	@IsString()
 	branchName = 'main';
 
@@ -45,8 +39,6 @@ export class SourceControlPreferences {
 		return new SourceControlPreferences({
 			connected: preferences.connected ?? defaultPreferences.connected,
 			repositoryUrl: preferences.repositoryUrl ?? defaultPreferences.repositoryUrl,
-			authorName: preferences.authorName ?? defaultPreferences.authorName,
-			authorEmail: preferences.authorEmail ?? defaultPreferences.authorEmail,
 			branchName: preferences.branchName ?? defaultPreferences.branchName,
 			branchReadOnly: preferences.branchReadOnly ?? defaultPreferences.branchReadOnly,
 			branchColor: preferences.branchColor ?? defaultPreferences.branchColor,
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts
index ef9d3d6650d39..e91f615fac0da 100644
--- a/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPullWorkFolder.ts
@@ -24,6 +24,4 @@ export class SourceControllPullOptions {
 	force?: boolean;
 
 	variables?: { [key: string]: string };
-
-	importAfterPull?: boolean = true;
 }
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts b/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts
index 0fef05da1e685..a6b23025d87aa 100644
--- a/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts
@@ -1,4 +1,5 @@
 import { IsBoolean, IsOptional, IsString } from 'class-validator';
+import type { SourceControlledFile } from './sourceControlledFile';
 
 export class SourceControlPushWorkFolder {
 	@IsBoolean()
@@ -6,16 +7,7 @@ export class SourceControlPushWorkFolder {
 	force?: boolean;
 
 	@IsString({ each: true })
-	@IsOptional()
-	fileNames?: Set<string>;
-
-	@IsString({ each: true })
-	@IsOptional()
-	workflowIds?: Set<string>;
-
-	@IsString({ each: true })
-	@IsOptional()
-	credentialIds?: Set<string>;
+	fileNames: SourceControlledFile[];
 
 	@IsString()
 	@IsOptional()
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts b/packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts
new file mode 100644
index 0000000000000..9afbf4e6fbb13
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlWorkflowVersionId.ts
@@ -0,0 +1,9 @@
+export interface SourceControlWorkflowVersionId {
+	id: string;
+	versionId: string;
+	filename: string;
+	name?: string;
+	localId?: string;
+	remoteId?: string;
+	updatedAt?: string;
+}
diff --git a/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts b/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts
index 165621ebc6126..5bbf75921b2f8 100644
--- a/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts
+++ b/packages/cli/src/environments/sourceControl/types/sourceControlledFile.ts
@@ -5,6 +5,8 @@ export type SourceControlledFileStatus =
 	| 'created'
 	| 'renamed'
 	| 'conflicted'
+	| 'ignored'
+	| 'staged'
 	| 'unknown';
 export type SourceControlledFileLocation = 'local' | 'remote';
 export type SourceControlledFileType = 'credential' | 'workflow' | 'tags' | 'variables' | 'file';
@@ -17,4 +19,5 @@ export type SourceControlledFile = {
 	location: SourceControlledFileLocation;
 	conflict: boolean;
 	updatedAt: string;
+	pushed?: boolean;
 };
diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts
index 33bbe16d365a5..429c656de33eb 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments/variables/variables.service.ee.ts
@@ -21,7 +21,7 @@ export class EEVariablesService extends VariablesService {
 		if (variable.key.replace(/[A-Za-z0-9_]/g, '').length !== 0) {
 			throw new VariablesValidationError('key can only contain characters A-Za-z0-9_');
 		}
-		if (variable.value.length > 255) {
+		if (variable.value?.length > 255) {
 			throw new VariablesValidationError('value cannot be longer than 255 characters');
 		}
 	}
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index f278bac24fc83..02a01ed6915e1 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -10,7 +10,8 @@ import { getLogger } from '@/Logger';
 import { License } from '@/License';
 import { LicenseService } from '@/license/License.service';
 import { N8N_VERSION } from '@/constants';
-import { Service } from 'typedi';
+import Container, { Service } from 'typedi';
+import { SourceControlPreferencesService } from '../environments/sourceControl/sourceControlPreferences.service.ee';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -105,11 +106,18 @@ export class Telemetry {
 
 		this.executionCountsBuffer = {};
 
+		const sourceControlPreferences = Container.get(
+			SourceControlPreferencesService,
+		).getPreferences();
+
 		// License info
 		const pulsePacket = {
 			plan_name_current: this.license.getPlanName(),
 			quota: this.license.getTriggerLimit(),
 			usage: await LicenseService.getActiveTriggerCount(),
+			source_control_set_up: Container.get(SourceControlPreferencesService).isSourceControlSetup(),
+			branchName: sourceControlPreferences.branchName,
+			read_only_instance: sourceControlPreferences.branchReadOnly,
 		};
 		allPromises.push(this.track('pulse', pulsePacket));
 		return Promise.all(allPromises);
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 14f2333227d73..24c4cc85542e6 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -222,16 +222,24 @@ export class WorkflowsService {
 			);
 		}
 
-		// Update the workflow's version
-		workflow.versionId = uuid();
-
-		LoggerProxy.verbose(
-			`Updating versionId for workflow ${workflowId} for user ${user.id} after saving`,
-			{
-				previousVersionId: shared.workflow.versionId,
-				newVersionId: workflow.versionId,
-			},
-		);
+		if (
+			Object.keys(workflow).length === 3 &&
+			workflow.id !== undefined &&
+			workflow.versionId !== undefined &&
+			workflow.active !== undefined
+		) {
+			// we're just updating the active status of the workflow, don't update the versionId
+		} else {
+			// Update the workflow's version
+			workflow.versionId = uuid();
+			LoggerProxy.verbose(
+				`Updating versionId for workflow ${workflowId} for user ${user.id} after saving`,
+				{
+					previousVersionId: shared.workflow.versionId,
+					newVersionId: workflow.versionId,
+				},
+			);
+		}
 
 		// check credentials for old format
 		await WorkflowHelpers.replaceInvalidCredentials(workflow);
diff --git a/packages/cli/test/integration/environments/SourceControl.test.ts b/packages/cli/test/integration/environments/SourceControl.test.ts
new file mode 100644
index 0000000000000..1e4852d7ca319
--- /dev/null
+++ b/packages/cli/test/integration/environments/SourceControl.test.ts
@@ -0,0 +1,72 @@
+import type { SuperAgentTest } from 'supertest';
+import { SOURCE_CONTROL_API_ROOT } from '@/environments/sourceControl/constants';
+import * as testDb from '../shared/testDb';
+import * as utils from '../shared/utils/';
+import type { User } from '@db/entities/User';
+import * as UserManagementHelpers from '@/UserManagement/UserManagementHelper';
+import Container from 'typedi';
+import { License } from '@/License';
+import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
+import { SourceControlService } from '@/environments/sourceControl/sourceControl.service.ee';
+import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
+
+let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
+let owner: User;
+let member: User;
+
+const sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['sourceControl', 'license', 'auth'],
+	enabledFeatures: ['feat:sourceControl', 'feat:sharing'],
+});
+
+beforeAll(async () => {
+	const globalOwnerRole = await testDb.getGlobalOwnerRole();
+	const globalMemberRole = await testDb.getGlobalMemberRole();
+	owner = await testDb.createUser({ globalRole: globalOwnerRole });
+	member = await testDb.createUser({ globalRole: globalMemberRole });
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(member);
+
+	Container.get(License).isSourceControlLicensed = () => true;
+	Container.get(SourceControlPreferencesService).isSourceControlConnected = () => true;
+});
+
+describe('GET /sourceControl/preferences', () => {
+	test('should return Source Control preferences', async () => {
+		await authOwnerAgent
+			.get(`/${SOURCE_CONTROL_API_ROOT}/preferences`)
+			.expect(200)
+			.expect((res) => {
+				return 'repositoryUrl' in res.body && 'branchName' in res.body;
+			});
+	});
+
+	test('should return repo sync status', async () => {
+		Container.get(SourceControlService).getStatus = async () => {
+			return [
+				{
+					id: 'haQetoXq9GxHSkft',
+					name: 'My workflow 6 edit',
+					type: 'workflow',
+					status: 'modified',
+					location: 'local',
+					conflict: true,
+					file: '/Users/michael/.n8n/git/workflows/haQetoXq9GxHSkft.json',
+					updatedAt: '2023-07-14T11:24:41.000Z',
+				},
+			] as SourceControlledFile[];
+		};
+		await authOwnerAgent
+			.get(`/${SOURCE_CONTROL_API_ROOT}/get-status`)
+			.query({ direction: 'push', preferLocalVersion: 'true', verbose: 'false' })
+			.expect(200)
+			.expect((res) => {
+				const data: SourceControlledFile[] = res.body.data;
+				expect(data.length).toBe(1);
+				expect(data[0].id).toBe('haQetoXq9GxHSkft');
+			});
+	});
+});
diff --git a/packages/cli/test/integration/environments/VersionControl.test.ts b/packages/cli/test/integration/environments/VersionControl.test.ts
deleted file mode 100644
index 1b85c92fce7bb..0000000000000
--- a/packages/cli/test/integration/environments/VersionControl.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { SuperAgentTest } from 'supertest';
-import { SOURCE_CONTROL_API_ROOT } from '@/environments/sourceControl/constants';
-import * as testDb from '../shared/testDb';
-import * as utils from '../shared/utils/';
-
-let authOwnerAgent: SuperAgentTest;
-
-const testServer = utils.setupTestServer({
-	endpointGroups: ['sourceControl'],
-	enabledFeatures: ['feat:sourceControl'],
-});
-
-beforeAll(async () => {
-	const owner = await testDb.createOwner();
-	authOwnerAgent = testServer.authAgentFor(owner);
-});
-
-describe('GET /sourceControl/preferences', () => {
-	test('should return Source Control preferences', async () => {
-		await authOwnerAgent
-			.get(`/${SOURCE_CONTROL_API_ROOT}/preferences`)
-			.expect(200)
-			.expect((res) => {
-				return 'repositoryUrl' in res.body && 'branchName' in res.body;
-			});
-	});
-});
diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
index e52826bf4c52c..23f455d59cff8 100644
--- a/packages/cli/test/integration/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -759,13 +759,12 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 		const { versionId: memberVersionId } = memberGetResponse.body.data;
 		await authMemberAgent
 			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: memberVersionId });
-
+			.send({ active: true, versionId: memberVersionId, name: 'Update by member' });
 		// owner blocked from activating workflow
 
 		const activationAttemptResponse = await authOwnerAgent
 			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: ownerVersionId });
+			.send({ active: true, versionId: ownerVersionId, name: 'Update by owner' });
 
 		expect(activationAttemptResponse.status).toBe(400);
 		expect(activationAttemptResponse.body.code).toBe(100);
@@ -793,13 +792,13 @@ describe('PATCH /workflows/:id - validate interim updates', () => {
 
 		await authOwnerAgent
 			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: ownerSecondVersionId });
+			.send({ active: true, versionId: ownerSecondVersionId, name: 'Owner update again' });
 
 		// member blocked from activating workflow
 
 		const updateAttemptResponse = await authMemberAgent
 			.patch(`/workflows/${id}`)
-			.send({ active: true, versionId: memberVersionId });
+			.send({ active: true, versionId: memberVersionId, name: 'Update by member' });
 
 		expect(updateAttemptResponse.status).toBe(400);
 		expect(updateAttemptResponse.body.code).toBe(100);
diff --git a/packages/cli/test/unit/SourceControl.test.ts b/packages/cli/test/unit/SourceControl.test.ts
new file mode 100644
index 0000000000000..e33b67aa8f7b5
--- /dev/null
+++ b/packages/cli/test/unit/SourceControl.test.ts
@@ -0,0 +1,256 @@
+import Container from 'typedi';
+import {
+	generateSshKeyPair,
+	getRepoType,
+	getTrackingInformationFromPostPushResult,
+	getTrackingInformationFromPrePushResult,
+	getTrackingInformationFromPullResult,
+	sourceControlFoldersExistCheck,
+} from '@/environments/sourceControl/sourceControlHelper.ee';
+import { License } from '@/License';
+import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
+import { UserSettings } from 'n8n-core';
+import path from 'path';
+import {
+	SOURCE_CONTROL_SSH_FOLDER,
+	SOURCE_CONTROL_GIT_FOLDER,
+	SOURCE_CONTROL_SSH_KEY_NAME,
+} from '@/environments/sourceControl/constants';
+import { LoggerProxy } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+import { constants as fsConstants, accessSync } from 'fs';
+import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
+
+const pushResult: SourceControlledFile[] = [
+	{
+		file: 'credential_stubs/kkookWGIeey9K4Kt.json',
+		id: 'kkookWGIeey9K4Kt',
+		name: '(deleted)',
+		type: 'credential',
+		status: 'deleted',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+		pushed: true,
+	},
+	{
+		file: 'variable_stubs.json',
+		id: 'variables',
+		name: 'variables',
+		type: 'variables',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+		pushed: true,
+	},
+	{
+		file: 'workflows/BpFS26gViuGqrIVP.json',
+		id: 'BpFS26gViuGqrIVP',
+		name: 'My workflow 5',
+		type: 'workflow',
+		status: 'modified',
+		location: 'remote',
+		conflict: true,
+		pushed: true,
+		updatedAt: '2023-07-10T10:10:59.000Z',
+	},
+	{
+		file: 'workflows/BpFS26gViuGqrIVP.json',
+		id: 'BpFS26gViuGqrIVP',
+		name: 'My workflow 5',
+		type: 'workflow',
+		status: 'modified',
+		location: 'local',
+		conflict: true,
+		updatedAt: '2023-07-10T10:10:59.000Z',
+	},
+	{
+		file: 'workflows/dAU6dNthm4TR3gXx.json',
+		id: 'dAU6dNthm4TR3gXx',
+		name: 'My workflow 7',
+		type: 'workflow',
+		status: 'created',
+		location: 'local',
+		conflict: false,
+		pushed: true,
+		updatedAt: '2023-07-10T10:02:45.186Z',
+	},
+	{
+		file: 'workflows/haQetoXq9GxHSkft.json',
+		id: 'haQetoXq9GxHSkft',
+		name: 'My workflow 6',
+		type: 'workflow',
+		status: 'created',
+		location: 'local',
+		conflict: false,
+		updatedAt: '2023-07-10T10:02:39.276Z',
+	},
+];
+
+const pullResult: SourceControlledFile[] = [
+	{
+		file: 'credential_stubs/kkookWGIeey9K4Kt.json',
+		id: 'kkookWGIeey9K4Kt',
+		name: '(deleted)',
+		type: 'credential',
+		status: 'deleted',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'credential_stubs/abcdeWGIeey9K4aa.json',
+		id: 'abcdeWGIeey9K4aa',
+		name: 'modfied credential',
+		type: 'credential',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'workflows/BpFS26gViuGqrIVP.json',
+		id: 'BpFS26gViuGqrIVP',
+		name: '(deleted)',
+		type: 'workflow',
+		status: 'deleted',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'variable_stubs.json',
+		id: 'variables',
+		name: 'variables',
+		type: 'variables',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '',
+	},
+	{
+		file: 'workflows/dAU6dNthm4TR3gXx.json',
+		id: 'dAU6dNthm4TR3gXx',
+		name: 'My workflow 7',
+		type: 'workflow',
+		status: 'created',
+		location: 'local',
+		conflict: false,
+		updatedAt: '2023-07-10T10:02:45.186Z',
+	},
+	{
+		file: 'workflows/haQetoXq9GxHSkft.json',
+		id: 'haQetoXq9GxHSkft',
+		name: 'My workflow 6',
+		type: 'workflow',
+		status: 'modified',
+		location: 'local',
+		conflict: false,
+		updatedAt: '2023-07-10T10:02:39.276Z',
+	},
+];
+
+beforeAll(async () => {
+	LoggerProxy.init(getLogger());
+	Container.get(License).isSourceControlLicensed = () => true;
+	Container.get(SourceControlPreferencesService).getPreferences = () => ({
+		branchName: 'main',
+		connected: true,
+		repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
+		branchReadOnly: false,
+		branchColor: '#5296D6',
+		publicKey:
+			'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBSz2nMZAiUBWe6n89aWd5x9QMcIOaznVW3fpuCYC4L n8n deploy key',
+	});
+});
+
+describe('Source Control', () => {
+	it('should generate an SSH key pair', async () => {
+		const keyPair = await generateSshKeyPair();
+		expect(keyPair.privateKey).toBeTruthy();
+		expect(keyPair.privateKey).toContain('BEGIN OPENSSH PRIVATE KEY');
+		expect(keyPair.publicKey).toBeTruthy();
+		expect(keyPair.publicKey).toContain('ssh-ed25519');
+	});
+
+	it('should check for git and ssh folders and create them if required', async () => {
+		const userFolder = UserSettings.getUserN8nFolderPath();
+		const sshFolder = path.join(userFolder, SOURCE_CONTROL_SSH_FOLDER);
+		const gitFolder = path.join(userFolder, SOURCE_CONTROL_GIT_FOLDER);
+		const sshKeyName = path.join(sshFolder, SOURCE_CONTROL_SSH_KEY_NAME);
+		let hasThrown = false;
+		try {
+			accessSync(sshFolder, fsConstants.F_OK);
+		} catch (error) {
+			hasThrown = true;
+		}
+		expect(hasThrown).toBeTruthy();
+		hasThrown = false;
+		try {
+			accessSync(gitFolder, fsConstants.F_OK);
+		} catch (error) {
+			hasThrown = true;
+		}
+		expect(hasThrown).toBeTruthy();
+		// create missing folders
+		expect(sourceControlFoldersExistCheck([gitFolder, sshFolder], true)).toBe(false);
+		// find folders this time
+		expect(sourceControlFoldersExistCheck([gitFolder, sshFolder], true)).toBe(true);
+		expect(accessSync(sshFolder, fsConstants.F_OK)).toBeUndefined();
+		expect(accessSync(gitFolder, fsConstants.F_OK)).toBeUndefined();
+	});
+
+	it('should check if source control is licensed', async () => {
+		expect(Container.get(License).isSourceControlLicensed()).toBe(true);
+	});
+
+	it('should get repo type from url', async () => {
+		expect(getRepoType('git@github.com:n8ntest/n8n_testrepo.git')).toBe('github');
+		expect(getRepoType('git@gitlab.com:n8ntest/n8n_testrepo.git')).toBe('gitlab');
+		expect(getRepoType('git@mygitea.io:n8ntest/n8n_testrepo.git')).toBe('other');
+	});
+
+	it('should get tracking information from pre-push results', () => {
+		const trackingResult = getTrackingInformationFromPrePushResult(pushResult);
+		expect(trackingResult).toEqual({
+			workflows_eligible: 3,
+			workflows_eligible_with_conflicts: 1,
+			creds_eligible: 1,
+			creds_eligible_with_conflicts: 0,
+			variables_eligible: 1,
+		});
+	});
+
+	it('should get tracking information from post-push results', () => {
+		const trackingResult = getTrackingInformationFromPostPushResult(pushResult);
+		expect(trackingResult).toEqual({
+			workflows_pushed: 2,
+			workflows_eligible: 3,
+			creds_pushed: 1,
+			variables_pushed: 1,
+		});
+	});
+
+	it('should get tracking information from pull results', () => {
+		const trackingResult = getTrackingInformationFromPullResult(pullResult);
+		expect(trackingResult).toEqual({
+			cred_conflicts: 1,
+			workflow_conflicts: 1,
+			workflow_updates: 3,
+		});
+	});
+
+	it('should class validate correct preferences', async () => {
+		const validPreferences = {
+			branchName: 'main',
+			repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
+			branchReadOnly: false,
+			branchColor: '#5296D6',
+		};
+		const validationResult = await Container.get(
+			SourceControlPreferencesService,
+		).validateSourceControlPreferences(validPreferences);
+		expect(validationResult).toBeTruthy();
+	});
+});
diff --git a/packages/cli/test/unit/VersionControl.test.ts b/packages/cli/test/unit/VersionControl.test.ts
deleted file mode 100644
index 52f1da05d2279..0000000000000
--- a/packages/cli/test/unit/VersionControl.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { generateSshKeyPair } from '../../src/environments/sourceControl/sourceControlHelper.ee';
-
-describe('Source Control', () => {
-	it('should generate an SSH key pair', () => {
-		const keyPair = generateSshKeyPair();
-		expect(keyPair.privateKey).toBeTruthy();
-		expect(keyPair.privateKey).toContain('BEGIN OPENSSH PRIVATE KEY');
-		expect(keyPair.publicKey).toBeTruthy();
-		expect(keyPair.publicKey).toContain('ssh-ed25519');
-	});
-});
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 9a36b6284d6e3..5e17b2d1f440e 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1451,8 +1451,6 @@ export type SamlPreferencesExtractedData = {
 export type SourceControlPreferences = {
 	connected: boolean;
 	repositoryUrl: string;
-	authorName: string;
-	authorEmail: string;
 	branchName: string;
 	branches: string[];
 	branchReadOnly: boolean;
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
index 445c76257ad78..6dc7f2f07cdc3 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
@@ -9,8 +9,6 @@ export function routesForSourceControl(server: Server) {
 	const defaultSourceControlPreferences: SourceControlPreferences = {
 		branchName: '',
 		branches: [],
-		authorName: '',
-		authorEmail: '',
 		repositoryUrl: '',
 		branchReadOnly: false,
 		branchColor: '#1d6acb',
diff --git a/packages/editor-ui/src/api/sourceControl.ts b/packages/editor-ui/src/api/sourceControl.ts
index 3ab78fe4b34e9..144839b156e8b 100644
--- a/packages/editor-ui/src/api/sourceControl.ts
+++ b/packages/editor-ui/src/api/sourceControl.ts
@@ -52,8 +52,13 @@ export const getStatus = async (context: IRestApiContext): Promise<SourceControl
 
 export const getAggregatedStatus = async (
 	context: IRestApiContext,
+	options: {
+		direction: 'push' | 'pull';
+		preferLocalVersion: boolean;
+		verbose: boolean;
+	} = { direction: 'push', preferLocalVersion: true, verbose: false },
 ): Promise<SourceControlAggregatedFile[]> => {
-	return makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/get-status`);
+	return makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/get-status`, options);
 };
 
 export const disconnect = async (
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index ae5bdba06447f..55d45172a20d2 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -152,7 +152,7 @@ import BreakpointsObserver from '@/components/BreakpointsObserver.vue';
 import type { IUser, IWorkflowDataUpdate, IWorkflowDb, IWorkflowToShare } from '@/Interface';
 
 import { saveAs } from 'file-saver';
-import { useTitleChange, useToast, useMessage, useLoadingService } from '@/composables';
+import { useTitleChange, useToast, useMessage } from '@/composables';
 import type { MessageBoxInputData } from 'element-ui/types/message-box';
 import {
 	useUIStore,
@@ -169,6 +169,7 @@ import { getWorkflowPermissions } from '@/permissions';
 import { createEventBus } from 'n8n-design-system';
 import { useCloudPlanStore } from '@/stores';
 import { nodeViewEventBus } from '@/event-bus';
+import { genericHelpers } from '@/mixins/genericHelpers';
 
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
@@ -181,7 +182,7 @@ const hasChanged = (prev: string[], curr: string[]) => {
 
 export default defineComponent({
 	name: 'WorkflowDetails',
-	mixins: [workflowHelpers],
+	mixins: [workflowHelpers, genericHelpers],
 	components: {
 		TagsContainer,
 		PushConnectionTracker,
@@ -199,10 +200,7 @@ export default defineComponent({
 		},
 	},
 	setup() {
-		const loadingService = useLoadingService();
-
 		return {
-			loadingService,
 			...useTitleChange(),
 			...useToast(),
 			...useMessage(),
@@ -247,6 +245,9 @@ export default defineComponent({
 		isDirty(): boolean {
 			return this.uiStore.stateIsDirty;
 		},
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
 		currentWorkflowTagIds(): string[] {
 			return this.workflowsStore.workflowTags;
 		},
@@ -318,7 +319,8 @@ export default defineComponent({
 				disabled:
 					!this.sourceControlStore.isEnterpriseSourceControlEnabled ||
 					!this.onWorkflowPage ||
-					this.onExecutionsTab,
+					this.onExecutionsTab ||
+					this.readOnlyEnv,
 			});
 
 			actions.push({
@@ -531,25 +533,20 @@ export default defineComponent({
 					break;
 				}
 				case WORKFLOW_MENU_ACTIONS.PUSH: {
-					this.loadingService.startLoading();
+					this.startLoading();
 					try {
 						await this.onSaveButtonClick();
 
 						const status = await this.sourceControlStore.getAggregatedStatus();
-						const workflowStatus = status.filter(
-							(s) =>
-								(s.id === this.currentWorkflowId && s.type === 'workflow') || s.type !== 'workflow',
-						);
 
 						this.uiStore.openModalWithData({
 							name: SOURCE_CONTROL_PUSH_MODAL_KEY,
-							data: { eventBus: this.eventBus, status: workflowStatus },
+							data: { eventBus: this.eventBus, status },
 						});
 					} catch (error) {
 						this.showError(error, this.$locale.baseText('error'));
 					} finally {
-						this.loadingService.stopLoading();
-						this.loadingService.setLoadingText(this.$locale.baseText('genericHelpers.loading'));
+						this.stopLoading();
 					}
 
 					break;
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 8a8c9016dff2d..e04e64907bb70 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, nextTick, ref } from 'vue';
 import { useRouter } from 'vue-router/composables';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useI18n, useLoadingService, useMessage, useToast } from '@/composables';
-import { useUIStore, useSourceControlStore } from '@/stores';
+import { useUIStore, useSourceControlStore, useUsersStore } from '@/stores';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY, VIEWS } from '@/constants';
+import type { SourceControlAggregatedFile } from '../Interface';
+import { sourceControlEventBus } from '@/event-bus/source-control';
 
 const props = defineProps<{
 	isCollapsed: boolean;
@@ -17,6 +19,7 @@ const responseStatuses = {
 const router = useRouter();
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
+const usersStore = useUsersStore();
 const sourceControlStore = useSourceControlStore();
 const message = useMessage();
 const toast = useToast();
@@ -29,10 +32,16 @@ const currentBranch = computed(() => {
 	return sourceControlStore.preferences.branchName;
 });
 const featureEnabled = computed(() => window.localStorage.getItem('source-control'));
+// TODO: use this for release
+// const featureEnabled = computed(
+// 	() => sourceControlStore.preferences.connected && sourceControlStore.preferences.branchName,
+// );
+const isInstanceOwner = computed(() => usersStore.isInstanceOwner);
 const setupButtonTooltipPlacement = computed(() => (props.isCollapsed ? 'right' : 'top'));
 
 async function pushWorkfolder() {
 	loadingService.startLoading();
+	loadingService.setLoadingText(i18n.baseText('settings.sourceControl.loading.checkingForChanges'));
 	try {
 		const status = await sourceControlStore.getAggregatedStatus();
 
@@ -53,7 +62,45 @@ async function pullWorkfolder() {
 	loadingService.setLoadingText(i18n.baseText('settings.sourceControl.loading.pull'));
 
 	try {
-		await sourceControlStore.pullWorkfolder(false);
+		const status: SourceControlAggregatedFile[] =
+			((await sourceControlStore.pullWorkfolder(
+				false,
+			)) as unknown as SourceControlAggregatedFile[]) || [];
+
+		const statusWithoutLocallyCreatedWorkflows = status.filter((file) => {
+			return !(file.type === 'workflow' && file.status === 'created' && file.location === 'local');
+		});
+		if (statusWithoutLocallyCreatedWorkflows.length === 0) {
+			toast.showMessage({
+				title: i18n.baseText('settings.sourceControl.pull.upToDate.title'),
+				message: i18n.baseText('settings.sourceControl.pull.upToDate.description'),
+				type: 'success',
+			});
+		} else {
+			toast.showMessage({
+				title: i18n.baseText('settings.sourceControl.pull.success.title'),
+				type: 'success',
+			});
+
+			const incompleteFileTypes = ['variables', 'credential'];
+			const hasVariablesOrCredentials = (status || []).some((file) => {
+				return incompleteFileTypes.includes(file.type);
+			});
+
+			if (hasVariablesOrCredentials) {
+				nextTick(() => {
+					toast.showMessage({
+						message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
+						title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
+						type: 'info',
+						duration: 0,
+						showClose: true,
+						offset: 0,
+					});
+				});
+			}
+		}
+		sourceControlEventBus.emit('pull');
 	} catch (error) {
 		const errorResponse = error.response;
 
@@ -78,12 +125,11 @@ const goToSourceControlSetup = async () => {
 
 <template>
 	<div
-		v-if="featureEnabled"
+		v-if="featureEnabled && isInstanceOwner"
 		:class="{
 			[$style.sync]: true,
 			[$style.collapsed]: isCollapsed,
-			[$style.isConnected]:
-				sourceControlStore.preferences.connected && sourceControlStore.preferences.branchName,
+			[$style.isConnected]: featureEnabled,
 		}"
 		:style="{ borderLeftColor: sourceControlStore.preferences.branchColor }"
 		data-test-id="main-sidebar-source-control"
@@ -93,7 +139,7 @@ const goToSourceControlSetup = async () => {
 			:class="$style.connected"
 			data-test-id="main-sidebar-source-control-connected"
 		>
-			<span>
+			<span :class="$style.branchName">
 				<n8n-icon icon="code-branch" />
 				{{ currentBranch }}
 			</span>
@@ -178,6 +224,11 @@ const goToSourceControlSetup = async () => {
 	}
 }
 
+.branchName {
+	white-space: normal;
+	line-break: anywhere;
+}
+
 .collapsed {
 	text-align: center;
 	padding-left: var(--spacing-s);
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 9bda6d0614c55..d0c84c44dabb2 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -12,7 +12,7 @@
 					class="node-name"
 					:value="node && node.name"
 					:nodeType="nodeType"
-					:isReadOnly="isReadOnly"
+					:readOnly="isReadOnly"
 					@input="nameChanged"
 				></NodeTitle>
 				<div v-if="isExecutable">
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 751cda38c003a..9e7b276020500 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -7,7 +7,7 @@
 			:class="$style.pinnedDataCallout"
 		>
 			{{ $locale.baseText('runData.pindata.thisDataIsPinned') }}
-			<span class="ml-4xs" v-if="!isReadOnlyRoute">
+			<span class="ml-4xs" v-if="!isReadOnlyRoute && !readOnlyEnv">
 				<n8n-link
 					theme="secondary"
 					size="small"
@@ -59,7 +59,7 @@
 					data-test-id="ndv-run-data-display-mode"
 				/>
 				<n8n-icon-button
-					v-if="canPinData && !isReadOnlyRoute"
+					v-if="canPinData && !isReadOnlyRoute && !readOnlyEnv"
 					v-show="!editMode.enabled"
 					:title="$locale.baseText('runData.editOutput')"
 					:circle="false"
@@ -100,7 +100,10 @@
 						:active="hasPinData"
 						icon="thumbtack"
 						:disabled="
-							editMode.enabled || (inputData.length === 0 && !hasPinData) || isReadOnlyRoute
+							editMode.enabled ||
+							(inputData.length === 0 && !hasPinData) ||
+							isReadOnlyRoute ||
+							readOnlyEnv
 						"
 						@click="onTogglePinData({ source: 'pin-icon-click' })"
 						data-test-id="ndv-pin-data"
@@ -889,6 +892,9 @@ export default defineComponent({
 		isPaneTypeOutput(): boolean {
 			return this.paneType === 'output';
 		},
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
 	},
 	methods: {
 		onItemHover(itemIndex: number | null) {
diff --git a/packages/editor-ui/src/components/SettingsSidebar.vue b/packages/editor-ui/src/components/SettingsSidebar.vue
index eea5b27a80d7e..3fa7c992b63f8 100644
--- a/packages/editor-ui/src/components/SettingsSidebar.vue
+++ b/packages/editor-ui/src/components/SettingsSidebar.vue
@@ -207,7 +207,6 @@ export default defineComponent({
 					}
 					break;
 				case 'users': // Fakedoor feature added via hooks when user management is disabled on cloud
-				case 'environments':
 				case 'logging':
 					this.$router.push({ name: VIEWS.FAKE_DOOR, params: { featureId: key } }).catch(() => {});
 					break;
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index bc58765f8cfd5..0ddd9c5d26156 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -3,28 +3,45 @@ import Modal from './Modal.vue';
 import { SOURCE_CONTROL_PULL_MODAL_KEY } from '@/constants';
 import type { PropType } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
-import type { SourceControlStatus } from '@/Interface';
+import type { SourceControlAggregatedFile } from '@/Interface';
 import { useI18n, useLoadingService, useToast } from '@/composables';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores';
-import { useRoute } from 'vue-router/composables';
+import { useRoute, useRouter } from 'vue-router/composables';
+import { computed, nextTick, ref } from 'vue';
+import { sourceControlEventBus } from '@/event-bus/source-control';
 
 const props = defineProps({
 	data: {
-		type: Object as PropType<{ eventBus: EventBus; status: SourceControlStatus }>,
+		type: Object as PropType<{ eventBus: EventBus; status: SourceControlAggregatedFile[] }>,
 		default: () => ({}),
 	},
 });
 
-const defaultStagedFileTypes = ['tags', 'variables', 'credential'];
+const incompleteFileTypes = ['variables', 'credential'];
 
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
 const toast = useToast();
 const { i18n } = useI18n();
 const sourceControlStore = useSourceControlStore();
+const router = useRouter();
 const route = useRoute();
 
+const files = ref<SourceControlAggregatedFile[]>(props.data.status || []);
+
+const workflowFiles = computed(() => {
+	return files.value.filter((file) => file.type === 'workflow');
+});
+
+const modifiedWorkflowFiles = computed(() => {
+	return workflowFiles.value.filter((file) => file.status === 'modified');
+});
+
+const deletedWorkflowFiles = computed(() => {
+	return workflowFiles.value.filter((file) => file.status === 'deleted');
+});
+
 function close() {
 	uiStore.closeModal(SOURCE_CONTROL_PULL_MODAL_KEY);
 }
@@ -35,11 +52,29 @@ async function pullWorkfolder() {
 
 	try {
 		await sourceControlStore.pullWorkfolder(true);
+
+		const hasVariablesOrCredentials = files.value.some((file) => {
+			return incompleteFileTypes.includes(file.type);
+		});
+
 		toast.showMessage({
-			message: i18n.baseText('settings.sourceControl.pull.success.description'),
 			title: i18n.baseText('settings.sourceControl.pull.success.title'),
 			type: 'success',
 		});
+
+		if (hasVariablesOrCredentials) {
+			nextTick(() => {
+				toast.showMessage({
+					message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
+					title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
+					type: 'info',
+					duration: 0,
+					showClose: true,
+					offset: 0,
+				});
+			});
+		}
+		sourceControlEventBus.emit('pull');
 	} catch (error) {
 		toast.showError(error, 'Error');
 	} finally {
@@ -59,7 +94,21 @@ async function pullWorkfolder() {
 			<div :class="$style.container">
 				<n8n-text>
 					{{ i18n.baseText('settings.sourceControl.modals.pull.description') }}
+					<n8n-link :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+						{{ i18n.baseText('settings.sourceControl.modals.pull.description.learnMore') }}
+					</n8n-link>
 				</n8n-text>
+
+				<div v-if="modifiedWorkflowFiles.length > 0" class="mt-l">
+					<ul :class="$style.filesList">
+						<li v-for="file in modifiedWorkflowFiles" :key="file.id">
+							<n8n-link :class="$style.fileLink" new-window :to="`/workflow/${file.id}`">
+								{{ file.name }}
+								<n8n-icon icon="external-link-alt" />
+							</n8n-link>
+						</li>
+					</ul>
+				</div>
 			</div>
 		</template>
 
@@ -81,6 +130,27 @@ async function pullWorkfolder() {
 	overflow-wrap: break-word;
 }
 
+.filesList {
+	list-style: inside;
+	margin-top: var(--spacing-3xs);
+	padding-left: var(--spacing-2xs);
+
+	li {
+		margin-top: var(--spacing-3xs);
+	}
+}
+
+.fileLink {
+	svg {
+		display: none;
+		margin-left: var(--spacing-4xs);
+	}
+
+	&:hover svg {
+		display: inline-flex;
+	}
+}
+
 .footer {
 	display: flex;
 	flex-direction: row;
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index bc5c5fa3fad56..0d9809a90d83c 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -23,12 +23,20 @@ const defaultStagedFileTypes = ['tags', 'variables', 'credential'];
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
 const toast = useToast();
-const { i18n } = useI18n();
+const { i18n: locale } = useI18n();
 const sourceControlStore = useSourceControlStore();
 const route = useRoute();
 
 const staged = ref<Record<string, boolean>>({});
-const files = ref<SourceControlAggregatedFile[]>(props.data.status || []);
+const files = ref<SourceControlAggregatedFile[]>(
+	props.data.status.filter((file, index, self) => {
+		// do not show remote workflows that are not yet created locally during push
+		if (file.location === 'remote' && file.type === 'workflow' && file.status === 'created') {
+			return false;
+		}
+		return self.findIndex((f) => f.id === file.id) === index;
+	}) || [],
+);
 
 const commitMessage = ref('');
 const loading = ref(true);
@@ -55,10 +63,10 @@ const workflowId = computed(() => {
 
 const sortedFiles = computed(() => {
 	const statusPriority = {
-		deleted: 1,
-		modified: 2,
-		renamed: 3,
-		created: 4,
+		modified: 1,
+		renamed: 2,
+		created: 3,
+		deleted: 4,
 	};
 
 	return [...files.value].sort((a, b) => {
@@ -104,7 +112,7 @@ onMounted(async () => {
 	try {
 		staged.value = getStagedFilesByContext(files.value);
 	} catch (error) {
-		toast.showError(error, i18n.baseText('error'));
+		toast.showError(error, locale.baseText('error'));
 	} finally {
 		loading.value = false;
 	}
@@ -152,10 +160,10 @@ function getStagedFilesByContext(files: SourceControlAggregatedFile[]): Record<s
 			stagedFiles[file.file] = true;
 		}
 
-		if (context.value === 'workflow' && file.type === 'workflow' && file.id === workflowId.value) {
-			stagedFiles[file.file] = true;
-		} else if (context.value === 'workflows' && file.type === 'workflow') {
-			stagedFiles[file.file] = true;
+		if (context.value === 'workflow') {
+			if (file.type === 'workflow' && file.id === workflowId.value) {
+				stagedFiles[file.file] = true;
+			}
 		}
 	});
 
@@ -176,7 +184,7 @@ function close() {
 function renderUpdatedAt(file: SourceControlAggregatedFile) {
 	const currentYear = new Date().getFullYear();
 
-	return i18n.baseText('settings.sourceControl.lastUpdated', {
+	return locale.baseText('settings.sourceControl.lastUpdated', {
 		interpolate: {
 			date: dateformat(
 				file.updatedAt,
@@ -187,25 +195,32 @@ function renderUpdatedAt(file: SourceControlAggregatedFile) {
 	});
 }
 
+async function onCommitKeyDownEnter() {
+	if (!isSubmitDisabled.value) {
+		await commitAndPush();
+	}
+}
+
 async function commitAndPush() {
-	const fileNames = files.value.filter((file) => staged.value[file.file]).map((file) => file.file);
+	const fileNames = files.value.filter((file) => staged.value[file.file]);
 
-	loadingService.startLoading(i18n.baseText('settings.sourceControl.loading.push'));
+	loadingService.startLoading(locale.baseText('settings.sourceControl.loading.push'));
 	close();
 
 	try {
 		await sourceControlStore.pushWorkfolder({
+			force: true,
 			commitMessage: commitMessage.value,
 			fileNames,
 		});
 
 		toast.showToast({
-			title: i18n.baseText('settings.sourceControl.modals.push.success.title'),
-			message: i18n.baseText('settings.sourceControl.modals.push.success.description'),
+			title: locale.baseText('settings.sourceControl.modals.push.success.title'),
+			message: locale.baseText('settings.sourceControl.modals.push.success.description'),
 			type: 'success',
 		});
 	} catch (error) {
-		toast.showError(error, i18n.baseText('error'));
+		toast.showError(error, locale.baseText('error'));
 	} finally {
 		loadingService.stopLoading();
 	}
@@ -215,98 +230,106 @@ async function commitAndPush() {
 <template>
 	<Modal
 		width="812px"
-		:title="i18n.baseText('settings.sourceControl.modals.push.title')"
+		:title="locale.baseText('settings.sourceControl.modals.push.title')"
 		:eventBus="data.eventBus"
 		:name="SOURCE_CONTROL_PUSH_MODAL_KEY"
 	>
 		<template #content>
 			<div :class="$style.container">
-				<n8n-text>
-					{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
-					<span v-if="context">
-						{{ i18n.baseText(`settings.sourceControl.modals.push.description.${context}`) }}
-					</span>
-					<n8n-link
-						:href="i18n.baseText('settings.sourceControl.modals.push.description.learnMore.url')"
-					>
-						{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
-					</n8n-link>
-				</n8n-text>
-
-				<div v-if="workflowFiles.length > 0">
-					<div class="mt-l mb-2xs">
-						<n8n-checkbox
-							:indeterminate="selectAllIndeterminate"
-							:value="selectAll"
-							@input="onToggleSelectAll"
-						>
-							<n8n-text bold tag="strong">
-								{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
-							</n8n-text>
-							<n8n-text tag="strong" v-show="workflowFiles.length > 0">
-								({{ stagedWorkflowFiles.length }}/{{ workflowFiles.length }})
-							</n8n-text>
-						</n8n-checkbox>
-					</div>
-					<n8n-card
-						v-for="file in sortedFiles"
-						v-show="!defaultStagedFileTypes.includes(file.type)"
-						:key="file.file"
-						:class="$style.listItem"
-						@click="setStagedStatus(file, !staged[file.file])"
-					>
-						<div :class="$style.listItemBody">
+				<div v-if="files.length > 0">
+					<div v-if="workflowFiles.length > 0">
+						<n8n-text>
+							{{ locale.baseText('settings.sourceControl.modals.push.description') }}
+							<n8n-link :to="locale.baseText('settings.sourceControl.docs.using.pushPull.url')">
+								{{ locale.baseText('settings.sourceControl.modals.push.description.learnMore') }}
+							</n8n-link>
+						</n8n-text>
+
+						<div class="mt-l mb-2xs">
 							<n8n-checkbox
-								:value="staged[file.file]"
-								:class="$style.listItemCheckbox"
-								@input="setStagedStatus(file, !staged[file.file])"
-							/>
-							<div>
-								<n8n-text v-if="file.status === 'deleted'" color="text-light">
-									<span v-if="file.type === 'workflow'"> Deleted Workflow: </span>
-									<span v-if="file.type === 'credential'"> Deleted Credential: </span>
-									<strong>{{ file.id }}</strong>
+								:indeterminate="selectAllIndeterminate"
+								:value="selectAll"
+								@input="onToggleSelectAll"
+							>
+								<n8n-text bold tag="strong">
+									{{ locale.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
 								</n8n-text>
-								<n8n-text bold v-else>
-									{{ file.name }}
+								<n8n-text tag="strong" v-show="workflowFiles.length > 0">
+									({{ stagedWorkflowFiles.length }}/{{ workflowFiles.length }})
 								</n8n-text>
-								<div v-if="file.updatedAt">
-									<n8n-text color="text-light" size="small">
-										{{ renderUpdatedAt(file) }}
+							</n8n-checkbox>
+						</div>
+						<n8n-card
+							v-for="file in sortedFiles"
+							v-show="!defaultStagedFileTypes.includes(file.type)"
+							:key="file.file"
+							:class="$style.listItem"
+							@click="setStagedStatus(file, !staged[file.file])"
+						>
+							<div :class="$style.listItemBody">
+								<n8n-checkbox
+									:value="staged[file.file]"
+									:class="$style.listItemCheckbox"
+									@input="setStagedStatus(file, !staged[file.file])"
+								/>
+								<div>
+									<n8n-text v-if="file.status === 'deleted'" color="text-light">
+										<span v-if="file.type === 'workflow'"> Deleted Workflow: </span>
+										<span v-if="file.type === 'credential'"> Deleted Credential: </span>
+										<strong>{{ file.name || file.id }}</strong>
 									</n8n-text>
+									<n8n-text bold v-else> {{ file.name }} </n8n-text>
+									<div v-if="file.updatedAt">
+										<n8n-text color="text-light" size="small">
+											{{ renderUpdatedAt(file) }}
+										</n8n-text>
+									</div>
 								</div>
-								<div v-if="file.conflict">
-									<n8n-text color="danger" size="small">
-										{{ i18n.baseText('settings.sourceControl.modals.push.overrideVersionInGit') }}
-									</n8n-text>
+								<div :class="$style.listItemStatus">
+									<n8n-badge
+										class="mr-2xs"
+										v-if="workflowId === file.id && file.type === 'workflow'"
+									>
+										Current workflow
+									</n8n-badge>
+									<n8n-badge :theme="statusToBadgeThemeMap[file.status] || 'default'">
+										{{ locale.baseText(`settings.sourceControl.status.${file.status}`) }}
+									</n8n-badge>
 								</div>
 							</div>
-							<div :class="$style.listItemStatus">
-								<n8n-badge class="mr-2xs" v-if="workflowId === file.id && file.type === 'workflow'">
-									Current workflow
-								</n8n-badge>
-								<n8n-badge :theme="statusToBadgeThemeMap[file.status] || 'default'">
-									{{ file.status }}
-								</n8n-badge>
-							</div>
-						</div>
-					</n8n-card>
+						</n8n-card>
+					</div>
+					<n8n-notice class="mt-0" v-else>
+						<i18n path="settings.sourceControl.modals.push.noWorkflowChanges">
+							<template #link>
+								<n8n-link
+									size="small"
+									:to="locale.baseText('settings.sourceControl.docs.using.url')"
+								>
+									{{
+										locale.baseText('settings.sourceControl.modals.push.noWorkflowChanges.moreInfo')
+									}}
+								</n8n-link>
+							</template>
+						</i18n>
+					</n8n-notice>
 
 					<n8n-text bold tag="p" class="mt-l mb-2xs">
-						{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
+						{{ locale.baseText('settings.sourceControl.modals.push.commitMessage') }}
 					</n8n-text>
 					<n8n-input
 						type="text"
 						v-model="commitMessage"
 						:placeholder="
-							i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
+							locale.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
 						"
+						@keydown.enter.native="onCommitKeyDownEnter"
 					/>
 				</div>
 				<div v-else-if="!loading">
-					<n8n-callout class="mt-l">
-						{{ i18n.baseText('settings.sourceControl.modals.push.everythingIsUpToDate') }}
-					</n8n-callout>
+					<n8n-notice class="mt-0 mb-0">
+						{{ locale.baseText('settings.sourceControl.modals.push.everythingIsUpToDate') }}
+					</n8n-notice>
 				</div>
 			</div>
 		</template>
@@ -314,10 +337,10 @@ async function commitAndPush() {
 		<template #footer>
 			<div :class="$style.footer">
 				<n8n-button type="tertiary" class="mr-2xs" @click="close">
-					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
+					{{ locale.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
 				</n8n-button>
 				<n8n-button type="primary" :disabled="isSubmitDisabled" @click="commitAndPush">
-					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.save') }}
+					{{ locale.baseText('settings.sourceControl.modals.push.buttons.save') }}
 				</n8n-button>
 			</div>
 		</template>
diff --git a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
index 06ce2abb9074c..c25b64f7c4187 100644
--- a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
@@ -9,10 +9,12 @@ import { i18nInstance } from '@/plugins/i18n';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
 import { useSourceControlStore, useUIStore } from '@/stores';
+import { useUsersStore } from '@/stores/users.store';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 let sourceControlStore: ReturnType<typeof useSourceControlStore>;
 let uiStore: ReturnType<typeof useUIStore>;
+let usersStore: ReturnType<typeof useUsersStore>;
 
 const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) => {
 	return render(
@@ -41,6 +43,10 @@ describe('MainSidebarSourceControl', () => {
 			},
 		});
 
+		usersStore = useUsersStore(pinia);
+
+		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(true);
+
 		sourceControlStore = useSourceControlStore();
 		uiStore = useUIStore();
 	});
@@ -62,8 +68,6 @@ describe('MainSidebarSourceControl', () => {
 			vi.spyOn(sourceControlStore, 'preferences', 'get').mockReturnValue({
 				branchName: 'main',
 				branches: [],
-				authorName: '',
-				authorEmail: '',
 				repositoryUrl: '',
 				branchReadOnly: false,
 				branchColor: '#5296D6',
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index f8c86af60a5ba..3dd013490865b 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -8,7 +8,7 @@
 			</div>
 
 			<div class="mt-xs mb-l">
-				<slot name="add-button">
+				<slot name="add-button" :disabled="disabled">
 					<n8n-button
 						size="large"
 						block
diff --git a/packages/editor-ui/src/event-bus/source-control.ts b/packages/editor-ui/src/event-bus/source-control.ts
new file mode 100644
index 0000000000000..3cd2c1d7a04bb
--- /dev/null
+++ b/packages/editor-ui/src/event-bus/source-control.ts
@@ -0,0 +1,3 @@
+import { createEventBus } from 'n8n-design-system';
+
+export const sourceControlEventBus = createEventBus();
diff --git a/packages/editor-ui/src/mixins/workflowActivate.ts b/packages/editor-ui/src/mixins/workflowActivate.ts
index fd2f804bd68a6..9dd68c88ebdc9 100644
--- a/packages/editor-ui/src/mixins/workflowActivate.ts
+++ b/packages/editor-ui/src/mixins/workflowActivate.ts
@@ -91,7 +91,10 @@ export const workflowActivate = defineComponent({
 					return;
 				}
 
-				await this.updateWorkflow({ workflowId: currWorkflowId, active: newActiveState });
+				await this.updateWorkflow(
+					{ workflowId: currWorkflowId, active: newActiveState },
+					!this.uiStore.stateIsDirty,
+				);
 			} catch (error) {
 				const newStateName = newActiveState === true ? 'activated' : 'deactivated';
 				this.showError(
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
index c5f1c2fd87966..e18ec7d4eb44d 100644
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/mixins/workflowHelpers.ts
@@ -664,12 +664,17 @@ export const workflowHelpers = defineComponent({
 			return returnData['__xxxxxxx__'];
 		},
 
-		async updateWorkflow({ workflowId, active }: { workflowId: string; active?: boolean }) {
+		async updateWorkflow(
+			{ workflowId, active }: { workflowId: string; active?: boolean },
+			partialData = false,
+		) {
 			let data: IWorkflowDataUpdate = {};
 
 			const isCurrentWorkflow = workflowId === this.workflowsStore.workflowId;
 			if (isCurrentWorkflow) {
-				data = await this.getWorkflowDataToSave();
+				data = partialData
+					? { versionId: this.workflowsStore.workflowVersionId }
+					: await this.getWorkflowDataToSave();
 			} else {
 				const { versionId } = await this.workflowsStore.fetchWorkflow(workflowId);
 				data.versionId = versionId;
@@ -699,6 +704,10 @@ export const workflowHelpers = defineComponent({
 			redirect = true,
 			forceSave = false,
 		): Promise<boolean> {
+			if (this.readOnlyEnv) {
+				return;
+			}
+
 			const currentWorkflow = id || this.$route.params.name;
 			const isLoading = this.loadingService !== null;
 
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 327c6a8bfefbe..f6bc151e41780 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -571,10 +571,6 @@
 	"expressionModalInput.undefined": "[undefined]",
 	"expressionModalInput.null": "null",
 	"fakeDoor.settings.environments.name": "Environments",
-	"fakeDoor.settings.environments.infoText": "Environments allow you to use different settings and credentials in a workflow when you're building it vs when it's running in production",
-	"fakeDoor.settings.environments.actionBox.title": "We’re working on environments (as a paid feature)",
-	"fakeDoor.settings.environments.actionBox.title.cloud": "We’re working on this",
-	"fakeDoor.settings.environments.actionBox.description": "If you'd like to be the first to hear when it's ready, join the list.",
 	"fakeDoor.settings.sso.name": "Single Sign-On",
 	"fakeDoor.settings.sso.actionBox.title": "We’re working on this (as a paid feature)",
 	"fakeDoor.settings.sso.actionBox.title.cloud": "We’re working on this",
@@ -606,8 +602,12 @@
 	"genericHelpers.minShort": "m",
 	"genericHelpers.sec": "sec",
 	"genericHelpers.secShort": "s",
-	"genericHelpers.showMessage.message": "Executions are read-only. Make changes from the <b>Workflow</b> tab.",
-	"genericHelpers.showMessage.title": "Cannot edit execution",
+	"readOnly.showMessage.executions.message": "Executions are read-only. Make changes from the <b>Workflow</b> tab.",
+	"readOnly.showMessage.executions.title": "Cannot edit execution",
+	"readOnlyEnv.showMessage.executions.message": "Executions are read-only.",
+	"readOnlyEnv.showMessage.executions.title": "Cannot edit execution",
+	"readOnlyEnv.showMessage.workflows.message": "Workflows are read-only in protected instances.",
+	"readOnlyEnv.showMessage.workflows.title": "Cannot edit workflow",
 	"mainSidebar.aboutN8n": "About n8n",
 	"mainSidebar.confirmMessage.workflowDelete.cancelButtonText": "",
 	"mainSidebar.confirmMessage.workflowDelete.confirmButtonText": "Yes, delete",
@@ -1261,7 +1261,7 @@
 	"settings.log-streaming": "Log Streaming",
 	"settings.log-streaming.heading": "Log Streaming",
 	"settings.log-streaming.add": "Add new destination",
-	"settings.log-streaming.actionBox.title": "Available on Enterprise plan",
+	"settings.log-streaming.actionBox.title": "Available on the Enterprise plan",
 	"settings.log-streaming.actionBox.description": "Log Streaming is available as a paid feature. Learn more about it.",
 	"settings.log-streaming.actionBox.button": "See plans",
 	"settings.log-streaming.infoText": "Send logs to external endpoints of your choice. You can also write logs to a file or the console using environment variables. <a href=\"https://docs.n8n.io/log-streaming/\" target=\"_blank\">More info</a>",
@@ -1339,8 +1339,8 @@
 	"settings.usageAndPlan.license.activation.success.message": "Your {name} {type} has been successfully activated.",
 	"settings.usageAndPlan.desktop.title": "Upgrade to n8n Cloud for the full experience",
 	"settings.usageAndPlan.desktop.description": "Cloud plans allow you to collaborate with teammates. Plus you don’t need to leave this app open all the time for your workflows to run.",
-	"settings.sourceControl.title": "Source Control",
-	"settings.sourceControl.actionBox.title": "Available on Enterprise plan",
+	"settings.sourceControl.title": "Environments",
+	"settings.sourceControl.actionBox.title": "Available on the Enterprise plan",
 	"settings.sourceControl.actionBox.description": "Use multiple instances for different environments (dev, prod, etc.), deploying between them via a Git repository.",
 	"settings.sourceControl.actionBox.description.link": "More info",
 	"settings.sourceControl.actionBox.buttonText": "See plans",
@@ -1354,7 +1354,7 @@
 	"settings.sourceControl.authorEmail": "Commit author  email",
 	"settings.sourceControl.authorEmailInvalid": "The provided email is not correct",
 	"settings.sourceControl.sshKey": "SSH Key",
-	"settings.sourceControl.sshKeyDescription": "Paste the SSH key in your git repository settings. {link}.",
+	"settings.sourceControl.sshKeyDescription": "Paste the SSH key in your git repository/account settings. {link}",
 	"settings.sourceControl.sshKeyDescriptionLink": "More info",
 	"settings.sourceControl.refreshSshKey": "Refresh Key",
 	"settings.sourceControl.refreshSshKey.successful.title": "SSH Key refreshed successfully",
@@ -1365,9 +1365,8 @@
 	"settings.sourceControl.button.save": "Save settings",
 	"settings.sourceControl.instanceSettings": "Instance settings",
 	"settings.sourceControl.branches": "Branch connected to this n8n instance",
-	"settings.sourceControl.readonly": "{bold}: prevent editing workflows (recommended for production environments). {link}",
-	"settings.sourceControl.readonly.bold": "Read-only instance",
-	"settings.sourceControl.readonly.link": "Learn more.",
+	"settings.sourceControl.protected": "{bold}: prevent editing workflows (recommended for production environments).",
+	"settings.sourceControl.protected.bold": "Protected instance",
 	"settings.sourceControl.color": "Color",
 	"settings.sourceControl.switchBranch.title": "Switch to {branch} branch",
 	"settings.sourceControl.switchBranch.description": "Please confirm you want to switch the current n8n instance to the branch: {branch}",
@@ -1378,26 +1377,30 @@
 	"settings.sourceControl.button.push": "Push",
 	"settings.sourceControl.button.pull": "Pull",
 	"settings.sourceControl.modals.push.title": "Commit and push changes",
-	"settings.sourceControl.modals.push.description": "Select the files you want to stage in your commit and add a commit message. ",
-	"settings.sourceControl.modals.push.description.workflows": "Since you are on the Workflows page, the modified workflow files have been pre-selected for you.",
-	"settings.sourceControl.modals.push.description.workflow": "Since you are currently editing a Workflow, the modified workflow file has been pre-selected for you.",
-	"settings.sourceControl.modals.push.description.credentials": "Since you are on the Credentials page, the modified credential files have been pre-selected for you.",
-	"settings.sourceControl.modals.push.description.learnMore": "Learn more",
-	"settings.sourceControl.modals.push.description.learnMore.url": "https://docs.n8n.io/source-control/using/",
+	"settings.sourceControl.modals.push.description": "Workflows you push will overwrite any existing versions in the repository. ",
+	"settings.sourceControl.modals.push.description.learnMore": "More info",
 	"settings.sourceControl.modals.push.filesToCommit": "Files to commit",
-	"settings.sourceControl.modals.push.workflowsToCommit": "Workflows to commit",
+	"settings.sourceControl.modals.push.workflowsToCommit": "Select workflows",
 	"settings.sourceControl.modals.push.everythingIsUpToDate": "Everything is up to date",
-	"settings.sourceControl.modals.push.overrideVersionInGit": "This will override the version in Git",
+	"settings.sourceControl.modals.push.noWorkflowChanges": "No workflow changes to push. Only modified credentials, variables, and tags will be pushed. {link}",
+	"settings.sourceControl.modals.push.noWorkflowChanges.moreInfo": "More info",
 	"settings.sourceControl.modals.push.commitMessage": "Commit message",
 	"settings.sourceControl.modals.push.commitMessage.placeholder": "e.g. My commit",
 	"settings.sourceControl.modals.push.buttons.cancel": "Cancel",
 	"settings.sourceControl.modals.push.buttons.save": "Commit and Push",
 	"settings.sourceControl.modals.push.success.title": "Pushed successfully",
 	"settings.sourceControl.modals.push.success.description": "The files you selected were committed and pushed to the remote repository",
+	"settings.sourceControl.status.modified": "Modified",
+	"settings.sourceControl.status.deleted": "Deleted",
+	"settings.sourceControl.status.created": "New",
+	"settings.sourceControl.pull.oneLastStep.title": "One last step",
+	"settings.sourceControl.pull.oneLastStep.description": "You have new creds/vars. Fill them out to make sure your workflows function properly",
 	"settings.sourceControl.pull.success.title": "Pulled successfully",
-	"settings.sourceControl.pull.success.description": "Make sure you fill out the details of any new credentials or variables",
-	"settings.sourceControl.modals.pull.title": "Override local changes?",
-	"settings.sourceControl.modals.pull.description": "Some remote changes are going to override some of your local changes. Are you sure you want to continue?",
+	"settings.sourceControl.pull.upToDate.title": "Up to date",
+	"settings.sourceControl.pull.upToDate.description": "No workflow changes to pull from Git",
+	"settings.sourceControl.modals.pull.title": "Pull changes",
+	"settings.sourceControl.modals.pull.description": "These workflows will be updated, and any local changes to them will be overridden. To keep the local version, push it before pulling.",
+	"settings.sourceControl.modals.pull.description.learnMore": "More info",
 	"settings.sourceControl.modals.pull.buttons.cancel": "@:_reusableBaseText.cancel",
 	"settings.sourceControl.modals.pull.buttons.save": "Pull and override",
 	"settings.sourceControl.modals.disconnect.title": "Disconnect Git repository",
@@ -1408,6 +1411,7 @@
 	"settings.sourceControl.modals.refreshSshKey.message": "This will delete the current SSH key and create a new one. You will not be able to authenticate with the current key anymore.",
 	"settings.sourceControl.modals.refreshSshKey.cancel": "Cancel",
 	"settings.sourceControl.modals.refreshSshKey.confirm": "Refresh key",
+	"settings.sourceControl.loading.connecting": "Connecting",
 	"settings.sourceControl.toast.connected.title": "Git repository connected",
 	"settings.sourceControl.toast.connected.message": "Select the branch to complete the configuration",
 	"settings.sourceControl.toast.connected.error": "Error connecting to Git",
@@ -1415,18 +1419,21 @@
 	"settings.sourceControl.toast.disconnected.message": "You can no longer sync your instance with the remote repository",
 	"settings.sourceControl.toast.disconnected.error": "Error disconnecting from Git",
 	"settings.sourceControl.loading.pull": "Pulling from remote",
+	"settings.sourceControl.loading.checkingForChanges": "Checking for changes",
 	"settings.sourceControl.loading.push": "Pushing to remote",
 	"settings.sourceControl.lastUpdated": "Last updated {date} at {time}",
 	"settings.sourceControl.saved.title": "Settings successfully saved",
 	"settings.sourceControl.refreshBranches.tooltip": "Reload branches list",
 	"settings.sourceControl.refreshBranches.success": "Branches successfully refreshed",
 	"settings.sourceControl.refreshBranches.error": "Error refreshing branches",
-	"settings.sourceControl.docs.url": "https://docs.n8n.io/source-control/",
-	"settings.sourceControl.docs.setup.url": "https://docs.n8n.io/source-control/setup/",
-	"settings.sourceControl.docs.using.url": "https://docs.n8n.io/source-control/using/",
+	"settings.sourceControl.docs.url": "https://docs.n8n.io/source-control-environments/",
+	"settings.sourceControl.docs.setup.url": "https://docs.n8n.io/source-control-environments/setup/",
+	"settings.sourceControl.docs.setup.ssh.url": "https://docs.n8n.io/source-control-environments/setup/#step-3-set-up-a-deploy-key",
+	"settings.sourceControl.docs.using.url": "https://docs.n8n.io/source-control-environments/using/",
+	"settings.sourceControl.docs.using.pushPull.url": "https://docs.n8n.io/source-control-environments/using/push-pull",
 	"showMessage.cancel": "@:_reusableBaseText.cancel",
 	"settings.auditLogs.title": "Audit Logs",
-	"settings.auditLogs.actionBox.title": "Available on Enterprise plan",
+	"settings.auditLogs.actionBox.title": "Available on the Enterprise plan",
 	"settings.auditLogs.actionBox.description": "Upgrade to see the audit logs of your n8n instance.",
 	"settings.auditLogs.actionBox.buttonText": "See plans",
 	"showMessage.ok": "OK",
@@ -1798,7 +1805,7 @@
 	"contextual.workflows.sharing.unavailable.button.cloud": "Upgrade now",
 	"contextual.workflows.sharing.unavailable.button.desktop": "View plans",
 
-	"contextual.variables.unavailable.title": "Available on Enterprise plan",
+	"contextual.variables.unavailable.title": "Available on the Enterprise plan",
 	"contextual.variables.unavailable.title.cloud": "Available on Pro plan",
 	"contextual.variables.unavailable.title.desktop": "Upgrade to n8n Cloud to collaborate",
 	"contextual.variables.unavailable.description": "Variables can be used to store and access data across workflows. Reference them in n8n using the prefix <code>$vars</code> (e.g. <code>$vars.myVariable</code>). Variables are immutable and cannot be modified within your workflows.<br/><a href=\"https://docs.n8n.io/environments/variables/\" target=\"_blank\">Learn more in the docs.</a>",
@@ -1849,7 +1856,7 @@
 	"settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "Yes, disable it",
 	"settings.ldap.confirmMessage.beforeSaveForm.headline": "Are you sure you want to disable LDAP login?",
 	"settings.ldap.confirmMessage.beforeSaveForm.message": "If you do so, all LDAP users will be converted to email users.",
-	"settings.ldap.disabled.title": "Available on Enterprise plan",
+	"settings.ldap.disabled.title": "Available on the Enterprise plan",
 	"settings.ldap.disabled.description": "LDAP is available as a paid feature. Learn more about it.",
 	"settings.ldap.disabled.buttonText": "See plans",
 	"settings.ldap.toast.sync.success": "Synchronization succeeded",
@@ -1933,7 +1940,7 @@
 	"settings.sso.settings.save.activate.test": "Test settings",
 	"settings.sso.settings.save.error": "Error saving SAML SSO configuration",
 	"settings.sso.settings.footer.hint": "Don't forget to activate SAML SSO once you've saved the settings.",
-	"settings.sso.actionBox.title": "Available on Enterprise plan",
+	"settings.sso.actionBox.title": "Available on the Enterprise plan",
 	"settings.sso.actionBox.description": "Use Single Sign On to consolidate authentication into a single platform to improve security and agility.",
 	"settings.sso.actionBox.buttonText": "See plans",
 	"sso.login.divider": "or",
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 22a5b383deaa1..584ad030f678c 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -560,7 +560,7 @@ export const routes = [
 				},
 			},
 			{
-				path: 'source-control',
+				path: 'environments',
 				name: VIEWS.SOURCE_CONTROL,
 				components: {
 					settingsView: SettingsSourceControl,
@@ -570,7 +570,7 @@ export const routes = [
 						pageCategory: 'settings',
 						getProperties(route: Route) {
 							return {
-								feature: 'vc',
+								feature: 'environments',
 							};
 						},
 					},
@@ -578,9 +578,6 @@ export const routes = [
 						allow: {
 							role: [ROLE.Owner],
 						},
-						deny: {
-							shouldDeny: () => !window.localStorage.getItem('source-control'),
-						},
 					},
 				},
 			},
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/editor-ui/src/stores/sourceControl.store.ts
index 54f472eb0f6b8..06a76070bceaf 100644
--- a/packages/editor-ui/src/stores/sourceControl.store.ts
+++ b/packages/editor-ui/src/stores/sourceControl.store.ts
@@ -24,8 +24,6 @@ export const useSourceControlStore = defineStore('sourceControl', () => {
 	const preferences = reactive<SourceControlPreferences>({
 		branchName: '',
 		branches: [],
-		authorName: defaultAuthor.value.name,
-		authorEmail: defaultAuthor.value.email,
 		repositoryUrl: '',
 		branchReadOnly: false,
 		branchColor: '#5296D6',
@@ -39,16 +37,30 @@ export const useSourceControlStore = defineStore('sourceControl', () => {
 		commitMessage: 'commit message',
 	});
 
-	const pushWorkfolder = async (data: { commitMessage: string; fileNames?: string[] }) => {
+	const pushWorkfolder = async (data: {
+		commitMessage: string;
+		fileNames?: Array<{
+			conflict: boolean;
+			file: string;
+			id: string;
+			location: string;
+			name: string;
+			status: string;
+			type: string;
+			updatedAt?: string | undefined;
+		}>;
+		force: boolean;
+	}) => {
 		state.commitMessage = data.commitMessage;
 		await vcApi.pushWorkfolder(rootStore.getRestApiContext, {
+			force: data.force,
 			message: data.commitMessage,
 			...(data.fileNames ? { fileNames: data.fileNames } : {}),
 		});
 	};
 
 	const pullWorkfolder = async (force: boolean) => {
-		await vcApi.pullWorkfolder(rootStore.getRestApiContext, { force });
+		return vcApi.pullWorkfolder(rootStore.getRestApiContext, { force });
 	};
 
 	const setPreferences = (data: Partial<SourceControlPreferences>) => {
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 3a6cda482d2dc..da185042bc65e 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -152,16 +152,6 @@ export const useUIStore = defineStore(STORES.UI, {
 		currentView: '',
 		mainPanelPosition: 0.5,
 		fakeDoorFeatures: [
-			{
-				id: FAKE_DOOR_FEATURES.ENVIRONMENTS,
-				featureName: 'fakeDoor.settings.environments.name',
-				icon: 'server',
-				infoText: 'fakeDoor.settings.environments.infoText',
-				actionBoxTitle: 'fakeDoor.settings.environments.actionBox.title',
-				actionBoxDescription: 'fakeDoor.settings.environments.actionBox.description',
-				linkURL: 'https://n8n-community.typeform.com/to/l7QOrERN#f=environments',
-				uiLocations: ['settings'],
-			},
 			{
 				id: FAKE_DOOR_FEATURES.SSO,
 				featureName: 'fakeDoor.settings.sso.name',
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 83dfc33c8639b..f86b6a6229f93 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -315,6 +315,8 @@ import {
 	N8nPlusEndpointType,
 	EVENT_PLUS_ENDPOINT_CLICK,
 } from '@/plugins/endpoints/N8nPlusEndpointType';
+import type { ElNotificationComponent } from 'element-ui/types/notification';
+import { sourceControlEventBus } from '@/event-bus/source-control';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -362,6 +364,8 @@ export default defineComponent({
 	watch: {
 		// Listen to route changes and load the workflow accordingly
 		$route(to: Route, from: Route) {
+			this.readOnlyEnvRouteCheck();
+
 			const currentTab = getNodeViewTab(to);
 			const nodeViewNotInitialized = !this.uiStore.nodeViewInitialized;
 			let workflowChanged =
@@ -422,7 +426,7 @@ export default defineComponent({
 			next();
 			return;
 		}
-		if (this.uiStore.stateIsDirty) {
+		if (this.uiStore.stateIsDirty && !this.readOnlyEnv) {
 			const confirmModal = await this.confirm(
 				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
 				{
@@ -620,6 +624,7 @@ export default defineComponent({
 			isProductionExecutionPreview: false,
 			enterTimer: undefined as undefined | ReturnType<typeof setTimeout>,
 			exitTimer: undefined as undefined | ReturnType<typeof setTimeout>,
+			readOnlyNotification: null as null | ElNotificationComponent,
 			// jsplumb automatically deletes all loose connections which is in turn recorded
 			// in undo history as a user action.
 			// This should prevent automatically removed connections from populating undo stack
@@ -637,13 +642,24 @@ export default defineComponent({
 	},
 	methods: {
 		editAllowedCheck(): boolean {
+			if (this.readOnlyNotification?.visible) {
+				return;
+			}
 			if (this.isReadOnlyRoute || this.readOnlyEnv) {
-				this.showMessage({
-					// title: 'Workflow can not be changed!',
-					title: this.$locale.baseText('genericHelpers.showMessage.title'),
-					message: this.$locale.baseText('genericHelpers.showMessage.message'),
+				this.readOnlyNotification = this.showMessage({
+					title: this.$locale.baseText(
+						this.readOnlyEnv
+							? `readOnlyEnv.showMessage.${this.isReadOnlyRoute ? 'executions' : 'workflows'}.title`
+							: 'readOnly.showMessage.executions.title',
+					),
+					message: this.$locale.baseText(
+						this.readOnlyEnv
+							? `readOnlyEnv.showMessage.${
+									this.isReadOnlyRoute ? 'executions' : 'workflows'
+							  }.message`
+							: 'readOnly.showMessage.executions.message',
+					),
 					type: 'info',
-					duration: 0,
 					dangerouslyUseHTMLString: true,
 				});
 
@@ -1465,6 +1481,10 @@ export default defineComponent({
 		 * This method gets called when data got pasted into the window
 		 */
 		async receivedCopyPasteData(plainTextData: string): Promise<void> {
+			if (this.readOnlyEnv) {
+				return;
+			}
+
 			const currentTab = getNodeViewTab(this.$route);
 			if (currentTab === MAIN_HEADER_TABS.WORKFLOW) {
 				let workflowData: IWorkflowDataUpdate | undefined;
@@ -2550,8 +2570,7 @@ export default defineComponent({
 				const templateId = this.$route.params.id;
 				await this.openWorkflowTemplate(templateId);
 			} else {
-				const result = this.uiStore.stateIsDirty;
-				if (result) {
+				if (this.uiStore.stateIsDirty && !this.readOnlyEnv) {
 					const confirmModal = await this.confirm(
 						this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
 						{
@@ -3821,6 +3840,41 @@ export default defineComponent({
 				this.stopLoading();
 			}
 		},
+		readOnlyEnvRouteCheck() {
+			if (
+				this.readOnlyEnv &&
+				[VIEWS.NEW_WORKFLOW, VIEWS.TEMPLATE_IMPORT].includes(this.$route.name)
+			) {
+				this.$nextTick(async () => {
+					this.resetWorkspace();
+					this.uiStore.stateIsDirty = false;
+
+					await this.$router.replace({ name: VIEWS.WORKFLOWS });
+				});
+			}
+		},
+	},
+	async onSourceControlPull() {
+		let workflowId = null as string | null;
+		if (this.$route.params.name) {
+			workflowId = this.$route.params.name;
+		}
+
+		try {
+			await Promise.all([this.loadCredentials(), this.loadVariables(), this.tagsStore.fetchAll()]);
+
+			if (workflowId !== null && !this.uiStore.stateIsDirty) {
+				const workflow: IWorkflowDb | undefined = await this.workflowsStore.fetchWorkflow(
+					workflowId,
+				);
+				if (workflow) {
+					this.titleSet(workflow.name, 'IDLE');
+					await this.openWorkflow(workflow);
+				}
+			}
+		} catch (error) {
+			console.error(error);
+		}
 	},
 	async mounted() {
 		this.resetWorkspace();
@@ -3850,6 +3904,7 @@ export default defineComponent({
 			);
 			return;
 		}
+
 		ready(async () => {
 			try {
 				try {
@@ -3913,6 +3968,10 @@ export default defineComponent({
 				}, promptTimeout);
 			}
 		}
+
+		sourceControlEventBus.on('pull', this.onSourceControlPull);
+
+		this.readOnlyEnvRouteCheck();
 	},
 	activated() {
 		const openSideMenu = this.uiStore.addFirstStepOnLoad;
@@ -3976,6 +4035,7 @@ export default defineComponent({
 		nodeViewEventBus.off('importWorkflowData', this.onImportWorkflowDataEvent);
 		nodeViewEventBus.off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
 		this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+		sourceControlEventBus.off('pull', this.onSourceControlPull);
 	},
 });
 </script>
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
index 2d2c70f195ea8..21b1faf890adb 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, reactive, ref, onMounted } from 'vue';
 import type { Rule, RuleGroup } from 'n8n-design-system/types';
-import { MODAL_CONFIRM, VALID_EMAIL_REGEX } from '@/constants';
+import { MODAL_CONFIRM } from '@/constants';
 import { useUIStore, useSourceControlStore } from '@/stores';
 import { useToast, useMessage, useLoadingService, useI18n } from '@/composables';
 import CopyInput from '@/components/CopyInput.vue';
@@ -13,9 +13,6 @@ const toast = useToast();
 const message = useMessage();
 const loadingService = useLoadingService();
 
-const sourceControlDocsSetupUrl = computed(() =>
-	locale.baseText('settings.sourceControl.docs.setup.url'),
-);
 const isConnected = ref(false);
 const branchNameOptions = computed(() =>
 	sourceControlStore.preferences.branches.map((branch) => ({
@@ -26,10 +23,9 @@ const branchNameOptions = computed(() =>
 
 const onConnect = async () => {
 	loadingService.startLoading();
+	loadingService.setLoadingText(locale.baseText('settings.sourceControl.loading.connecting'));
 	try {
 		await sourceControlStore.savePreferences({
-			authorName: sourceControlStore.preferences.authorName,
-			authorEmail: sourceControlStore.preferences.authorEmail,
 			repositoryUrl: sourceControlStore.preferences.repositoryUrl,
 		});
 		await sourceControlStore.getBranches();
@@ -115,9 +111,6 @@ onMounted(async () => {
 
 const formValidationStatus = reactive<Record<string, boolean>>({
 	repoUrl: false,
-	authorName: false,
-	authorEmail: false,
-	branchName: false,
 });
 
 function onValidate(key: string, value: boolean) {
@@ -135,28 +128,9 @@ const repoUrlValidationRules: Array<Rule | RuleGroup> = [
 	},
 ];
 
-const authorNameValidationRules: Array<Rule | RuleGroup> = [{ name: 'REQUIRED' }];
-
-const authorEmailValidationRules: Array<Rule | RuleGroup> = [
-	{ name: 'REQUIRED' },
-	{
-		name: 'MATCH_REGEX',
-		config: {
-			regex: VALID_EMAIL_REGEX,
-			message: locale.baseText('settings.sourceControl.authorEmailInvalid'),
-		},
-	},
-];
-
+const validForConnection = computed(() => formValidationStatus.repoUrl);
 const branchNameValidationRules: Array<Rule | RuleGroup> = [{ name: 'REQUIRED' }];
 
-const validForConnection = computed(
-	() =>
-		formValidationStatus.repoUrl &&
-		formValidationStatus.authorName &&
-		formValidationStatus.authorEmail,
-);
-
 async function refreshSshKey() {
 	try {
 		const confirmation = await message.confirm(
@@ -205,7 +179,7 @@ const refreshBranches = async () => {
 			<n8n-callout theme="secondary" icon="info-circle" class="mt-2xl mb-l">
 				<i18n path="settings.sourceControl.description">
 					<template #link>
-						<a :href="sourceControlDocsSetupUrl" target="_blank">
+						<a :href="locale.baseText('settings.sourceControl.docs.url')" target="_blank">
 							{{ locale.baseText('settings.sourceControl.description.link') }}
 						</a>
 					</template>
@@ -241,35 +215,6 @@ const refreshBranches = async () => {
 					>
 				</div>
 			</div>
-			<div :class="[$style.group, $style.groupFlex]">
-				<div>
-					<label for="authorName">{{ locale.baseText('settings.sourceControl.authorName') }}</label>
-					<n8n-form-input
-						label
-						id="authorName"
-						name="authorName"
-						validateOnBlur
-						:validationRules="authorNameValidationRules"
-						v-model="sourceControlStore.preferences.authorName"
-						@validate="(value) => onValidate('authorName', value)"
-					/>
-				</div>
-				<div>
-					<label for="authorEmail">{{
-						locale.baseText('settings.sourceControl.authorEmail')
-					}}</label>
-					<n8n-form-input
-						label
-						type="email"
-						id="authorEmail"
-						name="authorEmail"
-						validateOnBlur
-						:validationRules="authorEmailValidationRules"
-						v-model="sourceControlStore.preferences.authorEmail"
-						@validate="(value) => onValidate('authorEmail', value)"
-					/>
-				</div>
-			</div>
 			<div v-if="sourceControlStore.preferences.publicKey" :class="$style.group">
 				<label>{{ locale.baseText('settings.sourceControl.sshKey') }}</label>
 				<div :class="{ [$style.sshInput]: !isConnected }">
@@ -293,9 +238,11 @@ const refreshBranches = async () => {
 				<n8n-notice type="info" class="mt-s">
 					<i18n path="settings.sourceControl.sshKeyDescription">
 						<template #link>
-							<a :href="sourceControlDocsSetupUrl" target="_blank">{{
-								locale.baseText('settings.sourceControl.sshKeyDescriptionLink')
-							}}</a>
+							<a
+								:href="locale.baseText('settings.sourceControl.docs.setup.ssh.url')"
+								target="_blank"
+								>{{ locale.baseText('settings.sourceControl.sshKeyDescriptionLink') }}</a
+							>
 						</template>
 					</i18n>
 				</n8n-notice>
@@ -352,14 +299,9 @@ const refreshBranches = async () => {
 						v-model="sourceControlStore.preferences.branchReadOnly"
 						:class="$style.readOnly"
 					>
-						<i18n path="settings.sourceControl.readonly">
+						<i18n path="settings.sourceControl.protected">
 							<template #bold>
-								<strong>{{ locale.baseText('settings.sourceControl.readonly.bold') }}</strong>
-							</template>
-							<template #link>
-								<a :href="sourceControlDocsSetupUrl" target="_blank">
-									{{ locale.baseText('settings.sourceControl.readonly.link') }}
-								</a>
+								<strong>{{ locale.baseText('settings.sourceControl.protected.bold') }}</strong>
 							</template>
 						</i18n>
 					</n8n-checkbox>
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 45eece83abf91..a5de85f9bca97 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -13,6 +13,24 @@
 		@click:add="addWorkflow"
 		@update:filters="filters = $event"
 	>
+		<template #add-button="{ disabled }">
+			<n8n-tooltip :disabled="!readOnlyEnv">
+				<div>
+					<n8n-button
+						size="large"
+						block
+						:disabled="disabled"
+						@click="addWorkflow"
+						data-test-id="resources-list-add"
+					>
+						{{ $locale.baseText(`workflows.add`) }}
+					</n8n-button>
+				</div>
+				<template #content>
+					{{ $locale.baseText('mainSidebar.workflows.readOnlyEnv.tooltip') }}
+				</template>
+			</n8n-tooltip>
+		</template>
 		<template #default="{ data, updateItemSize }">
 			<workflow-card
 				data-test-id="resources-list-item"
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
index 515abd7ecdc9a..6185054ebee7a 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
@@ -80,8 +80,6 @@ describe('SettingsSourceControl', () => {
 		expect(connectButton).toBeDisabled();
 
 		const repoUrlInput = container.querySelector('input[name="repoUrl"]')!;
-		const authorName = container.querySelector('input[name="authorName"]')!;
-		const authorEmail = container.querySelector('input[name="authorEmail"]')!;
 
 		await userEvent.click(repoUrlInput);
 		await userEvent.type(repoUrlInput, 'git@github');
@@ -91,21 +89,6 @@ describe('SettingsSourceControl', () => {
 		await userEvent.click(repoUrlInput);
 		await userEvent.type(repoUrlInput, '.com:john/n8n-data.git');
 		await userEvent.tab();
-		expect(connectButton).toBeDisabled();
-
-		await userEvent.click(authorName);
-		await userEvent.type(authorName, 'John Doe');
-		await userEvent.tab();
-		expect(connectButton).toBeDisabled();
-
-		await userEvent.click(authorEmail);
-		await userEvent.type(authorEmail, 'john@example.');
-		await userEvent.tab();
-		expect(connectButton).toBeDisabled();
-
-		await userEvent.click(authorEmail);
-		await userEvent.type(authorEmail, 'com');
-		await userEvent.tab();
 
 		await waitFor(() => expect(connectButton).toBeEnabled());
 		expect(queryByTestId('source-control-save-settings-button')).not.toBeInTheDocument();

From 6b6c3abee676b11cf2968baa644467ea71ce65f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:39:15 +0200
Subject: [PATCH 062/116] fix(core): Fix RemoveResetPasswordColumns migration
 for sqlite (no-changelog) (#6739)

---
 .../1690000000030-RemoveResetPasswordColumns.ts   | 15 ++++++---------
 .../1690000000030-RemoveResetPasswordColumns.ts   |  5 +++++
 .../cli/src/databases/migrations/sqlite/index.ts  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts

diff --git a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
index 73f572c1685e2..92cc2e6529240 100644
--- a/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
+++ b/packages/cli/src/databases/migrations/common/1690000000030-RemoveResetPasswordColumns.ts
@@ -3,27 +3,24 @@ import { TableColumn } from 'typeorm';
 
 export class RemoveResetPasswordColumns1690000000030 implements ReversibleMigration {
 	async up({ queryRunner, tablePrefix }: MigrationContext) {
-		await queryRunner.dropColumn(`${tablePrefix}user`, 'resetPasswordToken');
-		await queryRunner.dropColumn(`${tablePrefix}user`, 'resetPasswordTokenExpiration');
+		await queryRunner.dropColumns(`${tablePrefix}user`, [
+			'resetPasswordToken',
+			'resetPasswordTokenExpiration',
+		]);
 	}
 
 	async down({ queryRunner, tablePrefix }: MigrationContext) {
-		await queryRunner.addColumn(
-			`${tablePrefix}user`,
+		await queryRunner.addColumns(`${tablePrefix}user`, [
 			new TableColumn({
 				name: 'resetPasswordToken',
 				type: 'varchar',
 				isNullable: true,
 			}),
-		);
-
-		await queryRunner.addColumn(
-			`${tablePrefix}user`,
 			new TableColumn({
 				name: 'resetPasswordTokenExpiration',
 				type: 'int',
 				isNullable: true,
 			}),
-		);
+		]);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts b/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts
new file mode 100644
index 0000000000000..c65752d8bf16a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000030-RemoveResetPasswordColumns.ts
@@ -0,0 +1,5 @@
+import { RemoveResetPasswordColumns1690000000030 as BaseMigration } from '../common/1690000000030-RemoveResetPasswordColumns';
+
+export class RemoveResetPasswordColumns1690000000030 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index b5f554107a268..0d1aae907029c 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -39,7 +39,7 @@ import { MigrateIntegerKeysToString1690000000002 } from './1690000000002-Migrate
 import { SeparateExecutionData1690000000010 } from './1690000000010-SeparateExecutionData';
 import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
 import { FixMissingIndicesFromStringIdMigration1690000000020 } from './1690000000020-FixMissingIndicesFromStringIdMigration';
-import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
+import { RemoveResetPasswordColumns1690000000030 } from './1690000000030-RemoveResetPasswordColumns';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,

From 62df48ed3b41e715b5827f9bc92dcebe212f7ef9 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?=
 <aditya@netroy.in>
Date: Wed, 26 Jul 2023 10:28:54 +0200
Subject: [PATCH 063/116] ci: Update changelog generation to work with node 18

---
 .github/scripts/package.json         |  1 -
 .github/scripts/update-changelog.mjs | 21 +++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/scripts/package.json b/.github/scripts/package.json
index 3d48686a5fe0d..6033dd191c7e8 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "add-stream": "^1.0.0",
     "conventional-changelog": "^4.0.0",
     "glob": "^10.3.0",
     "semver": "^7.5.4",
diff --git a/.github/scripts/update-changelog.mjs b/.github/scripts/update-changelog.mjs
index 1b41a671be457..c0cce214a9777 100644
--- a/.github/scripts/update-changelog.mjs
+++ b/.github/scripts/update-changelog.mjs
@@ -1,16 +1,12 @@
-import addStream from 'add-stream';
 import createTempFile from 'tempfile';
 import conventionalChangelog from 'conventional-changelog';
 import { resolve } from 'path';
 import { createReadStream, createWriteStream } from 'fs';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
-import stream from 'stream';
-import { promisify } from 'util';
+import { pipeline } from 'stream/promises';
 import packageJson from '../../package.json' assert { type: 'json' };
 
-const pipeline = promisify(stream.pipeline);
-
 const baseDir = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
 const fullChangelogFile = resolve(baseDir, 'CHANGELOG.md');
 const versionChangelogFile = resolve(baseDir, `CHANGELOG-${packageJson.version}.md`);
@@ -27,16 +23,13 @@ const changelogStream = conventionalChangelog({
 	process.exit(1);
 });
 
-// We need to duplicate the stream here to pipe the changelog into two separate files
-const stream1 = new stream.PassThrough();
-const stream2 = new stream.PassThrough();
-changelogStream.pipe(stream1);
-changelogStream.pipe(stream2);
-
-await pipeline(stream1, createWriteStream(versionChangelogFile));
+// Write the new changelog to a new temporary file, so that the contents can be used in the PR description
+await pipeline(changelogStream, createWriteStream(versionChangelogFile));
 
 // Since we can't read and write from the same file at the same time,
 // we use a temporary file to output the updated changelog to.
 const tmpFile = createTempFile();
-await pipeline(stream2, addStream(createReadStream(fullChangelogFile)), createWriteStream(tmpFile)),
-	await pipeline(createReadStream(tmpFile), createWriteStream(fullChangelogFile));
+const tmpStream = createWriteStream(tmpFile);
+await pipeline(createReadStream(versionChangelogFile), tmpStream, { end: false });
+await pipeline(createReadStream(fullChangelogFile), tmpStream);
+await pipeline(createReadStream(tmpFile), createWriteStream(fullChangelogFile));

From 1f0532241d9e62c805c29e85c4c6388abe6b94c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 26 Jul 2023 11:58:38 +0200
Subject: [PATCH 064/116] refactor: Remove webhook from `IDatabaseCollections`
 (no-changelog) (#6745)

* refactor: Remove webhook from `IDatabaseCollections`

* refactor: Remove also from `collections`
---
 packages/cli/src/Db.ts         | 1 -
 packages/cli/src/Interfaces.ts | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index 528a9f417c276..02d32a3744c2b 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -187,7 +187,6 @@ export async function init(testConnectionOptions?: ConnectionOptions): Promise<v
 	collections.Tag = Container.get(TagRepository);
 	collections.User = Container.get(UserRepository);
 	collections.Variables = Container.get(VariablesRepository);
-	collections.Webhook = Container.get(WebhookRepository);
 	collections.Workflow = Container.get(WorkflowRepository);
 	collections.WorkflowStatistics = Container.get(WorkflowStatisticsRepository);
 	collections.WorkflowTagMapping = Container.get(WorkflowTagMappingRepository);
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 8aa68566636d2..2d664a65705b1 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -103,7 +103,6 @@ export interface IDatabaseCollections extends Record<string, Repository<any>> {
 	Tag: TagRepository;
 	User: UserRepository;
 	Variables: VariablesRepository;
-	Webhook: WebhookRepository;
 	Workflow: WorkflowRepository;
 	WorkflowStatistics: WorkflowStatisticsRepository;
 	WorkflowTagMapping: WorkflowTagMappingRepository;

From 60444dd843601d8d4ba6b2ee31d4abe3d7b1d8c6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:55:53 +0200
Subject: [PATCH 065/116] :rocket: Release 1.1.0 (#6746)

Co-authored-by: netroy <netroy@users.noreply.github.com>
---
 CHANGELOG.md                             | 107 +++++++++++++++++++++++
 package.json                             |   2 +-
 packages/@n8n/client-oauth2/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 +-
 10 files changed, 116 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ee57a4b1387b..5b5c16ee8417e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,110 @@
+# [1.1.0](https://github.com/n8n-io/n8n/compare/n8n@1.0.1...n8n@1.1.0) (2023-07-26)
+
+
+### Bug Fixes
+
+* Add missing indices on sqlite ([#6673](https://github.com/n8n-io/n8n/issues/6673)) ([b1838f7](https://github.com/n8n-io/n8n/commit/b1838f7fab3e6d2983fa4d2ba1a480c79f8fe2c5))
+* **API:** Do not add starting node on workflow creation ([#6686](https://github.com/n8n-io/n8n/issues/6686)) ([92192fb](https://github.com/n8n-io/n8n/commit/92192fbd6108a71fca591e5284269239d4347621))
+* **API:** Fix issue with workflow setting not supporting newer nanoids ([#6699](https://github.com/n8n-io/n8n/issues/6699)) ([c7e1013](https://github.com/n8n-io/n8n/commit/c7e10130d694347982f50bc0ad1024101e27beea))
+* **AwsS3 Node:** Fix issue if bucket name contains a '.' ([#6542](https://github.com/n8n-io/n8n/issues/6542)) ([540d32d](https://github.com/n8n-io/n8n/commit/540d32dee4b8927199e047c77acf516d5b824bc3))
+* **Brevo Node:** Rename SendInBlue node to Brevo node ([#6521](https://github.com/n8n-io/n8n/issues/6521)) ([e63b398](https://github.com/n8n-io/n8n/commit/e63b3982d200ade34461b9159eb1e988f494c025))
+* **Code Node:** Install python modules always in a user-writable folder ([#6568](https://github.com/n8n-io/n8n/issues/6568)) ([bf35124](https://github.com/n8n-io/n8n/commit/bf351243dfa69095699596e8828904fda025d45c))
+* **core:** Add empty credential value marker to show empty pw field ([#6532](https://github.com/n8n-io/n8n/issues/6532)) ([9294e2d](https://github.com/n8n-io/n8n/commit/9294e2da3c7c99c2099f5865e610fa7217bf06be))
+* **core:** Deleting manual executions should defer deleting binary data ([#6680](https://github.com/n8n-io/n8n/issues/6680)) ([462a674](https://github.com/n8n-io/n8n/commit/462a674d1759dc5ae9849daa48cc8c4130dd030e))
+* **core:** Filter out workflows that failed to activate on startup ([#6676](https://github.com/n8n-io/n8n/issues/6676)) ([667c15d](https://github.com/n8n-io/n8n/commit/667c15d0dfbdab0c29114d5002eed75031c79b42))
+* **core:** Fix credentials test ([#6569](https://github.com/n8n-io/n8n/issues/6569)) ([1abd172](https://github.com/n8n-io/n8n/commit/1abd172f73e171e37c4cc3ccfaa395c6a46bdf48))
+* **core:** Fix migrations for MySQL/MariaDB ([#6591](https://github.com/n8n-io/n8n/issues/6591)) ([29882a6](https://github.com/n8n-io/n8n/commit/29882a6f39dddcd1c8c107c20a548ce8dc665cba))
+* **core:** Handle all uncaught exception, not just the ones from Axios ([#6666](https://github.com/n8n-io/n8n/issues/6666)) ([ff07595](https://github.com/n8n-io/n8n/commit/ff0759530df3780e8eb53a29ec4ab4e98e5755c6))
+* **core:** Improve the performance of last 2 sqlite migrations ([#6522](https://github.com/n8n-io/n8n/issues/6522)) ([31cba87](https://github.com/n8n-io/n8n/commit/31cba87d307183d613890c7e6d627636b5280b52))
+* **core:** Load SAML libraries dynamically ([#6690](https://github.com/n8n-io/n8n/issues/6690)) ([fce5609](https://github.com/n8n-io/n8n/commit/fce5609fa32b81ff8e44567233c77a7a1d6232df))
+* **core:** Redirect user to previous url after SSO signin ([#6710](https://github.com/n8n-io/n8n/issues/6710)) ([08331c6](https://github.com/n8n-io/n8n/commit/08331c63fbc0d69d2203f14165b15e1a596788b0))
+* **core:** Reduce memory consumption on `BinaryDataManager.init` ([#6633](https://github.com/n8n-io/n8n/issues/6633)) ([329d22f](https://github.com/n8n-io/n8n/commit/329d22f5d1f484d899df885a871f0f32839f0098))
+* **core:** Remove typeorm patches, but still enforce transactions on every migration ([#6594](https://github.com/n8n-io/n8n/issues/6594)) ([9def7a7](https://github.com/n8n-io/n8n/commit/9def7a729b52cd6b4698c47e190e9e2bd7894da5)), closes [#6519](https://github.com/n8n-io/n8n/issues/6519)
+* **core:** Rename to credential_stubs and variable_stubs.json ([#6528](https://github.com/n8n-io/n8n/issues/6528)) ([b06462f](https://github.com/n8n-io/n8n/commit/b06462f4415bd1143a00b4a66e6e626da8c52196))
+* **core:** Support redis cluster in queue mode ([#6708](https://github.com/n8n-io/n8n/issues/6708)) ([4029386](https://github.com/n8n-io/n8n/commit/40293863492d73865f805870937e46f3d0bdaa56))
+* **core:** Update docker compose setup for V1 images ([#6642](https://github.com/n8n-io/n8n/issues/6642)) ([05007d8](https://github.com/n8n-io/n8n/commit/05007d894e1bfa3550cfd865f85c2844b3db6eea))
+* **core:** Upgrade semver to address CVE-2022-25883 ([#6689](https://github.com/n8n-io/n8n/issues/6689)) ([9daf944](https://github.com/n8n-io/n8n/commit/9daf944ba53937ddd41bd640a6d473d235f0e16f))
+* **core:** Use `exec` in docker images to forward signals correctly ([#6732](https://github.com/n8n-io/n8n/issues/6732)) ([ed9f86b](https://github.com/n8n-io/n8n/commit/ed9f86bb95f7080335a336c866cd477669b02002))
+* **core:** Use JWT as reset password token ([#6714](https://github.com/n8n-io/n8n/issues/6714)) ([89f4402](https://github.com/n8n-io/n8n/commit/89f44021b919181ad58c555a31071c286b866975))
+* **core:** Use lower cased email for SAML email attribute ([#6663](https://github.com/n8n-io/n8n/issues/6663)) ([eedde24](https://github.com/n8n-io/n8n/commit/eedde24cc046ea517c6d6e455bcdd46a97e4c05b))
+* **core:** Use owners file to export wf owners ([#6547](https://github.com/n8n-io/n8n/issues/6547)) ([4b755fb](https://github.com/n8n-io/n8n/commit/4b755fb0b441a37eb804c9e70d4b071a341f7155))
+* **crowd.dev Node:** Fix documentation urls for crowd.dev credentials and nodes ([#6696](https://github.com/n8n-io/n8n/issues/6696)) ([acda7f2](https://github.com/n8n-io/n8n/commit/acda7f269f7b227d430e2308767e1676fda8e165))
+* **editor:** Add default author name and email to source control settings ([#6543](https://github.com/n8n-io/n8n/issues/6543)) ([e1a02c7](https://github.com/n8n-io/n8n/commit/e1a02c76257de30e08878279dea33d7854d46938))
+* **editor:** Add paywall state to non owner users for Variables ([#6679](https://github.com/n8n-io/n8n/issues/6679)) ([e7091d6](https://github.com/n8n-io/n8n/commit/e7091d6726eb98a194bc2614c0da332d348180dc))
+* **editor:** Change default branchColor and remove label ([#6541](https://github.com/n8n-io/n8n/issues/6541)) ([186271e](https://github.com/n8n-io/n8n/commit/186271e939bca19ec9c94d9455e9430d8b8cf9d7))
+* **editor:** Ensure default credential values are not detected as dirty state ([#6677](https://github.com/n8n-io/n8n/issues/6677)) ([c7b74c3](https://github.com/n8n-io/n8n/commit/c7b74c3c1fdd2f11b8650adf79052681c2f1e248))
+* **editor:** Extend menu item and use it as a recursive component ([#6618](https://github.com/n8n-io/n8n/issues/6618)) ([d617f63](https://github.com/n8n-io/n8n/commit/d617f63ae9155c03dbf5e597db8e102c1f7a025f))
+* **editor:** Hide Execute Node button for unknown nodes ([#6684](https://github.com/n8n-io/n8n/issues/6684)) ([6887b4e](https://github.com/n8n-io/n8n/commit/6887b4edeae6536f5b670c55637fde1c5dbd6e40))
+* **editor:** Increase contrast ratio in execution list workflow names ([#6661](https://github.com/n8n-io/n8n/issues/6661)) ([c0b1cb2](https://github.com/n8n-io/n8n/commit/c0b1cb273e56c04abff5d9893a5e37cda6eb3383))
+* **editor:** Make Source control branch select required ([#6619](https://github.com/n8n-io/n8n/issues/6619)) ([20737b5](https://github.com/n8n-io/n8n/commit/20737b532423c964bd70e0aa2aac2c9533b5c3d4))
+* **editor:** Prevent keyboard shortcuts to edit workflows in readonly mode ([#6613](https://github.com/n8n-io/n8n/issues/6613)) ([7383e7f](https://github.com/n8n-io/n8n/commit/7383e7fd48b5c86d43fab4fa47cb1e7a4a4b4043))
+* **editor:** Prevent RMC from loading schema if it's already cached ([#6695](https://github.com/n8n-io/n8n/issues/6695)) ([a79aa19](https://github.com/n8n-io/n8n/commit/a79aa198330808b7e45b217748fffdabb68098e2))
+* **editor:** Remove global link styling in v1 banner ([#6705](https://github.com/n8n-io/n8n/issues/6705)) ([76a765a](https://github.com/n8n-io/n8n/commit/76a765a1517f53cb0c4f16a57bdd6f55bc3be0bd))
+* **editor:** Show appropriate empty workflow list content when instance environment is readonly ([#6610](https://github.com/n8n-io/n8n/issues/6610)) ([7515f7d](https://github.com/n8n-io/n8n/commit/7515f7d52ae72fa1361687c43a9c29f585b3c6ce))
+* **editor:** Show retry information in execution list only when it exists ([#6587](https://github.com/n8n-io/n8n/issues/6587)) ([3ca66be](https://github.com/n8n-io/n8n/commit/3ca66be38082e7a3866d53d07328be58e913067f))
+* **editor:** Skip error line highlighting if out of range ([#6721](https://github.com/n8n-io/n8n/issues/6721)) ([a62d00a](https://github.com/n8n-io/n8n/commit/a62d00a4795d02a5905c5ddbae569f122a46a023))
+* **editor:** Update design system menu item component ([#6659](https://github.com/n8n-io/n8n/issues/6659)) ([84466e9](https://github.com/n8n-io/n8n/commit/84466e983336a3cfa8c20b30ead8d58abbf07cf0))
+* **FileMaker Node:** Improve returned error responses ([#6585](https://github.com/n8n-io/n8n/issues/6585)) ([91a052e](https://github.com/n8n-io/n8n/commit/91a052e4c53b6717d3a4e4d1034339012ce39c41))
+* **FTP Node:** List recursive ignore . and .. to prevent infinite loops ([#6707](https://github.com/n8n-io/n8n/issues/6707)) ([995d5cc](https://github.com/n8n-io/n8n/commit/995d5cc47095e584c2a064dd5aa3841b3054ffd4))
+* **GitLab Trigger Node:** Fix trigger activation 404 error  ([#6711](https://github.com/n8n-io/n8n/issues/6711)) ([8ceb832](https://github.com/n8n-io/n8n/commit/8ceb8322ebfc1384291e8a0d5d07ee5c22d52142))
+* **Gmail Trigger Node:** Early returns in case of no data ([#6727](https://github.com/n8n-io/n8n/issues/6727)) ([c2511a8](https://github.com/n8n-io/n8n/commit/c2511a829cfa40d4d9d570ad7724845c93544c3b))
+* **Google BigQuery Node:** Error description improvement ([#6715](https://github.com/n8n-io/n8n/issues/6715)) ([95837d2](https://github.com/n8n-io/n8n/commit/95837d260466e8a4bd19c44390ce4557fa5c51cb))
+* **Google Drive Node:** Fix regex in file RLC ([#6607](https://github.com/n8n-io/n8n/issues/6607)) ([5672146](https://github.com/n8n-io/n8n/commit/56721468dff51bb60ececc0472e2b9ca0740fcb1))
+* **Google Drive Node:** URL parsing ([#6527](https://github.com/n8n-io/n8n/issues/6527)) ([d9ed0b3](https://github.com/n8n-io/n8n/commit/d9ed0b31b538320a67ee4e5c0cae34656c9f4334))
+* **Google Sheets Node:** Incorrect read of 0 and false ([#6525](https://github.com/n8n-io/n8n/issues/6525)) ([806d134](https://github.com/n8n-io/n8n/commit/806d13460240abe94843e569b1820cd8d0d8edd1))
+* **HTTP Request Node:** Cleanup circular references in response ([#6590](https://github.com/n8n-io/n8n/issues/6590)) ([aecc05b](https://github.com/n8n-io/n8n/commit/aecc05b787d09ba778adc5b4bf96abacc5a64204))
+* **Merge Node:** Enrich input 2 fix ([#6526](https://github.com/n8n-io/n8n/issues/6526)) ([c82c7f1](https://github.com/n8n-io/n8n/commit/c82c7f19128df3a11d6d0f18e8d8dab57e6a3b8f))
+* **Microsoft Outlook Node:** Fix issue with category not correctly applying ([#6583](https://github.com/n8n-io/n8n/issues/6583)) ([fc8ed55](https://github.com/n8n-io/n8n/commit/fc8ed55c0de7db4cf17f4f1bf417f6cbf48444c2))
+* **Notion Node:** Version fix ([#6531](https://github.com/n8n-io/n8n/issues/6531)) ([38dc784](https://github.com/n8n-io/n8n/commit/38dc784d2eed25aae777c5c3c3fda1a35e20bd24))
+* **Postgres Node:** Arrays in query replacement fix ([#6718](https://github.com/n8n-io/n8n/issues/6718)) ([4cae091](https://github.com/n8n-io/n8n/commit/4cae091cfb54701dfa51b5204799df0a8b4929cd))
+* **Postgres Node:** For select queries, empty result should be be replaced with `{"success":true}` ([#6703](https://github.com/n8n-io/n8n/issues/6703)) ([250175d](https://github.com/n8n-io/n8n/commit/250175d066d6759f4a787371b47ed91ee62aab71))
+* **Postgres Node:** Upsert does not fetch columns when schema other then public ([#6643](https://github.com/n8n-io/n8n/issues/6643)) ([aaa9ee3](https://github.com/n8n-io/n8n/commit/aaa9ee3949529a745e3b624716da1549ed571604))
+* **Salesforce Node:** Fix typo for adding a contact to a campaign ([#6598](https://github.com/n8n-io/n8n/issues/6598)) ([7ffe3cb](https://github.com/n8n-io/n8n/commit/7ffe3cb36adeecaca6cc6ddf067a701ee55c18d1))
+* **Sendy Node:** Fix issue with brand id not being sent ([#6530](https://github.com/n8n-io/n8n/issues/6530)) ([2e8dfb8](https://github.com/n8n-io/n8n/commit/2e8dfb86d4636781b319d6190e8be12e7661ee16))
+* Stop n8n from complaining about credentials when saving a new workflow form a template ([#6671](https://github.com/n8n-io/n8n/issues/6671)) ([486d16b](https://github.com/n8n-io/n8n/commit/486d16bcdb6be12dd85f4af5f7de878d9d178fd6))
+* **Strapi Node:** Fix issue with pagination ([#4991](https://github.com/n8n-io/n8n/issues/4991)) ([54444fa](https://github.com/n8n-io/n8n/commit/54444fa388da12d75553e66e53a8cf6f8a99b6fc))
+* **Telegram Trigger Node:** Add guard to 'include' call on null or undefined ([#6730](https://github.com/n8n-io/n8n/issues/6730)) ([533b0ba](https://github.com/n8n-io/n8n/commit/533b0bac13d275753fee329bb4abe0c7aae5b48b))
+* **XML Node:** Fix issue with not returning valid data ([#6565](https://github.com/n8n-io/n8n/issues/6565)) ([cdd215f](https://github.com/n8n-io/n8n/commit/cdd215f642b47413c05f229e641074d0d4048f68))
+
+
+### Features
+
+* Add crowd.dev node and trigger node ([#6082](https://github.com/n8n-io/n8n/issues/6082)) ([238a78f](https://github.com/n8n-io/n8n/commit/238a78f0582dbf439a9799de0edcb2e9bef29978))
+* Add missing input panels to some trigger nodes ([#6518](https://github.com/n8n-io/n8n/issues/6518)) ([fdf8a42](https://github.com/n8n-io/n8n/commit/fdf8a428ed38bb3ceb2bc0e50b002b34843d8fc4))
+* Add various source control improvements ([#6533](https://github.com/n8n-io/n8n/issues/6533)) ([68fdc20](https://github.com/n8n-io/n8n/commit/68fdc2078928be478a286774f2889feba1c3f5fe))
+* **Airtable Node:** Overhaul ([#6200](https://github.com/n8n-io/n8n/issues/6200)) ([b69d20c](https://github.com/n8n-io/n8n/commit/b69d20c12ec1ad0395e23747ce5f1d437de0231b))
+* Allow `eslint-config` to be externally consumable ([#6694](https://github.com/n8n-io/n8n/issues/6694)) ([3566c13](https://github.com/n8n-io/n8n/commit/3566c13afc9795206b5a4af7b06159e35b046e12))
+* Allow hiding credential params on cloud ([#6687](https://github.com/n8n-io/n8n/issues/6687)) ([2af1c24](https://github.com/n8n-io/n8n/commit/2af1c24ead4c02e0588d4c2dfcf4a289f54388d4))
+* **API:** Implement users account quota guards  ([#6434](https://github.com/n8n-io/n8n/issues/6434)) ([e5620ab](https://github.com/n8n-io/n8n/commit/e5620ab1e49548e4c2ffd296e055f1caee94d2ba)), closes [#6636](https://github.com/n8n-io/n8n/issues/6636)
+* **core:** Add cache service ([#6729](https://github.com/n8n-io/n8n/issues/6729)) ([c0d2bac](https://github.com/n8n-io/n8n/commit/c0d2bac94d732d4166633adf9c3b8eaf5d8046be))
+* **core:** Only show V1 banner to users who migrated ([#6622](https://github.com/n8n-io/n8n/issues/6622)) ([071e56f](https://github.com/n8n-io/n8n/commit/071e56f7fde2fc4ffc7e3da92a069d8ed593bc60))
+* **editor:** Implement new banners framework ([#6603](https://github.com/n8n-io/n8n/issues/6603)) ([4240e76](https://github.com/n8n-io/n8n/commit/4240e76253e02da13942d4b84a83ec22fd30aca3))
+* **editor:** Load fixed template list as experiment ([#6632](https://github.com/n8n-io/n8n/issues/6632)) ([e996622](https://github.com/n8n-io/n8n/commit/e9966224ea555ce8f3a48872887a73ef879e47c3))
+* **editor:** Prevent saving of workflow when canvas is loading ([#6497](https://github.com/n8n-io/n8n/issues/6497)) ([f89ef83](https://github.com/n8n-io/n8n/commit/f89ef83c766fafb1d0497ed91a74b93e8d2af1ec))
+* **editor:** Removing `ph-no-capture` class from some elements ([#6674](https://github.com/n8n-io/n8n/issues/6674)) ([c3455a4](https://github.com/n8n-io/n8n/commit/c3455a4ad82d965c41267fea173feaad4800c43f))
+* Environments release using source control ([#6653](https://github.com/n8n-io/n8n/issues/6653)) ([fc7aa8b](https://github.com/n8n-io/n8n/commit/fc7aa8bd664553c463536b6abe58a488e5e11147))
+* **Google Cloud Storage Node:** Use streaming for file uploads ([#6462](https://github.com/n8n-io/n8n/issues/6462)) ([cd0e41a](https://github.com/n8n-io/n8n/commit/cd0e41a6b49a58bee95721363dd7e6c43de28725))
+* **Google Drive Node:** Overhaul ([#5941](https://github.com/n8n-io/n8n/issues/5941)) ([d70a1cb](https://github.com/n8n-io/n8n/commit/d70a1cb0c82ee0a4b92776684c6c9079020d028f))
+* **HTML Node:** 'Convert to table operation ([#6540](https://github.com/n8n-io/n8n/issues/6540)) ([8abb03d](https://github.com/n8n-io/n8n/commit/8abb03d7cf02ad7f03a0adffa646870df5f1a02c))
+* **HTTP Request Node:** New http request generic custom auth credential ([#5798](https://github.com/n8n-io/n8n/issues/5798)) ([b17b458](https://github.com/n8n-io/n8n/commit/b17b4582a059104665888a2369c3e2256db4c1ed))
+* **Matrix Node:** Allow setting filename if the binary data has none ([#6536](https://github.com/n8n-io/n8n/issues/6536)) ([8b76e98](https://github.com/n8n-io/n8n/commit/8b76e980852062b192a95593035697c43d6f808e))
+* **Microsoft To Do Node:** Add an option to set a reminder when creating a task ([#5757](https://github.com/n8n-io/n8n/issues/5757)) ([b19833d](https://github.com/n8n-io/n8n/commit/b19833d673bd554ba86c0b234e8d13633912563a))
+* **Notion Node:** Add option to update icon when updating a page ([#5670](https://github.com/n8n-io/n8n/issues/5670)) ([225e849](https://github.com/n8n-io/n8n/commit/225e849960ce65d7f85b482f05fb3d7ffb4f9427))
+* **OpenAI Node:** Update max token limit to support newer model limits ([#6644](https://github.com/n8n-io/n8n/issues/6644)) ([26046f6](https://github.com/n8n-io/n8n/commit/26046f6fe8df9e6fe799f6253d086142f6ce7e53))
+* **Read PDF Node:** Replace pdf-parse with pdfjs, and add support for streaming and encrypted PDFs ([#6640](https://github.com/n8n-io/n8n/issues/6640)) ([0a31b8e](https://github.com/n8n-io/n8n/commit/0a31b8e2b4aab8d74d80f76598900109fe19a0e8))
+* **Rundeck Node:** Add support for node filters  ([#5633](https://github.com/n8n-io/n8n/issues/5633)) ([1f70f49](https://github.com/n8n-io/n8n/commit/1f70f49ce5784baba7fd779b23209bae4f6b039a))
+* **Slack Node:** Add option to include link to workflow in Slack node ([#6611](https://github.com/n8n-io/n8n/issues/6611)) ([aa53c46](https://github.com/n8n-io/n8n/commit/aa53c46367480e31642e807ad1abf149fd13eb28))
+* **Strava Node:** Add hide_from_home field in Activity Update ([#5883](https://github.com/n8n-io/n8n/issues/5883)) ([7495e31](https://github.com/n8n-io/n8n/commit/7495e31a5b25e97683c7ea38225ba253d8fae8b7))
+* **Telegram Node:** Add support for sending messages to forum topics ([#5746](https://github.com/n8n-io/n8n/issues/5746)) ([e6a81f0](https://github.com/n8n-io/n8n/commit/e6a81f0008fddfcfd5f1102c8e6e58650020d930))
+* **Twitter Node:** Node overhaul ([#4788](https://github.com/n8n-io/n8n/issues/4788)) ([42721db](https://github.com/n8n-io/n8n/commit/42721dba80077fb796086a2bf0ecce256bf3a50f))
+
+
+### Reverts
+
+* Revert "test(editor): Add canvas actions E2E tests" (#6736) ([ed09e9c](https://github.com/n8n-io/n8n/commit/ed09e9c695109a715a4c8d47338bbb0b794eb009)), closes [#6736](https://github.com/n8n-io/n8n/issues/6736) [#6723](https://github.com/n8n-io/n8n/issues/6723)
+
+
+
 ## [1.0.1](https://github.com/n8n-io/n8n/compare/n8n@1.0.0...n8n@1.0.1) (2023-07-05)
 
 
diff --git a/package.json b/package.json
index 1d902685de674..4784ccb8469ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index b3acee86b27d8..6dba1df39898f 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/client-oauth2",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f0d9f7f97ec06..419aedd46bbde 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.0.1",
+  "version": "1.1.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 ac50281ddbe9e..3e06b6382e1e4 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.0.1",
+  "version": "1.1.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 62aa98c4a1b5c..d121f71adffd9 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.0.0",
+  "version": "1.1.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 fdf1dc01a1464..90a53d67f75da 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.0.1",
+  "version": "1.1.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 9a62439e8c8da..b8c1a23834944 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.0.1",
+  "version": "1.1.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 8513350c6423a..b1f75df8a9b62 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.0.1",
+  "version": "1.1.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 59e667038327a..de8fb5d9114ff 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 32c74123cf81562cd3bca92ca843a4e14fc848bf Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 26 Jul 2023 11:59:55 +0100
Subject: [PATCH 066/116] fix(Lemlist Node): Fix pagination issues with
 campaigns and activities (#6734)

---
 .../nodes/Lemlist/GenericFunctions.ts         |  2 +-
 .../nodes-base/nodes/Lemlist/Lemlist.node.ts  | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index 70e6e5c46501b..5257c0234e71e 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -51,11 +51,11 @@ export async function lemlistApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: string,
 	endpoint: string,
+	qs: IDataObject = {},
 ) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
-	const qs: IDataObject = {};
 
 	qs.limit = 100;
 	qs.offset = 0;
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
index 3343d185aa6f2..e1b3faf0de506 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
@@ -123,7 +123,7 @@ export class Lemlist implements INodeType {
 
 						// https://developer.lemlist.com/#activities
 
-						const returnAll = this.getNodeParameter('returnAll', 0);
+						const returnAll = this.getNodeParameter('returnAll', i);
 
 						const qs = {} as IDataObject;
 						const filters = this.getNodeParameter('filters', i);
@@ -132,11 +132,11 @@ export class Lemlist implements INodeType {
 							Object.assign(qs, filters);
 						}
 
-						responseData = await lemlistApiRequest.call(this, 'GET', '/activities', {}, qs);
-
-						if (!returnAll) {
-							const limit = this.getNodeParameter('limit', 0);
-							responseData = responseData.slice(0, limit);
+						if (returnAll) {
+							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/activities', qs);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await lemlistApiRequest.call(this, 'GET', '/activities', {}, qs);
 						}
 					}
 				} else if (resource === 'campaign') {
@@ -151,13 +151,15 @@ export class Lemlist implements INodeType {
 
 						// https://developer.lemlist.com/#list-all-campaigns
 
-						responseData = await lemlistApiRequest.call(this, 'GET', '/campaigns');
-
 						const returnAll = this.getNodeParameter('returnAll', i);
 
-						if (!returnAll) {
-							const limit = this.getNodeParameter('limit', i);
-							responseData = responseData.slice(0, limit);
+						if (returnAll) {
+							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/campaigns', {});
+						} else {
+							const qs = {
+								limit: this.getNodeParameter('limit', i),
+							};
+							responseData = await lemlistApiRequest.call(this, 'GET', '/campaigns', {}, qs);
 						}
 					}
 				} else if (resource === 'lead') {
@@ -277,7 +279,7 @@ export class Lemlist implements INodeType {
 						const returnAll = this.getNodeParameter('returnAll', i);
 
 						if (returnAll) {
-							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/unsubscribes');
+							responseData = await lemlistApiRequestAllItems.call(this, 'GET', '/unsubscribes', {});
 						} else {
 							const qs = {
 								limit: this.getNodeParameter('limit', i),

From 29c78959cac5d620a3a090b9925ec2c5ab6f18fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 26 Jul 2023 13:47:54 +0200
Subject: [PATCH 067/116] ci: Fix linting issues (no-changelog) (#6747)

---
 packages/cli/src/Db.ts         | 1 -
 packages/cli/src/Interfaces.ts | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index 02d32a3744c2b..cd27c7e737b5e 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -41,7 +41,6 @@ import {
 	TagRepository,
 	UserRepository,
 	VariablesRepository,
-	WebhookRepository,
 	WorkflowRepository,
 	WorkflowStatisticsRepository,
 	WorkflowTagMappingRepository,
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 2d664a65705b1..349fc807ec290 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -56,7 +56,6 @@ import type {
 	TagRepository,
 	UserRepository,
 	VariablesRepository,
-	WebhookRepository,
 	WorkflowRepository,
 	WorkflowStatisticsRepository,
 	WorkflowTagMappingRepository,

From 4b0e241b5325b229f9888d86eb0eb9141d8071b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 26 Jul 2023 17:56:59 +0200
Subject: [PATCH 068/116] fix(core): Allow ignoring SSL issues on generic
 oauth2 credentials (#6702)

---
 packages/@n8n/client-oauth2/src/ClientOAuth2.ts  | 16 ++++++++++++++--
 packages/@n8n/client-oauth2/src/CodeFlow.ts      |  8 ++++----
 packages/@n8n/client-oauth2/src/utils.ts         |  5 +++--
 .../cli/src/credentials/oauth2Credential.api.ts  |  1 +
 packages/core/src/NodeExecuteFunctions.ts        |  4 ++++
 .../credentials/OAuth2Api.credentials.ts         |  7 +++++++
 packages/workflow/src/Interfaces.ts              |  1 +
 packages/workflow/src/NodeHelpers.ts             |  2 ++
 8 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
index 6074cf11cdf7b..c9e21a6a42a63 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -4,7 +4,9 @@
 /* eslint-disable @typescript-eslint/restrict-plus-operands */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as qs from 'querystring';
+import { Agent } from 'https';
 import axios from 'axios';
+import type { AxiosRequestConfig } from 'axios';
 import { getAuthError } from './utils';
 import type { ClientOAuth2TokenData } from './ClientOAuth2Token';
 import { ClientOAuth2Token } from './ClientOAuth2Token';
@@ -18,6 +20,7 @@ export interface ClientOAuth2RequestObject {
 	body?: Record<string, any>;
 	query?: qs.ParsedUrlQuery;
 	headers?: Headers;
+	ignoreSSLIssues?: boolean;
 }
 
 export interface ClientOAuth2Options {
@@ -32,6 +35,7 @@ export interface ClientOAuth2Options {
 	state?: string;
 	body?: Record<string, any>;
 	query?: qs.ParsedUrlQuery;
+	ignoreSSLIssues?: boolean;
 }
 
 class ResponseError extends Error {
@@ -40,6 +44,8 @@ class ResponseError extends Error {
 	}
 }
 
+const sslIgnoringAgent = new Agent({ rejectUnauthorized: false });
+
 /**
  * Construct an object that can handle the multiple OAuth 2.0 flows.
  */
@@ -86,7 +92,7 @@ export class ClientOAuth2 {
 			url += (url.indexOf('?') === -1 ? '?' : '&') + query;
 		}
 
-		const response = await axios.request({
+		const requestConfig: AxiosRequestConfig = {
 			url,
 			method: options.method,
 			data: qs.stringify(options.body),
@@ -95,7 +101,13 @@ export class ClientOAuth2 {
 			// Axios rejects the promise by default for all status codes 4xx.
 			// We override this to reject promises only on 5xxs
 			validateStatus: (status) => status < 500,
-		});
+		};
+
+		if (options.ignoreSSLIssues) {
+			requestConfig.httpsAgent = sslIgnoringAgent;
+		}
+
+		const response = await axios.request(requestConfig);
 
 		const body = this.parseResponseBody<T>(response.data);
 
diff --git a/packages/@n8n/client-oauth2/src/CodeFlow.ts b/packages/@n8n/client-oauth2/src/CodeFlow.ts
index 7d3b8423296ca..20679188a879e 100644
--- a/packages/@n8n/client-oauth2/src/CodeFlow.ts
+++ b/packages/@n8n/client-oauth2/src/CodeFlow.ts
@@ -53,13 +53,13 @@ export class CodeFlow {
 	 * the user access token.
 	 */
 	async getToken(
-		uri: string | URL,
+		urlString: string,
 		opts?: Partial<ClientOAuth2Options>,
 	): Promise<ClientOAuth2Token> {
-		const options = { ...this.client.options, ...opts };
+		const options: ClientOAuth2Options = { ...this.client.options, ...opts };
 		expects(options, 'clientId', 'accessTokenUri');
 
-		const url = uri instanceof URL ? uri : new URL(uri, DEFAULT_URL_BASE);
+		const url = new URL(urlString, DEFAULT_URL_BASE);
 		if (
 			typeof options.redirectUri === 'string' &&
 			typeof url.pathname === 'string' &&
@@ -70,7 +70,7 @@ export class CodeFlow {
 
 		if (!url.search?.substring(1)) {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-			throw new TypeError(`Unable to process uri: ${uri.toString()}`);
+			throw new TypeError(`Unable to process uri: ${urlString}`);
 		}
 
 		const data =
diff --git a/packages/@n8n/client-oauth2/src/utils.ts b/packages/@n8n/client-oauth2/src/utils.ts
index 44317e5dc6e8a..9d57c78b224bf 100644
--- a/packages/@n8n/client-oauth2/src/utils.ts
+++ b/packages/@n8n/client-oauth2/src/utils.ts
@@ -63,14 +63,15 @@ export function auth(username: string, password: string): string {
  */
 export function getRequestOptions(
 	{ url, method, body, query, headers }: ClientOAuth2RequestObject,
-	options: any,
+	options: ClientOAuth2Options,
 ): ClientOAuth2RequestObject {
 	const rOptions = {
 		url,
 		method,
 		body: { ...body, ...options.body },
 		query: { ...query, ...options.query },
-		headers: { ...headers, ...options.headers },
+		headers: headers ?? {},
+		ignoreSSLIssues: options.ignoreSSLIssues,
 	};
 	// if request authorization was overridden delete it from header
 	if (rOptions.headers.Authorization === '') {
diff --git a/packages/cli/src/credentials/oauth2Credential.api.ts b/packages/cli/src/credentials/oauth2Credential.api.ts
index e2cf481ceef7d..b6a9573ba6837 100644
--- a/packages/cli/src/credentials/oauth2Credential.api.ts
+++ b/packages/cli/src/credentials/oauth2Credential.api.ts
@@ -265,6 +265,7 @@ oauth2CredentialController.get(
 				redirectUri: `${getInstanceBaseUrl()}/${restEndpoint}/oauth2-credential/callback`,
 				scopes: split(scopes, ','),
 				scopesSeparator: scopes.includes(',') ? ',' : ' ',
+				ignoreSSLIssues: get(oauthCredentials, 'ignoreSSLIssues') as boolean,
 			};
 
 			if (oauthCredentials.grantType === 'pkce') {
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 7f2e66265d121..aefb5d5003c4d 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1092,6 +1092,7 @@ export async function requestOAuth2(
 		clientSecret: credentials.clientSecret as string,
 		accessTokenUri: credentials.accessTokenUrl as string,
 		scopes: (credentials.scope as string).split(' '),
+		ignoreSSLIssues: credentials.ignoreSSLIssues as boolean,
 	});
 
 	let oauthTokenData = credentials.oauthTokenData as ClientOAuth2TokenData;
@@ -1131,6 +1132,9 @@ export async function requestOAuth2(
 		},
 		oAuth2Options?.tokenType || oauthTokenData.tokenType,
 	);
+
+	(requestOptions as OptionsWithUri).rejectUnauthorized = !credentials.ignoreSSLIssues;
+
 	// Signs the request by adding authorization headers or query parameters depending
 	// on the token-type used.
 	const newRequestOptions = token.sign(requestOptions as ClientOAuth2RequestObject);
diff --git a/packages/nodes-base/credentials/OAuth2Api.credentials.ts b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
index 22b0d8258c8d4..ed61e2d639353 100644
--- a/packages/nodes-base/credentials/OAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
@@ -104,5 +104,12 @@ export class OAuth2Api implements ICredentialType {
 			],
 			default: 'header',
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'ignoreSSLIssues',
+			type: 'boolean',
+			default: false,
+			doNotInherit: true,
+		},
 	];
 }
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 33a68c849a4f1..b17af48c165d4 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1116,6 +1116,7 @@ export interface INodeProperties {
 	extractValue?: INodePropertyValueExtractor;
 	modes?: INodePropertyMode[];
 	requiresDataPath?: 'single' | 'multiple';
+	doNotInherit?: boolean;
 }
 
 export interface INodePropertyModeTypeOptions {
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 4b10ce92a9134..8e658c0e43dbe 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1601,6 +1601,8 @@ export function mergeNodeProperties(
 ): void {
 	let existingIndex: number;
 	for (const property of addProperties) {
+		if (property.doNotInherit) continue;
+
 		existingIndex = mainProperties.findIndex((element) => element.name === property.name);
 
 		if (existingIndex === -1) {

From 58ab95b9a1373f61d6d6fc471716da4a3ef0d365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 27 Jul 2023 11:53:25 +0200
Subject: [PATCH 069/116] refactor: Remove all references to the
 resetPasswordToken field (no-changelog) (#6751)

refactor: remove all references to the resetPasswordToken field (no-changelog)
---
 .../cli/src/commands/user-management/reset.ts |  1 -
 .../cli/test/integration/auth.api.test.ts     | 70 +++----------------
 .../integration/commands/reset.cmd.test.ts    |  2 -
 packages/cli/test/integration/me.api.test.ts  |  6 --
 .../cli/test/integration/owner.api.test.ts    |  2 -
 .../integration/publicApi/users.ee.test.ts    |  6 --
 6 files changed, 10 insertions(+), 77 deletions(-)

diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts
index eec5e1784a9a4..09a5e060800ec 100644
--- a/packages/cli/src/commands/user-management/reset.ts
+++ b/packages/cli/src/commands/user-management/reset.ts
@@ -11,7 +11,6 @@ const defaultUserProps = {
 	lastName: null,
 	email: null,
 	password: null,
-	resetPasswordToken: null,
 };
 
 export class Reset extends BaseCommand {
diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts
index 1484468cf373e..009c2a590b9b0 100644
--- a/packages/cli/test/integration/auth.api.test.ts
+++ b/packages/cli/test/integration/auth.api.test.ts
@@ -47,17 +47,8 @@ describe('POST /login', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			password,
-			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
-			apiKey,
-		} = response.body.data;
+		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
+			response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBe(owner.email);
@@ -66,7 +57,6 @@ describe('POST /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
 		expect(globalRole).toBeDefined();
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
@@ -137,17 +127,8 @@ describe('GET /login', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			password,
-			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
-			apiKey,
-		} = response.body.data;
+		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
+			response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBeDefined();
@@ -156,7 +137,6 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
 		expect(globalRole).toBeDefined();
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
@@ -173,17 +153,8 @@ describe('GET /login', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			password,
-			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
-			apiKey,
-		} = response.body.data;
+		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
+			response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBeDefined();
@@ -192,7 +163,6 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
 		expect(globalRole).toBeDefined();
 		expect(globalRole.name).toBe('member');
 		expect(globalRole.scope).toBe('global');
@@ -209,17 +179,8 @@ describe('GET /login', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			password,
-			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
-			apiKey,
-		} = response.body.data;
+		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
+			response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBe(owner.email);
@@ -228,7 +189,6 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
 		expect(globalRole).toBeDefined();
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
@@ -245,17 +205,8 @@ describe('GET /login', () => {
 
 		expect(response.statusCode).toBe(200);
 
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			password,
-			personalizationAnswers,
-			globalRole,
-			resetPasswordToken,
-			apiKey,
-		} = response.body.data;
+		const { id, email, firstName, lastName, password, personalizationAnswers, globalRole, apiKey } =
+			response.body.data;
 
 		expect(validator.isUUID(id)).toBe(true);
 		expect(email).toBe(member.email);
@@ -264,7 +215,6 @@ describe('GET /login', () => {
 		expect(password).toBeUndefined();
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
 		expect(globalRole).toBeDefined();
 		expect(globalRole.name).toBe('member');
 		expect(globalRole.scope).toBe('global');
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index c1f4b3f7d86d2..ee41c1f45cdcc 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -42,7 +42,5 @@ test.skip('user-management:reset should reset DB to default user state', async (
 	expect(user.firstName).toBeNull();
 	expect(user.lastName).toBeNull();
 	expect(user.password).toBeNull();
-	expect(user.resetPasswordToken).toBeNull();
-	expect(user.resetPasswordTokenExpiration).toBeNull();
 	expect(user.personalizationAnswers).toBeNull();
 });
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index b330a9d9cbadc..05371ce558475 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -53,7 +53,6 @@ describe('Owner shell', () => {
 				personalizationAnswers,
 				globalRole,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = response.body.data;
@@ -64,7 +63,6 @@ describe('Owner shell', () => {
 			expect(lastName).toBe(validPayload.lastName);
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(globalRole.name).toBe('owner');
 			expect(globalRole.scope).toBe('global');
@@ -198,7 +196,6 @@ describe('Member', () => {
 				personalizationAnswers,
 				globalRole,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = response.body.data;
@@ -209,7 +206,6 @@ describe('Member', () => {
 			expect(lastName).toBe(validPayload.lastName);
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(globalRole.name).toBe('member');
 			expect(globalRole.scope).toBe('global');
@@ -334,7 +330,6 @@ describe('Owner', () => {
 				personalizationAnswers,
 				globalRole,
 				password,
-				resetPasswordToken,
 				isPending,
 				apiKey,
 			} = response.body.data;
@@ -345,7 +340,6 @@ describe('Owner', () => {
 			expect(lastName).toBe(validPayload.lastName);
 			expect(personalizationAnswers).toBeNull();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(globalRole.name).toBe('owner');
 			expect(globalRole.scope).toBe('global');
diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts
index e8227c9d5f508..6332ae39c1a87 100644
--- a/packages/cli/test/integration/owner.api.test.ts
+++ b/packages/cli/test/integration/owner.api.test.ts
@@ -55,7 +55,6 @@ describe('POST /owner/setup', () => {
 			personalizationAnswers,
 			globalRole,
 			password,
-			resetPasswordToken,
 			isPending,
 			apiKey,
 		} = response.body.data;
@@ -67,7 +66,6 @@ describe('POST /owner/setup', () => {
 		expect(personalizationAnswers).toBeNull();
 		expect(password).toBeUndefined();
 		expect(isPending).toBe(false);
-		expect(resetPasswordToken).toBeUndefined();
 		expect(globalRole.name).toBe('owner');
 		expect(globalRole.scope).toBe('global');
 		expect(apiKey).toBeUndefined();
diff --git a/packages/cli/test/integration/publicApi/users.ee.test.ts b/packages/cli/test/integration/publicApi/users.ee.test.ts
index 95b48c243e4e5..0bc09448ba68b 100644
--- a/packages/cli/test/integration/publicApi/users.ee.test.ts
+++ b/packages/cli/test/integration/publicApi/users.ee.test.ts
@@ -73,7 +73,6 @@ describe('With license unlimited quota:users', () => {
 					personalizationAnswers,
 					globalRole,
 					password,
-					resetPasswordToken,
 					isPending,
 					createdAt,
 					updatedAt,
@@ -85,7 +84,6 @@ describe('With license unlimited quota:users', () => {
 				expect(lastName).toBeDefined();
 				expect(personalizationAnswers).toBeUndefined();
 				expect(password).toBeUndefined();
-				expect(resetPasswordToken).toBeUndefined();
 				expect(isPending).toBe(false);
 				expect(globalRole).toBeUndefined();
 				expect(createdAt).toBeDefined();
@@ -144,7 +142,6 @@ describe('With license unlimited quota:users', () => {
 				personalizationAnswers,
 				globalRole,
 				password,
-				resetPasswordToken,
 				isPending,
 				createdAt,
 				updatedAt,
@@ -156,7 +153,6 @@ describe('With license unlimited quota:users', () => {
 			expect(lastName).toBeDefined();
 			expect(personalizationAnswers).toBeUndefined();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(globalRole).toBeUndefined();
 			expect(createdAt).toBeDefined();
 			expect(isPending).toBeDefined();
@@ -192,7 +188,6 @@ describe('With license unlimited quota:users', () => {
 				personalizationAnswers,
 				globalRole,
 				password,
-				resetPasswordToken,
 				isPending,
 				createdAt,
 				updatedAt,
@@ -204,7 +199,6 @@ describe('With license unlimited quota:users', () => {
 			expect(lastName).toBeDefined();
 			expect(personalizationAnswers).toBeUndefined();
 			expect(password).toBeUndefined();
-			expect(resetPasswordToken).toBeUndefined();
 			expect(isPending).toBe(false);
 			expect(globalRole).toBeUndefined();
 			expect(createdAt).toBeDefined();

From a67e3d8a63539d17527dc38537fdd61e26328e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 27 Jul 2023 11:53:37 +0200
Subject: [PATCH 070/116] refactor(core): Use mixins to delete redundant code
 between Entity classes (no-changelog) (#6616)

* db entities don't need an ID before they are inserted

* don't define constructors on entity classes, use repository.create instead

* use mixins to reduce duplicate code in db entity classes
---
 .../src/databases/entities/AbstractEntity.ts  | 78 +++++++++++++------
 .../src/databases/entities/AuthIdentity.ts    |  4 +-
 .../databases/entities/CredentialsEntity.ts   | 26 +------
 .../databases/entities/EventDestinations.ts   |  4 +-
 .../databases/entities/InstalledPackages.ts   |  4 +-
 packages/cli/src/databases/entities/Role.ts   |  4 +-
 .../databases/entities/SharedCredentials.ts   |  4 +-
 .../src/databases/entities/SharedWorkflow.ts  |  4 +-
 .../cli/src/databases/entities/TagEntity.ts   | 25 +-----
 packages/cli/src/databases/entities/User.ts   |  4 +-
 .../cli/src/databases/entities/Variables.ts   | 23 +-----
 .../src/databases/entities/WorkflowEntity.ts  | 35 +--------
 .../sourceControlImport.service.ee.ts         |  4 +-
 .../integration/audit/filesystem.risk.test.ts |  3 +-
 .../test/integration/audit/nodes.risk.test.ts |  3 +-
 .../cli/test/integration/shared/testDb.ts     |  4 +-
 16 files changed, 89 insertions(+), 140 deletions(-)

diff --git a/packages/cli/src/databases/entities/AbstractEntity.ts b/packages/cli/src/databases/entities/AbstractEntity.ts
index e12933572ce4a..9125694619820 100644
--- a/packages/cli/src/databases/entities/AbstractEntity.ts
+++ b/packages/cli/src/databases/entities/AbstractEntity.ts
@@ -1,6 +1,13 @@
-import { BeforeUpdate, CreateDateColumn, UpdateDateColumn } from 'typeorm';
+import {
+	BeforeInsert,
+	BeforeUpdate,
+	CreateDateColumn,
+	PrimaryColumn,
+	UpdateDateColumn,
+} from 'typeorm';
 import { IsDate, IsOptional } from 'class-validator';
 import config from '@/config';
+import { generateNanoId } from '../utils/generators';
 
 const dbType = config.getEnv('database.type');
 
@@ -14,26 +21,53 @@ const timestampSyntax = {
 export const jsonColumnType = dbType === 'sqlite' ? 'simple-json' : 'json';
 export const datetimeColumnType = dbType === 'postgresdb' ? 'timestamptz' : 'datetime';
 
-export abstract class AbstractEntity {
-	@CreateDateColumn({
-		precision: 3,
-		default: () => timestampSyntax,
-	})
-	@IsOptional() // ignored by validation because set at DB level
-	@IsDate()
-	createdAt: Date;
-
-	@UpdateDateColumn({
-		precision: 3,
-		default: () => timestampSyntax,
-		onUpdate: timestampSyntax,
-	})
-	@IsOptional() // ignored by validation because set at DB level
-	@IsDate()
-	updatedAt: Date;
-
-	@BeforeUpdate()
-	setUpdateDate(): void {
-		this.updatedAt = new Date();
+const tsColumnOptions = {
+	precision: 3,
+	default: () => timestampSyntax,
+};
+
+type Constructor<T> = new (...args: any[]) => T;
+
+function mixinStringId<T extends Constructor<{}>>(base: T) {
+	class Derived extends base {
+		@PrimaryColumn('varchar')
+		id: string;
+
+		@BeforeInsert()
+		generateId() {
+			if (!this.id) {
+				this.id = generateNanoId();
+			}
+		}
 	}
+	return Derived;
 }
+
+function mixinTimestamps<T extends Constructor<{}>>(base: T) {
+	class Derived extends base {
+		@CreateDateColumn(tsColumnOptions)
+		@IsOptional() // ignored by validation because set at DB level
+		@IsDate()
+		createdAt: Date;
+
+		@UpdateDateColumn({
+			...tsColumnOptions,
+			onUpdate: timestampSyntax,
+		})
+		@IsOptional() // ignored by validation because set at DB level
+		@IsDate()
+		updatedAt: Date;
+
+		@BeforeUpdate()
+		setUpdateDate(): void {
+			this.updatedAt = new Date();
+		}
+	}
+	return Derived;
+}
+
+class BaseEntity {}
+/* eslint-disable @typescript-eslint/naming-convention */
+export const WithStringId = mixinStringId(BaseEntity);
+export const WithTimestamps = mixinTimestamps(BaseEntity);
+export const WithTimestampsAndStringId = mixinStringId(WithTimestamps);
diff --git a/packages/cli/src/databases/entities/AuthIdentity.ts b/packages/cli/src/databases/entities/AuthIdentity.ts
index 7069206287826..47289c9306b9b 100644
--- a/packages/cli/src/databases/entities/AuthIdentity.ts
+++ b/packages/cli/src/databases/entities/AuthIdentity.ts
@@ -1,12 +1,12 @@
 import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from 'typeorm';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestamps } from './AbstractEntity';
 import { User } from './User';
 
 export type AuthProviderType = 'ldap' | 'email' | 'saml'; // | 'google';
 
 @Entity()
 @Unique(['providerId', 'providerType'])
-export class AuthIdentity extends AbstractEntity {
+export class AuthIdentity extends WithTimestamps {
 	@Column()
 	userId: string;
 
diff --git a/packages/cli/src/databases/entities/CredentialsEntity.ts b/packages/cli/src/databases/entities/CredentialsEntity.ts
index f9cb8fa49f8a7..23a2e70760e24 100644
--- a/packages/cli/src/databases/entities/CredentialsEntity.ts
+++ b/packages/cli/src/databases/entities/CredentialsEntity.ts
@@ -1,30 +1,12 @@
 import type { ICredentialNodeAccess } from 'n8n-workflow';
-import { BeforeInsert, Column, Entity, Index, OneToMany, PrimaryColumn } from 'typeorm';
+import { Column, Entity, Index, OneToMany } from 'typeorm';
 import { IsArray, IsObject, IsString, Length } from 'class-validator';
 import type { SharedCredentials } from './SharedCredentials';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { WithTimestampsAndStringId, jsonColumnType } from './AbstractEntity';
 import type { ICredentialsDb } from '@/Interfaces';
-import { generateNanoId } from '../utils/generators';
-@Entity()
-export class CredentialsEntity extends AbstractEntity implements ICredentialsDb {
-	constructor(data?: Partial<CredentialsEntity>) {
-		super();
-		Object.assign(this, data);
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@BeforeInsert()
-	nanoId(): void {
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@PrimaryColumn('varchar')
-	id: string;
 
+@Entity()
+export class CredentialsEntity extends WithTimestampsAndStringId implements ICredentialsDb {
 	@Column({ length: 128 })
 	@IsString({ message: 'Credential `name` must be of type string.' })
 	@Length(3, 128, {
diff --git a/packages/cli/src/databases/entities/EventDestinations.ts b/packages/cli/src/databases/entities/EventDestinations.ts
index 8f3452936cc6b..b302e9a1a8015 100644
--- a/packages/cli/src/databases/entities/EventDestinations.ts
+++ b/packages/cli/src/databases/entities/EventDestinations.ts
@@ -1,9 +1,9 @@
 import { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { Column, Entity, PrimaryColumn } from 'typeorm';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { WithTimestamps, jsonColumnType } from './AbstractEntity';
 
 @Entity({ name: 'event_destinations' })
-export class EventDestinations extends AbstractEntity {
+export class EventDestinations extends WithTimestamps {
 	@PrimaryColumn('uuid')
 	id: string;
 
diff --git a/packages/cli/src/databases/entities/InstalledPackages.ts b/packages/cli/src/databases/entities/InstalledPackages.ts
index ec406ca5d6929..c0c06a00da63d 100644
--- a/packages/cli/src/databases/entities/InstalledPackages.ts
+++ b/packages/cli/src/databases/entities/InstalledPackages.ts
@@ -1,9 +1,9 @@
 import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
 import type { InstalledNodes } from './InstalledNodes';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestamps } from './AbstractEntity';
 
 @Entity()
-export class InstalledPackages extends AbstractEntity {
+export class InstalledPackages extends WithTimestamps {
 	@PrimaryColumn()
 	packageName: string;
 
diff --git a/packages/cli/src/databases/entities/Role.ts b/packages/cli/src/databases/entities/Role.ts
index b1943866d48d8..b3dc3c3d0a605 100644
--- a/packages/cli/src/databases/entities/Role.ts
+++ b/packages/cli/src/databases/entities/Role.ts
@@ -4,7 +4,7 @@ import { IsString, Length } from 'class-validator';
 import type { User } from './User';
 import type { SharedWorkflow } from './SharedWorkflow';
 import type { SharedCredentials } from './SharedCredentials';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestamps } from './AbstractEntity';
 import { idStringifier } from '../utils/transformers';
 
 export type RoleNames = 'owner' | 'member' | 'user' | 'editor';
@@ -12,7 +12,7 @@ export type RoleScopes = 'global' | 'workflow' | 'credential';
 
 @Entity()
 @Unique(['scope', 'name'])
-export class Role extends AbstractEntity {
+export class Role extends WithTimestamps {
 	@PrimaryColumn({ transformer: idStringifier })
 	id: string;
 
diff --git a/packages/cli/src/databases/entities/SharedCredentials.ts b/packages/cli/src/databases/entities/SharedCredentials.ts
index bda9006125f4d..6686e5a3c4099 100644
--- a/packages/cli/src/databases/entities/SharedCredentials.ts
+++ b/packages/cli/src/databases/entities/SharedCredentials.ts
@@ -2,10 +2,10 @@ import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
 import { CredentialsEntity } from './CredentialsEntity';
 import { User } from './User';
 import { Role } from './Role';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestamps } from './AbstractEntity';
 
 @Entity()
-export class SharedCredentials extends AbstractEntity {
+export class SharedCredentials extends WithTimestamps {
 	@ManyToOne('Role', 'sharedCredentials', { nullable: false })
 	role: Role;
 
diff --git a/packages/cli/src/databases/entities/SharedWorkflow.ts b/packages/cli/src/databases/entities/SharedWorkflow.ts
index 12b9dd1def3b3..4b181e5ab114f 100644
--- a/packages/cli/src/databases/entities/SharedWorkflow.ts
+++ b/packages/cli/src/databases/entities/SharedWorkflow.ts
@@ -2,10 +2,10 @@ import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
 import { WorkflowEntity } from './WorkflowEntity';
 import { User } from './User';
 import { Role } from './Role';
-import { AbstractEntity } from './AbstractEntity';
+import { WithTimestamps } from './AbstractEntity';
 
 @Entity()
-export class SharedWorkflow extends AbstractEntity {
+export class SharedWorkflow extends WithTimestamps {
 	@ManyToOne('Role', 'sharedWorkflows', { nullable: false })
 	role: Role;
 
diff --git a/packages/cli/src/databases/entities/TagEntity.ts b/packages/cli/src/databases/entities/TagEntity.ts
index 8e9f518f2255e..c425b505ba5c5 100644
--- a/packages/cli/src/databases/entities/TagEntity.ts
+++ b/packages/cli/src/databases/entities/TagEntity.ts
@@ -1,30 +1,11 @@
-import { BeforeInsert, Column, Entity, Index, ManyToMany, OneToMany, PrimaryColumn } from 'typeorm';
+import { Column, Entity, Index, ManyToMany, OneToMany } from 'typeorm';
 import { IsString, Length } from 'class-validator';
 import type { WorkflowEntity } from './WorkflowEntity';
 import type { WorkflowTagMapping } from './WorkflowTagMapping';
-import { AbstractEntity } from './AbstractEntity';
-import { generateNanoId } from '../utils/generators';
+import { WithTimestampsAndStringId } from './AbstractEntity';
 
 @Entity()
-export class TagEntity extends AbstractEntity {
-	constructor(data?: Partial<TagEntity>) {
-		super();
-		Object.assign(this, data);
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@BeforeInsert()
-	nanoId() {
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@PrimaryColumn('varchar')
-	id: string;
-
+export class TagEntity extends WithTimestampsAndStringId {
 	@Column({ length: 24 })
 	@Index({ unique: true })
 	@IsString({ message: 'Tag name must be of type string.' })
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index 029275902ff31..15370aade6ba9 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -17,7 +17,7 @@ import type { SharedWorkflow } from './SharedWorkflow';
 import type { SharedCredentials } from './SharedCredentials';
 import { NoXss } from '../utils/customValidators';
 import { objectRetriever, lowerCaser } from '../utils/transformers';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { WithTimestamps, jsonColumnType } from './AbstractEntity';
 import type { IPersonalizationSurveyAnswers } from '@/Interfaces';
 import type { AuthIdentity } from './AuthIdentity';
 
@@ -26,7 +26,7 @@ export const MIN_PASSWORD_LENGTH = 8;
 export const MAX_PASSWORD_LENGTH = 64;
 
 @Entity()
-export class User extends AbstractEntity implements IUser {
+export class User extends WithTimestamps implements IUser {
 	@PrimaryGeneratedColumn('uuid')
 	id: string;
 
diff --git a/packages/cli/src/databases/entities/Variables.ts b/packages/cli/src/databases/entities/Variables.ts
index 6564da2fd02c3..42f52c4ace51f 100644
--- a/packages/cli/src/databases/entities/Variables.ts
+++ b/packages/cli/src/databases/entities/Variables.ts
@@ -1,25 +1,8 @@
-import { BeforeInsert, Column, Entity, PrimaryColumn } from 'typeorm';
-import { generateNanoId } from '../utils/generators';
+import { Column, Entity } from 'typeorm';
+import { WithStringId } from './AbstractEntity';
 
 @Entity()
-export class Variables {
-	constructor(data?: Partial<Variables>) {
-		Object.assign(this, data);
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@BeforeInsert()
-	nanoId() {
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@PrimaryColumn('varchar')
-	id: string;
-
+export class Variables extends WithStringId {
 	@Column('text')
 	key: string;
 
diff --git a/packages/cli/src/databases/entities/WorkflowEntity.ts b/packages/cli/src/databases/entities/WorkflowEntity.ts
index e40c1e1b7d53d..0bbb70ccf2417 100644
--- a/packages/cli/src/databases/entities/WorkflowEntity.ts
+++ b/packages/cli/src/databases/entities/WorkflowEntity.ts
@@ -3,17 +3,7 @@ import { Length } from 'class-validator';
 import { IConnections, IDataObject, IWorkflowSettings } from 'n8n-workflow';
 import type { IBinaryKeyData, INode, IPairedItemData } from 'n8n-workflow';
 
-import {
-	BeforeInsert,
-	Column,
-	Entity,
-	Index,
-	JoinColumn,
-	JoinTable,
-	ManyToMany,
-	OneToMany,
-	PrimaryColumn,
-} from 'typeorm';
+import { Column, Entity, Index, JoinColumn, JoinTable, ManyToMany, OneToMany } from 'typeorm';
 
 import config from '@/config';
 import type { TagEntity } from './TagEntity';
@@ -21,30 +11,11 @@ import type { SharedWorkflow } from './SharedWorkflow';
 import type { WorkflowStatistics } from './WorkflowStatistics';
 import type { WorkflowTagMapping } from './WorkflowTagMapping';
 import { objectRetriever, sqlite } from '../utils/transformers';
-import { AbstractEntity, jsonColumnType } from './AbstractEntity';
+import { WithTimestampsAndStringId, jsonColumnType } from './AbstractEntity';
 import type { IWorkflowDb } from '@/Interfaces';
-import { generateNanoId } from '../utils/generators';
 
 @Entity()
-export class WorkflowEntity extends AbstractEntity implements IWorkflowDb {
-	constructor(data?: Partial<WorkflowEntity>) {
-		super();
-		Object.assign(this, data);
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@BeforeInsert()
-	nanoId() {
-		if (!this.id) {
-			this.id = generateNanoId();
-		}
-	}
-
-	@PrimaryColumn('varchar')
-	id: string;
-
+export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkflowDb {
 	// TODO: Add XSS check
 	@Index({ unique: true })
 	@Length(1, 128, {
diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
index e7126350b2063..c99363cacf74a 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
@@ -14,7 +14,7 @@ import { readFile as fsReadFile } from 'fs/promises';
 import { Credentials, UserSettings } from 'n8n-core';
 import type { IWorkflowToImport } from '@/Interfaces';
 import type { ExportableCredential } from './types/exportableCredential';
-import { Variables } from '@db/entities/Variables';
+import type { Variables } from '@db/entities/Variables';
 import { UM_FIX_INSTRUCTION } from '@/commands/BaseCommand';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
@@ -576,7 +576,7 @@ export class SourceControlImportService {
 		if (overriddenKeys.length > 0 && valueOverrides) {
 			for (const key of overriddenKeys) {
 				result.imported.push(key);
-				const newVariable = new Variables({ key, value: valueOverrides[key] });
+				const newVariable = Db.collections.Variables.create({ key, value: valueOverrides[key] });
 				await Db.collections.Variables.save(newVariable);
 			}
 		}
diff --git a/packages/cli/test/integration/audit/filesystem.risk.test.ts b/packages/cli/test/integration/audit/filesystem.risk.test.ts
index 8418dbc10216a..d8f3e711e7b55 100644
--- a/packages/cli/test/integration/audit/filesystem.risk.test.ts
+++ b/packages/cli/test/integration/audit/filesystem.risk.test.ts
@@ -4,7 +4,6 @@ import { audit } from '@/audit';
 import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/audit/constants';
 import { getRiskSection, saveManualTriggerWorkflow } from './utils';
 import * as testDb from '../shared/testDb';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 
 beforeAll(async () => {
 	await testDb.init();
@@ -27,7 +26,7 @@ test('should report filesystem interaction nodes', async () => {
 	);
 
 	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = new WorkflowEntity({
+		const details = Db.collections.Workflow.create({
 			name: 'My Test Workflow',
 			active: false,
 			connections: {},
diff --git a/packages/cli/test/integration/audit/nodes.risk.test.ts b/packages/cli/test/integration/audit/nodes.risk.test.ts
index 884594cfe035c..49fb65bbc0eb7 100644
--- a/packages/cli/test/integration/audit/nodes.risk.test.ts
+++ b/packages/cli/test/integration/audit/nodes.risk.test.ts
@@ -9,7 +9,6 @@ import { toReportTitle } from '@/audit/utils';
 import { mockInstance } from '../shared/utils/';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { NodeTypes } from '@/NodeTypes';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 
 const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
 nodesAndCredentials.getCustomDirectories.mockReturnValue([]);
@@ -33,7 +32,7 @@ test('should report risky official nodes', async () => {
 	}, {});
 
 	const promises = Object.entries(map).map(async ([nodeType, nodeId]) => {
-		const details = new WorkflowEntity({
+		const details = Db.collections.Workflow.create({
 			name: 'My Test Workflow',
 			active: false,
 			connections: {},
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index 92fb56ea326ba..55a042d28263d 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -19,7 +19,7 @@ import { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { Role } from '@db/entities/Role';
 import type { TagEntity } from '@db/entities/TagEntity';
 import type { User } from '@db/entities/User';
-import { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { RoleRepository } from '@db/repositories';
 import type { ICredentialsDb } from '@/Interfaces';
 
@@ -412,7 +412,7 @@ export async function createManyWorkflows(
 export async function createWorkflow(attributes: Partial<WorkflowEntity> = {}, user?: User) {
 	const { active, name, nodes, connections } = attributes;
 
-	const workflowEntity = new WorkflowEntity({
+	const workflowEntity = Db.collections.Workflow.create({
 		active: active ?? false,
 		name: name ?? 'test workflow',
 		nodes: nodes ?? [

From 5132de35884132e761c692f8eef2de9ce31f90ee Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 27 Jul 2023 12:11:43 +0200
Subject: [PATCH 071/116] fix: Display source control buttons properly (#6756)

---
 .../src/components/MainSidebarSourceControl.vue      |  9 ++-------
 .../__tests__/MainSidebarSourceControl.test.ts       | 12 +++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index e04e64907bb70..6fd0a1d66517f 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -31,11 +31,6 @@ const tooltipOpenDelay = ref(300);
 const currentBranch = computed(() => {
 	return sourceControlStore.preferences.branchName;
 });
-const featureEnabled = computed(() => window.localStorage.getItem('source-control'));
-// TODO: use this for release
-// const featureEnabled = computed(
-// 	() => sourceControlStore.preferences.connected && sourceControlStore.preferences.branchName,
-// );
 const isInstanceOwner = computed(() => usersStore.isInstanceOwner);
 const setupButtonTooltipPlacement = computed(() => (props.isCollapsed ? 'right' : 'top'));
 
@@ -125,11 +120,11 @@ const goToSourceControlSetup = async () => {
 
 <template>
 	<div
-		v-if="featureEnabled && isInstanceOwner"
+		v-if="sourceControlStore.isEnterpriseSourceControlEnabled && isInstanceOwner"
 		:class="{
 			[$style.sync]: true,
 			[$style.collapsed]: isCollapsed,
-			[$style.isConnected]: featureEnabled,
+			[$style.isConnected]: sourceControlStore.isEnterpriseSourceControlEnabled,
 		}"
 		:style="{ borderLeftColor: sourceControlStore.preferences.branchColor }"
 		data-test-id="main-sidebar-source-control"
diff --git a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
index c25b64f7c4187..e8c19daf3b3a1 100644
--- a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
@@ -31,10 +31,7 @@ const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) => {
 };
 
 describe('MainSidebarSourceControl', () => {
-	const getItemSpy = vi.spyOn(Storage.prototype, 'getItem');
-
 	beforeEach(() => {
-		getItemSpy.mockReturnValue('true');
 		pinia = createTestingPinia({
 			initialState: {
 				[STORES.SETTINGS]: {
@@ -44,20 +41,21 @@ describe('MainSidebarSourceControl', () => {
 		});
 
 		usersStore = useUsersStore(pinia);
-
 		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(true);
 
 		sourceControlStore = useSourceControlStore();
+		vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
+
 		uiStore = useUIStore();
 	});
 
-	it('should render nothing', async () => {
-		getItemSpy.mockReturnValue(null);
+	it('should render nothing when not instance owner', async () => {
+		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(false);
 		const { container } = renderComponent({ props: { isCollapsed: false } });
 		expect(container).toBeEmptyDOMElement();
 	});
 
-	it('should render empty content', async () => {
+	it('should render empty content when instance owner but not connected', async () => {
 		const { getByTestId } = renderComponent({ props: { isCollapsed: false } });
 		expect(getByTestId('main-sidebar-source-control')).toBeInTheDocument();
 		expect(getByTestId('main-sidebar-source-control')).toBeEmptyDOMElement();

From d01fc0c468f127a7f51cc47cd589b9e9ae25a75a Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 28 Jul 2023 10:51:07 +0300
Subject: [PATCH 072/116] feat(editor): Migrate Design System and Editor UI to
 Vue 3 (#6476)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: remove vue-fragment (no-changelog)

* feat: partial design-system migration

* feat: migrate info-accordion and info-tip components

* feat: migrate several components to vue 3

* feat: migrated several components

* feat: migrate several components

* feat: migrate several components

* feat: migrate several components

* feat: re-exported all design system components

* fix: fix design for popper components

* fix: editor kind of working, lots of issues to fix

* fix: fix several vue 3 migration issues

* fix: replace @change with @update:modelValue in several places

* fix: fix translation linking

* fix: fix inline-edit input

* fix: fix ndv and dialog design

* fix: update parameter input event bindings

* fix: rename deprecated lifecycle methods

* fix: fix json view mapping

* build: update lock file

* fix(editor): revisit last conflict with master and fix issues

* fix(editor): revisit last conflict with master and fix issues

* fix: fix expression editor bug causing code mirror to no longer be reactive

* fix: fix resource locator bug

* fix: fix vue-agile integration

* fix: remove global import for vue-agile

* fix: replace element-plus buttons with n8n-buttons everywhere

* fix(editor): Fix various element-plus styles (#6571)

* fix(editor): Fix various element-plus styles

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Remove debugging code

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Address PR comments

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix(editor): Fix loading in production mode [Vue 3] (#6578)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix(editor): First round of e2e tests fixes with Vue 3 (#6579)

* fix(editor): Fix broken smoke and workflow list e2e tests
* ✔️ Fix failing canvas action tests. Updating some selectors used in credentials and workflow tests

* feat: add vue 3 eslint rules and fix issues

* fix: fix tags-dropdown

* fix: fix white-space issues caused by i18n-t

* fix: rename non-generic click events

* fix: fix search in resources list layout

* fix: fix datatable paginator

* fix: fix popper select caret and dropdown size

* fix: add width to action-dropdown

* fix: fix workflow settings icon not being hidden

* fix: refactor newly added code

* fix: fix merge issue

* fix: fix ndv credentials watcher

* fix: fix workflow saving and grabber notch

* fix: fix nodes list panel transition

* fix: fix node title visibility

* fix: fix data unpinning

* fix: fix value access

* fix: show  input panel only if trigger panel enabled or not trigger node

* fix: fix tags dropdown and executions status spcing

* fix(editor): Prevent execution list to load back when leaving the route (#6697)

fix(editor): prevent execution list to load back when leaving the route

* fix: fix drawer visibility

* fix: fix expression toggle padding

* fix: fix expressions editor styling

* chore: prepare for testing

* fix: fix styling for el-button without patching

* test: fix unit tests in design-system

* test: fix most unit tests

* fix: remove import cycle.

* fix: fix personalization modal tests

* fix further resource mapper test adjustments

* fix: fix multiple tests and n8n-route attr duplication

* fix: fix source control tets

* fix: fixed remaining unit tests

* fix: fix workflows and credentials e2e tests

* fix: fix localizeNodeNames

* fix: update ndv e2e tests

* fix: fix popper left placement arrow

* fix: fix 5-ndv e2e tests

* fix: fix 6-code-node e2e tests

* fix(editor): Drop click outside directive from NodeCreator (#6716)

* fix(editor): Drop click outside directive from NodeCreator

* fix(editor): make sure mouseup outside is unbound at least before the component is unmounted

* fix: fix 10-settings-log-streaming e2e tests

* fix: fix node redrawing

* fix: fix tooltip buttons styling

* fix: fix varous e2e suites

* fix: fix 15-scheduler-node e2e suite

* fix: fix route watcher

* fix: fixed param name update and credential edit

* feat: update event names

* refactor: Remove deprecated `$data` (#6576)

Co-authored-by: Alex Grozav <alex@grozav.com>

* fix: fix 17-sharing e2e suite

* fix: fix tags dropdown

* fix: fix tags manager

* fix(editor): move :deep selectors to a separate scoped style block

* fix: fix sticky component and inline text edit

* fix: update e2e tests

* fix: remove button override references

* fix(editor): Adjust spacing in templates for Vue 3 (#6744)

* fix(editor): Adjust spacing in templates

* fix: Undo unneeded change

* fix: Undo unneeded change

* fix(editor): Adjust NDV height for Vue 3 (#6742)

fix(editor): Adjust NDV height

* fix(editor): Restore collapsed sidebar items for Vue 3 (#6743)

fix(editor): Restore collapsed sidebar items

* fix: fix linting issues

* fix: fix design-system deps

* fix: post-merge fixes

* fix: update tests

* fix: increase timeout for executionslist tets

* chore: fix linting issue

* fix: fix 14-mapping e2e tests in ci

* fix: re-enable tests

* fix: fix workflow duplication e2e tests after tags update

* fix(editor): Change component prop to be typed

* fix: fix tags dropdown in duplicate wf modal

* fix: fix focus behaviour in tags selector

* fix: fix tag creation

* fix: fix log streaming e2e race condition

* fix(editor): Fix Vue 3 linting issues (#6748)

* fix(editor): Fix Vue 3 linting issues

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix MainSidebar linter issues

* revert pnpm lock

* update pnpm lock file

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* fix(editor): Some css fixes for vue3 branch (#6749)

* ✨ Fixing filter button height

* ✨ Update input modal button position

* ✨ Updating tags styling

* ✨ Fix event logging settings spacing

* 👕 Fixing lint errors

* fix: fix linting issues

* Revert to `// eslint-disable-next-line @typescript-eslint/no-misused-promises` disabling of mixins init

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix: fix css issue

* fix(editor): Lint fix

* fix(editor): Fix settings initialisation (#6750)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix: fix initial settings loading

* fix: replace realClick with click force

* fix: fix randomly failing mapping e2e tests

* fix(editor): Fix menu item event handling

* fix: fix resource filters dropdown events (#6752)

* fix: fix resource filters dropdown events

* fix: remove teleported:false

* fix: fix event selection event naming (#6753)

* fix: removed console.log (#6754)

* fix: rever await nextTick changes

* fix: redo linting changes

* fix(editor): Redraw node connections if adding more than one node to canvas (#6755)

* fix(editor): Redraw node connections if adding more than one node to canvas

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Update position before connection two nodes

* Lint fix

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* fix(editor): Fix `ResourceMapper` unit tests (#6758)

* ✔️ Fix matching columns test

* ✔️ Fix multiple matching columns test

* ✔️ Removing `skip` from the last test

* fix: Allow pasting a big workflow (#6760)

* fix: pasting a big workflow

* chore: update comment

* refactor: move try/catch to function

* refactor: move try/catch to function

* fix(editor): Fix modal layer width

* fix: fix position changes

* fix: undo it.only

* fix: make undo/redo multiple steps more verbose

* fix: Fix value survey styles (#6764)

* fix: fix value survey styles

* fix: lint

* Revert "fix: lint"

72869c431f1448861df021be041b61c62f1e3118

* fix: lint

* fix(editor): Fix collapsed sub menu

* fix: Fix drawer animation (#6767)

fix: drawer animation

* fix(editor): Fix source control buttons (#6769)

* fix(editor): Fix App loading & auth  (#6768)

* fix(editor): Fix App loading & auth

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Await promises

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Fix eslint error

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Csaba Tuncsik <csaba@n8n.io>
Co-authored-by: OlegIvaniv <me@olegivaniv.com>
Co-authored-by: Milorad FIlipović <milorad@n8n.io>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
---
 cypress/e2e/10-settings-log-streaming.cy.ts   |   51 +-
 cypress/e2e/10-undo-redo.cy.ts                |   29 +-
 cypress/e2e/12-canvas-actions.cy.ts           |    1 -
 cypress/e2e/12-canvas.cy.ts                   |    2 +-
 .../14-data-transformation-expressions.cy.ts  |   16 +-
 cypress/e2e/14-mapping.cy.ts                  |   15 +-
 cypress/e2e/15-scheduler-node.cy.ts           |    7 +-
 cypress/e2e/16-webhook-node.cy.ts             |   52 +-
 cypress/e2e/17-sharing.cy.ts                  |   16 +-
 cypress/e2e/17-workflow-tags.cy.ts            |   15 +-
 cypress/e2e/18-user-management.cy.ts          |   12 +-
 cypress/e2e/2-credentials.cy.ts               |   69 +-
 cypress/e2e/21-community-nodes.cy.ts          |   26 +-
 cypress/e2e/24-ndv-paired-item.cy.ts          |  184 +-
 cypress/e2e/25-stickies.cy.ts                 |  109 +-
 cypress/e2e/26-resource-locator.cy.ts         |    3 +-
 cypress/e2e/4-node-creator.cy.ts              |  121 +-
 cypress/e2e/5-ndv.cy.ts                       |   12 +-
 cypress/e2e/7-workflow-actions.cy.ts          |   92 +-
 cypress/pages/credentials.ts                  |    6 +-
 cypress/pages/modals/credentials-modal.ts     |    4 +-
 cypress/pages/modals/message-box.ts           |    8 +-
 cypress/pages/ndv.ts                          |   10 +-
 cypress/pages/settings-log-streaming.ts       |    5 +-
 cypress/pages/settings-personal.ts            |    7 +-
 cypress/pages/settings-users.ts               |   16 +-
 cypress/pages/variables.ts                    |    2 +-
 cypress/pages/workflow.ts                     |   50 +-
 cypress/pages/workflows.ts                    |    2 +-
 cypress/support/commands.ts                   |    4 +-
 cypress/support/e2e.ts                        |    4 +
 cypress/utils/index.ts                        |    1 +
 cypress/utils/modal.ts                        |    3 +
 cypress/utils/popper.ts                       |   11 +
 package.json                                  |    3 -
 packages/@n8n_io/eslint-config/frontend.js    |    8 +-
 .../.storybook/font-awesome-icons.js          |    8 -
 packages/design-system/.storybook/main.js     |   83 +-
 packages/design-system/.storybook/preview.js  |   27 +-
 .../design-system/.storybook/storybook.scss   |   15 +-
 packages/design-system/package.json           |   43 +-
 .../assets/images/storybook-logo-dark.png     |  Bin 0 -> 8215 bytes
 .../assets/images/storybook-logo-light.png    |  Bin 0 -> 3812 bytes
 packages/design-system/src/__tests__/setup.ts |    4 +
 .../N8nActionBox/ActionBox.stories.ts         |    7 +-
 .../src/components/N8nActionBox/ActionBox.vue |    2 +-
 .../N8nActionBox/__tests__/ActionBox.spec.ts  |    4 +-
 .../__snapshots__/ActionBox.spec.ts.snap      |   12 +-
 .../ActionDropdown.stories.ts                 |    9 +-
 .../N8nActionDropdown/ActionDropdown.vue      |   21 +-
 .../__tests__/ActionDropdown.spec.ts          |   10 +-
 .../__snapshots__/ActionDropdown.spec.ts.snap |   14 +-
 .../N8nActionToggle/ActionToggle.stories.ts   |    8 +-
 .../N8nActionToggle/ActionToggle.vue          |    9 +-
 .../src/components/N8nAlert/Alert.stories.ts  |   10 +-
 .../N8nAlert/__tests__/Alert.spec.ts          |   25 +-
 .../components/N8nAvatar/Avatar.stories.ts    |    8 +-
 .../src/components/N8nAvatar/Avatar.vue       |   10 +-
 .../src/components/N8nBadge/Badge.stories.ts  |    5 +-
 .../N8nBadge/__tests__/Badge.spec.ts          |   12 +-
 .../__snapshots__/Badge.spec.ts.snap          |    6 +-
 .../components/N8nBlockUi/BlockUi.stories.ts  |    5 +-
 .../src/components/N8nBlockUi/BlockUi.vue     |    2 +-
 .../src/components/N8nButton/Button.scss      |   81 +
 .../components/N8nButton/Button.stories.ts    |   55 +-
 .../src/components/N8nButton/Button.vue       |  242 +-
 .../N8nButton/__tests__/Button.spec.ts        |   70 +-
 .../__snapshots__/Button.spec.ts.snap         |   22 +-
 .../N8nButton/overrides/ElButton.ts           |    3 -
 .../N8nButton/overrides/ElButton.vue          |   51 -
 .../components/N8nButton/overrides/index.ts   |    1 -
 .../components/N8nCallout/Callout.stories.ts  |   11 +-
 .../N8nCallout/__tests__/Callout.spec.ts      |   28 +-
 .../__snapshots__/Callout.spec.ts.snap        |   58 +-
 .../src/components/N8nCard/Card.stories.ts    |   19 +-
 .../src/components/N8nCard/Card.vue           |    4 +-
 .../__tests__/__snapshots__/Card.spec.ts.snap |   12 +-
 .../N8nCheckbox/Checkbox.stories.ts           |    8 +-
 .../src/components/N8nCheckbox/Checkbox.vue   |   12 +-
 .../__snapshots__/Checkbox.spec.ts.snap       |   82 +-
 .../N8nColorPicker/ColorPicker.stories.ts     |    7 +-
 .../components/N8nColorPicker/ColorPicker.vue |   22 +-
 .../__tests__/ColorPicker.spec.ts             |   13 +-
 .../__snapshots__/ColorPicker.spec.ts.snap    |  314 +-
 .../N8nDatatable/Datatable.stories.ts         |    5 +-
 .../src/components/N8nDatatable/Datatable.vue |    8 +-
 .../N8nDatatable/__tests__/Datatable.spec.ts  |   22 +-
 .../__snapshots__/Datatable.spec.ts.snap      |  128 +-
 .../components/N8nFormBox/FormBox.stories.ts  |    7 +-
 .../src/components/N8nFormBox/FormBox.vue     |    6 +-
 .../N8nFormInput/FormInput.stories.ts         |    7 +-
 .../src/components/N8nFormInput/FormInput.vue |   37 +-
 .../N8nFormInputs/FormInputs.stories.ts       |    7 +-
 .../components/N8nFormInputs/FormInputs.vue   |   24 +-
 .../components/N8nHeading/Heading.stories.ts  |    9 +-
 .../src/components/N8nHeading/Heading.vue     |    2 +-
 .../src/components/N8nIcon/Icon.stories.ts    |    7 +-
 .../src/components/N8nIcon/Icon.vue           |    2 +-
 .../N8nIconButton/IconButton.stories.ts       |   10 +-
 .../components/N8nIconButton/IconButton.vue   |    2 +-
 .../N8nInfoAccordion/InfoAccordion.stories.ts |    5 +-
 .../N8nInfoAccordion/InfoAccordion.vue        |   10 +-
 .../components/N8nInfoTip/InfoTip.stories.ts  |    5 +-
 .../N8nInfoTip/__tests__/InfoTip.spec.ts      |    8 +-
 .../__snapshots__/InfoTip.spec.ts.snap        |    4 +-
 .../src/components/N8nInput/Input.stories.ts  |   16 +-
 .../src/components/N8nInput/Input.vue         |   30 +-
 .../N8nInput/__tests__/Input.spec.ts          |    6 +-
 .../__snapshots__/Input.spec.ts.snap          |   14 +-
 .../N8nInputLabel/InputLabel.stories.ts       |   10 +-
 .../components/N8nInputLabel/InputLabel.vue   |    2 +-
 .../N8nInputNumber/InputNumber.stories.ts     |   11 +-
 .../components/N8nInputNumber/InputNumber.vue |   18 +-
 .../src/components/N8nLink/Link.stories.ts    |    7 +-
 .../src/components/N8nLink/Link.vue           |    2 +-
 .../components/N8nLoading/Loading.stories.ts  |    9 +-
 .../src/components/N8nLoading/Loading.vue     |    7 +-
 .../N8nMarkdown/Markdown.stories.ts           |    9 +-
 .../src/components/N8nMenu/Menu.stories.ts    |   11 +-
 .../src/components/N8nMenu/Menu.vue           |   43 +-
 .../N8nMenuItem/MenuItem.stories.ts           |    7 +-
 .../src/components/N8nMenuItem/MenuItem.vue   |   98 +-
 .../NodeCreatorNode.stories.ts                |   14 +-
 .../N8nNodeCreatorNode/NodeCreatorNode.vue    |    1 -
 .../N8nNodeIcon/NodeIcon.stories.ts           |    5 +-
 .../src/components/N8nNodeIcon/NodeIcon.vue   |    2 +-
 .../components/N8nNotice/Notice.stories.ts    |    8 +-
 .../N8nNotice/__tests__/Notice.spec.ts        |   19 +-
 .../__snapshots__/Notice.spec.ts.snap         |   18 +-
 .../src/components/N8nOption/Option.vue       |   17 +-
 .../N8nPagination/Pagination.stories.ts       |   20 +-
 .../components/N8nPagination/Pagination.vue   |   12 +-
 .../components/N8nPopover/Popover.stories.ts  |   13 +-
 .../src/components/N8nPopover/Popover.vue     |   23 +-
 .../src/components/N8nPulse/Pulse.stories.ts  |    2 +-
 .../N8nRadioButtons/RadioButton.vue           |    3 -
 .../N8nRadioButtons/RadioButtons.stories.ts   |    7 +-
 .../N8nRadioButtons/RadioButtons.vue          |    8 +-
 .../RecycleScroller.stories.ts                |    7 +-
 .../N8nRecycleScroller/RecycleScroller.vue    |    4 +-
 .../__tests__/RecycleScroller.spec.ts         |    2 +-
 .../N8nResizeWrapper/ResizeWrapper.stories.js |   33 +-
 .../src/components/N8nRoute/Route.vue         |   14 +-
 .../components/N8nSelect/Select.stories.ts    |   18 +-
 .../src/components/N8nSelect/Select.vue       |   31 +-
 .../N8nSelect/__tests__/Select.spec.ts        |   24 +-
 .../__snapshots__/Select.spec.ts.snap         |   50 +-
 .../components/N8nSpinner/Spinner.stories.ts  |    9 +-
 .../components/N8nSticky/Sticky.stories.ts    |    7 +-
 .../src/components/N8nSticky/Sticky.vue       |   74 +-
 .../src/components/N8nTabs/Tabs.stories.ts    |    7 +-
 .../src/components/N8nTabs/Tabs.vue           |   11 +-
 .../src/components/N8nTag/Tag.stories.ts      |    5 +-
 .../src/components/N8nTag/Tag.vue             |    2 +-
 .../src/components/N8nTags/Tags.stories.ts    |    5 +-
 .../src/components/N8nTags/Tags.vue           |    2 +-
 .../src/components/N8nText/Text.stories.ts    |   25 +-
 .../src/components/N8nText/Text.vue           |    2 +-
 .../components/N8nTooltip/Tooltip.stories.ts  |   31 +-
 .../src/components/N8nTooltip/Tooltip.vue     |   23 +-
 .../src/components/N8nTree/Tree.stories.ts    |    5 +-
 .../src/components/N8nTree/Tree.vue           |   18 +-
 .../N8nUserInfo/UserInfo.stories.ts           |    5 +-
 .../N8nUserSelect/UserSelect.stories.ts       |    5 +-
 .../components/N8nUserSelect/UserSelect.vue   |   11 +-
 .../N8nUsersList/UsersList.stories.ts         |    5 +-
 .../ResizeObserver/ResizeObserver.vue         |    2 +-
 .../design-system/src/components/index.ts     |    9 +-
 packages/design-system/src/css/alert.scss     |    2 +-
 packages/design-system/src/css/carousel.scss  |    4 +-
 packages/design-system/src/css/checkbox.scss  |    2 +-
 .../design-system/src/css/color-picker.scss   |    9 +-
 .../design-system/src/css/common/popup.scss   |    4 +-
 .../src/css/common/transition.scss            |   20 +-
 packages/design-system/src/css/dialog.scss    |   32 +
 packages/design-system/src/css/drawer.scss    |  348 +-
 packages/design-system/src/css/dropdown.scss  |    9 +-
 packages/design-system/src/css/icon.scss      |   18 +
 packages/design-system/src/css/index.scss     |    1 +
 packages/design-system/src/css/loading.scss   |    2 +-
 packages/design-system/src/css/menu.scss      |   49 +-
 .../design-system/src/css/message-box.scss    |   22 +-
 packages/design-system/src/css/message.scss   |    2 +-
 .../design-system/src/css/notification.scss   |   10 +-
 .../design-system/src/css/pagination.scss     |  248 +-
 packages/design-system/src/css/popper.scss    |   99 +-
 packages/design-system/src/css/select.scss    |    8 +-
 packages/design-system/src/css/switch.scss    |    2 +-
 packages/design-system/src/css/tabs.scss      |    8 +-
 packages/design-system/src/css/tag.scss       |    8 +-
 packages/design-system/src/css/tooltip.scss   |   36 +-
 .../src/locale/{format.js => format.ts}       |   32 +-
 packages/design-system/src/locale/index.js    |   42 -
 packages/design-system/src/locale/index.ts    |   51 +
 .../src/locale/lang/{en.js => en.ts}          |   14 +-
 packages/design-system/src/plugin.ts          |   34 +-
 .../src/shims-vue2-boring-avatars.d.ts        |    1 -
 .../src/styleguide/ColorCircles.vue           |    7 +-
 .../design-system/src/styleguide/Sizes.vue    |    7 +-
 .../src/styleguide/VariableTable.vue          |    7 +-
 .../src/styleguide/utilities/lists.stories.ts |    2 +-
 .../styleguide/utilities/spacing.stories.ts   |    5 +-
 packages/design-system/src/types/i18n.ts      |    3 +
 packages/design-system/src/types/index.ts     |    1 +
 packages/design-system/src/types/menu.ts      |    4 +-
 .../design-system/theme/preview/index.html    |    9 +-
 packages/design-system/vite.config.ts         |    4 +-
 packages/editor-ui/package.json               |   21 +-
 packages/editor-ui/src/App.vue                |   51 +-
 packages/editor-ui/src/__tests__/render.ts    |   86 +
 packages/editor-ui/src/__tests__/setup.ts     |   21 -
 packages/editor-ui/src/__tests__/utils.ts     |    8 -
 .../editor-ui/src/components/AboutModal.vue   |    4 +-
 .../src/components/ActivationModal.vue        |    4 +-
 .../editor-ui/src/components/AskAiModal.vue   |    2 +-
 packages/editor-ui/src/components/Banner.vue  |    2 +-
 .../src/components/BreakpointsObserver.vue    |   30 +-
 .../src/components/ChangePasswordModal.vue    |    4 +-
 .../CodeNodeEditor/CodeNodeEditor.vue         |   12 +-
 .../components/CodeNodeEditor/completer.ts    |    5 +-
 .../completions/base.completions.ts           |    5 +-
 .../completions/execution.completions.ts      |    5 +-
 .../completions/itemField.completions.ts      |    5 +-
 .../completions/itemIndex.completions.ts      |    5 +-
 .../completions/jsonField.completions.ts      |    5 +-
 .../completions/luxon.completions.ts          |    5 +-
 .../CodeNodeEditor/completions/package.json   |    6 +
 .../completions/prevNode.completions.ts       |    5 +-
 .../completions/require.completions.ts        |    5 +-
 .../completions/variables.completions.ts      |    5 +-
 .../completions/workflow.completions.ts       |    5 +-
 .../src/components/CodeNodeEditor/linter.ts   |    6 +-
 .../src/components/CodeNodeEditor/types.ts    |    5 +-
 .../src/components/CollectionCard.vue         |    7 +-
 .../src/components/CollectionParameter.vue    |   29 +-
 .../src/components/CollectionWorkflowCard.vue |    2 +-
 .../src/components/CollectionsCarousel.vue    |   23 +-
 .../CommunityPackageInstallModal.vue          |    5 +-
 .../CommunityPackageManageConfirmModal.vue    |    6 +-
 .../src/components/ContactPromptModal.vue     |    2 +-
 .../editor-ui/src/components/CopyInput.vue    |    5 +-
 .../src/components/CredentialCard.vue         |    2 +-
 .../CredentialEdit/AuthTypeSelector.vue       |    4 +-
 .../CredentialEdit/CredentialConfig.vue       |    4 +-
 .../CredentialEdit/CredentialEdit.vue         |    9 +-
 .../CredentialEdit/CredentialInfo.vue         |    4 +-
 .../CredentialEdit/CredentialInputs.vue       |    4 +-
 .../CredentialEdit/CredentialSharing.ee.vue   |    6 +-
 .../src/components/CredentialsSelect.vue      |    4 +-
 .../src/components/CredentialsSelectModal.vue |    6 +-
 .../src/components/DeleteUserModal.vue        |   22 +-
 .../editor-ui/src/components/Draggable.vue    |    6 -
 .../src/components/DraggableTarget.vue        |    2 +-
 .../components/DuplicateWorkflowDialog.vue    |   11 +-
 .../src/components/ExecutionFilter.vue        |  345 +-
 .../src/components/ExecutionTime.vue          |    2 +-
 .../src/components/ExecutionsList.vue         |  145 +-
 .../src/components/ExecutionsModal.vue        |    2 +-
 .../src/components/ExecutionsUsage.vue        |    4 +-
 .../ExecutionsView/ExecutionCard.vue          |    1 +
 .../ExecutionsView/ExecutionPreview.vue       |    5 +-
 .../ExecutionsInfoAccordion.vue               |    2 +-
 .../ExecutionsView/ExecutionsList.vue         |   20 +-
 .../ExecutionsView/ExecutionsSidebar.vue      |   12 +-
 .../ExpandableInput/ExpandableInputBase.vue   |   25 +-
 .../ExpandableInput/ExpandableInputEdit.vue   |   12 +-
 .../ExpandableInputPreview.vue                |   18 +-
 .../src/components/ExpressionEdit.vue         |   74 +-
 .../ExpressionEditorModalInput.vue            |    9 +-
 .../ExpressionEditorModalOutput.vue           |    2 +-
 .../components/ExpressionParameterInput.vue   |   17 +-
 .../src/components/FeatureComingSoon.vue      |    6 +-
 .../components/FixedCollectionParameter.vue   |   38 +-
 .../src/components/HoverableNodeIcon.vue      |    2 +-
 .../src/components/HtmlEditor/HtmlEditor.vue  |   13 +-
 .../src/components/ImportCurlModal.vue        |    6 +-
 .../InlineExpressionEditorInput.vue           |   14 +-
 .../InlineExpressionEditorOutput.vue          |   27 +-
 .../src/components/InlineNameEdit.vue         |   18 +-
 .../src/components/InlineTextEdit.vue         |   34 +-
 .../editor-ui/src/components/InputPanel.vue   |   12 +-
 .../src/components/IntersectionObserved.vue   |    9 +-
 .../src/components/IntersectionObserver.vue   |    4 +-
 .../src/components/InviteUsersModal.vue       |    4 +-
 .../src/components/MainHeader/MainHeader.vue  |    4 +-
 .../src/components/MainHeader/TabBar.vue      |    2 +-
 .../components/MainHeader/WorkflowDetails.vue |  180 +-
 .../editor-ui/src/components/MainSidebar.vue  |   51 +-
 .../components/MainSidebarSourceControl.vue   |   24 +-
 packages/editor-ui/src/components/Modal.vue   |   25 +-
 .../editor-ui/src/components/ModalDrawer.vue  |   21 +-
 .../src/components/MultipleParameter.vue      |   53 +-
 .../src/components/NDVDraggablePanels.vue     |    2 +-
 packages/editor-ui/src/components/Node.vue    |   50 +-
 .../src/components/Node/NodeCreation.vue      |   21 +-
 .../NodeCreator/ItemTypes/CategoryItem.vue    |    2 +-
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |   19 +-
 .../NodeCreator/ItemTypes/SubcategoryItem.vue |    7 +-
 .../Node/NodeCreator/Modes/ActionsMode.vue    |  105 +-
 .../Node/NodeCreator/Modes/NodesMode.vue      |   16 +-
 .../Node/NodeCreator/NodeCreator.vue          |   31 +-
 .../Node/NodeCreator/Panel/NodesListPanel.vue |   26 +-
 .../Node/NodeCreator/Panel/SearchBar.vue      |   18 +-
 .../Renderers/CategorizedItemsRenderer.vue    |    2 +-
 .../NodeCreator/Renderers/ItemsRenderer.vue   |    4 +-
 .../__tests__/CategoryItem.test.ts            |   17 +-
 .../__tests__/ItemsRenderer.test.ts           |   44 +-
 .../__tests__/NodesListPanel.test.ts          |  115 +-
 .../__tests__/useKeyboardNavigation.test.ts   |   18 +-
 .../composables/useKeyboardNavigation.ts      |    4 +-
 .../NodeCreator/composables/useViewStacks.ts  |    7 +-
 .../components/Node/NodeCreator/viewsData.ts  |   45 +-
 .../src/components/NodeCredentials.vue        |    8 +-
 .../src/components/NodeDetailsView.vue        |   29 +-
 .../src/components/NodeExecuteButton.vue      |    3 +
 .../editor-ui/src/components/NodeSettings.vue |   31 +-
 .../src/components/NodeSettingsTabs.vue       |   12 +-
 .../editor-ui/src/components/NodeTitle.vue    |   24 +-
 .../components/OnboardingCallSignupModal.vue  |    4 +-
 .../editor-ui/src/components/OutputPanel.vue  |   20 +-
 .../editor-ui/src/components/PageAlert.vue    |    6 +-
 .../src/components/ParameterInput.vue         |  228 +-
 .../src/components/ParameterInputExpanded.vue |   70 +-
 .../src/components/ParameterInputFull.vue     |  117 +-
 .../src/components/ParameterInputList.vue     |   51 +-
 .../src/components/ParameterInputWrapper.vue  |   36 +-
 .../src/components/ParameterOptions.vue       |   18 +-
 .../src/components/PersonalizationModal.vue   |   13 +-
 .../ResourceLocator/ResourceLocator.vue       |   86 +-
 .../ResourceLocatorDropdown.vue               |   24 +-
 .../ResourceMapper/MappingFields.vue          |   12 +-
 .../ResourceMapper/MappingModeSelect.vue      |   80 +-
 .../ResourceMapper/MatchingColumnsSelect.vue  |   24 +-
 .../ResourceMapper/ResourceMapper.vue         |    8 +-
 packages/editor-ui/src/components/RunData.vue |  161 +-
 .../editor-ui/src/components/RunDataJson.vue  |  128 +-
 .../src/components/RunDataJsonActions.vue     |   25 +-
 .../src/components/RunDataSchema.vue          |   28 +-
 .../editor-ui/src/components/RunDataTable.vue |   98 +-
 .../editor-ui/src/components/SSOLogin.vue     |   14 +-
 .../editor-ui/src/components/SaveButton.vue   |    1 -
 .../EventDestinationCard.ee.vue               |    6 +-
 .../EventDestinationSettingsModal.ee.vue      |   52 +-
 .../EventSelection.ee.vue                     |   18 +-
 .../components/SourceControlPullModal.ee.vue  |    6 +-
 .../components/SourceControlPushModal.ee.vue  |   59 +-
 .../src/components/SqlEditor/SqlEditor.vue    |   19 +-
 packages/editor-ui/src/components/Sticky.vue  |   16 +-
 .../src/components/TagsContainer.vue          |   56 +-
 .../editor-ui/src/components/TagsDropdown.vue |  375 +-
 .../components/TagsManager/TagsManager.vue    |   15 +-
 .../TagsManager/TagsView/TagsTable.vue        |   17 +-
 .../TagsManager/TagsView/TagsTableHeader.vue  |    6 +-
 .../TagsManager/TagsView/TagsView.vue         |   52 +-
 .../src/components/TemplateDetails.vue        |    7 +-
 .../src/components/TemplateFilters.vue        |    8 +-
 .../editor-ui/src/components/TemplateList.vue |    2 +-
 .../editor-ui/src/components/TextEdit.vue     |   24 +-
 .../editor-ui/src/components/TriggerPanel.vue |   11 +-
 .../editor-ui/src/components/UpdatesPanel.vue |   24 +-
 .../editor-ui/src/components/ValueSurvey.vue  |   51 +-
 .../editor-ui/src/components/VariablesRow.vue |   13 +-
 .../editor-ui/src/components/VersionCard.vue  |   22 +-
 .../src/components/WorkflowActivator.vue      |   13 +-
 .../editor-ui/src/components/WorkflowCard.vue |    3 +-
 .../src/components/WorkflowPreview.vue        |    2 +-
 .../src/components/WorkflowSettings.vue       |   69 +-
 .../src/components/WorkflowShareModal.ee.vue  |   15 +-
 .../components/__tests__/BannersStack.test.ts |   94 +-
 .../components/__tests__/CopyInput.test.ts    |    8 +-
 .../__tests__/ExecutionFilter.test.ts         |  110 +-
 .../__tests__/ExecutionsList.test.ts          |  146 +-
 .../MainSidebarSourceControl.test.ts          |   41 +-
 .../__tests__/PersonalizationModal.spec.ts    |   62 +-
 .../__tests__/ResourceMapper.test.ts          |  213 +-
 .../src/components/__tests__/RunData.test.ts  |  227 +-
 .../components/__tests__/RunDataJson.test.ts  |   76 +-
 .../__tests__/RunDataSchema.test.ts           |  110 +-
 .../components/__tests__/SQLEditor.test.ts    |   56 +-
 .../src/components/__tests__/SSOLogin.test.ts |   30 +-
 .../components/__tests__/VariablesRow.spec.ts |   47 +-
 .../PersonalizationModal.spec.ts.snap         |  284 --
 .../__snapshots__/RunDataJson.test.ts.snap    | 1373 +++---
 .../__snapshots__/RunDataSchema.test.ts.snap  |  408 +-
 .../__snapshots__/VariablesRow.spec.ts.snap   |   78 -
 .../__tests__/utils/ResourceMapper.utils.ts   |    1 +
 .../forms/ResourceFiltersDropdown.vue         |   35 +-
 .../forms/ResourceOwnershipSelect.ee.vue      |   16 +-
 .../layouts/ResourcesListLayout.vue           |  101 +-
 .../transitions/SlideTransition.vue           |    2 +-
 .../__tests__/useHistoryHelper.test.ts        |    2 +-
 .../src/composables/useCanvasMouseSelect.ts   |    1 +
 .../src/composables/useGlobalLinkActions.ts   |    5 +-
 packages/editor-ui/src/composables/useI18n.ts |   16 +-
 .../src/composables/useLoadingService.ts      |    5 +-
 .../editor-ui/src/composables/useMessage.ts   |    6 +-
 .../editor-ui/src/composables/useToast.ts     |   22 +-
 packages/editor-ui/src/constants.ts           |    3 +
 .../src/declarations/vue-json-pretty.d.ts     |    5 -
 .../src/event-bus/code-node-editor.ts         |    2 +-
 .../editor-ui/src/event-bus/data-pinning.ts   |    2 +-
 .../editor-ui/src/event-bus/html-editor.ts    |    2 +-
 .../editor-ui/src/event-bus/link-actions.ts   |    2 +-
 packages/editor-ui/src/event-bus/node-view.ts |    2 +-
 packages/editor-ui/src/main.ts                |   31 +-
 packages/editor-ui/src/mixins/copyPaste.ts    |    2 +-
 .../editor-ui/src/mixins/expressionManager.ts |   11 +-
 packages/editor-ui/src/mixins/pinData.ts      |    6 +-
 packages/editor-ui/src/mixins/userHelpers.ts  |    6 +-
 .../editor-ui/src/mixins/workflowHelpers.ts   |    6 +-
 packages/editor-ui/src/models/history.ts      |    2 +-
 packages/editor-ui/src/n8n-theme.scss         |   29 +-
 packages/editor-ui/src/plugins/components.ts  |   31 +-
 packages/editor-ui/src/plugins/directives.ts  |   13 +-
 packages/editor-ui/src/plugins/i18n/index.ts  |   91 +-
 .../src/plugins/i18n/locales/en.json          |   66 +-
 packages/editor-ui/src/plugins/icons/index.ts |    4 +-
 .../editor-ui/src/plugins/telemetry/index.ts  |   23 +-
 .../src/plugins/telemetry/telemetry.types.ts  |   10 +-
 packages/editor-ui/src/router.ts              |   50 +-
 packages/editor-ui/src/shims-vue.d.ts         |   25 +-
 packages/editor-ui/src/shims.d.ts             |    4 +-
 .../src/stores/logStreaming.store.ts          |   21 +-
 .../editor-ui/src/stores/n8nRoot.store.ts     |   10 -
 .../editor-ui/src/stores/nodeTypes.store.ts   |    9 +
 .../src/stores/sourceControl.store.ts         |    4 +-
 packages/editor-ui/src/stores/ui.store.ts     |    2 +-
 .../editor-ui/src/stores/workflows.store.ts   |    9 +-
 .../src/utils/__tests__/userUtils.test.ts     |   27 +-
 packages/editor-ui/src/views/AuthView.vue     |    6 +-
 .../editor-ui/src/views/CanvasAddButton.vue   |    3 +-
 .../src/views/ChangePasswordView.vue          |    2 +-
 .../editor-ui/src/views/CredentialsView.vue   |    7 +-
 packages/editor-ui/src/views/NodeView.vue     |  210 +-
 .../editor-ui/src/views/SamlOnboarding.vue    |    4 +-
 .../editor-ui/src/views/SettingsApiView.vue   |    9 +-
 .../editor-ui/src/views/SettingsAuditLogs.vue |    4 +-
 .../src/views/SettingsCommunityNodesView.vue  |   11 +-
 .../editor-ui/src/views/SettingsLdapView.vue  |   25 +-
 .../src/views/SettingsLogStreamingView.vue    |   39 +-
 .../src/views/SettingsPersonalView.vue        |   31 +-
 .../src/views/SettingsSourceControl.vue       |   20 +-
 packages/editor-ui/src/views/SettingsSso.vue  |    4 +-
 .../src/views/SettingsUsageAndPlan.vue        |   72 +-
 .../editor-ui/src/views/SettingsUsersView.vue |    2 +-
 .../src/views/TemplatesSearchView.vue         |    5 +-
 .../editor-ui/src/views/VariablesView.vue     |   65 +-
 .../editor-ui/src/views/WorkflowsView.vue     |    9 +-
 .../src/views/__tests__/AuthView.test.ts      |   28 +-
 .../views/__tests__/SamlOnboarding.test.ts    |   25 +-
 .../views/__tests__/SettingsAuditLogs.test.ts |   51 +-
 .../__tests__/SettingsPersonalView.test.ts    |   77 +-
 .../__tests__/SettingsSourceControl.test.ts   |   60 +-
 .../src/views/__tests__/SettingsSso.test.ts   |   52 +-
 .../src/views/__tests__/VariablesView.spec.ts |   17 +-
 packages/editor-ui/src/vue-agile.d.ts         |    1 -
 packages/editor-ui/vite.config.ts             |   29 +-
 patches/element-ui@2.15.12.patch              |  262 --
 pnpm-lock.yaml                                | 4079 ++++++-----------
 459 files changed, 8820 insertions(+), 9918 deletions(-)
 create mode 100644 cypress/utils/index.ts
 create mode 100644 cypress/utils/modal.ts
 create mode 100644 cypress/utils/popper.ts
 delete mode 100644 packages/design-system/.storybook/font-awesome-icons.js
 create mode 100644 packages/design-system/public/assets/images/storybook-logo-dark.png
 create mode 100644 packages/design-system/public/assets/images/storybook-logo-light.png
 create mode 100644 packages/design-system/src/components/N8nButton/Button.scss
 delete mode 100644 packages/design-system/src/components/N8nButton/overrides/ElButton.ts
 delete mode 100644 packages/design-system/src/components/N8nButton/overrides/ElButton.vue
 delete mode 100644 packages/design-system/src/components/N8nButton/overrides/index.ts
 rename packages/design-system/src/locale/{format.js => format.ts} (53%)
 delete mode 100644 packages/design-system/src/locale/index.js
 create mode 100644 packages/design-system/src/locale/index.ts
 rename packages/design-system/src/locale/lang/{en.js => en.ts} (65%)
 delete mode 100644 packages/design-system/src/shims-vue2-boring-avatars.d.ts
 create mode 100644 packages/design-system/src/types/i18n.ts
 create mode 100644 packages/editor-ui/src/__tests__/render.ts
 create mode 100644 packages/editor-ui/src/components/CodeNodeEditor/completions/package.json
 delete mode 100644 packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
 delete mode 100644 packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
 delete mode 100644 packages/editor-ui/src/declarations/vue-json-pretty.d.ts
 delete mode 100644 packages/editor-ui/src/vue-agile.d.ts
 delete mode 100644 patches/element-ui@2.15.12.patch

diff --git a/cypress/e2e/10-settings-log-streaming.cy.ts b/cypress/e2e/10-settings-log-streaming.cy.ts
index 1261940df2f79..9acec76f420bc 100644
--- a/cypress/e2e/10-settings-log-streaming.cy.ts
+++ b/cypress/e2e/10-settings-log-streaming.cy.ts
@@ -1,4 +1,6 @@
 import { SettingsLogStreamingPage } from '../pages';
+import { getVisibleModalOverlay } from '../utils/modal';
+import { getVisibleDropdown } from '../utils';
 
 const settingsLogStreamingPage = new SettingsLogStreamingPage();
 
@@ -19,6 +21,7 @@ describe('Log Streaming Settings', () => {
 	});
 
 	it('should show the add destination modal', () => {
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
 		settingsLogStreamingPage.actions.clickAddFirstDestination();
 		cy.wait(100);
@@ -27,7 +30,7 @@ describe('Log Streaming Settings', () => {
 		settingsLogStreamingPage.getters.getSelectDestinationButton().should('be.visible');
 		settingsLogStreamingPage.getters.getSelectDestinationButton().should('have.attr', 'disabled');
 		settingsLogStreamingPage.getters
-			.getDestinationModalDialog()
+			.getDestinationModal()
 			.invoke('css', 'width')
 			.then((widthStr) => parseInt((widthStr as unknown as string).replace('px', '')))
 			.should('be.lessThan', 500);
@@ -36,65 +39,67 @@ describe('Log Streaming Settings', () => {
 		settingsLogStreamingPage.getters
 			.getSelectDestinationButton()
 			.should('not.have.attr', 'disabled');
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 		settingsLogStreamingPage.getters.getDestinationModal().should('not.exist');
 	});
 
 	it('should create a destination and delete it', () => {
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
+		cy.wait(1000); // Race condition with getDestinationDataFromBackend()
 		settingsLogStreamingPage.actions.clickAddFirstDestination();
 		cy.wait(100);
 		settingsLogStreamingPage.getters.getDestinationModal().should('be.visible');
 		settingsLogStreamingPage.getters.getSelectDestinationType().click();
 		settingsLogStreamingPage.getters.getSelectDestinationTypeItems().eq(0).click();
 		settingsLogStreamingPage.getters.getSelectDestinationButton().click();
-		settingsLogStreamingPage.getters.getDestinationNameInput().click()
+		settingsLogStreamingPage.getters.getDestinationNameInput().click();
 
-		settingsLogStreamingPage.getters.getDestinationNameInput().find('input').clear().type('Destination 0');
+		settingsLogStreamingPage.getters
+			.getDestinationNameInput()
+			.find('input')
+			.clear()
+			.type('Destination 0');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().click();
 		cy.wait(100);
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 		cy.reload();
 		settingsLogStreamingPage.getters.getDestinationCards().eq(0).click();
 		settingsLogStreamingPage.getters.getDestinationDeleteButton().should('be.visible').click();
 		cy.get('.el-message-box').should('be.visible').find('.btn--cancel').click();
 		settingsLogStreamingPage.getters.getDestinationDeleteButton().click();
 		cy.get('.el-message-box').should('be.visible').find('.btn--confirm').click();
-		cy.reload();
 	});
 
 	it('should create a destination and delete it via card actions', () => {
+		cy.enableFeature('logStreaming');
 		cy.visit('/settings/log-streaming');
+		cy.wait(1000); // Race condition with getDestinationDataFromBackend()
 		settingsLogStreamingPage.actions.clickAddFirstDestination();
 		cy.wait(100);
 		settingsLogStreamingPage.getters.getDestinationModal().should('be.visible');
 		settingsLogStreamingPage.getters.getSelectDestinationType().click();
 		settingsLogStreamingPage.getters.getSelectDestinationTypeItems().eq(0).click();
 		settingsLogStreamingPage.getters.getSelectDestinationButton().click();
-		settingsLogStreamingPage.getters.getDestinationNameInput().click()
-		settingsLogStreamingPage.getters.getDestinationNameInput().find('input').clear().type('Destination 1');
+		settingsLogStreamingPage.getters.getDestinationNameInput().click();
+		settingsLogStreamingPage.getters
+			.getDestinationNameInput()
+			.find('input')
+			.clear()
+			.type('Destination 1');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().should('not.have.attr', 'disabled');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().click();
 		cy.wait(100);
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 		cy.reload();
 
-		settingsLogStreamingPage.getters
-			.getDestinationCards()
-			.eq(0)
-			.find('.el-dropdown-selfdefine')
-			.click();
-		cy.get('.el-dropdown-menu').find('.el-dropdown-menu__item').eq(0).click();
+		settingsLogStreamingPage.getters.getDestinationCards().eq(0).find('.el-dropdown').click();
+		getVisibleDropdown().find('.el-dropdown-menu__item').eq(0).click();
 		settingsLogStreamingPage.getters.getDestinationSaveButton().should('not.exist');
-		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
+		getVisibleModalOverlay().click(1, 1);
 
-		settingsLogStreamingPage.getters
-			.getDestinationCards()
-			.eq(0)
-			.find('.el-dropdown-selfdefine')
-			.click();
-		cy.get('.el-dropdown-menu').find('.el-dropdown-menu__item').eq(1).click();
+		settingsLogStreamingPage.getters.getDestinationCards().eq(0).find('.el-dropdown').click();
+		getVisibleDropdown().find('.el-dropdown-menu__item').eq(1).click();
 		cy.get('.el-message-box').should('be.visible').find('.btn--confirm').click();
-		cy.reload();
 	});
 });
diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 059777e3b9113..3a65beedb2bd0 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -119,18 +119,15 @@ describe('Undo/Redo', () => {
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
 		WorkflowPage.getters
-			.canvasNodes()
-			.last()
+			.canvasNodeByName('Code')
 			.should('have.attr', 'style', 'left: 740px; top: 320px;');
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters
-			.canvasNodes()
-			.last()
+			.canvasNodeByName('Code')
 			.should('have.attr', 'style', 'left: 640px; top: 220px;');
 		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters
-			.canvasNodes()
-			.last()
+			.canvasNodeByName('Code')
 			.should('have.attr', 'style', 'left: 740px; top: 320px;');
 	});
 
@@ -138,7 +135,10 @@ describe('Undo/Redo', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.nodeConnections().realHover();
-		cy.get('.connection-actions .delete').filter(':visible').should('be.visible').click();
+		cy.get('.connection-actions .delete')
+			.filter(':visible')
+			.should('be.visible')
+			.click({ force: true });
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
@@ -256,6 +256,9 @@ describe('Undo/Redo', () => {
 	});
 
 	it('should undo/redo multiple steps', () => {
+		const initialPosition = 'left: 420px; top: 220px;';
+		const movedPosition = 'left: 540px; top: 360px;';
+
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
@@ -266,8 +269,10 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters.canvasNodes().last().click();
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		// Move first one
+		WorkflowPage.getters.canvasNodes().first().should('have.attr', 'style', initialPosition);
 		WorkflowPage.getters.canvasNodes().first().click();
 		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
+		WorkflowPage.getters.canvasNodes().first().should('have.attr', 'style', movedPosition);
 		// Delete the set node
 		WorkflowPage.getters.canvasNodeByName(SET_NODE_NAME).click().click();
 		cy.get('body').type('{backspace}');
@@ -278,10 +283,7 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 3);
 		// Second undo: Should move first node to it's original position
 		WorkflowPage.actions.hitUndo();
-		WorkflowPage.getters
-			.canvasNodes()
-			.first()
-			.should('have.attr', 'style', 'left: 420px; top: 220px;');
+		WorkflowPage.getters.canvasNodes().first().should('have.attr', 'style', initialPosition);
 		// Third undo: Should enable last node
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.disabledNodes().should('have.length', 0);
@@ -291,10 +293,7 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters.disabledNodes().should('have.length', 1);
 		// Second redo: Should move the first node
 		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters
-			.canvasNodes()
-			.first()
-			.should('have.attr', 'style', 'left: 540px; top: 360px;');
+		WorkflowPage.getters.canvasNodes().first().should('have.attr', 'style', movedPosition);
 		// Third redo: Should delete the Set node
 		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters.canvasNodes().should('have.length', 3);
diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index d336294f48c53..a4eaebc7be5a4 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -66,7 +66,6 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeViewBackground().click({ force: true });
 	});
 
-
 	it('should add a connected node using plus endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		cy.get('.plus-endpoint').should('be.visible').click();
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 625b8b98f8115..e98b9dea9e2bb 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -107,7 +107,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.zoomToFit();
 
 		cy.get('.plus-draggable-endpoint').filter(':visible').should('not.have.class', 'ep-success');
-		cy.get('.jtk-connector.success').should('have.length', 4);
+		cy.get('.jtk-connector.success').should('have.length', 3);
 		cy.get('.jtk-connector').should('have.length', 4);
 	});
 
diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index 099e79ae7d7b0..fc303c603bc47 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -7,12 +7,10 @@ describe('Data transformation expressions', () => {
 	beforeEach(() => {
 		wf.actions.visit();
 
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
+		cy.window().then((win) => {
+			// @ts-ignore
+			win.preventNodeViewBeforeUnload = true;
+		});
 	});
 
 	it('$json + native string methods', () => {
@@ -85,7 +83,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist')
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist');
 		ndv.getters.outputDataContainer().find('[class*=value_]').should('contain', output);
 	});
 
@@ -100,7 +98,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist')
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist');
 		ndv.getters.outputDataContainer().find('[class*=value_]').should('contain', output);
 	});
 });
@@ -111,7 +109,7 @@ describe('Data transformation expressions', () => {
 
 const addSet = () => {
 	wf.actions.addNodeToCanvas('Set', true, true);
-	ndv.getters.parameterInput('keepOnlySet').find('div[role=switch]').click(); // shorten output
+	ndv.getters.parameterInput('keepOnlySet').find('.el-switch').click(); // shorten output
 	cy.get('input[placeholder="Add Value"]').click();
 	cy.get('span').contains('String').click();
 	ndv.getters.nthParam(3).contains('Expression').invoke('show').click(); // Values to Set > String > Value
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 9ccda6b6a4f88..fa9bdd78a22a3 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -4,6 +4,7 @@ import {
 	SCHEDULE_TRIGGER_NODE_NAME,
 } from './../constants';
 import { WorkflowPage, NDV } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -28,11 +29,7 @@ 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();
+		getVisibleSelect().find('li:nth-child(3)').should('have.text', 'String').click();
 		ndv.getters
 			.parameterInput('name')
 			.should('have.length', 1)
@@ -128,7 +125,7 @@ describe('Data mapping', () => {
 			.find('.json-data')
 			.should(
 				'have.text',
-				'[{"input":[{"count":0,"with space":"!!","with.dot":"!!","with"quotes":"!!"}]},{"input":[{"count":1}]}]',
+				'[{"input": [{"count": 0,"with space": "!!","with.dot": "!!","with"quotes": "!!"}]},{"input": [{"count": 1}]}]',
 			)
 			.find('span')
 			.contains('"count"')
@@ -178,6 +175,7 @@ describe('Data mapping', () => {
 
 	it('maps expressions from previous nodes', () => {
 		cy.createFixtureWorkflow('Test_workflow_3.json', `My test workflow`);
+		workflowPage.actions.zoomToFit();
 		workflowPage.actions.openNode('Set1');
 
 		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
@@ -245,7 +243,8 @@ 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();
+		getVisibleSelect().find('li').contains('Sort').click();
 
 		ndv.getters.nodeParameters().find('button').contains('Add Field To Sort By').click();
 
@@ -274,6 +273,8 @@ describe('Data mapping', () => {
 
 		ndv.actions.typeIntoParameterInput('value', 'fun');
 		ndv.actions.clearParameterInput('value'); // keep focus on param
+		ndv.actions.dismissMappingTooltip();
+		cy.wait(300);
 
 		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown();
 
diff --git a/cypress/e2e/15-scheduler-node.cy.ts b/cypress/e2e/15-scheduler-node.cy.ts
index d58a5416527c0..0021455619811 100644
--- a/cypress/e2e/15-scheduler-node.cy.ts
+++ b/cypress/e2e/15-scheduler-node.cy.ts
@@ -1,5 +1,6 @@
 import { WorkflowPage, WorkflowsPage, NDV } from '../pages';
 import { BACKEND_BASE_URL } from '../constants';
+import { getVisibleSelect } from '../utils';
 
 const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
@@ -24,11 +25,7 @@ describe('Schedule Trigger node', async () => {
 		workflowPage.actions.openNode('Schedule Trigger');
 
 		cy.getByTestId('parameter-input-field').click();
-		cy.getByTestId('parameter-input-field')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains('Seconds')
-			.click();
+		getVisibleSelect().find('.option-headline').contains('Seconds').click();
 		cy.getByTestId('parameter-input-secondsInterval').clear().type('1');
 
 		ndv.getters.backToCanvas().click();
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 2ba59a8cfbe17..80a649a9523a9 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -2,6 +2,7 @@ import { WorkflowPage, NDV, CredentialsModal } from '../pages';
 import { v4 as uuid } from 'uuid';
 import { cowBase64 } from '../support/binaryTestFiles';
 import { BACKEND_BASE_URL } from '../constants';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -34,11 +35,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 	workflowPage.actions.openNode('Webhook');
 
 	cy.getByTestId('parameter-input-httpMethod').click();
-	cy.getByTestId('parameter-input-httpMethod')
-		.find('.el-select-dropdown')
-		.find('.option-headline')
-		.contains(method)
-		.click();
+	getVisibleSelect().find('.option-headline').contains(method).click();
 	cy.getByTestId('parameter-input-path')
 		.find('.parameter-input')
 		.find('input')
@@ -47,11 +44,7 @@ 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();
+		getVisibleSelect().find('.option-headline').contains(authentication).click();
 	}
 
 	if (responseCode) {
@@ -64,20 +57,12 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 
 	if (respondWith) {
 		cy.getByTestId('parameter-input-responseMode').click();
-		cy.getByTestId('parameter-input-responseMode')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains(respondWith)
-			.click();
+		getVisibleSelect().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();
+		getVisibleSelect().find('.option-headline').contains(responseData).click();
 	}
 
 	if (executeNow) {
@@ -136,13 +121,13 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.addNodeToCanvas('Set');
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
-		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
+		getVisibleSelect().find('.el-select-dropdown__item').contains('Number').click();
 		cy.get('.fixed-collection-parameter')
 			.getByTestId('parameter-input-name')
 			.clear()
 			.type('MyValue');
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
-		ndv.getters.backToCanvas().click();
+		ndv.getters.backToCanvas().click({ force: true });
 
 		workflowPage.actions.addNodeToCanvas('Respond to Webhook');
 
@@ -185,13 +170,18 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.addNodeToCanvas('Set');
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
-		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
+		getVisibleSelect().find('.el-select-dropdown__item').contains('Number').click();
 		cy.get('.fixed-collection-parameter')
 			.getByTestId('parameter-input-name')
+			.find('input')
 			.clear()
 			.type('MyValue');
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
-		ndv.getters.backToCanvas().click();
+		cy.get('.fixed-collection-parameter')
+			.getByTestId('parameter-input-value')
+			.find('input')
+			.clear()
+			.type('1234');
+		ndv.getters.backToCanvas().click({ force: true });
 
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
@@ -216,7 +206,7 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.addNodeToCanvas('Set');
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
-		cy.get('.add-option').find('.el-select-dropdown__item').contains('String').click();
+		getVisibleSelect().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')
@@ -231,11 +221,7 @@ describe('Webhook Trigger node', async () => {
 
 		workflowPage.actions.openNode('Move Binary Data');
 		cy.getByTestId('parameter-input-mode').click();
-		cy.getByTestId('parameter-input-mode')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains('JSON to Binary')
-			.click();
+		getVisibleSelect().find('.option-headline').contains('JSON to Binary').click();
 		ndv.getters.backToCanvas().click();
 
 		workflowPage.actions.executeWorkflow();
@@ -274,7 +260,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
@@ -317,7 +303,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index cf0f4ccd3598b..acd61b05db51f 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -48,7 +48,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		workflowPage.actions.setWorkflowName('Workflow W1');
 		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
 		workflowPage.actions.addNodeToCanvas('Notion', true, true);
-		ndv.getters.credentialInput().should('contain', 'Credential C1');
+		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C1');
 		ndv.actions.close();
 
 		workflowPage.actions.openShareModal();
@@ -87,16 +87,12 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		workflowsPage.getters.workflowCards().should('have.length', 1);
 		workflowsPage.getters.workflowCard('Workflow W1').click();
 		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
-		ndv.getters.credentialInput().should('contain', 'Credential C2');
+		ndv.getters.credentialInput().find('input').should('have.value', 'Credential C2');
 		ndv.actions.close();
 		workflowPage.actions.saveWorkflowOnButtonClick();
 
 		workflowPage.actions.openNode('Notion');
-		ndv.getters
-			.credentialInput()
-			.find('input')
-			.should('have.value', 'Credential C1')
-			.should('be.disabled');
+		ndv.getters.credentialInput().should('have.value', 'Credential C1').should('be.disabled');
 		ndv.actions.close();
 	});
 
@@ -116,11 +112,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		workflowsPage.getters.workflowCards().should('have.length', 2);
 		workflowsPage.getters.workflowCard('Workflow W1').click();
 		workflowPage.actions.openNode('Notion');
-		ndv.getters
-			.credentialInput()
-			.find('input')
-			.should('have.value', 'Credential C1')
-			.should('be.disabled');
+		ndv.getters.credentialInput().should('have.value', 'Credential C1').should('be.disabled');
 		ndv.actions.close();
 
 		cy.waitForLoad();
diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 56b548747d73a..966a506e7bf2b 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -30,7 +30,7 @@ describe('Workflow tags', () => {
 		}
 		cy.contains('Done').click();
 
-		wf.getters.createTagButton().click();
+		wf.getters.tagsDropdown().click();
 		wf.getters.tagsInDropdown().should('have.length', 5);
 		wf.getters.tagPills().should('have.length', 0); // none attached
 	});
@@ -45,7 +45,7 @@ describe('Workflow tags', () => {
 		});
 
 		cy.contains('Done').click();
-		wf.getters.createTagButton().click();
+		wf.getters.tagsDropdown().click();
 		wf.getters.tagsInDropdown().should('have.length', 0); // none stored
 		wf.getters.tagPills().should('have.length', 0); // none attached
 	});
@@ -57,7 +57,8 @@ describe('Workflow tags', () => {
 
 		cy.contains('Create a tag').click();
 		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
-		cy.getByTestId('edit-tag-button').click({ force: true });
+		cy.getByTestId('tags-table').should('contain.text', first);
+		cy.getByTestId('edit-tag-button').eq(-1).click({ force: true });
 		cy.wait(300);
 		cy.getByTestId('tags-table')
 			.find('.el-input--large')
@@ -65,7 +66,7 @@ describe('Workflow tags', () => {
 			.type(' Updated')
 			.type('{enter}');
 		cy.contains('Done').click();
-		wf.getters.createTagButton().click();
+		wf.getters.tagsDropdown().click();
 		wf.getters.tagsInDropdown().should('have.length', 1); // one stored
 		wf.getters.tagsInDropdown().contains('Updated').should('exist');
 		wf.getters.tagPills().should('have.length', 0); // none attached
@@ -76,7 +77,7 @@ describe('Workflow tags', () => {
 		wf.actions.addTags(TEST_TAGS);
 		wf.getters.nthTagPill(1).click();
 		wf.getters.tagsDropdown().find('.el-tag__close').first().click();
-		cy.get('body').type('{enter}');
+		cy.get('body').click(0, 0);
 		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
 	});
 
@@ -84,8 +85,8 @@ describe('Workflow tags', () => {
 		wf.getters.createTagButton().click();
 		wf.actions.addTags(TEST_TAGS);
 		wf.getters.nthTagPill(1).click();
-		wf.getters.tagsDropdown().find('li.selected').first().click();
-		cy.get('body').type('{enter}');
+		wf.getters.tagsInDropdown().filter('.selected').first().click();
+		cy.get('body').click(0, 0);
 		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
 	});
 });
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index 6af5ba6b60460..cbc7a165f15f3 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -58,19 +58,19 @@ describe('User Management', { disableAutoLogin: true }, () => {
 	it('should delete user and their data', () => {
 		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
 		usersSettingsPage.actions.opedDeleteDialog(INSTANCE_MEMBERS[0].email);
-		usersSettingsPage.getters.deleteDataRadioButton().realClick();
+		usersSettingsPage.getters.deleteDataRadioButton().click();
 		usersSettingsPage.getters.deleteDataInput().type('delete all data');
-		usersSettingsPage.getters.deleteUserButton().realClick();
+		usersSettingsPage.getters.deleteUserButton().click();
 		workflowPage.getters.successToast().should('contain', 'User deleted');
 	});
 
 	it('should delete user and transfer their data', () => {
 		usersSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password, true);
 		usersSettingsPage.actions.opedDeleteDialog(INSTANCE_MEMBERS[1].email);
-		usersSettingsPage.getters.transferDataRadioButton().realClick();
-		usersSettingsPage.getters.userSelectDropDown().realClick();
-		usersSettingsPage.getters.userSelectOptions().first().realClick();
-		usersSettingsPage.getters.deleteUserButton().realClick();
+		usersSettingsPage.getters.transferDataRadioButton().click();
+		usersSettingsPage.getters.userSelectDropDown().click();
+		usersSettingsPage.getters.userSelectOptions().first().click();
+		usersSettingsPage.getters.deleteUserButton().click();
 		workflowPage.getters.successToast().should('contain', 'User deleted');
 	});
 
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 7d4f743a986cb..78dbe055aa46f 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -4,8 +4,6 @@ import {
 	PIPEDRIVE_NODE_NAME,
 	HTTP_REQUEST_NODE_NAME,
 	NEW_QUERY_AUTH_ACCOUNT_NAME,
-} from './../constants';
-import {
 	GMAIL_NODE_NAME,
 	NEW_GOOGLE_ACCOUNT_NAME,
 	NEW_TRELLO_ACCOUNT_NAME,
@@ -13,6 +11,7 @@ import {
 	TRELLO_NODE_NAME,
 } from '../constants';
 import { CredentialsPage, CredentialsModal, WorkflowPage, NDV } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const credentialsPage = new CredentialsPage();
 const credentialsModal = new CredentialsModal();
@@ -90,13 +89,16 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
 		credentialsModal.actions.fillCredentialsForm();
 		cy.get('.el-message-box').find('button').contains('Close').click();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_GOOGLE_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_GOOGLE_ACCOUNT_NAME);
 	});
 
 	it('should show multiple credential types in the same dropdown', () => {
@@ -107,7 +109,7 @@ describe('Credentials', () => {
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add oAuth credentials
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
@@ -115,13 +117,14 @@ describe('Credentials', () => {
 		cy.get('.el-message-box').find('button').contains('Close').click();
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add Service account credentials
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().last().click();
 		credentialsModal.actions.fillCredentialsForm();
 		// Both (+ the 'Create new' option) should be in the dropdown
-		workflowPage.getters.nodeCredentialsSelect().find('li').should('have.length.greaterThan', 3);
+		workflowPage.getters.nodeCredentialsSelect().click();
+		getVisibleSelect().find('li').should('have.length.greaterThan', 2);
 	});
 
 	it('should correctly render required and optional credentials', () => {
@@ -132,18 +135,18 @@ describe('Credentials', () => {
 		// Select incoming authentication
 		nodeDetailsView.getters.parameterInput('incomingAuthentication').should('exist');
 		nodeDetailsView.getters.parameterInput('incomingAuthentication').click();
-		nodeDetailsView.getters.parameterInput('incomingAuthentication').find('li').first().click();
+		getVisibleSelect().find('li').first().click();
 		// There should be two credential fields
 		workflowPage.getters.nodeCredentialsSelect().should('have.length', 2);
 
 		workflowPage.getters.nodeCredentialsSelect().first().click();
-		workflowPage.getters.nodeCredentialsSelect().first().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		// This one should show auth type selector
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		cy.get('body').type('{esc}');
 
 		workflowPage.getters.nodeCredentialsSelect().last().click();
-		workflowPage.getters.nodeCredentialsSelect().last().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		// This one should not show auth type selector
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 	});
@@ -155,10 +158,13 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_TRELLO_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_TRELLO_ACCOUNT_NAME);
 	});
 
 	it('should delete credentials from NDV', () => {
@@ -168,16 +174,22 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_NOTION_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_NOTION_ACCOUNT_NAME);
 
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.deleteButton().click();
 		cy.get('.el-message-box').find('button').contains('Yes').click();
 		workflowPage.getters.successToast().contains('Credential deleted');
-		workflowPage.getters.nodeCredentialsSelect().should('not.contain', NEW_TRELLO_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('not.have.value', NEW_TRELLO_ACCOUNT_NAME);
 	});
 
 	it('should rename credentials from NDV', () => {
@@ -187,17 +199,18 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_TRELLO_ACCOUNT_NAME);
-
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.name().click();
 		credentialsModal.actions.renameCredential(NEW_CREDENTIAL_NAME);
 		credentialsModal.getters.saveButton().click();
 		credentialsModal.getters.closeButton().click();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_CREDENTIAL_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_CREDENTIAL_NAME);
 	});
 
 	it('should setup generic authentication for HTTP node', () => {
@@ -207,20 +220,20 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		nodeDetailsView.getters.parameterInput('authentication').click();
-		nodeDetailsView.getters.parameterInput('authentication').find('li').should('have.length', 3);
-		nodeDetailsView.getters.parameterInput('authentication').find('li').last().click();
+		getVisibleSelect().find('li').should('have.length', 3);
+		getVisibleSelect().find('li').last().click();
 		nodeDetailsView.getters.parameterInput('genericAuthType').should('exist');
 		nodeDetailsView.getters.parameterInput('genericAuthType').click();
-		nodeDetailsView.getters
-			.parameterInput('genericAuthType')
-			.find('li')
-			.should('have.length.greaterThan', 0);
-		nodeDetailsView.getters.parameterInput('genericAuthType').find('li').last().click();
+		getVisibleSelect().find('li').should('have.length.greaterThan', 0);
+		getVisibleSelect().find('li').last().click();
 
 		workflowPage.getters.nodeCredentialsSelect().should('exist');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_QUERY_AUTH_ACCOUNT_NAME);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_QUERY_AUTH_ACCOUNT_NAME);
 	});
 });
diff --git a/cypress/e2e/21-community-nodes.cy.ts b/cypress/e2e/21-community-nodes.cy.ts
index cfc76e46e04b8..39f572ba5c348 100644
--- a/cypress/e2e/21-community-nodes.cy.ts
+++ b/cypress/e2e/21-community-nodes.cy.ts
@@ -4,6 +4,7 @@ import { CredentialsModal, WorkflowPage } from '../pages';
 import CustomNodeWithN8nCredentialFixture from '../fixtures/Custom_node_n8n_credential.json';
 import CustomNodeWithCustomCredentialFixture from '../fixtures/Custom_node_custom_credential.json';
 import CustomCredential from '../fixtures/Custom_credential.json';
+import { getVisibleSelect } from '../utils';
 
 const credentialsModal = new CredentialsModal();
 const nodeCreatorFeature = new NodeCreator();
@@ -20,9 +21,13 @@ describe('Community Nodes', () => {
 			req.on('response', (res) => {
 				const nodes = res.body || [];
 
-				nodes.push(CustomNodeFixture, CustomNodeWithN8nCredentialFixture, CustomNodeWithCustomCredentialFixture);
+				nodes.push(
+					CustomNodeFixture,
+					CustomNodeWithN8nCredentialFixture,
+					CustomNodeWithCustomCredentialFixture,
+				);
 			});
-		})
+		});
 
 		cy.intercept('/types/credentials.json', { middleware: true }, (req) => {
 			req.headers['cache-control'] = 'no-cache, no-store';
@@ -31,8 +36,8 @@ describe('Community Nodes', () => {
 				const credentials = res.body || [];
 
 				credentials.push(CustomCredential);
-			})
-		})
+			});
+		});
 
 		workflowPage.actions.visit();
 	});
@@ -45,7 +50,7 @@ describe('Community Nodes', () => {
 
 		nodeCreatorFeature.getters
 			.getCreatorItem(customNode)
-			.findChildByTestId('node-creator-item-tooltip')
+			.find('.el-tooltip__trigger')
 			.should('exist');
 		nodeCreatorFeature.actions.selectNode(customNode);
 
@@ -65,16 +70,9 @@ describe('Community Nodes', () => {
 		secondParameter().find('label').contains('Resource').should('exist');
 		secondParameter().find('input.el-input__inner').should('have.value', 'option2');
 		secondParameter().find('.el-select').click();
-		secondParameter().find('.el-select-dropdown__list').should('exist');
 		// Check if all options are rendered and select the fourth one
-		secondParameter().find('.el-select-dropdown__list').children().should('have.length', 4);
-		secondParameter()
-			.find('.el-select-dropdown__list')
-			.children()
-			.eq(3)
-			.contains('option4')
-			.should('exist')
-			.click();
+		getVisibleSelect().find('li').should('have.length', 4);
+		getVisibleSelect().find('li').eq(3).contains('option4').should('exist').click();
 		secondParameter().find('input.el-input__inner').should('have.value', 'option4');
 	});
 
diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index 3bbd2f0b23bbe..a2bb52772344c 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -28,59 +28,36 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		// input to output
-		ndv.getters.inputTableRow(1)
+		ndv.getters
+			.inputTableRow(1)
 			.should('exist')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(1)
-			.realHover();
-		ndv.getters.outputTableRow(4)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(1).realHover();
+		ndv.getters.outputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(2)
-			.realHover();
-		ndv.getters.outputTableRow(2)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
-		
-		ndv.getters.inputTableRow(3)
-			.realHover();
-		ndv.getters.outputTableRow(6)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.inputTableRow(2).realHover();
+		ndv.getters.outputTableRow(2).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.getters.inputTableRow(3).realHover();
+		ndv.getters.outputTableRow(6).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		// output to input
-		ndv.getters.outputTableRow(1)
-			.realHover();
-		ndv.getters.inputTableRow(4)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.inputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-			ndv.getters.outputTableRow(4)
-			.realHover();
-		ndv.getters.inputTableRow(1)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(4).realHover();
+		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(2)
-			.realHover();
-		ndv.getters.inputTableRow(2)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
-		
-		ndv.getters.outputTableRow(6)
-			.realHover();
-		ndv.getters.inputTableRow(3)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(2).realHover();
+		ndv.getters.inputTableRow(2).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(1)
-			.realHover();
-		ndv.getters.inputTableRow(4)
-			.invoke('attr', 'data-test-id')
-			.should('equal', 'hovering-item');
+		ndv.getters.outputTableRow(6).realHover();
+		ndv.getters.inputTableRow(3).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.inputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 	});
 
 	it('maps paired input and output items based on selected input node', () => {
@@ -92,9 +69,11 @@ describe('NDV', () => {
 		workflowPage.actions.openNode('Set2');
 
 		ndv.getters.inputPanel().contains('6 items').should('exist');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
+			.find('input')
 			.should('exist')
-			.should('include.text', '2 of 2 (6 items)');
+			.should('have.value', '2 of 2 (6 items)');
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
@@ -106,7 +85,8 @@ describe('NDV', () => {
 		ndv.actions.selectInputNode('Set1');
 		ndv.getters.backToCanvas().realHover(); // reset to default hover
 
-		ndv.getters.inputTableRow(1)
+		ndv.getters
+			.inputTableRow(1)
 			.should('have.text', '1000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
@@ -119,7 +99,8 @@ describe('NDV', () => {
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
 		ndv.getters.backToCanvas().realHover(); // reset to default hover
 
-		ndv.getters.inputTableRow(1)
+		ndv.getters
+			.inputTableRow(1)
 			.should('have.text', '1111')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
@@ -137,11 +118,13 @@ describe('NDV', () => {
 		workflowPage.actions.executeWorkflow();
 		workflowPage.actions.openNode('Set3');
 
-		ndv.getters.inputRunSelector()
+		ndv.getters
+			.inputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
 			.should('exist')
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
@@ -150,23 +133,19 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
-		ndv.getters.inputRunSelector().find('input')
-			.should('include.value', '1 of 2 (6 items)');
-		ndv.getters.outputRunSelector().find('input')
-			.should('include.value', '1 of 2 (6 items)');
+		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
 
-		ndv.getters.inputTableRow(1)
+		ndv.getters
+			.inputTableRow(1)
 			.should('have.text', '1111')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '1111')
-			.realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '1111').realHover();
 
-		ndv.getters.outputTableRow(3)
-			.should('have.text', '4444')
-			.realHover();
-		ndv.getters.inputTableRow(3)
+		ndv.getters.outputTableRow(3).should('have.text', '4444').realHover();
+		ndv.getters
+			.inputTableRow(3)
 			.should('have.text', '4444')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
@@ -174,18 +153,16 @@ describe('NDV', () => {
 		ndv.actions.changeOutputRunSelector('2 of 2 (6 items)');
 		cy.wait(50);
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1000')
-			.realHover();
-		ndv.getters.outputTableRow(1)
+		ndv.getters.inputTableRow(1).should('have.text', '1000').realHover();
+		ndv.getters
+			.outputTableRow(1)
 			.should('have.text', '1000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(3)
-			.should('have.text', '2000')
-			.realHover();
-		ndv.getters.inputTableRow(3)
+		ndv.getters.outputTableRow(3).should('have.text', '2000').realHover();
+		ndv.getters
+			.inputTableRow(3)
 			.should('have.text', '2000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
@@ -200,15 +177,18 @@ describe('NDV', () => {
 		workflowPage.actions.openNode('Set2');
 
 		ndv.getters.inputPanel().contains('6 items').should('exist');
-		ndv.getters.outputRunSelector()
+		ndv.getters
+			.outputRunSelector()
+			.find('input')
 			.should('exist')
-			.should('include.text', '2 of 2 (6 items)');
+			.should('have.value', '2 of 2 (6 items)');
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.getters.backToCanvas().realHover(); // reset to default hover
-		ndv.getters.inputTableRow(1)
+		ndv.getters
+			.inputTableRow(1)
 			.should('have.text', '1111')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
@@ -218,28 +198,32 @@ describe('NDV', () => {
 
 		ndv.actions.selectInputNode('Code1');
 		ndv.getters.inputTableRow(1).realHover();
-		ndv.getters.inputTableRow(1)
+		ndv.getters
+			.inputTableRow(1)
 			.should('have.text', '1000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '1000');
+		ndv.getters.outputTableRow(1).should('have.text', '1000');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
 		ndv.actions.selectInputNode('Code');
 
 		ndv.getters.inputTableRow(1).realHover();
-		ndv.getters.inputTableRow(1)
-		.should('have.text', '6666')
-		.invoke('attr', 'data-test-id')
-		.should('equal', 'hovering-item');
+		ndv.getters
+			.inputTableRow(1)
+			.should('have.text', '6666')
+			.invoke('attr', 'data-test-id')
+			.should('equal', 'hovering-item');
 		ndv.getters.outputHoveringItem().should('not.exist');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
 		ndv.actions.selectInputNode('When clicking');
 
 		ndv.getters.inputTableRow(1).realHover();
-		ndv.getters.inputTableRow(1).should('have.text', "This is an item, but it's empty.").realHover();
+		ndv.getters
+			.inputTableRow(1)
+			.should('have.text', "This is an item, but it's empty.")
+			.realHover();
 		ndv.getters.outputHoveringItem().should('have.length', 6);
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 	});
@@ -256,18 +240,16 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.switchOutputBranch('False Branch (2 items)');
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
-		ndv.getters.inputTableRow(5)
+		ndv.getters.outputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters
+			.inputTableRow(5)
 			.should('have.text', '8888')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(2)
-			.should('have.text', '9999')
-			.realHover();
-		ndv.getters.inputTableRow(6)
+		ndv.getters.outputTableRow(2).should('have.text', '9999').realHover();
+		ndv.getters
+			.inputTableRow(6)
 			.should('have.text', '9999')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
@@ -277,31 +259,21 @@ describe('NDV', () => {
 		workflowPage.actions.openNode('Set5');
 
 		ndv.actions.switchInputBranch('True Branch');
-		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)')
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
+		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
+		ndv.getters.outputTableRow(1).should('have.text', '8888').realHover();
 		ndv.getters.inputHoveringItem().should('not.exist');
 
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '1111')
-			.realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1111').realHover();
 		ndv.getters.outputHoveringItem().should('not.exist');
 
 		ndv.actions.switchInputBranch('False Branch');
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '8888').realHover();
 
-		ndv.actions.changeOutputRunSelector('2 of 2 (4 items)')
-		ndv.getters.outputTableRow(1)
-			.should('have.text', '1111')
-			.realHover();
+		ndv.actions.changeOutputRunSelector('2 of 2 (4 items)');
+		ndv.getters.outputTableRow(1).should('have.text', '1111').realHover();
 
-		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)')
-		ndv.getters.inputTableRow(1)
-			.should('have.text', '8888')
-			.realHover();
+		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
+		ndv.getters.inputTableRow(1).should('have.text', '8888').realHover();
 		ndv.getters.outputHoveringItem().should('have.text', '8888');
 		// todo there's a bug here need to fix ADO-534
 		// ndv.getters.outputHoveringItem().should('not.exist');
diff --git a/cypress/e2e/25-stickies.cy.ts b/cypress/e2e/25-stickies.cy.ts
index afb2db3b5f42d..d0e219575fa62 100644
--- a/cypress/e2e/25-stickies.cy.ts
+++ b/cypress/e2e/25-stickies.cy.ts
@@ -2,7 +2,13 @@ import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const workflowPage = new WorkflowPageClass();
 
-function checkStickiesStyle( top: number, left: number, height: number, width: number, zIndex?: number) {
+function checkStickiesStyle(
+	top: number,
+	left: number,
+	height: number,
+	width: number,
+	zIndex?: number,
+) {
 	workflowPage.getters.stickies().should(($el) => {
 		expect($el).to.have.css('top', `${top}px`);
 		expect($el).to.have.css('left', `${left}px`);
@@ -18,22 +24,23 @@ describe('Canvas Actions', () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
 
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
+		cy.window().then((win) => {
+			// @ts-ignore
+			win.preventNodeViewBeforeUnload = true;
+		});
 	});
 
-
 	it('adds sticky to canvas with default text and position', () => {
 		workflowPage.getters.addStickyButton().should('not.be.visible');
 
-		addDefaultSticky()
-		workflowPage.getters.stickies().eq(0)
+		addDefaultSticky();
+		workflowPage.getters
+			.stickies()
+			.eq(0)
 			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n')
-			.find('a').contains('Guide').should('have.attr', 'href');
+			.find('a')
+			.contains('Guide')
+			.should('have.attr', 'href');
 	});
 
 	it('drags sticky around to top left corner', () => {
@@ -57,18 +64,19 @@ describe('Canvas Actions', () => {
 
 	it('deletes sticky', () => {
 		workflowPage.actions.addSticky();
-		workflowPage.getters.stickies().should('have.length', 1)
+		workflowPage.getters.stickies().should('have.length', 1);
 
 		workflowPage.actions.deleteSticky();
 
-		workflowPage.getters.stickies().should('have.length', 0)
+		workflowPage.getters.stickies().should('have.length', 0);
 	});
 
 	it('edits sticky and updates content as markdown', () => {
 		workflowPage.actions.addSticky();
 
-		workflowPage.getters.stickies()
-			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n')
+		workflowPage.getters
+			.stickies()
+			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n');
 
 		workflowPage.getters.stickies().dblclick();
 		workflowPage.actions.editSticky('# hello world \n ## text text');
@@ -159,32 +167,41 @@ describe('Canvas Actions', () => {
 		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-150, -150]);
 		checkStickiesStyle(124, 256, 316, 384, -121);
 
-		workflowPage.getters.canvasNodes().eq(0)
+		workflowPage.getters
+			.canvasNodes()
+			.eq(0)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', 'auto');
 			});
 
 		workflowPage.actions.addSticky();
-		workflowPage.getters.stickies().eq(0)
+		workflowPage.getters
+			.stickies()
+			.eq(0)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-121');
 			});
-		workflowPage.getters.stickies().eq(1)
+		workflowPage.getters
+			.stickies()
+			.eq(1)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-38');
 			});
 
 		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-200, -200], { index: 1 });
-		workflowPage.getters.stickies().eq(0)
+		workflowPage.getters
+			.stickies()
+			.eq(0)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-121');
 			});
 
-		workflowPage.getters.stickies().eq(1)
+		workflowPage.getters
+			.stickies()
+			.eq(1)
 			.should(($el) => {
 				expect($el).to.have.css('z-index', '-158');
 			});
-
 	});
 });
 
@@ -198,15 +215,20 @@ type BoundingBox = {
 	width: number;
 	top: number;
 	left: number;
-}
+};
 
 function dragRightEdge(curr: BoundingBox, move: number) {
-	workflowPage.getters.stickies().first().then(($el) => {
-		const { left, top, height, width } = curr;
-		cy.drag(`[data-test-id="sticky"] [data-dir="right"]`, [left + width + move, 0], { abs: true });
-		stickyShouldBePositionedCorrectly({ top, left });
-		stickyShouldHaveCorrectSize([height, width * 1.5 + move]);
-	});
+	workflowPage.getters
+		.stickies()
+		.first()
+		.then(($el) => {
+			const { left, top, height, width } = curr;
+			cy.drag(`[data-test-id="sticky"] [data-dir="right"]`, [left + width + move, 0], {
+				abs: true,
+			});
+			stickyShouldBePositionedCorrectly({ top, left });
+			stickyShouldHaveCorrectSize([height, width * 1.5 + move]);
+		});
 }
 
 function shouldHaveOneSticky() {
@@ -214,17 +236,20 @@ function shouldHaveOneSticky() {
 }
 
 function shouldBeInDefaultLocation() {
-	workflowPage.getters.stickies().eq(0).should(($el) => {
-		expect($el).to.have.css('height', '160px');
-		expect($el).to.have.css('width', '240px');
-	})
+	workflowPage.getters
+		.stickies()
+		.eq(0)
+		.should(($el) => {
+			expect($el).to.have.css('height', '160px');
+			expect($el).to.have.css('width', '240px');
+		});
 }
 
 function shouldHaveDefaultSize() {
 	workflowPage.getters.stickies().should(($el) => {
 		expect($el).to.have.css('height', '160px');
 		expect($el).to.have.css('width', '240px');
-	})
+	});
 }
 
 function addDefaultSticky() {
@@ -237,21 +262,19 @@ function addDefaultSticky() {
 function stickyShouldBePositionedCorrectly(position: Position) {
 	const yOffset = -100;
 	const xOffset = -180;
-	workflowPage.getters.stickies()
-		.should(($el) => {
-			expect($el).to.have.css('top', `${yOffset + position.top}px`);
-			expect($el).to.have.css('left', `${xOffset + position.left}px`);
-		});
+	workflowPage.getters.stickies().should(($el) => {
+		expect($el).to.have.css('top', `${yOffset + position.top}px`);
+		expect($el).to.have.css('left', `${xOffset + position.left}px`);
+	});
 }
 
 function stickyShouldHaveCorrectSize(size: [number, number]) {
 	const yOffset = 0;
 	const xOffset = 0;
-	workflowPage.getters.stickies()
-		.should(($el) => {
-			expect($el).to.have.css('height', `${yOffset + size[0]}px`);
-			expect($el).to.have.css('width', `${xOffset + size[1]}px`);
-		});
+	workflowPage.getters.stickies().should(($el) => {
+		expect($el).to.have.css('height', `${yOffset + size[0]}px`);
+		expect($el).to.have.css('width', `${xOffset + size[1]}px`);
+	});
 }
 
 function moveSticky(target: Position) {
diff --git a/cypress/e2e/26-resource-locator.cy.ts b/cypress/e2e/26-resource-locator.cy.ts
index cedcfd628e6dc..5231d3fe29f6a 100644
--- a/cypress/e2e/26-resource-locator.cy.ts
+++ b/cypress/e2e/26-resource-locator.cy.ts
@@ -1,4 +1,5 @@
 import { WorkflowPage, NDV, CredentialsModal } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -32,7 +33,7 @@ describe('Resource Locator', () => {
 		workflowPage.actions.addNodeToCanvas('Google Sheets', true, true);
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add oAuth credentials
-		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		getVisibleSelect().find('li').last().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index fb0887a6832e7..fdd4e0e7d2ccf 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,6 +1,7 @@
 import { NodeCreator } from '../pages/features/node-creator';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { NDV } from '../pages/ndv';
+import { getVisibleSelect } from '../utils';
 
 const nodeCreatorFeature = new NodeCreator();
 const WorkflowPage = new WorkflowPageClass();
@@ -85,7 +86,7 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.getCreatorItem(editImageNode).click();
 		nodeCreatorFeature.getters.activeSubcategory().should('have.text', editImageNode);
 		nodeCreatorFeature.getters.getCreatorItem('Crop Image').click();
-		NDVModal.getters.parameterInput('operation').should('contain.text', 'Crop');
+		NDVModal.getters.parameterInput('operation').find('input').should('have.value', 'Crop');
 	});
 
 	it('should search through actions and confirm added action', () => {
@@ -95,9 +96,9 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.activeSubcategory().should('have.text', 'FTP');
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('file');
 		// Navigate to rename action which should be the 4th item
-		nodeCreatorFeature.getters.searchBar().find('input').type('{uparrow}{uparrow}{rightarrow}');
-		NDVModal.getters.parameterInput('operation').should('contain.text', 'Rename');
-	})
+		nodeCreatorFeature.getters.searchBar().find('input').type('{uparrow}{rightarrow}');
+		NDVModal.getters.parameterInput('operation').find('input').should('have.value', 'Rename');
+	});
 
 	it('should not show actions for single action nodes', () => {
 		const singleActionNodes = [
@@ -110,19 +111,22 @@ describe('Node Creator', () => {
 			'Spontit',
 			'Vonage',
 			'Send Email',
-			'Toggl Trigger'
-		]
-		const doubleActionNode = 'OpenWeatherMap'
+			'Toggl Trigger',
+		];
+		const doubleActionNode = 'OpenWeatherMap';
 
 		nodeCreatorFeature.actions.openNodeCreator();
 		singleActionNodes.forEach((node) => {
 			nodeCreatorFeature.getters.searchBar().find('input').clear().type(node);
-			nodeCreatorFeature.getters.getCreatorItem(node).find('button[class*="panelIcon"]').should('not.exist');
-		})
+			nodeCreatorFeature.getters
+				.getCreatorItem(node)
+				.find('button[class*="panelIcon"]')
+				.should('not.exist');
+		});
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type(doubleActionNode);
 		nodeCreatorFeature.getters.getCreatorItem(doubleActionNode).click();
 		nodeCreatorFeature.getters.creatorItem().should('have.length', 4);
-	})
+	});
 
 	it('should have "Actions" section collapsed when opening actions view from Trigger root view', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
@@ -131,10 +135,19 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.getCategoryItem('Actions').should('exist');
 		nodeCreatorFeature.getters.getCategoryItem('Triggers').should('exist');
 
-		nodeCreatorFeature.getters.getCategoryItem('Triggers').parent().should('not.have.attr', 'data-category-collapsed');
-		nodeCreatorFeature.getters.getCategoryItem('Actions').parent().should('have.attr', 'data-category-collapsed', 'true');
-		nodeCreatorFeature.getters.getCategoryItem('Actions').click()
-		nodeCreatorFeature.getters.getCategoryItem('Actions').parent().should('not.have.attr', 'data-category-collapsed');
+		nodeCreatorFeature.getters
+			.getCategoryItem('Triggers')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'true');
+		nodeCreatorFeature.getters.getCategoryItem('Actions').click();
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
 	});
 
 	it('should have "Triggers" section collapsed when opening actions view from Regular root view', () => {
@@ -145,17 +158,33 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
 		nodeCreatorFeature.getters.getCreatorItem('n8n').click();
 
-		nodeCreatorFeature.getters.getCategoryItem('Actions').parent().should('not.have.attr', 'data-category-collapsed');
-		nodeCreatorFeature.getters.getCategoryItem('Actions').click()
-		nodeCreatorFeature.getters.getCategoryItem('Actions').parent().should('have.attr', 'data-category-collapsed');
-		nodeCreatorFeature.getters.getCategoryItem('Triggers').parent().should('have.attr', 'data-category-collapsed');
-		nodeCreatorFeature.getters.getCategoryItem('Triggers').click()
-		nodeCreatorFeature.getters.getCategoryItem('Triggers').parent().should('not.have.attr', 'data-category-collapsed');
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
+		nodeCreatorFeature.getters.getCategoryItem('Actions').click();
+		nodeCreatorFeature.getters
+			.getCategoryItem('Actions')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'true');
+		nodeCreatorFeature.getters
+			.getCategoryItem('Triggers')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'true');
+		nodeCreatorFeature.getters.getCategoryItem('Triggers').click();
+		nodeCreatorFeature.getters
+			.getCategoryItem('Triggers')
+			.parent()
+			.should('have.attr', 'data-category-collapsed', 'false');
 	});
 
 	it('should show callout and two suggested nodes if node has no trigger actions', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
 		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
 
 		cy.getByTestId('actions-panel-no-triggers-callout').should('be.visible');
@@ -165,28 +194,32 @@ describe('Node Creator', () => {
 
 	it('should show intro callout if user has not made a production execution', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
 		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
 
 		cy.getByTestId('actions-panel-activation-callout').should('be.visible');
 		nodeCreatorFeature.getters.activeSubcategory().find('button').click();
-		nodeCreatorFeature.getters.searchBar().find('input').clear()
+		nodeCreatorFeature.getters.searchBar().find('input').clear();
 
 		nodeCreatorFeature.getters.getCreatorItem('On a schedule').click();
 
 		// Setup 1s interval execution
 		cy.getByTestId('parameter-input-field').click();
-		cy.getByTestId('parameter-input-field')
-			.find('.el-select-dropdown')
-			.find('.option-headline')
-			.contains('Seconds')
-			.click();
+		getVisibleSelect().find('.option-headline').contains('Seconds').click();
 		cy.getByTestId('parameter-input-secondsInterval').clear().type('1');
 
 		NDVModal.actions.close();
 
 		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
 		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
 		nodeCreatorFeature.getters.getCreatorItem('Get All People').click();
 		NDVModal.actions.close();
@@ -197,11 +230,15 @@ describe('Node Creator', () => {
 
 		// Wait for schedule 1s execution to mark user as having made a production execution
 		cy.wait(1500);
-		cy.reload()
+		cy.reload();
 
 		// Action callout should not be visible after user has made a production execution
 		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
 		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
 
 		cy.getByTestId('actions-panel-activation-callout').should('not.exist');
@@ -210,7 +247,11 @@ describe('Node Creator', () => {
 	it('should show Trigger and Actions sections during search', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
 
-		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Customer Datastore (n8n training)');
+		nodeCreatorFeature.getters
+			.searchBar()
+			.find('input')
+			.clear()
+			.type('Customer Datastore (n8n training)');
 		nodeCreatorFeature.getters.getCreatorItem('Customer Datastore (n8n training)').click();
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Non existent action name');
@@ -228,7 +269,8 @@ describe('Node Creator', () => {
 			{
 				name: 'canvas add button',
 				handler: () => nodeCreatorFeature.getters.canvasAddButton().click(),
-			}, {
+			},
+			{
 				name: 'plus button',
 				handler: () => nodeCreatorFeature.getters.plusButton().click(),
 			},
@@ -238,10 +280,10 @@ describe('Node Creator', () => {
 			// 	name: 'tab key',
 			// 	handler: () => cy.realPress('Tab'),
 			// },
-		]
+		];
 		sourcesWithAppend.forEach((source) => {
 			it(`should append manual trigger when source is ${source.name}`, () => {
-				source.handler()
+				source.handler();
 				nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
 				nodeCreatorFeature.getters.getCreatorItem('n8n').click();
 				nodeCreatorFeature.getters.getCategoryItem('Actions').click();
@@ -251,6 +293,7 @@ describe('Node Creator', () => {
 			});
 		});
 
+		// @TODO FIX ADDING 2 NODES IN ONE GO
 		it('should not append manual trigger when source is canvas related', () => {
 			nodeCreatorFeature.getters.canvasAddButton().click();
 			nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
@@ -258,8 +301,8 @@ describe('Node Creator', () => {
 			nodeCreatorFeature.getters.getCategoryItem('Actions').click();
 			nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
 			NDVModal.actions.close();
-			WorkflowPage.actions.deleteNode('When clicking "Execute Workflow"')
-			WorkflowPage.getters.canvasNodePlusEndpointByName('n8n').click()
+			WorkflowPage.actions.deleteNode('When clicking "Execute Workflow"');
+			WorkflowPage.getters.canvasNodePlusEndpointByName('n8n').click();
 			nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
 			nodeCreatorFeature.getters.getCreatorItem('n8n').click();
 			nodeCreatorFeature.getters.getCategoryItem('Actions').click();
@@ -267,8 +310,8 @@ describe('Node Creator', () => {
 			NDVModal.actions.close();
 			WorkflowPage.getters.canvasNodes().should('have.length', 2);
 			WorkflowPage.actions.zoomToFit();
-			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Item Lists', 'Summarize')
+			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Item Lists', 'Summarize');
 			WorkflowPage.getters.canvasNodes().should('have.length', 3);
-		})
+		});
 	});
 });
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 6e3f38ca5bcb4..67010b4a13df3 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -117,7 +117,7 @@ describe('NDV', () => {
 			setupSchemaWorkflow();
 			ndv.getters.outputDisplayMode().children().should('have.length', 3);
 			ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Table');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Schema');
 
 			schemaKeys.forEach((key) => {
@@ -130,7 +130,7 @@ describe('NDV', () => {
 		});
 		it('should preserve schema view after execution', () => {
 			setupSchemaWorkflow();
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.actions.execute();
 			ndv.getters.outputDisplayMode().find('[class*=active]').should('contain', 'Schema');
 		});
@@ -142,7 +142,7 @@ describe('NDV', () => {
 					.outputPanel()
 					.find('[data-test-id=run-data-schema-item]')
 					.filter(':contains("objectValue")');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 
 			expandedObjectProps.forEach((key) => {
 				ndv.getters
@@ -173,9 +173,9 @@ describe('NDV', () => {
 			ndv.actions.execute();
 			ndv.getters.outputPanel().contains('25 items').should('exist');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('exist');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('not.exist');
-			ndv.getters.outputDisplayMode().contains('JSON').click();
+			ndv.actions.switchOutputMode('JSON');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('exist');
 		});
 		it('should display large schema', () => {
@@ -188,7 +188,7 @@ describe('NDV', () => {
 
 			ndv.getters.outputPanel().contains('20 items').should('exist');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('exist');
-			ndv.getters.outputDisplayMode().contains('Schema').click();
+			ndv.actions.switchOutputMode('Schema');
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('not.exist');
 			ndv.getters
 				.outputPanel()
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 7f9ee21c7c76e..fbba00e27b875 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -6,9 +6,11 @@ import {
 } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
+import { getVisibleDropdown, getVisibleSelect } from '../utils';
 
 const NEW_WORKFLOW_NAME = 'Something else';
-const IMPORT_WORKFLOW_URL = 'https://gist.githubusercontent.com/OlegIvaniv/010bd3f45c8a94f8eb7012e663a8b671/raw/3afea1aec15573cc168d9af7e79395bd76082906/test-workflow.json';
+const IMPORT_WORKFLOW_URL =
+	'https://gist.githubusercontent.com/OlegIvaniv/010bd3f45c8a94f8eb7012e663a8b671/raw/3afea1aec15573cc168d9af7e79395bd76082906/test-workflow.json';
 const DUPLICATE_WORKFLOW_NAME = 'Duplicated workflow';
 const DUPLICATE_WORKFLOW_TAG = 'Duplicate';
 
@@ -67,11 +69,11 @@ describe('Workflow Actions', () => {
 	it('should not save workflow if canvas is loading', () => {
 		let interceptCalledCount = 0;
 
-    // There's no way in Cypress to check if intercept was not called
+		// There's no way in Cypress to check if intercept was not called
 		// so we'll count the number of times it was called
-    cy.intercept('PATCH', '/rest/workflows/*', () => {
-      interceptCalledCount++;
-    }).as('saveWorkflow');
+		cy.intercept('PATCH', '/rest/workflows/*', () => {
+			interceptCalledCount++;
+		}).as('saveWorkflow');
 
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.saveWorkflowOnButtonClick();
@@ -84,11 +86,11 @@ describe('Workflow Actions', () => {
 			(req) => {
 				// Delay the response to give time for the save to be triggered
 				req.on('response', async (res) => {
-					await new Promise((resolve) => setTimeout(resolve, 2000))
+					await new Promise((resolve) => setTimeout(resolve, 2000));
 					res.send();
-				})
-			}
-		)
+				});
+			},
+		);
 		cy.reload();
 		cy.get('.el-loading-mask').should('exist');
 		cy.get('body').type(META_KEY, { release: false }).type('s');
@@ -99,7 +101,7 @@ describe('Workflow Actions', () => {
 		cy.get('body').type(META_KEY, { release: false }).type('s');
 		cy.wait('@saveWorkflow');
 		cy.wrap(null).then(() => expect(interceptCalledCount).to.eq(1));
-	})
+	});
 	it('should copy nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
@@ -127,7 +129,7 @@ describe('Workflow Actions', () => {
 		cy.get('.el-message-box').should('be.visible');
 		cy.get('.el-message-box').find('input').type(IMPORT_WORKFLOW_URL);
 		cy.get('body').type('{enter}');
-		cy.waitForLoad(false)
+		cy.waitForLoad(false);
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.getters.canvasNodes().should('have.length', 2);
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
@@ -137,7 +139,7 @@ describe('Workflow Actions', () => {
 		WorkflowPage.getters
 			.workflowImportInput()
 			.selectFile('cypress/fixtures/Test_workflow-actions_paste-data.json', { force: true });
-		cy.waitForLoad(false)
+		cy.waitForLoad(false);
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.getters.canvasNodes().should('have.length', 2);
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
@@ -157,57 +159,33 @@ describe('Workflow Actions', () => {
 			WorkflowPage.getters.workflowMenuItemSettings().click();
 			// Change all settings
 			// totalWorkflows + 1 (current workflow) + 1 (no workflow option)
-			WorkflowPage.getters.workflowSettingsErrorWorkflowSelect().find('li').should('have.length', totalWorkflows + 2);
-			WorkflowPage.getters
-				.workflowSettingsErrorWorkflowSelect()
-				.find('li')
-				.last()
-				.click({ force: true });
-			WorkflowPage.getters.workflowSettingsTimezoneSelect().find('li').should('exist');
-			WorkflowPage.getters.workflowSettingsTimezoneSelect().find('li').eq(1).click({ force: true });
-			WorkflowPage.getters
-				.workflowSettingsSaveFiledExecutionsSelect()
-				.find('li')
-				.should('have.length', 3);
-			WorkflowPage.getters
-				.workflowSettingsSaveFiledExecutionsSelect()
-				.find('li')
-				.last()
-				.click({ force: true });
-			WorkflowPage.getters
-				.workflowSettingsSaveSuccessExecutionsSelect()
-				.find('li')
-				.should('have.length', 3);
-			WorkflowPage.getters
-				.workflowSettingsSaveSuccessExecutionsSelect()
+			WorkflowPage.getters.workflowSettingsErrorWorkflowSelect().click();
+			getVisibleSelect()
 				.find('li')
-				.last()
-				.click({ force: true });
-			WorkflowPage.getters
-				.workflowSettingsSaveManualExecutionsSelect()
-				.find('li')
-				.should('have.length', 3);
-			WorkflowPage.getters
-				.workflowSettingsSaveManualExecutionsSelect()
-				.find('li')
-				.last()
-				.click({ force: true });
-			WorkflowPage.getters
-				.workflowSettingsSaveExecutionProgressSelect()
-				.find('li')
-				.should('have.length', 3);
-			WorkflowPage.getters
-				.workflowSettingsSaveExecutionProgressSelect()
-				.find('li')
-				.last()
-				.click({ force: true });
+				.should('have.length', totalWorkflows + 2);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsTimezoneSelect().click();
+			getVisibleSelect().find('li').should('exist');
+			getVisibleSelect().find('li').eq(1).click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveFiledExecutionsSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveSuccessExecutionsSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveManualExecutionsSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
+			WorkflowPage.getters.workflowSettingsSaveExecutionProgressSelect().click();
+			getVisibleSelect().find('li').should('have.length', 3);
+			getVisibleSelect().find('li').last().click({ force: true });
 			WorkflowPage.getters.workflowSettingsTimeoutWorkflowSwitch().click();
 			WorkflowPage.getters.workflowSettingsTimeoutForm().find('input').first().type('1');
 			// Save settings
 			WorkflowPage.getters.workflowSettingsSaveButton().click();
 			WorkflowPage.getters.workflowSettingsModal().should('not.exist');
 			WorkflowPage.getters.successToast().should('exist');
-		})
+		});
 	});
 
 	it('should not be able to delete unsaved workflow', () => {
@@ -245,7 +223,7 @@ describe('Workflow Actions', () => {
 				.find('.el-select__tags input')
 				.type(DUPLICATE_WORKFLOW_TAG);
 			WorkflowPage.getters.duplicateWorkflowModal().find('.el-select__tags input').type('{enter}');
-			WorkflowPage.getters.duplicateWorkflowModal().find('.el-select__tags input').type('{enter}');
+			WorkflowPage.getters.duplicateWorkflowModal().find('.el-select__tags input').type('{esc}');
 			WorkflowPage.getters
 				.duplicateWorkflowModal()
 				.find('button')
diff --git a/cypress/pages/credentials.ts b/cypress/pages/credentials.ts
index 7d3bf7ac9855e..733c030caa235 100644
--- a/cypress/pages/credentials.ts
+++ b/cypress/pages/credentials.ts
@@ -5,7 +5,7 @@ export class CredentialsPage extends BasePage {
 	getters = {
 		emptyListCreateCredentialButton: () => cy.getByTestId('empty-resources-list').find('button'),
 		createCredentialButton: () => cy.getByTestId('resources-list-add'),
-		searchInput: () => cy.getByTestId('resources-list-search').find('input'),
+		searchInput: () => cy.getByTestId('resources-list-search'),
 		emptyList: () => cy.getByTestId('resources-list-empty'),
 		credentialCards: () => cy.getByTestId('resources-list-item'),
 		credentialCard: (credentialName: string) =>
@@ -17,8 +17,8 @@ export class CredentialsPage extends BasePage {
 			this.getters.credentialCard(credentialName).findChildByTestId('credential-card-actions'),
 		credentialDeleteButton: () =>
 			cy.getByTestId('action-toggle-dropdown').filter(':visible').contains('Delete'),
-		sort: () => cy.getByTestId('resources-list-sort'),
-		sortOption: (label: string) => this.getters.sort().contains(label).first(),
+		sort: () => cy.getByTestId('resources-list-sort').first(),
+		sortOption: (label: string) => cy.getByTestId('resources-list-sort-item').contains(label).first(),
 		filtersTrigger: () => cy.getByTestId('resources-list-filters-trigger'),
 		filtersDropdown: () => cy.getByTestId('resources-list-filters-dropdown'),
 	};
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index 99d712e7e3f87..312e9edbf56c1 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -20,7 +20,7 @@ export class CredentialsModal extends BasePage {
 		credentialsEditModal: () => cy.getByTestId('credential-edit-dialog'),
 		credentialsAuthTypeSelector: () => cy.getByTestId('node-auth-type-selector'),
 		credentialAuthTypeRadioButtons: () =>
-			this.getters.credentialsAuthTypeSelector().find('label[role=radio]'),
+			this.getters.credentialsAuthTypeSelector().find('label.el-radio'),
 		credentialInputs: () => cy.getByTestId('credential-connection-parameter'),
 		menu: () => this.getters.editCredentialModal().get('.menu-container'),
 		menuItem: (name: string) => this.getters.menu().get('.n8n-menu-item').contains(name),
@@ -42,7 +42,7 @@ export class CredentialsModal extends BasePage {
 		},
 		save: (test = false) => {
 			cy.intercept('POST', '/rest/credentials').as('saveCredential');
-			this.getters.saveButton().click();
+			this.getters.saveButton().click({ force: true });
 
 			cy.wait('@saveCredential');
 			if (test) cy.wait('@testCredential');
diff --git a/cypress/pages/modals/message-box.ts b/cypress/pages/modals/message-box.ts
index cfa38368b8d67..95f259ccb4838 100644
--- a/cypress/pages/modals/message-box.ts
+++ b/cypress/pages/modals/message-box.ts
@@ -5,15 +5,15 @@ export class MessageBox extends BasePage {
 		modal: () => cy.get('.el-message-box', { withinSubject: null }),
 		header: () => this.getters.modal().find('.el-message-box__title'),
 		content: () => this.getters.modal().find('.el-message-box__content'),
-		confirm: () => this.getters.modal().find('.btn--confirm'),
-		cancel: () => this.getters.modal().find('.btn--cancel'),
+		confirm: () => this.getters.modal().find('.btn--confirm').first(),
+		cancel: () => this.getters.modal().find('.btn--cancel').first(),
 	};
 	actions = {
 		confirm: () => {
-			this.getters.confirm().click();
+			this.getters.confirm().click({ force: true});
 		},
 		cancel: () => {
-			this.getters.cancel().click();
+			this.getters.cancel().click({ force: true});
 		},
 	};
 }
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 3d580c1bf49ab..bde403a0fe626 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -1,4 +1,5 @@
 import { BasePage } from './base';
+import { getVisibleSelect } from '../utils';
 
 export class NDV extends BasePage {
 	getters = {
@@ -101,10 +102,11 @@ export class NDV extends BasePage {
 			this.getters.parameterInput(parameterName).type(content);
 		},
 		selectOptionInParameterDropdown: (parameterName: string, content: string) => {
-			this.getters.parameterInput(parameterName).find('.option-headline').contains(content).click();
+			getVisibleSelect().find('.option-headline').contains(content).click();
 		},
 		dismissMappingTooltip: () => {
 			cy.getByTestId('dismiss-mapping-tooltip').click();
+			cy.getByTestId('dismiss-mapping-tooltip').should('not.be.visible');
 		},
 		rename: (newName: string) => {
 			this.getters.nodeNameContainer().click();
@@ -139,11 +141,11 @@ export class NDV extends BasePage {
 		},
 		changeInputRunSelector: (runName: string) => {
 			this.getters.inputRunSelector().click();
-			cy.get('.el-select-dropdown:visible .el-select-dropdown__item').contains(runName).click();
+			getVisibleSelect().find('.el-select-dropdown__item').contains(runName).click();
 		},
 		changeOutputRunSelector: (runName: string) => {
 			this.getters.outputRunSelector().click();
-			cy.get('.el-select-dropdown:visible .el-select-dropdown__item').contains(runName).click();
+			getVisibleSelect().find('.el-select-dropdown__item').contains(runName).click();
 		},
 		toggleOutputRunLinking: () => {
 			this.getters.outputRunSelector().find('button').click();
@@ -159,7 +161,7 @@ export class NDV extends BasePage {
 		},
 		setRLCValue: (paramName: string, value: string) => {
 			this.getters.resourceLocatorModeSelector(paramName).click();
-			this.getters.resourceLocatorModeSelector(paramName).find('li').last().click();
+			getVisibleSelect().find('li').last().click();
 			this.getters.resourceLocatorInput(paramName).type(value);
 		},
 		validateExpressionPreview: (paramName: string, value: string) => {
diff --git a/cypress/pages/settings-log-streaming.ts b/cypress/pages/settings-log-streaming.ts
index b95fcb38bfa63..2d056a4444c04 100644
--- a/cypress/pages/settings-log-streaming.ts
+++ b/cypress/pages/settings-log-streaming.ts
@@ -1,4 +1,5 @@
 import { BasePage } from './base';
+import { getVisibleSelect } from '../utils';
 
 export class SettingsLogStreamingPage extends BasePage {
 	url = '/settings/log-streaming';
@@ -6,11 +7,9 @@ export class SettingsLogStreamingPage extends BasePage {
 		getActionBoxUnlicensed: () => cy.getByTestId('action-box-unlicensed'),
 		getActionBoxLicensed: () => cy.getByTestId('action-box-licensed'),
 		getDestinationModal: () => cy.getByTestId('destination-modal'),
-		getDestinationModalDialog: () => this.getters.getDestinationModal().find('.el-dialog'),
 		getSelectDestinationType: () => cy.getByTestId('select-destination-type'),
 		getDestinationNameInput: () => cy.getByTestId('subtitle-showing-type'),
-		getSelectDestinationTypeItems: () =>
-			this.getters.getSelectDestinationType().find('.el-select-dropdown__item'),
+		getSelectDestinationTypeItems: () => getVisibleSelect().find('.el-select-dropdown__item'),
 		getSelectDestinationButton: () => cy.getByTestId('select-destination-button'),
 		getContactUsButton: () => this.getters.getActionBoxUnlicensed().find('button'),
 		getAddFirstDestinationButton: () => this.getters.getActionBoxLicensed().find('button'),
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index a454837011a19..0b129a29bc81b 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -11,7 +11,7 @@ export class PersonalSettingsPage extends BasePage {
 		lastNameInput: () => cy.getByTestId('lastName').find('input').first(),
 		emailInputContainer: () => cy.getByTestId('email'),
 		emailInput: () => cy.getByTestId('email').find('input').first(),
-		changePasswordLink: () => cy.getByTestId('change-password-link').find('a').first(),
+		changePasswordLink: () => cy.getByTestId('change-password-link').first(),
 		saveSettingsButton: () => cy.getByTestId('save-settings-button'),
 	};
 	actions = {
@@ -34,7 +34,10 @@ export class PersonalSettingsPage extends BasePage {
 		},
 		tryToSetWeakPassword: (oldPassword: string, newPassword: string) => {
 			this.actions.updatePassword(oldPassword, newPassword);
-			changePasswordModal.getters.newPasswordInputContainer().find('div[class^="_errorInput"]').should('exist');
+			changePasswordModal.getters
+				.newPasswordInputContainer()
+				.find('div[class^="_errorInput"]')
+				.should('exist');
 		},
 		updateEmail: (newEmail: string) => {
 			this.getters.emailInput().type('{selectall}').type(newEmail).type('{enter}');
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index 41ae18711468f..d9a2e32df9f8b 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -4,8 +4,8 @@ import { WorkflowPage } from './workflow';
 import { WorkflowsPage } from './workflows';
 import { BasePage } from './base';
 
-const workflowPage =  new WorkflowPage();
-const workflowsPage =  new WorkflowsPage();
+const workflowPage = new WorkflowPage();
+const workflowsPage = new WorkflowsPage();
 const mainSidebar = new MainSidebar();
 const settingsSidebar = new SettingsSidebar();
 
@@ -18,11 +18,15 @@ export class SettingsUsersPage extends BasePage {
 		inviteUsersModalEmailsInput: () => cy.getByTestId('emails').find('input').first(),
 		userListItems: () => cy.get('[data-test-id^="user-list-item"]'),
 		userItem: (email: string) => cy.getByTestId(`user-list-item-${email.toLowerCase()}`),
-		userActionsToggle: (email: string) => this.getters.userItem(email).find('[data-test-id="action-toggle"]'),
-		deleteUserAction: () => cy.getByTestId('action-toggle-dropdown').find('li:contains("Delete"):visible'),
+		userActionsToggle: (email: string) =>
+			this.getters.userItem(email).find('[data-test-id="action-toggle"]'),
+		deleteUserAction: () =>
+			cy.getByTestId('action-toggle-dropdown').find('li:contains("Delete"):visible'),
 		confirmDeleteModal: () => cy.getByTestId('deleteUser-modal').last(),
-		transferDataRadioButton: () => this.getters.confirmDeleteModal().find('[role="radio"]').first(),
-		deleteDataRadioButton: () => this.getters.confirmDeleteModal().find('[role="radio"]').last(),
+		transferDataRadioButton: () =>
+			this.getters.confirmDeleteModal().find('.el-radio .el-radio__input').first(),
+		deleteDataRadioButton: () =>
+			this.getters.confirmDeleteModal().find('.el-radio .el-radio__input').last(),
 		userSelectDropDown: () => this.getters.confirmDeleteModal().find('.n8n-select'),
 		userSelectOptions: () => cy.get('.el-select-dropdown:visible .el-select-dropdown__item'),
 		deleteUserButton: () => this.getters.confirmDeleteModal().find('button:contains("Delete")'),
diff --git a/cypress/pages/variables.ts b/cypress/pages/variables.ts
index 721d874351cfe..6091e5cf1b54a 100644
--- a/cypress/pages/variables.ts
+++ b/cypress/pages/variables.ts
@@ -10,7 +10,7 @@ export class VariablesPage extends BasePage {
 		goToUpgrade: () => cy.getByTestId('go-to-upgrade'),
 		actionBox: () => cy.getByTestId('action-box'),
 		emptyResourcesListNewVariableButton: () => this.getters.emptyResourcesList().find('button'),
-		searchBar: () => cy.getByTestId('resources-list-search').find('input'),
+		searchBar: () => cy.getByTestId('resources-list-search'),
 		createVariableButton: () => cy.getByTestId('resources-list-add'),
 		variablesRows: () => cy.getByTestId('variables-row'),
 		variablesEditableRows: () =>
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index d324314dcc2d0..72aca5977ab90 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -1,5 +1,6 @@
 import { META_KEY } from '../constants';
 import { BasePage } from './base';
+import { getVisibleSelect } from '../utils';
 
 export class WorkflowPage extends BasePage {
 	url = '/workflow/new';
@@ -16,7 +17,7 @@ export class WorkflowPage extends BasePage {
 		nthTagPill: (n: number) =>
 			cy.get(`[data-test-id="workflow-tags-container"] span.tags > span:nth-child(${n})`),
 		tagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
-		tagsInDropdown: () => cy.getByTestId('workflow-tags-dropdown').find('li').filter('.tag'),
+		tagsInDropdown: () => getVisibleSelect().find('li').filter('.tag'),
 		createTagButton: () => cy.getByTestId('new-tag-link'),
 		saveButton: () => cy.getByTestId('workflow-save-button'),
 		nodeCreatorSearchBar: () => cy.getByTestId('node-creator-search-bar'),
@@ -37,8 +38,8 @@ export class WorkflowPage extends BasePage {
 		canvasNodePlusEndpointByName: (nodeName: string, index = 0) => {
 			return cy.get(this.getters.getEndpointSelector('plus', nodeName, index));
 		},
-		successToast: () => cy.get('.el-notification .el-icon-success').parent(),
-		errorToast: () => cy.get('.el-notification .el-icon-error'),
+		successToast: () => cy.get('.el-notification .el-notification--success').parent(),
+		errorToast: () => cy.get('.el-notification .el-notification--error'),
 		activatorSwitch: () => cy.getByTestId('workflow-activate-switch'),
 		workflowMenu: () => cy.getByTestId('workflow-menu'),
 		firstStepButton: () => cy.getByTestId('canvas-add-button'),
@@ -84,7 +85,8 @@ export class WorkflowPage extends BasePage {
 		duplicateWorkflowModal: () => cy.getByTestId('duplicate-modal'),
 		nodeViewBackground: () => cy.getByTestId('node-view-background'),
 		nodeView: () => cy.getByTestId('node-view'),
-		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input').find('[role=textbox]'),
+		inlineExpressionEditorInput: () =>
+			cy.getByTestId('inline-expression-editor-input').find('[role=textbox]'),
 		inlineExpressionEditorOutput: () => cy.getByTestId('inline-expression-editor-output'),
 		zoomInButton: () => cy.getByTestId('zoom-in-button'),
 		zoomOutButton: () => cy.getByTestId('zoom-out-button'),
@@ -92,8 +94,10 @@ export class WorkflowPage extends BasePage {
 		executeWorkflowButton: () => cy.getByTestId('execute-workflow-button'),
 		clearExecutionDataButton: () => cy.getByTestId('clear-execution-data-button'),
 		stopExecutionButton: () => cy.getByTestId('stop-execution-button'),
-		stopExecutionWaitingForWebhookButton: () => cy.getByTestId('stop-execution-waiting-for-webhook-button'),
+		stopExecutionWaitingForWebhookButton: () =>
+			cy.getByTestId('stop-execution-waiting-for-webhook-button'),
 		nodeCredentialsSelect: () => cy.getByTestId('node-credentials-select'),
+		nodeCredentialsCreateOption: () => cy.getByTestId('node-credentials-select-item-new'),
 		nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'),
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
 		ndvParameters: () => cy.getByTestId('parameter-item'),
@@ -134,17 +138,17 @@ export class WorkflowPage extends BasePage {
 
 			this.getters.nodeCreatorSearchBar().type(nodeDisplayName);
 			this.getters.nodeCreatorSearchBar().type('{enter}');
-			cy.wait(500)
+			cy.wait(500);
 			cy.get('body').then((body) => {
-				if(body.find('[data-test-id=node-creator]').length > 0) {
-					if(action) {
-						cy.contains(action).click()
+				if (body.find('[data-test-id=node-creator]').length > 0) {
+					if (action) {
+						cy.contains(action).click();
 					} else {
 						// Select the first action
-						cy.get('[data-keyboard-nav-type="action"]').eq(0).click()
+						cy.get('[data-keyboard-nav-type="action"]').eq(0).click();
 					}
 				}
-			})
+			});
 
 			if (!preventNdvClose) cy.get('body').type('{esc}');
 		},
@@ -157,7 +161,8 @@ export class WorkflowPage extends BasePage {
 		},
 		openTagManagerModal: () => {
 			this.getters.createTagButton().click();
-			this.getters.tagsDropdown().find('li.manage-tags').first().click();
+			this.getters.tagsDropdown().click();
+			getVisibleSelect().find('li.manage-tags').first().click();
 		},
 		openInlineExpressionEditor: () => {
 			cy.contains('Expression').invoke('show').click();
@@ -209,7 +214,7 @@ export class WorkflowPage extends BasePage {
 				this.getters.workflowTagsInput().type(tag);
 				this.getters.workflowTagsInput().type('{enter}');
 			});
-			cy.get('body').type('{enter}');
+			cy.get('body').click(0, 0);
 			// For a brief moment the Element UI tag component shows the tags as(+X) string
 			// so we need to wait for it to disappear
 			this.getters.workflowTagsContainer().should('not.contain', `+${tags.length}`);
@@ -241,7 +246,12 @@ export class WorkflowPage extends BasePage {
 		executeWorkflow: () => {
 			this.getters.executeWorkflowButton().click();
 		},
-		addNodeBetweenNodes: (sourceNodeName: string, targetNodeName: string, newNodeName: string, action?: string) => {
+		addNodeBetweenNodes: (
+			sourceNodeName: string,
+			targetNodeName: string,
+			newNodeName: string,
+			action?: string,
+		) => {
 			this.getters.getConnectionBetweenNodes(sourceNodeName, targetNodeName).first().realHover();
 			this.getters
 				.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName)
@@ -268,18 +278,10 @@ export class WorkflowPage extends BasePage {
 			this.getters.addStickyButton().click();
 		},
 		deleteSticky: () => {
-			this.getters.stickies().eq(0)
-				.realHover()
-				.find('[data-test-id="delete-sticky"]')
-				.click();
+			this.getters.stickies().eq(0).realHover().find('[data-test-id="delete-sticky"]').click();
 		},
 		editSticky: (content: string) => {
-			this.getters.stickies()
-				.dblclick()
-				.find('textarea')
-				.clear()
-				.type(content)
-				.type('{esc}');
+			this.getters.stickies().dblclick().find('textarea').clear().type(content).type('{esc}');
 		},
 	};
 }
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index d5700d07841fa..416528e85c87b 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -5,7 +5,7 @@ export class WorkflowsPage extends BasePage {
 	getters = {
 		newWorkflowButtonCard: () => cy.getByTestId('new-workflow-card'),
 		newWorkflowTemplateCard: () => cy.getByTestId('new-workflow-template-card'),
-		searchBar: () => cy.getByTestId('resources-list-search').find('input'),
+		searchBar: () => cy.getByTestId('resources-list-search'),
 		createWorkflowButton: () => cy.getByTestId('resources-list-add'),
 		workflowCards: () => cy.getByTestId('resources-list-item'),
 		workflowCard: (workflowName: string) =>
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 6c7adaea8f84b..1a1925b6a4697 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -53,12 +53,12 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 });
 
 Cypress.Commands.add('signout', () => {
-	cy.request('POST', '/rest/logout');
+	cy.request('POST', `${BACKEND_BASE_URL}/rest/logout`);
 	cy.getCookie(N8N_AUTH_COOKIE).should('not.exist');
 });
 
 Cypress.Commands.add('interceptREST', (method, url) => {
-	cy.intercept(method, `http://localhost:5678/rest${url}`);
+	cy.intercept(method, `${BACKEND_BASE_URL}/rest${url}`);
 });
 
 const setFeature = (feature: string, enabled: boolean) =>
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index dc3079282f232..a750918c6d051 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -6,6 +6,10 @@ before(() => {
 		owner: INSTANCE_OWNER,
 		members: INSTANCE_MEMBERS,
 	});
+
+	Cypress.on('uncaught:exception', (err) => {
+		return !err.message.includes('ResizeObserver');
+	});
 });
 
 beforeEach(() => {
diff --git a/cypress/utils/index.ts b/cypress/utils/index.ts
new file mode 100644
index 0000000000000..1929454b184ac
--- /dev/null
+++ b/cypress/utils/index.ts
@@ -0,0 +1 @@
+export * from './popper';
diff --git a/cypress/utils/modal.ts b/cypress/utils/modal.ts
new file mode 100644
index 0000000000000..4b260ca9e858a
--- /dev/null
+++ b/cypress/utils/modal.ts
@@ -0,0 +1,3 @@
+export function getVisibleModalOverlay() {
+	return cy.get('.el-overlay .el-overlay-dialog').filter(':visible');
+}
diff --git a/cypress/utils/popper.ts b/cypress/utils/popper.ts
new file mode 100644
index 0000000000000..846b2ec88e39d
--- /dev/null
+++ b/cypress/utils/popper.ts
@@ -0,0 +1,11 @@
+export function getVisiblePopper() {
+	return cy.get('.el-popper').filter(':visible');
+}
+
+export function getVisibleSelect() {
+	return getVisiblePopper().filter('.el-select__popper');
+}
+
+export function getVisibleDropdown() {
+	return getVisiblePopper().filter('.el-dropdown__popper');
+}
diff --git a/package.json b/package.json
index 4784ccb8469ec..015172f52aedd 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,6 @@
     "@ngneat/falso": "^6.1.0",
     "@types/jest": "^29.5.0",
     "@types/supertest": "^2.0.12",
-    "@vitejs/plugin-vue2": "^2.2.0",
     "@vitest/coverage-c8": "^0.28.5",
     "c8": "^7.12.0",
     "cross-env": "^7.0.3",
@@ -64,7 +63,6 @@
     "typescript": "*",
     "vite": "^4.0.4",
     "vitest": "^0.28.5",
-    "vue-template-compiler": "^2.7.14",
     "vue-tsc": "^1.0.24"
   },
   "pnpm": {
@@ -92,7 +90,6 @@
       "qqjs>globby": "^11.1.0"
     },
     "patchedDependencies": {
-      "element-ui@2.15.12": "patches/element-ui@2.15.12.patch",
       "typedi@0.10.0": "patches/typedi@0.10.0.patch",
       "@sentry/cli@2.17.0": "patches/@sentry__cli@2.17.0.patch",
       "pkce-challenge@3.0.0": "patches/pkce-challenge@3.0.0.patch",
diff --git a/packages/@n8n_io/eslint-config/frontend.js b/packages/@n8n_io/eslint-config/frontend.js
index e36d4c33b7938..a93c510e2052a 100644
--- a/packages/@n8n_io/eslint-config/frontend.js
+++ b/packages/@n8n_io/eslint-config/frontend.js
@@ -4,7 +4,7 @@
 module.exports = {
 	plugins: ['vue'],
 
-	extends: ['plugin:vue/essential', '@vue/typescript', './base'],
+	extends: ['plugin:vue/vue3-essential', '@vue/typescript', './base'],
 
 	env: {
 		browser: true,
@@ -37,6 +37,12 @@ module.exports = {
 		'vue/no-unused-components': 'error',
 		'vue/multi-word-component-names': 'off',
 
+		// TODO: fix these
+		'@typescript-eslint/no-unsafe-call': 'off',
+		'@typescript-eslint/no-unsafe-assignment': 'off',
+		'@typescript-eslint/restrict-template-expressions': 'off',
+		'@typescript-eslint/unbound-method': 'off',
+
 		// TODO: remove these
 		'vue/no-mutating-props': 'warn',
 		'vue/no-side-effects-in-computed-properties': 'warn',
diff --git a/packages/design-system/.storybook/font-awesome-icons.js b/packages/design-system/.storybook/font-awesome-icons.js
deleted file mode 100644
index 8713b3b6613f6..0000000000000
--- a/packages/design-system/.storybook/font-awesome-icons.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * These icons are only defined for storybook build
- * Editor icons are defined seperately
- */
-import { library } from '@fortawesome/fontawesome-svg-core';
-import { fas } from '@fortawesome/free-solid-svg-icons';
-
-library.add(fas);
diff --git a/packages/design-system/.storybook/main.js b/packages/design-system/.storybook/main.js
index d3a302a1b40a4..8db209694203f 100644
--- a/packages/design-system/.storybook/main.js
+++ b/packages/design-system/.storybook/main.js
@@ -1,59 +1,42 @@
-const path = require('path');
+const { mergeConfig } = require('vite');
+const { resolve } = require('path');
 
-/**
- * @type {import('@storybook/types').StorybookConfig}
- */
 module.exports = {
-	framework: {
-		name: '@storybook/vue-webpack5',
-		options: {},
-	},
-	stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.{ts,js}'],
+	stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
 	addons: [
+		'@storybook/addon-styling',
 		'@storybook/addon-links',
 		'@storybook/addon-essentials',
-		{
-			name: '@storybook/addon-postcss',
-			options: {
-				postcssLoaderOptions: {
-					implementation: require('postcss'),
-				},
-			},
-		},
-		'storybook-addon-themes',
+		// Disabled until this is actually used rather otherwise its a blank tab
+		// '@storybook/addon-interactions',
+		'@storybook/addon-a11y',
+		'storybook-dark-mode',
 	],
-	webpackFinal: async (config) => {
-		config.module.rules.push({
-			test: /\.scss$/,
-			oneOf: [
-				{
-					resourceQuery: /module/,
-					use: [
-						'vue-style-loader',
-						{
-							loader: 'css-loader',
-							options: {
-								modules: {
-									localIdentName: '[path][name]__[local]--[hash:base64:5]',
-								},
-							},
-						},
-						'sass-loader',
-					],
-					include: path.resolve(__dirname, '../'),
-				},
-				{
-					use: ['vue-style-loader', 'css-loader', 'sass-loader'],
-					include: path.resolve(__dirname, '../'),
-				},
-			],
+	staticDirs: ['../public'],
+	framework: {
+		name: '@storybook/vue3-vite',
+		options: {},
+	},
+	disableTelemetry: true,
+	async viteFinal(config, { configType }) {
+		// return the customized config
+		return mergeConfig(config, {
+			// customize the Vite config here
+			resolve: {
+				alias: [
+					{
+						find: /^@n8n-design-system\//,
+						replacement: `${resolve(__dirname, '..')}/src/`,
+					},
+					{
+						find: /^n8n-design-system$/,
+						replacement: `${resolve(__dirname, '..')}/src/main.ts`,
+					},
+				],
+			},
 		});
-
-		config.resolve.alias = {
-			...config.resolve.alias,
-			'@/': path.resolve(__dirname, '../src/'),
-		};
-
-		return config;
+	},
+	docs: {
+		autodocs: true,
 	},
 };
diff --git a/packages/design-system/.storybook/preview.js b/packages/design-system/.storybook/preview.js
index 1e01ec1dd4fdc..49708b358aec6 100644
--- a/packages/design-system/.storybook/preview.js
+++ b/packages/design-system/.storybook/preview.js
@@ -1,23 +1,24 @@
-import './font-awesome-icons';
+import { setup } from '@storybook/vue3';
+
 import './storybook.scss';
 
-import ElementUI from 'element-ui';
-import lang from 'element-ui/lib/locale/lang/en';
-import locale from 'element-ui/lib/locale';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { fas } from '@fortawesome/free-solid-svg-icons';
 
-import { N8nPlugin } from '../src/plugin';
+import ElementPlus from 'element-plus';
+import lang from 'element-plus/lib/locale/lang/en';
 
-import Vue from 'vue';
+import { N8nPlugin } from '../src/plugin';
 
-Vue.use(ElementUI);
-Vue.use(N8nPlugin);
+setup((app) => {
+	library.add(fas);
 
-locale.use(lang);
+	app.use(ElementPlus, {
+		locale: lang,
+	});
 
-// https://github.com/storybookjs/storybook/issues/6153
-Vue.prototype.toJSON = function () {
-	return this;
-};
+	app.use(N8nPlugin);
+});
 
 export const parameters = {
 	actions: {
diff --git a/packages/design-system/.storybook/storybook.scss b/packages/design-system/.storybook/storybook.scss
index 125f7d57a871b..ab48133c1eed9 100644
--- a/packages/design-system/.storybook/storybook.scss
+++ b/packages/design-system/.storybook/storybook.scss
@@ -1,12 +1,17 @@
 @use './fonts.scss';
 
-@use '~/src/css/base.scss' with (
-	$font-path: '~element-ui/lib/theme-chalk/fonts'
-);
+@use '../src/css/base.scss'; // @TODO CHECK IF NEEDED with (
+//	$font-path: 'element-ui/lib/theme-chalk/fonts'
+//);
 
-@use '~/src/css/reset.scss';
-@use '~/src/css/index.scss';
+@use '../src/css/reset.scss';
+@use '../src/css/index.scss';
 
 .multi-container > * {
 	margin-bottom: 10px;
 }
+
+#storybook-root > div:not([class]) > *,
+#storybook-root > * {
+		margin: var(--spacing-5xs);
+}
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index d121f71adffd9..0e7b3b07a8a47 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -40,38 +40,43 @@
   "devDependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/vue-fontawesome": "^2.0.9",
-    "@storybook/addon-actions": "^7.0.7",
-    "@storybook/addon-docs": "^7.0.7",
-    "@storybook/addon-essentials": "^7.0.7",
-    "@storybook/addon-links": "^7.0.7",
-    "@storybook/addon-postcss": "^3.0.0-alpha.1",
-    "@storybook/vue": "^7.0.7",
-    "@storybook/vue-webpack5": "^7.0.7",
+    "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@storybook/addon-a11y": "^7.0.21",
+    "@storybook/addon-actions": "^7.0.21",
+    "@storybook/addon-docs": "^7.0.21",
+    "@storybook/addon-essentials": "^7.0.21",
+    "@storybook/addon-links": "^7.0.21",
+    "@storybook/addon-postcss": "3.0.0-alpha.1",
+    "@storybook/addon-styling": "^1.3.0",
+    "@storybook/vue3": "^7.0.21",
+    "@storybook/vue3-vite": "^7.0.21",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/user-event": "^14.4.3",
-    "@testing-library/vue": "^5.8.3",
+    "@testing-library/vue": "^6.6.1",
     "@types/markdown-it": "^12.2.3",
     "@types/markdown-it-emoji": "^2.0.2",
     "@types/markdown-it-link-attributes": "^3.0.1",
-    "@types/sanitize-html": "^2.8.0",
-    "autoprefixer": "^10.4.13",
-    "core-js": "^3.27.2",
+    "@types/sanitize-html": "^2.9.0",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vue/test-utils": "^2.4.1",
+    "autoprefixer": "^10.4.14",
+    "core-js": "^3.31.0",
     "jsdom": "21.1.0",
-    "sass": "^1.58.0",
-    "sass-loader": "^13.2.0",
-    "storybook": "^7.0.7",
-    "storybook-addon-themes": "^6.1.0"
+    "sass": "^1.63.4",
+    "sass-loader": "^13.3.2",
+    "storybook": "^7.0.21",
+    "storybook-addon-themes": "^6.1.0",
+    "storybook-dark-mode": "^3.0.0"
   },
   "dependencies": {
-    "element-ui": "~2.15.12",
+    "element-plus": "^2.3.6",
     "markdown-it": "^13.0.1",
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-lists": "^2.1.1",
     "sanitize-html": "2.10.0",
-    "vue": "^2.7.14",
-    "vue2-boring-avatars": "^0.3.8",
+    "vue": "^3.3.4",
+    "vue-boring-avatars": "^1.3.0",
     "xss": "^1.0.14"
   }
 }
diff --git a/packages/design-system/public/assets/images/storybook-logo-dark.png b/packages/design-system/public/assets/images/storybook-logo-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa5e878f0b6ed1a37158a9c6cf8a18d51a0cd304
GIT binary patch
literal 8215
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

literal 0
HcmV?d00001

diff --git a/packages/design-system/public/assets/images/storybook-logo-light.png b/packages/design-system/public/assets/images/storybook-logo-light.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a99ee7e71fdd8cc4f9562bbb1114c2d47323fa4
GIT binary patch
literal 3812
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
A4gdfE

literal 0
HcmV?d00001

diff --git a/packages/design-system/src/__tests__/setup.ts b/packages/design-system/src/__tests__/setup.ts
index 7b0828bfa80fb..1734bac34f9f6 100644
--- a/packages/design-system/src/__tests__/setup.ts
+++ b/packages/design-system/src/__tests__/setup.ts
@@ -1 +1,5 @@
 import '@testing-library/jest-dom';
+import { config } from '@vue/test-utils';
+import { N8nPlugin } from '@/plugin';
+
+config.global.plugins = [N8nPlugin];
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts b/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
index dfc6d27cf74fe..b8d90ca151297 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
@@ -1,6 +1,6 @@
 import N8nActionBox from './ActionBox.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/ActionBox',
@@ -9,8 +9,8 @@ export default {
 		calloutTheme: {
 			control: {
 				type: 'select',
-				options: ['info', 'success', 'warning', 'danger', 'custom'],
 			},
+			options: ['info', 'success', 'warning', 'danger', 'custom'],
 		},
 	},
 	parameters: {
@@ -23,11 +23,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nActionBox,
 	},
-	template: '<n8n-action-box v-bind="$props" @click="onClick" />',
+	template: '<n8n-action-box v-bind="args" @click="onClick" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index a21f6e00d5f75..3995e083491d3 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -20,7 +20,7 @@
 			:label="buttonText"
 			:type="buttonType"
 			size="large"
-			@click="$emit('click', $event)"
+			@click="$emit('click:button', $event)"
 		/>
 		<n8n-callout
 			v-if="calloutText"
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts b/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
index 635836bd1d064..72a59953ccb57 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
@@ -11,7 +11,9 @@ describe('N8NActionBox', () => {
 					'Long description that you should know something is the way it is because of how it is. ',
 				buttonText: 'Do something',
 			},
-			stubs: ['n8n-heading', 'n8n-text', 'n8n-button', 'n8n-callout'],
+			global: {
+				stubs: ['n8n-heading', 'n8n-text', 'n8n-button', 'n8n-callout'],
+			},
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
index 40c7e9f605076..491d107483b22 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
@@ -1,15 +1,15 @@
 // Vitest Snapshot v1
 
 exports[`N8NActionBox > should render correctly 1`] = `
-"<div data-test-id=\\"action-box\\" class=\\"n8n-action-box container\\">
-  <div class=\\"emoji\\"> 😿 </div>
+"<div class=\\"n8n-action-box container\\" data-test-id=\\"action-box\\">
+  <div class=\\"emoji\\">😿</div>
   <div class=\\"heading\\">
-    <n8n-heading-stub tag=\\"span\\" size=\\"xlarge\\" align=\\"center\\">Headline you need to know</n8n-heading-stub>
+    <n8n-heading-stub align=\\"center\\" tag=\\"span\\" bold=\\"false\\" size=\\"xlarge\\"></n8n-heading-stub>
   </div>
   <div class=\\"description\\">
-    <n8n-text-stub size=\\"medium\\" color=\\"text-base\\" tag=\\"span\\"><span>Long description that you should know something is the way it is because of how it is. </span></n8n-text-stub>
+    <n8n-text-stub color=\\"text-base\\" bold=\\"false\\" size=\\"medium\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub>
   </div>
-  <n8n-button-stub label=\\"Do something\\" type=\\"primary\\" size=\\"large\\"></n8n-button-stub>
-  <!---->
+  <n8n-button-stub label=\\"Do something\\" type=\\"primary\\" size=\\"large\\" loading=\\"false\\" disabled=\\"false\\" outline=\\"false\\" text=\\"false\\" block=\\"false\\" active=\\"false\\" square=\\"false\\"></n8n-button-stub>
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
index feb43c23bf2ee..8e229231df646 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
@@ -1,5 +1,5 @@
 import N8nActionDropdown from './ActionDropdown.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/ActionDropdown',
@@ -8,8 +8,8 @@ export default {
 		placement: {
 			control: {
 				type: 'select',
-				options: ['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'],
 			},
+			options: ['top', 'top-end', 'top-start', 'bottom', 'bottom-end', 'bottom-start'],
 		},
 		activatorIcon: {
 			control: {
@@ -19,18 +19,19 @@ export default {
 		trigger: {
 			control: {
 				type: 'select',
-				options: ['click', 'hover'],
 			},
+			options: ['click', 'hover'],
 		},
 	},
 };
 
 const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nActionDropdown,
 	},
-	template: '<n8n-action-dropdown v-bind="$props" />',
+	template: '<n8n-action-dropdown v-bind="args" />',
 });
 
 export const defaultActionDropdown = template.bind({});
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
index 0c2177663310d..e37ddfa1e8c1d 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
@@ -6,7 +6,7 @@
 			@command="onSelect"
 			ref="elementDropdown"
 		>
-			<div :class="$style.activator" @click.prevent @blur="onButtonBlur">
+			<div :class="$style.activator" @click.stop.prevent @blur="onButtonBlur">
 				<n8n-icon :icon="activatorIcon" />
 			</div>
 			<template #dropdown>
@@ -36,11 +36,7 @@
 <script lang="ts">
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
-import {
-	Dropdown as ElDropdown,
-	DropdownMenu as ElDropdownMenu,
-	DropdownItem as ElDropdownItem,
-} from 'element-ui';
+import { ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus';
 import N8nIcon from '../N8nIcon';
 
 export interface IActionDropdownItem {
@@ -108,12 +104,11 @@ export default defineComponent({
 			this.$emit('select', action);
 		},
 		onButtonBlur(event: FocusEvent): void {
-			const elementDropdown = this.$refs.elementDropdown as
-				| (Vue & { hide: () => void })
-				| undefined;
+			const elementDropdown = this.$refs.elementDropdown as InstanceType<ElDropdown>;
+
 			// Hide dropdown when clicking outside of current document
-			if (elementDropdown && event.relatedTarget === null) {
-				elementDropdown.hide();
+			if (elementDropdown?.handleClose && event.relatedTarget === null) {
+				elementDropdown.handleClose();
 			}
 		},
 	},
@@ -121,6 +116,10 @@ export default defineComponent({
 </script>
 
 <style lang="scss" module>
+.userActionsMenu {
+	min-width: 160px;
+}
+
 .activator {
 	cursor: pointer;
 	padding: var(--spacing-2xs);
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts b/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
index 8af723b476b47..bcbc2f1486a56 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
@@ -6,6 +6,7 @@ describe('components', () => {
 		it('should render default styling correctly', () => {
 			const wrapper = render(N8nActionDropdown, {
 				props: {
+					teleported: false,
 					items: [
 						{
 							id: 'item1',
@@ -17,10 +18,13 @@ describe('components', () => {
 						},
 					],
 				},
-				stubs: ['n8n-icon', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				global: {
+					stubs: ['n8n-icon', 'el-tooltip', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
+
 		it('should render custom styling correctly', () => {
 			const wrapper = render(N8nActionDropdown, {
 				props: {
@@ -44,7 +48,9 @@ describe('components', () => {
 						},
 					],
 				},
-				stubs: ['n8n-icon', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				global: {
+					stubs: ['n8n-icon', 'el-dropdown', 'el-dropdown-menu', 'el-dropdown-item'],
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
index 5b1bee501d77b..56a9fe695dced 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
@@ -2,20 +2,12 @@
 
 exports[`components > N8nActionDropdown > should render custom styling correctly 1`] = `
 "<div class=\\"action-dropdown-container actionDropdownContainer\\">
-  <el-dropdown-stub trigger=\\"click\\" size=\\"\\" hideonclick=\\"true\\" placement=\\"bottom\\" visiblearrow=\\"true\\" showtimeout=\\"250\\" hidetimeout=\\"150\\" tabindex=\\"0\\">
-    <div class=\\"activator\\">
-      <n8n-icon-stub icon=\\"ellipsis-v\\" size=\\"medium\\"></n8n-icon-stub>
-    </div>
-  </el-dropdown-stub>
+  <el-dropdown-stub trigger=\\"click\\" effect=\\"light\\" placement=\\"bottom\\" popperoptions=\\"[object Object]\\" size=\\"\\" splitbutton=\\"false\\" hideonclick=\\"true\\" loop=\\"true\\" showtimeout=\\"150\\" hidetimeout=\\"150\\" tabindex=\\"0\\" maxheight=\\"\\" popperclass=\\"\\" disabled=\\"false\\" role=\\"menu\\" teleported=\\"true\\"></el-dropdown-stub>
 </div>"
 `;
 
 exports[`components > N8nActionDropdown > should render default styling correctly 1`] = `
-"<div class=\\"action-dropdown-container actionDropdownContainer\\">
-  <el-dropdown-stub trigger=\\"click\\" size=\\"\\" hideonclick=\\"true\\" placement=\\"bottom\\" visiblearrow=\\"true\\" showtimeout=\\"250\\" hidetimeout=\\"150\\" tabindex=\\"0\\">
-    <div class=\\"activator\\">
-      <n8n-icon-stub icon=\\"ellipsis-v\\" size=\\"medium\\"></n8n-icon-stub>
-    </div>
-  </el-dropdown-stub>
+"<div class=\\"action-dropdown-container actionDropdownContainer\\" teleported=\\"false\\">
+  <el-dropdown-stub trigger=\\"click\\" effect=\\"light\\" placement=\\"bottom\\" popperoptions=\\"[object Object]\\" size=\\"\\" splitbutton=\\"false\\" hideonclick=\\"true\\" loop=\\"true\\" showtimeout=\\"150\\" hidetimeout=\\"150\\" tabindex=\\"0\\" maxheight=\\"\\" popperclass=\\"\\" disabled=\\"false\\" role=\\"menu\\" teleported=\\"true\\"></el-dropdown-stub>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts b/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
index 2cf094b4db9d5..bf52cfe3e5d02 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
@@ -1,6 +1,6 @@
 import N8nActionToggle from './ActionToggle.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/ActionToggle',
@@ -25,12 +25,14 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nActionToggle,
 	},
-	template:
-		'<div style="height:300px;width:300px;display:flex;align-items:center;justify-content:center"><n8n-action-toggle v-bind="$props" @action="onAction" /></div>',
+	template: `<div style="height:300px; width:300px; display:flex; align-items:center; justify-content:center">
+			<n8n-action-toggle v-bind="args" @action="onAction" />
+		</div>`,
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
index 471c1e3dc0d04..4b92dd4d74780 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
@@ -1,10 +1,9 @@
 <template>
-	<span :class="$style.container" data-test-id="action-toggle">
+	<span @click.stop.prevent :class="$style.container" data-test-id="action-toggle">
 		<el-dropdown
 			:placement="placement"
 			:size="size"
 			trigger="click"
-			@click.native.stop
 			@command="onCommand"
 			@visible-change="onVisibleChange"
 		>
@@ -42,11 +41,7 @@
 <script lang="ts">
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
-import {
-	Dropdown as ElDropdown,
-	DropdownMenu as ElDropdownMenu,
-	DropdownItem as ElDropdownItem,
-} from 'element-ui';
+import { ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus';
 import N8nIcon from '../N8nIcon';
 import type { UserAction } from '@/types';
 
diff --git a/packages/design-system/src/components/N8nAlert/Alert.stories.ts b/packages/design-system/src/components/N8nAlert/Alert.stories.ts
index 8a4eb35da4976..97ef9c8a0b434 100644
--- a/packages/design-system/src/components/N8nAlert/Alert.stories.ts
+++ b/packages/design-system/src/components/N8nAlert/Alert.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nAlert from './Alert.vue';
 import N8nIcon from '../N8nIcon';
 
@@ -18,12 +18,13 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nAlert,
 	},
 	template:
-		'<div style="position: relative; width: 100%; height: 300px;"><n8n-alert v-bind="$props"><template #aside>custom content slot</template></n8n-alert></div>',
+		'<div style="position: relative; width: 100%; height: 300px;"><n8n-alert v-bind="args"><template #aside>custom content slot</template></n8n-alert></div>',
 });
 
 export const ContentAsProps = Template.bind({});
@@ -38,15 +39,16 @@ ContentAsProps.args = {
 };
 
 const TemplateForSlots: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nAlert,
 		N8nIcon,
 	},
 	template: `<div style="position: relative; width: 100%; height: 300px;">
-			  <n8n-alert v-bind="$props">
+			  <n8n-alert v-bind="args">
 					<template #title>Title</template>
-					<template>Description</template>
+					Description
 					<template #aside><button>Button</button></template>
 					<template #icon>
 						<n8n-icon icon="grin-stars" size="xlarge" />
diff --git a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts b/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
index ea97015d889bc..6be8dc2f103d1 100644
--- a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
+++ b/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
@@ -14,21 +14,20 @@ describe('components', () => {
 		});
 
 		it('should render slots instead of props', () => {
-			const { container } = render(
-				N8nAlert,
-				{
-					props: { showIcon: false },
-					slots: {
-						title: 'Title',
-						default: 'Message',
-						aside: '<button>Click me</button>',
-						icon: '<n8n-icon icon="plus-circle" />',
-					},
+			const { container } = render(N8nAlert, {
+				props: { showIcon: false },
+				slots: {
+					title: 'Title',
+					default: 'Message',
+					aside: '<button>Click me</button>',
+					icon: '<n8n-icon icon="plus-circle" />',
 				},
-				(localVue) => {
-					localVue.component('n8n-icon', N8nIcon);
+				global: {
+					components: {
+						'n8n-icon': N8nIcon,
+					},
 				},
-			);
+			});
 			expect(screen.getByRole('alert')).toBeVisible();
 			expect(screen.getByText('Title')).toBeVisible();
 			expect(screen.getByText('Message')).toBeVisible();
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts b/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
index b690009016421..fe58696d18cbf 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nAvatar from './Avatar.vue';
 
 export default {
@@ -13,14 +13,16 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nAvatar,
 	},
-	template: '<n8n-avatar v-bind="$props" />',
+	template: '<n8n-avatar v-bind="args" />',
 });
 
 export const Avatar = Template.bind({});
 Avatar.args = {
-	name: 'Sunny Side',
+	firstName: 'Sunny',
+	lastName: 'Side',
 };
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/design-system/src/components/N8nAvatar/Avatar.vue
index 7f2d8c201aca4..56ff8880e434a 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.vue
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.vue
@@ -1,6 +1,6 @@
 <template>
-	<span :class="['n8n-avatar', $style.container]" v-on="$listeners">
-		<avatar
+	<span :class="['n8n-avatar', $style.container]" v-bind="$attrs">
+		<Avatar
 			v-if="firstName"
 			:size="getSize(size)"
 			:name="firstName + ' ' + lastName"
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts">
-import Avatar from 'vue2-boring-avatars';
+import Avatar from 'vue-boring-avatars';
 
 const sizes: { [size: string]: number } = {
 	small: 28,
@@ -28,9 +28,11 @@ export default defineComponent({
 	props: {
 		firstName: {
 			type: String,
+			default: '',
 		},
 		lastName: {
 			type: String,
+			default: '',
 		},
 		size: {
 			type: String,
@@ -47,7 +49,7 @@ export default defineComponent({
 		},
 	},
 	components: {
-		Avatar, // eslint-disable-line @typescript-eslint/no-unsafe-assignment
+		Avatar,
 	},
 	computed: {
 		initials() {
diff --git a/packages/design-system/src/components/N8nBadge/Badge.stories.ts b/packages/design-system/src/components/N8nBadge/Badge.stories.ts
index ac4d178eda5da..e8442fd6a0f7f 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.stories.ts
+++ b/packages/design-system/src/components/N8nBadge/Badge.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nBadge from './Badge.vue';
 
 export default {
@@ -17,11 +17,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nBadge,
 	},
-	template: '<n8n-badge v-bind="$props">Badge</n8n-badge>',
+	template: '<n8n-badge v-bind="args">Badge</n8n-badge>',
 });
 
 export const Badge = Template.bind({});
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts b/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
index 7a5ed3653522b..250f329da9b1f 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
+++ b/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
@@ -14,7 +14,9 @@ describe('components', () => {
 					slots: {
 						default: '<n8n-text>Default badge</n8n-text>',
 					},
-					stubs: ['n8n-text'],
+					global: {
+						stubs: ['n8n-text'],
+					},
 				});
 				expect(wrapper.html()).toMatchSnapshot();
 			});
@@ -28,7 +30,9 @@ describe('components', () => {
 					slots: {
 						default: '<n8n-text>Secondary badge</n8n-text>',
 					},
-					stubs: ['n8n-text'],
+					global: {
+						stubs: ['n8n-text'],
+					},
 				});
 				expect(wrapper.html()).toMatchSnapshot();
 			});
@@ -37,7 +41,9 @@ describe('components', () => {
 					slots: {
 						default: '<n8n-text>A Badge</n8n-text>',
 					},
-					stubs: ['n8n-text'],
+					global: {
+						stubs: ['n8n-text'],
+					},
 				});
 				expect(wrapper.html()).toMatchSnapshot();
 			});
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap b/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
index e4fa2710fedab..5749263b7bbae 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
+++ b/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
@@ -1,7 +1,7 @@
 // Vitest Snapshot v1
 
-exports[`components > N8nBadge > props > should render default theme correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub bold=\\"true\\" size=\\"large\\" compact=\\"true\\" tag=\\"span\\"><n8n-text-stub size=\\"medium\\" tag=\\"span\\">Default badge</n8n-text-stub></n8n-text-stub></span>"`;
+exports[`components > N8nBadge > props > should render default theme correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub bold=\\"true\\" size=\\"large\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub></span>"`;
 
-exports[`components > N8nBadge > props > should render secondary theme correctly 1`] = `"<span class=\\"n8n-badge secondary\\"><n8n-text-stub size=\\"medium\\" compact=\\"true\\" tag=\\"span\\"><n8n-text-stub size=\\"medium\\" tag=\\"span\\">Secondary badge</n8n-text-stub></n8n-text-stub></span>"`;
+exports[`components > N8nBadge > props > should render secondary theme correctly 1`] = `"<span class=\\"n8n-badge secondary\\"><n8n-text-stub bold=\\"false\\" size=\\"medium\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub></span>"`;
 
-exports[`components > N8nBadge > props > should render with default values correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><n8n-text-stub size=\\"medium\\" tag=\\"span\\">A Badge</n8n-text-stub></n8n-text-stub></span>"`;
+exports[`components > N8nBadge > props > should render with default values correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub></span>"`;
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts b/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
index bbcc750712199..09b1c73ef0efe 100644
--- a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
+++ b/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nBlockUi from './BlockUi.vue';
 
 export default {
@@ -7,12 +7,13 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nBlockUi,
 	},
 	template:
-		'<div style="position: relative; width: 100%; height: 300px;"><n8n-block-ui v-bind="$props" /></div>',
+		'<div style="position: relative; width: 100%; height: 300px;"><n8n-block-ui v-bind="args" /></div>',
 });
 
 export const BlockUi = Template.bind({});
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.vue b/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
index 7344608460c3e..cb117c51e7fb0 100644
--- a/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
+++ b/packages/design-system/src/components/N8nBlockUi/BlockUi.vue
@@ -38,7 +38,7 @@ withDefaults(defineProps<BlockUiProps>(), {
 .fade-leave-active {
 	transition: opacity 200ms;
 }
-.fade-enter,
+.fade-enter-from,
 .fade-leave-to {
 	opacity: 0;
 }
diff --git a/packages/design-system/src/components/N8nButton/Button.scss b/packages/design-system/src/components/N8nButton/Button.scss
new file mode 100644
index 0000000000000..32024e3c7fe05
--- /dev/null
+++ b/packages/design-system/src/components/N8nButton/Button.scss
@@ -0,0 +1,81 @@
+@import '../../css/mixins/utils';
+@import '../../css/common/var';
+
+@mixin n8n-button($override: false) {
+	$important: if($override, !important, '');
+
+	display: inline-block;
+	line-height: 1;
+	white-space: nowrap;
+	cursor: pointer;
+
+	border: var(--border-width-base) $button-border-color var(--border-style-base) unquote($important);
+	color: $button-font-color unquote($important);
+	background-color: $button-background-color unquote($important);
+	font-weight: var(--font-weight-bold) unquote($important);
+	border-radius: $button-border-radius unquote($important);
+	padding: $button-padding-vertical $button-padding-horizontal unquote($important);
+	font-size: $button-font-size unquote($important);
+
+	-webkit-appearance: none;
+	text-align: center;
+	box-sizing: border-box;
+	outline: none;
+	margin: 0;
+	transition: 0.3s;
+
+	@include utils-user-select(none);
+
+	&:hover {
+		color: $button-hover-color unquote($important);
+		border-color: $button-hover-border-color unquote($important);
+		background-color: $button-hover-background-color unquote($important);
+	}
+
+	&:focus {
+		border-color: $button-focus-outline-color unquote($important);
+		outline: $focus-outline-width solid $button-focus-outline-color unquote($important);
+	}
+
+	&:active,
+	&.active {
+		color: $button-active-color unquote($important);
+		border-color: $button-active-border-color unquote($important);
+		background-color: $button-active-background-color unquote($important);
+		outline: none;
+	}
+
+	&::-moz-focus-inner {
+		border: 0;
+	}
+
+	> i {
+		display: none;
+	}
+
+	> span {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	span + span {
+		margin-left: var(--spacing-3xs);
+	}
+}
+
+@mixin n8n-button-secondary {
+	--button-color: var(--color-primary);
+	--button-border-color: var(--color-primary);
+	--button-background-color: var(--color-background-xlight);
+
+	--button-active-background-color: var(--color-primary-tint-2);
+	--button-active-color: var(--color-primary);
+	--button-active-border-color: var(--color-primary);
+
+	--button-hover-background-color: var(--color-primary-tint-3);
+	--button-hover-color: var(--color-primary);
+	--button-hover-border-color: var(--color-primary);
+
+	--button-focus-outline-color: var(--color-primary-tint-1);
+}
diff --git a/packages/design-system/src/components/N8nButton/Button.stories.ts b/packages/design-system/src/components/N8nButton/Button.stories.ts
index 7a46ae1c647d6..8234849097230 100644
--- a/packages/design-system/src/components/N8nButton/Button.stories.ts
+++ b/packages/design-system/src/components/N8nButton/Button.stories.ts
@@ -1,6 +1,6 @@
 import N8nButton from './Button.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Button',
@@ -13,8 +13,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 			},
+			options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 		},
 		float: {
 			type: 'select',
@@ -34,11 +34,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nButton,
 	},
-	template: '<n8n-button v-bind="$props" @click="onClick" />',
+	template: '<n8n-button v-bind="args" @click="onClick" />',
 	methods,
 });
 
@@ -48,48 +49,50 @@ Button.args = {
 };
 
 const AllSizesTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nButton,
 	},
 	template: `<div>
-		<n8n-button v-bind="$props" size="large" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" @click="onClick" />
-		<n8n-button v-bind="$props" :loading="true" @click="onClick" />
-		<n8n-button v-bind="$props" :disabled="true" @click="onClick" />
+		<n8n-button v-bind="args" size="large" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" @click="onClick" />
+		<n8n-button v-bind="args" size="small" @click="onClick" />
+		<n8n-button v-bind="args" :loading="true" @click="onClick" />
+		<n8n-button v-bind="args" :disabled="true" @click="onClick" />
 	</div>`,
 	methods,
 });
 
 const AllColorsAndSizesTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nButton,
 	},
 	template: `<div>
-		<n8n-button v-bind="$props" size="large" type="primary" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="secondary" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="tertiary" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="success" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="warning" @click="onClick" />
-		<n8n-button v-bind="$props" size="large" type="danger" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="primary" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="secondary" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="tertiary" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="success" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="warning" @click="onClick" />
+		<n8n-button v-bind="args" size="large" type="danger" @click="onClick" />
 		<br/>
 		<br/>
-		<n8n-button v-bind="$props" size="medium" type="primary" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="secondary" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="tertiary" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="success" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="warning" @click="onClick" />
-		<n8n-button v-bind="$props" size="medium" type="danger" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="primary" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="secondary" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="tertiary" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="success" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="warning" @click="onClick" />
+		<n8n-button v-bind="args" size="medium" type="danger" @click="onClick" />
 		<br/>
 		<br/>
-		<n8n-button v-bind="$props" size="small" type="primary" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="secondary" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="tertiary" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="success" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="warning" @click="onClick" />
-		<n8n-button v-bind="$props" size="small" type="danger" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="primary" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="secondary" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="tertiary" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="success" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="warning" @click="onClick" />
+		<n8n-button v-bind="args" size="small" type="danger" @click="onClick" />
 	</div>`,
 	methods,
 });
diff --git a/packages/design-system/src/components/N8nButton/Button.vue b/packages/design-system/src/components/N8nButton/Button.vue
index 3250bf9a269ef..a0bd861e2c4c0 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/design-system/src/components/N8nButton/Button.vue
@@ -1,11 +1,11 @@
 <template>
 	<button
 		:class="classes"
-		:disabled="disabled || loading"
+		:disabled="isDisabled"
 		:aria-disabled="ariaDisabled"
 		:aria-busy="ariaBusy"
 		aria-live="polite"
-		v-on="$listeners"
+		v-bind="$attrs"
 	>
 		<span :class="$style.icon" v-if="loading || icon">
 			<n8n-spinner v-if="loading" :size="size" />
@@ -17,158 +17,112 @@
 	</button>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
 import N8nIcon from '../N8nIcon';
 import N8nSpinner from '../N8nSpinner';
+import { useCssModule, computed, useAttrs } from 'vue';
 
-export default defineComponent({
-	name: 'n8n-button',
-	props: {
-		label: {
-			type: String,
-		},
-		type: {
-			type: String,
-			default: 'primary',
-			validator: (value: string): boolean =>
-				['primary', 'secondary', 'tertiary', 'success', 'warning', 'danger'].includes(value),
-		},
-		size: {
-			type: String,
-			default: 'medium',
-			validator: (value: string): boolean =>
-				['xmini', 'mini', 'small', 'medium', 'large', 'xlarge'].includes(value),
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		outline: {
-			type: Boolean,
-			default: false,
-		},
-		text: {
-			type: Boolean,
-			default: false,
-		},
-		icon: {
-			type: [String, Array],
-		},
-		block: {
-			type: Boolean,
-			default: false,
-		},
-		active: {
-			type: Boolean,
-			default: false,
-		},
-		float: {
-			type: String,
-			validator: (value: string): boolean => ['left', 'right'].includes(value),
-		},
-		square: {
-			type: Boolean,
-			default: false,
-		},
+const $style = useCssModule();
+const $attrs = useAttrs();
+
+const props = defineProps({
+	label: {
+		type: String,
+		default: '',
+	},
+	type: {
+		type: String,
+		default: 'primary',
+	},
+	size: {
+		type: String,
+		default: 'medium',
+	},
+	loading: {
+		type: Boolean,
+		default: false,
+	},
+	disabled: {
+		type: Boolean,
+		default: false,
+	},
+	outline: {
+		type: Boolean,
+		default: false,
 	},
-	components: {
-		N8nSpinner,
-		N8nIcon,
+	text: {
+		type: Boolean,
+		default: false,
 	},
-	computed: {
-		ariaBusy(): 'true' | undefined {
-			return this.loading ? 'true' : undefined;
-		},
-		ariaDisabled(): 'true' | undefined {
-			return this.disabled ? 'true' : undefined;
-		},
-		classes(): string {
-			return (
-				`button ${this.$style.button} ${this.$style[this.type]}` +
-				`${this.size ? ` ${this.$style[this.size]}` : ''}` +
-				`${this.outline ? ` ${this.$style.outline}` : ''}` +
-				`${this.loading ? ` ${this.$style.loading}` : ''}` +
-				`${this.float ? ` ${this.$style[`float-${this.float}`]}` : ''}` +
-				`${this.text ? ` ${this.$style.text}` : ''}` +
-				`${this.disabled ? ` ${this.$style.disabled}` : ''}` +
-				`${this.block ? ` ${this.$style.block}` : ''}` +
-				`${this.active ? ` ${this.$style.active}` : ''}` +
-				`${this.icon || this.loading ? ` ${this.$style.withIcon}` : ''}` +
-				`${this.square ? ` ${this.$style.square}` : ''}`
-			);
-		},
+	icon: {
+		type: [String, Array],
+	},
+	block: {
+		type: Boolean,
+		default: false,
+	},
+	active: {
+		type: Boolean,
+		default: false,
+	},
+	float: {
+		type: String,
+	},
+	square: {
+		type: Boolean,
+		default: false,
 	},
 });
-</script>
 
-<style lang="scss" module>
-@import '../../css/mixins/utils';
-@import '../../css/common/var';
-
-.button {
-	display: inline-block;
-	line-height: 1;
-	white-space: nowrap;
-	cursor: pointer;
-
-	border: var(--border-width-base) $button-border-color var(--border-style-base);
-	color: $button-font-color;
-	background-color: $button-background-color;
-	font-weight: var(--font-weight-bold);
-	border-radius: $button-border-radius;
-	padding: $button-padding-vertical $button-padding-horizontal;
-	font-size: $button-font-size;
-
-	-webkit-appearance: none;
-	text-align: center;
-	box-sizing: border-box;
-	outline: none;
-	margin: 0;
-	transition: 0.3s;
-
-	@include utils-user-select(none);
+const ariaBusy = computed(() => (props.loading ? 'true' : undefined));
+const ariaDisabled = computed(() => (props.disabled ? 'true' : undefined));
+const isDisabled = computed(() => props.disabled || props.loading);
+
+const classes = computed(() => {
+	return (
+		`button ${$style.button} ${$style[props.type]}` +
+		`${props.size ? ` ${$style[props.size]}` : ''}` +
+		`${props.outline ? ` ${$style.outline}` : ''}` +
+		`${props.loading ? ` ${$style.loading}` : ''}` +
+		`${props.float ? ` ${$style[`float-${props.float}`]}` : ''}` +
+		`${props.text ? ` ${$style.text}` : ''}` +
+		`${props.disabled ? ` ${$style.disabled}` : ''}` +
+		`${props.block ? ` ${$style.block}` : ''}` +
+		`${props.active ? ` ${$style.active}` : ''}` +
+		`${props.icon || props.loading ? ` ${$style.withIcon}` : ''}` +
+		`${props.square ? ` ${$style.square}` : ''}`
+	);
+});
+</script>
 
-	&:hover {
-		color: $button-hover-color;
-		border-color: $button-hover-border-color;
-		background-color: $button-hover-background-color;
-	}
+<style lang="scss">
+@import './Button';
 
-	&:focus {
-		border-color: $button-focus-outline-color;
-		outline: $focus-outline-width solid $button-focus-outline-color;
-	}
+.el-button {
+	@include n8n-button(true);
 
-	&:active,
-	&.active {
-		color: $button-active-color;
-		border-color: $button-active-border-color;
-		background-color: $button-active-background-color;
-		outline: none;
-	}
+	--button-padding-vertical: var(--spacing-2xs);
+	--button-padding-horizontal: var(--spacing-xs);
+	--button-font-size: var(--font-size-2xs);
 
-	&::-moz-focus-inner {
-		border: 0;
+	+ .el-button {
+		margin-left: var(--spacing-2xs);
 	}
 
-	> i {
-		display: none;
+	&.btn--cancel,
+	&.el-color-dropdown__link-btn {
+		@include n8n-button-secondary;
 	}
+}
+</style>
 
-	> span {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+<style lang="scss" module>
+@import './Button';
+@import '../../css/mixins/utils';
+@import '../../css/common/var';
 
-	span + span {
-		margin-left: var(--spacing-3xs);
-	}
+.button {
+	@include n8n-button;
 }
 
 $loading-overlay-background-color: rgba(255, 255, 255, 0);
@@ -178,19 +132,7 @@ $loading-overlay-background-color: rgba(255, 255, 255, 0);
  */
 
 .secondary {
-	--button-color: var(--color-primary);
-	--button-border-color: var(--color-primary);
-	--button-background-color: var(--color-background-xlight);
-
-	--button-active-background-color: var(--color-primary-tint-2);
-	--button-active-color: var(--color-primary);
-	--button-active-border-color: var(--color-primary);
-
-	--button-hover-background-color: var(--color-primary-tint-3);
-	--button-hover-color: var(--color-primary);
-	--button-hover-border-color: var(--color-primary);
-
-	--button-focus-outline-color: var(--color-primary-tint-1);
+	@include n8n-button-secondary;
 }
 
 .tertiary {
diff --git a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
index 184307c24e5b2..9ead6c73449b0 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
+++ b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
@@ -1,6 +1,5 @@
 import { render } from '@testing-library/vue';
 import N8nButton from '../Button.vue';
-import ElButton from '../overrides/ElButton.vue';
 
 const slots = {
 	default: 'Button',
@@ -12,7 +11,9 @@ describe('components', () => {
 		it('should render correctly', () => {
 			const wrapper = render(N8nButton, {
 				slots,
-				stubs,
+				global: {
+					stubs,
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
@@ -25,7 +26,9 @@ describe('components', () => {
 							loading: true,
 						},
 						slots,
-						stubs,
+						global: {
+							stubs,
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
@@ -38,7 +41,9 @@ describe('components', () => {
 							icon: 'plus-circle',
 						},
 						slots,
-						stubs,
+						global: {
+							stubs,
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
@@ -51,64 +56,13 @@ describe('components', () => {
 							square: true,
 							label: '48',
 						},
-						stubs,
+						global: {
+							stubs,
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
 			});
 		});
-
-		describe('overrides', () => {
-			it('should use default (`primary`) type when no type is given', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-
-			it('should use given (`secondary`) type', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-						type: 'secondary',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-
-			it('should render as `secondary` when `text` is given as type', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-						type: 'text',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-
-			it('should render as `tertiary` when `info` is given as type', () => {
-				const wrapper = render(ElButton, {
-					props: {
-						icon: 'plus-circle',
-						type: 'info',
-					},
-					slots,
-					stubs,
-				});
-
-				expect(wrapper.html()).toMatchSnapshot();
-			});
-		});
 	});
 });
diff --git a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
index f03d6421ceee4..97079c01efd78 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
+++ b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
@@ -1,23 +1,17 @@
 // Vitest Snapshot v1
 
-exports[`components > N8nButton > overrides > should render as \`secondary\` when \`text\` is given as type 1`] = `"<button aria-live=\\"polite\\" class=\\"button button secondary medium withIcon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button class=\\"button button primary medium withIcon\\" aria-live=\\"polite\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub></span><span>Button</span></button>"`;
 
-exports[`components > N8nButton > overrides > should render as \`tertiary\` when \`info\` is given as type 1`] = `"<button aria-live=\\"polite\\" class=\\"button button tertiary medium withIcon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > overrides > should use default (\`primary\`) type when no type is given 1`] = `"<button aria-live=\\"polite\\" class=\\"button button primary medium withIcon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > overrides > should use given (\`secondary\`) type 1`] = `"<button aria-live=\\"polite\\" class=\\"button button secondary medium withIcon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button aria-live=\\"polite\\" class=\\"button button primary medium withIcon\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
-
-exports[`components > N8nButton > props > loading > should render loading spinner 1`] = `"<button disabled=\\"disabled\\" aria-busy=\\"true\\" aria-live=\\"polite\\" class=\\"button button primary medium loading withIcon\\"><span class=\\"icon\\"><n8n-spinner-stub size=\\"medium\\" type=\\"dots\\"></n8n-spinner-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > props > loading > should render loading spinner 1`] = `"<button class=\\"button button primary medium loading withIcon\\" disabled=\\"\\" aria-busy=\\"true\\" aria-live=\\"polite\\"><span class=\\"icon\\"><n8n-spinner-stub size=\\"medium\\" type=\\"dots\\"></n8n-spinner-stub></span><span>Button</span></button>"`;
 
 exports[`components > N8nButton > props > square > should render square button 1`] = `
-"<button aria-live=\\"polite\\" class=\\"button button primary medium square\\">
-  <!----><span>48</span></button>"
+"<button class=\\"button button primary medium square\\" aria-live=\\"polite\\">
+  <!--v-if--><span>48</span>
+</button>"
 `;
 
 exports[`components > N8nButton > should render correctly 1`] = `
-"<button aria-live=\\"polite\\" class=\\"button button primary medium\\">
-  <!----><span>Button</span></button>"
+"<button class=\\"button button primary medium\\" aria-live=\\"polite\\">
+  <!--v-if--><span>Button</span>
+</button>"
 `;
diff --git a/packages/design-system/src/components/N8nButton/overrides/ElButton.ts b/packages/design-system/src/components/N8nButton/overrides/ElButton.ts
deleted file mode 100644
index 88c583bba16f0..0000000000000
--- a/packages/design-system/src/components/N8nButton/overrides/ElButton.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ElButton from './ElButton.vue';
-
-export default ElButton;
diff --git a/packages/design-system/src/components/N8nButton/overrides/ElButton.vue b/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
deleted file mode 100644
index 1cbb31b8200f3..0000000000000
--- a/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-	<n8n-button ref="button" v-bind="attrs" v-on="$listeners">
-		<slot />
-	</n8n-button>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import N8nButton from '../Button.vue';
-
-const classToTypeMap = {
-	'btn--cancel': 'secondary',
-	'el-picker-panel__link-btn': 'secondary',
-};
-
-type ButtonRef = InstanceType<typeof N8nButton>;
-
-export default defineComponent({
-	components: {
-		N8nButton,
-	},
-	computed: {
-		attrs() {
-			let type = this.$attrs.type || 'primary';
-
-			/* Element UI Button can have 'text' or 'info' type which is not supported by n8n-button
-			 so render it as 'secondary' or 'tertiary' */
-			if (type === 'text') {
-				type = 'secondary';
-			}
-
-			if (type === 'info') {
-				type = 'tertiary';
-			}
-
-			Object.entries(classToTypeMap).forEach(([className, mappedType]) => {
-				if ((this.$refs.button as ButtonRef)?.$el.classList.contains(className)) {
-					type = mappedType;
-				}
-			});
-
-			delete this.$attrs.type;
-
-			return {
-				...this.$attrs,
-				type,
-			};
-		},
-	},
-});
-</script>
diff --git a/packages/design-system/src/components/N8nButton/overrides/index.ts b/packages/design-system/src/components/N8nButton/overrides/index.ts
deleted file mode 100644
index c62be6ec636fb..0000000000000
--- a/packages/design-system/src/components/N8nButton/overrides/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as N8nElButton } from './ElButton.vue';
diff --git a/packages/design-system/src/components/N8nCallout/Callout.stories.ts b/packages/design-system/src/components/N8nCallout/Callout.stories.ts
index 48ccdafa77739..fe2f3988999ea 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.stories.ts
+++ b/packages/design-system/src/components/N8nCallout/Callout.stories.ts
@@ -1,7 +1,7 @@
 import N8nCallout from './Callout.vue';
 import N8nLink from '../N8nLink';
 import N8nText from '../N8nText';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Callout',
@@ -10,8 +10,8 @@ export default {
 		theme: {
 			control: {
 				type: 'select',
-				options: ['info', 'secondary', 'success', 'warning', 'danger', 'custom'],
 			},
+			options: ['info', 'secondary', 'success', 'warning', 'danger', 'custom'],
 		},
 		message: {
 			control: {
@@ -41,6 +41,7 @@ interface Args {
 }
 
 const template: StoryFn<Args> = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nLink,
@@ -48,12 +49,12 @@ const template: StoryFn<Args> = (args, { argTypes }) => ({
 		N8nCallout,
 	},
 	template: `
-		<n8n-callout v-bind="$props">
+		<n8n-callout v-bind="args">
 			${args.default}
-			<template #actions v-if="actions">
+			<template #actions v-if="args.actions">
 				${args.actions}
 			</template>
-			<template #trailingContent v-if="trailingContent">
+			<template #trailingContent v-if="args.trailingContent">
 				${args.trailingContent}
 			</template>
 		</n8n-callout>
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts b/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
index d25b105407b10..a55c32bf9f268 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
+++ b/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
@@ -8,7 +8,9 @@ describe('components', () => {
 				props: {
 					theme: 'info',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is an info callout.</n8n-text>',
 				},
@@ -20,7 +22,9 @@ describe('components', () => {
 				props: {
 					theme: 'success',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a success callout.</n8n-text>',
 				},
@@ -32,7 +36,9 @@ describe('components', () => {
 				props: {
 					theme: 'warning',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a warning callout.</n8n-text>',
 				},
@@ -44,7 +50,9 @@ describe('components', () => {
 				props: {
 					theme: 'danger',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a danger callout.</n8n-text>',
 				},
@@ -56,7 +64,9 @@ describe('components', () => {
 				props: {
 					theme: 'secondary',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a secondary callout.</n8n-text>',
 				},
@@ -69,7 +79,9 @@ describe('components', () => {
 					theme: 'custom',
 					icon: 'code-branch',
 				},
-				stubs: ['n8n-icon', 'n8n-text'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a secondary callout.</n8n-text>',
 				},
@@ -82,7 +94,9 @@ describe('components', () => {
 					theme: 'custom',
 					icon: 'code-branch',
 				},
-				stubs: ['n8n-icon', 'n8n-text', 'n8n-link'],
+				global: {
+					stubs: ['n8n-icon', 'n8n-text', 'n8n-link'],
+				},
 				slots: {
 					default: '<n8n-text size="small">This is a secondary callout.</n8n-text>',
 					actions: '<n8n-link size="small">Do something!</n8n-link>',
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
index 0a58f816b2492..74ef4858f1372 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
@@ -1,93 +1,79 @@
 // Vitest Snapshot v1
 
 exports[`components > N8nCallout > should render additional slots correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout custom round\\">
+"<div class=\\"n8n-callout callout custom round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"code-branch\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"code-branch\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a secondary callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp; <n8n-link-stub size=\\"small\\">Do something!</n8n-link-stub>
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp; <n8n-link-stub size=\\"small\\"></n8n-link-stub>
   </div>
-  <n8n-link-stub theme=\\"secondary\\" size=\\"small\\" bold=\\"true\\" underline=\\"true\\" to=\\"https://n8n.io\\">Learn more</n8n-link-stub>
+  <n8n-link-stub theme=\\"secondary\\" size=\\"small\\" bold=\\"true\\" underline=\\"true\\" to=\\"https://n8n.io\\"></n8n-link-stub>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render custom theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout custom round\\">
+"<div class=\\"n8n-callout callout custom round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"code-branch\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"code-branch\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a secondary callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render danger theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout danger round\\">
+"<div class=\\"n8n-callout callout danger round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"times-circle\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"times-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a danger callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render info theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout info round\\">
+"<div class=\\"n8n-callout callout info round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"info-circle\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"info-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is an info callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render secondary theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout secondary round\\">
+"<div class=\\"n8n-callout callout secondary round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"info-circle\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"info-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a secondary callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render success theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout success round\\">
+"<div class=\\"n8n-callout callout success round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"check-circle\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"check-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a success callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
 
 exports[`components > N8nCallout > should render warning theme correctly 1`] = `
-"<div role=\\"alert\\" class=\\"n8n-callout callout warning round\\">
+"<div class=\\"n8n-callout callout warning round\\" role=\\"alert\\">
   <div class=\\"messageSection\\">
     <div class=\\"icon\\">
-      <n8n-icon-stub icon=\\"exclamation-triangle\\" size=\\"medium\\"></n8n-icon-stub>
+      <n8n-icon-stub icon=\\"exclamation-triangle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub>
     </div>
-    <n8n-text-stub size=\\"small\\" tag=\\"span\\">
-      <n8n-text-stub size=\\"small\\" tag=\\"span\\">This is a warning callout.</n8n-text-stub>
-    </n8n-text-stub> &nbsp;
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"false\\" tag=\\"span\\"></n8n-text-stub> &nbsp;
   </div>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nCard/Card.stories.ts b/packages/design-system/src/components/N8nCard/Card.stories.ts
index e5274139fb6de..6b54c2a30f4d0 100644
--- a/packages/design-system/src/components/N8nCard/Card.stories.ts
+++ b/packages/design-system/src/components/N8nCard/Card.stories.ts
@@ -1,5 +1,5 @@
 import N8nCard from './Card.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nButton from '../N8nButton/Button.vue';
 import N8nIcon from '../N8nIcon/Icon.vue';
 import N8nText from '../N8nText/Text.vue';
@@ -10,14 +10,16 @@ export default {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCard,
 	},
-	template: '<n8n-card v-bind="$props">This is a card.</n8n-card>',
+	template: '<n8n-card v-bind="args">This is a card.</n8n-card>',
 });
 
 export const Hoverable: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCard,
@@ -25,7 +27,7 @@ export const Hoverable: StoryFn = (args, { argTypes }) => ({
 		N8nText,
 	},
 	template: `<div style="width: 140px; text-align: center;">
-		<n8n-card v-bind="$props">
+		<n8n-card v-bind="args">
 			<n8n-icon icon="plus" size="xlarge" />
 			<n8n-text size="large" class="mt-2xs">Add</n8n-text>
 		</n8n-card>
@@ -37,6 +39,7 @@ Hoverable.args = {
 };
 
 export const WithSlots: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCard,
@@ -44,22 +47,22 @@ export const WithSlots: StoryFn = (args, { argTypes }) => ({
 		N8nIcon,
 		N8nText,
 	},
-	template: `<n8n-card v-bind="$props">
-		<template slot="prepend">
+	template: `<n8n-card v-bind="args">
+		<template #prepend>
 			<n8n-icon icon="check" size="large" />
 		</template>
-		<template slot="header">
+		<template #header>
 			<strong>Card header</strong>
 		</template>
 		<n8n-text color="text-light" size="medium" class="mt-2xs mb-2xs">
 			This is the card body.
 		</n8n-text>
-		<template slot="footer">
+		<template #footer>
 			<n8n-text size="medium">
 				Card footer
 			</n8n-text>
 		</template>
-		<template slot="append">
+		<template #append>
 			<n8n-button>Click me</n8n-button>
 		</template>
 	</n8n-card>`,
diff --git a/packages/design-system/src/components/N8nCard/Card.vue b/packages/design-system/src/components/N8nCard/Card.vue
index 6b2c260509d11..4d15d83a42a0c 100644
--- a/packages/design-system/src/components/N8nCard/Card.vue
+++ b/packages/design-system/src/components/N8nCard/Card.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="classes" v-on="$listeners">
+	<div :class="classes" v-bind="$attrs">
 		<div :class="$style.icon" v-if="$slots.prepend">
 			<slot name="prepend" />
 		</div>
@@ -14,7 +14,7 @@
 				<slot name="footer" />
 			</div>
 		</div>
-		<div :class="$style.actions" v-if="$slots.append">
+		<div v-if="$slots.append">
 			<slot name="append" />
 		</div>
 	</div>
diff --git a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap b/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
index f79e0d3348d65..96751ee3e9305 100644
--- a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
@@ -2,24 +2,24 @@
 
 exports[`components > N8nCard > should render correctly 1`] = `
 "<div class=\\"card\\">
-  <!---->
+  <!--v-if-->
   <div class=\\"content\\">
-    <!---->
+    <!--v-if-->
     <div class=\\"body\\">This is a card.</div>
-    <!---->
+    <!--v-if-->
   </div>
-  <!---->
+  <!--v-if-->
 </div>"
 `;
 
 exports[`components > N8nCard > should render correctly with header and footer 1`] = `
 "<div class=\\"card\\">
-  <!---->
+  <!--v-if-->
   <div class=\\"content\\">
     <div class=\\"header\\">Header</div>
     <div class=\\"body\\">This is a card.</div>
     <div class=\\"footer\\">Footer</div>
   </div>
-  <!---->
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts b/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
index 1ec3178ae085d..c5c065ee5e6e9 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
@@ -1,5 +1,5 @@
 import N8nCheckbox from './Checkbox.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
 
 export default {
@@ -8,12 +8,13 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onFocus: action('focus'),
 	onChange: action('change'),
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nCheckbox,
@@ -21,7 +22,8 @@ const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
 	data: () => ({
 		isChecked: false,
 	}),
-	template: '<n8n-checkbox v-model="isChecked" v-bind="$props" @input="onInput"></n8n-checkbox>',
+	template:
+		'<n8n-checkbox v-model="isChecked" v-bind="args" @update:modelValue="onUpdateModelValue"></n8n-checkbox>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
index 1568aea764c73..0c0f32ee966f8 100644
--- a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.vue
@@ -5,8 +5,8 @@
 		:class="['n8n-checkbox', $style.n8nCheckbox]"
 		:disabled="disabled"
 		:indeterminate="indeterminate"
-		:value="value"
-		@change="onChange"
+		:modelValue="modelValue"
+		@update:modelValue="onUpdateModelValue"
 	>
 		<slot></slot>
 		<n8n-input-label
@@ -22,7 +22,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { Checkbox as ElCheckbox } from 'element-ui';
+import { ElCheckbox } from 'element-plus';
 import N8nInputLabel from '../N8nInputLabel';
 
 export default defineComponent({
@@ -46,7 +46,7 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-		value: {
+		modelValue: {
 			type: Boolean,
 			default: false,
 		},
@@ -57,8 +57,8 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		onChange(event: Event) {
-			this.$emit('input', event);
+		onUpdateModelValue(value: boolean) {
+			this.$emit('update:modelValue', value);
 		},
 		onLabelClick() {
 			const checkboxComponent = this.$refs.checkbox as ElCheckbox;
diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
index 73f5989d6ff95..e9a85b0eeb61a 100644
--- a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
@@ -9,22 +9,25 @@ exports[`components > N8nCheckbox > should render with both child and label 1`]
     <span
       class="el-checkbox__input"
     >
-      <span
-        class="el-checkbox__inner"
-      />
       <input
         aria-hidden="false"
         class="el-checkbox__original"
         type="checkbox"
         value="Checkbox"
       />
+      <span
+        class="el-checkbox__inner"
+      />
     </span>
     <span
       class="el-checkbox__label"
     >
+      
+      
       <strong>
         Bold text
       </strong>
+      
       <div
         class="container"
         data-test-id="input-label"
@@ -38,16 +41,21 @@ exports[`components > N8nCheckbox > should render with both child and label 1`]
             <span
               class="n8n-text size-medium regular"
             >
-               Checkbox 
-              <!---->
+              
+              Checkbox 
+              <!--v-if-->
+              
             </span>
           </div>
-          <!---->
-          <!---->
-          <!---->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
         </label>
+        
+        
       </div>
-      <!---->
+      
+      <!--v-if-->
     </span>
   </label>
 </div>
@@ -62,24 +70,27 @@ exports[`components > N8nCheckbox > should render with child 1`] = `
     <span
       class="el-checkbox__input"
     >
-      <span
-        class="el-checkbox__inner"
-      />
       <input
         aria-hidden="false"
         class="el-checkbox__original"
         type="checkbox"
-        value=""
+      />
+      <span
+        class="el-checkbox__inner"
       />
     </span>
     <span
       class="el-checkbox__label"
     >
+      
+      
       <strong>
         Bold text
       </strong>
-      <!---->
-      <!---->
+      
+      <!--v-if-->
+      
+      <!--v-if-->
     </span>
   </label>
 </div>
@@ -94,19 +105,22 @@ exports[`components > N8nCheckbox > should render with label 1`] = `
     <span
       class="el-checkbox__input"
     >
-      <span
-        class="el-checkbox__inner"
-      />
       <input
         aria-hidden="false"
         class="el-checkbox__original"
         type="checkbox"
         value="Checkbox"
       />
+      <span
+        class="el-checkbox__inner"
+      />
     </span>
     <span
       class="el-checkbox__label"
     >
+      
+      
+      
       <div
         class="container"
         data-test-id="input-label"
@@ -120,16 +134,21 @@ exports[`components > N8nCheckbox > should render with label 1`] = `
             <span
               class="n8n-text size-medium regular"
             >
-               Checkbox 
-              <!---->
+              
+              Checkbox 
+              <!--v-if-->
+              
             </span>
           </div>
-          <!---->
-          <!---->
-          <!---->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
         </label>
+        
+        
       </div>
-      <!---->
+      
+      <!--v-if-->
     </span>
   </label>
 </div>
@@ -144,17 +163,22 @@ exports[`components > N8nCheckbox > should render without label and child conten
     <span
       class="el-checkbox__input"
     >
-      <span
-        class="el-checkbox__inner"
-      />
       <input
         aria-hidden="false"
         class="el-checkbox__original"
         type="checkbox"
-        value=""
       />
+      <span
+        class="el-checkbox__inner"
+      />
+    </span>
+    <span
+      class="el-checkbox__label"
+    >
+      
+      
+      <!--v-if-->
     </span>
-    <!---->
   </label>
 </div>
 `;
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts b/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
index 65ac0d6dfe561..c17cdd4731c21 100644
--- a/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nColorPicker from './ColorPicker.vue';
 
 export default {
@@ -32,10 +32,11 @@ export default {
 const methods = {
 	onChange: action('change'),
 	onActiveChange: action('active-change'),
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nColorPicker,
@@ -44,7 +45,7 @@ const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
 		color: null,
 	}),
 	template:
-		'<n8n-color-picker v-model="color" v-bind="$props" @input="onInput" @change="onChange" @active-change="onActiveChange" />',
+		'<n8n-color-picker v-model="color" v-bind="args" @update:modelValue="onInput" @change="onChange" @active-change="onActiveChange" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
index 5a52c6d109350..e6682a8568e56 100644
--- a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import { ColorPicker } from 'element-ui';
+import { uid } from '../../utils';
+import { ElColorPicker } from 'element-plus';
 import N8nInput from '../N8nInput';
 
 export type Props = {
@@ -10,8 +11,9 @@ export type Props = {
 	colorFormat?: 'hex' | 'rgb' | 'hsl' | 'hsv';
 	popperClass?: string;
 	predefine?: string[];
-	value?: string;
+	modelValue?: string;
 	showInput?: boolean;
+	name?: string;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -21,10 +23,11 @@ const props = withDefaults(defineProps<Props>(), {
 	colorFormat: 'hex',
 	popperClass: '',
 	showInput: true,
-	value: null,
+	modelValue: null,
+	name: uid('color-picker'),
 });
 
-const color = ref(props.value);
+const color = ref(props.modelValue);
 
 const colorPickerProps = computed(() => {
 	const { value, showInput, ...rest } = props;
@@ -32,7 +35,7 @@ const colorPickerProps = computed(() => {
 });
 
 const emit = defineEmits<{
-	(event: 'input', value: string): void;
+	(event: 'update:modelValue', value: string): void;
 	(event: 'change', value: string): void;
 	(event: 'active-change', value: string): void;
 }>();
@@ -43,7 +46,7 @@ const model = computed({
 	},
 	set(value: string) {
 		color.value = value;
-		emit('input', value);
+		emit('update:modelValue', value);
 	},
 });
 
@@ -61,7 +64,7 @@ const onActiveChange = (value: string) => {
 </script>
 <template>
 	<span :class="['n8n-color-picker', $style.component]">
-		<color-picker
+		<el-color-picker
 			v-model="model"
 			v-bind="colorPickerProps"
 			@change="onChange"
@@ -72,8 +75,9 @@ const onActiveChange = (value: string) => {
 			:class="$style.input"
 			:disabled="props.disabled"
 			:size="props.size"
-			:value="color"
-			@input="onInput"
+			:modelValue="color"
+			:name="name"
+			@update:modelValue="onInput"
 			type="text"
 		/>
 	</span>
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts b/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
index 0367928bc4beb..702db17aa2ec1 100644
--- a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
@@ -4,12 +4,21 @@ import N8nColorPicker from '../ColorPicker.vue';
 describe('components', () => {
 	describe('N8nColorPicker', () => {
 		it('should render with input', () => {
-			const { container } = render(N8nColorPicker);
+			const { container } = render(N8nColorPicker, {
+				props: {
+					name: 'color-picker',
+				},
+			});
 			expect(container).toMatchSnapshot();
 		});
 
 		it('should render without input', () => {
-			const { container } = render(N8nColorPicker, { props: { showInput: false } });
+			const { container } = render(N8nColorPicker, {
+				props: {
+					name: 'color-picker',
+					showInput: false,
+				},
+			});
 			expect(container).toMatchSnapshot();
 		});
 	});
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
index 1e4756cfee719..0480e052b40cb 100644
--- a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
@@ -6,11 +6,15 @@ exports[`components > N8nColorPicker > should render with input 1`] = `
     class="n8n-color-picker component"
     data-v-dab78bb8=""
   >
+    
     <div
-      class="el-color-picker el-color-picker--medium"
-      data-v-dab78bb8=""
+      aria-description="current color is . press enter to select a new color."
+      aria-label="color picker"
+      class="el-color-picker el-color-picker--medium el-tooltip__trigger el-tooltip__trigger"
+      role="button"
+      tabindex="0"
     >
-      <!---->
+      <!--v-if-->
       <div
         class="el-color-picker__trigger"
       >
@@ -20,122 +24,75 @@ exports[`components > N8nColorPicker > should render with input 1`] = `
           <span
             class="el-color-picker__color-inner"
             style="background-color: transparent;"
-          />
-          <span
-            class="el-color-picker__empty el-icon-close"
-          />
-        </span>
-        <span
-          class="el-color-picker__icon el-icon-arrow-down"
-          style="display: none;"
-        />
-      </div>
-      <transition-stub
-        class="el-color-picker__panel"
-        name="el-zoom-in-top"
-      >
-        <div
-          class="el-color-dropdown"
-          style="display: none;"
-        >
-          <div
-            class="el-color-dropdown__main-wrapper"
           >
-            <div
-              class="el-color-hue-slider is-vertical"
-              style="float: right;"
+            <i
+              class="el-icon el-color-picker__icon is-icon-arrow-down"
+              style="display: none;"
             >
-              <div
-                class="el-color-hue-slider__bar"
-              />
-              <div
-                class="el-color-hue-slider__thumb"
-                style="left: 0px; top: 0px;"
-              />
-            </div>
-            <div
-              class="el-color-svpanel"
-              style="background-color: rgb(255, 0, 0);"
-            >
-              <div
-                class="el-color-svpanel__white"
-              />
-              <div
-                class="el-color-svpanel__black"
-              />
-              <div
-                class="el-color-svpanel__cursor"
-                style="top: 0px; left: 0px;"
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <div />
-              </div>
-            </div>
-          </div>
-          <!---->
-          <!---->
-          <div
-            class="el-color-dropdown__btns"
-          >
-            <span
-              class="el-color-dropdown__value"
+                <path
+                  d="M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z"
+                  fill="currentColor"
+                />
+              </svg>
+              
+            </i>
+            <i
+              class="el-icon el-color-picker__empty is-icon-close"
             >
-              <div
-                class="el-input el-input--mini"
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <!---->
-                <input
-                  autocomplete="off"
-                  class="el-input__inner"
-                  type="text"
+                <path
+                  d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z"
+                  fill="currentColor"
                 />
-                <!---->
-                <!---->
-                <!---->
-                <!---->
-              </div>
-            </span>
-            <button
-              class="el-button el-color-dropdown__link-btn el-button--text el-button--mini"
-              type="button"
-            >
-              <!---->
-              <!---->
-              <span>
-                
-        清空
-      
-              </span>
-            </button>
-            <button
-              class="el-button el-color-dropdown__btn el-button--default el-button--mini is-plain"
-              type="button"
-            >
-              <!---->
-              <!---->
-              <span>
-                
-        确定
-      
-              </span>
-            </button>
-          </div>
-        </div>
-      </transition-stub>
+              </svg>
+              
+            </i>
+          </span>
+        </span>
+      </div>
     </div>
+    <!--teleport start-->
+    <!--teleport end-->
+    
     <div
-      class="el-input el-input--medium n8n-input input"
+      class="el-input el-input--medium n8n-input input input"
       data-v-dab78bb8=""
     >
-      <!---->
-      <input
-        autocomplete="off"
-        class="el-input__inner"
-        type="text"
-      />
-      <!---->
-      <!---->
-      <!---->
-      <!---->
+      <!-- input -->
+      
+      <!-- prepend slot -->
+      <!--v-if-->
+      <div
+        class="el-input__wrapper"
+      >
+        <!-- prefix slot -->
+        <!--v-if-->
+        <input
+          autocomplete="off"
+          class="el-input__inner"
+          maxlength="Infinity"
+          name="color-picker"
+          placeholder=""
+          rows="2"
+          tabindex="0"
+          title=""
+          type="text"
+        />
+        <!-- suffix slot -->
+        <!--v-if-->
+      </div>
+      <!-- append slot -->
+      <!--v-if-->
+      
     </div>
   </span>
 </div>
@@ -147,11 +104,15 @@ exports[`components > N8nColorPicker > should render without input 1`] = `
     class="n8n-color-picker component"
     data-v-dab78bb8=""
   >
+    
     <div
-      class="el-color-picker el-color-picker--medium"
-      data-v-dab78bb8=""
+      aria-description="current color is . press enter to select a new color."
+      aria-label="color picker"
+      class="el-color-picker el-color-picker--medium el-tooltip__trigger el-tooltip__trigger"
+      role="button"
+      tabindex="0"
     >
-      <!---->
+      <!--v-if-->
       <div
         class="el-color-picker__trigger"
       >
@@ -161,109 +122,46 @@ exports[`components > N8nColorPicker > should render without input 1`] = `
           <span
             class="el-color-picker__color-inner"
             style="background-color: transparent;"
-          />
-          <span
-            class="el-color-picker__empty el-icon-close"
-          />
-        </span>
-        <span
-          class="el-color-picker__icon el-icon-arrow-down"
-          style="display: none;"
-        />
-      </div>
-      <transition-stub
-        class="el-color-picker__panel"
-        name="el-zoom-in-top"
-      >
-        <div
-          class="el-color-dropdown"
-          style="display: none;"
-        >
-          <div
-            class="el-color-dropdown__main-wrapper"
           >
-            <div
-              class="el-color-hue-slider is-vertical"
-              style="float: right;"
-            >
-              <div
-                class="el-color-hue-slider__bar"
-              />
-              <div
-                class="el-color-hue-slider__thumb"
-                style="left: 0px; top: 0px;"
-              />
-            </div>
-            <div
-              class="el-color-svpanel"
-              style="background-color: rgb(255, 0, 0);"
+            <i
+              class="el-icon el-color-picker__icon is-icon-arrow-down"
+              style="display: none;"
             >
-              <div
-                class="el-color-svpanel__white"
-              />
-              <div
-                class="el-color-svpanel__black"
-              />
-              <div
-                class="el-color-svpanel__cursor"
-                style="top: 0px; left: 0px;"
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <div />
-              </div>
-            </div>
-          </div>
-          <!---->
-          <!---->
-          <div
-            class="el-color-dropdown__btns"
-          >
-            <span
-              class="el-color-dropdown__value"
+                <path
+                  d="M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z"
+                  fill="currentColor"
+                />
+              </svg>
+              
+            </i>
+            <i
+              class="el-icon el-color-picker__empty is-icon-close"
             >
-              <div
-                class="el-input el-input--mini"
+              
+              <svg
+                viewBox="0 0 1024 1024"
+                xmlns="http://www.w3.org/2000/svg"
               >
-                <!---->
-                <input
-                  autocomplete="off"
-                  class="el-input__inner"
-                  type="text"
+                <path
+                  d="M764.288 214.592 512 466.88 259.712 214.592a31.936 31.936 0 0 0-45.12 45.12L466.752 512 214.528 764.224a31.936 31.936 0 1 0 45.12 45.184L512 557.184l252.288 252.288a31.936 31.936 0 0 0 45.12-45.12L557.12 512.064l252.288-252.352a31.936 31.936 0 1 0-45.12-45.184z"
+                  fill="currentColor"
                 />
-                <!---->
-                <!---->
-                <!---->
-                <!---->
-              </div>
-            </span>
-            <button
-              class="el-button el-color-dropdown__link-btn el-button--text el-button--mini"
-              type="button"
-            >
-              <!---->
-              <!---->
-              <span>
-                
-        清空
-      
-              </span>
-            </button>
-            <button
-              class="el-button el-color-dropdown__btn el-button--default el-button--mini is-plain"
-              type="button"
-            >
-              <!---->
-              <!---->
-              <span>
-                
-        确定
-      
-              </span>
-            </button>
-          </div>
-        </div>
-      </transition-stub>
+              </svg>
+              
+            </i>
+          </span>
+        </span>
+      </div>
     </div>
-    <!---->
+    <!--teleport start-->
+    <!--teleport end-->
+    
+    <!--v-if-->
   </span>
 </div>
 `;
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts b/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
index 3166530de182c..e32a808d5c0f2 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
@@ -1,5 +1,5 @@
 import N8nDatatable from './Datatable.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { rows, columns } from './__tests__/data';
 
 export default {
@@ -8,11 +8,12 @@ export default {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nDatatable,
 	},
-	template: '<n8n-datatable v-bind="$props"></n8n-datatable>',
+	template: '<n8n-datatable v-bind="args"></n8n-datatable>',
 });
 
 Default.args = {
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/design-system/src/components/N8nDatatable/Datatable.vue
index 990ea94a1d3c5..b776cc759e9af 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.vue
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.vue
@@ -114,7 +114,7 @@ export default defineComponent({
 </script>
 
 <template>
-	<div :class="classes" v-on="$listeners">
+	<div :class="classes" v-bind="$attrs">
 		<table :class="$style.datatable">
 			<thead :class="$style.datatableHeader">
 				<tr>
@@ -157,9 +157,9 @@ export default defineComponent({
 			<div :class="$style.pageSizeSelector">
 				<n8n-select
 					size="mini"
-					:value="rowsPerPage"
-					@input="onRowsPerPageChange"
-					popper-append-to-body
+					:modelValue="rowsPerPage"
+					@update:modelValue="onRowsPerPageChange"
+					teleported
 				>
 					<template #prepend>{{ t('datatable.pageSize') }}</template>
 					<n8n-option
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts b/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
index 7a1d74b27e1af..ccc2e544aeb24 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
@@ -10,12 +10,14 @@ describe('components', () => {
 
 		it('should render correctly', () => {
 			const wrapper = render(N8nDatatable, {
-				propsData: {
+				props: {
 					columns,
 					rows,
 					rowsPerPage,
 				},
-				stubs,
+				global: {
+					stubs,
+				},
 			});
 
 			expect(wrapper.container.querySelectorAll('thead tr').length).toEqual(1);
@@ -28,12 +30,14 @@ describe('components', () => {
 
 		it('should add column classes', () => {
 			const wrapper = render(N8nDatatable, {
-				propsData: {
+				props: {
 					columns: columns.map((column) => ({ ...column, classes: ['example'] })),
 					rows,
 					rowsPerPage,
 				},
-				stubs,
+				global: {
+					stubs,
+				},
 			});
 
 			expect(wrapper.container.querySelectorAll('.example').length).toEqual(
@@ -43,14 +47,16 @@ describe('components', () => {
 
 		it('should render row slot', () => {
 			const wrapper = render(N8nDatatable, {
-				propsData: {
+				props: {
 					columns,
 					rows,
 					rowsPerPage,
 				},
-				stubs,
-				scopedSlots: {
-					row: '<main><td v-for="column in props.columns" :key="column.id">Row slot</td></main>', // Wrapper is necessary for looping
+				global: {
+					stubs,
+				},
+				slots: {
+					row: '<template #row="props"><td v-for="column in props.columns" :key="column.id">Row slot</td></template>', // Wrapper is necessary for looping
 				},
 			});
 
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
index c796db1a796f0..9f29f40805581 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
@@ -5,95 +5,99 @@ exports[`components > N8nDatatable > should render correctly 1`] = `
   <table class=\\"datatable\\">
     <thead class=\\"datatableHeader\\">
       <tr>
-        <th> ID </th>
-        <th> Name </th>
-        <th> Age </th>
-        <th> Action </th>
+        <th class=\\"\\">ID</th>
+        <th class=\\"\\">Name</th>
+        <th class=\\"\\">Age</th>
+        <th class=\\"\\">Action</th>
       </tr>
     </thead>
     <tbody>
       <tr>
-        <td><span>1</span></td>
-        <td><span>Richard Hendricks</span></td>
-        <td><span>29</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 1</span></button></td>
+        <td class=\\"\\"><span>1</span></td>
+        <td class=\\"\\"><span>Richard Hendricks</span></td>
+        <td class=\\"\\"><span>29</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 1</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>2</span></td>
-        <td><span>Bertram Gilfoyle</span></td>
-        <td><span>44</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 2</span></button></td>
+        <td class=\\"\\"><span>2</span></td>
+        <td class=\\"\\"><span>Bertram Gilfoyle</span></td>
+        <td class=\\"\\"><span>44</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 2</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>3</span></td>
-        <td><span>Dinesh Chugtai</span></td>
-        <td><span>31</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 3</span></button></td>
+        <td class=\\"\\"><span>3</span></td>
+        <td class=\\"\\"><span>Dinesh Chugtai</span></td>
+        <td class=\\"\\"><span>31</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 3</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>4</span></td>
-        <td><span>Jared Dunn </span></td>
-        <td><span>38</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 4</span></button></td>
+        <td class=\\"\\"><span>4</span></td>
+        <td class=\\"\\"><span>Jared Dunn </span></td>
+        <td class=\\"\\"><span>38</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 4</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>5</span></td>
-        <td><span>Richard Hendricks</span></td>
-        <td><span>29</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 5</span></button></td>
+        <td class=\\"\\"><span>5</span></td>
+        <td class=\\"\\"><span>Richard Hendricks</span></td>
+        <td class=\\"\\"><span>29</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 5</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>6</span></td>
-        <td><span>Bertram Gilfoyle</span></td>
-        <td><span>44</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 6</span></button></td>
+        <td class=\\"\\"><span>6</span></td>
+        <td class=\\"\\"><span>Bertram Gilfoyle</span></td>
+        <td class=\\"\\"><span>44</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 6</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>7</span></td>
-        <td><span>Dinesh Chugtai</span></td>
-        <td><span>31</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 7</span></button></td>
+        <td class=\\"\\"><span>7</span></td>
+        <td class=\\"\\"><span>Dinesh Chugtai</span></td>
+        <td class=\\"\\"><span>31</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 7</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>8</span></td>
-        <td><span>Jared Dunn </span></td>
-        <td><span>38</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 8</span></button></td>
+        <td class=\\"\\"><span>8</span></td>
+        <td class=\\"\\"><span>Jared Dunn </span></td>
+        <td class=\\"\\"><span>38</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 8</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>9</span></td>
-        <td><span>Richard Hendricks</span></td>
-        <td><span>29</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 9</span></button></td>
+        <td class=\\"\\"><span>9</span></td>
+        <td class=\\"\\"><span>Richard Hendricks</span></td>
+        <td class=\\"\\"><span>29</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 9</span>
+          </button></td>
       </tr>
       <tr>
-        <td><span>10</span></td>
-        <td><span>Bertram Gilfoyle</span></td>
-        <td><span>44</span></td>
-        <td><button aria-live=\\"polite\\" class=\\"button button primary medium\\" column=\\"[object Object]\\">
-            <!----><span>Button 10</span></button></td>
+        <td class=\\"\\"><span>10</span></td>
+        <td class=\\"\\"><span>Bertram Gilfoyle</span></td>
+        <td class=\\"\\"><span>44</span></td>
+        <td class=\\"\\"><button class=\\"button button primary medium\\" aria-live=\\"polite\\" column=\\"[object Object]\\">
+            <!--v-if--><span>Button 10</span>
+          </button></td>
       </tr>
     </tbody>
   </table>
   <div class=\\"pagination\\">
-    <n8n-pagination-stub pagesize=\\"10\\" total=\\"15\\" pagercount=\\"5\\" currentpage=\\"1\\" layout=\\"prev, pager, next\\" pagesizes=\\"10,20,30,40,50,100\\" background=\\"true\\"></n8n-pagination-stub>
+    <n8n-pagination-stub pagesize=\\"10\\" total=\\"15\\" currentpage=\\"1\\" pagercount=\\"5\\" layout=\\"prev, pager, next\\" pagesizes=\\"10,20,30,40,50,100\\" popperclass=\\"\\" prevtext=\\"\\" previcon=\\"[object Object]\\" nexttext=\\"\\" nexticon=\\"[object Object]\\" small=\\"false\\" background=\\"true\\" disabled=\\"false\\" hideonsinglepage=\\"false\\"></n8n-pagination-stub>
     <div class=\\"pageSizeSelector\\">
-      <n8n-select-stub value=\\"10\\" size=\\"mini\\" popperappendtobody=\\"true\\">
-        <n8n-option-stub value=\\"10\\" label=\\"10\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"25\\" label=\\"25\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"50\\" label=\\"50\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"100\\" label=\\"100\\"></n8n-option-stub>
-        <n8n-option-stub value=\\"*\\" label=\\"All\\"></n8n-option-stub>
-      </n8n-select-stub>
+      <n8n-select-stub modelvalue=\\"10\\" autocomplete=\\"off\\" automaticdropdown=\\"false\\" size=\\"mini\\" effect=\\"light\\" disabled=\\"false\\" clearable=\\"false\\" filterable=\\"false\\" allowcreate=\\"false\\" loading=\\"false\\" popperoptions=\\"[object Object]\\" remote=\\"false\\" multiple=\\"false\\" multiplelimit=\\"0\\" defaultfirstoption=\\"false\\" reservekeyword=\\"true\\" valuekey=\\"value\\" collapsetags=\\"false\\" collapsetagstooltip=\\"false\\" maxcollapsetags=\\"1\\" teleported=\\"true\\" persistent=\\"true\\" clearicon=\\"[object Object]\\" fitinputwidth=\\"false\\" suffixicon=\\"[object Object]\\" tagtype=\\"info\\" validateevent=\\"true\\" remoteshowsuffix=\\"false\\" suffixtransition=\\"true\\" placement=\\"bottom-start\\" popperappendtobody=\\"false\\" limitpopperwidth=\\"false\\"></n8n-select-stub>
     </div>
   </div>
 </div>"
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts b/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
index 44a45077bdcd1..3db1bc1f01254 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
@@ -1,6 +1,6 @@
 import N8nFormBox from './FormBox.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/FormBox',
@@ -13,15 +13,16 @@ export default {
 
 const methods = {
 	onSubmit: action('submit'),
-	onInput: action('input'),
+	onChange: action('update'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nFormBox,
 	},
-	template: '<n8n-form-box v-bind="$props" @submit="onSubmit" @input="onInput" />',
+	template: '<n8n-form-box v-bind="args" @submit="onSubmit" @update="onUpdate" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.vue b/packages/design-system/src/components/N8nFormBox/FormBox.vue
index 13bca7461ffe5..3098d53eee8ce 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.vue
@@ -10,7 +10,7 @@
 				:inputs="inputs"
 				:eventBus="formBus"
 				:columnView="true"
-				@input="onInput"
+				@update="onUpdateModelValue"
 				@submit="onSubmit"
 			/>
 		</div>
@@ -87,8 +87,8 @@ export default defineComponent({
 		};
 	},
 	methods: {
-		onInput(e: { name: string; value: string }) {
-			this.$emit('input', e);
+		onUpdateModelValue(e: { name: string; value: string }) {
+			this.$emit('update', e);
 		},
 		onSubmit(e: { [key: string]: string }) {
 			this.$emit('submit', e);
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts b/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
index 1542944794c1f..e69972ea0c7af 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
@@ -1,6 +1,6 @@
 import N8nFormInput from './FormInput.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/FormInput',
@@ -9,18 +9,19 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onFocus: action('focus'),
 	onChange: action('change'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nFormInput,
 	},
 	template: `
-		<n8n-form-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" />
+		<n8n-form-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" />
 	`,
 	methods,
 	data() {
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 30622d9f6fdaf..9e0b40972cbc4 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -2,7 +2,7 @@
 	<n8n-checkbox
 		v-if="type === 'checkbox'"
 		v-bind="$props"
-		@input="onInput"
+		@update:modelValue="onUpdateModelValue"
 		@focus="onFocus"
 		ref="inputRef"
 	/>
@@ -17,10 +17,10 @@
 			{{ tooltipText }}
 		</template>
 		<el-switch
-			:value="value"
-			@change="onInput"
+			:modelValue="modelValue"
 			:active-color="activeColor"
 			:inactive-color="inactiveColor"
+			@update:modelValue="onUpdateModelValue"
 		></el-switch>
 	</n8n-input-label>
 	<n8n-input-label
@@ -34,14 +34,15 @@
 			<slot v-if="hasDefaultSlot" />
 			<n8n-select
 				v-else-if="type === 'select' || type === 'multi-select'"
-				:value="value"
+				:modelValue="modelValue"
 				:placeholder="placeholder"
 				:multiple="type === 'multi-select'"
 				:disabled="disabled"
-				@change="onInput"
+				@update:modelValue="onUpdateModelValue"
 				@focus="onFocus"
 				@blur="onBlur"
 				:name="name"
+				:teleported="teleported"
 				ref="inputRef"
 			>
 				<n8n-option
@@ -56,11 +57,11 @@
 				:name="name"
 				:type="type"
 				:placeholder="placeholder"
-				:value="value"
+				:modelValue="modelValue"
 				:maxlength="maxlength"
 				:autocomplete="autocomplete"
 				:disabled="disabled"
-				@input="onInput"
+				@update:modelValue="onUpdateModelValue"
 				@blur="onBlur"
 				@focus="onFocus"
 				ref="inputRef"
@@ -92,7 +93,7 @@ import N8nSelect from '../N8nSelect';
 import N8nOption from '../N8nOption';
 import N8nInputLabel from '../N8nInputLabel';
 import N8nCheckbox from '../N8nCheckbox';
-import { Switch as ElSwitch } from 'element-ui';
+import { ElSwitch } from 'element-plus';
 
 import { getValidationError, VALIDATORS } from './validators';
 import type { Rule, RuleGroup, IValidator, Validatable, FormState } from '../../types';
@@ -100,7 +101,7 @@ import type { Rule, RuleGroup, IValidator, Validatable, FormState } from '../../
 import { t } from '../../locale';
 
 export interface Props {
-	value: Validatable;
+	modelValue: Validatable;
 	label: string;
 	infoText?: string;
 	required?: boolean;
@@ -125,6 +126,7 @@ export interface Props {
 	activeColor?: string;
 	inactiveLabel?: string;
 	inactiveColor?: string;
+	teleported?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -133,11 +135,12 @@ const props = withDefaults(defineProps<Props>(), {
 	type: 'text',
 	showRequiredAsterisk: true,
 	validateOnBlur: true,
+	teleported: true,
 });
 
 const emit = defineEmits<{
 	(event: 'validate', shouldValidate: boolean): void;
-	(event: 'input', value: unknown): void;
+	(event: 'update:modelValue', value: unknown): void;
 	(event: 'focus'): void;
 	(event: 'blur'): void;
 	(event: 'enter'): void;
@@ -160,7 +163,11 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 	} as { [key: string]: IValidator | RuleGroup };
 
 	if (props.required) {
-		const error = getValidationError(props.value, validators, validators.REQUIRED as IValidator);
+		const error = getValidationError(
+			props.modelValue,
+			validators,
+			validators.REQUIRED as IValidator,
+		);
 		if (error) return error;
 	}
 
@@ -169,7 +176,7 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 			const rule = rules[i] as Rule;
 			if (validators[rule.name]) {
 				const error = getValidationError(
-					props.value,
+					props.modelValue,
 					validators,
 					validators[rule.name] as IValidator,
 					rule.config,
@@ -180,7 +187,7 @@ function getInputValidationError(): ReturnType<IValidator['validate']> {
 
 		if (rules[i].hasOwnProperty('rules')) {
 			const rule = rules[i] as RuleGroup;
-			const error = getValidationError(props.value, validators, rule);
+			const error = getValidationError(props.modelValue, validators, rule);
 			if (error) return error;
 		}
 	}
@@ -194,9 +201,9 @@ function onBlur() {
 	emit('blur');
 }
 
-function onInput(value: FormState) {
+function onUpdateModelValue(value: FormState) {
 	state.isTyping = true;
-	emit('input', value);
+	emit('update:modelValue', value);
 }
 
 function onFocus() {
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts b/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
index 4f4e17dba3a4f..d01968b3c288e 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
@@ -1,6 +1,6 @@
 import N8nFormInputs from './FormInputs.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/FormInputs',
@@ -12,16 +12,17 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onChange: action('change'),
 	onSubmit: action('submit'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nFormInputs,
 	},
-	template: '<n8n-form-inputs v-bind="$props" @submit="onSubmit" @input="onInput" />',
+	template: '<n8n-form-inputs v-bind="args" @submit="onSubmit" @change="onChange" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index e0809c1d39526..8351959667de1 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -22,12 +22,12 @@
 						v-bind="input.properties"
 						:name="input.name"
 						:label="input.properties.label || ''"
-						:value="values[input.name]"
+						:modelValue="values[input.name]"
 						:data-test-id="input.name"
 						:showValidationWarnings="showValidationWarnings"
-						@input="(value) => onInput(input.name, value)"
+						:teleported="teleported"
+						@update:modelValue="(value) => onUpdateModelValue(input.name, value)"
 						@validate="(value) => onValidate(input.name, value)"
-						@change="(value) => onInput(input.name, value)"
 						@enter="onSubmit"
 					/>
 				</div>
@@ -69,6 +69,10 @@ export default defineComponent({
 			default: '',
 			validator: (value: string): boolean => ['', 'xs', 's', 'm', 'm', 'l', 'xl'].includes(value),
 		},
+		teleported: {
+			type: Boolean,
+			default: true,
+		},
 	},
 	data() {
 		return {
@@ -80,7 +84,10 @@ export default defineComponent({
 	mounted() {
 		this.inputs.forEach((input) => {
 			if (input.hasOwnProperty('initialValue')) {
-				this.$set(this.values, input.name, input.initialValue);
+				this.values = {
+					...this.values,
+					[input.name]: input.initialValue,
+				};
 			}
 		});
 
@@ -105,15 +112,18 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		onInput(name: string, value: unknown) {
+		onUpdateModelValue(name: string, value: unknown) {
 			this.values = {
 				...this.values,
 				[name]: value,
 			};
-			this.$emit('input', { name, value });
+			this.$emit('update', { name, value });
 		},
 		onValidate(name: string, valid: boolean) {
-			this.$set(this.validity, name, valid);
+			this.validity = {
+				...this.validity,
+				[name]: valid,
+			};
 		},
 		onSubmit() {
 			this.showValidationWarnings = true;
diff --git a/packages/design-system/src/components/N8nHeading/Heading.stories.ts b/packages/design-system/src/components/N8nHeading/Heading.stories.ts
index c581f3c7901b8..8110662bc1948 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.stories.ts
+++ b/packages/design-system/src/components/N8nHeading/Heading.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nHeading from './Heading.vue';
 
 export default {
@@ -8,24 +8,25 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['2xlarge', 'xlarge', 'large', 'medium', 'small'],
 			},
+			options: ['2xlarge', 'xlarge', 'large', 'medium', 'small'],
 		},
 		color: {
 			control: {
 				type: 'select',
-				options: ['primary', 'text-dark', 'text-base', 'text-light', 'text-xlight'],
 			},
+			options: ['primary', 'text-dark', 'text-base', 'text-light', 'text-xlight'],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nHeading,
 	},
-	template: '<n8n-heading v-bind="$props">hello world</n8n-heading>',
+	template: '<n8n-heading v-bind="args">hello world</n8n-heading>',
 });
 
 export const Heading = Template.bind({});
diff --git a/packages/design-system/src/components/N8nHeading/Heading.vue b/packages/design-system/src/components/N8nHeading/Heading.vue
index 43c24423a9761..81da7e7bcaa7c 100644
--- a/packages/design-system/src/components/N8nHeading/Heading.vue
+++ b/packages/design-system/src/components/N8nHeading/Heading.vue
@@ -1,5 +1,5 @@
 <template>
-	<component :is="tag" :class="['n8n-heading', ...classes]" v-on="$listeners">
+	<component :is="tag" :class="['n8n-heading', ...classes]" v-bind="$attrs">
 		<slot></slot>
 	</component>
 </template>
diff --git a/packages/design-system/src/components/N8nIcon/Icon.stories.ts b/packages/design-system/src/components/N8nIcon/Icon.stories.ts
index 6d71ea5a00c2d..1b5d3b115aa26 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.stories.ts
+++ b/packages/design-system/src/components/N8nIcon/Icon.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nIcon from './Icon.vue';
 
 export default {
@@ -11,8 +11,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['xsmall', 'small', 'medium', 'large'],
 			},
+			options: ['xsmall', 'small', 'medium', 'large'],
 		},
 		spin: {
 			control: {
@@ -23,11 +23,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIcon,
 	},
-	template: '<n8n-icon v-bind="$props" />',
+	template: '<n8n-icon v-bind="args" />',
 });
 
 export const Clock = Template.bind({});
diff --git a/packages/design-system/src/components/N8nIcon/Icon.vue b/packages/design-system/src/components/N8nIcon/Icon.vue
index 4cce7dcdac707..9b2d2204f3f86 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.vue
+++ b/packages/design-system/src/components/N8nIcon/Icon.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-text :size="size" :color="color" :compact="true" class="n8n-icon" v-on="$listeners">
+	<n8n-text :size="size" :color="color" :compact="true" class="n8n-icon" v-bind="$attrs">
 		<font-awesome-icon :icon="icon" :spin="spin" :class="$style[size]" />
 	</n8n-text>
 </template>
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts b/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
index 22917d2d95679..a5207fdb4d1c1 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
@@ -1,6 +1,6 @@
 import N8nIconButton from './IconButton.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Icon Button',
@@ -13,8 +13,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 			},
+			options: ['mini', 'small', 'medium', 'large', 'xlarge'],
 		},
 	},
 	parameters: {
@@ -27,11 +27,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIconButton,
 	},
-	template: '<n8n-icon-button v-bind="$props" @click="onClick" />',
+	template: '<n8n-icon-button @click="onClick" v-bind="args" />',
 	methods,
 });
 
@@ -42,12 +43,13 @@ Button.args = {
 };
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIconButton,
 	},
 	template:
-		'<div> <n8n-icon-button v-bind="$props" size="xlarge" @click="onClick" /> <n8n-icon-button v-bind="$props" size="large" @click="onClick" />  <n8n-icon-button v-bind="$props" size="medium" @click="onClick" />  <n8n-icon-button v-bind="$props" size="small" @click="onClick" />  <n8n-icon-button v-bind="$props" :loading="true" @click="onClick" />  <n8n-icon-button v-bind="$props" :disabled="true" @click="onClick" /></div>',
+		'<div> <n8n-icon-button v-bind="args" size="xlarge" @click="onClick" /> <n8n-icon-button v-bind="args" size="large" @click="onClick" />  <n8n-icon-button v-bind="args" size="medium" @click="onClick" />  <n8n-icon-button v-bind="args" size="small" @click="onClick" />  <n8n-icon-button v-bind="args" :loading="true" @click="onClick" />  <n8n-icon-button v-bind="args" :disabled="true" @click="onClick" /></div>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.vue b/packages/design-system/src/components/N8nIconButton/IconButton.vue
index 3782436bc1034..249ee4ff0f6bc 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.vue
+++ b/packages/design-system/src/components/N8nIconButton/IconButton.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-button square v-bind="$props" v-on="$listeners" />
+	<n8n-button square v-bind="{ ...$attrs, ...$props }" />
 </template>
 
 <script lang="ts">
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
index ed00ec9eb8e38..75a28abf458c9 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
@@ -1,5 +1,5 @@
 import N8nInfoAccordion from './InfoAccordion.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
 
 export default {
@@ -16,11 +16,12 @@ const methods = {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInfoAccordion,
 	},
-	template: '<n8n-info-accordion v-bind="$props" @click="onClick" />',
+	template: '<n8n-info-accordion v-bind="args" @click="onClick" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index 7cf5d10d9d233..ee3b292d5a46f 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -43,6 +43,8 @@ import N8nText from '../N8nText';
 import N8nIcon from '../N8nIcon';
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
+import type { EventBus } from '../../utils';
+import { createEventBus } from '../../utils';
 
 export interface IAccordionItem {
 	id: string;
@@ -77,9 +79,13 @@ export default defineComponent({
 			type: Object as PropType<{ icon: string; color: string }>,
 			required: false,
 		},
+		eventBus: {
+			type: Object as PropType<EventBus>,
+			default: () => createEventBus(),
+		},
 	},
 	mounted() {
-		this.$on('expand', () => {
+		this.eventBus.on('expand', () => {
 			this.expanded = true;
 		});
 		this.expanded = this.initiallyExpanded;
@@ -94,7 +100,7 @@ export default defineComponent({
 			this.expanded = !this.expanded;
 		},
 		onClick(e: MouseEvent) {
-			this.$emit('click', e);
+			this.$emit('click:body', e);
 		},
 		onTooltipClick(item: string, event: MouseEvent) {
 			this.$emit('tooltipClick', item, event);
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts b/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
index e25106eb09bca..cf27c72a7220b 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nInfoTip from './InfoTip.vue';
 
 export default {
@@ -7,12 +7,13 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInfoTip,
 	},
 	template:
-		'<n8n-info-tip v-bind="$props">Need help doing something? <a href="/docs" target="_blank">Open docs</a></n8n-info-tip>',
+		'<n8n-info-tip v-bind="args">Need help doing something? <a href="/docs" target="_blank">Open docs</a></n8n-info-tip>',
 });
 
 export const Note = Template.bind({});
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts b/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
index 0df326f7a39aa..b25713001b563 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
+++ b/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
@@ -10,7 +10,9 @@ describe('N8nInfoTip', () => {
 	it('should render correctly as note', () => {
 		const wrapper = render(N8nInfoTip, {
 			slots,
-			stubs,
+			global: {
+				stubs,
+			},
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
@@ -18,10 +20,12 @@ describe('N8nInfoTip', () => {
 	it('should render correctly as tooltip', () => {
 		const wrapper = render(N8nInfoTip, {
 			slots,
-			stubs,
 			props: {
 				type: 'tooltip',
 			},
+			global: {
+				stubs,
+			},
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
index 075cbbb8476f7..e43f3a560b55b 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
+++ b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
@@ -1,9 +1,9 @@
 // Vitest Snapshot v1
 
-exports[`N8nInfoTip > should render correctly as note 1`] = `"<div class=\\"n8n-info-tip info note bold\\"><span class=\\"iconText\\"><span class=\\"n8n-icon n8n-text compact size-medium regular\\"></span><span>Need help doing something?<a href=\\"/docs\\" target=\\"_blank\\">Open docs</a></span></span></div>"`;
+exports[`N8nInfoTip > should render correctly as note 1`] = `"<div class=\\"n8n-info-tip info note bold\\"><span class=\\"iconText\\"><span class=\\"n8n-text compact size-medium regular n8n-icon n8n-icon\\"><!----></span><span>Need help doing something?<a href=\\"/docs\\" target=\\"_blank\\">Open docs</a></span></span></div>"`;
 
 exports[`N8nInfoTip > should render correctly as tooltip 1`] = `
 "<div class=\\"n8n-info-tip info tooltip bold\\">
-  <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\" popper-class=\\"tooltipPopper\\"><span class=\\"iconText\\"><span class=\\"n8n-icon n8n-text compact size-medium regular\\"></span></span></n8n-tooltip-stub>
+  <n8n-tooltip-stub popperclass=\\"tooltipPopper\\" role=\\"tooltip\\" showafter=\\"0\\" hideafter=\\"200\\" autoclose=\\"0\\" boundariespadding=\\"0\\" gpuacceleration=\\"true\\" offset=\\"12\\" placement=\\"top\\" popperoptions=\\"[object Object]\\" strategy=\\"absolute\\" effect=\\"dark\\" enterable=\\"true\\" pure=\\"false\\" focusonshow=\\"false\\" trapping=\\"false\\" stoppoppermouseevent=\\"true\\" virtualtriggering=\\"false\\" content=\\"\\" rawcontent=\\"false\\" persistent=\\"false\\" teleported=\\"true\\" disabled=\\"false\\" open=\\"false\\" trigger=\\"hover\\" triggerkeys=\\"Enter,Space\\" arrowoffset=\\"5\\" showarrow=\\"true\\" justifybuttons=\\"flex-end\\" buttons=\\"\\" class=\\"\\"></n8n-tooltip-stub>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nInput/Input.stories.ts b/packages/design-system/src/components/N8nInput/Input.stories.ts
index a753399e9c816..2ab4056259879 100644
--- a/packages/design-system/src/components/N8nInput/Input.stories.ts
+++ b/packages/design-system/src/components/N8nInput/Input.stories.ts
@@ -1,7 +1,7 @@
 import N8nInput from './Input.vue';
 import N8nIcon from '../N8nIcon';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input',
@@ -30,18 +30,19 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onFocus: action('focus'),
 	onChange: action('change'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInput,
 	},
 	template:
-		'<n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" />',
+		'<n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" />',
 	data() {
 		return {
 			val: '',
@@ -56,12 +57,13 @@ Input.args = {
 };
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInput,
 	},
 	template:
-		'<div class="multi-container"> <n8n-input size="xlarge" v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" size="medium" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" size="small" v-model="val" @input="onInput" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="$props" v-model="val" size="mini" @input="onInput" @change="onChange" @focus="onFocus" /> </div> ',
+		'<div class="multi-container"> <n8n-input size="xlarge" v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" size="medium" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" size="small" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> <n8n-input v-bind="args" v-model="val" size="mini" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus" /> </div> ',
 	methods,
 	data() {
 		return {
@@ -83,13 +85,14 @@ TextArea.args = {
 };
 
 const WithPrefix: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIcon,
 		N8nInput,
 	},
 	template:
-		'<n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="prefix" /></n8n-input>',
+		'<n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="prefix" /></n8n-input>',
 	data() {
 		return {
 			val: '',
@@ -104,13 +107,14 @@ WithPrefixIcon.args = {
 };
 
 const WithSuffix: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nIcon,
 		N8nInput,
 	},
 	template:
-		'<n8n-input v-bind="$props" v-model="val" @input="onInput" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="suffix" /></n8n-input>',
+		'<n8n-input v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" @focus="onFocus"><n8n-icon icon="clock" slot="suffix" /></n8n-input>',
 	data() {
 		return {
 			val: '',
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index 1236d0f6ad97d..efe1f7b3e125c 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -1,31 +1,32 @@
 <template>
 	<el-input
-		v-bind="$props"
 		:size="computedSize"
 		:class="['n8n-input', ...classes]"
 		:autoComplete="autocomplete"
-		ref="innerInput"
-		v-on="$listeners"
 		:name="name"
+		ref="innerInput"
+		v-bind="{ ...$props, ...$attrs }"
 	>
-		<template #prepend>
+		<template #prepend v-if="$slots.prepend">
 			<slot name="prepend" />
 		</template>
-		<template #append>
+		<template #append v-if="$slots.append">
 			<slot name="append" />
 		</template>
-		<template #prefix>
+		<template #prefix v-if="$slots.prefix">
 			<slot name="prefix" />
 		</template>
-		<template #suffix>
+		<template #suffix v-if="$slots.suffix">
 			<slot name="suffix" />
 		</template>
 	</el-input>
 </template>
 
 <script lang="ts">
-import { Input as ElInput } from 'element-ui';
+import { ElInput } from 'element-plus';
+import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
+import { uid } from '../../utils';
 
 type InputRef = InstanceType<typeof ElInput>;
 
@@ -35,7 +36,10 @@ export default defineComponent({
 		ElInput,
 	},
 	props: {
-		value: {},
+		modelValue: {
+			type: [String, Number] as PropType<string | number>,
+			default: '',
+		},
 		type: {
 			type: String,
 			validator: (value: string): boolean =>
@@ -49,27 +53,35 @@ export default defineComponent({
 		},
 		placeholder: {
 			type: String,
+			default: '',
 		},
 		disabled: {
 			type: Boolean,
+			default: false,
 		},
 		readonly: {
 			type: Boolean,
+			default: false,
 		},
 		clearable: {
 			type: Boolean,
+			default: false,
 		},
 		rows: {
 			type: Number,
+			default: 2,
 		},
 		maxlength: {
 			type: Number,
+			default: Infinity,
 		},
 		title: {
 			type: String,
+			default: '',
 		},
 		name: {
 			type: String,
+			default: () => uid('input'),
 		},
 		autocomplete: {
 			type: String,
diff --git a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
index 8026fab588239..d4fb295d71efe 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
+++ b/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
@@ -3,7 +3,11 @@ import N8nInput from '../Input.vue';
 
 describe('N8nInput', () => {
 	it('should render correctly', () => {
-		const wrapper = render(N8nInput);
+		const wrapper = render(N8nInput, {
+			props: {
+				name: 'input',
+			},
+		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
 
diff --git a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap b/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
index 47f0921e95098..dbd6077335cf6 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
+++ b/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
@@ -2,10 +2,14 @@
 
 exports[`N8nInput > should render correctly 1`] = `
 "<div class=\\"el-input el-input--large n8n-input\\">
-  <!----><input type=\\"text\\" autocomplete=\\"off\\" class=\\"el-input__inner\\">
-  <!---->
-  <!---->
-  <!---->
-  <!---->
+  <!-- input -->
+  <!-- prepend slot -->
+  <!--v-if-->
+  <div class=\\"el-input__wrapper\\">
+    <!-- prefix slot -->
+    <!--v-if--><input class=\\"el-input__inner\\" autocomplete=\\"off\\" name=\\"input\\" rows=\\"2\\" maxlength=\\"Infinity\\" title=\\"\\" type=\\"text\\" tabindex=\\"0\\" placeholder=\\"\\"><!-- suffix slot -->
+    <!--v-if-->
+  </div><!-- append slot -->
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts b/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
index 8eb6539865391..0feb1283a131d 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
@@ -1,6 +1,6 @@
 import N8nInputLabel from './InputLabel.vue';
 import N8nInput from '../N8nInput';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input Label',
@@ -12,13 +12,17 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInputLabel,
 		N8nInput,
 	},
-	template:
-		'<div style="margin-top:50px"><n8n-input-label v-bind="$props"><n8n-input /></n8n-input-label></div>',
+	template: `<div style="margin-top:50px">
+			<n8n-input-label v-bind="args">
+				<n8n-input />
+			</n8n-input-label>
+		</div>`,
 });
 
 export const InputLabel = Template.bind({});
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index 6e96e49252783..38c340380fe94 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="$style.container" v-on="$listeners" data-test-id="input-label">
+	<div :class="$style.container" v-bind="$attrs" data-test-id="input-label">
 		<label
 			v-if="label || $slots.options"
 			:for="inputName"
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
index 78ce48e77d9f5..d1496da540fb5 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
@@ -1,6 +1,6 @@
 import N8nInputNumber from './InputNumber.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Input Number',
@@ -49,15 +49,17 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInputNumber,
 	},
-	template: '<n8n-input-number v-bind="$props" v-model="val" @input="onInput" />',
+	template:
+		'<n8n-input-number v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" />',
 	data() {
 		return {
 			val: null,
@@ -73,12 +75,13 @@ Input.args = {
 };
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nInputNumber,
 	},
 	template:
-		'<div> <n8n-input-number style="margin-bottom:10px" v-bind="$props" v-model="val" @input="onInput" /> <n8n-input-number style="margin-bottom:10px" v-bind="$props" size="medium" v-model="val" @input="onInput" /> <n8n-input-number style="margin-bottom:10px" v-bind="$props" size="small" v-model="val" @input="onInput" /> <n8n-input-number style="margin-bottom:10px" v-bind="$props" v-model="val" size="mini" @input="onInput" /> </div>',
+		'<div> <n8n-input-number style="margin-bottom:10px" v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" /> <n8n-input-number style="margin-bottom:10px" v-bind="args" size="medium" v-model="val" @update:modelValue="onUpdateModelValue" /> <n8n-input-number style="margin-bottom:10px" v-bind="args" size="small" v-model="val" @update:modelValue="onUpdateModelValue" /> <n8n-input-number style="margin-bottom:10px" v-bind="args" v-model="val" size="mini" @update:modelValue="onUpdateModelValue" /> </div>',
 	methods,
 	data() {
 		return {
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
index edc6211c174b3..4c1b3bd60a801 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
+++ b/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
@@ -1,4 +1,18 @@
 <script lang="ts">
-import { InputNumber } from 'element-ui';
-export default InputNumber;
+import { ElInputNumber } from 'element-plus';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'N8nInputNumber',
+	props: {
+		...ElInputNumber.props,
+	},
+	components: {
+		ElInputNumber,
+	},
+});
 </script>
+
+<template>
+	<el-input-number v-bind="{ ...$props, ...$attrs }" />
+</template>
diff --git a/packages/design-system/src/components/N8nLink/Link.stories.ts b/packages/design-system/src/components/N8nLink/Link.stories.ts
index 6daeb93d64ac4..b11a7f4afdcf3 100644
--- a/packages/design-system/src/components/N8nLink/Link.stories.ts
+++ b/packages/design-system/src/components/N8nLink/Link.stories.ts
@@ -1,6 +1,6 @@
 import N8nLink from './Link.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Link',
@@ -9,8 +9,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['small', 'medium', 'large'],
 			},
+			options: ['small', 'medium', 'large'],
 		},
 	},
 };
@@ -20,11 +20,12 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nLink,
 	},
-	template: '<n8n-link v-bind="$props" @click="onClick">hello world</n8n-link>',
+	template: '<n8n-link v-bind="args" @click="onClick">hello world</n8n-link>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nLink/Link.vue b/packages/design-system/src/components/N8nLink/Link.vue
index a76fab71d91d8..998fd6319080e 100644
--- a/packages/design-system/src/components/N8nLink/Link.vue
+++ b/packages/design-system/src/components/N8nLink/Link.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-route :to="to" :newWindow="newWindow" v-on="$listeners" class="n8n-link">
+	<n8n-route :to="to" :newWindow="newWindow" v-bind="$attrs" class="n8n-link">
 		<span :class="$style[`${underline ? `${theme}-underline` : theme}`]">
 			<n8n-text :size="size" :bold="bold">
 				<slot></slot>
diff --git a/packages/design-system/src/components/N8nLoading/Loading.stories.ts b/packages/design-system/src/components/N8nLoading/Loading.stories.ts
index 86f0bd1461104..5d2ac6c435861 100644
--- a/packages/design-system/src/components/N8nLoading/Loading.stories.ts
+++ b/packages/design-system/src/components/N8nLoading/Loading.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nLoading from './Loading.vue';
 
 export default {
@@ -18,24 +18,25 @@ export default {
 		rows: {
 			control: {
 				type: 'select',
-				options: [1, 2, 3, 4, 5],
 			},
+			options: [1, 2, 3, 4, 5],
 		},
 		variant: {
 			control: {
 				type: 'select',
-				options: ['button', 'h1', 'image', 'p'],
 			},
+			options: ['button', 'h1', 'image', 'p'],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nLoading,
 	},
-	template: '<n8n-loading v-bind="$props"></n8n-loading>',
+	template: '<n8n-loading v-bind="args"></n8n-loading>',
 });
 
 export const Loading = Template.bind({});
diff --git a/packages/design-system/src/components/N8nLoading/Loading.vue b/packages/design-system/src/components/N8nLoading/Loading.vue
index ecb760f3af09c..29b62cba9286c 100644
--- a/packages/design-system/src/components/N8nLoading/Loading.vue
+++ b/packages/design-system/src/components/N8nLoading/Loading.vue
@@ -28,7 +28,7 @@
 				</div>
 			</div>
 			<div :class="$style.custom" v-else-if="variant === 'custom'">
-				<el-skeleton-item :variant="variant" />
+				<el-skeleton-item />
 			</div>
 			<el-skeleton-item v-else :variant="variant" />
 		</template>
@@ -36,8 +36,7 @@
 </template>
 
 <script lang="ts">
-import { Skeleton as ElSkeleton, SkeletonItem as ElSkeletonItem } from 'element-ui';
-
+import { ElSkeleton, ElSkeletonItem } from 'element-plus';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
@@ -99,7 +98,7 @@ export default defineComponent({
 </style>
 
 <style lang="scss">
-.n8n-loading-custom .el-skeleton {
+.n8n-loading-custom.el-skeleton {
 	&,
 	.el-skeleton__item {
 		width: 100%;
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts b/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
index 70c039f1560b8..180bf23acd4f5 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nMarkdown from './Markdown.vue';
 
 export default {
@@ -18,24 +18,25 @@ export default {
 		loadingBlocks: {
 			control: {
 				type: 'select',
-				options: [1, 2, 3, 4, 5],
 			},
+			options: [1, 2, 3, 4, 5],
 		},
 		loadingRows: {
 			control: {
 				type: 'select',
-				options: [1, 2, 3, 4, 5],
 			},
+			options: [1, 2, 3, 4, 5],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMarkdown,
 	},
-	template: '<n8n-markdown v-bind="$props"></n8n-markdown>',
+	template: '<n8n-markdown v-bind="args"></n8n-markdown>',
 });
 
 export const Markdown = Template.bind({});
diff --git a/packages/design-system/src/components/N8nMenu/Menu.stories.ts b/packages/design-system/src/components/N8nMenu/Menu.stories.ts
index e18a7840f50a3..970d55b62ff05 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.stories.ts
+++ b/packages/design-system/src/components/N8nMenu/Menu.stories.ts
@@ -1,7 +1,7 @@
 import N8nMenu from './Menu.vue';
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import { action } from '@storybook/addon-actions';
 
 export default {
@@ -15,19 +15,21 @@ const methods = {
 };
 
 const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMenu,
 	},
 	template: `
 		<div style="height: 90vh; width: 200px">
-			<n8n-menu v-bind="$props" @select="onSelect"></n8n-menu>
+			<n8n-menu v-bind="args" @select="onSelect"></n8n-menu>
 		</div>
 	`,
 	methods,
 });
 
 const templateWithHeaderAndFooter: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMenu,
@@ -36,7 +38,7 @@ const templateWithHeaderAndFooter: StoryFn = (args, { argTypes }) => ({
 	},
 	template: `
 		<div style="height: 90vh; width: 200px">
-			<n8n-menu v-bind="$props" @select="onSelect">
+			<n8n-menu v-bind="args" @select="onSelect">
 				<template #header>
 					<a href="#" class="p-m hideme" style="display: block;">
 						<n8n-icon icon="long-arrow-alt-left"/>&nbsp;&nbsp;Back to home
@@ -55,6 +57,7 @@ const templateWithHeaderAndFooter: StoryFn = (args, { argTypes }) => ({
 });
 
 const templateWithAllSlots: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nMenu,
@@ -63,7 +66,7 @@ const templateWithAllSlots: StoryFn = (args, { argTypes }) => ({
 	},
 	template: `
 		<div style="height: 90vh; width: 200px">
-			<n8n-menu v-bind="$props" @select="onSelect">
+			<n8n-menu v-bind="args" @select="onSelect">
 				<template #header>
 					<a href="#" class="p-m hideme" style="display: block;">
 						<n8n-icon icon="long-arrow-alt-left"/>&nbsp;&nbsp;Back to home
diff --git a/packages/design-system/src/components/N8nMenu/Menu.vue b/packages/design-system/src/components/N8nMenu/Menu.vue
index 62c45740993ab..b5ed60260a457 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.vue
+++ b/packages/design-system/src/components/N8nMenu/Menu.vue
@@ -14,7 +14,7 @@
 				<div v-if="$slots.menuPrefix" :class="$style.menuPrefix">
 					<slot name="menuPrefix"></slot>
 				</div>
-				<el-menu :defaultActive="defaultActive" :collapse="collapsed" v-on="$listeners">
+				<el-menu :defaultActive="defaultActive" :collapse="collapsed">
 					<n8n-menu-item
 						v-for="item in upperMenuItems"
 						:key="item.id"
@@ -23,13 +23,13 @@
 						:tooltipDelay="tooltipDelay"
 						:mode="mode"
 						:activeTab="activeTab"
-						@click="onSelect"
+						:handle-select="onSelect"
 					/>
 				</el-menu>
 			</div>
 			<div :class="[$style.lowerContent, 'pb-2xs']">
 				<slot name="beforeLowerMenu"></slot>
-				<el-menu :defaultActive="defaultActive" :collapse="collapsed" v-on="$listeners">
+				<el-menu :defaultActive="defaultActive" :collapse="collapsed">
 					<n8n-menu-item
 						v-for="item in lowerMenuItems"
 						:key="item.id"
@@ -38,7 +38,7 @@
 						:tooltipDelay="tooltipDelay"
 						:mode="mode"
 						:activeTab="activeTab"
-						@click="onSelect"
+						:handle-select="onSelect"
 					/>
 				</el-menu>
 				<div v-if="$slots.menuSuffix" :class="$style.menuSuffix">
@@ -53,7 +53,7 @@
 </template>
 
 <script lang="ts">
-import { Menu as ElMenu } from 'element-ui';
+import { ElMenu } from 'element-plus';
 import N8nMenuItem from '../N8nMenuItem';
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
@@ -96,8 +96,8 @@ export default defineComponent({
 			type: Array as PropType<IMenuItem[]>,
 			default: (): IMenuItem[] => [],
 		},
-		value: {
-			type: String,
+		modelValue: {
+			type: [String, Boolean],
 			default: '',
 		},
 	},
@@ -116,7 +116,7 @@ export default defineComponent({
 			this.activeTab = this.items.length > 0 ? this.items[0].id : '';
 		}
 
-		this.$emit('input', this.activeTab);
+		this.$emit('update:modelValue', this.activeTab);
 	},
 	computed: {
 		upperMenuItems(): IMenuItem[] {
@@ -139,17 +139,26 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		onSelect(event: MouseEvent, option: string): void {
+		onSelect(item: IMenuItem): void {
+			if (item && item.type === 'link' && item.properties) {
+				const href: string = item.properties.href;
+				if (!href) {
+					return;
+				}
+
+				if (item.properties.newWindow) {
+					window.open(href);
+				} else {
+					window.location.assign(item.properties.href);
+				}
+			}
+
 			if (this.mode === 'tabs') {
-				this.activeTab = option;
+				this.activeTab = item.id;
 			}
-			this.$emit('select', option);
-			this.$emit('input', this.activeTab);
-		},
-	},
-	watch: {
-		value(value: string) {
-			this.activeTab = value;
+
+			this.$emit('select', item.id);
+			this.$emit('update:modelValue', item.id);
 		},
 	},
 });
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts b/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
index 342bac227f5b7..5ad04296348eb 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
@@ -1,6 +1,6 @@
 import N8nMenuItem from '.';
-import { Menu as ElMenu } from 'element-ui';
-import type { StoryFn } from '@storybook/vue';
+import { ElMenu } from 'element-plus';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/MenuItem',
@@ -8,6 +8,7 @@ export default {
 };
 
 const template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		ElMenu,
@@ -16,7 +17,7 @@ const template: StoryFn = (args, { argTypes }) => ({
 	template: `
 		<div style="width: 200px">
 			<el-menu>
-				<n8n-menu-item v-bind="$props" />
+				<n8n-menu-item v-bind="args" />
 			</el-menu>
 		</div>
 	`,
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index a62a33fb2dc12..e532b9b4f73ae 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -1,6 +1,6 @@
 <template>
 	<div :class="['n8n-menu-item', $style.item]">
-		<el-submenu
+		<el-sub-menu
 			v-if="item.children?.length"
 			:id="item.id"
 			:class="{
@@ -9,8 +9,8 @@
 				[$style.active]: mode === 'router' && isItemActive(item),
 			}"
 			:index="item.id"
-			popper-append-to-body
-			:popper-class="`${$style.submenuPopper} ${popperClass}`"
+			teleported
+			:popper-class="submenuPopperClass"
 		>
 			<template #title>
 				<n8n-icon
@@ -22,16 +22,17 @@
 				<span :class="$style.label">{{ item.label }}</span>
 			</template>
 			<n8n-menu-item
-				v-for="item in availableChildren"
-				:key="item.id"
-				:item="item"
+				v-for="child in availableChildren"
+				:key="child.id"
+				:item="child"
 				:compact="compact"
 				:tooltipDelay="tooltipDelay"
 				:popperClass="popperClass"
 				:mode="mode"
 				:activeTab="activeTab"
+				:handle-select="handleSelect"
 			/>
-		</el-submenu>
+		</el-sub-menu>
 		<n8n-tooltip
 			v-else
 			placement="right"
@@ -50,7 +51,7 @@
 				}"
 				data-test-id="menu-item"
 				:index="item.id"
-				@click="onItemClick(item, $event)"
+				@click="handleSelect(item)"
 			>
 				<n8n-icon
 					v-if="item.icon"
@@ -75,7 +76,7 @@
 </template>
 
 <script lang="ts">
-import { Submenu as ElSubmenu, MenuItem as ElMenuItem } from 'element-ui';
+import { ElSubMenu, ElMenuItem } from 'element-plus';
 import N8nTooltip from '../N8nTooltip';
 import N8nIcon from '../N8nIcon';
 import type { PropType } from 'vue';
@@ -85,7 +86,7 @@ import type { IMenuItem, RouteObject } from '../../types';
 export default defineComponent({
 	name: 'n8n-menu-item',
 	components: {
-		ElSubmenu,
+		ElSubMenu,
 		ElMenuItem,
 		N8nIcon,
 		N8nTooltip,
@@ -115,6 +116,9 @@ export default defineComponent({
 		activeTab: {
 			type: String,
 		},
+		handleSelect: {
+			type: Function as PropType<(item: IMenuItem) => void>,
+		},
 	},
 	computed: {
 		availableChildren(): IMenuItem[] {
@@ -130,6 +134,13 @@ export default defineComponent({
 				}
 			);
 		},
+		submenuPopperClass(): string {
+			const popperClass = [this.$style.submenuPopper, this.popperClass];
+			if (this.compact) {
+				popperClass.push(this.$style.compact);
+			}
+			return popperClass.join(' ');
+		},
 	},
 	methods: {
 		isItemActive(item: IMenuItem): boolean {
@@ -156,21 +167,6 @@ export default defineComponent({
 				return item.id === this.activeTab;
 			}
 		},
-		onItemClick(item: IMenuItem, event: MouseEvent) {
-			if (item && item.type === 'link' && item.properties) {
-				const href: string = item.properties.href;
-				if (!href) {
-					return;
-				}
-
-				if (item.properties.newWindow) {
-					window.open(href);
-				} else {
-					window.location.assign(item.properties.href);
-				}
-			}
-			this.$emit('click', event, item.id);
-		},
 	},
 });
 </script>
@@ -178,26 +174,42 @@ export default defineComponent({
 <style module lang="scss">
 // Element menu-item overrides
 :global(.el-menu-item),
-:global(.el-submenu__title) {
+:global(.el-sub-menu__title) {
 	--menu-font-color: var(--color-text-base);
 	--menu-item-active-background-color: var(--color-foreground-base);
 	--menu-item-active-font-color: var(--color-text-dark);
 	--menu-item-hover-fill: var(--color-foreground-base);
 	--menu-item-hover-font-color: var(--color-text-dark);
 	--menu-item-height: 35px;
-	--submenu-item-height: 27px;
+	--sub-menu-item-height: 27px;
+}
+
+@mixin compact() {
+	.icon {
+		margin: 0;
+		overflow: visible !important;
+		visibility: visible !important;
+		width: initial !important;
+		height: initial !important;
+	}
+	.label {
+		display: none;
+	}
+	.secondaryIcon {
+		display: none;
+	}
 }
 
 .submenu {
 	background: none !important;
 
-	&.compact :global(.el-submenu__title) {
+	&.compact :global(.el-sub-menu__title) {
 		i {
 			display: none;
 		}
 	}
 
-	:global(.el-submenu__title) {
+	:global(.el-sub-menu__title) {
 		display: flex;
 		align-items: center;
 		border-radius: var(--border-radius-base) !important;
@@ -219,7 +231,7 @@ export default defineComponent({
 	}
 
 	.menuItem {
-		height: var(--submenu-item-height) !important;
+		height: var(--sub-menu-item-height) !important;
 		min-width: auto !important;
 		margin: var(--spacing-2xs) 0 !important;
 		padding-left: var(--spacing-l) !important;
@@ -246,7 +258,7 @@ export default defineComponent({
 		svg {
 			color: var(--color-text-dark) !important;
 		}
-		&:global(.el-submenu) {
+		&:global(.el-sub-menu) {
 			background-color: unset !important;
 		}
 	}
@@ -254,7 +266,7 @@ export default defineComponent({
 
 .active {
 	&,
-	& :global(.el-submenu__title) {
+	& :global(.el-sub-menu__title) {
 		background-color: var(--color-foreground-base);
 		border-radius: var(--border-radius-base);
 		.icon {
@@ -295,20 +307,7 @@ export default defineComponent({
 }
 
 .compact {
-	width: 40px;
-	.icon {
-		margin: 0;
-		overflow: visible !important;
-		visibility: visible !important;
-		width: initial !important;
-		height: initial !important;
-	}
-	.label {
-		display: none;
-	}
-	.secondaryIcon {
-		display: none;
-	}
+	@include compact();
 }
 
 .submenuPopper {
@@ -327,8 +326,11 @@ export default defineComponent({
 		margin-right: var(--spacing-xs);
 	}
 
-	.label {
-		display: block;
+	&.compact {
+		:global(.el-menu--popup) {
+			min-width: auto;
+			@include compact();
+		}
 	}
 }
 </style>
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
index bcd38ce4510ad..6e22518afadb9 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
@@ -1,5 +1,5 @@
 import N8nNodeCreatorNode from './NodeCreatorNode.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/Node Creator Node',
@@ -7,13 +7,14 @@ export default {
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeCreatorNode,
 	},
 	template: `
-		<n8n-node-creator-node v-bind="$props">
-			<template v-slot:icon>
+		<n8n-node-creator-node v-bind="args">
+			<template #icon>
 				<img src="https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/cartman.svg" />
 			</template>
 		</n8n-node-creator-node>
@@ -29,6 +30,7 @@ WithTitle.args = {
 };
 
 const PanelTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeCreatorNode,
@@ -39,11 +41,11 @@ const PanelTemplate: StoryFn = (args, { argTypes }) => ({
 		};
 	},
 	template: `
-		<n8n-node-creator-node v-bind="$props" :isPanelActive="isPanelActive" @click.capture="isPanelActive = true">
-			<template v-slot:icon>
+		<n8n-node-creator-node v-bind="args" :isPanelActive="isPanelActive" @click.capture="isPanelActive = true">
+			<template #icon>
 				<img src="https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/cartman.svg" />
 			</template>
-			<template v-slot:panel>
+			<template #panel>
 				<p style="width: 100%; height: 300px; background: white">Lorem ipsum dolor sit amet</p>
 				<button @click="isPanelActive = false">Close</button>
 			</template>
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index 433eb7de125e6..87dc9ad46aafb 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -4,7 +4,6 @@
 			[$style.creatorNode]: true,
 			[$style.hasAction]: !showActionArrow,
 		}"
-		v-on="$listeners"
 		v-bind="$attrs"
 	>
 		<div :class="$style.nodeIcon">
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
index 5c05fddf80311..75a7d184965d8 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
@@ -1,5 +1,5 @@
 import N8nNodeIcon from './NodeIcon.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/NodeIcon',
@@ -7,11 +7,12 @@ export default {
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeIcon,
 	},
-	template: '<n8n-node-icon v-bind="$props"></n8n-node-icon>',
+	template: '<n8n-node-icon v-bind="args"></n8n-node-icon>',
 });
 
 export const FileIcon = DefaultTemplate.bind({});
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
index 1e36d9914c564..7f71177992437 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
@@ -7,7 +7,7 @@
 				[$style.disabled]: disabled,
 			}"
 			:style="iconStyleData"
-			v-on="$listeners"
+			v-bind="$attrs"
 		>
 			<!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
 			<n8n-tooltip placement="top" :disabled="!showTooltip" v-if="showTooltip">
diff --git a/packages/design-system/src/components/N8nNotice/Notice.stories.ts b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
index af840d2f83408..7da7555cbb261 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.stories.ts
+++ b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
@@ -1,5 +1,5 @@
 import N8nNotice from './Notice.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Notice',
@@ -13,20 +13,22 @@ export default {
 };
 
 const SlotTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNotice,
 	},
 	template:
-		'<n8n-notice v-bind="$props">This is a notice! Thread carefully from this point forward.</n8n-notice>',
+		'<n8n-notice v-bind="args">This is a notice! Thread carefully from this point forward.</n8n-notice>',
 });
 
 const PropTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNotice,
 	},
-	template: '<n8n-notice v-bind="$props"/>',
+	template: '<n8n-notice v-bind="args"/>',
 });
 
 export const Warning = SlotTemplate.bind({});
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
index c6e6f4123bbb9..caf53c5ca5e44 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
+++ b/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
@@ -1,5 +1,6 @@
 import { render } from '@testing-library/vue';
 import N8nNotice from '../Notice.vue';
+import { N8nText } from '@/components';
 
 describe('components', () => {
 	describe('N8nNotice', () => {
@@ -11,7 +12,9 @@ describe('components', () => {
 				slots: {
 					default: 'This is a notice.',
 				},
-				stubs: ['n8n-text'],
+				global: {
+					stubs: ['n8n-text'],
+				},
 			});
 			expect(wrapper.html()).toMatchSnapshot();
 		});
@@ -24,7 +27,9 @@ describe('components', () => {
 							id: 'notice',
 							content: 'This is a notice.',
 						},
-						stubs: ['n8n-text'],
+						global: {
+							stubs: ['n8n-text'],
+						},
 					});
 					expect(wrapper.html()).toMatchSnapshot();
 				});
@@ -35,7 +40,11 @@ describe('components', () => {
 							id: 'notice',
 							content: '<strong>Hello world!</strong> This is a notice.',
 						},
-						stubs: ['n8n-text'],
+						global: {
+							components: {
+								'n8n-text': N8nText,
+							},
+						},
 					});
 
 					expect(wrapper.container.querySelectorAll('strong')).toHaveLength(1);
@@ -48,7 +57,9 @@ describe('components', () => {
 							id: 'notice',
 							content: '<script>alert(1);</script> This is a notice.',
 						},
-						stubs: ['n8n-text'],
+						global: {
+							stubs: ['n8n-text'],
+						},
 					});
 
 					expect(wrapper.container.querySelector('script')).not.toBeTruthy();
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
index 8763d86f89a1f..8b156ee73bbc2 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
+++ b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
@@ -1,33 +1,31 @@
 // Vitest Snapshot v1
 
 exports[`components > N8nNotice > props > content > should render HTML 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
-  <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><span id=\\"notice-content\\" role=\\"region\\" class=\\"truncated\\"><strong>Hello world!</strong> This is a notice.</span></n8n-text-stub>
-  </div>
+"<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
+  <div class=\\"notice-content\\"><span class=\\"n8n-text compact size-small regular\\"><span class=\\"truncated\\" id=\\"notice-content\\" role=\\"region\\"><strong>Hello world!</strong> This is a notice.</span></span></div>
 </div>"
 `;
 
 exports[`components > N8nNotice > props > content > should render correctly with content prop 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
+"<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
   <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><span id=\\"notice-content\\" role=\\"region\\" class=\\"truncated\\">This is a notice.</span></n8n-text-stub>
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub>
   </div>
 </div>"
 `;
 
 exports[`components > N8nNotice > props > content > should sanitize rendered HTML 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
+"<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
   <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\"><span id=\\"notice-content\\" role=\\"region\\" class=\\"truncated\\"> This is a notice.</span></n8n-text-stub>
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub>
   </div>
 </div>"
 `;
 
 exports[`components > N8nNotice > should render correctly 1`] = `
-"<div id=\\"notice\\" role=\\"alert\\" class=\\"notice notice warning\\">
+"<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
   <div class=\\"notice-content\\">
-    <n8n-text-stub size=\\"small\\" compact=\\"true\\" tag=\\"span\\">This is a notice.</n8n-text-stub>
+    <n8n-text-stub bold=\\"false\\" size=\\"small\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub>
   </div>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nOption/Option.vue b/packages/design-system/src/components/N8nOption/Option.vue
index f17ed7602e6e4..de11bf11e35ee 100644
--- a/packages/design-system/src/components/N8nOption/Option.vue
+++ b/packages/design-system/src/components/N8nOption/Option.vue
@@ -1,4 +1,17 @@
 <script lang="ts">
-import { Option } from 'element-ui';
-export default Option;
+import { ElOption } from 'element-plus';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	props: {
+		...ElOption.props,
+	},
+	components: {
+		ElOption,
+	},
+});
 </script>
+
+<template>
+	<el-option v-bind="{ ...$props, ...$attrs }"><slot /></el-option>
+</template>
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts b/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
index 3fa4d573b7d7f..20381c31e3b2c 100644
--- a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
+++ b/packages/design-system/src/components/N8nPagination/Pagination.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nPagination from './Pagination.vue';
 
 export default {
@@ -7,11 +7,27 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => {
+		const onUpdateCurrentPage = (currentPage: number) => {
+			args.currentPage = currentPage;
+		};
+
+		const onUpdatePageSize = (pageSize: number) => {
+			args.pageSize = pageSize;
+		};
+
+		return { onUpdateCurrentPage, onUpdatePageSize, args };
+	},
 	props: Object.keys(argTypes),
 	components: {
 		N8nPagination,
 	},
-	template: '<n8n-pagination v-bind="$props" />',
+	template: `
+		<n8n-pagination
+			v-bind="args"
+			v-model:current-page="args.currentPage"
+			v-model:page-size="args.pageSize"
+		/>`,
 });
 
 export const Pagination: StoryFn = Template.bind({});
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.vue b/packages/design-system/src/components/N8nPagination/Pagination.vue
index 5b0f106370005..7394a4eb310fb 100644
--- a/packages/design-system/src/components/N8nPagination/Pagination.vue
+++ b/packages/design-system/src/components/N8nPagination/Pagination.vue
@@ -1,10 +1,11 @@
 <script lang="ts">
-import type { DefineComponent } from 'vue';
 import { defineComponent } from 'vue';
-import { Pagination as ElPagination } from 'element-ui';
+import { ElPagination } from 'element-plus';
 
 export default defineComponent({
-	props: (ElPagination as unknown as DefineComponent).props,
+	props: {
+		...ElPagination.props,
+	},
 	components: {
 		ElPagination,
 	},
@@ -13,9 +14,8 @@ export default defineComponent({
 
 <template>
 	<el-pagination
-		background
+		class="is-background"
 		layout="prev, pager, next"
-		v-bind="[$props, $attrs]"
-		v-on="$listeners"
+		v-bind="{ ...$props, ...$attrs }"
 	/>
 </template>
diff --git a/packages/design-system/src/components/N8nPopover/Popover.stories.ts b/packages/design-system/src/components/N8nPopover/Popover.stories.ts
index 36bd7179c78f1..afe37f8b7f3f1 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.stories.ts
+++ b/packages/design-system/src/components/N8nPopover/Popover.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nPopover from './Popover.vue';
 
 export default {
@@ -36,12 +36,19 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nPopover,
 	},
-	template:
-		'<n8n-Popover v-bind="$props"><div style="margin:50px; display: inline-block;"><span>yo</span></div></n8n-Popover>',
+	template: `<n8n-popover v-bind="args">
+			<div style="margin:50px; display: inline-block;">
+				<span>yo</span>
+			</div>
+			<template #content>
+				Popover
+			</template>
+		</n8n-popover>`,
 });
 
 export const Popover = Template.bind({});
diff --git a/packages/design-system/src/components/N8nPopover/Popover.vue b/packages/design-system/src/components/N8nPopover/Popover.vue
index b85cad06e7e5f..352eb6053c151 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.vue
+++ b/packages/design-system/src/components/N8nPopover/Popover.vue
@@ -1,4 +1,23 @@
 <script lang="ts">
-import { Popover } from 'element-ui';
-export default Popover;
+import { ElPopover } from 'element-plus';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+	name: 'N8nPopover',
+	props: {
+		...ElPopover.props,
+	},
+	components: {
+		ElPopover,
+	},
+});
 </script>
+
+<template>
+	<el-popover v-bind="{ ...$props, ...$attrs }">
+		<template #reference>
+			<slot name="reference" />
+		</template>
+		<slot />
+	</el-popover>
+</template>
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts b/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
index a91328ba69aab..4d29b64379f94 100644
--- a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
+++ b/packages/design-system/src/components/N8nPulse/Pulse.stories.ts
@@ -1,5 +1,5 @@
 import N8nPulse from './Pulse.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Pulse',
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
index 221be4b48f3db..8d4ea4fca86b7 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
@@ -9,7 +9,6 @@
 		}"
 		aria-checked="true"
 	>
-		<input type="radio" tabindex="-1" autocomplete="off" :class="$style.input" :value="value" />
 		<div
 			:class="{
 				[$style.button]: true,
@@ -18,7 +17,6 @@
 				[$style.disabled]: disabled,
 			}"
 			:data-test-id="`radio-button-${value}`"
-			@click="$emit('click')"
 		>
 			{{ label }}
 		</div>
@@ -76,7 +74,6 @@ export default defineComponent({
 }
 
 .button {
-	border-radius: 0;
 	display: flex;
 	align-items: center;
 	border-radius: var(--border-radius-base);
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
index c711b0ce85a2b..e7b3ac013dff8 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
@@ -1,7 +1,7 @@
 import N8nRadioButtons from './RadioButtons.vue';
 
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/RadioButtons',
@@ -18,15 +18,16 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nRadioButtons,
 	},
-	template: `<n8n-radio-buttons v-model="val" v-bind="$props" @input="onInput">
+	template: `<n8n-radio-buttons v-model="val" v-bind="args" @update:modelValue="onInput">
 		</n8n-radio-buttons>`,
 	methods,
 	data() {
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
index 1972d4fd600ea..4ff7d63e91a8f 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
@@ -7,10 +7,10 @@
 			v-for="option in options"
 			:key="option.value"
 			v-bind="option"
-			:active="value === option.value"
+			:active="modelValue === option.value"
 			:size="size"
 			:disabled="disabled || option.disabled"
-			@click="() => onClick(option)"
+			@click.prevent.stop="onClick(option)"
 		/>
 	</div>
 </template>
@@ -30,7 +30,7 @@ export interface RadioOption {
 export default defineComponent({
 	name: 'n8n-radio-buttons',
 	props: {
-		value: {
+		modelValue: {
 			type: String,
 		},
 		options: {
@@ -52,7 +52,7 @@ export default defineComponent({
 			if (this.disabled || option.disabled) {
 				return;
 			}
-			this.$emit('input', option.value);
+			this.$emit('update:modelValue', option.value);
 		},
 	},
 });
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
index 7e75a5d51a60f..d9e5a75ba9c08 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nRecycleScroller from './RecycleScroller.vue';
 import type { ComponentInstance } from 'vue';
 
@@ -9,7 +9,8 @@ export default {
 	argTypes: {},
 };
 
-const Template: StoryFn = () => ({
+const Template: StoryFn = (args) => ({
+	setup: () => ({ args }),
 	components: {
 		N8nRecycleScroller,
 	},
@@ -42,7 +43,7 @@ const Template: StoryFn = () => ({
 		},
 	},
 	template: `<div style="height: calc(100vh - 30px); width: 100%; overflow: auto">
-		<N8nRecycleScroller :items="items" :item-size="100" item-key="id" v-bind="$props">
+		<N8nRecycleScroller :items="items" :item-size="100" item-key="id" v-bind="args">
 			<template	#default="{ item, updateItemSize }">
 				<div
 					:ref="'item-' + item.id"
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
index 4c4a1073aee44..abd34dae1742d 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
@@ -164,7 +164,7 @@ export default defineComponent({
 		}
 
 		function onUpdateItemSize(item: { [key: string]: string }) {
-			nextTick(() => {
+			void nextTick(() => {
 				const itemId = item[props.itemKey];
 				const itemRef = itemRefs.value[itemId] as HTMLElement;
 				const previousSize = itemSizeCache.value[itemId];
@@ -186,7 +186,7 @@ export default defineComponent({
 		function onWindowResize() {
 			if (wrapperRef.value) {
 				wrapperHeight.value = wrapperRef.value.offsetHeight;
-				nextTick(() => {
+				void nextTick(() => {
 					updateItemSizeCache(visibleItems.value);
 				});
 			}
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts b/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
index 3b062e5165564..662f58798e603 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
+++ b/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
@@ -12,7 +12,7 @@ describe('components', () => {
 	describe('N8nRecycleScroller', () => {
 		it('should render correctly', () => {
 			const wrapper = render(N8nRecycleScroller, {
-				propsData: {
+				props: {
 					itemSize,
 					itemKey,
 					items,
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
index 5a5d355b1618d..063ba3de85749 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
@@ -1,5 +1,6 @@
 import { action } from '@storybook/addon-actions';
 import N8nResizeWrapper from './ResizeWrapper.vue';
+import { ref } from 'vue';
 
 export default {
 	title: 'Atoms/ResizeWrapper',
@@ -8,28 +9,34 @@ export default {
 
 const methods = {
 	onInput: action('input'),
-	onResize(resizeData) {
-		action('resize', resizeData);
-		this.newHeight = resizeData.height;
-		this.newWidth = resizeData.width;
-	},
 	onResizeEnd: action('resizeend'),
 	onResizeStart: action('resizestart'),
 };
 
 const Template = (args, { argTypes }) => ({
-	props: Object.keys(argTypes),
-	components: {
-		N8nResizeWrapper,
-	},
-	data() {
+	setup: () => {
+		const newWidth = ref(args.width);
+		const newHeight = ref(args.height);
+
+		function onResize(resizeData) {
+			action('resize', resizeData);
+			newHeight.value = resizeData.height;
+			newWidth.value = resizeData.width;
+		}
+
 		return {
-			newWidth: this.width,
-			newHeight: this.height,
+			onResize,
+			newWidth,
+			newHeight,
 			background:
 				'linear-gradient(90deg, rgba(255,0,0,1) 0%, rgba(255,154,0,1) 10%, rgba(208,222,33,1) 20%, rgba(79,220,74,1) 30%, rgba(63,218,216,1) 40%, rgba(47,201,226,1) 50%, rgba(28,127,238,1) 60%, rgba(95,21,242,1) 70%, rgba(186,12,248,1) 80%, rgba(251,7,217,1) 90%, rgba(255,0,0,1) 100%)',
+			args,
 		};
 	},
+	props: Object.keys(argTypes),
+	components: {
+		N8nResizeWrapper,
+	},
 	computed: {
 		containerStyles() {
 			return {
@@ -41,7 +48,7 @@ const Template = (args, { argTypes }) => ({
 	},
 	template: `<div style="width: fit-content; height: fit-content">
 			<n8n-resize-wrapper
-				v-bind="$props"
+				v-bind="args"
 				@resize="onResize"
 				@resizeend="onResizeEnd"
 				@resizestart="onResizeStart"
diff --git a/packages/design-system/src/components/N8nRoute/Route.vue b/packages/design-system/src/components/N8nRoute/Route.vue
index b5c6d346a55dc..4352d70cdc6f6 100644
--- a/packages/design-system/src/components/N8nRoute/Route.vue
+++ b/packages/design-system/src/components/N8nRoute/Route.vue
@@ -1,12 +1,10 @@
 <template>
-	<span>
-		<router-link v-if="useRouterLink" :to="to" v-on="$listeners">
-			<slot></slot>
-		</router-link>
-		<a v-else :href="to" :target="openNewWindow ? '_blank' : '_self'" v-on="$listeners">
-			<slot></slot>
-		</a>
-	</span>
+	<router-link v-if="useRouterLink" :to="to" v-bind="$attrs">
+		<slot></slot>
+	</router-link>
+	<a v-else :href="to" :target="openNewWindow ? '_blank' : '_self'" v-bind="$attrs">
+		<slot></slot>
+	</a>
 </template>
 
 <script lang="ts">
diff --git a/packages/design-system/src/components/N8nSelect/Select.stories.ts b/packages/design-system/src/components/N8nSelect/Select.stories.ts
index ad0cc1e859a11..b95c5b9b1d86e 100644
--- a/packages/design-system/src/components/N8nSelect/Select.stories.ts
+++ b/packages/design-system/src/components/N8nSelect/Select.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nSelect from './Select.vue';
 import N8nOption from '../N8nOption';
 import N8nIcon from '../N8nIcon';
@@ -16,8 +16,8 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['large', 'medium', 'small', 'mini'],
 			},
+			options: ['large', 'medium', 'small', 'mini'],
 		},
 		loading: {
 			control: {
@@ -41,11 +41,12 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 	onChange: action('change'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -53,7 +54,7 @@ const Template: StoryFn = (args, { argTypes }) => ({
 		N8nIcon,
 	},
 	template:
-		'<n8n-select v-bind="$props" v-model="val" @input="onInput" @change="onChange"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>',
+		'<n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>',
 	data() {
 		return {
 			val: '',
@@ -73,11 +74,12 @@ Filterable.args = {
 const selects = ['large', 'medium', 'small', 'mini']
 	.map(
 		(size) =>
-			`<n8n-select v-bind="$props" v-model="val" @input="onInput" @change="onChange" size="${size}"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
+			`<n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange" size="${size}"><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
 	)
 	.join('');
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -103,11 +105,12 @@ Sizes.args = {
 const selectsWithIcon = ['xlarge', 'large', 'medium', 'small', 'mini']
 	.map(
 		(size) =>
-			`<n8n-select v-bind="$props" v-model="val" @input="onInput" size="${size}"><n8n-icon icon="search" slot="prefix" /><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
+			`<n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" size="${size}"><n8n-icon icon="search" slot="prefix" /><n8n-option value="1">op1</n8n-option><n8n-option value="2">op2</n8n-option></n8n-select>`,
 	)
 	.join('');
 
 const ManyTemplateWithIcon: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -131,6 +134,7 @@ WithIcon.args = {
 };
 
 const LimitedWidthTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -138,7 +142,7 @@ const LimitedWidthTemplate: StoryFn = (args, { argTypes }) => ({
 		N8nIcon,
 	},
 	template:
-		'<div style="width:100px;"><n8n-select v-bind="$props" v-model="val" @input="onInput" @change="onChange"><n8n-option value="1" label="opt1 11 1111" /><n8n-option value="2" label="opt2 test very long ipsum"/></n8n-select></div>',
+		'<div style="width:100px;"><n8n-select v-bind="args" v-model="val" @update:modelValue="onUpdateModelValue" @change="onChange"><n8n-option value="1" label="opt1 11 1111" /><n8n-option value="2" label="opt2 test very long ipsum"/></n8n-select></div>',
 	data() {
 		return {
 			val: '',
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 7ea6eeb799c71..1fcd5ba7ce12b 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -10,29 +10,26 @@
 			<slot name="prepend" />
 		</div>
 		<el-select
-			v-bind="$props"
-			:value="value"
+			v-bind="{ ...$props, ...listeners }"
+			:modelValue="modelValue"
 			:size="computedSize"
 			:class="$style[classes]"
 			:popper-class="popperClass"
-			v-on="$listeners"
 			ref="innerSelect"
 		>
-			<template #prefix>
+			<template #prefix v-if="$slots.prefix">
 				<slot name="prefix" />
 			</template>
-			<template #suffix>
+			<template #suffix v-if="$slots.suffix">
 				<slot name="suffix" />
 			</template>
-			<template #default>
-				<slot></slot>
-			</template>
+			<slot></slot>
 		</el-select>
 	</div>
 </template>
 
 <script lang="ts">
-import { Select as ElSelect } from 'element-ui';
+import { ElSelect } from 'element-plus';
 import { defineComponent } from 'vue';
 
 type InnerSelectRef = InstanceType<typeof ElSelect>;
@@ -49,7 +46,8 @@ export default defineComponent({
 		ElSelect,
 	},
 	props: {
-		value: {},
+		...ElSelect.props,
+		modelValue: {},
 		size: {
 			type: String,
 			default: 'large',
@@ -94,7 +92,20 @@ export default defineComponent({
 		},
 	},
 	computed: {
+		listeners() {
+			return Object.entries(this.$attrs).reduce<Record<string, () => {}>>((acc, [key, value]) => {
+				if (/^on[A-Z]/.test(key)) {
+					acc[key] = value;
+				}
+
+				return acc;
+			}, {});
+		},
 		computedSize(): string | undefined {
+			if (this.size === 'medium') {
+				return 'default';
+			}
+
 			if (this.size === 'xlarge') {
 				return undefined;
 			}
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
index 87a96883081b0..26d1fa5275405 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
+++ b/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
@@ -8,8 +8,10 @@ describe('components', () => {
 	describe('N8nSelect', () => {
 		it('should render correctly', () => {
 			const wrapper = render(N8nSelect, {
-				components: {
-					N8nOption,
+				global: {
+					components: {
+						'n8n-option': N8nOption,
+					},
 				},
 				slots: {
 					default: [
@@ -24,10 +26,6 @@ describe('components', () => {
 
 		it('should select an option', async () => {
 			const n8nSelectTestComponent = defineComponent({
-				components: {
-					N8nSelect,
-					N8nOption,
-				},
 				template: `
 					<n8n-select v-model="selected">
 						<n8n-option v-for="o in options" :key="o" :value="o" :label="o" />
@@ -44,10 +42,20 @@ describe('components', () => {
 				},
 			});
 
-			const { container, getByRole } = render(n8nSelectTestComponent);
+			const { container } = render(n8nSelectTestComponent, {
+				props: {
+					teleported: false,
+				},
+				global: {
+					components: {
+						'n8n-select': N8nSelect,
+						'n8n-option': N8nOption,
+					},
+				},
+			});
 			const getOption = (value: string) => within(container as HTMLElement).getByText(value);
-			const textbox = getByRole('textbox');
 
+			const textbox = container.querySelector('input')!;
 			await userEvent.click(textbox);
 			await waitFor(() => expect(getOption('1')).toBeVisible());
 			await userEvent.click(getOption('1'));
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
index 0d3bd043ba703..629386ebc8603 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
+++ b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
@@ -2,39 +2,25 @@
 
 exports[`components > N8nSelect > should render correctly 1`] = `
 "<div class=\\"n8n-select container\\">
-  <!---->
-  <div class=\\"el-select el-select--large\\">
-    <!---->
-    <div class=\\"el-input el-input--large el-input--suffix\\">
-      <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"请选择\\" class=\\"el-input__inner\\">
-      <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-      <!----></span>
-      <!---->
-      <!---->
-    </div>
-    <transition-stub name=\\"el-zoom-in-top\\">
-      <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-        <div class=\\"el-scrollbar\\" style=\\"display: none;\\">
-          <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-            <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-              <!---->
-              <li class=\\"el-select-dropdown__item\\">1</li>
-              <li class=\\"el-select-dropdown__item\\">2</li>
-              <li class=\\"el-select-dropdown__item\\">3</li>
-            </ul>
-          </div>
-          <div class=\\"el-scrollbar__bar is-horizontal\\">
-            <div class=\\"el-scrollbar__thumb\\" style=\\"width: 0px; transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-          </div>
-          <div class=\\"el-scrollbar__bar is-vertical\\">
-            <div class=\\"el-scrollbar__thumb\\" style=\\"height: 0px; transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-          </div>
-        </div>
-        <p class=\\"el-select-dropdown__empty\\">
-          无数据
-        </p>
+  <!--v-if-->
+  <div class=\\"el-select el-select--large\\" popperappendtobody=\\"false\\" limitpopperwidth=\\"false\\">
+    <div class=\\"select-trigger el-tooltip__trigger el-tooltip__trigger\\">
+      <!--v-if-->
+      <!-- fix: https://github.com/element-plus/element-plus/issues/11415 -->
+      <!--v-if-->
+      <div class=\\"el-input el-input--large el-input--suffix\\">
+        <!-- input -->
+        <!-- prepend slot -->
+        <!--v-if-->
+        <div class=\\"el-input__wrapper\\">
+          <!-- prefix slot -->
+          <!--v-if--><input class=\\"el-input__inner\\" type=\\"text\\" readonly=\\"\\" autocomplete=\\"off\\" tabindex=\\"0\\" placeholder=\\"Select\\"><!-- suffix slot --><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-icon el-select__caret el-select__icon\\"><svg xmlns=\\"http://www.w3.org/2000/svg\\" viewBox=\\"0 0 1024 1024\\"><path fill=\\"currentColor\\" d=\\"M831.872 340.864 512 652.672 192.128 340.864a30.592 30.592 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.592 30.592 0 0 0-42.752 0z\\"></path></svg></i><!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if--><!--v-if--></span></span>
+        </div><!-- append slot -->
+        <!--v-if-->
       </div>
-    </transition-stub>
+    </div>
+    <!--teleport start-->
+    <!--teleport end-->
   </div>
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts b/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
index 0a51e8ec4ce14..7e1865b60473c 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nSpinner from './Spinner.vue';
 
 export default {
@@ -8,24 +8,25 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['small', 'medium', 'large'],
 			},
+			options: ['small', 'medium', 'large'],
 		},
 		type: {
 			control: {
 				type: 'select',
-				options: ['dots', 'ring'],
 			},
+			options: ['dots', 'ring'],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSpinner,
 	},
-	template: '<n8n-spinner v-bind="$props" />',
+	template: '<n8n-spinner v-bind="args" />',
 });
 
 export const Spinner = Template.bind({});
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
index 88f4bf28dc6ac..6a4e05d8300e8 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
+++ b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nSticky from './Sticky.vue';
 
 export default {
@@ -40,19 +40,20 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 	onResize: action('resize'),
 	onResizeEnd: action('resizeend'),
 	onResizeStart: action('resizestart'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSticky,
 	},
 	template:
-		'<n8n-sticky v-bind="$props"  @resize="onResize" @resizeend="onResizeEnd" @resizeStart="onResizeStart" @input="onInput"></n8n-sticky>',
+		'<n8n-sticky v-bind="args"  @resize="onResize" @resizeend="onResizeEnd" @resizeStart="onResizeStart" @input="onInput"></n8n-sticky>',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index c5952fb835ffe..16bb7082e3245 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -16,40 +16,38 @@
 			@resize="onResize"
 			@resizestart="onResizeStart"
 		>
-			<template>
-				<div v-show="!editMode" :class="$style.wrapper" @dblclick.stop="onDoubleClick">
-					<n8n-markdown
-						theme="sticky"
-						:content="content"
-						:withMultiBreaks="true"
-						@markdown-click="onMarkdownClick"
-					/>
-				</div>
-				<div
-					v-show="editMode"
-					@click.stop
-					@mousedown.stop
-					@mouseup.stop
-					@keydown.esc="onInputBlur"
-					@keydown.stop
-					@wheel.stop
-					:class="{ 'full-height': !shouldShowFooter, 'sticky-textarea': true }"
-				>
-					<n8n-input
-						:value="content"
-						type="textarea"
-						:rows="5"
-						@blur="onInputBlur"
-						@input="onInput"
-						ref="input"
-					/>
-				</div>
-				<div v-if="editMode && shouldShowFooter" :class="$style.footer">
-					<n8n-text size="xsmall" aligh="right">
-						<span v-html="t('sticky.markdownHint')"></span>
-					</n8n-text>
-				</div>
-			</template>
+			<div v-show="!editMode" :class="$style.wrapper" @dblclick.stop="onDoubleClick">
+				<n8n-markdown
+					theme="sticky"
+					:content="modelValue"
+					:withMultiBreaks="true"
+					@markdown-click="onMarkdownClick"
+				/>
+			</div>
+			<div
+				v-show="editMode"
+				@click.stop
+				@mousedown.stop
+				@mouseup.stop
+				@keydown.esc="onInputBlur"
+				@keydown.stop
+				@wheel.stop
+				:class="{ 'full-height': !shouldShowFooter, 'sticky-textarea': true }"
+			>
+				<n8n-input
+					:modelValue="modelValue"
+					type="textarea"
+					:rows="5"
+					@blur="onInputBlur"
+					@update:modelValue="onUpdateModelValue"
+					ref="input"
+				/>
+			</div>
+			<div v-if="editMode && shouldShowFooter" :class="$style.footer">
+				<n8n-text size="xsmall" aligh="right">
+					<span v-html="t('sticky.markdownHint')"></span>
+				</n8n-text>
+			</div>
 		</n8n-resize-wrapper>
 	</div>
 </template>
@@ -66,7 +64,7 @@ export default defineComponent({
 	name: 'n8n-sticky',
 	mixins: [Locale],
 	props: {
-		content: {
+		modelValue: {
 			type: String,
 		},
 		height: {
@@ -154,8 +152,8 @@ export default defineComponent({
 				this.$emit('edit', false);
 			}
 		},
-		onInput(value: string) {
-			this.$emit('input', value);
+		onUpdateModelValue(value: string) {
+			this.$emit('update:modelValue', value);
 		},
 		onMarkdownClick(link: string, event: Event) {
 			this.$emit('markdown-click', link, event);
@@ -177,7 +175,7 @@ export default defineComponent({
 			setTimeout(() => {
 				if (newMode && !prevMode && this.$refs.input) {
 					const textarea = this.$refs.input as HTMLTextAreaElement;
-					if (this.defaultText === this.content) {
+					if (this.defaultText === this.modelValue) {
 						textarea.select();
 					}
 					textarea.focus();
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts b/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
index 2cb7a55e4f128..614198efeca60 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
+++ b/packages/design-system/src/components/N8nTabs/Tabs.stories.ts
@@ -1,7 +1,7 @@
 import N8nTabs from './Tabs.vue';
 
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Tabs',
@@ -13,15 +13,16 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onUpdateModelValue: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTabs,
 	},
-	template: `<n8n-tabs v-model="val" v-bind="$props" @input="onInput">
+	template: `<n8n-tabs v-model="val" v-bind="args" @update:modelValue="onUpdateModelValue">
 		</n8n-tabs>`,
 	methods,
 	data() {
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index 8ce5387be8da8..5425e9e1e306d 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/design-system/src/components/N8nTabs/Tabs.vue
@@ -34,7 +34,7 @@
 
 					<div
 						v-else
-						:class="{ [$style.tab]: true, [$style.activeTab]: value === option.value }"
+						:class="{ [$style.tab]: true, [$style.activeTab]: modelValue === option.value }"
 						@click="() => handleTabClick(option.value)"
 					>
 						<n8n-icon v-if="option.icon" :icon="option.icon" size="medium" />
@@ -88,7 +88,7 @@ export default defineComponent({
 			this.canScrollRight = scrollWidth - width > this.scrollPosition;
 		}
 	},
-	destroyed() {
+	unmounted() {
 		if (this.resizeObserver) {
 			this.resizeObserver.disconnect();
 		}
@@ -101,7 +101,10 @@ export default defineComponent({
 		};
 	},
 	props: {
-		value: {},
+		modelValue: {
+			type: String,
+			default: '',
+		},
 		options: {
 			type: Array as PropType<N8nTabOptions[]>,
 			default: (): N8nTabOptions[] => [],
@@ -112,7 +115,7 @@ export default defineComponent({
 			this.$emit('tooltipClick', tab, event);
 		},
 		handleTabClick(tab: string) {
-			this.$emit('input', tab);
+			this.$emit('update:modelValue', tab);
 		},
 		scrollLeft() {
 			this.scroll(-50);
diff --git a/packages/design-system/src/components/N8nTag/Tag.stories.ts b/packages/design-system/src/components/N8nTag/Tag.stories.ts
index 3ce2fe65a8596..c2f25a408985c 100644
--- a/packages/design-system/src/components/N8nTag/Tag.stories.ts
+++ b/packages/design-system/src/components/N8nTag/Tag.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nTag from './Tag.vue';
 
 export default {
@@ -14,11 +14,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTag,
 	},
-	template: '<n8n-tag v-bind="$props"></n8n-tag>',
+	template: '<n8n-tag v-bind="args"></n8n-tag>',
 });
 
 export const Tag = Template.bind({});
diff --git a/packages/design-system/src/components/N8nTag/Tag.vue b/packages/design-system/src/components/N8nTag/Tag.vue
index af18212c7c568..95ba1f7dfcfa4 100644
--- a/packages/design-system/src/components/N8nTag/Tag.vue
+++ b/packages/design-system/src/components/N8nTag/Tag.vue
@@ -1,5 +1,5 @@
 <template>
-	<span :class="['n8n-tag', $style.tag]" v-on="$listeners">
+	<span :class="['n8n-tag', $style.tag]" v-bind="$attrs">
 		{{ text }}
 	</span>
 </template>
diff --git a/packages/design-system/src/components/N8nTags/Tags.stories.ts b/packages/design-system/src/components/N8nTags/Tags.stories.ts
index a4d751cf45bd5..89590c75abaed 100644
--- a/packages/design-system/src/components/N8nTags/Tags.stories.ts
+++ b/packages/design-system/src/components/N8nTags/Tags.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nTags from './Tags.vue';
 
 export default {
@@ -8,11 +8,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTags,
 	},
-	template: '<n8n-tags v-bind="$props"></n8n-tags>',
+	template: '<n8n-tags v-bind="args"></n8n-tags>',
 });
 
 export const Tags = Template.bind({});
diff --git a/packages/design-system/src/components/N8nTags/Tags.vue b/packages/design-system/src/components/N8nTags/Tags.vue
index 40e668f3aebba..96012f44f0f06 100644
--- a/packages/design-system/src/components/N8nTags/Tags.vue
+++ b/packages/design-system/src/components/N8nTags/Tags.vue
@@ -4,7 +4,7 @@
 			v-for="tag in visibleTags"
 			:key="tag.id"
 			:text="tag.name"
-			@click="$emit('click', tag.id, $event)"
+			@click="$emit('click:tag', tag.id, $event)"
 		/>
 		<n8n-link
 			v-if="truncate && !showAll && hiddenTagsLength > 0"
diff --git a/packages/design-system/src/components/N8nText/Text.stories.ts b/packages/design-system/src/components/N8nText/Text.stories.ts
index dd0313f3b1bc8..50577dfba409a 100644
--- a/packages/design-system/src/components/N8nText/Text.stories.ts
+++ b/packages/design-system/src/components/N8nText/Text.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nText from './Text.vue';
 
 export default {
@@ -8,32 +8,33 @@ export default {
 		size: {
 			control: {
 				type: 'select',
-				options: ['xsmall', 'small', 'medium', 'large'],
 			},
+			options: ['xsmall', 'small', 'medium', 'large'],
 		},
 		color: {
 			control: {
 				type: 'select',
-				options: [
-					'primary',
-					'text-dark',
-					'text-base',
-					'text-light',
-					'text-xlight',
-					'danger',
-					'success',
-				],
 			},
+			options: [
+				'primary',
+				'text-dark',
+				'text-base',
+				'text-light',
+				'text-xlight',
+				'danger',
+				'success',
+			],
 		},
 	},
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nText,
 	},
-	template: '<n8n-text v-bind="$props">hello world</n8n-text>',
+	template: '<n8n-text v-bind="args">hello world</n8n-text>',
 });
 
 export const Text = Template.bind({});
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/design-system/src/components/N8nText/Text.vue
index 284c3e92b04cf..5fb802a6423b2 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/design-system/src/components/N8nText/Text.vue
@@ -1,5 +1,5 @@
 <template>
-	<component :is="tag" :class="['n8n-text', ...classes]" v-on="$listeners">
+	<component :is="tag" :class="['n8n-text', ...classes]" v-bind="$attrs">
 		<slot></slot>
 	</component>
 </template>
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts b/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
index 337d50ebb1e36..3e81be9ff0f4d 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nTooltip from './Tooltip.vue';
 
 export default {
@@ -36,15 +36,40 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTooltip,
 	},
-	template:
-		'<n8n-tooltip v-bind="$props"><div style="margin:50px; display: inline-block;"><span>yo</span></div></n8n-tooltip>',
+	template: '<n8n-tooltip v-bind="args"><button>Hover me</button></n8n-tooltip>',
 });
 
 export const Tooltip = Template.bind({});
 Tooltip.args = {
 	content: '...',
 };
+
+export const TooltipWithButtons = Template.bind({});
+TooltipWithButtons.args = {
+	content: 'Hello world!',
+	buttons: [
+		{
+			attrs: {
+				label: 'Button 1',
+				'data-test-id': 'tooltip-button',
+			},
+			listeners: {
+				click: () => alert('Clicked 1'),
+			},
+		},
+		{
+			attrs: {
+				label: 'Button 2',
+				'data-test-id': 'tooltip-button',
+			},
+			listeners: {
+				click: () => alert('Clicked 2'),
+			},
+		},
+	],
+};
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index f9bb068ebdc1c..a14e6fd482de9 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -1,18 +1,19 @@
 <template>
-	<el-tooltip v-bind="$attrs">
-		<template v-for="(_, slotName) in $slots" #[slotName]>
-			<slot :name="slotName" />
+	<el-tooltip v-bind="{ ...$props, ...$attrs }">
+		<slot />
+		<template #content>
+			<slot name="content">
+				{{ content }}
+			</slot>
 			<div
-				:key="slotName"
-				v-if="slotName === 'content' && buttons.length"
+				v-if="buttons.length"
 				:class="$style.buttons"
 				:style="{ justifyContent: justifyButtons }"
 			>
 				<n8n-button
 					v-for="button in buttons"
 					:key="button.attrs.label"
-					v-bind="button.attrs"
-					v-on="button.listeners"
+					v-bind="{ ...button.attrs, ...button.listeners }"
 				/>
 			</div>
 		</template>
@@ -22,7 +23,7 @@
 <script lang="ts">
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
-import { Tooltip as ElTooltip } from 'element-ui';
+import { ElTooltip } from 'element-plus';
 import type { IN8nButton } from '@/types';
 import N8nButton from '../N8nButton';
 
@@ -34,6 +35,11 @@ export default defineComponent({
 		N8nButton,
 	},
 	props: {
+		...ElTooltip.props,
+		content: {
+			type: String,
+			default: '',
+		},
 		justifyButtons: {
 			type: String,
 			default: 'flex-end',
@@ -64,5 +70,6 @@ export default defineComponent({
 	display: flex;
 	align-items: center;
 	margin-top: var(--spacing-s);
+	gap: var(--spacing-2xs);
 }
 </style>
diff --git a/packages/design-system/src/components/N8nTree/Tree.stories.ts b/packages/design-system/src/components/N8nTree/Tree.stories.ts
index c2eb7a1473b0d..d8f98dc903d42 100644
--- a/packages/design-system/src/components/N8nTree/Tree.stories.ts
+++ b/packages/design-system/src/components/N8nTree/Tree.stories.ts
@@ -1,5 +1,5 @@
 import N8nTree from './Tree.vue';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Atoms/Tree',
@@ -7,11 +7,12 @@ export default {
 };
 
 export const Default: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nTree,
 	},
-	template: `<n8n-tree v-bind="$props">
+	template: `<n8n-tree v-bind="args">
 		<template v-slot:label="{ label }">
 			<span>{{ label }}</span>
 		</template>
diff --git a/packages/design-system/src/components/N8nTree/Tree.vue b/packages/design-system/src/components/N8nTree/Tree.vue
index 80a11b6670865..743fb609e8bae 100644
--- a/packages/design-system/src/components/N8nTree/Tree.vue
+++ b/packages/design-system/src/components/N8nTree/Tree.vue
@@ -2,24 +2,14 @@
 	<div class="n8n-tree">
 		<div v-for="(label, i) in Object.keys(value)" :key="i" :class="classes">
 			<div :class="$style.simple" v-if="isSimple(value[label])">
-				<slot
-					v-if="$scopedSlots.label"
-					name="label"
-					v-bind:label="label"
-					v-bind:path="getPath(label)"
-				/>
+				<slot v-if="$slots.label" name="label" v-bind:label="label" v-bind:path="getPath(label)" />
 				<span v-else>{{ label }}</span>
 				<span>:</span>
-				<slot v-if="$scopedSlots.value" name="value" v-bind:value="value[label]" />
+				<slot v-if="$slots.value" name="value" v-bind:value="value[label]" />
 				<span v-else>{{ value[label] }}</span>
 			</div>
 			<div v-else>
-				<slot
-					v-if="$scopedSlots.label"
-					name="label"
-					v-bind:label="label"
-					v-bind:path="getPath(label)"
-				/>
+				<slot v-if="$slots.label" name="label" v-bind:label="label" v-bind:path="getPath(label)" />
 				<span v-else>{{ label }}</span>
 				<n8n-tree
 					:path="getPath(label)"
@@ -27,7 +17,7 @@
 					:value="value[label]"
 					:nodeClass="nodeClass"
 				>
-					<template v-for="(index, name) in $scopedSlots" #[name]="data">
+					<template v-for="(index, name) in $slots" #[name]="data">
 						<slot :name="name" v-bind="data"></slot>
 					</template>
 				</n8n-tree>
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts b/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
index 29247db8f0a37..2a8c5d7a9442f 100644
--- a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
+++ b/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import N8nUserInfo from './UserInfo.vue';
 
 export default {
@@ -10,11 +10,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nUserInfo,
 	},
-	template: '<n8n-user-info v-bind="$props" />',
+	template: '<n8n-user-info v-bind="args" />',
 });
 
 export const Member = Template.bind({});
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts b/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
index 209af2648fb60..6bae7d537f769 100644
--- a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
+++ b/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
@@ -1,6 +1,6 @@
 import N8nUserSelect from './UserSelect.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Modules/UserSelect',
@@ -18,12 +18,13 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nUserSelect,
 	},
 	template:
-		'<n8n-user-select v-bind="$props" v-model="val" @change="onChange" @blur="onBlur" @focus="onFocus" />',
+		'<n8n-user-select v-bind="args" v-model="val" @change="onChange" @blur="onBlur" @focus="onFocus" />',
 	methods,
 	data() {
 		return {
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
index d4c8eec96d34d..cc496e76d8862 100644
--- a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
+++ b/packages/design-system/src/components/N8nUserSelect/UserSelect.vue
@@ -1,15 +1,15 @@
 <template>
 	<n8n-select
-		:value="value"
+		v-bind="$attrs"
+		:modelValue="modelValue"
 		:filterable="true"
 		:filterMethod="setFilter"
 		:placeholder="placeholder"
 		:default-first-option="true"
-		:popper-append-to-body="true"
+		teleported
 		:popper-class="$style.limitPopperWidth"
 		:noDataText="t('nds.userSelect.noMatchingUsers')"
 		:size="size"
-		@change="onChange"
 		@blur="onBlur"
 		@focus="onFocus"
 	>
@@ -52,7 +52,7 @@ export default defineComponent({
 			type: Array as PropType<IUser[]>,
 			default: () => [],
 		},
-		value: {
+		modelValue: {
 			type: String,
 			default: '',
 		},
@@ -122,9 +122,6 @@ export default defineComponent({
 		setFilter(value: string) {
 			this.filter = value;
 		},
-		onChange(value: string) {
-			this.$emit('input', value);
-		},
 		onBlur() {
 			this.$emit('blur');
 		},
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts b/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
index fb3348e7288d6..69eccc85fe706 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
@@ -1,6 +1,6 @@
 import N8nUsersList from './UsersList.vue';
 import { action } from '@storybook/addon-actions';
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import type { IUser } from '@/types';
 
 export default {
@@ -18,12 +18,13 @@ const methods = {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nUsersList,
 	},
 	template:
-		'<n8n-users-list v-bind="$props" :actions="actions" @reinvite="onReinvite" @delete="onDelete" />',
+		'<n8n-users-list v-bind="args" :actions="actions" @reinvite="onReinvite" @delete="onDelete" />',
 	methods,
 });
 
diff --git a/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue b/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
index 5de3a5f934984..8f91ce5334167 100644
--- a/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
+++ b/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
@@ -68,7 +68,7 @@ export default defineComponent({
 			observer.observe(this.$refs.root as HTMLDivElement);
 		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.enabled) {
 			this.observer?.disconnect(); // eslint-disable-line
 		}
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index 3aa18cf0b100e..888149da2cf0b 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -6,9 +6,10 @@ export { default as N8nAvatar } from './N8nAvatar';
 export { default as N8nBadge } from './N8nBadge';
 export { default as N8nBlockUi } from './N8nBlockUi';
 export { default as N8nButton } from './N8nButton';
-export { N8nElButton } from './N8nButton/overrides';
 export { default as N8nCallout } from './N8nCallout';
 export { default as N8nCard } from './N8nCard';
+export { default as N8nCheckbox } from './N8nCheckbox';
+export { default as N8nColorPicker } from './N8nColorPicker';
 export { default as N8nDatatable } from './N8nDatatable';
 export { default as N8nFormBox } from './N8nFormBox';
 export { default as N8nFormInputs } from './N8nFormInputs';
@@ -33,6 +34,8 @@ export { default as N8nOption } from './N8nOption';
 export { default as N8nPopover } from './N8nPopover';
 export { default as N8nPulse } from './N8nPulse';
 export { default as N8nRadioButtons } from './N8nRadioButtons';
+export { default as N8nRecycleScroller } from './N8nRecycleScroller';
+export { default as N8nResizeWrapper } from './N8nResizeWrapper';
 export { default as N8nSelect } from './N8nSelect';
 export { default as N8nSpinner } from './N8nSpinner';
 export { default as N8nSticky } from './N8nSticky';
@@ -45,7 +48,3 @@ export { default as N8nTree } from './N8nTree';
 export { default as N8nUserInfo } from './N8nUserInfo';
 export { default as N8nUserSelect } from './N8nUserSelect';
 export { default as N8nUsersList } from './N8nUsersList';
-export { default as N8nResizeWrapper } from './N8nResizeWrapper';
-export { default as N8nRecycleScroller } from './N8nRecycleScroller';
-export { default as N8nCheckbox } from './N8nCheckbox';
-export { default as N8nColorPicker } from './N8nColorPicker';
diff --git a/packages/design-system/src/css/alert.scss b/packages/design-system/src/css/alert.scss
index 449aecada80bd..9e7a7afb093a0 100644
--- a/packages/design-system/src/css/alert.scss
+++ b/packages/design-system/src/css/alert.scss
@@ -141,7 +141,7 @@
 	}
 }
 
-.el-alert-fade-enter,
+.el-alert-fade-enter-from,
 .el-alert-fade-leave-active {
 	opacity: 0;
 }
diff --git a/packages/design-system/src/css/carousel.scss b/packages/design-system/src/css/carousel.scss
index 44032e1c6dfce..45ed4defa9b61 100644
--- a/packages/design-system/src/css/carousel.scss
+++ b/packages/design-system/src/css/carousel.scss
@@ -148,13 +148,13 @@
 	}
 }
 
-.carousel-arrow-left-enter,
+.carousel-arrow-left-enter-from,
 .carousel-arrow-left-leave-active {
 	transform: translateY(-50%) translateX(-10px);
 	opacity: 0;
 }
 
-.carousel-arrow-right-enter,
+.carousel-arrow-right-enter-from,
 .carousel-arrow-right-leave-active {
 	transform: translateY(-50%) translateX(10px);
 	opacity: 0;
diff --git a/packages/design-system/src/css/checkbox.scss b/packages/design-system/src/css/checkbox.scss
index aa31707b70357..3b79a6353227e 100644
--- a/packages/design-system/src/css/checkbox.scss
+++ b/packages/design-system/src/css/checkbox.scss
@@ -276,7 +276,7 @@
 			color: var(--color-primary);
 		}
 
-		& [class*='el-icon-'] {
+		& .el-icon {
 			line-height: 0.9;
 
 			& + span {
diff --git a/packages/design-system/src/css/color-picker.scss b/packages/design-system/src/css/color-picker.scss
index 7a8e82e24995d..b6031693ef22f 100644
--- a/packages/design-system/src/css/color-picker.scss
+++ b/packages/design-system/src/css/color-picker.scss
@@ -196,12 +196,9 @@
 
 	@include mixins.e(main-wrapper) {
 		margin-bottom: 6px;
-
-		&::after {
-			content: '';
-			display: table;
-			clear: both;
-		}
+		display: flex;
+		flex-direction: row-reverse;
+		justify-content: space-between;
 	}
 
 	@include mixins.e(btns) {
diff --git a/packages/design-system/src/css/common/popup.scss b/packages/design-system/src/css/common/popup.scss
index 34a2195b5d894..2db9bd304515b 100644
--- a/packages/design-system/src/css/common/popup.scss
+++ b/packages/design-system/src/css/common/popup.scss
@@ -1,11 +1,11 @@
 @use './var.scss';
 @use '../mixins/mixins';
 
-.v-modal-enter {
+.v-modal-enter-from {
 	animation: v-modal-in 0.2s ease;
 }
 
-.v-modal-leave {
+.v-modal-leave-to {
 	animation: v-modal-out 0.2s ease forwards;
 }
 
diff --git a/packages/design-system/src/css/common/transition.scss b/packages/design-system/src/css/common/transition.scss
index ce49d94895624..26c8c1d448437 100644
--- a/packages/design-system/src/css/common/transition.scss
+++ b/packages/design-system/src/css/common/transition.scss
@@ -4,8 +4,8 @@
 .fade-in-linear-leave-active {
 	transition: var.$fade-linear-transition;
 }
-.fade-in-linear-enter,
-.fade-in-linear-leave,
+.fade-in-linear-enter-from,
+.fade-in-linear-leave-from,
 .fade-in-linear-leave-active {
 	opacity: 0;
 }
@@ -14,8 +14,8 @@
 .el-fade-in-linear-leave-active {
 	transition: var.$fade-linear-transition;
 }
-.el-fade-in-linear-enter,
-.el-fade-in-linear-leave,
+.el-fade-in-linear-enter-from,
+.el-fade-in-linear-leave-from,
 .el-fade-in-linear-leave-active {
 	opacity: 0;
 }
@@ -24,7 +24,7 @@
 .el-fade-in-leave-active {
 	transition: all 0.3s cubic-bezier(0.55, 0, 0.1, 1);
 }
-.el-fade-in-enter,
+.el-fade-in-enter-from,
 .el-fade-in-leave-active {
 	opacity: 0;
 }
@@ -33,7 +33,7 @@
 .el-zoom-in-center-leave-active {
 	transition: all 0.3s cubic-bezier(0.55, 0, 0.1, 1);
 }
-.el-zoom-in-center-enter,
+.el-zoom-in-center-enter-from,
 .el-zoom-in-center-leave-active {
 	opacity: 0;
 	transform: scaleX(0);
@@ -46,7 +46,7 @@
 	transition: var.$md-fade-transition;
 	transform-origin: center top;
 }
-.el-zoom-in-top-enter,
+.el-zoom-in-top-enter-from,
 .el-zoom-in-top-leave-active {
 	opacity: 0;
 	transform: scaleY(0);
@@ -59,7 +59,7 @@
 	transition: var.$md-fade-transition;
 	transform-origin: center bottom;
 }
-.el-zoom-in-bottom-enter,
+.el-zoom-in-bottom-enter-from,
 .el-zoom-in-bottom-leave-active {
 	opacity: 0;
 	transform: scaleY(0);
@@ -72,7 +72,7 @@
 	transition: var.$md-fade-transition;
 	transform-origin: top left;
 }
-.el-zoom-in-left-enter,
+.el-zoom-in-left-enter-from,
 .el-zoom-in-left-leave-active {
 	opacity: 0;
 	transform: scale(0.45, 0.45);
@@ -89,7 +89,7 @@
 .el-list-leave-active {
 	transition: all 1s;
 }
-.el-list-enter,
+.el-list-enter-from,
 .el-list-leave-active {
 	opacity: 0;
 	transform: translateY(-30px);
diff --git a/packages/design-system/src/css/dialog.scss b/packages/design-system/src/css/dialog.scss
index 09eddb78eb987..7abf11c46e3bb 100644
--- a/packages/design-system/src/css/dialog.scss
+++ b/packages/design-system/src/css/dialog.scss
@@ -3,6 +3,34 @@
 @use './common/var';
 @use 'common/popup';
 
+@include mixins.b(overlay) {
+	width: 100%;
+	height: 100%;
+	display: block;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-color: hsla(247deg, 14%, 30%, 0.75);
+}
+
+@include mixins.b(overlay-dialog) {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: inherit;
+	justify-content: center;
+	padding-top: var(--spacing-2xl);
+}
+
+@include mixins.b(overlay-message-box) {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
 @include mixins.b(dialog) {
 	position: relative;
 	margin: 0 auto 50px;
@@ -75,6 +103,10 @@
 		padding-top: 10px;
 		text-align: right;
 		box-sizing: border-box;
+
+		.button + .button {
+			margin-left: var(--spacing-2xs);
+		}
 	}
 
 	// 内容居中布局
diff --git a/packages/design-system/src/css/drawer.scss b/packages/design-system/src/css/drawer.scss
index 225126cc84333..1ef1ba76f369d 100644
--- a/packages/design-system/src/css/drawer.scss
+++ b/packages/design-system/src/css/drawer.scss
@@ -1,218 +1,156 @@
 @use 'mixins/mixins';
 @use './common/var';
 
-@keyframes el-drawer-fade-in {
-	0% {
-		opacity: 0;
-	}
-	100% {
-		opacity: 1;
-	}
-}
-
-@mixin drawer-animation($direction) {
-	@keyframes #{$direction}-drawer-in {
-		0% {
-			@if $direction == ltr {
-				transform: translate(-100%, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(100%, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, -100%);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 100%);
-			}
-		}
-
-		100% {
-			@if $direction == ltr {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 0px);
-			}
-		}
-	}
-
-	@keyframes #{$direction}-drawer-out {
-		0% {
-			@if $direction == ltr {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, 0px);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 0);
-			}
-		}
-
-		100% {
-			@if $direction == ltr {
-				transform: translate(-100%, 0px);
-			}
-
-			@if $direction == rtl {
-				transform: translate(100%, 0px);
-			}
-
-			@if $direction == ttb {
-				transform: translate(0px, -100%);
-			}
-
-			@if $direction == btt {
-				transform: translate(0px, 100%);
-			}
-		}
-	}
-}
-
-@mixin animation-in($direction) {
-	.el-drawer__open &.#{$direction} {
-		animation: #{$direction}-drawer-in 0.3s 1ms;
-	}
-}
-
-@mixin animation-out($direction) {
-	&.#{$direction} {
-		animation: #{$direction}-drawer-out 0.3s;
-	}
-}
-
-@include drawer-animation(rtl);
-@include drawer-animation(ltr);
-@include drawer-animation(ttb);
-@include drawer-animation(btt);
-
 $directions: rtl, ltr, ttb, btt;
 
 @include mixins.b(drawer) {
-	position: absolute;
-	box-sizing: border-box;
+  position: absolute;
+  box-sizing: border-box;
 	background-color: var.$dialog-background-color;
-	display: flex;
-	flex-direction: column;
+  display: flex;
+  flex-direction: column;
 	box-shadow: 0px 6px 16px rgb(68 28 23 / 6%);
-	overflow: hidden;
-	outline: 0;
-
-	@each $direction in $directions {
-		@include animation-out($direction);
-		@include animation-in($direction);
-	}
-
-	&__wrapper {
-		position: fixed;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		overflow: hidden;
-		margin: 0;
-	}
-
-	&__header {
-		align-items: center;
-		color: rgb(114, 118, 123);
-		display: flex;
-		margin-bottom: 32px;
-		padding: var.$dialog-padding-primary;
-		padding-bottom: 0;
-		& > :first-child {
-			flex: 1;
-		}
-	}
-
-	&__title {
-		margin: 0;
-		flex: 1;
-		line-height: inherit;
-		font-size: 1rem;
-	}
-
-	&__close-btn {
-		border: none;
-		cursor: pointer;
-		font-size: var.$font-size-extra-large;
-		color: inherit;
-		background-color: transparent;
-	}
-
-	&__body {
-		flex: 1;
-		& > * {
-			box-sizing: border-box;
-		}
-	}
-
-	&.ltr,
-	&.rtl {
-		height: 100%;
-		top: 0;
-		bottom: 0;
-	}
-
-	&.ttb,
-	&.btt {
-		width: 100%;
-		left: 0;
-		right: 0;
-	}
-
-	&.ltr {
-		left: 0;
-		border-right: var(--border-base);
-	}
-
-	&.rtl {
-		right: 0;
-		border-left: var(--border-base);
-	}
-
-	&.ttb {
-		top: 0;
-	}
-
-	&.btt {
-		bottom: 0;
-	}
-}
+  overflow: hidden;
 
-.el-drawer__container {
-	position: relative;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	height: 100%;
-	width: 100%;
-}
+  transition: all 0.3s;
 
-.el-drawer-fade-enter-active {
-	animation: el-drawer-fade-in 0.3s;
+  @each $direction in $directions {
+    .#{$direction} {
+      transform: translate(0, 0);
+    }
+  }
+
+  &__sr-focus:focus {
+    outline: none !important;
+  }
+
+  &__header {
+    align-items: center;
+    color: rgb(114, 118, 123);
+    display: flex;
+    margin-bottom: 32px;
+		padding: var.$dialog-padding-primary;
+    padding-bottom: 0;
+    & > :first-child {
+      flex: 1;
+    }
+  }
+
+  &__title {
+    margin: 0;
+    flex: 1;
+    line-height: inherit;
+    font-size: 1rem;
+  }
+
+  @include mixins.e(footer) {
+		padding: var.$dialog-padding-primary;
+    padding-top: 10px;
+    text-align: right;
+  }
+
+  &__close-btn {
+    display: inline-flex;
+    border: none;
+    cursor: pointer;
+    font-size: getCssVar('font-size-extra-large');
+    color: inherit;
+    background-color: transparent;
+    outline: none;
+    &:focus,
+    &:hover {
+      i {
+        color: getCssVar('color-primary');
+      }
+    }
+  }
+
+  &__body {
+    flex: 1;
+		padding: 0;
+		
+    overflow: auto;
+    & > * {
+      box-sizing: border-box;
+    }
+  }
+
+  &.ltr,
+  &.rtl {
+    height: 100%;
+    top: 0;
+    bottom: 0;
+  }
+
+  &.ttb,
+  &.btt {
+    width: 100%;
+    left: 0;
+    right: 0;
+  }
+
+  &.ltr {
+    left: 0;
+  }
+
+  &.rtl {
+    right: 0;
+  }
+
+  &.ttb {
+    top: 0;
+  }
+
+  &.btt {
+    bottom: 0;
+  }
 }
 
-.el-drawer-fade-leave-active {
-	animation: el-drawer-fade-in 0.3s reverse;
+.el-drawer-fade {
+  &-enter-active,
+  &-leave-active {
+    transition: all 0.3s;
+  }
+
+  &-enter-from,
+  &-enter-active,
+  &-enter-to,
+  &-leave-from,
+  &-leave-active,
+  &-leave-to {
+    overflow: hidden !important;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-to,
+  &-leave-from {
+    opacity: 1;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    @each $direction in $directions {
+      .#{$direction} {
+        @if $direction == ltr {
+          transform: translateX(-100%);
+        }
+
+        @if $direction == rtl {
+          transform: translateX(100%);
+        }
+
+        @if $direction == ttb {
+          transform: translateY(-100%);
+        }
+
+        @if $direction == btt {
+          transform: translateY(100%);
+        }
+      }
+    }
+  }
 }
diff --git a/packages/design-system/src/css/dropdown.scss b/packages/design-system/src/css/dropdown.scss
index e5305a04acee0..7705b5c120211 100644
--- a/packages/design-system/src/css/dropdown.scss
+++ b/packages/design-system/src/css/dropdown.scss
@@ -2,11 +2,15 @@
 @use './common/var';
 @use './popper';
 
+@use 'element-plus/theme-chalk/src/dropdown-menu';
+
 @include mixins.b(dropdown) {
-	display: inline-block;
 	position: relative;
 	color: var(--color-text-dark);
 	font-size: var.$font-size-base;
+	display: inline-flex;
+	line-height: 1;
+	vertical-align: top;
 
 	.el-button-group {
 		display: block;
@@ -69,7 +73,6 @@
 }
 
 @include mixins.b(dropdown-menu) {
-	position: absolute;
 	top: 0;
 	left: 0;
 	z-index: 10;
@@ -79,6 +82,8 @@
 	border: 1px solid var(--border-color-light);
 	border-radius: var(--border-radius-base);
 	box-shadow: var.$dropdown-menu-box-shadow;
+	position: relative;
+	list-style: none;
 
 	@include mixins.e(item) {
 		list-style: none;
diff --git a/packages/design-system/src/css/icon.scss b/packages/design-system/src/css/icon.scss
index dfab446582d3e..5ffa344d56964 100644
--- a/packages/design-system/src/css/icon.scss
+++ b/packages/design-system/src/css/icon.scss
@@ -27,6 +27,24 @@
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.el-icon {
+	--color: inherit;
+	height: 1em;
+	width: 1em;
+	line-height: 1em;
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	position: relative;
+	fill: currentColor;
+	color: var(--color);
+	font-size: inherit;
+
+	svg {
+		height: 1em;
+    width: 1em;
+	}
+}
 .el-icon-ice-cream-round:before {
 	content: '\e6a0';
 }
diff --git a/packages/design-system/src/css/index.scss b/packages/design-system/src/css/index.scss
index 644991180e863..916ae11e05afa 100644
--- a/packages/design-system/src/css/index.scss
+++ b/packages/design-system/src/css/index.scss
@@ -80,5 +80,6 @@
 // @use "./cascader-panel.scss";
 // @use "./avatar.scss";
 @use './drawer.scss';
+@use './popper.scss';
 // @use "./popconfirm.scss";
 @use './utilities/index.scss';
diff --git a/packages/design-system/src/css/loading.scss b/packages/design-system/src/css/loading.scss
index 17137efaab4c7..92442916407a3 100644
--- a/packages/design-system/src/css/loading.scss
+++ b/packages/design-system/src/css/loading.scss
@@ -69,7 +69,7 @@
 	}
 }
 
-.el-loading-fade-enter,
+.el-loading-fade-enter-from,
 .el-loading-fade-leave-active {
 	opacity: 0;
 }
diff --git a/packages/design-system/src/css/menu.scss b/packages/design-system/src/css/menu.scss
index 2a737708e7c61..d2488c1238403 100644
--- a/packages/design-system/src/css/menu.scss
+++ b/packages/design-system/src/css/menu.scss
@@ -71,25 +71,25 @@
 				background-color: var(--color-foreground-xlight);
 			}
 		}
-		& > .el-submenu {
+		& > .el-sub-menu {
 			float: left;
 
 			&:focus,
 			&:hover {
 				outline: none;
-				.el-submenu__title {
+				.el-sub-menu__title {
 					color: var(--color-text-dark);
 				}
 			}
 
 			&.is-active {
-				.el-submenu__title {
+				.el-sub-menu__title {
 					border-bottom: 2px solid var(--color-primary);
 					color: var(--color-text-dark);
 				}
 			}
 
-			& .el-submenu__title {
+			& .el-sub-menu__title {
 				height: 60px;
 				line-height: 60px;
 				border-bottom: 2px solid transparent;
@@ -99,7 +99,7 @@
 					background-color: var(--color-foreground-xlight);
 				}
 			}
-			& .el-submenu__icon-arrow {
+			& .el-sub-menu__icon-arrow {
 				position: static;
 				vertical-align: middle;
 				margin-left: 8px;
@@ -108,7 +108,7 @@
 		}
 		& .el-menu {
 			& .el-menu-item,
-			& .el-submenu__title {
+			& .el-sub-menu__title {
 				background-color: var.$color-white;
 				float: none;
 				height: 36px;
@@ -117,7 +117,7 @@
 				color: var(--color-text-light);
 			}
 			& .el-menu-item.is-active,
-			& .el-submenu.is-active > .el-submenu__title {
+			& .el-sub-menu.is-active > .el-sub-menu__title {
 				color: var(--color-text-dark);
 			}
 		}
@@ -135,14 +135,14 @@
 		width: 64px;
 
 		> .el-menu-item,
-		> .el-submenu > .el-submenu__title {
+		> .el-sub-menu > .el-sub-menu__title {
 			[class^='el-icon-'] {
 				margin: 0;
 				vertical-align: middle;
 				width: 24px;
 				text-align: center;
 			}
-			.el-submenu__icon-arrow {
+			.el-sub-menu__icon-arrow {
 				display: none;
 			}
 			span {
@@ -158,11 +158,11 @@
 			color: inherit;
 		}
 
-		.el-menu .el-submenu {
+		.el-menu .el-sub-menu {
 			min-width: 200px;
 		}
 
-		.el-submenu {
+		.el-sub-menu {
 			position: relative;
 			& .el-menu {
 				position: absolute;
@@ -176,7 +176,7 @@
 			}
 
 			&.is-opened {
-				> .el-submenu__title .el-submenu__icon-arrow {
+				> .el-sub-menu__title .el-sub-menu__icon-arrow {
 					transform: none;
 				}
 			}
@@ -223,7 +223,7 @@
 	}
 }
 
-@include mixins.b(submenu) {
+@include mixins.b(sub-menu) {
 	list-style: none;
 	margin: 0;
 	padding-left: 0;
@@ -245,25 +245,36 @@
 		min-width: 200px;
 	}
 	@include mixins.e(icon-arrow) {
+		right: 20px;
 		position: absolute;
 		top: 50%;
-		right: 20px;
-		margin-top: -7px;
+		margin-top: -6px;
 		transition: transform 0.3s;
+		margin-right: 0;
 		font-size: 12px;
+		width: 12px;
+		height: 12px;
+
+		svg {
+			width: 12px;
+			height: 12px;
+			position: relative;
+			display: block;
+			margin-top: -2px;
+		}
 	}
 	@include mixins.when(active) {
-		.el-submenu__title {
+		.el-sub-menu__title {
 			border-bottom-color: var(--color-primary);
 		}
 	}
 	@include mixins.when(opened) {
-		> .el-submenu__title .el-submenu__icon-arrow {
+		> .el-sub-menu__title .el-sub-menu__icon-arrow {
 			transform: rotateZ(180deg);
 		}
 	}
 	@include mixins.when(disabled) {
-		.el-submenu__title,
+		.el-sub-menu__title,
 		.el-menu-item {
 			opacity: 0.25;
 			cursor: not-allowed;
@@ -291,7 +302,7 @@
 	}
 }
 
-.horizontal-collapse-transition .el-submenu__title .el-submenu__icon-arrow {
+.horizontal-collapse-transition .el-sub-menu__title .el-sub-menu__icon-arrow {
 	transition: 0.2s;
 	opacity: 0;
 }
diff --git a/packages/design-system/src/css/message-box.scss b/packages/design-system/src/css/message-box.scss
index 360130d5a6651..023c984a168f7 100644
--- a/packages/design-system/src/css/message-box.scss
+++ b/packages/design-system/src/css/message-box.scss
@@ -150,13 +150,23 @@
 			margin-left: 10px;
 		}
 
-		//& .btn--confirm {
-		//	@include button.button-just-primary();
-		//	@include button.button-medium();
-		//}
+		& .btn--confirm {
+			@include button.button-just-primary();
+			@include button.button-small();
+		}
 		//
-		//& .btn--cancel {
-		//}
+		& .btn--cancel {
+			@include button.button-small();
+			@include button.button-outline;
+
+			--button-active-background-color: var(--color-primary-tint-2);
+			--button-active-color: var(--color-primary);
+			--button-active-border-color: var(--color-primary);
+			--button-hover-background-color: var(--color-primary-tint-3);
+			--button-hover-color: var(--color-primary);
+			--button-hover-border-color: var(--color-primary);
+			--button-focus-outline-color: var(--color-primary-tint-1);
+		}
 	}
 
 	@include mixins.e(btns-reverse) {
diff --git a/packages/design-system/src/css/message.scss b/packages/design-system/src/css/message.scss
index 84ba403e1b439..5a80adb911473 100644
--- a/packages/design-system/src/css/message.scss
+++ b/packages/design-system/src/css/message.scss
@@ -117,7 +117,7 @@
 	}
 }
 
-.el-message-fade-enter,
+.el-message-fade-enter-from,
 .el-message-fade-leave-active {
 	opacity: 0;
 	transform: translate(-50%, -100%);
diff --git a/packages/design-system/src/css/notification.scss b/packages/design-system/src/css/notification.scss
index fae03903d04b8..fc8fcc03d6e5f 100644
--- a/packages/design-system/src/css/notification.scss
+++ b/packages/design-system/src/css/notification.scss
@@ -67,24 +67,24 @@
 		}
 	}
 
-	.el-icon-success {
+	.el-icon.el-notification--success {
 		color: var.$notification-success-icon-color;
 	}
 
-	.el-icon-error {
+	.el-icon.el-notification--error {
 		color: var.$notification-danger-icon-color;
 	}
 
-	.el-icon-info {
+	.el-icon.el-notification--info {
 		color: var.$notification-info-icon-color;
 	}
 
-	.el-icon-warning {
+	.el-icon.el-notification--warning {
 		color: var.$notification-warning-icon-color;
 	}
 }
 
-.el-notification-fade-enter {
+.el-notification-fade-enter-from {
 	&.right {
 		right: 0;
 		transform: translateX(100%);
diff --git a/packages/design-system/src/css/pagination.scss b/packages/design-system/src/css/pagination.scss
index 04098a8993af9..f7b2fd45ea667 100644
--- a/packages/design-system/src/css/pagination.scss
+++ b/packages/design-system/src/css/pagination.scss
@@ -65,17 +65,29 @@
 
 	.btn-prev,
 	.btn-next {
-		background: center center no-repeat;
+		background-position: center center;
+		background-repeat: no-repeat;
 		background-size: 16px;
 		background-color: var.$pagination-background-color;
 		cursor: pointer;
 		margin: 0;
 		color: var.$pagination-button-color;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
 
 		.el-icon {
-			display: block;
 			font-size: 12px;
+			width: 12px;
+			height: 12px;
 			font-weight: bold;
+
+			svg {
+				width: 12px;
+				height: 12px;
+				display: block;
+				pointer-events: none;
+			}
 		}
 	}
 
@@ -220,7 +232,7 @@
 				border: 1px solid var(--color-foreground-base);
 			}
 
-			&.active {
+			&.is-active {
 				border: 1px solid var(--color-primary);
 				color: var(--color-primary);
 			}
@@ -240,11 +252,13 @@
 @include mixins.b(pager) {
 	user-select: none;
 	list-style: none;
-	display: inline-block;
 	vertical-align: top;
 	font-size: 0;
 	padding: 0;
 	margin: 0;
+	display: inline-flex;
+	align-items: center;
+
 
 	.more::before {
 		line-height: 30px;
@@ -284,7 +298,7 @@
 			cursor: pointer;
 		}
 
-		&.active + li {
+		&.is-active + li {
 			border-left: 0;
 		}
 
@@ -292,9 +306,231 @@
 			color: var.$pagination-hover-color;
 		}
 
-		&.active {
+		&.is-active {
 			color: var.$pagination-hover-color;
 			cursor: default;
 		}
 	}
 }
+
+
+//@mixin pagination-button {
+//	display: flex;
+//	justify-content: center;
+//	align-items: center;
+//	font-size: getCssVar('pagination-font-size');
+//	min-width: getCssVar('pagination-button-width');
+//	height: getCssVar('pagination-button-height');
+//	line-height: getCssVar('pagination-button-height');
+//	color: getCssVar('pagination-button-color');
+//	background: getCssVar('pagination-bg-color');
+//	padding: 0 4px;
+//	border: none;
+//	border-radius: getCssVar('pagination-border-radius');
+//	cursor: pointer;
+//	text-align: center;
+//	box-sizing: border-box;
+//
+//	* {
+//		pointer-events: none;
+//	}
+//
+//	&:focus {
+//		outline: none;
+//	}
+//
+//	&:hover {
+//		color: getCssVar('pagination-hover-color');
+//	}
+//
+//	&.is-active {
+//		color: getCssVar('pagination-hover-color');
+//		cursor: default;
+//		font-weight: bold;
+//
+//		&.is-disabled {
+//			font-weight: bold;
+//			color: getCssVar('text-color', 'secondary');
+//		}
+//	}
+//
+//	&:disabled,
+//	&.is-disabled {
+//		color: getCssVar('pagination-button-disabled-color');
+//		background-color: getCssVar('pagination-button-disabled-bg-color');
+//		cursor: not-allowed;
+//	}
+//
+//	&:focus-visible {
+//		outline: 1px solid getCssVar('pagination-hover-color');
+//		outline-offset: -1px;
+//	}
+//}
+//
+//@include b(pagination) {
+//	@include set-component-css-var('pagination', $pagination);
+//
+//	white-space: nowrap;
+//	color: getCssVar('pagination-text-color');
+//	font-size: getCssVar('pagination-font-size');
+//	font-weight: normal;
+//	display: flex;
+//	align-items: center;
+//
+//	.#{$namespace}-input__inner {
+//		text-align: center;
+//		-moz-appearance: textfield;
+//	}
+//
+//	.#{$namespace}-select .#{$namespace}-input {
+//		width: 128px;
+//	}
+//
+//	button {
+//		@include pagination-button;
+//	}
+//
+//	.btn-prev,
+//	.btn-next {
+//		.#{$namespace}-icon {
+//			display: block;
+//			font-size: 12px;
+//			font-weight: bold;
+//			width: inherit;
+//		}
+//	}
+//
+//	& > * {
+//		@include when(first) {
+//			margin-left: 0 !important;
+//		}
+//		@include when(last) {
+//			margin-right: 0 !important;
+//		}
+//	}
+//
+//	.btn-prev {
+//		margin-left: getCssVar('pagination-item-gap');
+//	}
+//
+//	@include e(sizes) {
+//		margin-left: getCssVar('pagination-item-gap');
+//		font-weight: normal;
+//		color: getCssVar('text-color', 'regular');
+//	}
+//
+//	@include e(total) {
+//		margin-left: getCssVar('pagination-item-gap');
+//		font-weight: normal;
+//		color: getCssVar('text-color', 'regular');
+//
+//		&[disabled='true'] {
+//			color: getCssVar('text-color', 'placeholder');
+//		}
+//	}
+//
+//	@include e(jump) {
+//		display: flex;
+//		align-items: center;
+//		margin-left: getCssVar('pagination-item-gap');
+//		font-weight: normal;
+//		color: getCssVar('text-color', 'regular');
+//
+//		&[disabled='true'] {
+//			color: getCssVar('text-color', 'placeholder');
+//		}
+//
+//		@include e(goto) {
+//			margin-right: 8px;
+//		}
+//
+//		@include e(editor) {
+//			text-align: center;
+//			box-sizing: border-box;
+//
+//			&.#{$namespace}-input {
+//				width: 56px;
+//			}
+//
+//			.#{$namespace}-input__inner::-webkit-inner-spin-button,
+//			.#{$namespace}-input__inner::-webkit-outer-spin-button {
+//				-webkit-appearance: none;
+//				margin: 0;
+//			}
+//		}
+//
+//		@include e(classifier) {
+//			margin-left: 8px;
+//		}
+//	}
+//
+//	@include e(rightwrapper) {
+//		flex: 1;
+//		display: flex;
+//		align-items: center;
+//		justify-content: flex-end;
+//	}
+//
+//	@include when(background) {
+//		.btn-prev,
+//		.btn-next,
+//		.#{$namespace}-pager li {
+//			margin: 0 4px;
+//			background-color: getCssVar('pagination-button-bg-color');
+//
+//			&.is-active {
+//				background-color: getCssVar('color-primary');
+//				color: getCssVar('color-white');
+//			}
+//
+//			&:disabled,
+//			&.is-disabled {
+//				color: getCssVar('text-color', 'placeholder');
+//				background-color: getCssVar('disabled-bg-color');
+//
+//				&.is-active {
+//					color: getCssVar('text-color', 'secondary');
+//					background-color: getCssVar('fill-color', 'dark');
+//				}
+//			}
+//		}
+//
+//		.btn-prev {
+//			margin-left: getCssVar('pagination-item-gap');
+//		}
+//	}
+//
+//	@include m(small) {
+//		.btn-prev,
+//		.btn-next,
+//		.#{$namespace}-pager li {
+//			height: getCssVar('pagination-button-height-small');
+//			line-height: getCssVar('pagination-button-height-small');
+//			font-size: getCssVar('pagination-font-size-small');
+//			min-width: getCssVar('pagination-button-width-small');
+//		}
+//
+//		span:not([class*='suffix']),
+//		button {
+//			font-size: getCssVar('pagination-font-size-small');
+//		}
+//
+//		.#{$namespace}-select .#{$namespace}-input {
+//			width: 100px;
+//		}
+//	}
+//}
+//
+//@include b(pager) {
+//	user-select: none;
+//	list-style: none;
+//	font-size: 0;
+//	padding: 0;
+//	margin: 0;
+//	display: flex;
+//	align-items: center;
+//
+//	li {
+//		@include pagination-button;
+//	}
+//}
diff --git a/packages/design-system/src/css/popper.scss b/packages/design-system/src/css/popper.scss
index c7d9a0424db78..0fcc70fe2aaca 100644
--- a/packages/design-system/src/css/popper.scss
+++ b/packages/design-system/src/css/popper.scss
@@ -2,31 +2,60 @@
 @use './common/var';
 
 @include mixins.b(popper) {
-	.popper__arrow,
-	.popper__arrow::after {
+	position: absolute;
+	z-index: 2000;
+	min-width: 10px;
+	word-wrap: break-word;
+	visibility: visible;
+
+	&:not(.el-popover) {
+		max-width: 420px;
+	}
+
+	img {
+		max-width: 100%;
+	}
+
+	.el-select-dropdown,
+	.el-dropdown-menu {
+		position: relative;
+		margin: 0;
+	}
+
+	&:not(.el-select__popper):not(.el-dropdown__popper):not(.el-picker__popper) {
+		padding: var.$tooltip-padding;
+		font-size: var.$tooltip-font-size;
+		border-radius: 4px;
+	}
+
+	.el-popper__arrow {
 		position: absolute;
 		display: block;
 		width: 0;
 		height: 0;
+		z-index: 1010;
 		border-color: transparent;
 		border-style: solid;
-	}
-
-	.popper__arrow {
 		border-width: var.$popover-arrow-size;
 		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
 	}
 
-	.popper__arrow::after {
+	.el-popper__arrow::after {
+		display: block;
+		position: absolute;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
 		content: ' ';
 		border-width: var.$popover-arrow-size;
 	}
 
-	&[x-placement^='top'] {
-		margin-bottom: #{var.$popover-arrow-size + 6};
+	&[data-popper-placement^='top'] {
+		//margin-bottom: #{var.$popover-arrow-size + 6};
 	}
 
-	&[x-placement^='top'] .popper__arrow {
+	&[data-popper-placement^='top'] .el-popper__arrow {
 		bottom: -(var.$popover-arrow-size);
 		left: 50%;
 		margin-right: #{var.$tooltip-arrow-size * 0.5};
@@ -41,11 +70,11 @@
 		}
 	}
 
-	&[x-placement^='bottom'] {
-		margin-top: #{var.$popover-arrow-size + 6};
+	&[data-popper-placement^='bottom'] {
+		//margin-top: #{var.$popover-arrow-size + 6};
 	}
 
-	&[x-placement^='bottom'] .popper__arrow {
+	&[data-popper-placement^='bottom'] .el-popper__arrow {
 		top: -(var.$popover-arrow-size);
 		left: 50%;
 		margin-right: #{var.$tooltip-arrow-size * 0.5};
@@ -60,11 +89,11 @@
 		}
 	}
 
-	&[x-placement^='right'] {
+	&[data-popper-placement^='right'] {
 		margin-left: #{var.$popover-arrow-size + 6};
 	}
 
-	&[x-placement^='right'] .popper__arrow {
+	&[data-popper-placement^='right'] .el-popper__arrow {
 		top: 50%;
 		left: -(var.$popover-arrow-size);
 		margin-bottom: #{var.$tooltip-arrow-size * 0.5};
@@ -79,11 +108,11 @@
 		}
 	}
 
-	&[x-placement^='left'] {
+	&[data-popper-placement^='left'] {
 		margin-right: #{var.$popover-arrow-size + 6};
 	}
 
-	&[x-placement^='left'] .popper__arrow {
+	&[data-popper-placement^='left'] .el-popper__arrow {
 		top: 50%;
 		right: -(var.$popover-arrow-size);
 		margin-bottom: #{var.$tooltip-arrow-size * 0.5};
@@ -98,4 +127,42 @@
 			border-left-color: var.$popover-background-color;
 		}
 	}
+
+	@include mixins.when(dark) {
+		background: var.$tooltip-fill;
+		color: var.$tooltip-color;
+
+		&[data-popper-placement^='top'] .el-popper__arrow {
+			border-top-color: transparent;
+
+			&::after {
+				border-top-color: var.$tooltip-border-color;
+			}
+		}
+
+
+		&[data-popper-placement^='bottom'] .el-popper__arrow {
+			border-bottom-color: transparent;
+
+			&::after {
+				border-bottom-color: var.$tooltip-border-color;
+			}
+		}
+
+		&[data-popper-placement^='right'] .el-popper__arrow {
+			border-right-color: transparent;
+
+			&::after {
+				border-right-color: var.$tooltip-border-color;
+			}
+		}
+
+		&[data-popper-placement^='left'] .el-popper__arrow {
+			border-left-color: transparent;
+
+			&::after {
+				border-left-color: var.$tooltip-border-color;
+			}
+		}
+	}
 }
diff --git a/packages/design-system/src/css/select.scss b/packages/design-system/src/css/select.scss
index 6fed9ae001299..7cc8696c1a61b 100644
--- a/packages/design-system/src/css/select.scss
+++ b/packages/design-system/src/css/select.scss
@@ -47,11 +47,10 @@
 		& .el-select__caret {
 			font-size: var.$select-input-font-size;
 			transition: transform 0.3s;
-			transform: rotateZ(180deg);
 			cursor: pointer;
 
 			@include mixins.when(reverse) {
-				transform: rotateZ(0deg);
+				transform: rotateZ(180deg);
 			}
 
 			@include mixins.when(show-close) {
@@ -165,4 +164,9 @@
 			height: 42px;
 		}
 	}
+	&--default {
+		.el-tag {
+			padding: var(--spacing-5xs) var(--spacing-xs);
+		}
+	}
 }
diff --git a/packages/design-system/src/css/switch.scss b/packages/design-system/src/css/switch.scss
index 7105bfd317503..17d8e568d22b5 100644
--- a/packages/design-system/src/css/switch.scss
+++ b/packages/design-system/src/css/switch.scss
@@ -109,7 +109,7 @@
 		}
 	}
 
-	& .label-fade-enter,
+	& .label-fade-enter-from,
 	& .label-fade-leave-active {
 		opacity: 0;
 	}
diff --git a/packages/design-system/src/css/tabs.scss b/packages/design-system/src/css/tabs.scss
index 29587790254c2..cca2eddef4687 100644
--- a/packages/design-system/src/css/tabs.scss
+++ b/packages/design-system/src/css/tabs.scss
@@ -517,19 +517,19 @@
 .slideInLeft-transition {
 	display: inline-block;
 }
-.slideInRight-enter {
+.slideInRight-enter-from {
 	animation: slideInRight-enter 0.3s;
 }
-.slideInRight-leave {
+.slideInRight-leave-to {
 	position: absolute;
 	left: 0;
 	right: 0;
 	animation: slideInRight-leave 0.3s;
 }
-.slideInLeft-enter {
+.slideInLeft-enter-from {
 	animation: slideInLeft-enter 0.3s;
 }
-.slideInLeft-leave {
+.slideInLeft-leave-to {
 	position: absolute;
 	left: 0;
 	right: 0;
diff --git a/packages/design-system/src/css/tag.scss b/packages/design-system/src/css/tag.scss
index d7e8f736e9b67..47d740fd4e752 100644
--- a/packages/design-system/src/css/tag.scss
+++ b/packages/design-system/src/css/tag.scss
@@ -104,7 +104,7 @@
 	box-sizing: border-box;
 	white-space: nowrap;
 
-	.el-icon-close {
+	.el-icon.el-tag__close {
 		border-radius: 50%;
 		text-align: center;
 		position: relative;
@@ -133,7 +133,7 @@
 	@include mixins.m(medium) {
 		padding: 12px;
 
-		.el-icon-close {
+		.el-icon.el-tag__close {
 			transform: scale(0.8);
 		}
 	}
@@ -143,7 +143,7 @@
 		padding: 0 8px;
 		line-height: 22px;
 
-		.el-icon-close {
+		.el-icon.el-tag__close {
 			transform: scale(0.8);
 		}
 	}
@@ -153,7 +153,7 @@
 		padding: 0 5px;
 		line-height: 18px;
 
-		.el-icon-close {
+		.el-icon.el-tag__close {
 			margin-left: -3px;
 			transform: scale(0.7);
 		}
diff --git a/packages/design-system/src/css/tooltip.scss b/packages/design-system/src/css/tooltip.scss
index 81be43e297a72..879b4801ca282 100644
--- a/packages/design-system/src/css/tooltip.scss
+++ b/packages/design-system/src/css/tooltip.scss
@@ -23,8 +23,8 @@
 			font-weight: var(--font-weight-bold);
 		}
 
-		.popper__arrow,
-		.popper__arrow::after {
+		.el-popper__arrow,
+		.el-popper__arrow::after {
 			position: absolute;
 			display: block;
 			width: 0;
@@ -33,20 +33,20 @@
 			border-style: solid;
 		}
 
-		.popper__arrow {
+		.el-popper__arrow {
 			border-width: var.$tooltip-arrow-size;
 		}
 
-		.popper__arrow::after {
+		.el-popper__arrow::after {
 			content: ' ';
 			border-width: 5px;
 		}
 
-		&[x-placement^='top'] {
+		&[data-popper-placement^='top'] {
 			margin-bottom: #{var.$tooltip-arrow-size + 6px};
 		}
 
-		&[x-placement^='top'] .popper__arrow {
+		&[data-popper-placement^='top'] .el-popper__arrow {
 			bottom: -(var.$tooltip-arrow-size);
 			border-top-color: var.$tooltip-border-color;
 			border-bottom-width: 0;
@@ -59,11 +59,11 @@
 			}
 		}
 
-		&[x-placement^='bottom'] {
+		&[data-popper-placement^='bottom'] {
 			margin-top: #{var.$tooltip-arrow-size + 6px};
 		}
 
-		&[x-placement^='bottom'] .popper__arrow {
+		&[data-popper-placement^='bottom'] .el-popper__arrow {
 			top: -(var.$tooltip-arrow-size);
 			border-top-width: 0;
 			border-bottom-color: var.$tooltip-border-color;
@@ -76,11 +76,11 @@
 			}
 		}
 
-		&[x-placement^='right'] {
+		&[data-popper-placement^='right'] {
 			margin-left: #{var.$tooltip-arrow-size + 6px};
 		}
 
-		&[x-placement^='right'] .popper__arrow {
+		&[data-popper-placement^='right'] .el-popper__arrow {
 			left: -(var.$tooltip-arrow-size);
 			border-right-color: var.$tooltip-border-color;
 			border-left-width: 0;
@@ -93,11 +93,11 @@
 			}
 		}
 
-		&[x-placement^='left'] {
+		&[data-popper-placement^='left'] {
 			margin-right: #{var.$tooltip-arrow-size + 6px};
 		}
 
-		&[x-placement^='left'] .popper__arrow {
+		&[data-popper-placement^='left'] .el-popper__arrow {
 			right: -(var.$tooltip-arrow-size);
 			border-right-width: 0;
 			border-left-color: var.$tooltip-border-color;
@@ -111,34 +111,34 @@
 			}
 		}
 
-		@include mixins.when(dark) {
+		@include mixins.when(is-dark) {
 			background: var.$tooltip-fill;
 			color: var.$tooltip-color;
 		}
 
-		@include mixins.when(light) {
+		@include mixins.when(is-light) {
 			background: var.$tooltip-color;
 			border: 1px solid var.$tooltip-fill;
 
-			&[x-placement^='top'] .popper__arrow {
+			&[data-popper-placement^='top'] .el-popper__arrow {
 				border-top-color: var.$tooltip-fill;
 				&::after {
 					border-top-color: var.$tooltip-color;
 				}
 			}
-			&[x-placement^='bottom'] .popper__arrow {
+			&[data-popper-placement^='bottom'] .el-popper__arrow {
 				border-bottom-color: var.$tooltip-fill;
 				&::after {
 					border-bottom-color: var.$tooltip-color;
 				}
 			}
-			&[x-placement^='left'] .popper__arrow {
+			&[data-popper-placement^='left'] .el-popper__arrow {
 				border-left-color: var.$tooltip-fill;
 				&::after {
 					border-left-color: var.$tooltip-color;
 				}
 			}
-			&[x-placement^='right'] .popper__arrow {
+			&[data-popper-placement^='right'] .el-popper__arrow {
 				border-right-color: var.$tooltip-fill;
 				&::after {
 					border-right-color: var.$tooltip-color;
diff --git a/packages/design-system/src/locale/format.js b/packages/design-system/src/locale/format.ts
similarity index 53%
rename from packages/design-system/src/locale/format.js
rename to packages/design-system/src/locale/format.ts
index 77777cec63c6b..beaac88889abc 100644
--- a/packages/design-system/src/locale/format.js
+++ b/packages/design-system/src/locale/format.ts
@@ -1,9 +1,3 @@
-const hasOwnProperty = Object.prototype.hasOwnProperty;
-
-export function hasOwn(obj, key) {
-	return hasOwnProperty.call(obj, key);
-}
-
 const RE_NARGS = /(%|)\{([0-9a-zA-Z_]+)\}/g;
 /**
  *  String format template
@@ -12,34 +6,30 @@ const RE_NARGS = /(%|)\{([0-9a-zA-Z_]+)\}/g;
  *    https://github.com/Matt-Esch/string-template/index.js
  */
 export default function () {
-	/**
-	 * template
-	 *
-	 * @param {String | Function} string
-	 * @param {Array} ...args
-	 * @return {String}
-	 */
-
-	function template(value, ...args) {
+	function template(
+		value: string | ((...args: unknown[]) => string),
+		...args: Array<string | object>
+	) {
 		if (typeof value === 'function') {
 			return value(args);
 		}
-		const string = value;
+
+		const str = value;
 		if (args.length === 1 && typeof args[0] === 'object') {
-			args = args[0];
+			args = args[0] as unknown as Array<string | object>;
 		}
 
 		if (!args || !args.hasOwnProperty) {
-			args = {};
+			args = {} as unknown as Array<string | object>;
 		}
 
-		return string.replace(RE_NARGS, (match, prefix, i, index) => {
+		return str.replace(RE_NARGS, (match, prefix, i, index: number) => {
 			let result;
 
-			if (string[index - 1] === '{' && string[index + match.length] === '}') {
+			if (str[index - 1] === '{' && str[index + match.length] === '}') {
 				return i;
 			} else {
-				result = hasOwn(args, i) ? args[i] : null;
+				result = Object.hasOwn(args, i) ? args[i] : null;
 				if (result === null || result === undefined) {
 					return '';
 				}
diff --git a/packages/design-system/src/locale/index.js b/packages/design-system/src/locale/index.js
deleted file mode 100644
index 603690f157c54..0000000000000
--- a/packages/design-system/src/locale/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import defaultLang from '../locale/lang/en';
-import Format from './format';
-
-import ElementLocale from 'element-ui/lib/locale';
-import ElementLang from 'element-ui/lib/locale/lang/en';
-ElementLocale.use(ElementLang);
-
-const format = Format();
-let lang = defaultLang;
-
-let i18nHandler;
-
-export const t = function (path, options) {
-	if (typeof i18nHandler === 'function') {
-		const value = i18nHandler.apply(this, arguments);
-		if (value !== null && value !== undefined && value !== path) return String(value);
-	}
-
-	// only support flat keys
-	if (lang[path] !== undefined) {
-		return format(lang[path], options);
-	}
-
-	return '';
-};
-
-export const use = function (l) {
-	try {
-		const ndsLang = require(`./lang/${l}`);
-		lang = ndsLang.default;
-
-		// todo breaks select empty data
-		// const elLang = require(`element-ui/lib/locale/lang/${l}`);;
-		// ElementLocale.use(elLang);
-	} catch (e) {}
-};
-
-export const i18n = function (fn) {
-	i18nHandler = fn || i18nHandler;
-};
-
-export default { use, t, i18n };
diff --git a/packages/design-system/src/locale/index.ts b/packages/design-system/src/locale/index.ts
new file mode 100644
index 0000000000000..4688b6a5baa52
--- /dev/null
+++ b/packages/design-system/src/locale/index.ts
@@ -0,0 +1,51 @@
+import defaultLang from '../locale/lang/en';
+import createFormatTemplate from './format';
+import type { N8nLocale, N8nLocaleTranslateFn } from '@/types';
+
+// import { ElementLocale } from 'element-plus';
+// import ElementLang from 'element-plus/lib/locale/lang/en';
+//
+// ElementLocale.use(ElementLang);
+
+const format = createFormatTemplate();
+let lang = defaultLang;
+
+let i18nHandler: N8nLocaleTranslateFn;
+
+export const t = function (
+	path: Parameters<typeof i18nHandler>[0],
+	options: Parameters<typeof i18nHandler>[1],
+) {
+	if (typeof i18nHandler === 'function') {
+		const value = i18nHandler(path, options);
+
+		if (value !== null && value !== undefined && value !== path) {
+			return String(value);
+		}
+	}
+
+	// only support flat keys
+	if (lang[path] !== undefined) {
+		return format(lang[path], options);
+	}
+
+	return '';
+};
+
+export async function use(l: string) {
+	try {
+		const ndsLang = (await import(`./lang/${l}.ts`)) as { default: N8nLocale };
+
+		lang = ndsLang.default;
+
+		// todo breaks select empty data
+		// const elLang = require(`element-ui/lib/locale/lang/${l}`);;
+		// ElementLocale.use(elLang);
+	} catch (e) {}
+}
+
+export const i18n = function (fn: N8nLocaleTranslateFn) {
+	i18nHandler = fn || i18nHandler;
+};
+
+export default { use, t, i18n };
diff --git a/packages/design-system/src/locale/lang/en.js b/packages/design-system/src/locale/lang/en.ts
similarity index 65%
rename from packages/design-system/src/locale/lang/en.js
rename to packages/design-system/src/locale/lang/en.ts
index 3038b3b248716..78102ec5c23af 100644
--- a/packages/design-system/src/locale/lang/en.js
+++ b/packages/design-system/src/locale/lang/en.ts
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { N8nLocale } from '@/types';
+
 export default {
 	'nds.auth.roles.owner': 'Owner',
 	'nds.userInfo.you': '(you)',
@@ -8,15 +11,16 @@ export default {
 	'formInput.validator.fieldRequired': 'This field is required',
 	'formInput.validator.minCharactersRequired': 'Must be at least {minimum} characters',
 	'formInput.validator.maxCharactersRequired': 'Must be at most {maximum} characters',
-	'formInput.validator.oneNumbersRequired': (config) => {
+	'formInput.validator.oneNumbersRequired': (config: { minimum: number }) => {
 		return `Must have at least ${config.minimum} number${config.minimum > 1 ? 's' : ''}`;
 	},
 	'formInput.validator.validEmailRequired': 'Must be a valid email',
-	'formInput.validator.uppercaseCharsRequired': (config) =>
+	'formInput.validator.uppercaseCharsRequired': (config: { minimum: number }) =>
 		`Must have at least ${config.minimum} uppercase character${config.minimum > 1 ? 's' : ''}`,
 	'formInput.validator.defaultPasswordRequirements':
 		'8+ characters, at least 1 number and 1 capital letter',
-	'sticky.markdownHint': `You can style with <a href="https://docs.n8n.io/workflows/sticky-notes/" target="_blank">Markdown</a>`,
-	'tags.showMore': (count) => `+${count} more`,
+	'sticky.markdownHint':
+		'You can style with <a href="https://docs.n8n.io/workflows/sticky-notes/" target="_blank">Markdown</a>',
+	'tags.showMore': (count: number) => `+${count} more`,
 	'datatable.pageSize': 'Page size',
-};
+} as N8nLocale;
diff --git a/packages/design-system/src/plugin.ts b/packages/design-system/src/plugin.ts
index 2166c6dc371d3..1ad81241cc441 100644
--- a/packages/design-system/src/plugin.ts
+++ b/packages/design-system/src/plugin.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type { PluginObject } from 'vue';
+import type { Plugin } from 'vue';
 import {
 	N8nActionBox,
 	N8nActionDropdown,
@@ -9,9 +9,10 @@ import {
 	N8nBadge,
 	N8nBlockUi,
 	N8nButton,
-	N8nElButton,
 	N8nCallout,
 	N8nCard,
+	N8nCheckbox,
+	N8nColorPicker,
 	N8nDatatable,
 	N8nFormBox,
 	N8nFormInputs,
@@ -36,6 +37,8 @@ import {
 	N8nPopover,
 	N8nPulse,
 	N8nRadioButtons,
+	N8nRecycleScroller,
+	N8nResizeWrapper,
 	N8nSelect,
 	N8nSpinner,
 	N8nSticky,
@@ -48,15 +51,10 @@ import {
 	N8nUserInfo,
 	N8nUserSelect,
 	N8nUsersList,
-	N8nResizeWrapper,
-	N8nRecycleScroller,
-	N8nCheckbox,
-	N8nColorPicker,
 } from './components';
 
-export const N8nPlugin: PluginObject<{}> = {
+export const N8nPlugin: Plugin<{}> = {
 	install: (app) => {
-		app.component('n8n-info-accordion', N8nInfoAccordion);
 		app.component('n8n-action-box', N8nActionBox);
 		app.component('n8n-action-dropdown', N8nActionDropdown);
 		app.component('n8n-action-toggle', N8nActionToggle);
@@ -65,22 +63,24 @@ export const N8nPlugin: PluginObject<{}> = {
 		app.component('n8n-badge', N8nBadge);
 		app.component('n8n-block-ui', N8nBlockUi);
 		app.component('n8n-button', N8nButton);
-		app.component('el-button', N8nElButton);
 		app.component('n8n-callout', N8nCallout);
 		app.component('n8n-card', N8nCard);
+		app.component('n8n-checkbox', N8nCheckbox);
+		app.component('n8n-color-picker', N8nColorPicker);
 		app.component('n8n-datatable', N8nDatatable);
 		app.component('n8n-form-box', N8nFormBox);
 		app.component('n8n-form-inputs', N8nFormInputs);
 		app.component('n8n-form-input', N8nFormInput);
+		app.component('n8n-heading', N8nHeading);
 		app.component('n8n-icon', N8nIcon);
 		app.component('n8n-icon-button', N8nIconButton);
+		app.component('n8n-info-accordion', N8nInfoAccordion);
 		app.component('n8n-info-tip', N8nInfoTip);
 		app.component('n8n-input', N8nInput);
 		app.component('n8n-input-label', N8nInputLabel);
 		app.component('n8n-input-number', N8nInputNumber);
-		app.component('n8n-loading', N8nLoading);
-		app.component('n8n-heading', N8nHeading);
 		app.component('n8n-link', N8nLink);
+		app.component('n8n-loading', N8nLoading);
 		app.component('n8n-markdown', N8nMarkdown);
 		app.component('n8n-menu', N8nMenu);
 		app.component('n8n-menu-item', N8nMenuItem);
@@ -90,22 +90,20 @@ export const N8nPlugin: PluginObject<{}> = {
 		app.component('n8n-option', N8nOption);
 		app.component('n8n-popover', N8nPopover);
 		app.component('n8n-pulse', N8nPulse);
+		app.component('n8n-radio-buttons', N8nRadioButtons);
+		app.component('n8n-recycle-scroller', N8nRecycleScroller);
+		app.component('n8n-resize-wrapper', N8nResizeWrapper);
 		app.component('n8n-select', N8nSelect);
 		app.component('n8n-spinner', N8nSpinner);
 		app.component('n8n-sticky', N8nSticky);
-		app.component('n8n-radio-buttons', N8nRadioButtons);
-		app.component('n8n-tags', N8nTags);
 		app.component('n8n-tabs', N8nTabs);
 		app.component('n8n-tag', N8nTag);
+		app.component('n8n-tags', N8nTags);
 		app.component('n8n-text', N8nText);
 		app.component('n8n-tooltip', N8nTooltip);
-		app.component('n8n-user-info', N8nUserInfo);
 		app.component('n8n-tree', N8nTree);
+		app.component('n8n-user-info', N8nUserInfo);
 		app.component('n8n-users-list', N8nUsersList);
 		app.component('n8n-user-select', N8nUserSelect);
-		app.component('n8n-resize-wrapper', N8nResizeWrapper);
-		app.component('n8n-recycle-scroller', N8nRecycleScroller);
-		app.component('n8n-checkbox', N8nCheckbox);
-		app.component('n8n-color-picker', N8nColorPicker);
 	},
 };
diff --git a/packages/design-system/src/shims-vue2-boring-avatars.d.ts b/packages/design-system/src/shims-vue2-boring-avatars.d.ts
deleted file mode 100644
index 9098a107f12f9..0000000000000
--- a/packages/design-system/src/shims-vue2-boring-avatars.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'vue2-boring-avatars';
diff --git a/packages/design-system/src/styleguide/ColorCircles.vue b/packages/design-system/src/styleguide/ColorCircles.vue
index 763bc24b1d763..5901e5366b9e5 100644
--- a/packages/design-system/src/styleguide/ColorCircles.vue
+++ b/packages/design-system/src/styleguide/ColorCircles.vue
@@ -56,7 +56,10 @@ export default defineComponent({
 			this.colors.forEach((color) => {
 				const style = getComputedStyle(document.body);
 
-				this.$set(this.hsl, color, style.getPropertyValue(color));
+				this.hsl = {
+					...this.hsl,
+					[color]: style.getPropertyValue(color),
+				};
 			});
 		};
 
@@ -75,7 +78,7 @@ export default defineComponent({
 			this.observer.observe(body, { attributes: true });
 		}
 	},
-	destroyed() {
+	unmounted() {
 		if (this.observer) {
 			this.observer.disconnect();
 		}
diff --git a/packages/design-system/src/styleguide/Sizes.vue b/packages/design-system/src/styleguide/Sizes.vue
index dd5316c6799de..a22de96cd3c95 100644
--- a/packages/design-system/src/styleguide/Sizes.vue
+++ b/packages/design-system/src/styleguide/Sizes.vue
@@ -46,7 +46,10 @@ export default defineComponent({
 				const rem = style.getPropertyValue(variable);
 				const px = parseFloat(rem.replace('rem', '')) * 16;
 
-				this.$set(this.sizes, variable, { rem, px });
+				this.sizes = {
+					...this.sizes,
+					[variable]: { rem, px },
+				};
 			});
 		};
 
@@ -65,7 +68,7 @@ export default defineComponent({
 			this.observer.observe(body, { attributes: true });
 		}
 	},
-	destroyed() {
+	unmounted() {
 		if (this.observer) {
 			this.observer.disconnect();
 		}
diff --git a/packages/design-system/src/styleguide/VariableTable.vue b/packages/design-system/src/styleguide/VariableTable.vue
index 9d26337900f68..5548a2f481f3f 100644
--- a/packages/design-system/src/styleguide/VariableTable.vue
+++ b/packages/design-system/src/styleguide/VariableTable.vue
@@ -43,7 +43,10 @@ export default defineComponent({
 				const style = getComputedStyle(document.body);
 				const value = style.getPropertyValue(variable);
 
-				this.$set(this.values, variable, value);
+				this.values = {
+					...this.values,
+					[variable]: value,
+				};
 			});
 		};
 
@@ -62,7 +65,7 @@ export default defineComponent({
 			this.observer.observe(body, { attributes: true });
 		}
 	},
-	destroyed() {
+	unmounted() {
 		if (this.observer) {
 			this.observer.disconnect();
 		}
diff --git a/packages/design-system/src/styleguide/utilities/lists.stories.ts b/packages/design-system/src/styleguide/utilities/lists.stories.ts
index e3b562aef9333..e52a9adce6e33 100644
--- a/packages/design-system/src/styleguide/utilities/lists.stories.ts
+++ b/packages/design-system/src/styleguide/utilities/lists.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 
 export default {
 	title: 'Utilities/Lists',
diff --git a/packages/design-system/src/styleguide/utilities/spacing.stories.ts b/packages/design-system/src/styleguide/utilities/spacing.stories.ts
index a2fb7addfd35b..065383a5d1d91 100644
--- a/packages/design-system/src/styleguide/utilities/spacing.stories.ts
+++ b/packages/design-system/src/styleguide/utilities/spacing.stories.ts
@@ -1,4 +1,4 @@
-import type { StoryFn } from '@storybook/vue';
+import type { StoryFn } from '@storybook/vue3';
 import SpacingPreview from '../components/SpacingPreview.vue';
 
 export default {
@@ -6,11 +6,12 @@ export default {
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		SpacingPreview,
 	},
-	template: '<spacing-preview v-bind="$props" />',
+	template: '<spacing-preview v-bind="args" />',
 });
 
 export const Padding = Template.bind({});
diff --git a/packages/design-system/src/types/i18n.ts b/packages/design-system/src/types/i18n.ts
new file mode 100644
index 0000000000000..7e79f4037c04a
--- /dev/null
+++ b/packages/design-system/src/types/i18n.ts
@@ -0,0 +1,3 @@
+export type N8nLocaleTranslateFn = (path: string, options: object) => string;
+
+export type N8nLocale = Record<string, string | ((...args: unknown[]) => string)>;
diff --git a/packages/design-system/src/types/index.ts b/packages/design-system/src/types/index.ts
index 9fa2387dc47b7..931028279ead1 100644
--- a/packages/design-system/src/types/index.ts
+++ b/packages/design-system/src/types/index.ts
@@ -1,6 +1,7 @@
 export * from './button';
 export * from './datatable';
 export * from './form';
+export * from './i18n';
 export * from './menu';
 export * from './router';
 export * from './user';
diff --git a/packages/design-system/src/types/menu.ts b/packages/design-system/src/types/menu.ts
index ce5640df723ec..c97bfdd1f2179 100644
--- a/packages/design-system/src/types/menu.ts
+++ b/packages/design-system/src/types/menu.ts
@@ -1,4 +1,4 @@
-import type { Tooltip } from 'element-ui';
+import type { ElTooltipProps } from 'element-plus';
 
 export type IMenuItem = {
 	id: string;
@@ -7,7 +7,7 @@ export type IMenuItem = {
 	secondaryIcon?: {
 		name: string;
 		size?: 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
-		tooltip?: Tooltip;
+		tooltip?: ElTooltipProps;
 	};
 	customIconSize?: 'medium' | 'small';
 	available?: boolean;
diff --git a/packages/design-system/theme/preview/index.html b/packages/design-system/theme/preview/index.html
index 2de021bca5804..ed1c514ab2515 100644
--- a/packages/design-system/theme/preview/index.html
+++ b/packages/design-system/theme/preview/index.html
@@ -886,9 +886,9 @@ <h4>Tree</h4>
 	</body>
 	<!-- import Vue before Element -->
 	<!-- <script src="https://unpkg.com/vue/dist/vue.js"></script> -->
-	<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+	<script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
 	<!-- import JavaScript -->
-	<script src="https://unpkg.com/element-ui/lib/index.js"></script>
+	<script src="https://unpkg.com/element-plus/lib/index.js"></script>
 	<script>
 		const original = {
 			color_primary: '#409EFF',
@@ -919,8 +919,7 @@ <h4>Tree</h4>
 		};
 
 		Vue.config.devtools = true;
-		new Vue({
-			el: '#app',
+		Vue.createApp({
 			data() {
 				return {
 					global: {},
@@ -1330,6 +1329,6 @@ <h4>Tree</h4>
 					this.visible = true;
 				},
 			},
-		});
+		}).mount('#app');
 	</script>
 </html>
diff --git a/packages/design-system/vite.config.ts b/packages/design-system/vite.config.ts
index a1ae7d976a672..b37ff74b3fef5 100644
--- a/packages/design-system/vite.config.ts
+++ b/packages/design-system/vite.config.ts
@@ -1,4 +1,4 @@
-import vue from '@vitejs/plugin-vue2';
+import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
 import { defineConfig as defineVitestConfig } from 'vitest/config';
@@ -11,7 +11,7 @@ export default mergeConfig(
 		resolve: {
 			alias: {
 				'@': resolve(__dirname, 'src'),
-				'vue2-boring-avatars': require.resolve('vue2-boring-avatars'),
+				'n8n-design-system': resolve(__dirname, 'src'),
 			},
 		},
 		build: {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 90a53d67f75da..f5b9d5722963d 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -39,13 +39,15 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
     "@fortawesome/free-regular-svg-icons": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
-    "@fortawesome/vue-fontawesome": "^2.0.10",
+    "@fortawesome/vue-fontawesome": "^3.0.3",
     "@jsplumb/browser-ui": "^5.13.2",
     "@jsplumb/common": "^5.13.2",
     "@jsplumb/connector-bezier": "^5.13.2",
     "@jsplumb/core": "^5.13.2",
     "@jsplumb/util": "^5.13.2",
     "@n8n/codemirror-lang-sql": "^1.0.1",
+    "@vueuse/components": "^10.2.0",
+    "@vueuse/core": "^10.2.0",
     "axios": "^0.21.1",
     "codemirror-lang-html-n8n": "^1.0.0",
     "codemirror-lang-n8n-expression": "^0.2.0",
@@ -67,15 +69,13 @@
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
     "uuid": "^8.3.2",
-    "v-click-outside": "^3.1.2",
-    "vue": "^2.7.14",
+    "v3-infinite-loading": "^1.2.2",
+    "vue": "^3.3.4",
     "vue-agile": "^2.0.0",
-    "vue-i18n": "^8.26.7",
-    "vue-infinite-loading": "^2.4.5",
-    "vue-json-pretty": "1.9.3",
-    "vue-router": "^3.6.5",
-    "vue2-teleport": "^1.0.1",
-    "vue2-touch-events": "^3.2.1",
+    "vue-i18n": "^9.2.2",
+    "vue-json-pretty": "2.2.4",
+    "vue-router": "^4.2.2",
+    "vue3-touch-events": "^4.1.3",
     "xss": "^1.0.14"
   },
   "devDependencies": {
@@ -84,7 +84,7 @@
     "@sentry/vite-plugin": "^0.4.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/user-event": "^14.4.3",
-    "@testing-library/vue": "^5.8.3",
+    "@testing-library/vue": "^6.6.1",
     "@types/dateformat": "^3.0.0",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
@@ -92,6 +92,7 @@
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
     "@types/uuid": "^8.3.2",
+    "@vitejs/plugin-vue": "^4.2.3",
     "miragejs": "^0.1.47"
   }
 }
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index f61cefc2765da..c185ca03ba3a5 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -19,9 +19,11 @@
 				<router-view name="sidebar"></router-view>
 			</div>
 			<div id="content" :class="$style.content">
-				<keep-alive include="NodeView" :max="1">
-					<router-view />
-				</keep-alive>
+				<router-view v-slot="{ Component }">
+					<keep-alive include="NodeView" :max="1">
+						<component :is="Component" />
+					</keep-alive>
+				</router-view>
 			</div>
 			<Modals />
 			<Telemetry />
@@ -55,7 +57,7 @@ import {
 } from '@/stores';
 import { useHistoryHelper } from '@/composables/useHistoryHelper';
 import { newVersions } from '@/mixins/newVersions';
-import { useRoute } from 'vue-router/composables';
+import { useRoute } from 'vue-router';
 import { useExternalHooks } from '@/composables';
 
 export default defineComponent({
@@ -73,6 +75,7 @@ export default defineComponent({
 			...useHistoryHelper(useRoute()),
 			...useToast(),
 			externalHooks: useExternalHooks(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...newVersions.setup?.(props),
 		};
 	},
@@ -98,13 +101,18 @@ export default defineComponent({
 	data() {
 		return {
 			postAuthenticateDone: false,
+			settingsInitialized: false,
 			loading: true,
 		};
 	},
 	methods: {
 		async initSettings(): Promise<void> {
+			// The settings should only be initialized once
+			if (this.settingsInitialized) return;
+
 			try {
 				await this.settingsStore.getSettings();
+				this.settingsInitialized = true;
 			} catch (e) {
 				this.showToast({
 					title: this.$locale.baseText('startupError'),
@@ -149,15 +157,14 @@ export default defineComponent({
 
 			this.$telemetry.page(this.$route);
 		},
-		authenticate() {
+		async authenticate() {
 			// redirect to setup page. user should be redirected to this only once
 			if (this.settingsStore.showSetupPage) {
 				if (this.$route.name === VIEWS.SETUP) {
 					return;
 				}
 
-				void this.$router.replace({ name: VIEWS.SETUP });
-				return;
+				return this.$router.replace({ name: VIEWS.SETUP });
 			}
 
 			if (this.canUserAccessCurrentRoute()) {
@@ -170,8 +177,7 @@ export default defineComponent({
 				const redirect =
 					this.$route.query.redirect ||
 					encodeURIComponent(`${window.location.pathname}${window.location.search}`);
-				void this.$router.replace({ name: VIEWS.SIGNIN, query: { redirect } });
-				return;
+				return this.$router.replace({ name: VIEWS.SIGNIN, query: { redirect } });
 			}
 
 			// if cannot access page and is logged in, respect signin redirect
@@ -179,22 +185,23 @@ export default defineComponent({
 				const redirect = decodeURIComponent(this.$route.query.redirect);
 				if (redirect.startsWith('/')) {
 					// protect against phishing
-					void this.$router.replace(redirect);
-					return;
+					return this.$router.replace(redirect);
 				}
 			}
 
 			// if cannot access page and is logged in
-			void this.$router.replace({ name: VIEWS.HOMEPAGE });
+			return this.$router.replace({ name: VIEWS.HOMEPAGE });
 		},
-		redirectIfNecessary() {
+		async redirectIfNecessary() {
 			const redirect =
 				this.$route.meta &&
 				typeof this.$route.meta.getRedirect === 'function' &&
 				this.$route.meta.getRedirect();
+
 			if (redirect) {
-				void this.$router.replace(redirect);
+				return this.$router.replace(redirect);
 			}
+			return;
 		},
 		setTheme() {
 			const theme = window.localStorage.getItem(LOCAL_STORAGE_THEME);
@@ -251,8 +258,8 @@ export default defineComponent({
 		this.setTheme();
 		await this.initialize();
 		this.logHiringBanner();
-		this.authenticate();
-		this.redirectIfNecessary();
+		await this.authenticate();
+		await this.redirectIfNecessary();
 		void this.checkForNewVersions();
 		await this.checkForCloudPlanData();
 		await this.initBanners();
@@ -262,6 +269,7 @@ export default defineComponent({
 
 		this.loading = false;
 
+		this.logHiringBanner();
 		this.trackPage();
 		void this.externalHooks.run('app.mount');
 
@@ -275,9 +283,9 @@ export default defineComponent({
 				void this.postAuthenticate();
 			}
 		},
-		$route(route) {
-			this.authenticate();
-			this.redirectIfNecessary();
+		async $route(route) {
+			await this.initSettings();
+			await this.redirectIfNecessary();
 
 			this.trackPage();
 		},
@@ -317,6 +325,11 @@ export default defineComponent({
 	height: 100%;
 	width: 100%;
 	justify-content: center;
+
+	main {
+		width: 100%;
+		height: 100%;
+	}
 }
 
 .header {
diff --git a/packages/editor-ui/src/__tests__/render.ts b/packages/editor-ui/src/__tests__/render.ts
new file mode 100644
index 0000000000000..dcdf9994477ac
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/render.ts
@@ -0,0 +1,86 @@
+import type { Plugin } from 'vue';
+import { render } from '@testing-library/vue';
+import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
+import { GlobalComponentsPlugin } from '@/plugins/components';
+import { GlobalDirectivesPlugin } from '@/plugins/directives';
+import { FontAwesomePlugin } from '@/plugins/icons';
+import type { Pinia } from 'pinia';
+import { PiniaVuePlugin } from 'pinia';
+import type { Telemetry } from '@/plugins/telemetry';
+import vueJsonPretty from 'vue-json-pretty';
+import { merge } from 'lodash-es';
+import type { TestingPinia } from '@pinia/testing';
+
+export type RenderComponent = Parameters<typeof render>[0];
+export type RenderOptions = Parameters<typeof render>[1] & {
+	pinia?: TestingPinia | Pinia;
+};
+
+const TelemetryPlugin: Plugin<{}> = {
+	install(app) {
+		app.config.globalProperties.$telemetry = {
+			track(event: string, properties?: object) {},
+		} as Telemetry;
+	},
+};
+
+const defaultOptions = {
+	global: {
+		stubs: {
+			'router-link': true,
+			'vue-json-pretty': vueJsonPretty,
+		},
+		plugins: [
+			I18nPlugin,
+			i18nInstance,
+			PiniaVuePlugin,
+			FontAwesomePlugin,
+			GlobalComponentsPlugin,
+			GlobalDirectivesPlugin,
+			TelemetryPlugin,
+		],
+	},
+};
+
+export function renderComponent(component: RenderComponent, options: RenderOptions = {}) {
+	const { pinia, ...renderOptions } = options;
+
+	return render(component, {
+		...defaultOptions,
+		...renderOptions,
+		global: {
+			...defaultOptions.global,
+			...renderOptions.global,
+			stubs: { ...defaultOptions.global.stubs, ...(renderOptions.global?.stubs ?? {}) },
+			plugins: [
+				...defaultOptions.global.plugins,
+				...(renderOptions.global?.plugins ?? []),
+				...(pinia ? [pinia] : []),
+			],
+		},
+	});
+}
+
+export function createComponentRenderer(
+	component: RenderComponent,
+	defaultOptions: RenderOptions = {},
+) {
+	return (options: RenderOptions = {}, rendererOptions: { merge?: boolean } = {}) =>
+		renderComponent(
+			component,
+			rendererOptions.merge
+				? merge(defaultOptions, options)
+				: {
+						...defaultOptions,
+						...options,
+						props: {
+							...defaultOptions.props,
+							...options.props,
+						},
+						global: {
+							...defaultOptions.global,
+							...options.global,
+						},
+				  },
+		);
+}
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/editor-ui/src/__tests__/setup.ts
index 172da286a71d8..d7d7a324c035a 100644
--- a/packages/editor-ui/src/__tests__/setup.ts
+++ b/packages/editor-ui/src/__tests__/setup.ts
@@ -1,29 +1,8 @@
 import '@testing-library/jest-dom';
 import { configure } from '@testing-library/vue';
-import Vue from 'vue';
-import '../plugins';
-import { I18nPlugin } from '@/plugins/i18n';
-import { config } from '@vue/test-utils';
-import { GlobalComponentsPlugin } from '@/plugins/components';
-import { GlobalDirectivesPlugin } from '@/plugins/directives';
-import { FontAwesomePlugin } from '@/plugins/icons';
 
 configure({ testIdAttribute: 'data-test-id' });
 
-Vue.config.productionTip = false;
-Vue.config.devtools = false;
-
-Vue.use(I18nPlugin);
-Vue.use(FontAwesomePlugin);
-Vue.use(GlobalComponentsPlugin);
-Vue.use(GlobalDirectivesPlugin);
-
-// TODO: Investigate why this is needed
-// Without having this 3rd party library imported like this, any component test using 'vue-json-pretty' fail with:
-// [Vue warn]: Failed to mount component: template or render function not defined.
-// Vue.component('vue-json-pretty', require('vue-json-pretty').default);
-config.stubs['vue-json-pretty'] = require('vue-json-pretty').default;
-
 window.ResizeObserver =
 	window.ResizeObserver ||
 	vi.fn().mockImplementation(() => ({
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
index 24d7cd9d603ff..47f5a0dd00470 100644
--- a/packages/editor-ui/src/__tests__/utils.ts
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -1,7 +1,5 @@
 import type { ISettingsState } from '@/Interface';
 import { UserManagementAuthenticationMethod } from '@/Interface';
-import { render } from '@testing-library/vue';
-import { PiniaVuePlugin } from 'pinia';
 
 export const retry = async (assertion: () => any, { interval = 20, timeout = 1000 } = {}) => {
 	return new Promise((resolve, reject) => {
@@ -21,12 +19,6 @@ export const retry = async (assertion: () => any, { interval = 20, timeout = 100
 	});
 };
 
-type RenderParams = Parameters<typeof render>;
-export const renderComponent = (Component: RenderParams[0], renderOptions: RenderParams[1] = {}) =>
-	render(Component, renderOptions, (vue) => {
-		vue.use(PiniaVuePlugin);
-	});
-
 export const waitAllPromises = async () => new Promise((resolve) => setTimeout(resolve));
 
 export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue
index 23ee51b71e226..2be4c4faa69dc 100644
--- a/packages/editor-ui/src/components/AboutModal.vue
+++ b/packages/editor-ui/src/components/AboutModal.vue
@@ -1,6 +1,6 @@
 <template>
 	<Modal
-		width="540px"
+		max-width="540px"
 		:title="$locale.baseText('about.aboutN8n')"
 		:eventBus="modalBus"
 		:name="ABOUT_MODAL_KEY"
@@ -56,7 +56,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import Modal from './Modal.vue';
 import { ABOUT_MODAL_KEY } from '../constants';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/editor-ui/src/components/ActivationModal.vue
index 9b97787ad879a..6b2e7274bcb73 100644
--- a/packages/editor-ui/src/components/ActivationModal.vue
+++ b/packages/editor-ui/src/components/ActivationModal.vue
@@ -25,7 +25,7 @@
 
 		<template #footer="{ close }">
 			<div :class="$style.footer">
-				<el-checkbox :value="checked" @change="handleCheckboxChange">{{
+				<el-checkbox :modelValue="checked" @update:modelValue="handleCheckboxChange">{{
 					$locale.baseText('generic.dontShowAgain')
 				}}</el-checkbox>
 				<n8n-button @click="close" :label="$locale.baseText('activationModal.gotIt')" />
@@ -37,7 +37,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 import Modal from '@/components/Modal.vue';
 import {
diff --git a/packages/editor-ui/src/components/AskAiModal.vue b/packages/editor-ui/src/components/AskAiModal.vue
index 43c2e4b406900..5a606964e462e 100644
--- a/packages/editor-ui/src/components/AskAiModal.vue
+++ b/packages/editor-ui/src/components/AskAiModal.vue
@@ -26,7 +26,7 @@
 import { defineComponent } from 'vue';
 import Modal from './Modal.vue';
 import { ASK_AI_MODAL_KEY, ASK_AI_WAITLIST_URL } from '../constants';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'AskAI',
diff --git a/packages/editor-ui/src/components/Banner.vue b/packages/editor-ui/src/components/Banner.vue
index 8b48fe6883af4..45fd870516b00 100644
--- a/packages/editor-ui/src/components/Banner.vue
+++ b/packages/editor-ui/src/components/Banner.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-tag :type="theme" size="medium" :disable-transitions="true" :class="$style.container">
+	<el-tag :type="theme" :disable-transitions="true" :class="$style.container">
 		<font-awesome-icon
 			:icon="theme === 'success' ? 'check-circle' : 'exclamation-triangle'"
 			:class="theme === 'success' ? $style.icon : $style.dangerIcon"
diff --git a/packages/editor-ui/src/components/BreakpointsObserver.vue b/packages/editor-ui/src/components/BreakpointsObserver.vue
index d3f73167c796a..f2f45af600dd9 100644
--- a/packages/editor-ui/src/components/BreakpointsObserver.vue
+++ b/packages/editor-ui/src/components/BreakpointsObserver.vue
@@ -34,36 +34,36 @@ export default defineComponent({
 	created() {
 		window.addEventListener('resize', this.onResize);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		window.removeEventListener('resize', this.onResize);
 	},
 	methods: {
 		onResize() {
 			void this.callDebounced('onResizeEnd', { debounceTime: 50 });
 		},
-		onResizeEnd() {
-			this.$data.width = window.innerWidth;
-			this.$nextTick(async () => {
-				const bannerHeight = await getBannerRowHeight();
-				useUIStore().updateBannersHeight(bannerHeight);
-			});
+		async onResizeEnd() {
+			this.width = window.innerWidth;
+			await this.$nextTick();
+
+			const bannerHeight = await getBannerRowHeight();
+			useUIStore().updateBannersHeight(bannerHeight);
 		},
 	},
 	computed: {
 		bp(): string {
-			if (this.$data.width < BREAKPOINT_SM) {
+			if (this.width < BREAKPOINT_SM) {
 				return 'XS';
 			}
 
-			if (this.$data.width >= BREAKPOINT_XL) {
+			if (this.width >= BREAKPOINT_XL) {
 				return 'XL';
 			}
 
-			if (this.$data.width >= BREAKPOINT_LG) {
+			if (this.width >= BREAKPOINT_LG) {
 				return 'LG';
 			}
 
-			if (this.$data.width >= BREAKPOINT_MD) {
+			if (this.width >= BREAKPOINT_MD) {
 				return 'MD';
 			}
 
@@ -71,19 +71,19 @@ export default defineComponent({
 		},
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		value(): any | undefined {
-			if (this.valueXS !== undefined && this.$data.width < BREAKPOINT_SM) {
+			if (this.valueXS !== undefined && this.width < BREAKPOINT_SM) {
 				return this.valueXS;
 			}
 
-			if (this.valueXL !== undefined && this.$data.width >= BREAKPOINT_XL) {
+			if (this.valueXL !== undefined && this.width >= BREAKPOINT_XL) {
 				return this.valueXL;
 			}
 
-			if (this.valueLG !== undefined && this.$data.width >= BREAKPOINT_LG) {
+			if (this.valueLG !== undefined && this.width >= BREAKPOINT_LG) {
 				return this.valueLG;
 			}
 
-			if (this.valueMD !== undefined && this.$data.width >= BREAKPOINT_MD) {
+			if (this.valueMD !== undefined && this.width >= BREAKPOINT_MD) {
 				return this.valueMD;
 			}
 
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index b091117d5909d..9337bb4b0577a 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -12,7 +12,7 @@
 				:inputs="config"
 				:eventBus="formBus"
 				:columnView="true"
-				@input="onInput"
+				@update="onInput"
 				@submit="onSubmit"
 			/>
 		</template>
@@ -37,7 +37,7 @@ import type { IFormInputs } from '@/Interface';
 import { CHANGE_PASSWORD_MODAL_KEY } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'ChangePasswordModal',
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index fb27f721c7716..efc2ad12e6fe2 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -76,7 +76,7 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-		value: {
+		modelValue: {
 			type: String,
 		},
 	},
@@ -282,15 +282,15 @@ export default defineComponent({
 			} catch {}
 		},
 	},
-	destroyed() {
+	beforeUnmount() {
 		if (!this.isReadOnly) codeNodeEditorEventBus.off('error-line-number', this.highlightLine);
 	},
 	mounted() {
 		if (!this.isReadOnly) codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
 
 		// empty on first load, default param value
-		if (!this.value) {
-			this.$emit('valueChanged', this.placeholder);
+		if (!this.modelValue) {
+			this.$emit('update:modelValue', this.placeholder);
 		}
 
 		const { isReadOnly, language } = this;
@@ -322,7 +322,7 @@ export default defineComponent({
 
 					this.trackCompletion(viewUpdate);
 
-					this.$emit('valueChanged', this.editor?.state.doc.toString());
+					this.$emit('update:modelValue', this.editor?.state.doc.toString());
 				}),
 			);
 		}
@@ -331,7 +331,7 @@ export default defineComponent({
 		extensions.push(this.languageCompartment.of(languageSupport), ...otherExtensions);
 
 		const state = EditorState.create({
-			doc: this.value || this.placeholder,
+			doc: this.modelValue || this.placeholder,
 			extensions,
 		});
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts b/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
index e8b70fc30f1c0..dfcb2b6f14352 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
@@ -1,4 +1,4 @@
-import Vue, { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 import { autocompletion } from '@codemirror/autocomplete';
 import { localCompletionSource } from '@codemirror/lang-javascript';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
@@ -16,11 +16,8 @@ import { itemFieldCompletions } from './completions/itemField.completions';
 import { jsonFieldCompletions } from './completions/jsonField.completions';
 import { variablesCompletions } from './completions/variables.completions';
 
-import type { CodeNodeEditorMixin } from './types';
-
 export const completerExtension = defineComponent({
 	mixins: [
-		Vue as CodeNodeEditorMixin,
 		baseCompletions,
 		requireCompletions,
 		executionCompletions,
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
index 1c39721687a2a..be79c9eb6ee8b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION } from '../constants';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { INodeUi } from '@/Interface';
-import type { CodeNodeEditorMixin } from '../types';
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 
@@ -13,7 +12,7 @@ function getAutoCompletableNodeNames(nodes: INodeUi[]) {
 		.map((node: INodeUi) => node.name);
 }
 
-export const baseCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const baseCompletions = defineComponent({
 	computed: {
 		...mapStores(useWorkflowsStore),
 	},
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
index 558e32196097b..b2a1ec499535d 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { addVarType, escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 
-export const executionCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const executionCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$execution.` to `.id .mode .resumeUrl`
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
index c52d520b6ab83..728a3ba03b5ea 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { addVarType, escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 
-export const itemFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const itemFieldCompletions = defineComponent({
 	methods: {
 		/**
 		 * - Complete `x.first().` to `.json .binary`
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
index a108e88b67e79..e31942a75b6b8 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
 import { escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
+import { defineComponent } from 'vue';
 
-export const itemIndexCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const itemIndexCompletions = defineComponent({
 	methods: {
 		/**
 		 * - Complete `$input.` to `.first() .last() .all() .itemMatching()` in all-items mode.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
index 5bb2fbeeea24c..c8b07b8015eb3 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -1,14 +1,13 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { escape, toVariableOption } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { IDataObject, IPinData, IRunData } from 'n8n-workflow';
-import type { CodeNodeEditorMixin } from '../types';
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { isAllowedInDotNotation } from '@/plugins/codemirror/completions/utils';
 
-export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const jsonFieldCompletions = defineComponent({
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 	},
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
index 20c4005a785f4..920a6234b5f7f 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
@@ -1,9 +1,8 @@
-import Vue from 'vue';
 import { escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
+import { defineComponent } from 'vue';
 
-export const luxonCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const luxonCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$today.` with luxon `DateTime` instance methods.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/package.json b/packages/editor-ui/src/components/CodeNodeEditor/completions/package.json
new file mode 100644
index 0000000000000..bb1b4118f790e
--- /dev/null
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "completions",
+  "version": "1.0.0",
+  "dependencies": {
+  }
+}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
index 2fa177862e078..6ae4e2e8f9dec 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
@@ -1,13 +1,12 @@
-import Vue from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
+import { defineComponent } from 'vue';
 
 const DEFAULT_MATCHER = '$prevNode';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const prevNodeCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const prevNodeCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$prevNode.` to `.name .outputIndex .runIndex`.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
index e4c2bb41bba70..c183a739fc3fb 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
@@ -1,10 +1,9 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { AUTOCOMPLETABLE_BUILT_IN_MODULES_JS } from '../constants';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 import { useSettingsStore } from '@/stores/settings.store';
 
-export const requireCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const requireCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `req`	to `require('moduleName')` based on modules available in context.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
index dc60e9d96359d..c7a6983b6ed17 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
@@ -1,12 +1,11 @@
-import Vue from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 import { useEnvironmentsStore } from '@/stores';
+import { defineComponent } from 'vue';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const variablesCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const variablesCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$workflow.` to `.id .name .active`.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
index fc6c6099f3a8f..c367fb8c3cf4e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
@@ -1,11 +1,10 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { CodeNodeEditorMixin } from '../types';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
-export const workflowCompletions = (Vue as CodeNodeEditorMixin).extend({
+export const workflowCompletions = defineComponent({
 	methods: {
 		/**
 		 * Complete `$workflow.` to `.id .name .active`.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index d7fed97dbe5c0..68ca950d1c267 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import type { Diagnostic } from '@codemirror/lint';
 import { linter as createLinter } from '@codemirror/lint';
 import { jsonParseLinter } from '@codemirror/lang-json';
@@ -10,9 +10,9 @@ import type { CodeNodeEditorLanguage } from 'n8n-workflow';
 import { DEFAULT_LINTER_DELAY_IN_MS, DEFAULT_LINTER_SEVERITY } from './constants';
 import { OFFSET_FOR_SCRIPT_WRAPPER } from './constants';
 import { walk } from './utils';
-import type { CodeNodeEditorMixin, RangeNode } from './types';
+import type { RangeNode } from './types';
 
-export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
+export const linterExtension = defineComponent({
 	methods: {
 		createLinter(language: CodeNodeEditorLanguage) {
 			switch (language) {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/types.ts b/packages/editor-ui/src/components/CodeNodeEditor/types.ts
index f4a0e634f32f1..61f0871794dad 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/types.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/types.ts
@@ -2,9 +2,10 @@ import type { EditorView } from '@codemirror/view';
 import type { I18nClass } from '@/plugins/i18n';
 import type { Workflow, CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import type { Node } from 'estree';
+import type { DefineComponent } from 'vue';
 
-export type CodeNodeEditorMixin = Vue.VueConstructor<
-	Vue & {
+export type CodeNodeEditorMixin = InstanceType<
+	DefineComponent & {
 		$locale: I18nClass;
 		editor: EditorView | null;
 		mode: CodeExecutionMode;
diff --git a/packages/editor-ui/src/components/CollectionCard.vue b/packages/editor-ui/src/components/CollectionCard.vue
index 2a0a62fa5184c..97fc3c450c3b7 100644
--- a/packages/editor-ui/src/components/CollectionCard.vue
+++ b/packages/editor-ui/src/components/CollectionCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<Card :loading="loading" :title="collection.name" @click="onClick">
+	<Card :loading="loading" :title="collection.name">
 		<template #footer>
 			<n8n-text size="small" color="text-light">
 				{{ collection.workflows.length }}
@@ -31,11 +31,6 @@ export default defineComponent({
 		Card,
 		NodeList,
 	},
-	methods: {
-		onClick(e: MouseEvent) {
-			this.$emit('click', e);
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/editor-ui/src/components/CollectionParameter.vue
index 2c743b23cf5ef..f3e55bb0c8fd6 100644
--- a/packages/editor-ui/src/components/CollectionParameter.vue
+++ b/packages/editor-ui/src/components/CollectionParameter.vue
@@ -5,15 +5,17 @@
 				<n8n-text size="small">{{ $locale.baseText('collectionParameter.noProperties') }}</n8n-text>
 			</div>
 
-			<parameter-input-list
-				:parameters="getProperties"
-				:nodeValues="nodeValues"
-				:path="path"
-				:hideDelete="hideDelete"
-				:indent="true"
-				:isReadOnly="isReadOnly"
-				@valueChanged="valueChanged"
-			/>
+			<Suspense>
+				<parameter-input-list
+					:parameters="getProperties"
+					:nodeValues="nodeValues"
+					:path="path"
+					:hideDelete="hideDelete"
+					:indent="true"
+					:isReadOnly="isReadOnly"
+					@valueChanged="valueChanged"
+				/>
+			</Suspense>
 
 			<div v-if="parameterOptions.length > 0 && !isReadOnly" class="param-options">
 				<n8n-button
@@ -28,7 +30,7 @@
 						v-model="selectedOption"
 						:placeholder="getPlaceholderText"
 						size="small"
-						@change="optionSelected"
+						@update:modelValue="optionSelected"
 						filterable
 					>
 						<n8n-option
@@ -46,8 +48,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import type { Component } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 
@@ -60,6 +61,8 @@ import { get } from 'lodash-es';
 
 import { useNDVStore } from '@/stores/ndv.store';
 
+const ParameterInputList = defineAsyncComponent(async () => import('./ParameterInputList.vue'));
+
 export default defineComponent({
 	name: 'CollectionParameter',
 	mixins: [nodeHelpers],
@@ -72,7 +75,7 @@ export default defineComponent({
 		'isReadOnly', // boolean
 	],
 	components: {
-		ParameterInputList: async () => import('./ParameterInputList.vue') as Promise<Component>,
+		ParameterInputList,
 	},
 	data() {
 		return {
diff --git a/packages/editor-ui/src/components/CollectionWorkflowCard.vue b/packages/editor-ui/src/components/CollectionWorkflowCard.vue
index 630d638873a80..b7775bc973f4c 100644
--- a/packages/editor-ui/src/components/CollectionWorkflowCard.vue
+++ b/packages/editor-ui/src/components/CollectionWorkflowCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<n8n-card :class="$style.card" v-on="$listeners">
+	<n8n-card :class="$style.card" v-bind="$attrs">
 		<template #header v-if="!loading">
 			<span v-text="title" :class="$style.title" />
 		</template>
diff --git a/packages/editor-ui/src/components/CollectionsCarousel.vue b/packages/editor-ui/src/components/CollectionsCarousel.vue
index 5d3ffab753add..b5355f9aa541b 100644
--- a/packages/editor-ui/src/components/CollectionsCarousel.vue
+++ b/packages/editor-ui/src/components/CollectionsCarousel.vue
@@ -98,20 +98,19 @@ export default defineComponent({
 			}
 		},
 	},
-	mounted() {
-		this.$nextTick(() => {
-			const sliderRef = this.$refs.slider as SliderRef | undefined;
-			if (!sliderRef) {
-				return;
-			}
+	async mounted() {
+		await this.$nextTick();
+		const sliderRef = this.$refs.slider as SliderRef | undefined;
+		if (!sliderRef) {
+			return;
+		}
 
-			this.listElement = sliderRef.$el.querySelector('.agile__list');
-			if (this.listElement) {
-				this.listElement.addEventListener('scroll', this.updateCarouselScroll);
-			}
-		});
+		this.listElement = sliderRef.$el.querySelector('.agile__list');
+		if (this.listElement) {
+			this.listElement.addEventListener('scroll', this.updateCarouselScroll);
+		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		const sliderRef = this.$refs.slider as SliderRef | undefined;
 		if (sliderRef) {
 			sliderRef.destroy();
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
index 1d91847dfbfcf..66bf8470c0fed 100644
--- a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
@@ -14,6 +14,7 @@
 					<n8n-text>
 						{{ $locale.baseText('settings.communityNodes.installModal.description') }}
 					</n8n-text>
+					{{ ' ' }}
 					<n8n-link :to="COMMUNITY_NODES_INSTALLATION_DOCS_URL" @click="onMoreInfoTopClick">
 						{{ $locale.baseText('_reusableDynamicText.moreInfo') }}
 					</n8n-link>
@@ -59,7 +60,7 @@
 					v-model="userAgreed"
 					:class="[$style.checkbox, checkboxWarning ? $style.error : '', 'mt-l']"
 					:disabled="loading"
-					@change="onCheckboxChecked"
+					@update:modelValue="onCheckboxChecked"
 				>
 					<n8n-text>
 						{{ $locale.baseText('settings.communityNodes.installModal.checkbox.label') }} </n8n-text
@@ -90,7 +91,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import Modal from '@/components/Modal.vue';
 import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
index 6c4b588846cbc..f6d11065d728b 100644
--- a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
@@ -15,9 +15,7 @@
 				v-if="mode === COMMUNITY_PACKAGE_MANAGE_ACTIONS.UPDATE"
 			>
 				<n8n-info-tip theme="info" type="note" :bold="false">
-					<template>
-						<span v-text="getModalContent.description"></span>
-					</template>
+					<span v-text="getModalContent.description"></span>
 				</n8n-info-tip>
 			</div>
 		</template>
@@ -41,7 +39,7 @@ import { COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS }
 import { useToast } from '@/composables';
 import { mapStores } from 'pinia';
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'CommunityPackageManageConfirmModal',
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index 50e744c7c2102..7a8dcc6338b64 100644
--- a/packages/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/editor-ui/src/components/ContactPromptModal.vue
@@ -41,7 +41,7 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import Modal from '@/components/Modal.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import { useToast } from '@/composables';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/editor-ui/src/components/CopyInput.vue
index 71e7b9030734c..88b8d71474039 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -25,6 +25,7 @@
 import { defineComponent } from 'vue';
 import { copyPaste } from '@/mixins/copyPaste';
 import { useToast } from '@/composables';
+import { i18n } from '@/plugins/i18n';
 
 export default defineComponent({
 	mixins: [copyPaste],
@@ -41,13 +42,13 @@ export default defineComponent({
 		copyButtonText: {
 			type: String,
 			default(): string {
-				return this.$locale.baseText('generic.copy');
+				return i18n.baseText('generic.copy');
 			},
 		},
 		toastTitle: {
 			type: String,
 			default(): string {
-				return this.$locale.baseText('generic.copiedToClipboard');
+				return i18n.baseText('generic.copiedToClipboard');
 			},
 		},
 		toastMessage: {
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index 87a8255969687..642a8c8887575 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -24,7 +24,7 @@
 						{{ $locale.baseText('credentials.item.owner') }}
 					</n8n-badge>
 				</enterprise-edition>
-				<n8n-action-toggle :actions="actions" theme="dark" @action="onAction" />
+				<n8n-action-toggle :actions="actions" theme="dark" @action="onAction" @click.stop />
 			</div>
 		</template>
 	</n8n-card>
diff --git a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
index 8a74217fb877f..7c34a3a3223fa 100644
--- a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
@@ -123,7 +123,7 @@ defineExpose({
 				:value="authRelatedFieldsValues[parameter.name] || parameter.default"
 				:path="parameter.name"
 				:displayOptions="false"
-				@valueChanged="valueChanged"
+				@update="valueChanged"
 			/>
 		</div>
 		<div>
@@ -140,7 +140,7 @@ defineExpose({
 			:label="prop.value"
 			:class="$style.authRadioButton"
 			border
-			@change="onAuthTypeChange"
+			@update:modelValue="onAuthTypeChange"
 			>{{ prop.name }}</el-radio
 		>
 	</div>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 71b87c0f00be5..8a75cfeb2b842 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -109,7 +109,7 @@
 			:credentialProperties="credentialProperties"
 			:documentationUrl="documentationUrl"
 			:showValidationWarnings="showValidationWarning"
-			@change="onDataChange"
+			@update="onDataChange"
 		/>
 
 		<OauthButton
@@ -332,7 +332,7 @@ export default defineComponent({
 			return this.credentialsStore.allUsableCredentialsByType[type];
 		},
 		onDataChange(event: { name: string; value: string | number | boolean | Date | null }): void {
-			this.$emit('change', event);
+			this.$emit('update', event);
 		},
 		onDocumentationUrlClick(): void {
 			this.$telemetry.track('User clicked credential modal docs link', {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 658f145ddc388..cbecace0b39c6 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -15,11 +15,11 @@
 						<CredentialIcon :credentialTypeName="defaultCredentialTypeName" />
 					</div>
 					<InlineNameEdit
-						:name="credentialName"
+						:modelValue="credentialName"
 						:subtitle="credentialType ? credentialType.displayName : ''"
 						:readonly="!credentialPermissions.updateName || !credentialType"
 						type="Credential"
-						@input="onNameEdit"
+						@update:modelValue="onNameEdit"
 						data-test-id="credential-name"
 					/>
 				</div>
@@ -28,7 +28,6 @@
 						v-if="currentCredential && credentialPermissions.delete"
 						:title="$locale.baseText('credentialEdit.credentialEdit.delete')"
 						icon="trash"
-						size="medium"
 						type="tertiary"
 						:disabled="isSaving"
 						:loading="isDeleting"
@@ -74,7 +73,7 @@
 						:mode="mode"
 						:selectedCredential="selectedCredential"
 						:showAuthTypeSelector="requiredCredentials"
-						@change="onDataChange"
+						@update="onDataChange"
 						@oauth="oAuthCredentialAuthorize"
 						@retest="retestCredential"
 						@scrollToTop="scrollToTop"
@@ -145,7 +144,7 @@ import FeatureComingSoon from '@/components/FeatureComingSoon.vue';
 import type { IPermissions } from '@/permissions';
 import { getCredentialPermissions } from '@/permissions';
 import type { IMenuItem } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
index bb798284fc343..c23a8dcb3f8d7 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
@@ -16,8 +16,8 @@
 								fallback: node.displayName,
 							})
 						"
-						:value="!!nodeAccess[node.name]"
-						@change="(val) => onNodeAccessChange(node.name, val)"
+						:modelValue="!!nodeAccess[node.name]"
+						@update:modelValue="(val) => onNodeAccessChange(node.name, val)"
 					/>
 					<n8n-text v-else>
 						{{
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
index fd471e5f5735d..a75068d142266 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
@@ -17,7 +17,7 @@
 				:showValidationWarnings="showValidationWarnings"
 				:label="label"
 				eventSource="credentials"
-				@change="valueChanged"
+				@update="valueChanged"
 			/>
 		</form>
 	</div>
@@ -51,7 +51,7 @@ export default defineComponent({
 		valueChanged(parameterData: IUpdateInformation) {
 			const name = parameterData.name.split('.').pop();
 
-			this.$emit('change', {
+			this.$emit('update', {
 				name,
 				value: parameterData.value,
 			});
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 3908d3af1338a..0f912262245d1 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -17,7 +17,7 @@
 						uiStore.contextBasedTranslationKeys.credentials.sharing.unavailable.button,
 					)
 				"
-				@click="goToUpgrade"
+				@click:button="goToUpgrade"
 			/>
 		</div>
 		<div v-else-if="isDefaultUser">
@@ -27,7 +27,7 @@
 					$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.description')
 				"
 				:buttonText="$locale.baseText('credentialEdit.credentialSharing.isDefaultUser.button')"
-				@click="goToUsersSettings"
+				@click:button="goToUsersSettings"
 			/>
 		</div>
 		<div v-else>
@@ -62,7 +62,7 @@
 				:currentUserId="usersStore.currentUser.id"
 				:placeholder="$locale.baseText('credentialEdit.credentialSharing.select.placeholder')"
 				data-test-id="credential-sharing-modal-users-select"
-				@input="onAddSharee"
+				@update:modelValue="onAddSharee"
 			>
 				<template #prefix>
 					<n8n-icon icon="search" />
diff --git a/packages/editor-ui/src/components/CredentialsSelect.vue b/packages/editor-ui/src/components/CredentialsSelect.vue
index 83a1fd9593c2d..4e44770842480 100644
--- a/packages/editor-ui/src/components/CredentialsSelect.vue
+++ b/packages/editor-ui/src/components/CredentialsSelect.vue
@@ -4,14 +4,14 @@
 			<n8n-select
 				:size="inputSize"
 				filterable
-				:value="displayValue"
+				:modelValue="displayValue"
 				:placeholder="
 					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
 				"
 				:title="displayTitle"
 				:disabled="isReadOnly"
 				ref="innerSelect"
-				@change="(value) => $emit('valueChanged', value)"
+				@update:modelValue="(value) => $emit('update:modelValue', value)"
 				@keydown.stop
 				@focus="$emit('setFocus')"
 				@blur="$emit('onBlur')"
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index ef1bc49e378c3..4716125c119b3 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/editor-ui/src/components/CredentialsSelectModal.vue
@@ -24,8 +24,8 @@
 					:placeholder="$locale.baseText('credentialSelectModal.searchForApp')"
 					size="xlarge"
 					ref="select"
-					:value="selected"
-					@change="onSelect"
+					:modelValue="selected"
+					@update:modelValue="onSelect"
 					data-test-id="new-credential-type-select"
 				>
 					<template #prefix>
@@ -66,7 +66,7 @@ import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'CredentialsSelectModal',
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 5cd816e21e979..8412e61f86c44 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -20,7 +20,11 @@
 							$locale.baseText('settings.users.confirmDataHandlingAfterDeletion')
 						}}</n8n-text>
 					</div>
-					<el-radio :value="operation" label="transfer" @change="() => setOperation('transfer')">
+					<el-radio
+						:modelValue="operation"
+						label="transfer"
+						@update:modelValue="() => setOperation('transfer')"
+					>
 						<n8n-text color="text-dark">{{
 							$locale.baseText('settings.users.transferWorkflowsAndCredentials')
 						}}</n8n-text>
@@ -29,14 +33,18 @@
 						<n8n-input-label :label="$locale.baseText('settings.users.userToTransferTo')">
 							<n8n-user-select
 								:users="usersStore.allUsers"
-								:value="transferId"
+								:modelValue="transferId"
 								:ignoreIds="ignoreIds"
 								:currentUserId="usersStore.currentUserId"
-								@input="setTransferId"
+								@update:modelValue="setTransferId"
 							/>
 						</n8n-input-label>
 					</div>
-					<el-radio :value="operation" label="delete" @change="() => setOperation('delete')">
+					<el-radio
+						:modelValue="operation"
+						label="delete"
+						@update:modelValue="() => setOperation('delete')"
+					>
 						<n8n-text color="text-dark">{{
 							$locale.baseText('settings.users.deleteWorkflowsAndCredentials')
 						}}</n8n-text>
@@ -48,9 +56,9 @@
 					>
 						<n8n-input-label :label="$locale.baseText('settings.users.deleteConfirmationMessage')">
 							<n8n-input
-								:value="deleteConfirmText"
+								:modelValue="deleteConfirmText"
 								:placeholder="$locale.baseText('settings.users.deleteConfirmationText')"
-								@input="setConfirmText"
+								@update:modelValue="setConfirmText"
 							/>
 						</n8n-input-label>
 					</div>
@@ -76,7 +84,7 @@ import Modal from '@/components/Modal.vue';
 import type { IUser } from '@/Interface';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'DeleteUserModal',
diff --git a/packages/editor-ui/src/components/Draggable.vue b/packages/editor-ui/src/components/Draggable.vue
index d47467e0fc13c..c9a67b3a4425b 100644
--- a/packages/editor-ui/src/components/Draggable.vue
+++ b/packages/editor-ui/src/components/Draggable.vue
@@ -21,14 +21,8 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
 
-// @ts-ignore
-import Teleport from 'vue2-teleport';
-
 export default defineComponent({
 	name: 'draggable',
-	components: {
-		Teleport,
-	},
 	props: {
 		disabled: {
 			type: Boolean,
diff --git a/packages/editor-ui/src/components/DraggableTarget.vue b/packages/editor-ui/src/components/DraggableTarget.vue
index 224107b4924c8..3418f604398ba 100644
--- a/packages/editor-ui/src/components/DraggableTarget.vue
+++ b/packages/editor-ui/src/components/DraggableTarget.vue
@@ -35,7 +35,7 @@ export default defineComponent({
 		window.addEventListener('mousemove', this.onMouseMove);
 		window.addEventListener('mouseup', this.onMouseUp);
 	},
-	destroyed() {
+	beforeUnmount() {
 		window.removeEventListener('mousemove', this.onMouseMove);
 		window.removeEventListener('mouseup', this.onMouseUp);
 	},
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index 3b605252200d5..62e78ed347a16 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -17,12 +17,11 @@
 				/>
 				<TagsDropdown
 					v-if="settingsStore.areTagsEnabled"
+					v-model="currentTagIds"
 					:createEnabled="true"
-					:currentTagIds="currentTagIds"
 					:eventBus="dropdownBus"
 					@blur="onTagsBlur"
 					@esc="onTagsEsc"
-					@update="onTagsUpdate"
 					:placeholder="$locale.baseText('duplicateWorkflowDialog.chooseOrCreateATag')"
 					ref="dropdown"
 				/>
@@ -62,7 +61,7 @@ import type { IWorkflowDataUpdate } from '@/Interface';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import { useUsersStore } from '@/stores/users.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import { useCredentialsStore } from '@/stores';
 
 export default defineComponent({
@@ -90,7 +89,8 @@ export default defineComponent({
 	},
 	async mounted() {
 		this.name = await this.workflowsStore.getDuplicateCurrentWorkflowName(this.data.name);
-		this.$nextTick(() => this.focusOnNameInput());
+		await this.$nextTick();
+		this.focusOnNameInput();
 	},
 	computed: {
 		...mapStores(useCredentialsStore, useUsersStore, useSettingsStore, useWorkflowsStore),
@@ -133,9 +133,6 @@ export default defineComponent({
 			// revert last changes
 			this.currentTagIds = this.prevTagIds;
 		},
-		onTagsUpdate(tagIds: string[]) {
-			this.currentTagIds = tagIds;
-		},
 		async save(): Promise<void> {
 			const name = this.name.trim();
 			if (!name) {
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
index 9f8dd8f641113..874a1e1abdda2 100644
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ b/packages/editor-ui/src/components/ExecutionFilter.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { computed, reactive, onBeforeMount, ref } from 'vue';
 import debounce from 'lodash/debounce';
-import type { PopoverPlacement } from 'element-ui/types/popover';
 import type {
 	ExecutionFilterType,
 	ExecutionFilterMetadata,
@@ -15,13 +14,15 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useTelemetry } from '@/composables';
+import type { Placement } from '@floating-ui/core';
 
 export type ExecutionFilterProps = {
 	workflows?: IWorkflowShortResponse[];
-	popoverPlacement?: PopoverPlacement;
+	popoverPlacement?: Placement;
+	teleported?: boolean;
 };
 
-const DATE_TIME_MASK = 'yyyy-MM-dd HH:mm';
+const DATE_TIME_MASK = 'YYYY-MM-DD HH:mm';
 
 const settingsStore = useSettingsStore();
 const usageStore = useUsageStore();
@@ -30,7 +31,8 @@ const uiStore = useUIStore();
 const telemetry = useTelemetry();
 
 const props = withDefaults(defineProps<ExecutionFilterProps>(), {
-	popoverPlacement: 'bottom',
+	popoverPlacement: 'bottom' as Placement,
+	teleported: true,
 });
 const emit = defineEmits<{
 	(event: 'filterChanged', value: ExecutionFilterType): void;
@@ -145,196 +147,187 @@ onBeforeMount(() => {
 });
 </script>
 <template>
-	<div :class="$style.filter">
-		<n8n-popover trigger="click" :placement="popoverPlacement">
-			<template #reference>
-				<n8n-button
-					icon="filter"
-					type="tertiary"
-					size="medium"
-					:active="!!countSelectedFilterProps"
-					data-test-id="executions-filter-button"
+	<n8n-popover trigger="click" :placement="popoverPlacement" width="440">
+		<template #reference>
+			<n8n-button
+				icon="filter"
+				type="tertiary"
+				:active="!!countSelectedFilterProps"
+				data-test-id="executions-filter-button"
+			>
+				<n8n-badge
+					v-if="!!countSelectedFilterProps"
+					theme="primary"
+					class="mr-4xs"
+					data-test-id="execution-filter-badge"
+					>{{ countSelectedFilterProps }}</n8n-badge
 				>
-					<n8n-badge
-						v-if="!!countSelectedFilterProps"
-						theme="primary"
-						class="mr-4xs"
-						data-test-id="execution-filter-badge"
-						>{{ countSelectedFilterProps }}</n8n-badge
-					>
-					{{ locale.baseText('executionsList.filters') }}
-				</n8n-button>
-			</template>
-			<div data-test-id="execution-filter-form">
-				<div v-if="workflows?.length" :class="$style.group">
-					<label for="execution-filter-workflows">{{ locale.baseText('workflows.heading') }}</label>
-					<n8n-select
-						id="execution-filter-workflows"
-						v-model="vModel.workflowId"
-						:placeholder="locale.baseText('executionsFilter.selectWorkflow')"
-						size="medium"
-						filterable
-						data-test-id="executions-filter-workflows-select"
-					>
-						<div>
-							<n8n-option
-								v-for="(item, idx) in props.workflows"
-								:key="idx"
-								:label="item.name"
-								:value="item.id"
-							/>
-						</div>
-					</n8n-select>
-				</div>
-				<div v-if="showTags" :class="$style.group">
-					<label for="execution-filter-tags">{{ locale.baseText('workflows.filters.tags') }}</label>
-					<TagsDropdown
-						id="execution-filter-tags"
-						:placeholder="locale.baseText('workflowOpen.filterWorkflows')"
-						:currentTagIds="filter.tags"
-						:createEnabled="false"
-						@update="onTagsChange"
-						data-test-id="executions-filter-tags-select"
-					/>
-				</div>
-				<div :class="$style.group">
-					<label for="execution-filter-status">{{
-						locale.baseText('executionsList.status')
-					}}</label>
-					<n8n-select
-						id="execution-filter-status"
-						v-model="vModel.status"
-						:placeholder="locale.baseText('executionsFilter.selectStatus')"
-						size="medium"
-						filterable
-						data-test-id="executions-filter-status-select"
-					>
+				{{ locale.baseText('executionsList.filters') }}
+			</n8n-button>
+		</template>
+		<div data-test-id="execution-filter-form">
+			<div v-if="workflows && workflows.length > 0" :class="$style.group">
+				<label for="execution-filter-workflows">{{ locale.baseText('workflows.heading') }}</label>
+				<n8n-select
+					id="execution-filter-workflows"
+					v-model="vModel.workflowId"
+					:placeholder="locale.baseText('executionsFilter.selectWorkflow')"
+					filterable
+					data-test-id="executions-filter-workflows-select"
+					:teleported="teleported"
+				>
+					<div>
 						<n8n-option
-							v-for="(item, idx) in statuses"
+							v-for="(item, idx) in props.workflows"
 							:key="idx"
 							:label="item.name"
 							:value="item.id"
 						/>
-					</n8n-select>
-				</div>
-				<div :class="$style.group">
-					<label for="execution-filter-start-date">{{
-						locale.baseText('executionsFilter.start')
-					}}</label>
-					<div :class="$style.dates">
-						<el-date-picker
-							id="execution-filter-start-date"
-							type="datetime"
-							v-model="vModel.startDate"
-							:format="DATE_TIME_MASK"
-							:placeholder="locale.baseText('executionsFilter.startDate')"
-							data-test-id="executions-filter-start-date-picker"
-						/>
-						<span :class="$style.divider">to</span>
-						<el-date-picker
-							id="execution-filter-end-date"
-							type="datetime"
-							v-model="vModel.endDate"
-							:format="DATE_TIME_MASK"
-							:placeholder="locale.baseText('executionsFilter.endDate')"
-							data-test-id="executions-filter-end-date-picker"
-						/>
 					</div>
+				</n8n-select>
+			</div>
+			<div v-if="showTags" :class="$style.group">
+				<label for="execution-filter-tags">{{ locale.baseText('workflows.filters.tags') }}</label>
+				<TagsDropdown
+					id="execution-filter-tags"
+					:placeholder="locale.baseText('workflowOpen.filterWorkflows')"
+					:modelValue="filter.tags"
+					:createEnabled="false"
+					@update:modelValue="onTagsChange"
+					data-test-id="executions-filter-tags-select"
+				/>
+			</div>
+			<div :class="$style.group">
+				<label for="execution-filter-status">{{ locale.baseText('executionsList.status') }}</label>
+				<n8n-select
+					id="execution-filter-status"
+					v-model="vModel.status"
+					:placeholder="locale.baseText('executionsFilter.selectStatus')"
+					filterable
+					data-test-id="executions-filter-status-select"
+					:teleported="teleported"
+				>
+					<n8n-option
+						v-for="(item, idx) in statuses"
+						:key="idx"
+						:label="item.name"
+						:value="item.id"
+					/>
+				</n8n-select>
+			</div>
+			<div :class="$style.group">
+				<label for="execution-filter-start-date">{{
+					locale.baseText('executionsFilter.start')
+				}}</label>
+				<div :class="$style.dates">
+					<el-date-picker
+						id="execution-filter-start-date"
+						type="datetime"
+						:teleported="false"
+						v-model="vModel.startDate"
+						:format="DATE_TIME_MASK"
+						:placeholder="locale.baseText('executionsFilter.startDate')"
+						data-test-id="executions-filter-start-date-picker"
+					/>
+					<span :class="$style.divider">to</span>
+					<el-date-picker
+						id="execution-filter-end-date"
+						type="datetime"
+						:teleported="false"
+						v-model="vModel.endDate"
+						:format="DATE_TIME_MASK"
+						:placeholder="locale.baseText('executionsFilter.endDate')"
+						data-test-id="executions-filter-end-date-picker"
+					/>
 				</div>
-				<div :class="$style.group">
-					<n8n-tooltip placement="right">
+			</div>
+			<div :class="$style.group">
+				<n8n-tooltip placement="right">
+					<template #content>
+						<i18n-t tag="span" keypath="executionsFilter.customData.docsTooltip">
+							<template #link>
+								<a
+									target="_blank"
+									href="https://docs.n8n.io/workflows/executions/custom-executions-data/"
+								>
+									{{ locale.baseText('executionsFilter.customData.docsTooltip.link') }}
+								</a>
+							</template>
+						</i18n-t>
+					</template>
+					<span :class="$style.label">
+						{{ locale.baseText('executionsFilter.savedData') }}
+						<n8n-icon :class="$style.tooltipIcon" icon="question-circle" size="small" />
+					</span>
+				</n8n-tooltip>
+				<div :class="$style.subGroup">
+					<label for="execution-filter-saved-data-key">{{
+						locale.baseText('executionsFilter.savedDataKey')
+					}}</label>
+					<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
 						<template #content>
-							<i18n tag="span" path="executionsFilter.customData.docsTooltip">
+							<i18n-t tag="span" keypath="executionsFilter.customData.inputTooltip">
 								<template #link>
 									<a
-										target="_blank"
-										href="https://docs.n8n.io/workflows/executions/custom-executions-data/"
+										href="#"
+										@click.prevent="goToUpgrade"
+										data-test-id="executions-filter-view-plans-link"
+										>{{ locale.baseText('executionsFilter.customData.inputTooltip.link') }}</a
 									>
-										{{ locale.baseText('executionsFilter.customData.docsTooltip.link') }}
-									</a>
 								</template>
-							</i18n>
+							</i18n-t>
 						</template>
-						<span :class="$style.label">
-							{{ locale.baseText('executionsFilter.savedData') }}
-							<n8n-icon :class="$style.tooltipIcon" icon="question-circle" size="small" />
-						</span>
+						<n8n-input
+							id="execution-filter-saved-data-key"
+							name="execution-filter-saved-data-key"
+							type="text"
+							:disabled="!isAdvancedExecutionFilterEnabled"
+							:placeholder="locale.baseText('executionsFilter.savedDataKeyPlaceholder')"
+							:modelValue="filter.metadata[0]?.key"
+							@update:modelValue="onFilterMetaChange(0, 'key', $event)"
+							data-test-id="execution-filter-saved-data-key-input"
+						/>
+					</n8n-tooltip>
+					<label for="execution-filter-saved-data-value">{{
+						locale.baseText('executionsFilter.savedDataValue')
+					}}</label>
+					<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
+						<template #content>
+							<i18n-t tag="span" keypath="executionsFilter.customData.inputTooltip">
+								<template #link>
+									<a href="#" @click.prevent="goToUpgrade">{{
+										locale.baseText('executionsFilter.customData.inputTooltip.link')
+									}}</a>
+								</template>
+							</i18n-t>
+						</template>
+						<n8n-input
+							id="execution-filter-saved-data-value"
+							name="execution-filter-saved-data-value"
+							type="text"
+							:disabled="!isAdvancedExecutionFilterEnabled"
+							:placeholder="locale.baseText('executionsFilter.savedDataValuePlaceholder')"
+							:modelValue="filter.metadata[0]?.value"
+							@update:modelValue="onFilterMetaChange(0, 'value', $event)"
+							data-test-id="execution-filter-saved-data-value-input"
+						/>
 					</n8n-tooltip>
-					<div :class="$style.subGroup">
-						<label for="execution-filter-saved-data-key">{{
-							locale.baseText('executionsFilter.savedDataKey')
-						}}</label>
-						<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
-							<template #content>
-								<i18n tag="span" path="executionsFilter.customData.inputTooltip">
-									<template #link>
-										<a
-											href="#"
-											@click.prevent="goToUpgrade"
-											data-test-id="executions-filter-view-plans-link"
-											>{{ locale.baseText('executionsFilter.customData.inputTooltip.link') }}</a
-										>
-									</template>
-								</i18n>
-							</template>
-							<n8n-input
-								id="execution-filter-saved-data-key"
-								name="execution-filter-saved-data-key"
-								type="text"
-								size="medium"
-								:disabled="!isAdvancedExecutionFilterEnabled"
-								:placeholder="locale.baseText('executionsFilter.savedDataKeyPlaceholder')"
-								:value="filter.metadata[0]?.key"
-								@input="onFilterMetaChange(0, 'key', $event)"
-								data-test-id="execution-filter-saved-data-key-input"
-							/>
-						</n8n-tooltip>
-						<label for="execution-filter-saved-data-value">{{
-							locale.baseText('executionsFilter.savedDataValue')
-						}}</label>
-						<n8n-tooltip :disabled="isAdvancedExecutionFilterEnabled" placement="top">
-							<template #content>
-								<i18n tag="span" path="executionsFilter.customData.inputTooltip">
-									<template #link>
-										<a href="#" @click.prevent="goToUpgrade">{{
-											locale.baseText('executionsFilter.customData.inputTooltip.link')
-										}}</a>
-									</template>
-								</i18n>
-							</template>
-							<n8n-input
-								id="execution-filter-saved-data-value"
-								name="execution-filter-saved-data-value"
-								type="text"
-								size="medium"
-								:disabled="!isAdvancedExecutionFilterEnabled"
-								:placeholder="locale.baseText('executionsFilter.savedDataValuePlaceholder')"
-								:value="filter.metadata[0]?.value"
-								@input="onFilterMetaChange(0, 'value', $event)"
-								data-test-id="execution-filter-saved-data-value-input"
-							/>
-						</n8n-tooltip>
-					</div>
 				</div>
-				<n8n-button
-					v-if="!!countSelectedFilterProps"
-					:class="$style.resetBtn"
-					@click="onFilterReset"
-					size="large"
-					text
-					data-test-id="executions-filter-reset-button"
-				>
-					{{ locale.baseText('executionsFilter.reset') }}
-				</n8n-button>
 			</div>
-		</n8n-popover>
-	</div>
+			<n8n-button
+				v-if="!!countSelectedFilterProps"
+				:class="$style.resetBtn"
+				@click="onFilterReset"
+				size="large"
+				text
+				data-test-id="executions-filter-reset-button"
+			>
+				{{ locale.baseText('executionsFilter.reset') }}
+			</n8n-button>
+		</div>
+	</n8n-popover>
 </template>
 <style lang="scss" module>
-.filter {
-	display: inline-block;
-}
-
 .group {
 	label,
 	.label {
@@ -400,7 +393,7 @@ onBeforeMount(() => {
 	}
 }
 
-:deep(.el-select-dropdown.el-popper[x-placement^='bottom']) {
+:deep(.el-select-dropdown.el-popper[data-popper-placement^='bottom']) {
 	> .popper__arrow {
 		top: -6px;
 		left: 50%;
diff --git a/packages/editor-ui/src/components/ExecutionTime.vue b/packages/editor-ui/src/components/ExecutionTime.vue
index 729b3566c82ec..012b01365f59e 100644
--- a/packages/editor-ui/src/components/ExecutionTime.vue
+++ b/packages/editor-ui/src/components/ExecutionTime.vue
@@ -33,7 +33,7 @@ export default defineComponent({
 			this.setNow();
 		}, 1000);
 	},
-	destroyed() {
+	beforeUnmount() {
 		// Make sure that the timer gets destroyed once no longer needed
 		if (this.intervalTimer !== null) {
 			clearInterval(this.intervalTimer);
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index ac01067fa3d26..b5271d6ce70fa 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -9,10 +9,10 @@
 						v-else
 						class="mr-xl"
 						v-model="autoRefresh"
-						@change="handleAutoRefreshToggle"
+						@update:modelValue="handleAutoRefreshToggle"
 						data-test-id="execution-auto-refresh-checkbox"
 					>
-						{{ $locale.baseText('executionsList.autoRefresh') }}
+						{{ i18n.baseText('executionsList.autoRefresh') }}
 					</el-checkbox>
 					<execution-filter
 						v-show="!isMounting"
@@ -26,13 +26,13 @@
 				v-if="allVisibleSelected && finishedExecutionsCount > 0"
 				:class="$style.selectAll"
 				:label="
-					$locale.baseText('executionsList.selectAll', {
+					i18n.baseText('executionsList.selectAll', {
 						adjustToNumber: finishedExecutionsCount,
 						interpolate: { executionNum: finishedExecutionsCount },
 					})
 				"
-				:value="allExistingSelected"
-				@change="handleCheckAllExistingChange"
+				:modelValue="allExistingSelected"
+				@update:modelValue="handleCheckAllExistingChange"
 				data-test-id="select-all-executions-checkbox"
 			/>
 
@@ -46,17 +46,17 @@
 					<tr>
 						<th>
 							<el-checkbox
-								:value="allVisibleSelected"
-								@change="handleCheckAllVisibleChange"
+								:modelValue="allVisibleSelected"
+								@update:modelValue="handleCheckAllVisibleChange"
 								:disabled="finishedExecutionsCount < 1"
 								label=""
 								data-test-id="select-visible-executions-checkbox"
 							/>
 						</th>
-						<th>{{ $locale.baseText('executionsList.name') }}</th>
-						<th>{{ $locale.baseText('executionsList.startedAt') }}</th>
-						<th>{{ $locale.baseText('executionsList.status') }}</th>
-						<th>{{ $locale.baseText('executionsList.id') }}</th>
+						<th>{{ i18n.baseText('executionsList.name') }}</th>
+						<th>{{ i18n.baseText('executionsList.startedAt') }}</th>
+						<th>{{ i18n.baseText('executionsList.status') }}</th>
+						<th>{{ i18n.baseText('executionsList.id') }}</th>
 						<th></th>
 						<th></th>
 						<th></th>
@@ -72,8 +72,8 @@
 						<td>
 							<el-checkbox
 								v-if="execution.stoppedAt !== undefined && execution.id"
-								:value="selectedItems[execution.id] || allExistingSelected"
-								@change="handleCheckboxChanged(execution.id)"
+								:modelValue="selectedItems[execution.id] || allExistingSelected"
+								@update:modelValue="handleCheckboxChanged(execution.id)"
 								label=""
 								data-test-id="select-execution-checkbox"
 							/>
@@ -81,7 +81,7 @@
 						<td>
 							<span @click.stop="displayExecution(execution)"
 								><a href="#" :class="$style.link">{{
-									execution.workflowName || $locale.baseText('executionsList.unsavedWorkflow')
+									execution.workflowName || i18n.baseText('executionsList.unsavedWorkflow')
 								}}</a></span
 							>
 						</td>
@@ -93,9 +93,10 @@
 								<span v-if="isRunning(execution)" :class="$style.spinner">
 									<font-awesome-icon icon="spinner" spin />
 								</span>
-								<i18n
+								<i18n-t
 									v-if="!isWaitTillIndefinite(execution)"
-									:path="getStatusTextTranslationPath(execution)"
+									tag="span"
+									:keypath="getStatusTextTranslationPath(execution)"
 								>
 									<template #status>
 										<span :class="$style.status">{{ getStatusText(execution) }}</span>
@@ -115,7 +116,7 @@
 										</span>
 										<execution-time v-else :start-time="execution.startedAt" />
 									</template>
-								</i18n>
+								</i18n-t>
 								<n8n-tooltip v-else placement="top">
 									<template #content>
 										<span>{{ getStatusTooltipText(execution) }}</span>
@@ -129,13 +130,13 @@
 							<span v-if="execution.retryOf">
 								<br />
 								<small>
-									({{ $locale.baseText('executionsList.retryOf') }} #{{ execution.retryOf }})
+									({{ i18n.baseText('executionsList.retryOf') }} #{{ execution.retryOf }})
 								</small>
 							</span>
 							<span v-else-if="execution.retrySuccessId">
 								<br />
 								<small>
-									({{ $locale.baseText('executionsList.successRetry') }} #{{
+									({{ i18n.baseText('executionsList.successRetry') }} #{{
 										execution.retrySuccessId
 									}})
 								</small>
@@ -144,7 +145,7 @@
 						<td>
 							<n8n-tooltip v-if="execution.mode === 'manual'" placement="top">
 								<template #content>
-									<span>{{ $locale.baseText('executionsList.test') }}</span>
+									<span>{{ i18n.baseText('executionsList.test') }}</span>
 								</template>
 								<font-awesome-icon icon="flask" />
 							</n8n-tooltip>
@@ -155,7 +156,7 @@
 									v-if="execution.stoppedAt !== undefined && execution.id"
 									size="small"
 									outline
-									:label="$locale.baseText('executionsList.view')"
+									:label="i18n.baseText('executionsList.view')"
 									@click.stop="displayExecution(execution)"
 								/>
 							</div>
@@ -166,7 +167,7 @@
 									v-if="execution.stoppedAt === undefined || execution.waitTill"
 									size="small"
 									outline
-									:label="$locale.baseText('executionsList.stop')"
+									:label="i18n.baseText('executionsList.stop')"
 									@click.stop="stopExecution(execution.id)"
 									:loading="stoppingExecutions.includes(execution.id)"
 								/>
@@ -183,7 +184,7 @@
 										text
 										type="tertiary"
 										size="mini"
-										:title="$locale.baseText('executionsList.retryExecution')"
+										:title="i18n.baseText('executionsList.retryExecution')"
 										icon="ellipsis-v"
 									/>
 								</span>
@@ -199,20 +200,20 @@
 											:class="$style.retryAction"
 											:command="{ command: 'currentlySaved', execution }"
 										>
-											{{ $locale.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
+											{{ i18n.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
 										</el-dropdown-item>
 										<el-dropdown-item
 											v-if="isExecutionRetriable(execution)"
 											:class="$style.retryAction"
 											:command="{ command: 'original', execution }"
 										>
-											{{ $locale.baseText('executionsList.retryWithOriginalWorkflow') }}
+											{{ i18n.baseText('executionsList.retryWithOriginalWorkflow') }}
 										</el-dropdown-item>
 										<el-dropdown-item
 											:class="$style.deleteAction"
 											:command="{ command: 'delete', execution }"
 										>
-											{{ $locale.baseText('generic.delete') }}
+											{{ i18n.baseText('generic.delete') }}
 										</el-dropdown-item>
 									</el-dropdown-menu>
 								</template>
@@ -227,7 +228,7 @@
 				:class="$style.loadedAll"
 				data-test-id="execution-list-empty"
 			>
-				{{ $locale.baseText('executionsList.empty') }}
+				{{ i18n.baseText('executionsList.empty') }}
 			</div>
 			<div
 				:class="$style.loadMore"
@@ -237,8 +238,8 @@
 			>
 				<n8n-button
 					icon="sync"
-					:title="$locale.baseText('executionsList.loadMore')"
-					:label="$locale.baseText('executionsList.loadMore')"
+					:title="i18n.baseText('executionsList.loadMore')"
+					:label="i18n.baseText('executionsList.loadMore')"
 					@click="loadMore()"
 					:loading="isDataLoading"
 					data-test-id="load-more-button"
@@ -249,7 +250,7 @@
 				:class="$style.loadedAll"
 				data-test-id="execution-all-loaded"
 			>
-				{{ $locale.baseText('executionsList.loadedAll') }}
+				{{ i18n.baseText('executionsList.loadedAll') }}
 			</div>
 		</div>
 		<div
@@ -259,20 +260,20 @@
 		>
 			<span>
 				{{
-					$locale.baseText('executionsList.selected', {
+					i18n.baseText('executionsList.selected', {
 						adjustToNumber: numSelected,
 						interpolate: { numSelected },
 					})
 				}}
 			</span>
 			<n8n-button
-				:label="$locale.baseText('generic.delete')"
+				:label="i18n.baseText('generic.delete')"
 				type="tertiary"
 				@click="handleDeleteSelected"
 				data-test-id="delete-selected-button"
 			/>
 			<n8n-button
-				:label="$locale.baseText('executionsList.clearSelection')"
+				:label="i18n.baseText('executionsList.clearSelection')"
 				type="tertiary"
 				@click="handleClearSelection"
 				data-test-id="clear-selection-button"
@@ -290,7 +291,7 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { MODAL_CONFIRM, VIEWS, WAIT_TIME_UNLIMITED } from '@/constants';
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
-import { useToast, useMessage } from '@/composables';
+import { useToast, useMessage, useI18n, useTelemetry } from '@/composables';
 import type {
 	IExecutionsCurrentSummaryExtended,
 	IExecutionDeleteFilter,
@@ -320,7 +321,12 @@ export default defineComponent({
 		},
 	},
 	setup() {
+		const i18n = useI18n();
+		const telemetry = useTelemetry();
+
 		return {
+			i18n,
+			telemetry,
 			...useToast(),
 			...useMessage(),
 		};
@@ -359,11 +365,11 @@ export default defineComponent({
 		await this.loadWorkflows();
 
 		void this.$externalHooks().run('executionsList.openDialog');
-		this.$telemetry.track('User opened Executions log', {
+		this.telemetry.track('User opened Executions log', {
 			workflow_id: this.workflowsStore.workflowId,
 		});
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.stopAutoRefreshInterval();
 		document.removeEventListener('visibilitychange', this.onDocumentVisibilityChange);
 	},
@@ -405,7 +411,7 @@ export default defineComponent({
 			return executionFilterToQueryFilter(this.filter);
 		},
 		pageTitle() {
-			return this.$locale.baseText('executionsList.workflowExecutions');
+			return this.i18n.baseText('executionsList.workflowExecutions');
 		},
 	},
 	methods: {
@@ -455,16 +461,14 @@ export default defineComponent({
 		},
 		async handleDeleteSelected() {
 			const deleteExecutions = await this.confirm(
-				this.$locale.baseText('executionsList.confirmMessage.message', {
+				this.i18n.baseText('executionsList.confirmMessage.message', {
 					interpolate: { numSelected: this.numSelected.toString() },
 				}),
-				this.$locale.baseText('executionsList.confirmMessage.headline'),
+				this.i18n.baseText('executionsList.confirmMessage.headline'),
 				{
 					type: 'warning',
-					confirmButtonText: this.$locale.baseText(
-						'executionsList.confirmMessage.confirmButtonText',
-					),
-					cancelButtonText: this.$locale.baseText('executionsList.confirmMessage.cancelButtonText'),
+					confirmButtonText: this.i18n.baseText('executionsList.confirmMessage.confirmButtonText'),
+					cancelButtonText: this.i18n.baseText('executionsList.confirmMessage.cancelButtonText'),
 				},
 			);
 
@@ -489,7 +493,7 @@ export default defineComponent({
 				this.isDataLoading = false;
 				this.showError(
 					error,
-					this.$locale.baseText('executionsList.showError.handleDeleteSelected.title'),
+					this.i18n.baseText('executionsList.showError.handleDeleteSelected.title'),
 				);
 
 				return;
@@ -497,7 +501,7 @@ export default defineComponent({
 			this.isDataLoading = false;
 
 			this.showMessage({
-				title: this.$locale.baseText('executionsList.showMessage.handleDeleteSelected.title'),
+				title: this.i18n.baseText('executionsList.showMessage.handleDeleteSelected.title'),
 				type: 'success',
 			});
 
@@ -524,7 +528,7 @@ export default defineComponent({
 
 				await this.retryExecution(commandData.execution, loadWorkflow);
 
-				this.$telemetry.track('User clicked retry execution button', {
+				this.telemetry.track('User clicked retry execution button', {
 					workflow_id: this.workflowsStore.workflowId,
 					execution_id: commandData.execution.id,
 					retry_type: loadWorkflow ? 'current' : 'original',
@@ -690,7 +694,7 @@ export default defineComponent({
 				);
 			} catch (error) {
 				this.isDataLoading = false;
-				this.showError(error, this.$locale.baseText('executionsList.showError.loadMore.title'));
+				this.showError(error, this.i18n.baseText('executionsList.showError.loadMore.title'));
 				return;
 			}
 
@@ -725,15 +729,12 @@ export default defineComponent({
 
 				workflows.unshift({
 					id: 'all',
-					name: this.$locale.baseText('executionsList.allWorkflows'),
+					name: this.i18n.baseText('executionsList.allWorkflows'),
 				} as IWorkflowShortResponse);
 
 				this.workflows = workflows;
 			} catch (error) {
-				this.showError(
-					error,
-					this.$locale.baseText('executionsList.showError.loadWorkflows.title'),
-				);
+				this.showError(error, this.i18n.baseText('executionsList.showError.loadWorkflows.title'));
 			}
 		},
 		async retryExecution(execution: IExecutionsSummary, loadWorkflow?: boolean) {
@@ -747,22 +748,19 @@ export default defineComponent({
 
 				if (retrySuccessful) {
 					this.showMessage({
-						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
+						title: this.i18n.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
 						type: 'success',
 					});
 				} else {
 					this.showMessage({
-						title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
+						title: this.i18n.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
 						type: 'error',
 					});
 				}
 
 				this.isDataLoading = false;
 			} catch (error) {
-				this.showError(
-					error,
-					this.$locale.baseText('executionsList.showError.retryExecution.title'),
-				);
+				this.showError(error, this.i18n.baseText('executionsList.showError.retryExecution.title'));
 
 				this.isDataLoading = false;
 			}
@@ -773,7 +771,7 @@ export default defineComponent({
 			try {
 				await Promise.all([this.loadActiveExecutions(), this.loadFinishedExecutions()]);
 			} catch (error) {
-				this.showError(error, this.$locale.baseText('executionsList.showError.refreshData.title'));
+				this.showError(error, this.i18n.baseText('executionsList.showError.refreshData.title'));
 			}
 
 			this.isDataLoading = false;
@@ -806,21 +804,21 @@ export default defineComponent({
 			let text = '';
 
 			if (status === 'waiting') {
-				text = this.$locale.baseText('executionsList.waiting');
+				text = this.i18n.baseText('executionsList.waiting');
 			} else if (status === 'canceled') {
-				text = this.$locale.baseText('executionsList.canceled');
+				text = this.i18n.baseText('executionsList.canceled');
 			} else if (status === 'crashed') {
-				text = this.$locale.baseText('executionsList.error');
+				text = this.i18n.baseText('executionsList.error');
 			} else if (status === 'new') {
-				text = this.$locale.baseText('executionsList.running');
+				text = this.i18n.baseText('executionsList.running');
 			} else if (status === 'running') {
-				text = this.$locale.baseText('executionsList.running');
+				text = this.i18n.baseText('executionsList.running');
 			} else if (status === 'success') {
-				text = this.$locale.baseText('executionsList.succeeded');
+				text = this.i18n.baseText('executionsList.succeeded');
 			} else if (status === 'failed') {
-				text = this.$locale.baseText('executionsList.error');
+				text = this.i18n.baseText('executionsList.error');
 			} else {
-				text = this.$locale.baseText('executionsList.unknown');
+				text = this.i18n.baseText('executionsList.unknown');
 			}
 
 			return text;
@@ -854,7 +852,7 @@ export default defineComponent({
 			let text = '';
 
 			if (status === 'waiting' && this.isWaitTillIndefinite(entry)) {
-				text = this.$locale.baseText(
+				text = this.i18n.baseText(
 					'executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely',
 				);
 			}
@@ -874,8 +872,8 @@ export default defineComponent({
 				this.stoppingExecutions.splice(index, 1);
 
 				this.showMessage({
-					title: this.$locale.baseText('executionsList.showMessage.stopExecution.title'),
-					message: this.$locale.baseText('executionsList.showMessage.stopExecution.message', {
+					title: this.i18n.baseText('executionsList.showMessage.stopExecution.title'),
+					message: this.i18n.baseText('executionsList.showMessage.stopExecution.message', {
 						interpolate: { activeExecutionId },
 					}),
 					type: 'success',
@@ -883,10 +881,7 @@ export default defineComponent({
 
 				await this.refreshData();
 			} catch (error) {
-				this.showError(
-					error,
-					this.$locale.baseText('executionsList.showError.stopExecution.title'),
-				);
+				this.showError(error, this.i18n.baseText('executionsList.showError.stopExecution.title'));
 			}
 		},
 		isExecutionRetriable(execution: IExecutionsSummary): boolean {
@@ -911,7 +906,7 @@ export default defineComponent({
 			} catch (error) {
 				this.showError(
 					error,
-					this.$locale.baseText('executionsList.showError.handleDeleteSelected.title'),
+					this.i18n.baseText('executionsList.showError.handleDeleteSelected.title'),
 				);
 			}
 			this.isDataLoading = true;
diff --git a/packages/editor-ui/src/components/ExecutionsModal.vue b/packages/editor-ui/src/components/ExecutionsModal.vue
index 242f2145d3aad..343fe413029a0 100644
--- a/packages/editor-ui/src/components/ExecutionsModal.vue
+++ b/packages/editor-ui/src/components/ExecutionsModal.vue
@@ -11,7 +11,7 @@ import { defineComponent } from 'vue';
 import ExecutionsList from '@/components/ExecutionsList.vue';
 import Modal from '@/components/Modal.vue';
 import { EXECUTIONS_MODAL_KEY } from '@/constants';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'ExecutionsModal',
diff --git a/packages/editor-ui/src/components/ExecutionsUsage.vue b/packages/editor-ui/src/components/ExecutionsUsage.vue
index 207342e6c0fb1..892431fa8808e 100644
--- a/packages/editor-ui/src/components/ExecutionsUsage.vue
+++ b/packages/editor-ui/src/components/ExecutionsUsage.vue
@@ -6,7 +6,7 @@
 			</n8n-text>
 		</div>
 		<div v-else-if="!isTrialExpired && trialHasExecutionsLeft" :class="$style.usageText">
-			<i18n path="executionUsage.currentUsage">
+			<i18n-t tag="span" keypath="executionUsage.currentUsage">
 				<template #text>
 					<n8n-text size="small" color="text-dark">
 						{{ locale.baseText('executionUsage.currentUsage.text') }}
@@ -21,7 +21,7 @@
 						}}
 					</n8n-text>
 				</template>
-			</i18n>
+			</i18n-t>
 		</div>
 		<div v-else-if="!trialHasExecutionsLeft" :class="$style.usageText">
 			<n8n-text size="small">
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
index b1fbf8064d81c..bfe2f75dc0f44 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
@@ -30,6 +30,7 @@
 					<n8n-text :class="$style.statusLabel" size="small">{{
 						executionUIDetails.label
 					}}</n8n-text>
+					{{ ' ' }}
 					<n8n-text
 						v-if="executionUIDetails.name === 'running'"
 						:color="isActive ? 'text-dark' : 'text-base'"
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
index b342b469bb8d0..50ba270e6837c 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
@@ -6,7 +6,7 @@
 		<n8n-text :class="$style.runningMessage" color="text-light">
 			{{ $locale.baseText('executionDetails.runningMessage') }}
 		</n8n-text>
-		<n8n-button class="mt-l" type="tertiary" size="medium" @click="handleStopClick">
+		<n8n-button class="mt-l" type="tertiary" @click="handleStopClick">
 			{{ $locale.baseText('executionsList.stopExecution') }}
 		</n8n-button>
 	</div>
@@ -33,6 +33,7 @@
 				>
 					{{ executionUIDetails.label }}
 				</n8n-text>
+				{{ ' ' }}
 				<n8n-text v-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
 					{{
 						$locale.baseText('executionDetails.runningTimeRunning', {
@@ -135,7 +136,7 @@ import type { IExecutionUIData } from '@/mixins/executionsHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
 import { MODAL_CONFIRM, VIEWS } from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
-import { Dropdown as ElDropdown } from 'element-ui';
+import { ElDropdown } from 'element-plus';
 
 type RetryDropdownRef = InstanceType<typeof ElDropdown> & { hide: () => void };
 
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
index f0112edd1d991..ade83195c34d5 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsInfoAccordion.vue
@@ -5,7 +5,7 @@
 		:items="accordionItems"
 		:initiallyExpanded="shouldExpandAccordion"
 		:headerIcon="accordionIcon"
-		@click="onAccordionClick"
+		@click:body="onAccordionClick"
 		@tooltipClick="onItemTooltipClick"
 	>
 		<template #customContent>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index 3f8197094d84e..75adb04bd0650 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -126,8 +126,10 @@ export default defineComponent({
 	},
 	watch: {
 		$route(to: Route, from: Route) {
-			const workflowChanged = from.params.name !== to.params.name;
-			void this.initView(workflowChanged);
+			if (to.params.name) {
+				const workflowChanged = from.params.name !== to.params.name;
+				void this.initView(workflowChanged);
+			}
 
 			if (to.params.executionId) {
 				const execution = this.workflowsStore.getExecutionDataById(to.params.executionId);
@@ -192,12 +194,12 @@ export default defineComponent({
 		}
 
 		this.autoRefresh = this.uiStore.executionSidebarAutoRefresh === true;
-		this.startAutoRefreshInterval();
+		void this.startAutoRefreshInterval();
 		document.addEventListener('visibilitychange', this.onDocumentVisibilityChange);
 
 		this.loading = false;
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.stopAutoRefreshInterval();
 		document.removeEventListener('visibilitychange', this.onDocumentVisibilityChange);
 	},
@@ -349,7 +351,9 @@ export default defineComponent({
 		async startAutoRefreshInterval() {
 			if (this.autoRefresh) {
 				await this.loadAutoRefresh();
-				this.autoRefreshTimeout = setTimeout(() => this.startAutoRefreshInterval(), 4000);
+				this.autoRefreshTimeout = setTimeout(() => {
+					void this.startAutoRefreshInterval();
+				}, 4000);
 			}
 		},
 		stopAutoRefreshInterval() {
@@ -363,13 +367,13 @@ export default defineComponent({
 			this.uiStore.executionSidebarAutoRefresh = this.autoRefresh;
 
 			this.stopAutoRefreshInterval(); // Clear any previously existing intervals (if any - there shouldn't)
-			this.startAutoRefreshInterval();
+			void this.startAutoRefreshInterval();
 		},
 		onDocumentVisibilityChange() {
 			if (document.visibilityState === 'hidden') {
-				this.stopAutoRefreshInterval();
+				void this.stopAutoRefreshInterval();
 			} else {
-				this.startAutoRefreshInterval();
+				void this.startAutoRefreshInterval();
 			}
 		},
 		async loadAutoRefresh(): Promise<void> {
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index afd13e6d2566b..2677c72623fc4 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -11,8 +11,8 @@
 		</div>
 		<div :class="$style.controls">
 			<el-checkbox
-				:value="autoRefresh"
-				@input="$emit('update:autoRefresh', $event)"
+				:modelValue="autoRefresh"
+				@update:modelValue="$emit('update:autoRefresh', $event)"
 				data-test-id="auto-refresh-checkbox"
 			>
 				{{ $locale.baseText('executionsList.autoRefresh') }}
@@ -270,8 +270,10 @@ export default defineComponent({
 </style>
 
 <style lang="scss" scoped>
-:deep(.el-skeleton__item) {
-	height: 60px;
-	border-radius: 0;
+.executions-sidebar {
+	:deep(.el-skeleton__item) {
+		height: 60px;
+		border-radius: 0;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
index 5d0c57ef24e23..14109db747f46 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
@@ -10,10 +10,10 @@ import { defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'ExpandableInputBase',
-	props: ['value', 'placeholder', 'staticSize'],
+	props: ['modelValue', 'placeholder', 'staticSize'],
 	computed: {
 		hiddenValue() {
-			let value = (this.value as string).replace(/\s/g, '.'); // force input to expand on space chars
+			let value = (this.modelValue as string).replace(/\s/g, '.'); // force input to expand on space chars
 			if (!value) {
 				// @ts-ignore
 				value = this.placeholder;
@@ -28,23 +28,22 @@ export default defineComponent({
 <style lang="scss" scoped>
 $--horiz-padding: 15px;
 
-input {
-	border: 1px solid transparent;
-	padding: 0 $--horiz-padding - 2px; // -2px for borders
-}
-
-div.el-input {
+.el-input {
 	display: inline-grid;
 	font: inherit;
 	padding: 10px 0;
 
-	&::after,
-	input {
+	:deep(input) {
+		border: 1px solid transparent;
+		padding: 0 $--horiz-padding - 2px; // -2px for borders
+		width: 100%;
 		grid-area: 1 / 2;
 		font: inherit;
 	}
 
 	&::after {
+		grid-area: 1 / 2;
+		font: inherit;
 		content: attr(data-value) ' ';
 		visibility: hidden;
 		white-space: nowrap;
@@ -56,9 +55,13 @@ div.el-input {
 	}
 
 	&:hover {
-		input:not(:focus) {
+		:deep(input):not(:focus) {
 			border: 1px solid var(--color-text-lighter);
 		}
 	}
+
+	:deep(input):focus {
+		border: 1px solid var(--color-secondary);
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index 7e7b42c8a5474..9c0ac148ead51 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
@@ -1,8 +1,8 @@
 <template>
-	<ExpandableInputBase :value="value" :placeholder="placeholder">
+	<ExpandableInputBase :modelValue="modelValue" :placeholder="placeholder">
 		<input
 			class="el-input__inner"
-			:value="value"
+			:value="modelValue"
 			:placeholder="placeholder"
 			:maxlength="maxlength"
 			@input="onInput"
@@ -10,7 +10,7 @@
 			@keydown.esc="onEscape"
 			ref="input"
 			size="4"
-			v-click-outside="onClickOutside"
+			v-on-click-outside="onClickOutside"
 		/>
 	</ExpandableInputBase>
 </template>
@@ -25,7 +25,7 @@ export default defineComponent({
 	name: 'ExpandableInputEdit',
 	components: { ExpandableInputBase },
 	props: {
-		value: {},
+		modelValue: {},
 		placeholder: {},
 		maxlength: {},
 		autofocus: {},
@@ -40,7 +40,7 @@ export default defineComponent({
 		}
 		this.eventBus?.on('focus', this.focus);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus?.off('focus', this.focus);
 	},
 	methods: {
@@ -50,7 +50,7 @@ export default defineComponent({
 			}
 		},
 		onInput() {
-			this.$emit('input', (this.$refs.input as HTMLInputElement).value);
+			this.$emit('update:modelValue', (this.$refs.input as HTMLInputElement).value);
 		},
 		onEnter() {
 			this.$emit('enter', (this.$refs.input as HTMLInputElement).value);
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
index 4820297941444..b0451dda46bc2 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
@@ -1,13 +1,11 @@
 <template>
-	<ExpandableInputBase :value="value" :staticSize="true">
-		<template>
-			<input
-				:class="{ 'el-input__inner': true, clickable: true }"
-				:value="value"
-				:disabled="true"
-				size="4"
-			/>
-		</template>
+	<ExpandableInputBase :modelValue="modelValue" :staticSize="true">
+		<input
+			:class="{ 'el-input__inner': true, clickable: true }"
+			:value="modelValue"
+			:disabled="true"
+			size="4"
+		/>
 	</ExpandableInputBase>
 </template>
 
@@ -18,7 +16,7 @@ import ExpandableInputBase from './ExpandableInputBase.vue';
 export default defineComponent({
 	name: 'ExpandableInputPreview',
 	components: { ExpandableInputBase },
-	props: ['value'],
+	props: ['modelValue'],
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index 612b3a7ac8f16..e2ee6023c9484 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -1,9 +1,8 @@
 <template>
-	<div v-if="dialogVisible" @keydown.stop>
+	<div class="expression-edit" v-if="dialogVisible" @keydown.stop>
 		<el-dialog
-			:visible="dialogVisible"
-			custom-class="expression-dialog classic"
-			append-to-body
+			:modelValue="dialogVisible"
+			class="expression-dialog classic"
 			width="80%"
 			:title="$locale.baseText('expressionEdit.editExpression')"
 			:before-close="closeDialog"
@@ -41,6 +40,7 @@
 								<span>
 									{{ $locale.baseText('expressionEdit.isJavaScript') }}
 								</span>
+								{{ ' ' }}
 								<n8n-link size="medium" :to="expressionsDocsUrl">
 									{{ $locale.baseText('expressionEdit.learnMore') }}
 								</n8n-link>
@@ -48,7 +48,7 @@
 						</div>
 						<div class="expression-editor">
 							<ExpressionEditorModalInput
-								:value="value"
+								:modelValue="modelValue"
 								:isReadOnly="isReadOnlyRoute"
 								:path="path"
 								:class="{ 'ph-no-capture': redactValues }"
@@ -102,7 +102,7 @@ import type { Segment } from '@/types/expressions';
 export default defineComponent({
 	name: 'ExpressionEdit',
 	mixins: [externalHooks, genericHelpers, debounceHelper],
-	props: ['dialogVisible', 'parameter', 'path', 'value', 'eventSource', 'redactValues'],
+	props: ['dialogVisible', 'parameter', 'path', 'modelValue', 'eventSource', 'redactValues'],
 	components: {
 		ExpressionEditorModalInput,
 		ExpressionEditorModalOutput,
@@ -126,7 +126,7 @@ export default defineComponent({
 
 			if (forceUpdate === true) {
 				this.updateDisplayValue();
-				this.$emit('valueChanged', this.latestValue);
+				this.$emit('update:modelValue', this.latestValue);
 			} else {
 				void this.callDebounced('updateDisplayValue', { debounceTime: 500 });
 			}
@@ -137,10 +137,10 @@ export default defineComponent({
 		},
 
 		closeDialog() {
-			if (this.latestValue !== this.value) {
+			if (this.latestValue !== this.modelValue) {
 				// Handle the close externally as the visible parameter is an external prop
 				// and is so not allowed to be changed here.
-				this.$emit('valueChanged', this.latestValue);
+				this.$emit('update:modelValue', this.latestValue);
 			}
 			this.$emit('closeDialog');
 			return false;
@@ -151,7 +151,7 @@ export default defineComponent({
 			(this.$refs.inputFieldExpression as any).itemSelected(eventData);
 			void this.$externalHooks().run('expressionEdit.itemSelected', {
 				parameter: this.parameter,
-				value: this.value,
+				value: this.modelValue,
 				selectedItem: eventData,
 			});
 
@@ -221,8 +221,8 @@ export default defineComponent({
 	},
 	watch: {
 		dialogVisible(newValue) {
-			this.displayValue = this.value;
-			this.latestValue = this.value;
+			this.displayValue = this.modelValue;
+			this.latestValue = this.modelValue;
 
 			const resolvedExpressionValue =
 				// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -231,14 +231,14 @@ export default defineComponent({
 			void this.$externalHooks().run('expressionEdit.dialogVisibleChanged', {
 				dialogVisible: newValue,
 				parameter: this.parameter,
-				value: this.value,
+				value: this.modelValue,
 				resolvedExpressionValue,
 			});
 
 			if (!newValue) {
 				const telemetryPayload = createExpressionTelemetryPayload(
 					this.segments,
-					this.value,
+					this.modelValue,
 					this.workflowsStore.workflowId,
 					this.ndvStore.sessionId,
 					this.ndvStore.activeNode?.type ?? '',
@@ -253,6 +253,28 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+.expression-edit {
+	:deep(.expression-dialog) {
+		.el-dialog__header {
+			padding: 0;
+		}
+		.el-dialog__title {
+			display: none;
+		}
+
+		.el-dialog__body {
+			padding: 0;
+			font-size: var(--font-size-s);
+		}
+
+		.right-side {
+			background-color: var(--color-background-light);
+			border-top-right-radius: 8px;
+			border-bottom-right-radius: 8px;
+		}
+	}
+}
+
 .editor-description {
 	line-height: 1.5;
 	font-weight: bold;
@@ -293,28 +315,8 @@ export default defineComponent({
 	margin-top: 1em;
 }
 
-::v-deep .expression-dialog {
-	.el-dialog__header {
-		padding: 0;
-	}
-	.el-dialog__title {
-		display: none;
-	}
-
-	.el-dialog__body {
-		padding: 0;
-		font-size: var(--font-size-s);
-	}
-
-	.right-side {
-		background-color: var(--color-background-light);
-		border-top-right-radius: 8px;
-		border-bottom-right-radius: 8px;
-	}
-}
-
 .header-side-menu {
-	padding: 1em 0 0.5em 1.8em;
+	padding: 1em 0 0.5em var(--spacing-s);
 	border-top-left-radius: 8px;
 
 	background-color: var(--color-background-base);
@@ -339,6 +341,6 @@ export default defineComponent({
 }
 
 .variable-selector {
-	margin: 0 1em;
+	margin: 0 var(--spacing-s);
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index 943fe2db3c2d0..2cf390f1054d6 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -24,7 +24,7 @@ export default defineComponent({
 	name: 'ExpressionEditorModalInput',
 	mixins: [expressionManager, completionManager, workflowHelpers],
 	props: {
-		value: {
+		modelValue: {
 			type: String,
 		},
 		path: {
@@ -69,6 +69,8 @@ export default defineComponent({
 			EditorView.updateListener.of((viewUpdate) => {
 				if (!this.editor || !viewUpdate.docChanged) return;
 
+				this.editorState = this.editor.state;
+
 				highlighter.removeColor(this.editor, this.plaintextSegments);
 				highlighter.addColor(this.editor, this.resolvableSegments);
 
@@ -89,11 +91,12 @@ export default defineComponent({
 		this.editor = new EditorView({
 			parent: this.$refs.root as HTMLDivElement,
 			state: EditorState.create({
-				doc: this.value.startsWith('=') ? this.value.slice(1) : this.value,
+				doc: this.modelValue.startsWith('=') ? this.modelValue.slice(1) : this.modelValue,
 				extensions,
 			}),
 		});
 
+		this.editorState = this.editor.state;
 		this.editor.focus();
 
 		highlighter.addColor(this.editor, this.resolvableSegments);
@@ -107,7 +110,7 @@ export default defineComponent({
 			segments: this.displayableSegments,
 		});
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.editor?.destroy();
 	},
 	methods: {
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
index d4e28945f3976..2438ca44315b8 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalOutput.vue
@@ -54,7 +54,7 @@ export default defineComponent({
 			}),
 		});
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.editor?.destroy();
 	},
 	computed: {
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index c597a1edd5c1c..8567f95123d5e 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -1,5 +1,9 @@
 <template>
-	<div :class="$style['expression-parameter-input']" v-click-outside="onBlur" @keydown.tab="onBlur">
+	<div
+		:class="$style['expression-parameter-input']"
+		v-on-click-outside="onBlur"
+		@keydown.tab="onBlur"
+	>
 		<div :class="[$style['all-sections'], { [$style['focused']]: isFocused }]">
 			<div
 				:class="[
@@ -11,7 +15,7 @@
 				<ExpressionFunctionIcon />
 			</div>
 			<InlineExpressionEditorInput
-				:value="value"
+				:modelValue="modelValue"
 				:isReadOnly="isReadOnly"
 				:targetItem="hoveringItem"
 				:isSingleLine="isForRecordLocator"
@@ -33,7 +37,6 @@
 
 		<InlineExpressionEditorOutput
 			:segments="segments"
-			:value="value"
 			:isReadOnly="isReadOnly"
 			:visible="isFocused"
 			:hoveringItemNumber="hoveringItemNumber"
@@ -74,7 +77,7 @@ export default defineComponent({
 		path: {
 			type: String,
 		},
-		value: {
+		modelValue: {
 			type: String,
 		},
 		isReadOnly: {
@@ -129,7 +132,7 @@ export default defineComponent({
 			if (wasFocused) {
 				const telemetryPayload = createExpressionTelemetryPayload(
 					this.segments,
-					this.value,
+					this.modelValue,
 					this.workflowsStore.workflowId,
 					this.ndvStore.sessionId,
 					this.ndvStore.activeNode?.type ?? '',
@@ -143,9 +146,9 @@ export default defineComponent({
 
 			this.segments = segments;
 
-			if (value === '=' + this.value) return; // prevent report on change of target item
+			if (value === '=' + this.modelValue) return; // prevent report on change of target item
 
-			this.$emit('valueChanged', value);
+			this.$emit('update:modelValue', value);
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/FeatureComingSoon.vue b/packages/editor-ui/src/components/FeatureComingSoon.vue
index 994a0043cfe0d..23e415389352f 100644
--- a/packages/editor-ui/src/components/FeatureComingSoon.vue
+++ b/packages/editor-ui/src/components/FeatureComingSoon.vue
@@ -7,9 +7,7 @@
 		</div>
 		<div v-if="featureInfo.infoText" class="mb-l">
 			<n8n-info-tip theme="info" type="note">
-				<template>
-					<span v-html="$locale.baseText(featureInfo.infoText)"></span>
-				</template>
+				<span v-html="$locale.baseText(featureInfo.infoText)"></span>
 			</n8n-info-tip>
 		</div>
 		<div :class="$style.actionBoxContainer">
@@ -18,7 +16,7 @@
 				:buttonText="
 					$locale.baseText(featureInfo.actionBoxButtonLabel || 'fakeDoor.actionBox.button.label')
 				"
-				@click="openLinkPage"
+				@click:button="openLinkPage"
 			>
 				<template #heading>
 					<span v-html="$locale.baseText(featureInfo.actionBoxTitle)" />
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 6cc5a6dacc5e8..b67baa1587fb0 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -49,14 +49,16 @@
 								/>
 							</div>
 						</div>
-						<parameter-input-list
-							:parameters="property.values"
-							:nodeValues="nodeValues"
-							:path="getPropertyPath(property.name, index)"
-							:hideDelete="true"
-							:isReadOnly="isReadOnly"
-							@valueChanged="valueChanged"
-						/>
+						<Suspense>
+							<parameter-input-list
+								:parameters="property.values"
+								:nodeValues="nodeValues"
+								:path="getPropertyPath(property.name, index)"
+								:hideDelete="true"
+								:isReadOnly="isReadOnly"
+								@valueChanged="valueChanged"
+							/>
+						</Suspense>
 					</div>
 				</div>
 			</div>
@@ -96,7 +98,7 @@
 					v-model="selectedOption"
 					:placeholder="getPlaceholderText"
 					size="small"
-					@change="optionSelected"
+					@update:modelValue="optionSelected"
 					filterable
 				>
 					<n8n-option
@@ -112,8 +114,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import type { Component, PropType } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
+import type { PropType } from 'vue';
 import type { IUpdateInformation } from '@/Interface';
 
 import type {
@@ -126,6 +128,8 @@ import { deepCopy, isINodePropertyCollectionList } from 'n8n-workflow';
 
 import { get } from 'lodash-es';
 
+const ParameterInputList = defineAsyncComponent(async () => import('./ParameterInputList.vue'));
+
 export default defineComponent({
 	name: 'FixedCollectionParameter',
 	props: {
@@ -151,7 +155,7 @@ export default defineComponent({
 		},
 	},
 	components: {
-		ParameterInputList: async () => import('./ParameterInputList.vue') as Promise<Component>,
+		ParameterInputList,
 	},
 	data() {
 		return {
@@ -337,17 +341,15 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
-::v-deep {
-	.button {
+.fixed-collection-parameter {
+	padding-left: var(--spacing-s);
+
+	:deep(.button) {
 		--button-background-color: var(--color-background-base);
 		--button-border-color: var(--color-foreground-base);
 	}
 }
 
-.fixed-collection-parameter {
-	padding-left: var(--spacing-s);
-}
-
 .fixed-collection-parameter-property {
 	margin: var(--spacing-xs) 0;
 }
diff --git a/packages/editor-ui/src/components/HoverableNodeIcon.vue b/packages/editor-ui/src/components/HoverableNodeIcon.vue
index a4fe8fe2d7ee5..5e79a51cd9582 100644
--- a/packages/editor-ui/src/components/HoverableNodeIcon.vue
+++ b/packages/editor-ui/src/components/HoverableNodeIcon.vue
@@ -7,7 +7,7 @@
 		@mouseleave="showTooltip = false"
 	>
 		<div :class="$style.tooltip">
-			<n8n-tooltip placement="top" manual :value="showTooltip">
+			<n8n-tooltip placement="top" :visible="showTooltip">
 				<template #content>
 					<div v-text="nodeType.displayName"></div>
 				</template>
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index fd3e57ed4f0ad..47f88002e20ab 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -43,7 +43,7 @@ export default defineComponent({
 	name: 'HtmlEditor',
 	mixins: [expressionManager],
 	props: {
-		html: {
+		modelValue: {
 			type: String,
 			required: true,
 		},
@@ -106,10 +106,12 @@ export default defineComponent({
 				EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
 					if (!viewUpdate.docChanged) return;
 
+					this.editorState = this.editor.state;
+
 					this.getHighlighter()?.removeColor(this.editor, this.htmlSegments);
 					this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
 
-					this.$emit('valueChanged', this.doc);
+					this.$emit('update:modelValue', this.doc);
 				}),
 			];
 		},
@@ -261,20 +263,21 @@ export default defineComponent({
 	mounted() {
 		htmlEditorEventBus.on('format-html', this.format);
 
-		let doc = this.html;
+		let doc = this.modelValue;
 
-		if (this.html === '' && this.rows > 0) {
+		if (this.modelValue === '' && this.rows > 0) {
 			doc = '\n'.repeat(this.rows - 1);
 		}
 
 		const state = EditorState.create({ doc, extensions: this.extensions });
 
 		this.editor = new EditorView({ parent: this.root(), state });
+		this.editorState = this.editor.state;
 
 		this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
 	},
 
-	destroyed() {
+	beforeUnmount() {
 		htmlEditorEventBus.off('format-html', this.format);
 	},
 });
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 7384559dffad0..8fd8c32197cb1 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -10,11 +10,11 @@
 			<div :class="$style.container">
 				<n8n-input-label :label="$locale.baseText('importCurlModal.input.label')" color="text-dark">
 					<n8n-input
-						:value="curlCommand"
+						:modelValue="curlCommand"
 						type="textarea"
 						:rows="5"
 						:placeholder="$locale.baseText('importCurlModal.input.placeholder')"
-						@input="onInput"
+						@update:modelValue="onInput"
 						@focus="$event.target.select()"
 						ref="input"
 					/>
@@ -52,7 +52,7 @@ import type { INodeUi } from '@/Interface';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'ImportCurlModal',
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 646b3f3c2b97d..902729dbe1567 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -25,7 +25,7 @@ export default defineComponent({
 	name: 'InlineExpressionEditorInput',
 	mixins: [completionManager, expressionManager, workflowHelpers],
 	props: {
-		value: {
+		modelValue: {
 			type: String,
 		},
 		isReadOnly: {
@@ -46,7 +46,7 @@ export default defineComponent({
 				effects: editableConf.reconfigure(EditorView.editable.of(!newValue)),
 			});
 		},
-		value(newValue) {
+		modelValue(newValue) {
 			const isInternalChange = newValue === this.editor?.state.doc.toString();
 
 			if (isInternalChange) return;
@@ -66,7 +66,7 @@ export default defineComponent({
 				changes: {
 					from: 0,
 					to: this.editor.state.doc.length,
-					insert: this.value,
+					insert: this.modelValue,
 				},
 			});
 
@@ -114,6 +114,9 @@ export default defineComponent({
 			EditorView.updateListener.of((viewUpdate) => {
 				if (!this.editor || !viewUpdate.docChanged) return;
 
+				// Force segments value update by keeping track of editor state
+				this.editorState = this.editor.state;
+
 				highlighter.removeColor(this.editor, this.plaintextSegments);
 				highlighter.addColor(this.editor, this.resolvableSegments);
 
@@ -133,10 +136,11 @@ export default defineComponent({
 		this.editor = new EditorView({
 			parent: this.$refs.root as HTMLDivElement,
 			state: EditorState.create({
-				doc: this.value.startsWith('=') ? this.value.slice(1) : this.value,
+				doc: this.modelValue.startsWith('=') ? this.modelValue.slice(1) : this.modelValue,
 				extensions,
 			}),
 		});
+		this.editorState = this.editor.state;
 
 		highlighter.addColor(this.editor, this.resolvableSegments);
 
@@ -145,7 +149,7 @@ export default defineComponent({
 			segments: this.displayableSegments,
 		});
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.editor?.destroy();
 	},
 	methods: {
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index cf139c1e7a810..377152d763da6 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -1,19 +1,20 @@
 <template>
 	<div :class="visible ? $style.dropdown : $style.hidden">
 		<n8n-text size="small" compact :class="$style.header">
-			{{ $locale.baseText('parameterInput.resultForItem') }} {{ hoveringItemNumber }}
+			{{ i18n.baseText('parameterInput.resultForItem') }} {{ hoveringItemNumber }}
 		</n8n-text>
 		<n8n-text :class="$style.body">
 			<div ref="root" data-test-id="inline-expression-editor-output"></div>
 		</n8n-text>
 		<div :class="$style.footer">
 			<n8n-text size="small" compact>
-				{{ $locale.baseText('parameterInput.anythingInside') }}
+				{{ i18n.baseText('parameterInput.anythingInside') }}
 			</n8n-text>
 			<div :class="$style['expression-syntax-example']" v-text="`{{ }}`"></div>
 			<n8n-text size="small" compact>
-				{{ $locale.baseText('parameterInput.isJavaScript') }}
+				{{ i18n.baseText('parameterInput.isJavaScript') }}
 			</n8n-text>
+			{{ ' ' }}
 			<n8n-link
 				:class="$style['learn-more']"
 				size="small"
@@ -21,7 +22,7 @@
 				theme="text"
 				:to="expressionsDocsUrl"
 			>
-				{{ $locale.baseText('parameterInput.learnMore') }}
+				{{ i18n.baseText('parameterInput.learnMore') }}
 			</n8n-link>
 		</div>
 	</div>
@@ -39,6 +40,7 @@ import { outputTheme } from './theme';
 
 import type { Plaintext, Resolved, Segment } from '@/types/expressions';
 import { EXPRESSIONS_DOCS_URL } from '@/constants';
+import { useI18n } from '@/composables';
 
 export default defineComponent({
 	name: 'InlineExpressionEditorOutput',
@@ -47,9 +49,6 @@ export default defineComponent({
 			type: Array as PropType<Segment[]>,
 			required: true,
 		},
-		value: {
-			type: String,
-		},
 		isReadOnly: {
 			type: Boolean,
 			default: false,
@@ -75,6 +74,13 @@ export default defineComponent({
 			highlighter.removeColor(this.editor, this.plaintextSegments);
 		},
 	},
+	setup() {
+		const i18n = useI18n();
+
+		return {
+			i18n,
+		};
+	},
 	data() {
 		return {
 			editor: null as EditorView | null,
@@ -90,7 +96,7 @@ export default defineComponent({
 			}),
 		});
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.editor?.destroy();
 	},
 	computed: {
@@ -122,11 +128,6 @@ export default defineComponent({
 				.filter((segment): segment is Resolved => segment.kind === 'resolvable');
 		},
 	},
-	methods: {
-		getValue() {
-			return '=' + this.resolvedExpression;
-		},
-	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/InlineNameEdit.vue b/packages/editor-ui/src/components/InlineNameEdit.vue
index 04c0e7b5119e5..59ba4292e50a8 100644
--- a/packages/editor-ui/src/components/InlineNameEdit.vue
+++ b/packages/editor-ui/src/components/InlineNameEdit.vue
@@ -1,25 +1,25 @@
 <template>
 	<div :class="$style.container">
 		<span v-if="readonly" :class="$style.headline">
-			{{ name }}
+			{{ modelValue }}
 		</span>
 		<div
 			v-else
 			:class="[$style.headline, $style['headline-editable']]"
 			@keydown.stop
 			@click="enableNameEdit"
-			v-click-outside="disableNameEdit"
+			v-on-click-outside="disableNameEdit"
 		>
 			<div v-if="!isNameEdit">
-				<span>{{ name }}</span>
+				<span>{{ modelValue }}</span>
 				<i><font-awesome-icon icon="pen" /></i>
 			</div>
 			<div v-else :class="$style.nameInput">
 				<n8n-input
-					:value="name"
+					:modelValue="modelValue"
 					size="xlarge"
 					ref="nameInput"
-					@input="onNameEdit"
+					@update:modelValue="onNameEdit"
 					@change="disableNameEdit"
 					:maxlength="64"
 				/>
@@ -38,7 +38,7 @@ import { useToast } from '@/composables';
 export default defineComponent({
 	name: 'InlineNameEdit',
 	props: {
-		name: {
+		modelValue: {
 			type: String,
 		},
 		subtitle: {
@@ -64,7 +64,7 @@ export default defineComponent({
 	},
 	methods: {
 		onNameEdit(value: string) {
-			this.$emit('input', value);
+			this.$emit('update:modelValue', value);
 		},
 		enableNameEdit() {
 			this.isNameEdit = true;
@@ -77,8 +77,8 @@ export default defineComponent({
 			}, 0);
 		},
 		disableNameEdit() {
-			if (!this.name) {
-				this.$emit('input', `Untitled ${this.type}`);
+			if (!this.modelValue) {
+				this.$emit('update:modelValue', `Untitled ${this.type}`);
 
 				this.showToast({
 					title: 'Error',
diff --git a/packages/editor-ui/src/components/InlineTextEdit.vue b/packages/editor-ui/src/components/InlineTextEdit.vue
index 52a72f4432d09..4eb43044bc4fe 100644
--- a/packages/editor-ui/src/components/InlineTextEdit.vue
+++ b/packages/editor-ui/src/components/InlineTextEdit.vue
@@ -1,13 +1,13 @@
 <template>
 	<span @keydown.stop class="inline-edit">
-		<span v-if="isEditEnabled && !disabled">
+		<span v-if="isEditEnabled && !isDisabled">
 			<ExpandableInputEdit
 				:placeholder="placeholder"
-				:value="newValue"
+				:modelValue="newValue"
 				:maxlength="maxLength"
 				:autofocus="true"
 				:eventBus="inputBus"
-				@input="onInput"
+				@update:modelValue="onInput"
 				@esc="onEscape"
 				@blur="onBlur"
 				@enter="submit"
@@ -15,7 +15,7 @@
 		</span>
 
 		<span @click="onClick" class="preview" v-else>
-			<ExpandableInputPreview :value="previewValue || value" />
+			<ExpandableInputPreview :modelValue="previewValue || modelValue" />
 		</span>
 	</span>
 </template>
@@ -24,7 +24,7 @@
 import { defineComponent } from 'vue';
 import ExpandableInputEdit from '@/components/ExpandableInput/ExpandableInputEdit.vue';
 import ExpandableInputPreview from '@/components/ExpandableInput/ExpandableInputPreview.vue';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'InlineTextEdit',
@@ -34,7 +34,7 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
-		value: {
+		modelValue: {
 			type: String,
 			default: '',
 		},
@@ -57,6 +57,7 @@ export default defineComponent({
 	},
 	data() {
 		return {
+			isDisabled: this.disabled,
 			newValue: '',
 			escPressed: false,
 			inputBus: createEventBus(),
@@ -75,7 +76,7 @@ export default defineComponent({
 				return;
 			}
 
-			this.$data.newValue = this.value;
+			this.newValue = this.modelValue;
 			this.$emit('toggle');
 		},
 		onBlur() {
@@ -83,10 +84,10 @@ export default defineComponent({
 				return;
 			}
 
-			if (!this.$data.escPressed) {
+			if (!this.escPressed) {
 				this.submit();
 			}
-			this.$data.escPressed = false;
+			this.escPressed = false;
 		},
 		submit() {
 			if (this.disabled) {
@@ -94,25 +95,30 @@ export default defineComponent({
 			}
 
 			const onSubmit = (updated: boolean) => {
-				this.$data.disabled = false;
+				this.isDisabled = false;
 
 				if (!updated) {
-					this.$data.inputBus.emit('focus');
+					this.inputBus.emit('focus');
 				}
 			};
 
-			this.$data.disabled = true;
-			this.$emit('submit', this.newValue, onSubmit);
+			this.isDisabled = true;
+			this.$emit('submit', { name: this.newValue, onSubmit });
 		},
 		onEscape() {
 			if (this.disabled) {
 				return;
 			}
 
-			this.$data.escPressed = true;
+			this.escPressed = true;
 			this.$emit('toggle');
 		},
 	},
+	watch: {
+		disabled(value) {
+			this.isDisabled = value;
+		},
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 14cf1f06c3c9d..18fe2518b24ca 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -25,10 +25,10 @@
 			<div :class="$style.titleSection">
 				<n8n-select
 					v-if="parentNodes.length"
-					:popper-append-to-body="true"
+					teleported
 					size="small"
-					:value="currentNodeName"
-					@input="onSelect"
+					:modelValue="currentNodeName"
+					@update:modelValue="onSelect"
 					:no-data-text="$locale.baseText('ndv.input.noNodesFound')"
 					:placeholder="$locale.baseText('ndv.input.parentNodes')"
 					filterable
@@ -63,11 +63,7 @@
 				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
 					$locale.baseText('ndv.input.noOutputData.title')
 				}}</n8n-text>
-				<n8n-tooltip
-					v-if="!readOnly"
-					:manual="true"
-					:value="showDraggableHint && showDraggableHintWithDelay"
-				>
+				<n8n-tooltip v-if="!readOnly" :visible="showDraggableHint && showDraggableHintWithDelay">
 					<template #content>
 						<div
 							v-html="
diff --git a/packages/editor-ui/src/components/IntersectionObserved.vue b/packages/editor-ui/src/components/IntersectionObserved.vue
index 041e70f0c76db..3be8dde88eb1b 100644
--- a/packages/editor-ui/src/components/IntersectionObserved.vue
+++ b/packages/editor-ui/src/components/IntersectionObserved.vue
@@ -22,16 +22,15 @@ export default defineComponent({
 			default: () => createEventBus(),
 		},
 	},
-	mounted() {
+	async mounted() {
 		if (!this.enabled) {
 			return;
 		}
 
-		this.$nextTick(() => {
-			this.eventBus.emit('observe', this.$refs.observed);
-		});
+		await this.$nextTick();
+		this.eventBus.emit('observe', this.$refs.observed);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.enabled) {
 			this.eventBus.emit('unobserve', this.$refs.observed);
 		}
diff --git a/packages/editor-ui/src/components/IntersectionObserver.vue b/packages/editor-ui/src/components/IntersectionObserver.vue
index d5e1d7f254b7c..f6382c8e260d4 100644
--- a/packages/editor-ui/src/components/IntersectionObserver.vue
+++ b/packages/editor-ui/src/components/IntersectionObserver.vue
@@ -61,9 +61,9 @@ export default defineComponent({
 			observer.unobserve(observed);
 		});
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.enabled) {
-			this.$data.observer.disconnect();
+			this.observer.disconnect();
 		}
 	},
 });
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index 49efd7dfeda03..791b9fa10bf9a 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -35,7 +35,7 @@
 				:inputs="config"
 				:eventBus="formBus"
 				:columnView="true"
-				@input="onInput"
+				@update="onInput"
 				@submit="onSubmit"
 			/>
 		</template>
@@ -62,7 +62,7 @@ import { VALID_EMAIL_REGEX, INVITE_USER_MODAL_KEY } from '@/constants';
 import { ROLE } from '@/utils';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 const NAME_EMAIL_FORMAT_REGEX = /^.* <(.*)>$/;
 
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index a5f8cd309a353..fbd49bf83ef91 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -41,7 +41,9 @@ export default defineComponent({
 	mixins: [pushConnection, workflowHelpers],
 	setup(props) {
 		return {
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...pushConnection.setup?.(props),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...workflowHelpers.setup?.(props),
 		};
 	},
@@ -91,7 +93,7 @@ export default defineComponent({
 		// Initialize the push connection
 		this.pushConnect();
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.pushDisconnect();
 	},
 	watch: {
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.vue b/packages/editor-ui/src/components/MainHeader/TabBar.vue
index c4ee71214767d..4ddf6b0108a88 100644
--- a/packages/editor-ui/src/components/MainHeader/TabBar.vue
+++ b/packages/editor-ui/src/components/MainHeader/TabBar.vue
@@ -7,7 +7,7 @@
 			[$style.menuCollapsed]: mainSidebarCollapsed,
 		}"
 	>
-		<n8n-radio-buttons :value="activeTab" :options="items" @input="onSelect" />
+		<n8n-radio-buttons :modelValue="activeTab" :options="items" @update:modelValue="onSelect" />
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 55d45172a20d2..87a4e5c10d6bb 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -10,7 +10,7 @@
 				>
 					<template #default="{ shortenedName }">
 						<InlineTextEdit
-							:value="workflowName"
+							:modelValue="workflowName"
 							:previewValue="shortenedName"
 							:isEditEnabled="isNameEditEnabled"
 							:maxLength="MAX_WORKFLOW_NAME_LENGTH"
@@ -28,16 +28,15 @@
 		<span v-if="settingsStore.areTagsEnabled" class="tags" data-test-id="workflow-tags-container">
 			<div v-if="isTagsEditEnabled && !readOnly">
 				<TagsDropdown
+					v-model="appliedTagIds"
 					:createEnabled="true"
-					:currentTagIds="appliedTagIds"
 					:eventBus="tagsEditBus"
-					@blur="onTagsBlur"
-					@update="onTagsUpdate"
-					@esc="onTagsEditEsc"
 					:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
 					ref="dropdown"
 					class="tags-edit"
 					data-test-id="workflow-tags-dropdown"
+					@blur="onTagsBlur"
+					@esc="onTagsEditEsc"
 				/>
 			</div>
 			<div v-else-if="currentWorkflowTagIds.length === 0 && !readOnly">
@@ -58,67 +57,65 @@
 		<span v-else class="tags"></span>
 
 		<PushConnectionTracker class="actions">
-			<template>
-				<span class="activator">
-					<WorkflowActivator :workflow-active="isWorkflowActive" :workflow-id="currentWorkflowId" />
-				</span>
-				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
-					<n8n-button
-						type="secondary"
-						class="mr-2xs"
-						@click="onShareButtonClick"
-						data-test-id="workflow-share-button"
-					>
-						{{ $locale.baseText('workflowDetails.share') }}
-					</n8n-button>
-					<template #fallback>
-						<n8n-tooltip>
-							<n8n-button type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
-								{{ $locale.baseText('workflowDetails.share') }}
-							</n8n-button>
-							<template #content>
-								<i18n
-									:path="
-										contextBasedTranslationKeys.workflows.sharing.unavailable.description.tooltip
-									"
-									tag="span"
-								>
-									<template #action>
-										<a @click="goToUpgrade">
-											{{
-												$locale.baseText(
-													contextBasedTranslationKeys.workflows.sharing.unavailable.button,
-												)
-											}}
-										</a>
-									</template>
-								</i18n>
-							</template>
-						</n8n-tooltip>
-					</template>
-				</enterprise-edition>
-				<SaveButton
-					type="primary"
-					:saved="!this.isDirty && !this.isNewWorkflow"
-					:disabled="isWorkflowSaving || readOnly"
-					data-test-id="workflow-save-button"
-					@click="onSaveButtonClick"
+			<span class="activator">
+				<WorkflowActivator :workflow-active="isWorkflowActive" :workflow-id="currentWorkflowId" />
+			</span>
+			<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
+				<n8n-button
+					type="secondary"
+					class="mr-2xs"
+					@click="onShareButtonClick"
+					data-test-id="workflow-share-button"
+				>
+					{{ $locale.baseText('workflowDetails.share') }}
+				</n8n-button>
+				<template #fallback>
+					<n8n-tooltip>
+						<n8n-button type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
+							{{ $locale.baseText('workflowDetails.share') }}
+						</n8n-button>
+						<template #content>
+							<i18n-t
+								:keypath="
+									contextBasedTranslationKeys.workflows.sharing.unavailable.description.tooltip
+								"
+								tag="span"
+							>
+								<template #action>
+									<a @click="goToUpgrade">
+										{{
+											$locale.baseText(
+												contextBasedTranslationKeys.workflows.sharing.unavailable.button,
+											)
+										}}
+									</a>
+								</template>
+							</i18n-t>
+						</template>
+					</n8n-tooltip>
+				</template>
+			</enterprise-edition>
+			<SaveButton
+				type="primary"
+				:saved="!this.isDirty && !this.isNewWorkflow"
+				:disabled="isWorkflowSaving || readOnly"
+				data-test-id="workflow-save-button"
+				@click="onSaveButtonClick"
+			/>
+			<div :class="$style.workflowMenuContainer">
+				<input
+					:class="$style.hiddenInput"
+					type="file"
+					ref="importFile"
+					data-test-id="workflow-import-input"
+					@change="handleFileImport()"
 				/>
-				<div :class="$style.workflowMenuContainer">
-					<input
-						:class="$style.hiddenInput"
-						type="file"
-						ref="importFile"
-						data-test-id="workflow-import-input"
-						@change="handleFileImport()"
-					/>
-					<n8n-action-dropdown
-						:items="workflowMenuItems"
-						data-test-id="workflow-menu"
-						@select="onWorkflowMenuSelect"
-					/>
-				</div>
-			</template>
+				<n8n-action-dropdown
+					:items="workflowMenuItems"
+					data-test-id="workflow-menu"
+					@select="onWorkflowMenuSelect"
+				/>
+			</div>
 		</PushConnectionTracker>
 	</div>
 </template>
@@ -153,7 +150,7 @@ import type { IUser, IWorkflowDataUpdate, IWorkflowDb, IWorkflowToShare } from '
 
 import { saveAs } from 'file-saver';
 import { useTitleChange, useToast, useMessage } from '@/composables';
-import type { MessageBoxInputData } from 'element-ui/types/message-box';
+import type { MessageBoxInputData } from 'element-plus';
 import {
 	useUIStore,
 	useSettingsStore,
@@ -166,7 +163,7 @@ import {
 } from '@/stores';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import { useCloudPlanStore } from '@/stores';
 import { nodeViewEventBus } from '@/event-bus';
 import { genericHelpers } from '@/mixins/genericHelpers';
@@ -370,31 +367,28 @@ export default defineComponent({
 			});
 		},
 		onTagsEditEnable() {
-			this.$data.appliedTagIds = this.currentWorkflowTagIds;
-			this.$data.isTagsEditEnabled = true;
+			this.appliedTagIds = this.currentWorkflowTagIds;
+			this.isTagsEditEnabled = true;
 
 			setTimeout(() => {
 				// allow name update to occur before disabling name edit
-				this.$data.isNameEditEnabled = false;
-				this.$data.tagsEditBus.emit('focus');
+				this.isNameEditEnabled = false;
+				this.tagsEditBus.emit('focus');
 			}, 0);
 		},
-		async onTagsUpdate(tags: string[]) {
-			this.$data.appliedTagIds = tags;
-		},
 
 		async onTagsBlur() {
 			const current = this.currentWorkflowTagIds;
-			const tags = this.$data.appliedTagIds;
+			const tags = this.appliedTagIds;
 			if (!hasChanged(current, tags)) {
-				this.$data.isTagsEditEnabled = false;
+				this.isTagsEditEnabled = false;
 
 				return;
 			}
-			if (this.$data.tagsSaving) {
+			if (this.tagsSaving) {
 				return;
 			}
-			this.$data.tagsSaving = true;
+			this.tagsSaving = true;
 
 			const saved = await this.saveCurrentWorkflow({ tags });
 			this.$telemetry.track('User edited workflow tags', {
@@ -402,26 +396,32 @@ export default defineComponent({
 				new_tag_count: tags.length,
 			});
 
-			this.$data.tagsSaving = false;
+			this.tagsSaving = false;
 			if (saved) {
-				this.$data.isTagsEditEnabled = false;
+				this.isTagsEditEnabled = false;
 			}
 		},
 		onTagsEditEsc() {
-			this.$data.isTagsEditEnabled = false;
+			this.isTagsEditEnabled = false;
 		},
 		onNameToggle() {
-			this.$data.isNameEditEnabled = !this.$data.isNameEditEnabled;
-			if (this.$data.isNameEditEnabled) {
-				if (this.$data.isTagsEditEnabled) {
+			this.isNameEditEnabled = !this.isNameEditEnabled;
+			if (this.isNameEditEnabled) {
+				if (this.isTagsEditEnabled) {
 					// @ts-ignore
 					void this.onTagsBlur();
 				}
 
-				this.$data.isTagsEditEnabled = false;
+				this.isTagsEditEnabled = false;
 			}
 		},
-		async onNameSubmit(name: string, cb: (saved: boolean) => void) {
+		async onNameSubmit({
+			name,
+			onSubmit: cb,
+		}: {
+			name: string;
+			onSubmit: (saved: boolean) => void;
+		}) {
 			const newName = name.trim();
 			if (!newName) {
 				this.showMessage({
@@ -435,7 +435,7 @@ export default defineComponent({
 			}
 
 			if (newName === this.workflowName) {
-				this.$data.isNameEditEnabled = false;
+				this.isNameEditEnabled = false;
 
 				cb(true);
 				return;
@@ -443,7 +443,7 @@ export default defineComponent({
 
 			const saved = await this.saveCurrentWorkflow({ name });
 			if (saved) {
-				this.$data.isNameEditEnabled = false;
+				this.isNameEditEnabled = false;
 			}
 			cb(saved);
 		},
@@ -603,8 +603,8 @@ export default defineComponent({
 	},
 	watch: {
 		currentWorkflowId() {
-			this.$data.isTagsEditEnabled = false;
-			this.$data.isNameEditEnabled = false;
+			this.isTagsEditEnabled = false;
+			this.isNameEditEnabled = false;
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 3d1c0883cadf2..9f5f278179470 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -111,7 +111,7 @@ import { workflowRun } from '@/mixins/workflowRun';
 import { ABOUT_MODAL_KEY, VERSIONS_MODAL_KEY, VIEWS } from '@/constants';
 import { userHelpers } from '@/mixins/userHelpers';
 import { debounceHelper } from '@/mixins/debounce';
-import Vue, { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import {
 	useUIStore,
@@ -138,6 +138,7 @@ export default defineComponent({
 	setup(props) {
 		return {
 			...useMessage(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...workflowRun.setup?.(props),
 		};
 	},
@@ -336,23 +337,26 @@ export default defineComponent({
 			};
 		},
 	},
-	async mounted() {
+	mounted() {
 		this.basePath = this.rootStore.baseUrl;
 		if (this.$refs.user) {
 			void this.$externalHooks().run('mainSidebar.mounted', { userRef: this.$refs.user });
 		}
-		if (window.innerWidth < 900 || this.uiStore.isNodeView) {
-			this.uiStore.sidebarMenuCollapsed = true;
-		} else {
-			this.uiStore.sidebarMenuCollapsed = false;
-		}
-		await Vue.nextTick();
-		this.fullyExpanded = !this.isCollapsed;
+
+		void this.$nextTick(() => {
+			if (window.innerWidth < 900 || this.uiStore.isNodeView) {
+				this.uiStore.sidebarMenuCollapsed = true;
+			} else {
+				this.uiStore.sidebarMenuCollapsed = false;
+			}
+
+			this.fullyExpanded = !this.isCollapsed;
+		});
 	},
 	created() {
 		window.addEventListener('resize', this.onResize);
 	},
-	destroyed() {
+	beforeUnmount() {
 		window.removeEventListener('resize', this.onResize);
 	},
 	methods: {
@@ -426,9 +430,9 @@ export default defineComponent({
 				case 'settings': {
 					const defaultRoute = this.findFirstAccessibleSettingsRoute();
 					if (defaultRoute) {
-						const routeProps = this.$router.resolve({ name: defaultRoute });
+						const route = this.$router.resolve({ name: defaultRoute });
 						if (this.$router.currentRoute.name !== defaultRoute) {
-							this.goToRoute(routeProps.route.path);
+							this.goToRoute(route.path);
 						}
 					}
 					break;
@@ -451,6 +455,7 @@ export default defineComponent({
 		},
 		goToRoute(route: string | { name: string }) {
 			this.$router.push(route).catch((failure) => {
+				console.log(failure);
 				// Catch navigation failures caused by route guards
 				if (!isNavigationFailure(failure)) {
 					console.error(failure);
@@ -458,37 +463,33 @@ export default defineComponent({
 			});
 		},
 		findFirstAccessibleSettingsRoute() {
-			// Get all settings rotes by filtering them by pageCategory property
 			const settingsRoutes = this.$router
 				.getRoutes()
-				.filter(
-					(category) =>
-						category.meta.telemetry && category.meta.telemetry.pageCategory === 'settings',
-				)
-				.map((route) => route.name || '');
-			let defaultSettingsRoute = null;
+				.find((route) => route.path === '/settings')!
+				.children.map((route) => route.name || '');
 
+			let defaultSettingsRoute = null;
 			for (const route of settingsRoutes) {
 				if (this.canUserAccessRouteByName(route)) {
 					defaultSettingsRoute = route;
 					break;
 				}
 			}
+
 			return defaultSettingsRoute;
 		},
 		onResize(event: UIEvent) {
 			void this.callDebounced('onResizeEnd', { debounceTime: 100 }, event);
 		},
-		onResizeEnd(event: UIEvent) {
+		async onResizeEnd(event: UIEvent) {
 			const browserWidth = (event.target as Window).outerWidth;
-			this.checkWidthAndAdjustSidebar(browserWidth);
+			await this.checkWidthAndAdjustSidebar(browserWidth);
 		},
-		checkWidthAndAdjustSidebar(width: number) {
+		async checkWidthAndAdjustSidebar(width: number) {
 			if (width < 900) {
 				this.uiStore.sidebarMenuCollapsed = true;
-				Vue.nextTick(() => {
-					this.fullyExpanded = !this.isCollapsed;
-				});
+				await this.$nextTick();
+				this.fullyExpanded = !this.isCollapsed;
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 6fd0a1d66517f..20712ff8eb2ee 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import { computed, nextTick, ref } from 'vue';
-import { useRouter } from 'vue-router/composables';
+import { useRouter } from 'vue-router';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useI18n, useLoadingService, useMessage, useToast } from '@/composables';
-import { useUIStore, useSourceControlStore, useUsersStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUsersStore } from '@/stores/users.store';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY, VIEWS } from '@/constants';
 import type { SourceControlAggregatedFile } from '../Interface';
 import { sourceControlEventBus } from '@/event-bus/source-control';
@@ -23,7 +25,7 @@ const usersStore = useUsersStore();
 const sourceControlStore = useSourceControlStore();
 const message = useMessage();
 const toast = useToast();
-const { i18n } = useI18n();
+const i18n = useI18n();
 
 const eventBus = createEventBus();
 const tooltipOpenDelay = ref(300);
@@ -83,7 +85,7 @@ async function pullWorkfolder() {
 			});
 
 			if (hasVariablesOrCredentials) {
-				nextTick(() => {
+				void nextTick(() => {
 					toast.showMessage({
 						message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
 						title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
@@ -154,12 +156,9 @@ const goToSourceControlSetup = async () => {
 						type="tertiary"
 						size="mini"
 						:square="isCollapsed"
+						:label="isCollapsed ? '' : i18n.baseText('settings.sourceControl.button.pull')"
 						@click="pullWorkfolder"
-					>
-						<span v-if="!isCollapsed">{{
-							i18n.baseText('settings.sourceControl.button.pull')
-						}}</span>
-					</n8n-button>
+					/>
 				</n8n-tooltip>
 				<n8n-tooltip
 					v-if="!sourceControlStore.preferences.branchReadOnly"
@@ -174,15 +173,12 @@ const goToSourceControlSetup = async () => {
 					</template>
 					<n8n-button
 						:square="isCollapsed"
+						:label="isCollapsed ? '' : i18n.baseText('settings.sourceControl.button.push')"
 						icon="arrow-up"
 						type="tertiary"
 						size="mini"
 						@click="pushWorkfolder"
-					>
-						<span v-if="!isCollapsed">{{
-							i18n.baseText('settings.sourceControl.button.push')
-						}}</span>
-					</n8n-button>
+					/>
 				</n8n-tooltip>
 			</div>
 		</div>
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 3ba52ae3a0b03..8f90b4e0726ab 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -1,18 +1,21 @@
 <template>
 	<el-dialog
-		:visible="uiStore.isModalOpen(this.name)"
+		:modelValue="uiStore.isModalOpen(this.name)"
 		:before-close="closeDialog"
-		:class="{ 'dialog-wrapper': true, [$style.center]: center, scrollable: scrollable }"
+		:class="{
+			'dialog-wrapper': true,
+			scrollable: scrollable,
+			[getCustomClass()]: true,
+		}"
 		:width="width"
 		:show-close="showClose"
-		:custom-class="getCustomClass()"
 		:close-on-click-modal="closeOnClickModal"
 		:close-on-press-escape="closeOnPressEscape"
 		:style="styles"
-		append-to-body
+		:append-to-body="appendToBody"
 		:data-test-id="`${this.name}-modal`"
 	>
-		<template #title v-if="$scopedSlots.header">
+		<template #header v-if="$slots.header">
 			<slot name="header" v-if="!loading" />
 		</template>
 		<template #title v-else-if="title">
@@ -36,13 +39,14 @@
 				<n8n-spinner />
 			</div>
 		</div>
-		<div v-if="!loading && $scopedSlots.footer" :class="$style.footer">
+		<div v-if="!loading && $slots.footer" :class="$style.footer">
 			<slot name="footer" :close="closeDialog" />
 		</div>
 	</el-dialog>
 </template>
 
 <script lang="ts">
+import { ElDialog } from 'element-plus';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
@@ -52,6 +56,7 @@ import { useUIStore } from '@/stores/ui.store';
 export default defineComponent({
 	name: 'Modal',
 	props: {
+		...ElDialog.props,
 		name: {
 			type: String,
 		},
@@ -118,6 +123,10 @@ export default defineComponent({
 			type: Boolean,
 			default: true,
 		},
+		appendToBody: {
+			type: Boolean,
+			default: true,
+		},
 	},
 	mounted() {
 		window.addEventListener('keydown', this.onWindowKeydown);
@@ -130,7 +139,7 @@ export default defineComponent({
 			activeElement.blur();
 		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus?.off('close', this.closeDialog);
 		this.eventBus?.off('closeAll', this.uiStore.closeAllModals);
 		window.removeEventListener('keydown', this.onWindowKeydown);
@@ -197,7 +206,7 @@ export default defineComponent({
 
 <style lang="scss">
 .dialog-wrapper {
-	.el-dialog {
+	&.el-dialog {
 		display: flex;
 		flex-direction: column;
 		max-width: var(--dialog-max-width, 80%);
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index 43398af7b7d61..9a9923c17ee7a 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -1,20 +1,18 @@
 <template>
 	<el-drawer
 		:direction="direction"
-		:visible="uiStore.isModalOpen(this.name)"
+		:modelValue="uiStore.isModalOpen(this.name)"
 		:size="width"
 		:before-close="close"
 		:modal="modal"
 		:wrapperClosable="wrapperClosable"
 	>
-		<template #title>
+		<template #header>
 			<slot name="header" />
 		</template>
-		<template>
-			<span @keydown.stop>
-				<slot name="content" />
-			</span>
-		</template>
+		<span @keydown.stop>
+			<slot name="content" />
+		</span>
 	</el-drawer>
 </template>
 
@@ -24,9 +22,13 @@ import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import type { EventBus } from 'n8n-design-system';
+import { ElDrawer } from 'element-plus';
 
 export default defineComponent({
 	name: 'ModalDrawer',
+	components: {
+		ElDrawer,
+	},
 	props: {
 		name: {
 			type: String,
@@ -38,7 +40,8 @@ export default defineComponent({
 			type: Object as PropType<EventBus>,
 		},
 		direction: {
-			type: String,
+			type: String as PropType<'ltr' | 'rtl' | 'ttb' | 'btt'>,
+			required: true,
 		},
 		modal: {
 			type: Boolean,
@@ -61,7 +64,7 @@ export default defineComponent({
 			activeElement.blur();
 		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus?.off('close', this.close);
 		window.removeEventListener('keydown', this.onWindowKeydown);
 	},
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index 2202d49e66559..1731b71ffa191 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/editor-ui/src/components/MultipleParameter.vue
@@ -56,7 +56,7 @@
 					:displayOptions="true"
 					:hideLabel="true"
 					:path="getPath(index)"
-					@valueChanged="valueChanged"
+					@update="valueChanged"
 					inputSize="small"
 					:isReadOnly="isReadOnly"
 				/>
@@ -209,6 +209,32 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+.duplicate-parameter {
+	:deep(.button) {
+		--button-background-color: var(--color-background-base);
+		--button-border-color: var(--color-foreground-base);
+	}
+
+	:deep(.duplicate-parameter-item) {
+		position: relative;
+
+		.multi > .delete-item {
+			top: 0.1em;
+		}
+	}
+
+	:deep(.duplicate-parameter-input-item) {
+		margin: 0.5em 0 0.25em 2em;
+	}
+
+	:deep(.duplicate-parameter-item + .duplicate-parameter-item) {
+		.collection-parameter-wrapper {
+			border-top: 1px dashed #999;
+			margin-top: var(--spacing-xs);
+		}
+	}
+}
+
 .duplicate-parameter-item {
 	~ .add-item-wrapper {
 		margin-top: var(--spacing-xs);
@@ -230,31 +256,6 @@ export default defineComponent({
 	}
 }
 
-::v-deep {
-	.button {
-		--button-background-color: var(--color-background-base);
-		--button-border-color: var(--color-foreground-base);
-	}
-
-	.duplicate-parameter-item {
-		position: relative;
-
-		.multi > .delete-item {
-			top: 0.1em;
-		}
-	}
-
-	.duplicate-parameter-input-item {
-		margin: 0.5em 0 0.25em 2em;
-	}
-
-	.duplicate-parameter-item + .duplicate-parameter-item {
-		.collection-parameter-wrapper {
-			border-top: 1px dashed #999;
-			margin-top: var(--spacing-xs);
-		}
-	}
-}
 .no-items-exist {
 	margin: var(--spacing-xs) 0;
 }
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index bd822b28c9949..4458c3062b24d 100644
--- a/packages/editor-ui/src/components/NDVDraggablePanels.vue
+++ b/packages/editor-ui/src/components/NDVDraggablePanels.vue
@@ -119,7 +119,7 @@ export default defineComponent({
 			this.initialized = true;
 		}, 0);
 	},
-	destroyed() {
+	beforeUnmount() {
 		window.removeEventListener('resize', this.setTotalWidth);
 	},
 	computed: {
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 6f318630b8306..08ca458cc0972 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -70,8 +70,7 @@
 				<div class="node-trigger-tooltip__wrapper">
 					<n8n-tooltip
 						placement="top"
-						manual
-						:value="showTriggerNodeTooltip"
+						:visible="showTriggerNodeTooltip"
 						popper-class="node-trigger-tooltip__wrapper--item"
 					>
 						<template #content>
@@ -82,8 +81,7 @@
 					<n8n-tooltip
 						v-if="isTriggerNode"
 						placement="top"
-						manual
-						:value="pinDataDiscoveryTooltipVisible"
+						:visible="pinDataDiscoveryTooltipVisible"
 						popper-class="node-trigger-tooltip__wrapper--item"
 					>
 						<template #content>
@@ -169,7 +167,7 @@
 </template>
 
 <script lang="ts">
-import Vue, { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import {
 	CUSTOM_API_CALL_KEY,
@@ -486,6 +484,10 @@ export default defineComponent({
 			}
 		},
 		nodeRunData(newValue) {
+			if (!this.data) {
+				return;
+			}
+
 			this.$emit('run', { name: this.data.name, data: newValue, waiting: !!this.waiting });
 		},
 	},
@@ -500,7 +502,9 @@ export default defineComponent({
 		}
 	},
 	mounted() {
-		this.setSubtitle();
+		setTimeout(() => {
+			this.setSubtitle();
+		}, 0);
 		if (this.nodeRunData) {
 			setTimeout(() => {
 				this.$emit('run', {
@@ -537,10 +541,18 @@ export default defineComponent({
 			this.unwatchWorkflowDataItems();
 		},
 		setSubtitle() {
-			const nodeSubtitle =
-				this.getNodeSubtitle(this.data, this.nodeType, this.getCurrentWorkflow()) || '';
-
-			this.nodeSubtitle = nodeSubtitle.includes(CUSTOM_API_CALL_KEY) ? '' : nodeSubtitle;
+			// why is this not a computed property? because it's a very expensive operation
+			// it requires expressions to resolve each subtitle...
+			// and ends up bogging down the UI with big workflows, for example when pasting a workflow or even opening a node...
+			// so we only update it when necessary (when node is mounted and when it's opened and closed (isActive))
+			try {
+				const nodeSubtitle =
+					this.getNodeSubtitle(this.data, this.nodeType, this.getCurrentWorkflow()) || '';
+
+				this.nodeSubtitle = nodeSubtitle.includes(CUSTOM_API_CALL_KEY) ? '' : nodeSubtitle;
+			} catch (e) {
+				// avoid breaking UI if expression error occurs
+			}
 		},
 		disableNode() {
 			if (this.data !== null) {
@@ -567,28 +579,26 @@ export default defineComponent({
 				workflow_id: this.workflowsStore.workflowId,
 			});
 		},
-		deleteNode() {
+		async deleteNode() {
 			this.$telemetry.track('User clicked node hover button', {
 				node_type: this.data.type,
 				button_name: 'delete',
 				workflow_id: this.workflowsStore.workflowId,
 			});
 
-			Vue.nextTick(() => {
-				// Wait a tick else vue causes problems because the data is gone
-				this.$emit('removeNode', this.data.name);
-			});
+			// Wait a tick else vue causes problems because the data is gone
+			await this.$nextTick();
+			this.$emit('removeNode', this.data.name);
 		},
-		duplicateNode() {
+		async duplicateNode() {
 			this.$telemetry.track('User clicked node hover button', {
 				node_type: this.data.type,
 				button_name: 'duplicate',
 				workflow_id: this.workflowsStore.workflowId,
 			});
-			Vue.nextTick(() => {
-				// Wait a tick else vue causes problems because the data is gone
-				this.$emit('duplicateNode', this.data.name);
-			});
+			// Wait a tick else vue causes problems because the data is gone
+			await this.$nextTick();
+			this.$emit('duplicateNode', this.data.name);
 		},
 
 		onClick(event: MouseEvent) {
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index 450a634781463..376033cf82952 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -20,7 +20,6 @@
 					data-test-id="add-sticky-button"
 				>
 					<n8n-icon-button
-						size="medium"
 						type="tertiary"
 						:icon="['far', 'note-sticky']"
 						:title="$locale.baseText('nodeView.addSticky')"
@@ -28,16 +27,18 @@
 				</div>
 			</div>
 		</div>
-		<node-creator
-			:active="createNodeActive"
-			@nodeTypeSelected="nodeTypeSelected"
-			@closeNodeCreator="closeNodeCreator"
-		/>
+		<Suspense>
+			<NodeCreator
+				:active="createNodeActive"
+				@nodeTypeSelected="nodeTypeSelected"
+				@closeNodeCreator="closeNodeCreator"
+			/>
+		</Suspense>
 	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
 import { getMidCanvasPosition } from '@/utils/nodeViewUtils';
 import {
 	DEFAULT_STICKY_HEIGHT,
@@ -48,10 +49,14 @@ import {
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 
+const NodeCreator = defineAsyncComponent(
+	async () => import('@/components/Node/NodeCreator/NodeCreator.vue'),
+);
+
 export default defineComponent({
 	name: 'node-creation',
 	components: {
-		NodeCreator: async () => import('@/components/Node/NodeCreator/NodeCreator.vue'),
+		NodeCreator,
 	},
 	props: {
 		nodeViewScale: {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
index b42dd251fab8d..329dbba7568bf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
@@ -21,7 +21,7 @@ const categoryName = computed(() => {
 <template>
 	<div
 		:class="$style.categoryWrapper"
-		v-on="$listeners"
+		v-bind="$attrs"
 		data-keyboard-nav="true"
 		data-test-id="node-creator-category-item"
 	>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index dd5a427f17ec2..9e871ad35d0bd 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -18,7 +18,7 @@
 			<p
 				:class="$style.communityNodeIcon"
 				v-html="
-					$locale.baseText('generic.communityNode.tooltip', {
+					i18n.baseText('generic.communityNode.tooltip', {
 						interpolate: {
 							packageName: nodeType.name.split('.')[0],
 							docURL: COMMUNITY_NODES_INSTALLATION_DOCS_URL,
@@ -38,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, getCurrentInstance } from 'vue';
+import { computed, ref } from 'vue';
 import type { SimplifiedNodeType } from '@/Interface';
 import { COMMUNITY_NODES_INSTALLATION_DOCS_URL, DEFAULT_SUBCATEGORY } from '@/constants';
 
@@ -48,6 +48,7 @@ import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 
 import { useActions } from '../composables/useActions';
+import { useI18n, useTelemetry } from '@/composables';
 
 export interface Props {
 	nodeType: SimplifiedNodeType;
@@ -59,16 +60,18 @@ const props = withDefaults(defineProps<Props>(), {
 	active: false,
 });
 
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
 const { actions } = useNodeCreatorStore();
 const { getNodeTypesWithManualTrigger } = useActions();
-const instance = getCurrentInstance();
 
 const dragging = ref(false);
 const draggablePosition = ref({ x: -100, y: -100 });
 const draggableDataTransfer = ref(null as Element | null);
 
 const description = computed<string>(() => {
-	return instance?.proxy.$locale.headerText({
+	return i18n.headerText({
 		key: `headers.${shortNodeType.value}.description`,
 		fallback: props.nodeType.description,
 	}) as string;
@@ -84,9 +87,7 @@ const nodeActions = computed(() => {
 	return nodeActions;
 });
 
-const shortNodeType = computed<string>(
-	() => instance?.proxy.$locale.shortNodeType(props.nodeType.name) || '',
-);
+const shortNodeType = computed<string>(() => i18n.shortNodeType(props.nodeType.name) || '');
 
 const draggableStyle = computed<{ top: string; left: string }>(() => ({
 	top: `${draggablePosition.value.y}px`,
@@ -99,7 +100,7 @@ const isCommunityNode = computed<boolean>(() => isCommunityPackageName(props.nod
 const displayName = computed<any>(() => {
 	const displayName = props.nodeType.displayName.trimEnd();
 
-	return instance?.proxy.$locale.headerText({
+	return i18n.headerText({
 		key: `headers.${shortNodeType.value}.displayName`,
 		fallback: hasActions.value ? displayName.replace('Trigger', '') : displayName,
 	});
@@ -153,7 +154,7 @@ function onDragEnd(event: DragEvent): void {
 
 function onCommunityNodeTooltipClick(event: MouseEvent) {
 	if ((event.target as Element).localName === 'a') {
-		instance?.proxy.$telemetry.track('user clicked cnr docs link', { source: 'nodes panel node' });
+		telemetry.track('user clicked cnr docs link', { source: 'nodes panel node' });
 	}
 }
 </script>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
index caf102f675c46..9527e68a32446 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
@@ -1,9 +1,9 @@
 <template>
 	<n8n-node-creator-node
 		:class="$style.subCategory"
-		:title="$locale.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`)"
+		:title="i18n.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`)"
 		:isTrigger="false"
-		:description="$locale.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`)"
+		:description="i18n.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`)"
 		:showActionArrow="true"
 	>
 		<template #icon>
@@ -16,11 +16,14 @@
 import type { SubcategoryItemProps } from '@/Interface';
 import { camelCase } from 'lodash-es';
 import { computed } from 'vue';
+import { useI18n } from '@/composables';
+
 export interface Props {
 	item: SubcategoryItemProps;
 }
 
 const props = defineProps<Props>();
+const i18n = useI18n();
 const subcategoryName = computed(() => camelCase(props.item.subcategory || props.item.title));
 </script>
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
index 1170f54bf10e2..be707e9f05c6c 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { computed, getCurrentInstance, onMounted, defineComponent } from 'vue';
-import type { VNode, PropType } from 'vue';
+import { computed, getCurrentInstance, onMounted, defineComponent, h } from 'vue';
+import type { PropType } from 'vue';
 import type {
 	INodeCreateElement,
 	ActionTypeDescription,
@@ -205,15 +205,15 @@ const OrderSwitcher = defineComponent({
 			type: String as PropType<NodeFilterType>,
 		},
 	},
-	render(h): VNode {
-		const triggers = this.$slots?.triggers?.[0];
-		const actions = this.$slots?.actions?.[0];
-
-		return h(
-			'div',
-			{},
-			this.rootView === REGULAR_NODE_CREATOR_VIEW ? [actions, triggers] : [triggers, actions],
-		);
+	setup(props, { slots }) {
+		return () =>
+			h(
+				'div',
+				{},
+				props.rootView === REGULAR_NODE_CREATOR_VIEW
+					? [slots.actions?.(), slots.triggers?.()]
+					: [slots.triggers?.(), slots.actions?.()],
+			);
 	},
 });
 
@@ -236,32 +236,30 @@ onMounted(() => {
 					@selected="onSelected"
 				>
 					<!-- Empty state -->
-					<template #empty>
-						<template v-if="hasNoTriggerActions">
-							<n8n-callout
-								theme="info"
-								iconless
-								slim
-								data-test-id="actions-panel-no-triggers-callout"
-							>
-								<span
-									v-html="
-										$locale.baseText('nodeCreator.actionsCallout.noTriggerItems', {
-											interpolate: { nodeName: subcategory },
-										})
-									"
-								/>
-							</n8n-callout>
-							<ItemsRenderer @selected="onSelected" :elements="placeholderTriggerActions" />
-						</template>
-
-						<template v-else>
-							<p
-								:class="$style.resetSearch"
-								v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
-								@click="resetSearch"
+					<template #empty v-if="hasNoTriggerActions">
+						<n8n-callout
+							v-if="hasNoTriggerActions"
+							theme="info"
+							iconless
+							slim
+							data-test-id="actions-panel-no-triggers-callout"
+						>
+							<span
+								v-html="
+									$locale.baseText('nodeCreator.actionsCallout.noTriggerItems', {
+										interpolate: { nodeName: subcategory },
+									})
+								"
 							/>
-						</template>
+						</n8n-callout>
+						<ItemsRenderer @selected="onSelected" :elements="placeholderTriggerActions" />
+					</template>
+					<template #empty v-else>
+						<p
+							:class="$style.resetSearch"
+							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingTriggers')"
+							@click="resetSearch"
+						/>
 					</template>
 				</CategorizedItemsRenderer>
 			</template>
@@ -274,17 +272,15 @@ onMounted(() => {
 					:expanded="!isTriggerRootView || parsedTriggerActions.length === 0"
 					@selected="onSelected"
 				>
-					<template>
-						<n8n-callout
-							theme="info"
-							iconless
-							v-if="!userActivated && isTriggerRootView"
-							slim
-							data-test-id="actions-panel-activation-callout"
-						>
-							<span v-html="$locale.baseText('nodeCreator.actionsCallout.triggersStartWorkflow')" />
-						</n8n-callout>
-					</template>
+					<n8n-callout
+						theme="info"
+						iconless
+						v-if="!userActivated && isTriggerRootView"
+						slim
+						data-test-id="actions-panel-activation-callout"
+					>
+						<span v-html="$locale.baseText('nodeCreator.actionsCallout.triggersStartWorkflow')" />
+					</n8n-callout>
 					<!-- Empty state -->
 					<template #empty>
 						<n8n-info-tip theme="info" type="note" v-if="!search" :class="$style.actionsEmpty">
@@ -296,14 +292,13 @@ onMounted(() => {
 								"
 							/>
 						</n8n-info-tip>
-						<template v-else>
-							<p
-								:class="$style.resetSearch"
-								v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingActions')"
-								@click="resetSearch"
-								data-test-id="actions-panel-no-matching-actions"
-							/>
-						</template>
+						<p
+							v-else
+							:class="$style.resetSearch"
+							v-html="$locale.baseText('nodeCreator.actionsCategory.noMatchingActions')"
+							@click="resetSearch"
+							data-test-id="actions-panel-no-matching-actions"
+						/>
 					</template>
 				</CategorizedItemsRenderer>
 			</template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
index 0dd131aa1b6cf..4448a43891c6f 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { camelCase } from 'lodash-es';
-import { getCurrentInstance, computed } from 'vue';
+import { computed } from 'vue';
 import type { INodeCreateElement, NodeFilterType } from '@/Interface';
 import { TRIGGER_NODE_CREATOR_VIEW, HTTP_REQUEST_NODE_TYPE, WEBHOOK_NODE_TYPE } from '@/constants';
 
@@ -16,6 +16,7 @@ import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
 import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
 import CategorizedItemsRenderer from '../Renderers/CategorizedItemsRenderer.vue';
 import NoResults from '../Panel/NoResults.vue';
+import { useI18n, useTelemetry } from '@/composables';
 
 export interface Props {
 	rootView: 'trigger' | 'action';
@@ -25,7 +26,9 @@ const emit = defineEmits({
 	nodeTypeSelected: (nodeTypes: string[]) => true,
 });
 
-const instance = getCurrentInstance();
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
 const { mergedNodes, actions } = useNodeCreatorStore();
 const { baseUrl } = useRootStore();
 const { getNodeTypesWithManualTrigger } = useActions();
@@ -45,7 +48,7 @@ function selectNodeType(nodeTypes: string[]) {
 
 function onSelected(item: INodeCreateElement) {
 	if (item.type === 'subcategory') {
-		const title = instance?.proxy.$locale.baseText(
+		const title = i18n.baseText(
 			`nodeCreator.subcategoryNames.${camelCase(item.properties.title)}` as BaseTextKey,
 		);
 
@@ -59,7 +62,7 @@ function onSelected(item: INodeCreateElement) {
 			itemsMapper: subcategoriesMapper,
 		});
 
-		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.onSubcategorySelected', {
+		telemetry.trackNodesPanel('nodeCreateList.onSubcategorySelected', {
 			subcategory: item.key,
 		});
 	}
@@ -96,10 +99,7 @@ function onSelected(item: INodeCreateElement) {
 	}
 
 	if (item.type === 'view') {
-		const view =
-			item.key === TRIGGER_NODE_CREATOR_VIEW
-				? TriggerView(instance?.proxy?.$locale)
-				: RegularView(instance?.proxy?.$locale);
+		const view = item.key === TRIGGER_NODE_CREATOR_VIEW ? TriggerView() : RegularView();
 
 		pushViewStack({
 			title: view.title,
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index 262d166536e19..e96364719eb23 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -7,21 +7,20 @@
 				:class="$style.nodeCreator"
 				:style="nodeCreatorInlineStyle"
 				ref="nodeCreator"
-				v-click-outside="onClickOutside"
 				@dragover="onDragOver"
 				@drop="onDrop"
 				@mousedown="onMouseDown"
 				@mouseup="onMouseUp"
 				data-test-id="node-creator"
 			>
-				<NodesListPanel @nodeTypeSelected="$listeners.nodeTypeSelected" />
+				<NodesListPanel @nodeTypeSelected="onNodeTypeSelected" />
 			</div>
 		</slide-transition>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { watch, reactive, toRefs, computed } from 'vue';
+import { watch, reactive, toRefs, computed, onBeforeUnmount } from 'vue';
 
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
@@ -35,6 +34,7 @@ import { useUIStore } from '@/stores';
 
 export interface Props {
 	active?: boolean;
+	onNodeTypeSelected?: (nodeType: string) => void;
 }
 
 const props = defineProps<Props>();
@@ -61,13 +61,7 @@ const viewStacksLength = computed(() => useViewStacks().viewStacks.length);
 const nodeCreatorInlineStyle = computed(() => {
 	return { top: `${uiStore.bannersHeight + uiStore.headerHeight}px` };
 });
-
-function onClickOutside(event: Event) {
-	// We need to prevent cases where user would click inside the node creator
-	// and try to drag non-draggable element. In that case the click event would
-	// be fired and the node creator would be closed. So we stop that if we detect
-	// that the click event originated from inside the node creator. And fire click even on the
-	// original target.
+function onMouseUpOutside() {
 	if (state.mousedownInsideEvent) {
 		const clickEvent = new MouseEvent('click', {
 			bubbles: true,
@@ -75,18 +69,21 @@ function onClickOutside(event: Event) {
 		});
 		state.mousedownInsideEvent.target?.dispatchEvent(clickEvent);
 		state.mousedownInsideEvent = null;
-		return;
-	}
-
-	if (event.type === 'click') {
-		emit('closeNodeCreator');
+		unBindOnMouseUpOutside();
 	}
 }
+function unBindOnMouseUpOutside() {
+	document.removeEventListener('mouseup', onMouseUpOutside);
+	document.removeEventListener('touchstart', onMouseUpOutside);
+}
 function onMouseUp() {
 	state.mousedownInsideEvent = null;
+	unBindOnMouseUpOutside();
 }
 function onMouseDown(event: MouseEvent) {
 	state.mousedownInsideEvent = event;
+	document.addEventListener('mouseup', onMouseUpOutside);
+	document.addEventListener('touchstart', onMouseUpOutside);
 }
 function onDragOver(event: DragEvent) {
 	event.preventDefault();
@@ -147,6 +144,10 @@ watch(
 	{ immediate: true },
 );
 const { nodeCreator } = toRefs(state);
+
+onBeforeUnmount(() => {
+	unBindOnMouseUpOutside();
+});
 </script>
 
 <style module lang="scss">
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
index c4a4c6ab4248a..aca86133e1056 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { getCurrentInstance, computed, onMounted, onUnmounted, watch } from 'vue';
+import { computed, onMounted, onUnmounted, watch } from 'vue';
 import type { INodeCreateElement } from '@/Interface';
 import { TRIGGER_NODE_CREATOR_VIEW } from '@/constants';
 
@@ -11,8 +11,9 @@ import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
 import SearchBar from './SearchBar.vue';
 import ActionsRenderer from '../Modes/ActionsMode.vue';
 import NodesRenderer from '../Modes/NodesMode.vue';
+import { useI18n } from '@/composables';
 
-const instance = getCurrentInstance();
+const i18n = useI18n();
 
 const { mergedNodes } = useNodeCreatorStore();
 const { pushViewStack, popViewStack, updateCurrentViewStack } = useViewStacks();
@@ -25,10 +26,10 @@ const viewStacks = computed(() => useViewStacks().viewStacks);
 const isActionsMode = computed(() => useViewStacks().activeViewStackMode === 'actions');
 const searchPlaceholder = computed(() =>
 	isActionsMode.value
-		? instance?.proxy?.$locale.baseText('nodeCreator.actionsCategory.searchActions', {
+		? i18n.baseText('nodeCreator.actionsCategory.searchActions', {
 				interpolate: { node: activeViewStack.value.title as string },
 		  })
-		: instance?.proxy?.$locale.baseText('nodeCreator.searchBar.searchNodes'),
+		: i18n.baseText('nodeCreator.searchBar.searchNodes'),
 );
 
 const nodeCreatorView = computed(() => useNodeCreatorStore().selectedView);
@@ -58,10 +59,7 @@ onUnmounted(() => {
 watch(
 	() => nodeCreatorView.value,
 	(selectedView) => {
-		const view =
-			selectedView === TRIGGER_NODE_CREATOR_VIEW
-				? TriggerView(instance?.proxy?.$locale)
-				: RegularView(instance?.proxy?.$locale);
+		const view = selectedView === TRIGGER_NODE_CREATOR_VIEW ? TriggerView() : RegularView();
 
 		pushViewStack({
 			title: view.title,
@@ -124,15 +122,15 @@ function onBackButton() {
 						? searchPlaceholder
 						: $locale.baseText('nodeCreator.searchBar.searchNodes')
 				"
-				@input="onSearch"
-				:value="activeViewStack.search"
+				:modelValue="activeViewStack.search"
+				@update:modelValue="onSearch"
 			/>
 			<div :class="$style.renderedItems">
 				<!-- Actions mode -->
-				<ActionsRenderer v-if="isActionsMode && activeViewStack.subcategory" v-on="$listeners" />
+				<ActionsRenderer v-if="isActionsMode && activeViewStack.subcategory" v-bind="$attrs" />
 
 				<!-- Nodes Mode -->
-				<NodesRenderer v-else :rootView="nodeCreatorView" v-on="$listeners" />
+				<NodesRenderer v-else :rootView="nodeCreatorView" v-bind="$attrs" />
 			</div>
 		</aside>
 	</transition>
@@ -149,14 +147,14 @@ function onBackButton() {
 	right: 0;
 }
 
-:global(.panel-slide-out-enter),
+:global(.panel-slide-out-enter-from),
 :global(.panel-slide-in-leave-to) {
 	transform: translateX(0);
 	z-index: -1;
 }
 
 :global(.panel-slide-out-leave-to),
-:global(.panel-slide-in-enter) {
+:global(.panel-slide-in-enter-from) {
 	transform: translateX(100%);
 	// Make sure the leaving panel stays on top
 	// for the slide-out panel effect
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
index 1d69c17eeae50..003bc48f2628b 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
@@ -1,21 +1,21 @@
 <template>
 	<div :class="$style.searchContainer" data-test-id="search-bar">
-		<div :class="{ [$style.prefix]: true, [$style.active]: value.length > 0 }">
+		<div :class="{ [$style.prefix]: true, [$style.active]: modelValue.length > 0 }">
 			<font-awesome-icon icon="search" size="sm" />
 		</div>
 		<div :class="$style.text">
 			<input
 				:placeholder="placeholder"
-				:value="value"
-				@input="onInput"
+				:value="modelValue"
 				:class="$style.input"
 				ref="inputRef"
 				autofocus
 				data-test-id="node-creator-search-bar"
 				tabindex="0"
+				@input="onInput"
 			/>
 		</div>
-		<div :class="$style.suffix" v-if="value.length > 0" @click="clear">
+		<div :class="$style.suffix" v-if="modelValue.length > 0" @click="clear">
 			<button :class="[$style.clear, $style.clickable]">
 				<font-awesome-icon icon="times-circle" />
 			</button>
@@ -30,16 +30,16 @@ import { runExternalHook } from '@/utils';
 
 export interface Props {
 	placeholder: string;
-	value: string;
+	modelValue: string;
 }
 
 withDefaults(defineProps<Props>(), {
 	placeholder: '',
-	value: '',
+	modelValue: '',
 });
 
 const emit = defineEmits<{
-	(event: 'input', value: string): void;
+	(event: 'update:modelValue', value: string): void;
 }>();
 
 const state = reactive({
@@ -52,11 +52,11 @@ function focus() {
 
 function onInput(event: Event) {
 	const input = event.target as HTMLInputElement;
-	emit('input', input.value);
+	emit('update:modelValue', input.value);
 }
 
 function clear() {
-	emit('input', '');
+	emit('update:modelValue', '');
 }
 
 onMounted(() => {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
index 6ea7adef79f92..503ee6f54f2ff 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -117,8 +117,8 @@ registerKeyHook(`CategoryLeft_${props.category}`, {
 		<!-- Pass through listeners & empty slot to ItemsRenderer -->
 		<ItemsRenderer
 			v-if="expanded"
+			v-bind="$attrs"
 			:elements="elements"
-			v-on="$listeners"
 			:isTrigger="isTriggerCategory"
 		>
 			<template #default> </template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
index 52e3a383df8ab..0d55d55518774 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
@@ -125,7 +125,7 @@ watch(
 			:data-keyboard-nav-id="item.uuid"
 			@click="wrappedEmit('selected', item)"
 		>
-			<template v-if="renderedItems.includes(item)">
+			<div v-if="renderedItems.includes(item)">
 				<label-item v-if="item.type === 'label'" :item="item" />
 				<subcategory-item v-if="item.type === 'subcategory'" :item="item.properties" />
 
@@ -148,7 +148,7 @@ watch(
 					:view="item.properties"
 					:class="$style.viewItem"
 				/>
-			</template>
+			</div>
 
 			<n8n-loading :loading="true" :rows="1" variant="p" :class="$style.itemSkeleton" v-else />
 		</div>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
index a566eb6b57d0c..fa290aa550a0c 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
@@ -1,31 +1,34 @@
-import { render, screen } from '@testing-library/vue';
+import { screen } from '@testing-library/vue';
 import CategoryItem from '../ItemTypes/CategoryItem.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const renderComponent = createComponentRenderer(CategoryItem);
 
 describe('CategoryItem', () => {
 	it('should allow expand and collapse', async () => {
-		const { container, updateProps } = render(CategoryItem, { props: { name: 'Category Test' } });
+		const { container, rerender } = renderComponent({ props: { name: 'Category Test' } });
 
 		expect(container.querySelector('[data-icon="chevron-down"]')).toBeInTheDocument();
-		await updateProps({ expanded: false });
+		await rerender({ expanded: false });
 		expect(container.querySelector('[data-icon="chevron-down"]')).not.toBeInTheDocument();
 		expect(container.querySelector('[data-icon="chevron-up"]')).toBeInTheDocument();
 	});
 
 	it('should show count', async () => {
-		const { updateProps } = render(CategoryItem, { props: { name: 'Category Test', count: 10 } });
+		const { rerender } = renderComponent({ props: { name: 'Category Test', count: 10 } });
 
 		expect(screen.getByText('Category Test (10)')).toBeInTheDocument();
-		await updateProps({ count: 0 });
+		await rerender({ count: 0 });
 		expect(screen.getByText('Category Test')).toBeInTheDocument();
 	});
 
 	it('should show trigger icon', async () => {
-		const { updateProps, container } = render(CategoryItem, {
+		const { rerender, container } = renderComponent({
 			props: { name: 'Category Test', isTrigger: true },
 		});
 
 		expect(container.querySelector('[data-icon="bolt"]')).toBeInTheDocument();
-		await updateProps({ isTrigger: false });
+		await rerender({ isTrigger: false });
 		expect(container.querySelector('[data-icon="bolt"]')).not.toBeInTheDocument();
 	});
 });
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
index 39d236f4b846f..27c9516588ee5 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
@@ -1,7 +1,6 @@
-import Vue from 'vue';
-import { PiniaVuePlugin } from 'pinia';
+import { nextTick } from 'vue';
 import { createTestingPinia } from '@pinia/testing';
-import { render, fireEvent } from '@testing-library/vue';
+import { fireEvent } from '@testing-library/vue';
 import {
 	mockSubcategoryCreateElement,
 	mockLabelCreateElement,
@@ -10,6 +9,9 @@ import {
 import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
 import { mockActionCreateElement } from './utils';
 import { mockViewCreateElement } from './utils';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const renderComponent = createComponentRenderer(ItemsRenderer);
 
 describe('ItemsRenderer', () => {
 	it('should render items', async () => {
@@ -24,18 +26,16 @@ describe('ItemsRenderer', () => {
 			mockNodeCreateElement('subcategory', { displayName: 'Node 3', name: 'node3' }),
 			mockSubcategoryCreateElement({ title: 'Subcategory 2' }),
 		];
-		const { container } = render(
-			ItemsRenderer,
-			{
-				pinia: createTestingPinia(),
-				props: { elements: items },
-			},
-			(vue) => {
-				vue.use(PiniaVuePlugin);
+
+		const { container } = renderComponent({
+			pinia: createTestingPinia(),
+			props: { elements: items },
+			global: {
+				stubs: ['n8n-loading'],
 			},
-		);
-		//
-		await Vue.nextTick();
+		});
+
+		await nextTick();
 
 		const nodeItems = container.querySelectorAll('.iteratorItem .nodeItem');
 		const labels = container.querySelectorAll('.iteratorItem .label');
@@ -53,18 +53,12 @@ describe('ItemsRenderer', () => {
 			mockActionCreateElement(),
 			mockViewCreateElement(),
 		];
-		const { container, emitted } = render(
-			ItemsRenderer,
-			{
-				pinia: createTestingPinia(),
-				props: { elements: items },
-			},
-			(vue) => {
-				vue.use(PiniaVuePlugin);
-			},
-		);
+		const { container, emitted } = renderComponent({
+			pinia: createTestingPinia(),
+			props: { elements: items },
+		});
 		//
-		await Vue.nextTick();
+		await nextTick();
 
 		const itemTypes = {
 			node: container.querySelector('.iteratorItem .nodeItem'),
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
index e83045e0070b0..83f316e35e90a 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
@@ -1,30 +1,14 @@
-import Vue, { defineComponent, watch } from 'vue';
+import { defineComponent, nextTick, watch } from 'vue';
 import type { PropType } from 'vue';
-import { PiniaVuePlugin, createPinia } from 'pinia';
-import { render, screen, fireEvent } from '@testing-library/vue';
+import { createPinia } from 'pinia';
+import { screen, fireEvent } from '@testing-library/vue';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { mockSimplifiedNodeType } from './utils';
 import NodesListPanel from '../Panel/NodesListPanel.vue';
 import { REGULAR_NODE_CREATOR_VIEW } from '@/constants';
 import type { NodeFilterType } from '@/Interface';
-
-function TelemetryPlugin(vue: typeof Vue): void {
-	Object.defineProperty(vue, '$telemetry', {
-		get() {
-			return {
-				trackNodesPanel: () => {},
-			};
-		},
-	});
-	Object.defineProperty(vue.prototype, '$telemetry', {
-		get() {
-			return {
-				trackNodesPanel: () => {},
-			};
-		},
-	});
-}
+import { createComponentRenderer } from '@/__tests__/render';
 
 function getWrapperComponent(setup: () => void) {
 	const wrapperComponent = defineComponent({
@@ -41,16 +25,11 @@ function getWrapperComponent(setup: () => void) {
 		template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
 	});
 
-	return render(
-		wrapperComponent,
-		{
-			pinia: createPinia(),
-		},
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-			vue.use(TelemetryPlugin);
+	return createComponentRenderer(wrapperComponent, {
+		global: {
+			plugins: [createPinia()],
 		},
-	);
+	})();
 }
 
 describe('NodesListPanel', () => {
@@ -78,11 +57,11 @@ describe('NodesListPanel', () => {
 				return {};
 			});
 
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.getByText('Select a trigger')).toBeInTheDocument();
 			expect(screen.queryByTestId('node-creator-search-bar')).toBeInTheDocument();
 			screen.getByText('On app event').click();
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.queryByTestId('node-creator-search-bar')).not.toBeInTheDocument();
 			mockedTriggerNodes.forEach((n) => {
 				expect(screen.queryByText(n.name)).toBeInTheDocument();
@@ -95,7 +74,7 @@ describe('NodesListPanel', () => {
 			expect(container.querySelector('.backButton')).toBeInTheDocument();
 
 			await fireEvent.click(container.querySelector('.backButton')!);
-			await Vue.nextTick();
+			await nextTick();
 
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(6);
 		});
@@ -145,27 +124,22 @@ describe('NodesListPanel', () => {
 				template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
 			});
 
-			render(
-				wrapperComponent,
-				{
-					pinia: createPinia(),
-					props: {
-						nodeTypes: mockedNodes,
-						selectedView: REGULAR_NODE_CREATOR_VIEW,
-					},
-				},
-				(vue) => {
-					vue.use(PiniaVuePlugin);
-					vue.use(TelemetryPlugin);
+			const renderComponent = createComponentRenderer(wrapperComponent);
+
+			renderComponent({
+				pinia: createPinia(),
+				props: {
+					nodeTypes: mockedNodes,
+					selectedView: REGULAR_NODE_CREATOR_VIEW,
 				},
-			);
+			});
 
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.getByText('What happens next?')).toBeInTheDocument();
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(6);
 
 			screen.getByText('Action in an app').click();
-			await Vue.nextTick();
+			await nextTick();
 			mockedNodes.forEach((n) => {
 				expect(screen.queryByText(n.displayName)).toBeInTheDocument();
 			});
@@ -205,40 +179,31 @@ describe('NodesListPanel', () => {
 			template: '<NodesListPanel @nodeTypeSelected="e => $emit(\'nodeTypeSelected\', e)" />',
 		});
 
-		function renderComponent() {
-			return render(
-				wrapperComponent,
-				{
-					pinia: createPinia(),
-					props: {
-						nodeTypes: mockedNodes,
-					},
-				},
-				(vue) => {
-					vue.use(PiniaVuePlugin);
-					vue.use(TelemetryPlugin);
-				},
-			);
-		}
+		const renderComponent = createComponentRenderer(wrapperComponent, {
+			pinia: createPinia(),
+			props: {
+				nodeTypes: mockedNodes,
+			},
+		});
 
 		it('should be visible in the root view', async () => {
 			renderComponent();
-			await Vue.nextTick();
+			await nextTick();
 
 			expect(screen.queryByTestId('node-creator-search-bar')).toBeInTheDocument();
 		});
 		it('should not be visible if subcategory contains less than 9 items', async () => {
 			renderComponent();
-			await Vue.nextTick();
+			await nextTick();
 
 			screen.getByText('On app event').click();
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.queryByTestId('node-creator-search-bar')).not.toBeInTheDocument();
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(8);
 		});
 		it('should be visible if subcategory contains 9 or more items', async () => {
-			const { updateProps } = renderComponent();
-			await Vue.nextTick();
+			const { rerender } = renderComponent();
+			await nextTick();
 
 			mockedNodes.push(
 				mockSimplifiedNodeType({
@@ -248,11 +213,11 @@ describe('NodesListPanel', () => {
 				}),
 			);
 
-			await updateProps({ nodeTypes: [...mockedNodes] });
-			await Vue.nextTick();
+			await rerender({ nodeTypes: [...mockedNodes] });
+			await nextTick();
 
 			screen.getByText('On app event').click();
-			await Vue.nextTick();
+			await nextTick();
 
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(9);
 			expect(screen.queryByTestId('node-creator-search-bar')).toBeInTheDocument();
@@ -260,26 +225,26 @@ describe('NodesListPanel', () => {
 
 		it('should correctly handle search', async () => {
 			const { container } = renderComponent();
-			await Vue.nextTick();
+			await nextTick();
 
 			screen.getByText('On app event').click();
-			await Vue.nextTick();
+			await nextTick();
 
 			await fireEvent.input(screen.getByTestId('node-creator-search-bar'), {
 				target: { value: 'Ninth' },
 			});
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(1);
 
 			await fireEvent.input(screen.getByTestId('node-creator-search-bar'), {
 				target: { value: 'Non sense' },
 			});
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(0);
 			expect(screen.queryByText("We didn't make that... yet")).toBeInTheDocument();
 
 			await fireEvent.click(container.querySelector('.clear')!);
-			await Vue.nextTick();
+			await nextTick();
 			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(9);
 		});
 	});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
index 9bc0557a810f6..105d4443a4966 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
@@ -1,8 +1,8 @@
-import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { defineComponent, computed } from 'vue';
 import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
-import { PiniaVuePlugin, createPinia } from 'pinia';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createPinia } from 'pinia';
 
 const eventHookSpy = vi.fn();
 describe('useKeyboardNavigation', () => {
@@ -38,18 +38,16 @@ describe('useKeyboardNavigation', () => {
 		},
 	});
 
-	const renderTestComponent = () => {
-		return render(TestComponent, { pinia: createPinia() }, (vue) => {
-			vue.use(PiniaVuePlugin);
-		});
-	};
+	const renderComponent = createComponentRenderer(TestComponent, {
+		pinia: createPinia(),
+	});
 
 	afterAll(() => {
 		eventHookSpy.mockClear();
 	});
 
 	test('ArrowDown moves to the next item, cycling after last item', async () => {
-		const { container } = renderTestComponent();
+		const { container } = renderComponent();
 
 		expect(container.querySelector('[data-keyboard-nav-id="item1"]')).toHaveClass('active');
 		await userEvent.keyboard('{arrowdown}');
@@ -60,7 +58,7 @@ describe('useKeyboardNavigation', () => {
 	});
 
 	test('ArrowUp moves to the previous item, cycling after firstitem', async () => {
-		const { container } = renderTestComponent();
+		const { container } = renderComponent();
 
 		expect(container.querySelector('[data-keyboard-nav-id="item1"]')).toHaveClass('active');
 		await userEvent.keyboard('{arrowup}');
@@ -72,7 +70,7 @@ describe('useKeyboardNavigation', () => {
 	});
 
 	test('Key hooks are executed', async () => {
-		renderTestComponent();
+		renderComponent();
 
 		await userEvent.keyboard('{arrowup}');
 		expect(eventHookSpy).toHaveBeenCalledWith('item3', 'ArrowUp');
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
index f6e4782427666..440051e2226bf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
@@ -1,4 +1,4 @@
-import { ref, set } from 'vue';
+import { ref } from 'vue';
 import { defineStore } from 'pinia';
 
 export type KeyboardKey = (typeof WATCHED_KEYS)[number];
@@ -125,7 +125,7 @@ export const useKeyboardNavigation = defineStore('nodeCreatorKeyboardNavigation'
 	function registerKeyHook(name: string, hook: KeyHook) {
 		hook.keyboardKeys.forEach((keyboardKey) => {
 			if (WATCHED_KEYS.includes(keyboardKey)) {
-				set(keysHooks.value, name, hook);
+				keysHooks.value = { ...keysHooks.value, [name]: hook };
 			} else {
 				throw new Error(`Key ${keyboardKey} is not supported`);
 			}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
index f5049627658bd..b0497f2f157f5 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -1,4 +1,4 @@
-import { computed, ref, set } from 'vue';
+import { computed, ref } from 'vue';
 import { defineStore } from 'pinia';
 import { v4 as uuid } from 'uuid';
 import type { INodeCreateElement, NodeFilterType, SimplifiedNodeType } from '@/Interface';
@@ -167,7 +167,10 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		// For each key in the stack, update the matched stack
 		Object.keys(stack).forEach((key) => {
 			const typedKey = key as keyof ViewStack;
-			set(viewStacks.value[matchedIndex], key, stack[typedKey]);
+			viewStacks.value[matchedIndex] = {
+				...viewStacks.value[matchedIndex],
+				[key]: stack[typedKey],
+			};
 		});
 	}
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index cad4e97a1b01f..e4f0a77c9c3a7 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -14,12 +14,15 @@ import {
 	EMAIL_IMAP_NODE_TYPE,
 	DEFAULT_SUBCATEGORY,
 } from '@/constants';
+import { useI18n } from '@/composables';
+
+export function TriggerView() {
+	const i18n = useI18n();
 
-export function TriggerView($locale: any) {
 	return {
 		value: TRIGGER_NODE_CREATOR_VIEW,
-		title: $locale.baseText('nodeCreator.triggerHelperPanel.selectATrigger'),
-		subtitle: $locale.baseText('nodeCreator.triggerHelperPanel.selectATriggerDescription'),
+		title: i18n.baseText('nodeCreator.triggerHelperPanel.selectATrigger'),
+		subtitle: i18n.baseText('nodeCreator.triggerHelperPanel.selectATriggerDescription'),
 		items: [
 			{
 				key: DEFAULT_SUBCATEGORY,
@@ -37,12 +40,8 @@ export function TriggerView($locale: any) {
 				properties: {
 					group: [],
 					name: SCHEDULE_TRIGGER_NODE_TYPE,
-					displayName: $locale.baseText(
-						'nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName',
-					),
-					description: $locale.baseText(
-						'nodeCreator.triggerHelperPanel.scheduleTriggerDescription',
-					),
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.scheduleTriggerDescription'),
 					icon: 'fa:clock',
 				},
 			},
@@ -53,8 +52,8 @@ export function TriggerView($locale: any) {
 				properties: {
 					group: [],
 					name: WEBHOOK_NODE_TYPE,
-					displayName: $locale.baseText('nodeCreator.triggerHelperPanel.webhookTriggerDisplayName'),
-					description: $locale.baseText('nodeCreator.triggerHelperPanel.webhookTriggerDescription'),
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.webhookTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.webhookTriggerDescription'),
 					iconData: {
 						type: 'file',
 						icon: 'webhook',
@@ -69,8 +68,8 @@ export function TriggerView($locale: any) {
 				properties: {
 					group: [],
 					name: MANUAL_TRIGGER_NODE_TYPE,
-					displayName: $locale.baseText('nodeCreator.triggerHelperPanel.manualTriggerDisplayName'),
-					description: $locale.baseText('nodeCreator.triggerHelperPanel.manualTriggerDescription'),
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.manualTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.manualTriggerDescription'),
 					icon: 'fa:mouse-pointer',
 				},
 			},
@@ -81,12 +80,8 @@ export function TriggerView($locale: any) {
 				properties: {
 					group: [],
 					name: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-					displayName: $locale.baseText(
-						'nodeCreator.triggerHelperPanel.workflowTriggerDisplayName',
-					),
-					description: $locale.baseText(
-						'nodeCreator.triggerHelperPanel.workflowTriggerDescription',
-					),
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.workflowTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.workflowTriggerDescription'),
 					icon: 'fa:sign-out-alt',
 				},
 			},
@@ -103,10 +98,12 @@ export function TriggerView($locale: any) {
 	};
 }
 
-export function RegularView($locale: any) {
+export function RegularView() {
+	const i18n = useI18n();
+
 	return {
 		value: REGULAR_NODE_CREATOR_VIEW,
-		title: $locale.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
+		title: i18n.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
 		items: [
 			{
 				key: DEFAULT_SUBCATEGORY,
@@ -156,11 +153,9 @@ export function RegularView($locale: any) {
 				key: TRIGGER_NODE_CREATOR_VIEW,
 				type: 'view',
 				properties: {
-					title: $locale.baseText('nodeCreator.triggerHelperPanel.addAnotherTrigger'),
+					title: i18n.baseText('nodeCreator.triggerHelperPanel.addAnotherTrigger'),
 					icon: 'bolt',
-					description: $locale.baseText(
-						'nodeCreator.triggerHelperPanel.addAnotherTriggerDescription',
-					),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.addAnotherTriggerDescription'),
 				},
 			},
 		],
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 71096361e974a..c463765217e9a 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -17,7 +17,7 @@
 			>
 				<div v-if="readonly || isReadOnlyRoute">
 					<n8n-input
-						:value="getSelectedName(credentialTypeDescription.name)"
+						:modelValue="getSelectedName(credentialTypeDescription.name)"
 						disabled
 						size="small"
 						data-test-id="node-credentials-select"
@@ -29,8 +29,8 @@
 					data-test-id="node-credentials-select"
 				>
 					<n8n-select
-						:value="getSelectedId(credentialTypeDescription.name)"
-						@change="
+						:modelValue="getSelectedId(credentialTypeDescription.name)"
+						@update:modelValue="
 							(value) =>
 								onCredentialSelected(
 									credentialTypeDescription.name,
@@ -46,6 +46,7 @@
 							v-for="item in getCredentialOptions(
 								getAllRelatedCredentialTypes(credentialTypeDescription),
 							)"
+							:data-test-id="`node-credentials-select-item-${item.id}`"
 							:key="item.id"
 							:label="item.name"
 							:value="item.id"
@@ -56,6 +57,7 @@
 							</div>
 						</n8n-option>
 						<n8n-option
+							data-test-id="node-credentials-select-item-new"
 							:key="NEW_CREDENTIALS_TEXT"
 							:value="NEW_CREDENTIALS_TEXT"
 							:label="NEW_CREDENTIALS_TEXT"
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 1169b342db614..011fd42042407 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -1,19 +1,18 @@
 <template>
 	<el-dialog
-		:visible="(!!activeNode || renaming) && !isActiveStickyNode"
+		:modelValue="(!!activeNode || renaming) && !isActiveStickyNode"
 		:before-close="close"
 		:show-close="false"
-		custom-class="data-display-wrapper"
-		class="ndv-wrapper"
+		class="data-display-wrapper ndv-wrapper"
+		overlay-class="data-display-overlay"
 		width="auto"
 		append-to-body
 		data-test-id="ndv"
 	>
 		<n8n-tooltip
 			placement="bottom-start"
-			:value="showTriggerWaitingWarning"
+			:visible="showTriggerWaitingWarning"
 			:disabled="!showTriggerWaitingWarning"
-			manual
 		>
 			<template #content>
 				<div :class="$style.triggerWarning">
@@ -48,7 +47,7 @@
 				@dragstart="onDragStart"
 				@dragend="onDragEnd"
 			>
-				<template #input>
+				<template #input v-if="showTriggerPanel || !isTriggerNode">
 					<TriggerPanel
 						v-if="showTriggerPanel"
 						:nodeName="activeNode.name"
@@ -127,7 +126,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import type {
 	INodeConnections,
 	INodeTypeDescription,
@@ -193,6 +192,7 @@ export default defineComponent({
 		return {
 			...useDeviceSupport(),
 			...useMessage(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...workflowActivate.setup?.(props),
 		};
 	},
@@ -214,7 +214,7 @@ export default defineComponent({
 	mounted() {
 		dataPinningEventBus.on('data-pinning-discovery', this.setIsTooltipVisible);
 	},
-	destroyed() {
+	beforeUnmount() {
 		dataPinningEventBus.off('data-pinning-discovery', this.setIsTooltipVisible);
 	},
 	computed: {
@@ -419,7 +419,7 @@ export default defineComponent({
 				this.avgOutputRowHeight = 0;
 				this.avgInputRowHeight = 0;
 
-				setTimeout(this.ndvStore.setNDVSessionId, 0);
+				setTimeout(() => this.ndvStore.setNDVSessionId(), 0);
 				void this.$externalHooks().run('dataDisplay.nodeTypeChanged', {
 					nodeSubtitle: this.getNodeSubtitle(node, this.activeNodeType, this.getCurrentWorkflow()),
 				});
@@ -694,14 +694,17 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.el-overlay-dialog {
+	padding-top: var(--spacing-2xs);
+}
+
 .ndv-wrapper {
-	overflow: hidden;
+	overflow: visible;
 }
 
 .data-display-wrapper {
-	height: 93%;
+	height: calc(100% - var(--spacing-2xl));
 	width: 100%;
-	margin-top: var(--spacing-xl) !important;
 	background: none;
 	border: none;
 
@@ -713,7 +716,7 @@ export default defineComponent({
 		padding: 0 !important;
 		height: 100%;
 		min-height: 400px;
-		overflow: hidden;
+		overflow: visible;
 		border-radius: 8px;
 	}
 }
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index dae424c3f4b7a..9aa382044d056 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -5,6 +5,7 @@
 		</template>
 		<div>
 			<n8n-button
+				v-bind="$attrs"
 				:loading="nodeRunning && !isListeningForEvents && !isListeningForWorkflowEvents"
 				:disabled="disabled || !!disabledHint"
 				:label="buttonLabel"
@@ -32,6 +33,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useToast, useMessage } from '@/composables';
 
 export default defineComponent({
+	inheritAttrs: false,
 	mixins: [workflowRun, pinData],
 	props: {
 		nodeName: {
@@ -62,6 +64,7 @@ export default defineComponent({
 		return {
 			...useToast(),
 			...useMessage(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...workflowRun.setup?.(props),
 		};
 	},
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index d0c84c44dabb2..6328b6d14d91c 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -9,11 +9,12 @@
 		<div :class="$style.header">
 			<div class="header-side-menu">
 				<NodeTitle
+					v-if="node"
 					class="node-name"
-					:value="node && node.name"
+					:modelValue="node.name"
 					:nodeType="nodeType"
 					:readOnly="isReadOnly"
-					@input="nameChanged"
+					@update:modelValue="nameChanged"
 				></NodeTitle>
 				<div v-if="isExecutable">
 					<NodeExecuteButton
@@ -46,8 +47,8 @@
 			</div>
 			<div v-if="isCommunityNode" :class="$style.descriptionContainer">
 				<div class="mb-l">
-					<i18n
-						path="nodeSettings.communityNodeUnknown.description"
+					<i18n-t
+						keypath="nodeSettings.communityNodeUnknown.description"
 						tag="span"
 						@click="onMissingNodeTextClick"
 					>
@@ -58,7 +59,7 @@
 								>{{ node.type.split('.')[0] }}</a
 							>
 						</template>
-					</i18n>
+					</i18n-t>
 				</div>
 				<n8n-link
 					:to="COMMUNITY_NODES_INSTALLATION_DOCS_URL"
@@ -67,7 +68,7 @@
 					{{ $locale.baseText('nodeSettings.communityNodeUnknown.installLink.text') }}
 				</n8n-link>
 			</div>
-			<i18n v-else path="nodeSettings.nodeTypeUnknown.description" tag="span">
+			<i18n-t v-else keypath="nodeSettings.nodeTypeUnknown.description" tag="span">
 				<template #action>
 					<a
 						:href="CUSTOM_NODES_DOCS_URL"
@@ -75,7 +76,7 @@
 						v-text="$locale.baseText('nodeSettings.nodeTypeUnknown.description.customNode')"
 					/>
 				</template>
-			</i18n>
+			</i18n-t>
 		</div>
 		<div class="node-parameters-wrapper" data-test-id="node-parameters" v-if="node && nodeValid">
 			<n8n-notice
@@ -290,10 +291,10 @@ export default defineComponent({
 			return this.ndvStore.outputPanelEditMode;
 		},
 		isCommunityNode(): boolean {
-			return isCommunityPackageName(this.node.type);
+			return isCommunityPackageName(this.node?.type);
 		},
 		isTriggerNode(): boolean {
-			return this.nodeTypesStore.isTriggerNode(this.node.type);
+			return this.nodeTypesStore.isTriggerNode(this.node?.type);
 		},
 		workflowOwnerName(): string {
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowsStore.workflowId}`);
@@ -524,7 +525,7 @@ export default defineComponent({
 				}
 			}
 
-			// Set the value via Vue.set that everything updates correctly in the UI
+			// Set the value so that everything updates correctly in the UI
 			if (nameParts.length === 0) {
 				// Data is on top level
 				if (value === null) {
@@ -613,7 +614,7 @@ export default defineComponent({
 			}
 			// Save the node name before we commit the change because
 			// we need the old name to rename the node properly
-			const nodeNameBefore = parameterData.node || this.node.name;
+			const nodeNameBefore = parameterData.node || this.node?.name;
 			const node = this.workflowsStore.getNodeByName(nodeNameBefore);
 
 			if (node === null) {
@@ -934,8 +935,8 @@ export default defineComponent({
 		onMissingNodeLearnMoreLinkClick() {
 			this.$telemetry.track('user clicked cnr docs link', {
 				source: 'missing node modal source',
-				package_name: this.node.type.split('.')[0],
-				node_type: this.node.type,
+				package_name: this.node?.type.split('.')[0],
+				node_type: this.node?.type,
 			});
 		},
 		onStopExecution() {
@@ -952,7 +953,7 @@ export default defineComponent({
 
 		this.updateNodeParameterIssues(this.node as INodeUi, this.nodeType);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus?.off('openSettings', this.openSettings);
 	},
 });
@@ -974,7 +975,7 @@ export default defineComponent({
 }
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .node-settings {
 	display: flex;
 	flex-direction: column;
diff --git a/packages/editor-ui/src/components/NodeSettingsTabs.vue b/packages/editor-ui/src/components/NodeSettingsTabs.vue
index 2f4d9bee313ec..672acadb056c6 100644
--- a/packages/editor-ui/src/components/NodeSettingsTabs.vue
+++ b/packages/editor-ui/src/components/NodeSettingsTabs.vue
@@ -1,5 +1,10 @@
 <template>
-	<n8n-tabs :options="options" :value="value" @input="onTabSelect" @tooltipClick="onTooltipClick" />
+	<n8n-tabs
+		:options="options"
+		:modelValue="modelValue"
+		@update:modelValue="onTabSelect"
+		@tooltipClick="onTooltipClick"
+	/>
 </template>
 
 <script lang="ts">
@@ -22,8 +27,9 @@ export default defineComponent({
 	name: 'NodeSettingsTabs',
 	mixins: [externalHooks],
 	props: {
-		value: {
+		modelValue: {
 			type: String,
+			default: '',
 		},
 		nodeType: {},
 		sessionId: {
@@ -137,7 +143,7 @@ export default defineComponent({
 			}
 
 			if (tab === 'settings' || tab === 'params') {
-				this.$emit('input', tab);
+				this.$emit('update:modelValue', tab);
 			}
 		},
 		onTooltipClick(tab: string, event: MouseEvent) {
diff --git a/packages/editor-ui/src/components/NodeTitle.vue b/packages/editor-ui/src/components/NodeTitle.vue
index 67c3ef33a629b..ed01152edee5a 100644
--- a/packages/editor-ui/src/components/NodeTitle.vue
+++ b/packages/editor-ui/src/components/NodeTitle.vue
@@ -1,7 +1,7 @@
 <template>
 	<span :class="$style.container" data-test-id="node-title-container" @click="onEdit">
 		<span :class="$style.iconWrapper"><NodeIcon :nodeType="nodeType" :size="18" /></span>
-		<n8n-popover placement="right" width="200" :value="editName" :disabled="!editable">
+		<n8n-popover placement="right" width="200" :visible="editName" :disabled="!editable">
 			<div
 				:class="$style.editContainer"
 				@keydown.enter="onRename"
@@ -29,7 +29,7 @@
 			</div>
 			<template #reference>
 				<div :class="{ [$style.title]: true, [$style.hoverable]: editable }">
-					{{ value }}
+					{{ modelValue }}
 					<div :class="$style.editIconContainer">
 						<font-awesome-icon :class="$style.editIcon" icon="pencil-alt" v-if="editable" />
 					</div>
@@ -49,8 +49,9 @@ export default defineComponent({
 		NodeIcon,
 	},
 	props: {
-		value: {
+		modelValue: {
 			type: String,
+			default: '',
 		},
 		nodeType: {},
 		readOnly: {
@@ -70,19 +71,18 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		onEdit() {
-			this.newName = this.value;
+		async onEdit() {
+			this.newName = this.modelValue;
 			this.editName = true;
-			this.$nextTick(() => {
-				const inputRef = this.$refs.input as HTMLInputElement | undefined;
-				if (inputRef) {
-					inputRef.focus();
-				}
-			});
+			await this.$nextTick();
+			const inputRef = this.$refs.input as HTMLInputElement | undefined;
+			if (inputRef) {
+				inputRef.focus();
+			}
 		},
 		onRename() {
 			if (this.newName.trim() !== '') {
-				this.$emit('input', this.newName.trim());
+				this.$emit('update:modelValue', this.newName.trim());
 			}
 
 			this.editName = false;
diff --git a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
index 8b2736afffac0..e2bb8aa60e9e1 100644
--- a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
+++ b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
@@ -29,7 +29,6 @@
 				<n8n-button
 					:label="$locale.baseText('onboardingCallSignupModal.cancelButton.label')"
 					:disabled="loading"
-					size="medium"
 					float="right"
 					type="outline"
 					@click="onCancel"
@@ -37,7 +36,6 @@
 				<n8n-button
 					:disabled="email === '' || loading"
 					:label="$locale.baseText('onboardingCallSignupModal.signupButton.label')"
-					size="medium"
 					float="right"
 					:loading="loading"
 					@click="onSignup"
@@ -55,7 +53,7 @@ import { defineComponent } from 'vue';
 import { useToast } from '@/composables';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'OnboardingCallSignupModal',
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index 8a97d23d947e7..b953610df2347 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -36,17 +36,15 @@
 					tooltipPlacement="right"
 					v-if="hasNodeRun && staleData"
 				>
-					<template>
-						<span
-							v-html="
-								$locale.baseText(
-									hasPinData
-										? 'ndv.output.staleDataWarning.pinData'
-										: 'ndv.output.staleDataWarning.regular',
-								)
-							"
-						></span>
-					</template>
+					<span
+						v-html="
+							$locale.baseText(
+								hasPinData
+									? 'ndv.output.staleDataWarning.pinData'
+									: 'ndv.output.staleDataWarning.regular',
+							)
+						"
+					></span>
 				</n8n-info-tip>
 			</div>
 		</template>
diff --git a/packages/editor-ui/src/components/PageAlert.vue b/packages/editor-ui/src/components/PageAlert.vue
index 81031c0335c48..d2c4fdc35b2ed 100644
--- a/packages/editor-ui/src/components/PageAlert.vue
+++ b/packages/editor-ui/src/components/PageAlert.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import type { ElNotificationComponent } from 'element-ui/types/notification';
+import type { NotificationInstance } from 'element-plus';
 import { sanitizeHtml } from '@/utils';
 import { useToast } from '@/composables';
 
@@ -26,7 +26,7 @@ export default defineComponent({
 	},
 	data() {
 		return {
-			alert: null as null | ElNotificationComponent,
+			alert: null as null | NotificationInstance,
 		};
 	},
 	mounted() {
@@ -40,7 +40,7 @@ export default defineComponent({
 			customClass: this.popupClass || '',
 		});
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.alert) {
 			this.alert.close();
 		}
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 63262863029f7..39bb67a18dff6 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -2,8 +2,12 @@
 	<div @keydown.stop :class="parameterInputClasses">
 		<expression-edit
 			:dialogVisible="expressionEditDialogVisible"
-			:value="
-				isResourceLocatorParameter && typeof value !== 'string' ? (value ? value.value : '') : value
+			:modelValue="
+				isResourceLocatorParameter && typeof modelValue !== 'string'
+					? modelValue
+						? modelValue.value
+						: ''
+					: modelValue
 			"
 			:parameter="parameter"
 			:path="path"
@@ -11,14 +15,14 @@
 			:isReadOnly="isReadOnly"
 			:redactValues="shouldRedactValue"
 			@closeDialog="closeExpressionEditDialog"
-			@valueChanged="expressionUpdated"
+			@update:modelValue="expressionUpdated"
 		></expression-edit>
 		<div class="parameter-input ignore-key-press" :style="parameterInputWrapperStyle">
 			<resource-locator
 				v-if="isResourceLocatorParameter"
 				ref="resourceLocator"
 				:parameter="parameter"
-				:value="value"
+				:modelValue="modelValue"
 				:dependentParametersValues="dependentParametersValues"
 				:displayTitle="displayTitle"
 				:expressionDisplayValue="expressionDisplayValue"
@@ -30,7 +34,7 @@
 				:node="node"
 				:path="path"
 				:event-bus="eventBus"
-				@input="valueChanged"
+				@update:modelValue="valueChanged"
 				@modalOpenerClick="openExpressionEditorModal"
 				@focus="setFocus"
 				@blur="onBlur"
@@ -38,12 +42,12 @@
 			/>
 			<ExpressionParameterInput
 				v-else-if="isValueExpression || forceShowExpression"
-				:value="expressionDisplayValue"
+				:modelValue="expressionDisplayValue"
 				:title="displayTitle"
 				:isReadOnly="isReadOnly"
 				:path="path"
 				:class="{ 'ph-no-capture': shouldRedactValue }"
-				@valueChanged="expressionUpdated"
+				@update:modelValue="expressionUpdated"
 				@modalOpenerClick="openExpressionEditorModal"
 				@focus="setFocus"
 				@blur="onBlur"
@@ -57,69 +61,69 @@
 			>
 				<el-dialog
 					v-if="codeEditDialogVisible"
-					visible
+					:modelValue="true"
 					append-to-body
 					:close-on-click-modal="false"
 					width="80%"
-					:title="`${$locale.baseText('codeEdit.edit')} ${$locale
+					:title="`${i18n.baseText('codeEdit.edit')} ${$locale
 						.nodeText()
 						.inputLabelDisplayName(parameter, path)}`"
 					:before-close="closeCodeEditDialog"
 				>
 					<div class="ignore-key-press">
 						<code-node-editor
-							:value="value"
+							:modelValue="modelValue"
 							:defaultValue="parameter.default"
 							:language="editorLanguage"
 							:isReadOnly="isReadOnly"
-							@valueChanged="expressionUpdated"
+							@update:modelValue="expressionUpdated"
 						/>
 					</div>
 				</el-dialog>
 
 				<text-edit
 					:dialogVisible="textEditDialogVisible"
-					:value="value"
+					:modelValue="modelValue"
 					:parameter="parameter"
 					:path="path"
 					:isReadOnly="isReadOnly"
 					@closeDialog="closeTextEditDialog"
-					@valueChanged="expressionUpdated"
+					@update:modelValue="expressionUpdated"
 				></text-edit>
 
 				<code-node-editor
 					v-if="editorType === 'codeNodeEditor' && isCodeNode(node)"
 					:mode="node.parameters.mode"
-					:value="value"
+					:modelValue="modelValue"
 					:defaultValue="parameter.default"
 					:language="editorLanguage"
 					:isReadOnly="isReadOnly"
 					:aiButtonEnabled="settingsStore.isCloudDeployment"
-					@valueChanged="valueChangedDebounced"
+					@update:modelValue="valueChangedDebounced"
 				/>
 
 				<html-editor
 					v-else-if="editorType === 'htmlEditor'"
-					:html="value"
+					:modelValue="modelValue"
 					:isReadOnly="isReadOnly"
 					:rows="getArgument('rows')"
 					:disableExpressionColoring="!isHtmlNode(node)"
 					:disableExpressionCompletions="!isHtmlNode(node)"
-					@valueChanged="valueChangedDebounced"
+					@update:modelValue="valueChangedDebounced"
 				/>
 
 				<sql-editor
 					v-else-if="editorType === 'sqlEditor'"
-					:query="value"
+					:modelValue="modelValue"
 					:dialect="getArgument('sqlDialect')"
 					:isReadOnly="isReadOnly"
-					@valueChanged="valueChangedDebounced"
+					@update:modelValue="valueChangedDebounced"
 				/>
 
 				<div v-else-if="editorType" class="readonly-code clickable" @click="displayEditDialog()">
 					<code-node-editor
 						v-if="!codeEditDialogVisible"
-						:value="value"
+						:modelValue="modelValue"
 						:language="editorLanguage"
 						:isReadOnly="true"
 					/>
@@ -133,10 +137,8 @@
 					:size="inputSize"
 					:type="getStringInputType"
 					:rows="getArgument('rows')"
-					:value="displayValue"
 					:disabled="isReadOnly"
-					@input="onTextInputChange"
-					@change="valueChanged"
+					@update:modelValue="valueChanged($event) && onUpdateTextInput($event)"
 					@keydown.stop
 					@focus="setFocus"
 					@blur="onBlur"
@@ -153,7 +155,7 @@
 								focused: isFocused,
 								invalid: !isFocused && getIssues.length > 0 && !isValueExpression,
 							}"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 							@focus="setFocus"
 						/>
@@ -165,11 +167,11 @@
 				<el-color-picker
 					size="small"
 					class="color-picker"
-					:value="displayValue"
+					:modelValue="displayValue"
 					:disabled="isReadOnly"
 					@focus="setFocus"
 					@blur="onBlur"
-					@change="valueChanged"
+					@update:modelValue="valueChanged"
 					:title="displayTitle"
 					:show-alpha="getArgument('showAlpha')"
 				/>
@@ -177,9 +179,8 @@
 					v-model="tempValue"
 					:size="inputSize"
 					type="text"
-					:value="tempValue"
 					:disabled="isReadOnly"
-					@change="valueChanged"
+					@update:modelValue="valueChanged"
 					@keydown.stop
 					@focus="setFocus"
 					@blur="onBlur"
@@ -193,17 +194,17 @@
 				ref="inputField"
 				type="datetime"
 				:size="inputSize"
-				:value="displayValue"
+				:modelValue="displayValue"
 				:title="displayTitle"
 				:disabled="isReadOnly"
 				:placeholder="
 					parameter.placeholder
 						? getPlaceholder()
-						: $locale.baseText('parameterInput.selectDateAndTime')
+						: i18n.baseText('parameterInput.selectDateAndTime')
 				"
 				:picker-options="dateTimePickerOptions"
 				:class="{ 'ph-no-capture': shouldRedactValue }"
-				@change="valueChanged"
+				@update:modelValue="valueChanged"
 				@focus="setFocus"
 				@blur="onBlur"
 				@keydown.stop
@@ -213,15 +214,14 @@
 				v-else-if="parameter.type === 'number'"
 				ref="inputField"
 				:size="inputSize"
-				:value="displayValue"
+				:modelValue="displayValue"
 				:controls="false"
 				:max="getArgument('maxValue')"
 				:min="getArgument('minValue')"
 				:precision="getArgument('numberPrecision')"
 				:disabled="isReadOnly"
 				:class="{ 'ph-no-capture': shouldRedactValue }"
-				@change="valueChanged"
-				@input="onTextInputChange"
+				@update:modelValue="onUpdateTextInput"
 				@focus="setFocus"
 				@blur="onBlur"
 				@keydown.stop
@@ -240,7 +240,7 @@
 				:isReadOnly="isReadOnly"
 				:displayTitle="displayTitle"
 				@credentialSelected="credentialSelected"
-				@valueChanged="valueChanged"
+				@update:modelValue="valueChanged"
 				@setFocus="setFocus"
 				@onBlur="onBlur"
 			>
@@ -254,14 +254,14 @@
 				ref="inputField"
 				:size="inputSize"
 				filterable
-				:value="displayValue"
+				:modelValue="displayValue"
 				:placeholder="
-					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
+					parameter.placeholder ? getPlaceholder() : i18n.baseText('parameterInput.select')
 				"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
-				@change="valueChanged"
+				@update:modelValue="valueChanged"
 				@keydown.stop
 				@focus="setFocus"
 				@blur="onBlur"
@@ -294,12 +294,12 @@
 				:size="inputSize"
 				filterable
 				multiple
-				:value="displayValue"
+				:modelValue="displayValue"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
-				:placeholder="$locale.baseText('parameterInput.select')"
-				@change="valueChanged"
+				:placeholder="i18n.baseText('parameterInput.select')"
+				@update:modelValue="valueChanged"
 				@keydown.stop
 				@focus="setFocus"
 				@blur="onBlur"
@@ -325,7 +325,7 @@
 			<n8n-input
 				v-else-if="parameter.type === 'boolean' && droppable"
 				:size="inputSize"
-				:value="JSON.stringify(displayValue)"
+				:modelValue="JSON.stringify(displayValue)"
 				:disabled="isReadOnly"
 				:title="displayTitle"
 			/>
@@ -334,9 +334,9 @@
 				:class="{ 'switch-input': true, 'ph-no-capture': shouldRedactValue }"
 				ref="inputField"
 				active-color="#13ce66"
-				:value="displayValue"
+				:modelValue="displayValue"
 				:disabled="isReadOnly"
-				@change="valueChanged"
+				@update:modelValue="valueChanged"
 			/>
 		</div>
 
@@ -391,9 +391,9 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { htmlEditorEventBus } from '@/event-bus';
-import Vue from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
+import { useI18n } from '@/composables';
 
 export default defineComponent({
 	name: 'parameter-input',
@@ -419,7 +419,7 @@ export default defineComponent({
 		path: {
 			type: String,
 		},
-		value: {
+		modelValue: {
 			type: [String, Number, Boolean, Array, Object] as PropType<NodeParameterValueType>,
 		},
 		hideLabel: {
@@ -469,6 +469,13 @@ export default defineComponent({
 			default: () => createEventBus(),
 		},
 	},
+	setup() {
+		const i18n = useI18n();
+
+		return {
+			i18n,
+		};
+	},
 	data() {
 		return {
 			codeEditDialogVisible: false,
@@ -523,7 +530,7 @@ export default defineComponent({
 			// on which the current field depends on changes
 			await this.loadRemoteParameterOptions();
 		},
-		value() {
+		modelValue() {
 			if (this.parameter.type === 'color' && this.getArgument('showAlpha') === true) {
 				// Do not set for color with alpha else wrong value gets displayed in field
 				return;
@@ -544,7 +551,9 @@ export default defineComponent({
 				return '';
 			}
 
-			const value = isResourceLocatorValue(this.value) ? this.value.value : this.value;
+			const value = isResourceLocatorValue(this.modelValue)
+				? this.modelValue.value
+				: this.modelValue;
 			if (typeof value === 'string' && value.startsWith('=')) {
 				return value.slice(1);
 			}
@@ -552,7 +561,7 @@ export default defineComponent({
 			return `${this.displayValue ?? ''}`;
 		},
 		isValueExpression(): boolean {
-			return isValueExpression(this.parameter, this.value);
+			return isValueExpression(this.parameter, this.modelValue);
 		},
 		codeAutocomplete(): string | undefined {
 			return this.getArgument('codeAutocomplete') as string | undefined;
@@ -586,17 +595,14 @@ export default defineComponent({
 			const interpolation = { interpolate: { shortPath: this.shortPath } };
 
 			if (this.getIssues.length && this.isValueExpression) {
-				return this.$locale.baseText(
-					'parameterInput.parameterHasIssuesAndExpression',
-					interpolation,
-				);
+				return this.i18n.baseText('parameterInput.parameterHasIssuesAndExpression', interpolation);
 			} else if (this.getIssues.length && !this.isValueExpression) {
-				return this.$locale.baseText('parameterInput.parameterHasIssues', interpolation);
+				return this.i18n.baseText('parameterInput.parameterHasIssues', interpolation);
 			} else if (!this.getIssues.length && this.isValueExpression) {
-				return this.$locale.baseText('parameterInput.parameterHasExpression', interpolation);
+				return this.i18n.baseText('parameterInput.parameterHasExpression', interpolation);
 			}
 
-			return this.$locale.baseText('parameterInput.parameter', interpolation);
+			return this.i18n.baseText('parameterInput.parameter', interpolation);
 		},
 		displayValue(): string | number | boolean | null {
 			if (this.remoteParameterOptionsLoading === true) {
@@ -604,27 +610,27 @@ export default defineComponent({
 				// to user that the data is loading. If not it would
 				// display the user the key instead of the value it
 				// represents
-				return this.$locale.baseText('parameterInput.loadingOptions');
+				return this.i18n.baseText('parameterInput.loadingOptions');
 			}
 
 			// if the value is marked as empty return empty string, to prevent displaying the asterisks
-			if (this.value === CREDENTIAL_EMPTY_VALUE) {
+			if (this.modelValue === CREDENTIAL_EMPTY_VALUE) {
 				return '';
 			}
 
 			let returnValue;
 			if (this.isValueExpression === false) {
 				returnValue = this.isResourceLocatorParameter
-					? isResourceLocatorValue(this.value)
-						? this.value.value
+					? isResourceLocatorValue(this.modelValue)
+						? this.modelValue.value
 						: ''
-					: this.value;
+					: this.modelValue;
 			} else {
 				returnValue = this.expressionEvaluated;
 			}
 
-			if (this.parameter.type === 'credentialsSelect' && typeof this.value === 'string') {
-				const credType = this.credentialsStore.getCredentialTypeByName(this.value);
+			if (this.parameter.type === 'credentialsSelect' && typeof this.modelValue === 'string') {
+				const credType = this.credentialsStore.getCredentialTypeByName(this.modelValue);
 				if (credType) {
 					returnValue = credType.displayName;
 				}
@@ -690,7 +696,7 @@ export default defineComponent({
 			if (this.parameter.type === 'credentialsSelect' && this.displayValue === '') {
 				issues.parameters = issues.parameters || {};
 
-				const issue = this.$locale.baseText('parameterInput.selectACredentialTypeFromTheDropdown');
+				const issue = this.i18n.baseText('parameterInput.selectACredentialTypeFromTheDropdown');
 
 				issues.parameters[this.parameter.name] = [issue];
 			} else if (
@@ -723,7 +729,7 @@ export default defineComponent({
 							issues.parameters = {};
 						}
 
-						const issue = this.$locale.baseText('parameterInput.theValueIsNotSupported', {
+						const issue = this.i18n.baseText('parameterInput.theValueIsNotSupported', {
 							interpolate: { checkValue },
 						});
 
@@ -859,18 +865,18 @@ export default defineComponent({
 		},
 		getPlaceholder(): string {
 			return this.isForCredential
-				? this.$locale.credText().placeholder(this.parameter)
-				: this.$locale.nodeText().placeholder(this.parameter, this.path);
+				? this.i18n.credText().placeholder(this.parameter)
+				: this.i18n.nodeText().placeholder(this.parameter, this.path);
 		},
 		getOptionsOptionDisplayName(option: INodePropertyOptions): string {
 			return this.isForCredential
-				? this.$locale.credText().optionsOptionDisplayName(this.parameter, option)
-				: this.$locale.nodeText().optionsOptionDisplayName(this.parameter, option, this.path);
+				? this.i18n.credText().optionsOptionDisplayName(this.parameter, option)
+				: this.i18n.nodeText().optionsOptionDisplayName(this.parameter, option, this.path);
 		},
 		getOptionsOptionDescription(option: INodePropertyOptions): string {
 			return this.isForCredential
-				? this.$locale.credText().optionsOptionDescription(this.parameter, option)
-				: this.$locale.nodeText().optionsOptionDescription(this.parameter, option, this.path);
+				? this.i18n.credText().optionsOptionDescription(this.parameter, option)
+				: this.i18n.nodeText().optionsOptionDescription(this.parameter, option, this.path);
 		},
 
 		async loadRemoteParameterOptions() {
@@ -952,7 +958,7 @@ export default defineComponent({
 		},
 		expressionUpdated(value: string) {
 			const val: NodeParameterValueType = this.isResourceLocatorParameter
-				? { __rl: true, value, mode: this.value.mode }
+				? { __rl: true, value, mode: this.modelValue.mode }
 				: value;
 			this.valueChanged(val);
 		},
@@ -969,7 +975,7 @@ export default defineComponent({
 		onResourceLocatorDrop(data: string) {
 			this.$emit('drop', data);
 		},
-		setFocus() {
+		async setFocus() {
 			if (['json'].includes(this.parameter.type) && this.getArgument('alwaysOpenEditWindow')) {
 				this.displayEditDialog();
 				return;
@@ -985,14 +991,13 @@ export default defineComponent({
 				this.nodeName = this.node.name;
 			}
 
-			Vue.nextTick(() => {
+			await this.$nextTick();
+			// @ts-ignore
+			if (this.$refs.inputField?.focus && this.$refs.inputField?.$el) {
 				// @ts-ignore
-				if (this.$refs.inputField?.focus && this.$refs.inputField?.$el) {
-					// @ts-ignore
-					this.$refs.inputField.focus();
-					this.isFocused = true;
-				}
-			});
+				this.$refs.inputField.focus();
+				this.isFocused = true;
+			}
 
 			this.$emit('focus');
 		},
@@ -1030,6 +1035,10 @@ export default defineComponent({
 		valueChangedDebounced(value: NodeParameterValueType | {} | Date) {
 			void this.callDebounced('valueChanged', { debounceTime: 100 }, value);
 		},
+		onUpdateTextInput(value: string) {
+			this.valueChanged(value);
+			this.onTextInputChange(value);
+		},
 		valueChanged(value: NodeParameterValueType | {} | Date) {
 			if (this.parameter.name === 'nodeCredentialType') {
 				this.activeCredentialType = value as string;
@@ -1059,7 +1068,7 @@ export default defineComponent({
 				value,
 			};
 
-			this.$emit('valueChanged', parameterData);
+			this.$emit('update', parameterData);
 
 			if (this.parameter.name === 'operation' || this.parameter.name === 'mode') {
 				this.$telemetry.track('User set node operation or mode', {
@@ -1072,30 +1081,34 @@ export default defineComponent({
 				});
 			}
 		},
-		optionSelected(command: string) {
-			const prevValue = this.value;
+		async optionSelected(command: string) {
+			const prevValue = this.modelValue;
 
 			if (command === 'resetValue') {
 				this.valueChanged(this.parameter.default);
 			} else if (command === 'addExpression') {
 				if (this.isResourceLocatorParameter) {
-					if (isResourceLocatorValue(this.value)) {
-						this.valueChanged({ __rl: true, value: `=${this.value.value}`, mode: this.value.mode });
+					if (isResourceLocatorValue(this.modelValue)) {
+						this.valueChanged({
+							__rl: true,
+							value: `=${this.modelValue.value}`,
+							mode: this.modelValue.mode,
+						});
 					} else {
-						this.valueChanged({ __rl: true, value: `=${this.value}`, mode: '' });
+						this.valueChanged({ __rl: true, value: `=${this.modelValue}`, mode: '' });
 					}
 				} else if (
 					this.parameter.type === 'number' &&
-					(!this.value || this.value === '[Object: null]')
+					(!this.modelValue || this.modelValue === '[Object: null]')
 				) {
 					this.valueChanged('={{ 0 }}');
 				} else if (this.parameter.type === 'number' || this.parameter.type === 'boolean') {
-					this.valueChanged(`={{ ${this.value} }}`);
+					this.valueChanged(`={{ ${this.modelValue} }}`);
 				} else {
-					this.valueChanged(`=${this.value}`);
+					this.valueChanged(`=${this.modelValue}`);
 				}
 
-				this.setFocus();
+				await this.setFocus();
 			} else if (command === 'removeExpression') {
 				let value: NodeParameterValueType = this.expressionEvaluated;
 
@@ -1111,14 +1124,14 @@ export default defineComponent({
 						);
 				}
 
-				if (this.isResourceLocatorParameter && isResourceLocatorValue(this.value)) {
-					this.valueChanged({ __rl: true, value, mode: this.value.mode });
+				if (this.isResourceLocatorParameter && isResourceLocatorValue(this.modelValue)) {
+					this.valueChanged({ __rl: true, value, mode: this.modelValue.mode });
 				} else {
 					let newValue = typeof value !== 'undefined' ? value : null;
 
 					if (this.parameter.type === 'string') {
 						// Strip the '=' from the beginning
-						newValue = this.value ? this.value.toString().substring(1) : null;
+						newValue = this.modelValue ? this.modelValue.toString().substring(1) : null;
 					}
 
 					this.valueChanged(newValue);
@@ -1147,14 +1160,13 @@ export default defineComponent({
 			}
 		},
 	},
-	updated() {
-		this.$nextTick(() => {
-			const remoteParameterOptions = this.$el.querySelectorAll('.remote-parameter-option');
+	async updated() {
+		await this.$nextTick();
+		const remoteParameterOptions = this.$el.querySelectorAll('.remote-parameter-option');
 
-			if (remoteParameterOptions.length > 0) {
-				void this.$externalHooks().run('parameterInput.updated', { remoteParameterOptions });
-			}
-		});
+		if (remoteParameterOptions.length > 0) {
+			void this.$externalHooks().run('parameterInput.updated', { remoteParameterOptions });
+		}
 	},
 	mounted() {
 		this.eventBus.on('optionSelected', this.optionSelected);
@@ -1184,7 +1196,7 @@ export default defineComponent({
 			// Make sure to load the parameter options
 			// directly and whenever the credentials change
 			this.$watch(
-				() => this.node!.credentials,
+				() => this.node?.credentials,
 				() => {
 					void this.loadRemoteParameterOptions();
 				},
@@ -1197,7 +1209,7 @@ export default defineComponent({
 			inputFieldRef: this.$refs['inputField'],
 		});
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus.off('optionSelected', this.optionSelected);
 	},
 });
@@ -1224,13 +1236,13 @@ export default defineComponent({
 
 .parameter-input {
 	display: inline-block;
-}
 
-::v-deep .color-input {
-	display: flex;
+	:deep(.color-input) {
+		display: flex;
 
-	.el-color-picker__trigger {
-		border: none;
+		.el-color-picker__trigger {
+			border: none;
+		}
 	}
 }
 </style>
@@ -1307,7 +1319,7 @@ export default defineComponent({
 	align-items: center;
 }
 
-.input-with-opener > .el-input__suffix {
+.input-with-opener .el-input__suffix {
 	right: 0;
 }
 
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/editor-ui/src/components/ParameterInputExpanded.vue
index 3e2faac1c5264..8ead0d6eb5813 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -15,44 +15,42 @@
 				:isReadOnly="false"
 				:showOptions="true"
 				:isValueExpression="isValueExpression"
-				@optionSelected="optionSelected"
+				@update:modelValue="optionSelected"
 				@menu-expanded="onMenuExpanded"
 			/>
 		</template>
-		<template>
-			<parameter-input-wrapper
-				ref="param"
-				inputSize="large"
-				:parameter="parameter"
-				:value="value"
-				:path="parameter.name"
-				:hideIssues="true"
-				:documentationUrl="documentationUrl"
-				:errorHighlight="showRequiredErrors"
-				:isForCredential="true"
-				:eventSource="eventSource"
-				:hint="!showRequiredErrors ? hint : ''"
-				:event-bus="eventBus"
-				@focus="onFocus"
-				@blur="onBlur"
-				@textInput="valueChanged"
-				@valueChanged="valueChanged"
-			/>
-			<div :class="$style.errors" v-if="showRequiredErrors">
-				<n8n-text color="danger" size="small">
-					{{ $locale.baseText('parameterInputExpanded.thisFieldIsRequired') }}
-					<n8n-link
-						v-if="documentationUrl"
-						:to="documentationUrl"
-						size="small"
-						:underline="true"
-						@click="onDocumentationUrlClick"
-					>
-						{{ $locale.baseText('parameterInputExpanded.openDocs') }}
-					</n8n-link>
-				</n8n-text>
-			</div>
-		</template>
+		<parameter-input-wrapper
+			ref="param"
+			inputSize="large"
+			:parameter="parameter"
+			:modelValue="value"
+			:path="parameter.name"
+			:hideIssues="true"
+			:documentationUrl="documentationUrl"
+			:errorHighlight="showRequiredErrors"
+			:isForCredential="true"
+			:eventSource="eventSource"
+			:hint="!showRequiredErrors ? hint : ''"
+			:event-bus="eventBus"
+			@focus="onFocus"
+			@blur="onBlur"
+			@textInput="valueChanged"
+			@update="valueChanged"
+		/>
+		<div :class="$style.errors" v-if="showRequiredErrors">
+			<n8n-text color="danger" size="small">
+				{{ $locale.baseText('parameterInputExpanded.thisFieldIsRequired') }}
+				<n8n-link
+					v-if="documentationUrl"
+					:to="documentationUrl"
+					size="small"
+					:underline="true"
+					@click="onDocumentationUrlClick"
+				>
+					{{ $locale.baseText('parameterInputExpanded.openDocs') }}
+				</n8n-link>
+			</n8n-text>
+		</div>
 	</n8n-input-label>
 </template>
 
@@ -153,7 +151,7 @@ export default defineComponent({
 			this.eventBus.emit('optionSelected', command);
 		},
 		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('change', parameterData);
+			this.$emit('update', parameterData);
 		},
 		onDocumentationUrlClick(): void {
 			this.$telemetry.track('User clicked credential modal docs link', {
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 3ff7e88355933..53a04f79d5309 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -1,7 +1,7 @@
 <template>
 	<n8n-input-label
-		:label="hideLabel ? '' : $locale.nodeText().inputLabelDisplayName(parameter, path)"
-		:tooltipText="hideLabel ? '' : $locale.nodeText().inputLabelDescription(parameter, path)"
+		:label="hideLabel ? '' : i18n.nodeText().inputLabelDisplayName(parameter, path)"
+		:tooltipText="hideLabel ? '' : i18n.nodeText().inputLabelDescription(parameter, path)"
 		:showTooltip="focused"
 		:showOptions="menuExpanded || focused || forceShowExpression"
 		:bold="false"
@@ -16,58 +16,55 @@
 				:isReadOnly="isReadOnly"
 				:showOptions="displayOptions"
 				:showExpressionSelector="showExpressionSelector"
-				@optionSelected="optionSelected"
+				@update:modelValue="optionSelected"
 				@menu-expanded="onMenuExpanded"
 			/>
 		</template>
-		<template>
-			<draggable-target
-				type="mapping"
-				:disabled="isDropDisabled"
-				:sticky="true"
-				:stickyOffset="isValueExpression ? [26, 3] : [3, 3]"
-				@drop="onDrop"
-			>
-				<template #default="{ droppable, activeDrop }">
-					<n8n-tooltip
-						placement="left"
-						:manual="true"
-						:value="showMappingTooltip"
-						:buttons="dataMappingTooltipButtons"
-					>
-						<template #content>
-							<span
-								v-html="
-									$locale.baseText(`dataMapping.${displayMode}Hint`, {
-										interpolate: { name: parameter.displayName },
-									})
-								"
-							/>
-						</template>
-						<parameter-input-wrapper
-							ref="param"
-							:parameter="parameter"
-							:value="value"
-							:path="path"
-							:isReadOnly="isReadOnly"
-							:droppable="droppable"
-							:activeDrop="activeDrop"
-							:forceShowExpression="forceShowExpression"
-							:hint="hint"
-							:hide-issues="hideIssues"
-							:label="label"
-							:event-bus="eventBus"
-							@valueChanged="valueChanged"
-							@textInput="onTextInput"
-							@focus="onFocus"
-							@blur="onBlur"
-							@drop="onDrop"
-							inputSize="small"
+		<draggable-target
+			type="mapping"
+			:disabled="isDropDisabled"
+			:sticky="true"
+			:stickyOffset="isValueExpression ? [26, 3] : [3, 3]"
+			@drop="onDrop"
+		>
+			<template #default="{ droppable, activeDrop }">
+				<n8n-tooltip
+					placement="left"
+					:visible="showMappingTooltip"
+					:buttons="dataMappingTooltipButtons"
+				>
+					<template #content>
+						<span
+							v-html="
+								i18n.baseText(`dataMapping.${displayMode}Hint`, {
+									interpolate: { name: parameter.displayName },
+								})
+							"
 						/>
-					</n8n-tooltip>
-				</template>
-			</draggable-target>
-		</template>
+					</template>
+					<parameter-input-wrapper
+						ref="param"
+						:parameter="parameter"
+						:modelValue="value"
+						:path="path"
+						:isReadOnly="isReadOnly"
+						:droppable="droppable"
+						:activeDrop="activeDrop"
+						:forceShowExpression="forceShowExpression"
+						:hint="hint"
+						:hide-issues="hideIssues"
+						:label="label"
+						:event-bus="eventBus"
+						@update="valueChanged"
+						@textInput="onTextInput"
+						@focus="onFocus"
+						@blur="onBlur"
+						@drop="onDrop"
+						inputSize="small"
+					/>
+				</n8n-tooltip>
+			</template>
+		</draggable-target>
 	</n8n-input-label>
 </template>
 
@@ -80,7 +77,7 @@ import type { IN8nButton, INodeUi, IRunDataDisplayMode, IUpdateInformation } fro
 
 import ParameterOptions from '@/components/ParameterOptions.vue';
 import DraggableTarget from '@/components/DraggableTarget.vue';
-import { useToast } from '@/composables';
+import { useI18n, useToast } from '@/composables';
 import {
 	hasExpressionMapping,
 	isResourceLocatorValue,
@@ -101,8 +98,6 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { getMappedResult } from '@/utils/mappingUtils';
 import { createEventBus } from 'n8n-design-system/utils';
 
-type ParameterInputWrapperRef = InstanceType<typeof ParameterInputWrapper>;
-
 const DISPLAY_MODES_WITH_DATA_MAPPING = ['table', 'json', 'schema'];
 
 export default defineComponent({
@@ -115,8 +110,10 @@ export default defineComponent({
 	},
 	setup() {
 		const eventBus = createEventBus();
+		const i18n = useI18n();
 
 		return {
+			i18n,
 			eventBus,
 			...useToast(),
 		};
@@ -163,12 +160,12 @@ export default defineComponent({
 			}),
 		},
 	},
-	created() {
+	mounted() {
 		const mappingTooltipDismissHandler = this.onMappingTooltipDismissed.bind(this);
 		this.dataMappingTooltipButtons = [
 			{
 				attrs: {
-					label: this.$locale.baseText('_reusableBaseText.dismiss' as BaseTextKey),
+					label: this.i18n.baseText('_reusableBaseText.dismiss' as BaseTextKey),
 					'data-test-id': 'dismiss-mapping-tooltip',
 				},
 				listeners: {
@@ -183,7 +180,7 @@ export default defineComponent({
 			return this.ndvStore.activeNode;
 		},
 		hint(): string | null {
-			return this.$locale.nodeText().hint(this.parameter, this.path);
+			return this.i18n.nodeText().hint(this.parameter, this.path);
 		},
 		isInputTypeString(): boolean {
 			return this.parameter.type === 'string';
@@ -242,7 +239,7 @@ export default defineComponent({
 			this.eventBus.emit('optionSelected', command);
 		},
 		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
+			this.$emit('update', parameterData);
 		},
 		onTextInput(parameterData: IUpdateInformation) {
 			if (isValueExpression(this.parameter, parameterData.value)) {
@@ -299,12 +296,12 @@ export default defineComponent({
 						};
 					}
 
-					this.$emit('valueChanged', parameterData);
+					this.valueChanged(parameterData);
 
 					if (!this.ndvStore.isMappingOnboarded) {
 						this.showMessage({
-							title: this.$locale.baseText('dataMapping.success.title'),
-							message: this.$locale.baseText('dataMapping.success.moreInfo'),
+							title: this.i18n.baseText('dataMapping.success.title'),
+							message: this.i18n.baseText('dataMapping.success.moreInfo'),
 							type: 'success',
 							dangerouslyUseHTMLString: true,
 						});
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 6aa377f7372be..71230a40a9491 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -62,24 +62,26 @@
 					:underline="true"
 					color="text-dark"
 				/>
-				<collection-parameter
-					v-if="parameter.type === 'collection'"
-					:parameter="parameter"
-					:values="getParameterValue(nodeValues, parameter.name, path)"
-					:nodeValues="nodeValues"
-					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
-				/>
-				<fixed-collection-parameter
-					v-else-if="parameter.type === 'fixedCollection'"
-					:parameter="parameter"
-					:values="getParameterValue(nodeValues, parameter.name, path)"
-					:nodeValues="nodeValues"
-					:path="getPath(parameter.name)"
-					:isReadOnly="isReadOnly"
-					@valueChanged="valueChanged"
-				/>
+				<Suspense>
+					<collection-parameter
+						v-if="parameter.type === 'collection'"
+						:parameter="parameter"
+						:values="getParameterValue(nodeValues, parameter.name, path)"
+						:nodeValues="nodeValues"
+						:path="getPath(parameter.name)"
+						:isReadOnly="isReadOnly"
+						@valueChanged="valueChanged"
+					/>
+					<fixed-collection-parameter
+						v-else-if="parameter.type === 'fixedCollection'"
+						:parameter="parameter"
+						:values="getParameterValue(nodeValues, parameter.name, path)"
+						:nodeValues="nodeValues"
+						:path="getPath(parameter.name)"
+						:isReadOnly="isReadOnly"
+						@valueChanged="valueChanged"
+					/>
+				</Suspense>
 			</div>
 			<resource-mapper
 				v-else-if="parameter.type === 'resourceMapper'"
@@ -114,7 +116,7 @@
 					:isReadOnly="isReadOnly"
 					:hideLabel="false"
 					:nodeValues="nodeValues"
-					@valueChanged="valueChanged"
+					@update="valueChanged"
 					@blur="onParameterBlur(parameter.name)"
 				/>
 			</div>
@@ -126,7 +128,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
 import type {
@@ -150,14 +152,19 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { isAuthRelatedParameter, getNodeAuthFields, getMainAuthField } from '@/utils';
 import { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
 
+const FixedCollectionParameter = defineAsyncComponent(
+	async () => import('./FixedCollectionParameter.vue'),
+);
+const CollectionParameter = defineAsyncComponent(async () => import('./CollectionParameter.vue'));
+
 export default defineComponent({
 	name: 'ParameterInputList',
 	mixins: [workflowHelpers],
 	components: {
 		MultipleParameter,
 		ParameterInputFull,
-		FixedCollectionParameter: async () => import('./FixedCollectionParameter.vue'),
-		CollectionParameter: async () => import('./CollectionParameter.vue'),
+		FixedCollectionParameter,
+		CollectionParameter,
 		ImportParameter,
 		ResourceMapper,
 	},
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index a163ceec024b2..a0246a7fc6ab1 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -4,7 +4,7 @@
 			ref="param"
 			:inputSize="inputSize"
 			:parameter="parameter"
-			:value="value"
+			:modelValue="modelValue"
 			:path="path"
 			:isReadOnly="isReadOnly"
 			:droppable="droppable"
@@ -18,12 +18,12 @@
 			:expressionEvaluated="expressionValueComputed"
 			:label="label"
 			:data-test-id="`parameter-input-${parameter.name}`"
-			:event-bus="internalEventBus"
+			:event-bus="eventBus"
 			@focus="onFocus"
 			@blur="onBlur"
 			@drop="onDrop"
 			@textInput="onTextInput"
-			@valueChanged="onValueChanged"
+			@update="onValueChanged"
 		/>
 		<input-hint
 			v-if="expressionOutput"
@@ -71,17 +71,6 @@ export default defineComponent({
 		ParameterInput,
 		InputHint,
 	},
-	data() {
-		return {
-			internalEventBus: createEventBus(),
-		};
-	},
-	mounted() {
-		this.eventBus.on('optionSelected', this.optionSelected);
-	},
-	beforeDestroy() {
-		this.eventBus.off('optionSelected', this.optionSelected);
-	},
 	props: {
 		isReadOnly: {
 			type: Boolean,
@@ -92,7 +81,7 @@ export default defineComponent({
 		path: {
 			type: String,
 		},
-		value: {
+		modelValue: {
 			type: [String, Number, Boolean, Array, Object] as PropType<NodeParameterValueType>,
 		},
 		droppable: {
@@ -140,21 +129,21 @@ export default defineComponent({
 	computed: {
 		...mapStores(useNDVStore),
 		isValueExpression() {
-			return isValueExpression(this.parameter, this.value);
+			return isValueExpression(this.parameter, this.modelValue);
 		},
 		activeNode(): INodeUi | null {
 			return this.ndvStore.activeNode;
 		},
 		selectedRLMode(): INodePropertyMode | undefined {
 			if (
-				typeof this.value !== 'object' ||
+				typeof this.modelValue !== 'object' ||
 				this.parameter.type !== 'resourceLocator' ||
-				!isResourceLocatorValue(this.value)
+				!isResourceLocatorValue(this.modelValue)
 			) {
 				return undefined;
 			}
 
-			const mode = this.value.mode;
+			const mode = this.modelValue.mode;
 			if (mode) {
 				return this.parameter.modes?.find((m: INodePropertyMode) => m.name === mode);
 			}
@@ -178,7 +167,9 @@ export default defineComponent({
 			return this.ndvStore.isInputParentOfActiveNode;
 		},
 		expressionValueComputed(): string | null {
-			const value = isResourceLocatorValue(this.value) ? this.value.value : this.value;
+			const value = isResourceLocatorValue(this.modelValue)
+				? this.modelValue.value
+				: this.modelValue;
 			if (!this.activeNode || !this.isValueExpression || typeof value !== 'string') {
 				return null;
 			}
@@ -228,11 +219,8 @@ export default defineComponent({
 		onDrop(data: string) {
 			this.$emit('drop', data);
 		},
-		optionSelected(command: string) {
-			this.internalEventBus.emit('optionSelected', command);
-		},
 		onValueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
+			this.$emit('update', parameterData);
 		},
 		onTextInput(parameterData: IUpdateInformation) {
 			this.$emit('textInput', parameterData);
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index 2d3f2fba89d17..934457803ec47 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -20,20 +20,20 @@
 					iconSize="small"
 					:actions="actions"
 					:iconOrientation="iconOrientation"
-					@action="(action) => $emit('optionSelected', action)"
+					@action="(action) => $emit('update:modelValue', action)"
 					@visible-change="onMenuToggle"
 				/>
 			</div>
 			<n8n-radio-buttons
 				v-if="shouldShowExpressionSelector"
 				size="small"
-				:value="selectedView"
+				:modelValue="selectedView"
 				:disabled="isReadOnly"
-				@input="onViewSelected"
 				:options="[
 					{ label: $locale.baseText('parameterInput.fixed'), value: 'fixed' },
 					{ label: $locale.baseText('parameterInput.expression'), value: 'expression' },
 				]"
+				@update:modelValue="onViewSelected"
 			/>
 		</div>
 	</div>
@@ -44,6 +44,7 @@ import type { NodeParameterValueType } from 'n8n-workflow';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { isValueExpression, isResourceLocatorValue } from '@/utils';
+import { i18n } from '@/plugins/i18n';
 
 export default defineComponent({
 	name: 'parameter-options',
@@ -81,7 +82,7 @@ export default defineComponent({
 		loadingMessage: {
 			type: String,
 			default() {
-				return this.$locale.baseText('genericHelpers.loading');
+				return i18n.baseText('genericHelpers.loading');
 			},
 		},
 	},
@@ -173,11 +174,14 @@ export default defineComponent({
 		},
 		onViewSelected(selected: string) {
 			if (selected === 'expression') {
-				this.$emit('optionSelected', this.isValueExpression ? 'openExpression' : 'addExpression');
+				this.$emit(
+					'update:modelValue',
+					this.isValueExpression ? 'openExpression' : 'addExpression',
+				);
 			}
 
 			if (selected === 'fixed' && this.isValueExpression) {
-				this.$emit('optionSelected', 'removeExpression');
+				this.$emit('update:modelValue', 'removeExpression');
 			}
 		},
 		getArgument(argumentName: string): string | number | boolean | undefined {
@@ -209,6 +213,8 @@ export default defineComponent({
 }
 .controlsContainer {
 	display: flex;
+	align-items: center;
+	flex-direction: row;
 }
 
 .noExpressionSelector {
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index b6659ee9bf679..272d6f0161b1c 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -18,6 +18,7 @@
 					:inputs="survey"
 					:columnView="true"
 					:eventBus="formBus"
+					:teleported="teleported"
 					@submit="onSubmit"
 				/>
 			</div>
@@ -135,12 +136,18 @@ import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { useUsersStore } from '@/stores/users.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'PersonalizationModal',
 	mixins: [workflowHelpers],
 	components: { Modal },
+	props: {
+		teleported: {
+			type: Boolean,
+			default: true,
+		},
+	},
 	data() {
 		return {
 			isSaving: false,
@@ -623,7 +630,7 @@ export default defineComponent({
 			this.formBus.emit('submit');
 		},
 		async onSubmit(values: IPersonalizationLatestVersion): Promise<void> {
-			this.$data.isSaving = true;
+			this.isSaving = true;
 
 			try {
 				const survey: Record<string, GenericValue> = {
@@ -646,7 +653,7 @@ export default defineComponent({
 				this.showError(e, 'Error while submitting results');
 			}
 
-			this.$data.isSaving = false;
+			this.isSaving = false;
 			this.closeDialog();
 		},
 		async fetchOnboardingPrompt() {
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 69af9376dc567..a84cf16407556 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -5,7 +5,7 @@
 		:data-test-id="`resource-locator-${parameter.name}`"
 	>
 		<resource-locator-dropdown
-			:value="value ? value.value : ''"
+			:modelValue="modelValue ? modelValue.value : ''"
 			:show="showResourceDropdown"
 			:filterable="isSearchable"
 			:filterRequired="requiresSearchFilter"
@@ -16,7 +16,7 @@
 			:errorView="currentQueryError"
 			:width="width"
 			:event-bus="eventBus"
-			@input="onListItemSelected"
+			@update:modelValue="onListItemSelected"
 			@hide="onDropdownHide"
 			@filter="onSearchFilter"
 			@loadMore="loadResourcesDebounced"
@@ -45,18 +45,17 @@
 			>
 				<div v-if="hasMultipleModes" :class="$style.modeSelector">
 					<n8n-select
-						:value="selectedMode"
+						:modelValue="selectedMode"
 						filterable
 						:size="inputSize"
 						:disabled="isReadOnly"
-						@change="onModeSelected"
+						@update:modelValue="onModeSelected"
 						:placeholder="$locale.baseText('resourceLocator.modeSelector.placeholder')"
 						data-test-id="rlc-mode-selector"
 					>
 						<n8n-option
 							v-for="mode in parameter.modes"
 							:key="mode.name"
-							:label="$locale.baseText(getModeLabel(mode.name)) || mode.displayName"
 							:value="mode.name"
 							:disabled="isValueExpression && mode.name === 'list'"
 							:title="
@@ -65,6 +64,7 @@
 									: ''
 							"
 						>
+							{{ getModeLabel(mode.name) || mode.displayName }}
 						</n8n-option>
 					</n8n-select>
 				</div>
@@ -88,10 +88,10 @@
 							>
 								<ExpressionParameterInput
 									v-if="isValueExpression || forceShowExpression"
-									:value="expressionDisplayValue"
+									:modelValue="expressionDisplayValue"
 									:path="path"
 									isForRecordLocator
-									@valueChanged="onInputChange"
+									@update:modelValue="onInputChange"
 									@modalOpenerClick="$emit('modalOpenerClick')"
 									ref="input"
 								/>
@@ -99,7 +99,7 @@
 									v-else
 									:class="{ [$style.selectInput]: isListMode }"
 									:size="inputSize"
-									:value="valueToDisplay"
+									:modelValue="valueToDisplay"
 									:disabled="isReadOnly"
 									:readonly="isListMode"
 									:title="displayTitle"
@@ -107,7 +107,7 @@
 									type="text"
 									ref="input"
 									data-test-id="rlc-input"
-									@input="onInputChange"
+									@update:modelValue="onInputChange"
 									@focus="onInputFocus"
 									@blur="onInputBlur"
 								>
@@ -200,7 +200,7 @@ export default defineComponent({
 			type: Object as PropType<INodeProperties>,
 			required: true,
 		},
-		value: {
+		modelValue: {
 			type: [Object, String] as PropType<
 				INodeParameterResourceLocator | NodeParameterValue | undefined
 			>,
@@ -281,16 +281,16 @@ export default defineComponent({
 			return getAppNameFromNodeName(nodeType?.displayName || '');
 		},
 		selectedMode(): string {
-			if (typeof this.value !== 'object') {
+			if (typeof this.modelValue !== 'object') {
 				// legacy mode
 				return '';
 			}
 
-			if (!this.value) {
+			if (!this.modelValue) {
 				return this.parameter.modes ? this.parameter.modes[0].name : '';
 			}
 
-			return this.value.mode;
+			return this.modelValue.mode;
 		},
 		isListMode(): boolean {
 			return this.selectedMode === 'list';
@@ -335,19 +335,19 @@ export default defineComponent({
 			return hasOnlyListMode(this.parameter);
 		},
 		valueToDisplay(): NodeParameterValue {
-			if (typeof this.value !== 'object') {
-				return this.value;
+			if (typeof this.modelValue !== 'object') {
+				return this.modelValue;
 			}
 
 			if (this.isListMode) {
-				return this.value ? this.value.cachedResultName || this.value.value : '';
+				return this.modelValue ? this.modelValue.cachedResultName || this.modelValue.value : '';
 			}
 
-			return this.value ? this.value.value : '';
+			return this.modelValue ? this.modelValue.value : '';
 		},
 		urlValue(): string | null {
-			if (this.isListMode && typeof this.value === 'object') {
-				return (this.value && this.value.cachedResultUrl) || null;
+			if (this.isListMode && typeof this.modelValue === 'object') {
+				return (this.modelValue && this.modelValue.cachedResultUrl) || null;
 			}
 
 			if (this.selectedMode === 'url') {
@@ -454,10 +454,10 @@ export default defineComponent({
 			if (
 				mode.extractValue &&
 				mode.extractValue.regex &&
-				isResourceLocatorValue(this.value) &&
-				this.value.__regex !== mode.extractValue.regex
+				isResourceLocatorValue(this.modelValue) &&
+				this.modelValue.__regex !== mode.extractValue.regex
 			) {
-				this.$emit('input', { ...this.value, __regex: mode.extractValue.regex });
+				this.$emit('update:modelValue', { ...this.modelValue, __regex: mode.extractValue.regex });
 			}
 		},
 		dependentParametersValues(currentValue, oldValue) {
@@ -465,12 +465,12 @@ export default defineComponent({
 			// Reset value if dependent parameters change
 			if (
 				isUpdated &&
-				this.value &&
-				isResourceLocatorValue(this.value) &&
-				this.value.value !== ''
+				this.modelValue &&
+				isResourceLocatorValue(this.modelValue) &&
+				this.modelValue.value !== ''
 			) {
-				this.$emit('input', {
-					...this.value,
+				this.$emit('update:modelValue', {
+					...this.modelValue,
 					cachedResultName: '',
 					cachedResultUrl: '',
 					value: '',
@@ -491,7 +491,7 @@ export default defineComponent({
 			this.setWidth();
 		}, 0);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus.off('refreshList', this.refreshList);
 		window.removeEventListener('resize', this.setWidth);
 	},
@@ -590,17 +590,26 @@ export default defineComponent({
 					params.cachedResultUrl = resource.url;
 				}
 			}
-			this.$emit('input', params);
+			this.$emit('update:modelValue', params);
 		},
 		onModeSelected(value: string): void {
-			if (typeof this.value !== 'object') {
-				this.$emit('input', { __rl: true, value: this.value, mode: value });
-			} else if (value === 'url' && this.value && this.value.cachedResultUrl) {
-				this.$emit('input', { __rl: true, mode: value, value: this.value.cachedResultUrl });
-			} else if (value === 'id' && this.selectedMode === 'list' && this.value && this.value.value) {
-				this.$emit('input', { __rl: true, mode: value, value: this.value.value });
+			if (typeof this.modelValue !== 'object') {
+				this.$emit('update:modelValue', { __rl: true, value: this.modelValue, mode: value });
+			} else if (value === 'url' && this.modelValue && this.modelValue.cachedResultUrl) {
+				this.$emit('update:modelValue', {
+					__rl: true,
+					mode: value,
+					value: this.modelValue.cachedResultUrl,
+				});
+			} else if (
+				value === 'id' &&
+				this.selectedMode === 'list' &&
+				this.modelValue &&
+				this.modelValue.value
+			) {
+				this.$emit('update:modelValue', { __rl: true, mode: value, value: this.modelValue.value });
 			} else {
-				this.$emit('input', { __rl: true, mode: value, value: '' });
+				this.$emit('update:modelValue', { __rl: true, mode: value, value: '' });
 			}
 
 			this.trackEvent('User changed resource locator mode', { mode: value });
@@ -728,9 +737,10 @@ export default defineComponent({
 				}
 
 				if (mode) {
-					this.$emit('input', {
+					this.$emit('update:modelValue', {
 						__rl: true,
-						value: this.value && typeof this.value === 'object' ? this.value.value : '',
+						value:
+							this.modelValue && typeof this.modelValue === 'object' ? this.modelValue.value : '',
 						mode: mode.name,
 					});
 				}
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index f8feb2b17936b..1dc6c7dde6904 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -1,22 +1,22 @@
 <template>
 	<n8n-popover
+		:teleported="false"
 		placement="bottom"
 		:width="width"
 		:popper-class="$style.popover"
-		:value="show"
+		:visible="show"
 		trigger="manual"
 		data-test-id="resource-locator-dropdown"
-		v-click-outside="onClickOutside"
+		v-on-click-outside="onClickOutside"
 	>
 		<div :class="$style.messageContainer" v-if="errorView">
 			<slot name="error"></slot>
 		</div>
 		<div :class="$style.searchInput" v-if="filterable && !errorView" @keydown="onKeyDown">
 			<n8n-input
-				size="medium"
-				:value="filter"
+				:modelValue="filter"
 				:clearable="true"
-				@input="onFilterInput"
+				@update:modelValue="onFilterInput"
 				ref="search"
 				:placeholder="$locale.baseText('resourceLocator.search.placeholder')"
 			>
@@ -45,7 +45,7 @@
 				:key="result.value"
 				:class="{
 					[$style.resourceItem]: true,
-					[$style.selected]: result.value === value,
+					[$style.selected]: result.value === modelValue,
 					[$style.hovering]: hoverIndex === i,
 				}"
 				@click="() => onItemClick(result.value)"
@@ -90,7 +90,7 @@ const SCROLL_MARGIN_PX = 10;
 export default defineComponent({
 	name: 'resource-locator-dropdown',
 	props: {
-		value: {
+		modelValue: {
 			type: [String, Number],
 		},
 		show: {
@@ -135,7 +135,7 @@ export default defineComponent({
 	mounted() {
 		this.eventBus.on('keyDown', this.onKeyDown);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.eventBus.off('keyDown', this.onKeyDown);
 	},
 	computed: {
@@ -148,7 +148,7 @@ export default defineComponent({
 					}
 					seen.add(item.value);
 
-					if (this.value && item.value === this.value) {
+					if (this.modelValue && item.value === this.modelValue) {
 						acc.selected = item;
 					} else {
 						acc.notSelected.push(item);
@@ -209,7 +209,7 @@ export default defineComponent({
 					}
 				}
 			} else if (e.key === 'Enter') {
-				this.$emit('input', this.sortedResources[this.hoverIndex].value);
+				this.$emit('update:modelValue', this.sortedResources[this.hoverIndex].value);
 			}
 		},
 		onFilterInput(value: string) {
@@ -219,7 +219,7 @@ export default defineComponent({
 			this.$emit('hide');
 		},
 		onItemClick(selected: string) {
-			this.$emit('input', selected);
+			this.$emit('update:modelValue', selected);
 		},
 		onItemHover(index: number) {
 			this.hoverIndex = index;
@@ -261,7 +261,7 @@ export default defineComponent({
 			}, 0);
 		},
 		loading() {
-			setTimeout(this.onResultsEnd, 0); // in case of filtering
+			setTimeout(() => this.onResultsEnd(), 0); // in case of filtering
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 56786442bbd93..66b6d99cda850 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -29,9 +29,12 @@ interface Props {
 	showMappingModeSelect: boolean;
 	loading: boolean;
 	refreshInProgress: boolean;
+	teleported?: boolean;
 }
 
-const props = defineProps<Props>();
+const props = withDefaults(defineProps<Props>(), {
+	teleported: true,
+});
 const FORCE_TEXT_INPUT_FOR_TYPES: FieldType[] = ['time', 'object', 'array'];
 
 const {
@@ -281,7 +284,7 @@ defineExpose({
 					:customActions="parameterActions"
 					:loading="props.refreshInProgress"
 					:loadingMessage="fetchingFieldsLabel"
-					@optionSelected="onParameterActionSelected"
+					@update:modelValue="onParameterActionSelected"
 				/>
 			</template>
 		</n8n-input-label>
@@ -347,7 +350,7 @@ defineExpose({
 					:hideIssues="true"
 					:nodeValues="nodeValues"
 					:class="$style.parameterInputFull"
-					@valueChanged="onValueChanged"
+					@update="onValueChanged"
 				/>
 			</div>
 			<parameter-issues
@@ -364,8 +367,9 @@ defineExpose({
 					})
 				"
 				size="small"
+				:teleported="teleported"
 				:disabled="addFieldOptions.length == 0"
-				@change="addField"
+				@update:modelValue="addField"
 			>
 				<n8n-option
 					v-for="item in addFieldOptions"
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
index 21d633c1f10ee..b37cdb5c1cbd9 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -13,6 +13,7 @@ interface Props {
 	serviceName: string;
 	loading: boolean;
 	loadingError: boolean;
+	teleported?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -109,45 +110,48 @@ defineExpose({
 			:size="labelSize"
 			color="text-dark"
 		>
-			<template>
-				<div class="mt-5xs">
-					<n8n-select :value="selected" :size="props.inputSize" @change="onModeChanged">
-						<n8n-option
-							v-for="option in mappingModeOptions"
-							:key="option.value"
-							:value="option.value"
-							:label="option.name"
-							description="sadasd"
-						>
-							<div class="list-option">
-								<div class="option-headline">
-									{{ option.name }}
-								</div>
-								<div class="option-description" v-html="option.description" />
+			<div class="mt-5xs">
+				<n8n-select
+					:modelValue="selected"
+					:teleported="teleported"
+					:size="props.inputSize"
+					@update:modelValue="onModeChanged"
+				>
+					<n8n-option
+						v-for="option in mappingModeOptions"
+						:key="option.value"
+						:value="option.value"
+						:label="option.name"
+						description="sadasd"
+					>
+						<div class="list-option">
+							<div class="option-headline">
+								{{ option.name }}
 							</div>
-						</n8n-option>
-					</n8n-select>
-				</div>
-				<div class="mt-5xs">
-					<n8n-text v-if="loading" size="small">
-						<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
-						{{
-							locale.baseText('resourceMapper.fetchingFields.message', {
-								interpolate: {
-									fieldWord: pluralFieldWord,
-								},
-							})
-						}}
-					</n8n-text>
-					<n8n-text v-else-if="errorMessage !== ''" size="small" color="danger">
-						<n8n-icon icon="exclamation-triangle" size="xsmall" />
-						{{ errorMessage }}
-						<n8n-link size="small" theme="danger" :underline="true" @click="onRetryClick">
-							{{ locale.baseText('generic.retry') }}
-						</n8n-link>
-					</n8n-text>
-				</div>
-			</template>
+							<div class="option-description" v-html="option.description" />
+						</div>
+					</n8n-option>
+				</n8n-select>
+			</div>
+			<div class="mt-5xs">
+				<n8n-text v-if="loading" size="small">
+					<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
+					{{
+						locale.baseText('resourceMapper.fetchingFields.message', {
+							interpolate: {
+								fieldWord: pluralFieldWord,
+							},
+						})
+					}}
+				</n8n-text>
+				<n8n-text v-else-if="errorMessage !== ''" size="small" color="danger">
+					<n8n-icon icon="exclamation-triangle" size="xsmall" />
+					{{ errorMessage }}
+					<n8n-link size="small" theme="danger" :underline="true" @click="onRetryClick">
+						{{ locale.baseText('generic.retry') }}
+					</n8n-link>
+				</n8n-text>
+			</div>
 		</n8n-input-label>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index 40dec46807ce0..198524e0889c1 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -16,9 +16,12 @@ interface Props {
 	inputSize: string;
 	loading: boolean;
 	serviceName: string;
+	teleported?: boolean;
 }
 
-const props = defineProps<Props>();
+const props = withDefaults(defineProps<Props>(), {
+	teleported: true,
+});
 const {
 	resourceMapperTypeOptions,
 	singularFieldWord,
@@ -110,7 +113,12 @@ function onSelectionChange(value: string | string[]) {
 }
 
 function emitValueChanged() {
-	emit('matchingColumnsChanged', Array.isArray(state.selected) ? state.selected : [state.selected]);
+	if (state.selected) {
+		emit(
+			'matchingColumnsChanged',
+			Array.isArray(state.selected) ? state.selected : [state.selected],
+		);
+	}
 }
 
 defineExpose({
@@ -131,12 +139,18 @@ defineExpose({
 		>
 			<n8n-select
 				:multiple="resourceMapperTypeOptions?.multiKeyMatch === true"
-				:value="state.selected"
+				:modelValue="state.selected"
 				:size="props.inputSize"
 				:disabled="loading"
-				@change="onSelectionChange"
+				:teleported="teleported"
+				@update:modelValue="onSelectionChange"
 			>
-				<n8n-option v-for="field in availableMatchingFields" :key="field.id" :value="field.id">
+				<n8n-option
+					v-for="field in availableMatchingFields"
+					:key="field.id"
+					:value="field.id"
+					:data-test-id="`matching-column-option-${field.id}`"
+				>
 					{{ field.displayName }}
 				</n8n-option>
 			</n8n-select>
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 77c8307a1fcff..4ab6ebeae289a 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -26,12 +26,15 @@ type Props = {
 	inputSize: string;
 	labelSize: string;
 	dependentParametersValues?: string | null;
+	teleported: boolean;
 };
 
 const nodeTypesStore = useNodeTypesStore();
 const ndvStore = useNDVStore();
 
-const props = defineProps<Props>();
+const props = withDefaults(defineProps<Props>(), {
+	teleported: true,
+});
 
 const emit = defineEmits<{
 	(event: 'valueChanged', value: IUpdateInformation): void;
@@ -448,6 +451,7 @@ defineExpose({
 			:loading="state.loading"
 			:loadingError="state.loadingError"
 			:fieldsToMap="state.paramValue.schema"
+			:teleported="teleported"
 			@modeChanged="onModeChanged"
 			@retryFetch="initFetching"
 		/>
@@ -460,6 +464,7 @@ defineExpose({
 			:loading="state.loading"
 			:initialValue="matchingColumns"
 			:serviceName="nodeType?.displayName || locale.baseText('generic.service')"
+			:teleported="teleported"
 			@matchingColumnsChanged="onMatchingColumnsChanged"
 		/>
 		<n8n-text v-if="!showMappingModeSelect && state.loading" size="small">
@@ -483,6 +488,7 @@ defineExpose({
 			:showMatchingColumnsSelector="showMatchingColumnsSelector"
 			:showMappingModeSelect="showMappingModeSelect"
 			:loading="state.loading"
+			:teleported="teleported"
 			:refreshInProgress="state.refreshInProgress"
 			@fieldValueChanged="fieldValueChanged"
 			@removeField="removeField"
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 9e7b276020500..b12be9667dd43 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -13,7 +13,7 @@
 					size="small"
 					underline
 					bold
-					@click="onTogglePinData({ source: 'banner-link' })"
+					@click.stop="onTogglePinData({ source: 'banner-link' })"
 				>
 					{{ $locale.baseText('runData.pindata.unpin') }}
 				</n8n-link>
@@ -53,10 +53,10 @@
 						((jsonData && jsonData.length > 0) || (binaryData && binaryData.length > 0)) &&
 						!editMode.enabled
 					"
-					:value="displayMode"
+					:modelValue="displayMode"
 					:options="buttons"
-					@input="onDisplayModeChange"
 					data-test-id="ndv-run-data-display-mode"
+					@update:modelValue="onDisplayModeChange"
 				/>
 				<n8n-icon-button
 					v-if="canPinData && !isReadOnlyRoute && !readOnlyEnv"
@@ -74,8 +74,11 @@
 					placement="bottom-end"
 					v-if="canPinData && jsonData && jsonData.length > 0"
 					v-show="!editMode.enabled"
-					:value="pinDataDiscoveryTooltipVisible"
-					:manual="isControlledPinDataTooltip"
+					:visible="
+						isControlledPinDataTooltip
+							? isControlledPinDataTooltip && pinDataDiscoveryTooltipVisible
+							: undefined
+					"
 				>
 					<template #content v-if="!isControlledPinDataTooltip">
 						<div :class="$style.tooltipContainer">
@@ -134,10 +137,10 @@
 		>
 			<n8n-select
 				size="small"
-				:value="runIndex"
-				@input="onRunIndexChange"
+				:modelValue="runIndex"
+				@update:modelValue="onRunIndexChange"
 				@click.stop
-				popper-append-to-body
+				teleported
 			>
 				<template #prepend>{{ $locale.baseText('ndv.output.run') }}</template>
 				<n8n-option
@@ -148,20 +151,17 @@
 				></n8n-option>
 			</n8n-select>
 
-			<n8n-tooltip
-				placement="right"
-				v-if="canLinkRuns"
-				:content="$locale.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint')"
-			>
+			<n8n-tooltip placement="right" v-if="canLinkRuns">
+				<template #content>
+					{{ $locale.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint') }}
+				</template>
 				<n8n-icon-button
-					v-if="linkedRuns"
-					icon="unlink"
+					:icon="linkedRuns ? 'unlink' : 'link'"
 					text
 					type="tertiary"
 					size="small"
-					@click="unlinkRun"
+					@click="toggleLinkRuns"
 				/>
-				<n8n-icon-button v-else icon="link" text type="tertiary" size="small" @click="linkRun" />
 			</n8n-tooltip>
 
 			<slot name="run-info"></slot>
@@ -172,7 +172,11 @@
 			:class="$style.tabs"
 			data-test-id="branches"
 		>
-			<n8n-tabs :value="currentOutputIndex" @input="onBranchChange" :options="branches" />
+			<n8n-tabs
+				:modelValue="currentOutputIndex"
+				:options="branches"
+				@update:modelValue="onBranchChange"
+			/>
 		</div>
 
 		<div
@@ -196,9 +200,9 @@
 			<div v-else-if="editMode.enabled" :class="$style.editMode">
 				<div :class="[$style.editModeBody, 'ignore-key-press']">
 					<code-node-editor
-						:value="editMode.value"
+						:modelValue="editMode.value"
 						language="json"
-						@valueChanged="ndvStore.setOutputPanelEditModeValue($event)"
+						@update:modelValue="ndvStore.setOutputPanelEditModeValue($event)"
 					/>
 				</div>
 				<div :class="$style.editModeFooter">
@@ -300,49 +304,51 @@
 				</n8n-text>
 			</div>
 
-			<run-data-table
-				v-else-if="hasNodeRun && displayMode === 'table'"
-				:node="node"
-				:inputData="inputData"
-				:mappingEnabled="mappingEnabled"
-				:distanceFromActive="distanceFromActive"
-				:runIndex="runIndex"
-				:pageOffset="currentPageOffset"
-				:totalRuns="maxRunIndex"
-				:hasDefaultHoverState="paneType === 'input'"
-				@mounted="$emit('tableMounted', $event)"
-				@activeRowChanged="onItemHover"
-				@displayModeChange="onDisplayModeChange"
-			/>
-
-			<run-data-json
-				v-else-if="hasNodeRun && displayMode === 'json'"
-				:paneType="paneType"
-				:editMode="editMode"
-				:sessioId="sessionId"
-				:node="node"
-				:inputData="inputData"
-				:mappingEnabled="mappingEnabled"
-				:distanceFromActive="distanceFromActive"
-				:runIndex="runIndex"
-				:totalRuns="maxRunIndex"
-			/>
-
-			<run-data-html
-				v-else-if="hasNodeRun && isPaneTypeOutput && displayMode === 'html'"
-				:inputData="inputData"
-			/>
-
-			<run-data-schema
-				v-else-if="hasNodeRun && isSchemaView"
-				:data="jsonData"
-				:mappingEnabled="mappingEnabled"
-				:distanceFromActive="distanceFromActive"
-				:node="node"
-				:paneType="paneType"
-				:runIndex="runIndex"
-				:totalRuns="maxRunIndex"
-			/>
+			<Suspense v-else-if="hasNodeRun && displayMode === 'table'">
+				<run-data-table
+					:node="node"
+					:inputData="inputData"
+					:mappingEnabled="mappingEnabled"
+					:distanceFromActive="distanceFromActive"
+					:runIndex="runIndex"
+					:pageOffset="currentPageOffset"
+					:totalRuns="maxRunIndex"
+					:hasDefaultHoverState="paneType === 'input'"
+					@mounted="$emit('tableMounted', $event)"
+					@activeRowChanged="onItemHover"
+					@displayModeChange="onDisplayModeChange"
+				/>
+			</Suspense>
+
+			<Suspense v-else-if="hasNodeRun && displayMode === 'json'">
+				<run-data-json
+					:paneType="paneType"
+					:editMode="editMode"
+					:sessioId="sessionId"
+					:node="node"
+					:inputData="inputData"
+					:mappingEnabled="mappingEnabled"
+					:distanceFromActive="distanceFromActive"
+					:runIndex="runIndex"
+					:totalRuns="maxRunIndex"
+				/>
+			</Suspense>
+
+			<Suspense v-else-if="hasNodeRun && isPaneTypeOutput && displayMode === 'html'">
+				<run-data-html :inputData="inputData" />
+			</Suspense>
+
+			<Suspense v-else-if="hasNodeRun && isSchemaView">
+				<run-data-schema
+					:data="jsonData"
+					:mappingEnabled="mappingEnabled"
+					:distanceFromActive="distanceFromActive"
+					:node="node"
+					:paneType="paneType"
+					:runIndex="runIndex"
+					:totalRuns="maxRunIndex"
+				/>
+			</Suspense>
 
 			<div v-else-if="displayMode === 'binary' && binaryData.length === 0" :class="$style.center">
 				<n8n-text align="center" tag="div">{{
@@ -446,17 +452,22 @@
 			<el-pagination
 				background
 				:hide-on-single-page="true"
-				:current-page.sync="currentPage"
+				:current-page="currentPage"
 				:pager-count="5"
 				:page-size="pageSize"
 				layout="prev, pager, next"
-				@current-change="onCurrentPageChange"
+				@update:current-page="onCurrentPageChange"
 				:total="dataCount"
 			>
 			</el-pagination>
 
 			<div :class="$style.pageSizeSelector">
-				<n8n-select size="mini" :value="pageSize" @input="onPageSizeChange" popper-append-to-body>
+				<n8n-select
+					size="mini"
+					:modelValue="pageSize"
+					@update:modelValue="onPageSizeChange"
+					teleported
+				>
 					<template #prepend>{{ $locale.baseText('ndv.output.pageSize') }}</template>
 					<n8n-option v-for="size in pageSizes" :key="size" :label="size" :value="size">
 					</n8n-option>
@@ -469,7 +480,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
 import { saveAs } from 'file-saver';
@@ -519,10 +530,10 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useToast } from '@/composables';
 
-const RunDataTable = async () => import('@/components/RunDataTable.vue');
-const RunDataJson = async () => import('@/components/RunDataJson.vue');
-const RunDataSchema = async () => import('@/components/RunDataSchema.vue');
-const RunDataHtml = async () => import('@/components/RunDataHtml.vue');
+const RunDataTable = defineAsyncComponent(async () => import('@/components/RunDataTable.vue'));
+const RunDataJson = defineAsyncComponent(async () => import('@/components/RunDataJson.vue'));
+const RunDataSchema = defineAsyncComponent(async () => import('@/components/RunDataSchema.vue'));
+const RunDataHtml = defineAsyncComponent(async () => import('@/components/RunDataHtml.vue'));
 
 export type EnterEditModeArgs = {
 	origin: 'editIconButton' | 'insertTestDataLink';
@@ -629,7 +640,7 @@ export default defineComponent({
 
 		if (this.paneType === 'output') this.setDisplayMode();
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.hidePinDataDiscoveryTooltip();
 		dataPinningEventBus.off('data-pinning-error', this.onDataPinningError);
 		dataPinningEventBus.off('data-unpinning', this.onDataUnpinning);
@@ -1123,13 +1134,17 @@ export default defineComponent({
 				type: 'showTooMuchData',
 			});
 		},
+		toggleLinkRuns() {
+			this.linkedRuns ? this.unlinkRun() : this.linkRun();
+		},
 		linkRun() {
 			this.$emit('linkRun');
 		},
 		unlinkRun() {
 			this.$emit('unlinkRun');
 		},
-		onCurrentPageChange() {
+		onCurrentPageChange(value) {
+			this.currentPage = value;
 			this.$telemetry.track('User changed ndv page', {
 				node_type: this.activeNode?.type,
 				workflow_id: this.workflowsStore.workflowId,
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index cd51f62c02cf7..8ea9a49d63569 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -1,15 +1,17 @@
 <template>
 	<div :class="$style.jsonDisplay">
-		<run-data-json-actions
-			v-if="!editMode.enabled"
-			:node="node"
-			:sessioId="sessionId"
-			:displayMode="displayMode"
-			:distanceFromActive="distanceFromActive"
-			:selectedJsonPath="selectedJsonPath"
-			:jsonData="jsonData"
-			:paneType="paneType"
-		/>
+		<Suspense>
+			<run-data-json-actions
+				v-if="!editMode.enabled"
+				:node="node"
+				:sessioId="sessionId"
+				:displayMode="displayMode"
+				:distanceFromActive="distanceFromActive"
+				:selectedJsonPath="selectedJsonPath"
+				:jsonData="jsonData"
+				:paneType="paneType"
+			/>
+		</Suspense>
 		<draggable
 			type="mapping"
 			targetDataKey="mappable"
@@ -20,54 +22,54 @@
 			<template #preview="{ canDrop, el }">
 				<MappingPill v-if="el" :html="getShortKey(el)" :can-drop="canDrop" />
 			</template>
-			<template>
-				<vue-json-pretty
-					:data="jsonData"
-					:deep="10"
-					:showLength="true"
-					:selected-value.sync="selectedJsonPath"
-					rootPath=""
-					selectableType="single"
-					class="json-data"
-				>
-					<template #nodeKey="{ node }">
-						<span
-							data-target="mappable"
-							:data-value="getJsonParameterPath(node.path)"
-							:data-name="node.key"
-							:data-path="node.path"
-							:data-depth="node.level"
-							:class="{
-								[$style.mappable]: mappingEnabled,
-								[$style.dragged]: draggingPath === node.path,
-							}"
-							>"{{ node.key }}"</span
-						>
-					</template>
-					<template #nodeValue="{ node }">
-						<span v-if="isNaN(node.index)">{{ getContent(node.content) }}</span>
-						<span
-							v-else
-							data-target="mappable"
-							:data-value="getJsonParameterPath(node.path)"
-							:data-name="getListItemName(node.path)"
-							:data-path="node.path"
-							:data-depth="node.level"
-							:class="{
-								[$style.mappable]: mappingEnabled,
-								[$style.dragged]: draggingPath === node.path,
-							}"
-							>{{ getContent(node.content) }}</span
-						>
-					</template>
-				</vue-json-pretty>
-			</template>
+			<vue-json-pretty
+				:data="jsonData"
+				:deep="10"
+				:showLength="true"
+				:selectedValue="selectedJsonPath"
+				rootPath=""
+				selectableType="single"
+				class="json-data"
+				@update:selectedValue="selectedJsonPath = $event"
+			>
+				<template #renderNodeKey="{ node }">
+					<span
+						data-target="mappable"
+						:data-value="getJsonParameterPath(node.path)"
+						:data-name="node.key"
+						:data-path="node.path"
+						:data-depth="node.level"
+						:class="{
+							[$style.mappable]: mappingEnabled,
+							[$style.dragged]: draggingPath === node.path,
+						}"
+						>"{{ node.key }}"</span
+					>
+				</template>
+				<template #renderNodeValue="{ node }">
+					<span v-if="isNaN(node.index)">{{ getContent(node.content) }}</span>
+					<span
+						v-else
+						data-target="mappable"
+						:data-value="getJsonParameterPath(node.path)"
+						:data-name="getListItemName(node.path)"
+						:data-path="node.path"
+						:data-depth="node.level"
+						:class="{
+							[$style.mappable]: mappingEnabled,
+							[$style.dragged]: draggingPath === node.path,
+						}"
+						class="ph-no-capture"
+						>{{ getContent(node.content) }}</span
+					>
+				</template>
+			</vue-json-pretty>
 		</draggable>
 	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent, ref } from 'vue';
 import type { PropType } from 'vue';
 import VueJsonPretty from 'vue-json-pretty';
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
@@ -80,9 +82,11 @@ import { useNDVStore } from '@/stores/ndv.store';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { nonExistingJsonPath } from '@/components/RunDataJsonActions.vue';
+import { nonExistingJsonPath } from '@/constants';
 
-const runDataJsonActions = async () => import('@/components/RunDataJsonActions.vue');
+const RunDataJsonActions = defineAsyncComponent(
+	async () => import('@/components/RunDataJsonActions.vue'),
+);
 
 export default defineComponent({
 	name: 'run-data-json',
@@ -90,7 +94,7 @@ export default defineComponent({
 	components: {
 		VueJsonPretty,
 		Draggable,
-		runDataJsonActions,
+		RunDataJsonActions,
 		MappingPill,
 	},
 	props: {
@@ -122,11 +126,15 @@ export default defineComponent({
 			type: Number,
 		},
 	},
-	data() {
+	setup() {
+		const selectedJsonPath = ref(nonExistingJsonPath);
+		const draggingPath = ref<null | string>(null);
+		const displayMode = ref('json');
+
 		return {
-			selectedJsonPath: nonExistingJsonPath,
-			draggingPath: null as null | string,
-			displayMode: 'json',
+			selectedJsonPath,
+			draggingPath,
+			displayMode,
 		};
 	},
 	computed: {
diff --git a/packages/editor-ui/src/components/RunDataJsonActions.vue b/packages/editor-ui/src/components/RunDataJsonActions.vue
index d2a9831af83c7..4bdf715f498a8 100644
--- a/packages/editor-ui/src/components/RunDataJsonActions.vue
+++ b/packages/editor-ui/src/components/RunDataJsonActions.vue
@@ -2,7 +2,7 @@
 	<div :class="$style.actionsGroup">
 		<n8n-icon-button
 			v-if="noSelection"
-			:title="$locale.baseText('runData.copyToClipboard')"
+			:title="i18n.baseText('runData.copyToClipboard')"
 			icon="copy"
 			type="tertiary"
 			:circle="false"
@@ -11,7 +11,7 @@
 		<el-dropdown v-else trigger="click" @command="handleCopyClick">
 			<span class="el-dropdown-link">
 				<n8n-icon-button
-					:title="$locale.baseText('runData.copyToClipboard')"
+					:title="i18n.baseText('runData.copyToClipboard')"
 					icon="copy"
 					type="tertiary"
 					:circle="false"
@@ -20,13 +20,13 @@
 			<template #dropdown>
 				<el-dropdown-menu>
 					<el-dropdown-item :command="{ command: 'value' }">
-						{{ $locale.baseText('runData.copyValue') }}
+						{{ i18n.baseText('runData.copyValue') }}
 					</el-dropdown-item>
 					<el-dropdown-item :command="{ command: 'itemPath' }" divided>
-						{{ $locale.baseText('runData.copyItemPath') }}
+						{{ i18n.baseText('runData.copyItemPath') }}
 					</el-dropdown-item>
 					<el-dropdown-item :command="{ command: 'parameterPath' }">
-						{{ $locale.baseText('runData.copyParameterPath') }}
+						{{ i18n.baseText('runData.copyParameterPath') }}
 					</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
@@ -48,16 +48,14 @@ import { genericHelpers } from '@/mixins/genericHelpers';
 import { clearJsonKey, convertPath, executionDataToJson } from '@/utils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useToast } from '@/composables';
+import { useI18n, useToast } from '@/composables';
+import { nonExistingJsonPath } from '@/constants';
 
 type JsonPathData = {
 	path: string;
 	startPath: string;
 };
 
-// A path that does not exist so that nothing is selected by default
-export const nonExistingJsonPath = '_!^&*';
-
 export default defineComponent({
 	name: 'run-data-json-actions',
 	mixins: [genericHelpers, nodeHelpers, pinData, copyPaste],
@@ -94,7 +92,10 @@ export default defineComponent({
 		},
 	},
 	setup() {
+		const i18n = useI18n();
+
 		return {
+			i18n,
 			...useToast(),
 		};
 	},
@@ -161,7 +162,7 @@ export default defineComponent({
 				value = this.getJsonValue();
 
 				this.showToast({
-					title: this.$locale.baseText('runData.copyValue.toast'),
+					title: this.i18n.baseText('runData.copyValue.toast'),
 					message: '',
 					type: 'success',
 					duration: 2000,
@@ -175,7 +176,7 @@ export default defineComponent({
 					path = jsonItemPath.path;
 
 					this.showToast({
-						title: this.$locale.baseText('runData.copyItemPath.toast'),
+						title: this.i18n.baseText('runData.copyItemPath.toast'),
 						message: '',
 						type: 'success',
 						duration: 2000,
@@ -186,7 +187,7 @@ export default defineComponent({
 					path = jsonParameterPath.path;
 
 					this.showToast({
-						title: this.$locale.baseText('runData.copyParameterPath.toast'),
+						title: this.i18n.baseText('runData.copyParameterPath.toast'),
 						message: '',
 						type: 'success',
 						duration: 2000,
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 64af9db9886a8..4611dd588108d 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -82,21 +82,19 @@ const onDragEnd = (el: HTMLElement) => {
 			<template #preview="{ canDrop, el }">
 				<MappingPill v-if="el" :html="el.outerHTML" :can-drop="canDrop" />
 			</template>
-			<template>
-				<div :class="$style.schema">
-					<run-data-schema-item
-						:schema="schema"
-						:level="0"
-						:parent="null"
-						:paneType="paneType"
-						:subKey="`${schema.type}-0-0`"
-						:mappingEnabled="mappingEnabled"
-						:draggingPath="draggingPath"
-						:distanceFromActive="distanceFromActive"
-						:node="node"
-					/>
-				</div>
-			</template>
+			<div :class="$style.schema">
+				<run-data-schema-item
+					:schema="schema"
+					:level="0"
+					:parent="null"
+					:paneType="paneType"
+					:subKey="`${schema.type}-0-0`"
+					:mappingEnabled="mappingEnabled"
+					:draggingPath="draggingPath"
+					:distanceFromActive="distanceFromActive"
+					:node="node"
+				/>
+			</div>
 		</draggable>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index b69522fd70ce7..6e67221947a5f 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -65,14 +65,14 @@
 						<n8n-tooltip placement="bottom-end">
 							<template #content>
 								<div>
-									<i18n path="dataMapping.tableView.tableColumnsExceeded.tooltip">
+									<i18n-t tag="span" keypath="dataMapping.tableView.tableColumnsExceeded.tooltip">
 										<template #columnLimit>{{ columnLimit }}</template>
 										<template #link>
 											<a @click="switchToJsonView">{{
 												$locale.baseText('dataMapping.tableView.tableColumnsExceeded.tooltip.link')
 											}}</a>
 										</template>
-									</i18n>
+									</i18n-t>
 								</div>
 							</template>
 							<span>
@@ -102,56 +102,54 @@
 						:can-drop="canDrop"
 					/>
 				</template>
-				<template>
-					<tr
-						v-for="(row, index1) in tableData.data"
-						:key="index1"
-						:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
-						:data-test-id="isHoveringRow(index1) ? 'hovering-item' : undefined"
+				<tr
+					v-for="(row, index1) in tableData.data"
+					:key="index1"
+					:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
+					:data-test-id="isHoveringRow(index1) ? 'hovering-item' : undefined"
+				>
+					<td
+						v-for="(data, index2) in row"
+						:key="index2"
+						:data-row="index1"
+						:data-col="index2"
+						@mouseenter="onMouseEnterCell"
+						@mouseleave="onMouseLeaveCell"
+						:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
 					>
-						<td
-							v-for="(data, index2) in row"
-							:key="index2"
-							:data-row="index1"
-							:data-col="index2"
-							@mouseenter="onMouseEnterCell"
-							@mouseleave="onMouseLeaveCell"
-							:class="hasJsonInColumn(index2) ? $style.minColWidth : $style.limitColWidth"
+						<span
+							v-if="isSimple(data)"
+							:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
+							>{{ getValueToRender(data) }}</span
 						>
-							<span
-								v-if="isSimple(data)"
-								:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
-								>{{ getValueToRender(data) }}</span
-							>
-							<n8n-tree :nodeClass="$style.nodeClass" v-else :value="data">
-								<template #label="{ label, path }">
-									<span
-										@mouseenter="() => onMouseEnterKey(path, index2)"
-										@mouseleave="onMouseLeaveKey"
-										:class="{
-											[$style.hoveringKey]: mappingEnabled && isHovering(path, index2),
-											[$style.draggingKey]: isDraggingKey(path, index2),
-											[$style.dataKey]: true,
-											[$style.mappable]: mappingEnabled,
-										}"
-										data-target="mappable"
-										:data-name="getCellPathName(path, index2)"
-										:data-value="getCellExpression(path, index2)"
-										:data-depth="path.length"
-										>{{ label || $locale.baseText('runData.unnamedField') }}</span
-									>
-								</template>
-								<template #value="{ value }">
-									<span :class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }">
-										{{ getValueToRender(value) }}
-									</span>
-								</template>
-							</n8n-tree>
-						</td>
-						<td v-if="columnLimitExceeded"></td>
-						<td :class="$style.tableRightMargin"></td>
-					</tr>
-				</template>
+						<n8n-tree :nodeClass="$style.nodeClass" v-else :value="data">
+							<template #label="{ label, path }">
+								<span
+									@mouseenter="() => onMouseEnterKey(path, index2)"
+									@mouseleave="onMouseLeaveKey"
+									:class="{
+										[$style.hoveringKey]: mappingEnabled && isHovering(path, index2),
+										[$style.draggingKey]: isDraggingKey(path, index2),
+										[$style.dataKey]: true,
+										[$style.mappable]: mappingEnabled,
+									}"
+									data-target="mappable"
+									:data-name="getCellPathName(path, index2)"
+									:data-value="getCellExpression(path, index2)"
+									:data-depth="path.length"
+									>{{ label || $locale.baseText('runData.unnamedField') }}</span
+								>
+							</template>
+							<template #value="{ value }">
+								<span :class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }">
+									{{ getValueToRender(value) }}
+								</span>
+							</template>
+						</n8n-tree>
+					</td>
+					<td v-if="columnLimitExceeded"></td>
+					<td :class="$style.tableRightMargin"></td>
+				</tr>
 			</draggable>
 		</table>
 	</div>
diff --git a/packages/editor-ui/src/components/SSOLogin.vue b/packages/editor-ui/src/components/SSOLogin.vue
index 8d95dacdd2544..2c36ca656d3fe 100644
--- a/packages/editor-ui/src/components/SSOLogin.vue
+++ b/packages/editor-ui/src/components/SSOLogin.vue
@@ -1,18 +1,16 @@
 <script lang="ts" setup>
-import { Notification } from 'element-ui';
 import { useSSOStore } from '@/stores/sso.store';
+import { useI18n, useToast } from '@/composables';
 
+const i18n = useI18n();
 const ssoStore = useSSOStore();
+const toast = useToast();
 
 const onSSOLogin = async () => {
 	try {
 		window.location.href = await ssoStore.getSSORedirectUrl();
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, 'Error', error.message);
 	}
 };
 </script>
@@ -20,14 +18,14 @@ const onSSOLogin = async () => {
 <template>
 	<div v-if="ssoStore.showSsoLoginButton" :class="$style.ssoLogin">
 		<div :class="$style.divider">
-			<span>{{ $locale.baseText('sso.login.divider') }}</span>
+			<span>{{ i18n.baseText('sso.login.divider') }}</span>
 		</div>
 		<n8n-button
 			@click="onSSOLogin"
 			size="large"
 			type="primary"
 			outline
-			:label="$locale.baseText('sso.login.button')"
+			:label="i18n.baseText('sso.login.button')"
 		/>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/SaveButton.vue b/packages/editor-ui/src/components/SaveButton.vue
index 4d78e8844d9fa..0a9d5f932745c 100644
--- a/packages/editor-ui/src/components/SaveButton.vue
+++ b/packages/editor-ui/src/components/SaveButton.vue
@@ -8,7 +8,6 @@
 			:disabled="disabled"
 			:class="$style.button"
 			:type="type"
-			@click="$emit('click')"
 		/>
 	</span>
 </template>
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index 9c977a984c6ee..01718335a1380 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -26,8 +26,8 @@
 				<el-switch
 					class="mr-s"
 					:disabled="!isInstanceOwner"
-					:value="nodeParameters.enabled"
-					@change="onEnabledSwitched($event, destination.id)"
+					:modelValue="nodeParameters.enabled"
+					@update:modelValue="onEnabledSwitched($event, destination.id)"
 					:title="
 						nodeParameters.enabled
 							? $locale.baseText('workflowActivator.deactivateWorkflow')
@@ -96,7 +96,7 @@ export default defineComponent({
 		);
 		this.eventBus?.on('destinationWasSaved', this.onDestinationWasSaved);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus?.off('destinationWasSaved', this.onDestinationWasSaved);
 	},
 	computed: {
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 4dc2604223149..a597211d65cc5 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -22,12 +22,12 @@
 				<div :class="$style.header">
 					<div :class="$style.destinationInfo">
 						<InlineNameEdit
-							:name="headerLabel"
+							:modelValue="headerLabel"
 							:subtitle="!isTypeAbstract ? $locale.baseText(typeLabelName) : 'Select type'"
 							:readonly="isTypeAbstract"
 							type="Credential"
 							data-test-id="subtitle-showing-type"
-							@input="onLabelChange"
+							@update:modelValue="onLabelChange"
 						/>
 					</div>
 					<div :class="$style.destinationActions">
@@ -39,7 +39,6 @@
 									? 'Event sent and returned OK'
 									: 'Event returned with error'
 							"
-							size="medium"
 							type="tertiary"
 							label="Send Test-Event"
 							:disabled="!hasOnceBeenSaved || !unchanged"
@@ -51,7 +50,6 @@
 								v-if="nodeParameters && hasOnceBeenSaved"
 								:title="$locale.baseText('settings.log-streaming.delete')"
 								icon="trash"
-								size="medium"
 								type="tertiary"
 								:disabled="isSaving"
 								:loading="isDeleting"
@@ -83,9 +81,9 @@
 						:underline="false"
 					>
 						<n8n-select
-							:value="typeSelectValue"
+							:modelValue="typeSelectValue"
 							:placeholder="typeSelectPlaceholder"
-							@change="onTypeSelectInput"
+							@update:modelValue="onTypeSelectInput"
 							data-test-id="select-destination-type"
 							name="name"
 							ref="typeSelectRef"
@@ -146,24 +144,21 @@
 						</template>
 					</div>
 					<div v-if="activeTab === 'events'" :class="$style.mainContent">
-						<template>
-							<div class="">
-								<n8n-input-label
-									class="mb-m mt-m"
-									:label="$locale.baseText('settings.log-streaming.tab.events.title')"
-									:bold="true"
-									size="medium"
-									:underline="false"
-								/>
-								<event-selection
-									class=""
-									:destinationId="destination.id"
-									@input="onInput"
-									@change="valueChanged"
-									:readonly="!isInstanceOwner"
-								/>
-							</div>
-						</template>
+						<div class="">
+							<n8n-input-label
+								class="mb-m mt-m"
+								:label="$locale.baseText('settings.log-streaming.tab.events.title')"
+								:bold="true"
+								size="medium"
+								:underline="false"
+							/>
+							<event-selection
+								:destinationId="destination.id"
+								@input="onInput"
+								@change="valueChanged"
+								:readonly="!isInstanceOwner"
+							/>
+						</div>
 					</div>
 				</template>
 			</div>
@@ -211,7 +206,7 @@ import InlineNameEdit from '@/components/InlineNameEdit.vue';
 import SaveButton from '@/components/SaveButton.vue';
 import EventSelection from '@/components/SettingsLogStreaming/EventSelection.ee.vue';
 import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'event-destination-settings-modal',
@@ -360,7 +355,7 @@ export default defineComponent({
 		onTypeSelectInput(destinationType: MessageEventBusDestinationTypeNames) {
 			this.typeSelectValue = destinationType;
 		},
-		onContinueAddClicked() {
+		async onContinueAddClicked() {
 			let newDestination;
 			switch (this.typeSelectValue) {
 				case MessageEventBusDestinationTypeNames.syslog:
@@ -380,6 +375,7 @@ export default defineComponent({
 					);
 					break;
 			}
+
 			if (newDestination) {
 				this.headerLabel = newDestination?.label ?? this.headerLabel;
 				this.setupNode(newDestination);
@@ -389,9 +385,9 @@ export default defineComponent({
 			this.unchanged = false;
 			this.testMessageSent = false;
 			const newValue: NodeParameterValue = parameterData.value as string | number;
-			const parameterPath = parameterData.name.startsWith('parameters.')
+			const parameterPath = parameterData.name?.startsWith('parameters.')
 				? parameterData.name.split('.').slice(1).join('.')
-				: parameterData.name;
+				: parameterData.name || '';
 
 			const nodeParameters = deepCopy(this.nodeParameters);
 
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
index 70efcc2eafb3f..5c7c3e2037346 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
@@ -7,9 +7,9 @@
 		>
 			<!-- <template #header> -->
 			<checkbox
-				:value="group.selected"
+				:modelValue="group.selected"
 				:indeterminate="!group.selected && group.indeterminate"
-				@input="onInput"
+				@update:modelValue="onInput"
 				@change="onCheckboxChecked(group.name, $event)"
 				:disabled="readonly"
 			>
@@ -20,7 +20,7 @@
 					:popper-class="$style.tooltipPopper"
 					class="ml-xs"
 				>
-					<n8n-icon icon="question-circle" size="small" />
+					<n8n-icon icon="question-circle" size="small" class="ml-4xs" />
 					<template #content>
 						{{ groupLabelInfo(group.name) }}
 					</template>
@@ -28,14 +28,14 @@
 			</checkbox>
 			<checkbox
 				v-if="group.name === 'n8n.audit'"
-				:value="logStreamingStore.items[destinationId]?.destination.anonymizeAuditMessages"
-				@input="onInput"
+				:modelValue="logStreamingStore.items[destinationId]?.destination.anonymizeAuditMessages"
+				@update:modelValue="onInput"
 				@change="anonymizeAuditMessagesChanged"
 				:disabled="readonly"
 			>
 				{{ $locale.baseText('settings.log-streaming.tab.events.anonymize') }}
 				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
-					<n8n-icon icon="question-circle" size="small" />
+					<n8n-icon icon="question-circle" size="small" class="ml-4xs" />
 					<template #content>
 						{{ $locale.baseText('settings.log-streaming.tab.events.anonymize.info') }}
 					</template>
@@ -49,10 +49,10 @@
 					:class="`${$style.eventListItem} ${group.selected ? $style.eventListItemDisabled : ''}`"
 				>
 					<checkbox
-						:value="event.selected || group.selected"
+						:modelValue="event.selected || group.selected"
 						:indeterminate="event.indeterminate"
 						:disabled="group.selected || readonly"
-						@input="onInput"
+						@update:modelValue="onInput"
 						@change="onCheckboxChecked(event.name, $event)"
 					>
 						{{ event.label }}
@@ -69,7 +69,7 @@
 </template>
 
 <script lang="ts">
-import { Checkbox } from 'element-ui';
+import { ElCheckbox as Checkbox } from 'element-plus';
 import { mapStores } from 'pinia';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index 0ddd9c5d26156..c869ef78c6b1f 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -7,7 +7,7 @@ import type { SourceControlAggregatedFile } from '@/Interface';
 import { useI18n, useLoadingService, useToast } from '@/composables';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores';
-import { useRoute, useRouter } from 'vue-router/composables';
+import { useRoute, useRouter } from 'vue-router';
 import { computed, nextTick, ref } from 'vue';
 import { sourceControlEventBus } from '@/event-bus/source-control';
 
@@ -23,7 +23,7 @@ const incompleteFileTypes = ['variables', 'credential'];
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
 const toast = useToast();
-const { i18n } = useI18n();
+const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
 const router = useRouter();
 const route = useRoute();
@@ -63,7 +63,7 @@ async function pullWorkfolder() {
 		});
 
 		if (hasVariablesOrCredentials) {
-			nextTick(() => {
+			void nextTick(() => {
 				toast.showMessage({
 					message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
 					title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index 0d9809a90d83c..136f5c4b2ac80 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -8,7 +8,7 @@ import type { SourceControlAggregatedFile } from '@/Interface';
 import { useI18n, useLoadingService, useToast } from '@/composables';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores';
-import { useRoute } from 'vue-router/composables';
+import { useRoute } from 'vue-router';
 import dateformat from 'dateformat';
 
 const props = defineProps({
@@ -23,7 +23,7 @@ const defaultStagedFileTypes = ['tags', 'variables', 'credential'];
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
 const toast = useToast();
-const { i18n: locale } = useI18n();
+const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
 const route = useRoute();
 
@@ -112,7 +112,7 @@ onMounted(async () => {
 	try {
 		staged.value = getStagedFilesByContext(files.value);
 	} catch (error) {
-		toast.showError(error, locale.baseText('error'));
+		toast.showError(error, i18n.baseText('error'));
 	} finally {
 		loading.value = false;
 	}
@@ -184,7 +184,7 @@ function close() {
 function renderUpdatedAt(file: SourceControlAggregatedFile) {
 	const currentYear = new Date().getFullYear();
 
-	return locale.baseText('settings.sourceControl.lastUpdated', {
+	return i18n.baseText('settings.sourceControl.lastUpdated', {
 		interpolate: {
 			date: dateformat(
 				file.updatedAt,
@@ -204,7 +204,7 @@ async function onCommitKeyDownEnter() {
 async function commitAndPush() {
 	const fileNames = files.value.filter((file) => staged.value[file.file]);
 
-	loadingService.startLoading(locale.baseText('settings.sourceControl.loading.push'));
+	loadingService.startLoading(i18n.baseText('settings.sourceControl.loading.push'));
 	close();
 
 	try {
@@ -215,12 +215,12 @@ async function commitAndPush() {
 		});
 
 		toast.showToast({
-			title: locale.baseText('settings.sourceControl.modals.push.success.title'),
-			message: locale.baseText('settings.sourceControl.modals.push.success.description'),
+			title: i18n.baseText('settings.sourceControl.modals.push.success.title'),
+			message: i18n.baseText('settings.sourceControl.modals.push.success.description'),
 			type: 'success',
 		});
 	} catch (error) {
-		toast.showError(error, locale.baseText('error'));
+		toast.showError(error, i18n.baseText('error'));
 	} finally {
 		loadingService.stopLoading();
 	}
@@ -230,7 +230,7 @@ async function commitAndPush() {
 <template>
 	<Modal
 		width="812px"
-		:title="locale.baseText('settings.sourceControl.modals.push.title')"
+		:title="i18n.baseText('settings.sourceControl.modals.push.title')"
 		:eventBus="data.eventBus"
 		:name="SOURCE_CONTROL_PUSH_MODAL_KEY"
 	>
@@ -239,20 +239,20 @@ async function commitAndPush() {
 				<div v-if="files.length > 0">
 					<div v-if="workflowFiles.length > 0">
 						<n8n-text>
-							{{ locale.baseText('settings.sourceControl.modals.push.description') }}
-							<n8n-link :to="locale.baseText('settings.sourceControl.docs.using.pushPull.url')">
-								{{ locale.baseText('settings.sourceControl.modals.push.description.learnMore') }}
+							{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
+							<n8n-link :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+								{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
 							</n8n-link>
 						</n8n-text>
 
 						<div class="mt-l mb-2xs">
 							<n8n-checkbox
 								:indeterminate="selectAllIndeterminate"
-								:value="selectAll"
-								@input="onToggleSelectAll"
+								:modelValue="selectAll"
+								@update:modelValue="onToggleSelectAll"
 							>
 								<n8n-text bold tag="strong">
-									{{ locale.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
+									{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
 								</n8n-text>
 								<n8n-text tag="strong" v-show="workflowFiles.length > 0">
 									({{ stagedWorkflowFiles.length }}/{{ workflowFiles.length }})
@@ -268,9 +268,9 @@ async function commitAndPush() {
 						>
 							<div :class="$style.listItemBody">
 								<n8n-checkbox
-									:value="staged[file.file]"
+									:modelValue="staged[file.file]"
 									:class="$style.listItemCheckbox"
-									@input="setStagedStatus(file, !staged[file.file])"
+									@update:modelValue="setStagedStatus(file, !staged[file.file])"
 								/>
 								<div>
 									<n8n-text v-if="file.status === 'deleted'" color="text-light">
@@ -293,42 +293,39 @@ async function commitAndPush() {
 										Current workflow
 									</n8n-badge>
 									<n8n-badge :theme="statusToBadgeThemeMap[file.status] || 'default'">
-										{{ locale.baseText(`settings.sourceControl.status.${file.status}`) }}
+										{{ i18n.baseText(`settings.sourceControl.status.${file.status}`) }}
 									</n8n-badge>
 								</div>
 							</div>
 						</n8n-card>
 					</div>
 					<n8n-notice class="mt-0" v-else>
-						<i18n path="settings.sourceControl.modals.push.noWorkflowChanges">
+						<i18n-t keypath="settings.sourceControl.modals.push.noWorkflowChanges">
 							<template #link>
-								<n8n-link
-									size="small"
-									:to="locale.baseText('settings.sourceControl.docs.using.url')"
-								>
+								<n8n-link size="small" :to="i18n.baseText('settings.sourceControl.docs.using.url')">
 									{{
-										locale.baseText('settings.sourceControl.modals.push.noWorkflowChanges.moreInfo')
+										i18n.baseText('settings.sourceControl.modals.push.noWorkflowChanges.moreInfo')
 									}}
 								</n8n-link>
 							</template>
-						</i18n>
+						</i18n-t>
 					</n8n-notice>
 
 					<n8n-text bold tag="p" class="mt-l mb-2xs">
-						{{ locale.baseText('settings.sourceControl.modals.push.commitMessage') }}
+						{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
 					</n8n-text>
 					<n8n-input
 						type="text"
 						v-model="commitMessage"
 						:placeholder="
-							locale.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
+							i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
 						"
-						@keydown.enter.native="onCommitKeyDownEnter"
+						@keydown.enter="onCommitKeyDownEnter"
 					/>
 				</div>
 				<div v-else-if="!loading">
 					<n8n-notice class="mt-0 mb-0">
-						{{ locale.baseText('settings.sourceControl.modals.push.everythingIsUpToDate') }}
+						{{ i18n.baseText('settings.sourceControl.modals.push.everythingIsUpToDate') }}
 					</n8n-notice>
 				</div>
 			</div>
@@ -337,10 +334,10 @@ async function commitAndPush() {
 		<template #footer>
 			<div :class="$style.footer">
 				<n8n-button type="tertiary" class="mr-2xs" @click="close">
-					{{ locale.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
+					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
 				</n8n-button>
 				<n8n-button type="primary" :disabled="isSubmitDisabled" @click="commitAndPush">
-					{{ locale.baseText('settings.sourceControl.modals.push.buttons.save') }}
+					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.save') }}
 				</n8n-button>
 			</div>
 		</template>
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 77b5c9e8ff0a9..3e21361ded80b 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -1,9 +1,8 @@
 <template>
-	<div :class="$style.sqlEditor" v-click-outside="onBlur">
+	<div :class="$style.sqlEditor" v-on-click-outside="onBlur">
 		<div ref="sqlEditor" data-test-id="sql-editor-container"></div>
 		<InlineExpressionEditorOutput
 			:segments="segments"
-			:value="query"
 			:isReadOnly="isReadOnly"
 			:visible="isFocused"
 			:hoveringItemNumber="hoveringItemNumber"
@@ -27,6 +26,7 @@ import {
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
+import type { ViewUpdate } from '@codemirror/view';
 import {
 	MSSQL,
 	MySQL,
@@ -73,7 +73,7 @@ export default defineComponent({
 	},
 	mixins: [expressionManager],
 	props: {
-		query: {
+		modelValue: {
 			type: String,
 			required: true,
 		},
@@ -103,7 +103,7 @@ export default defineComponent({
 				changes: {
 					from: 0,
 					to: this.editor.state.doc.length,
-					insert: this.query,
+					insert: this.modelValue,
 				},
 			});
 
@@ -166,13 +166,15 @@ export default defineComponent({
 					foldGutter(),
 					dropCursor(),
 					bracketMatching(),
-					EditorView.updateListener.of((viewUpdate) => {
+					EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
 						if (!viewUpdate.docChanged || !this.editor) return;
 
+						this.editorState = this.editor.state;
+
 						highlighter.removeColor(this.editor as EditorView, this.plaintextSegments);
 						highlighter.addColor(this.editor as EditorView, this.resolvableSegments);
 
-						this.$emit('valueChanged', this.doc);
+						this.$emit('update:modelValue', this.doc);
 					}),
 				);
 			}
@@ -182,8 +184,9 @@ export default defineComponent({
 	mounted() {
 		if (!this.isReadOnly) codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
 
-		const state = EditorState.create({ doc: this.query, extensions: this.extensions });
+		const state = EditorState.create({ doc: this.modelValue, extensions: this.extensions });
 		this.editor = new EditorView({ parent: this.$refs.sqlEditor as HTMLDivElement, state });
+		this.editorState = this.editor.state;
 		highlighter.addColor(this.editor as EditorView, this.resolvableSegments);
 	},
 	methods: {
@@ -202,7 +205,7 @@ export default defineComponent({
 
 			if (lineNumber === 'final') {
 				this.editor.dispatch({
-					selection: { anchor: this.query.length },
+					selection: { anchor: this.modelValue.length },
 				});
 				return;
 			}
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index 5f51032e3f2a1..50d0b5e7e42c1 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -23,7 +23,7 @@
 				v-touch:end="touchEnd"
 			>
 				<n8n-sticky
-					:content.sync="node.parameters.content"
+					:modelValue="node.parameters.content"
 					:height="node.parameters.height"
 					:width="node.parameters.width"
 					:scale="nodeViewScale"
@@ -32,12 +32,12 @@
 					:defaultText="defaultText"
 					:editMode="isActive && !isReadOnly"
 					:gridSize="gridSize"
-					@input="onInputChange"
 					@edit="onEdit"
 					@resizestart="onResizeStart"
 					@resize="onResize"
 					@resizeend="onResizeEnd"
 					@markdown-click="onMarkdownClick"
+					@update:modelValue="onInputChange"
 				/>
 			</div>
 
@@ -56,7 +56,7 @@
 </template>
 
 <script lang="ts">
-import Vue, { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 
 import { externalHooks } from '@/mixins/externalHooks';
@@ -162,11 +162,10 @@ export default defineComponent({
 		};
 	},
 	methods: {
-		deleteNode() {
-			Vue.nextTick(() => {
-				// Wait a tick else vue causes problems because the data is gone
-				this.$emit('removeNode', this.data.name);
-			});
+		async deleteNode() {
+			// Wait a tick else vue causes problems because the data is gone
+			await this.$nextTick();
+			this.$emit('removeNode', this.data.name);
 		},
 		onEdit(edit: boolean) {
 			if (edit && !this.isActive && this.node) {
@@ -190,6 +189,7 @@ export default defineComponent({
 			}
 		},
 		onInputChange(content: string) {
+			this.node.parameters.content = content;
 			this.setParameters({ content });
 		},
 		onResizeStart() {
diff --git a/packages/editor-ui/src/components/TagsContainer.vue b/packages/editor-ui/src/components/TagsContainer.vue
index eb8704648d747..579a34cb3bd83 100644
--- a/packages/editor-ui/src/components/TagsContainer.vue
+++ b/packages/editor-ui/src/components/TagsContainer.vue
@@ -6,37 +6,35 @@
 		:enabled="responsive"
 		:event-bus="intersectionEventBus"
 	>
-		<template>
-			<span class="tags">
-				<span
-					v-for="tag in tags"
-					:key="tag.id"
-					:class="{ clickable: !tag.hidden }"
-					@click="(e) => onClick(e, tag)"
+		<span class="tags">
+			<span
+				v-for="tag in tags"
+				:key="tag.id"
+				:class="{ clickable: !tag.hidden }"
+				@click="(e) => onClick(e, tag)"
+			>
+				<el-tag
+					:title="tag.title"
+					type="info"
+					size="small"
+					v-if="tag.isCount"
+					class="count-container"
 				>
-					<el-tag
-						:title="tag.title"
-						type="info"
-						size="small"
-						v-if="tag.isCount"
-						class="count-container"
-					>
+					{{ tag.name }}
+				</el-tag>
+				<IntersectionObserved
+					:class="{ hidden: tag.hidden }"
+					:data-id="tag.id"
+					:enabled="responsive"
+					:event-bus="intersectionEventBus"
+					v-else
+				>
+					<el-tag :title="tag.name" type="info" size="small" :class="{ hoverable }">
 						{{ tag.name }}
 					</el-tag>
-					<IntersectionObserved
-						:class="{ hidden: tag.hidden }"
-						:data-id="tag.id"
-						:enabled="responsive"
-						:event-bus="intersectionEventBus"
-						v-else
-					>
-						<el-tag :title="tag.name" type="info" size="small" :class="{ hoverable }">
-							{{ tag.name }}
-						</el-tag>
-					</IntersectionObserved>
-				</span>
+				</IntersectionObserved>
 			</span>
-		</template>
+		</span>
 	</IntersectionObserver>
 </template>
 
@@ -81,7 +79,7 @@ export default defineComponent({
 			let toDisplay: TagEl[] = limit ? tags.slice(0, limit) : tags;
 			toDisplay = toDisplay.map((tag: ITag) => ({
 				...tag,
-				hidden: this.responsive && !this.$data.visibility[tag.id],
+				hidden: this.responsive && !this.visibility[tag.id],
 			}));
 
 			let visibleCount = toDisplay.length;
@@ -113,7 +111,7 @@ export default defineComponent({
 	methods: {
 		onObserved({ el, isIntersecting }: { el: HTMLElement; isIntersecting: boolean }) {
 			if (el.dataset.id) {
-				this.$data.visibility = { ...this.$data.visibility, [el.dataset.id]: isIntersecting };
+				this.visibility = { ...this.visibility, [el.dataset.id]: isIntersecting };
 			}
 		},
 		onClick(e: MouseEvent, tag: TagEl) {
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 601a9364128c9..298cbf5c77537 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -1,39 +1,44 @@
 <template>
-	<div :class="{ 'tags-container': true, focused }" @keydown.stop v-click-outside="onClickOutside">
+	<div
+		:class="{ 'tags-container': true, focused }"
+		@keydown.stop
+		v-on-click-outside="onClickOutside"
+	>
 		<n8n-select
-			:popperAppendToBody="false"
-			:value="appliedTags"
-			:loading="tagsStore.isLoading"
+			:teleported="true"
+			:modelValue="appliedTags"
+			:loading="isLoading"
 			:placeholder="placeholder"
 			:filter-method="filterOptions"
-			@change="onTagsUpdated"
-			@visible-change="onVisibleChange"
-			@remove-tag="onRemoveTag"
 			filterable
 			multiple
-			ref="select"
+			:allowCreate="createEnabled"
+			:reserve-keyword="false"
+			ref="selectRef"
 			loading-text="..."
 			popper-class="tags-dropdown"
-			size="medium"
+			@update:modelValue="onTagsUpdated"
+			@visible-change="onVisibleChange"
+			@remove-tag="onRemoveTag"
 		>
 			<n8n-option
 				v-if="options.length === 0 && filter && createEnabled"
 				:key="CREATE_KEY"
 				:value="CREATE_KEY"
 				class="ops"
-				ref="create"
+				ref="createRef"
 			>
 				<font-awesome-icon icon="plus-circle" />
 				<span>
-					{{ $locale.baseText('tagsDropdown.createTag', { interpolate: { filter } }) }}
+					{{ i18n.baseText('tagsDropdown.createTag', { interpolate: { filter } }) }}
 				</span>
 			</n8n-option>
 			<n8n-option v-else-if="options.length === 0" value="message" disabled>
-				<span v-if="createEnabled">{{ $locale.baseText('tagsDropdown.typeToCreateATag') }}</span>
+				<span v-if="createEnabled">{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
 				<span v-else-if="allTags.length > 0">{{
-					$locale.baseText('tagsDropdown.noMatchingTagsExist')
+					i18n.baseText('tagsDropdown.noMatchingTagsExist')
 				}}</span>
-				<span v-else>{{ $locale.baseText('tagsDropdown.noTagsExist') }}</span>
+				<span v-else>{{ i18n.baseText('tagsDropdown.noTagsExist') }}</span>
 			</n8n-option>
 
 			<!-- key is id+index for keyboard navigation to work well with filter -->
@@ -43,30 +48,30 @@
 				:key="tag.id + '_' + i"
 				:label="tag.name"
 				class="tag"
-				ref="tag"
+				ref="tagRefs"
 			/>
 
 			<n8n-option :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
 				<font-awesome-icon icon="cog" />
-				<span>{{ $locale.baseText('tagsDropdown.manageTags') }}</span>
+				<span>{{ i18n.baseText('tagsDropdown.manageTags') }}</span>
 			</n8n-option>
 		</n8n-select>
 	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import type { ITag } from '@/Interface';
 import { MAX_TAG_NAME_LENGTH, TAGS_MANAGER_MODAL_KEY } from '@/constants';
 
-import { useToast } from '@/composables';
-import { mapStores } from 'pinia';
+import { useI18n, useToast } from '@/composables';
 import { useUIStore } from '@/stores/ui.store';
 import { useTagsStore } from '@/stores/tags.store';
 import type { EventBus } from 'n8n-design-system';
 import type { PropType } from 'vue';
 import type { N8nOption, N8nSelect } from 'n8n-design-system';
+import { storeToRefs } from 'pinia';
 
 type SelectRef = InstanceType<typeof N8nSelect>;
 type TagRef = InstanceType<typeof N8nOption>;
@@ -79,192 +84,238 @@ export default defineComponent({
 	name: 'TagsDropdown',
 	props: {
 		placeholder: {},
-		currentTagIds: {
+		modelValue: {
 			type: Array as PropType<string[]>,
 			default: () => [],
 		},
-		createEnabled: {},
+		createEnabled: {
+			type: Boolean,
+			default: false,
+		},
 		eventBus: {
 			type: Object as PropType<EventBus>,
 		},
 	},
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	data() {
-		return {
-			filter: '',
-			MANAGE_KEY,
-			CREATE_KEY,
-			focused: false,
-			preventUpdate: false,
-		};
-	},
-	mounted() {
-		const selectRef = this.$refs.select as SelectRef | undefined;
-		const select = selectRef?.$refs?.innerSelect;
-		if (select) {
-			const input = select.$refs.input as Element | undefined;
-			if (input) {
-				input.setAttribute('maxlength', `${MAX_TAG_NAME_LENGTH}`);
-				input.addEventListener('keydown', (e: Event) => {
-					const keyboardEvent = e as KeyboardEvent;
-					// events don't bubble outside of select, so need to hook onto input
-					if (keyboardEvent.key === 'Escape') {
-						this.$emit('esc');
-					} else if (keyboardEvent.key === 'Enter' && this.filter.length === 0) {
-						this.$data.preventUpdate = true;
-						this.$emit('blur');
-
-						if (typeof selectRef?.blur === 'function') {
-							selectRef.blur();
+	setup(props, { emit }) {
+		const i18n = useI18n();
+		const { showError } = useToast();
+		const tagsStore = useTagsStore();
+		const uiStore = useUIStore();
+
+		const { isLoading } = storeToRefs(tagsStore);
+
+		const selectRef = ref<SelectRef | undefined>();
+		const tagRefs = ref<TagRef[] | undefined>();
+		const createRef = ref<CreateRef | undefined>();
+
+		const tags = ref([]);
+		const filter = ref('');
+		const focused = ref(false);
+		const preventUpdate = ref(false);
+
+		const allTags = computed<ITag[]>(() => {
+			return tagsStore.allTags;
+		});
+
+		const hasTags = computed<boolean>(() => {
+			return tagsStore.hasTags;
+		});
+
+		const options = computed<ITag[]>(() => {
+			return allTags.value.filter(
+				(tag: ITag) => tag && tag.name.toLowerCase().includes(filter.value.toLowerCase()),
+			);
+		});
+
+		const appliedTags = computed<string[]>(() => {
+			return props.modelValue.filter((id: string) => tagsStore.getTagById(id));
+		});
+
+		watch(
+			() => allTags.value,
+			() => {
+				// keep applied tags in sync with store, for example in case tag is deleted from store
+				if (props.modelValue.length !== appliedTags.value.length) {
+					emit('update:modelValue', appliedTags.value);
+				}
+			},
+		);
+
+		onMounted(() => {
+			const select = selectRef.value?.$refs?.innerSelect;
+			if (select) {
+				const input = select.$refs.input as Element | undefined;
+				if (input) {
+					input.setAttribute('maxlength', `${MAX_TAG_NAME_LENGTH}`);
+					input.addEventListener('keydown', (e: Event) => {
+						const keyboardEvent = e as KeyboardEvent;
+						// events don't bubble outside of select, so need to hook onto input
+						if (keyboardEvent.key === 'Escape') {
+							emit('esc');
+						} else if (keyboardEvent.key === 'Enter' && filter.value.length === 0) {
+							preventUpdate.value = true;
+
+							emit('blur');
+
+							if (typeof selectRef.value?.blur === 'function') {
+								selectRef.value.blur();
+							}
 						}
-					}
-				});
+					});
+				}
 			}
+
+			props.eventBus?.on('focus', onBusFocus);
+
+			void tagsStore.fetchAll();
+		});
+
+		onBeforeUnmount(() => {
+			props.eventBus?.off('focus', onBusFocus);
+		});
+
+		function onBusFocus() {
+			focusOnInput();
+			focusFirstOption();
 		}
 
-		this.eventBus?.on('focus', this.onBusFocus);
+		function filterOptions(value = '') {
+			filter.value = value.trim();
+			void nextTick(() => focusFirstOption());
+		}
 
-		void this.tagsStore.fetchAll();
-	},
-	destroyed() {
-		this.eventBus?.off('focus', this.onBusFocus);
-	},
-	computed: {
-		...mapStores(useTagsStore, useUIStore),
-		allTags(): ITag[] {
-			return this.tagsStore.allTags;
-		},
-		hasTags(): boolean {
-			return this.tagsStore.hasTags;
-		},
-		options(): ITag[] {
-			return this.allTags.filter(
-				(tag: ITag) => tag && tag.name.toLowerCase().includes(this.$data.filter.toLowerCase()),
-			);
-		},
-		appliedTags(): string[] {
-			return this.currentTagIds.filter((id: string) => this.tagsStore.getTagById(id));
-		},
-	},
-	methods: {
-		onBusFocus() {
-			this.focusOnInput();
-			this.focusOnTopOption();
-		},
-		filterOptions(filter = '') {
-			this.$data.filter = filter.trim();
-			this.$nextTick(() => this.focusOnTopOption());
-		},
-		async onCreate() {
-			const name = this.$data.filter;
+		async function onCreate() {
+			const name = filter.value;
 			try {
-				const newTag = await this.tagsStore.create(name);
-				this.$emit('update', [...this.currentTagIds, newTag.id]);
-				this.$nextTick(() => this.focusOnTag(newTag.id));
+				const newTag = await tagsStore.create(name);
+				emit('update:modelValue', [...props.modelValue, newTag.id]);
+
+				void nextTick(() => focusOnTag(newTag.id));
 
-				this.$data.filter = '';
+				filter.value = '';
 			} catch (error) {
-				this.showError(
+				showError(
 					error,
-					this.$locale.baseText('tagsDropdown.showError.title'),
-					this.$locale.baseText('tagsDropdown.showError.message', { interpolate: { name } }),
+					i18n.baseText('tagsDropdown.showError.title'),
+					i18n.baseText('tagsDropdown.showError.message', { interpolate: { name } }),
 				);
 			}
-		},
-		onTagsUpdated(selected: string[]) {
-			const ops = selected.find((value) => value === MANAGE_KEY || value === CREATE_KEY);
-			if (ops === MANAGE_KEY) {
-				this.$data.filter = '';
-				this.uiStore.openModal(TAGS_MANAGER_MODAL_KEY);
-			} else if (ops === CREATE_KEY) {
-				void this.onCreate();
+		}
+
+		function onTagsUpdated(selected: string[]) {
+			const manage = selected.find((value) => value === MANAGE_KEY);
+			const create = selected.find((value) => value === CREATE_KEY);
+
+			if (manage) {
+				filter.value = '';
+				uiStore.openModal(TAGS_MANAGER_MODAL_KEY);
+			} else if (create) {
+				void onCreate();
 			} else {
 				setTimeout(() => {
-					if (!this.$data.preventUpdate) {
-						this.$emit('update', selected);
+					if (!preventUpdate.value) {
+						emit('update:modelValue', selected);
 					}
-					this.$data.preventUpdate = false;
+					preventUpdate.value = false;
 				}, 0);
 			}
-		},
-		focusOnTopOption() {
-			const tagRefs = this.$refs.tag as TagRef[] | undefined;
-			const createRef = this.$refs.create as CreateRef | undefined;
+		}
+
+		function focusFirstOption() {
 			// focus on create option
-			if (createRef && createRef.hoverItem) {
-				createRef.hoverItem();
+			if (createRef.value?.$el) {
+				createRef.value.$el.dispatchEvent(new Event('mouseenter'));
 			}
 			// focus on top option after filter
-			else if (tagRefs && tagRefs[0] && tagRefs[0].hoverItem) {
-				tagRefs[0].hoverItem();
+			else if (tagRefs.value?.[0]?.$el) {
+				tagRefs.value[0].$el.dispatchEvent(new Event('mouseenter'));
 			}
-		},
-		focusOnTag(tagId: string) {
-			const tagOptions = (this.$refs.tag as TagRef[]) || [];
+		}
+
+		function focusOnTag(tagId: string) {
+			const tagOptions = tagRefs.value || [];
 			if (tagOptions && tagOptions.length) {
 				const added = tagOptions.find((ref) => ref.value === tagId);
 			}
-		},
-		focusOnInput() {
-			const selectRef = this.$refs.select as SelectRef | undefined;
-			if (selectRef) {
-				selectRef.focusOnInput();
-				this.focused = true;
+		}
+
+		function focusOnInput() {
+			if (selectRef.value) {
+				selectRef.value.focusOnInput();
+				focused.value = true;
 			}
-		},
-		onVisibleChange(visible: boolean) {
+		}
+
+		function onVisibleChange(visible: boolean) {
 			if (!visible) {
-				this.$data.filter = '';
-				this.focused = false;
+				filter.value = '';
+				focused.value = false;
 			} else {
-				this.focused = true;
+				focused.value = true;
 			}
-		},
-		onRemoveTag() {
-			this.$nextTick(() => {
-				this.focusOnInput();
+		}
+
+		function onRemoveTag() {
+			void nextTick(() => {
+				focusOnInput();
 			});
-		},
-		onClickOutside(e: Event) {
-			if (e.type === 'click') {
-				this.$emit('blur');
-			}
-		},
-	},
-	watch: {
-		allTags() {
-			// keep applied tags in sync with store
-			// for example in case tag is deleted from store
-			if (this.currentTagIds.length !== this.appliedTags.length) {
-				this.$emit('update', this.appliedTags);
+		}
+
+		function onClickOutside(e: Event) {
+			const tagsDropdown = document.querySelector('.tags-dropdown');
+			const tagsModal = document.querySelector('#tags-manager-modal');
+
+			const clickInsideTagsDropdowns =
+				tagsDropdown?.contains(e.target as Node) || tagsDropdown === e.target;
+			const clickInsideTagsModal = tagsModal?.contains(e.target as Node) || tagsModal === e.target;
+
+			if (!clickInsideTagsDropdowns && !clickInsideTagsModal && e.type === 'click') {
+				emit('blur');
 			}
-		},
+		}
+
+		return {
+			i18n,
+			tags,
+			filter,
+			focused,
+			preventUpdate,
+			selectRef,
+			tagRefs,
+			createRef,
+			allTags,
+			appliedTags,
+			options,
+			isLoading,
+			MANAGE_KEY,
+			CREATE_KEY,
+			onTagsUpdated,
+			onCreate,
+			filterOptions,
+			onVisibleChange,
+			onRemoveTag,
+			onClickOutside,
+			...useToast(),
+		};
 	},
 });
 </script>
+<style lang="scss">
+.tags-container {
+	$--max-input-height: 60px;
 
-<style lang="scss" scoped>
-$--max-input-height: 60px;
-
-::v-deep .el-select {
-	.el-select__tags {
-		max-height: $--max-input-height;
-		overflow-y: scroll;
-		overflow-x: hidden;
-	}
+	.el-select-tags-wrapper {
+		.el-tag {
+			max-height: $--max-input-height;
+			overflow-y: scroll;
+			overflow-x: hidden;
+		}
 
-	input {
-		max-height: $--max-input-height;
+		input {
+			max-height: $--max-input-height;
+		}
 	}
-}
-</style>
 
-<style lang="scss">
-.tags-container {
 	.el-tag {
 		padding: 1px var(--spacing-4xs);
 		color: var(--color-text-dark);
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
index 3f4f301539a7d..69a9471b408f9 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -1,5 +1,6 @@
 <template>
 	<Modal
+		id="tags-manager-modal"
 		:title="$locale.baseText('tagsManager.manageTags')"
 		:name="TAGS_MANAGER_MODAL_KEY"
 		:eventBus="modalBus"
@@ -39,7 +40,7 @@ import Modal from '@/components/Modal.vue';
 import { TAGS_MANAGER_MODAL_KEY } from '@/constants';
 import { mapStores } from 'pinia';
 import { useTagsStore } from '@/stores/tags.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'TagsManager',
@@ -71,9 +72,7 @@ export default defineComponent({
 			return this.tagsStore.isLoading;
 		},
 		tags(): ITag[] {
-			return this.$data.tagIds
-				.map((tagId: string) => this.tagsStore.getTagById(tagId))
-				.filter(Boolean); // if tag is deleted from store
+			return this.tagIds.map((tagId: string) => this.tagsStore.getTagById(tagId)).filter(Boolean); // if tag is deleted from store
 		},
 		hasTags(): boolean {
 			return this.tags.length > 0;
@@ -81,11 +80,11 @@ export default defineComponent({
 	},
 	methods: {
 		onEnableCreate() {
-			this.$data.isCreating = true;
+			this.isCreating = true;
 		},
 
 		onDisableCreate() {
-			this.$data.isCreating = false;
+			this.isCreating = false;
 		},
 
 		async onCreate(name: string, cb: (tag: ITag | null, error?: Error) => void) {
@@ -95,7 +94,7 @@ export default defineComponent({
 				}
 
 				const newTag = await this.tagsStore.create(name);
-				this.$data.tagIds = [newTag.id].concat(this.$data.tagIds);
+				this.tagIds = [newTag.id].concat(this.tagIds);
 				cb(newTag);
 			} catch (error) {
 				const escapedName = escape(name);
@@ -154,7 +153,7 @@ export default defineComponent({
 					throw new Error(this.$locale.baseText('tagsManager.couldNotDeleteTag'));
 				}
 
-				this.$data.tagIds = this.$data.tagIds.filter((tagId: string) => tagId !== id);
+				this.tagIds = this.tagIds.filter((tagId: string) => tagId !== id);
 
 				cb(deleted);
 
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index 8b2d43c465c3c..65bedf13bce51 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -1,5 +1,6 @@
 <template>
 	<el-table
+		class="tags-table"
 		stripe
 		max-height="450"
 		ref="table"
@@ -15,9 +16,9 @@
 					<transition name="fade" mode="out-in">
 						<n8n-input
 							v-if="scope.row.create || scope.row.update"
-							:value="newName"
+							:modelValue="newName"
 							:maxlength="maxLength"
-							@input="onNewNameChange"
+							@update:modelValue="onNewNameChange"
 							ref="nameInput"
 						></n8n-input>
 						<span v-else-if="scope.row.delete">
@@ -107,7 +108,7 @@
 </template>
 
 <script lang="ts">
-import type { Table as ElTable } from 'element-ui';
+import type { ElTable } from 'element-plus';
 import { MAX_TAG_NAME_LENGTH } from '@/constants';
 import type { ITagRow } from '@/Interface';
 import { defineComponent } from 'vue';
@@ -214,6 +215,12 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+.tags-table {
+	:deep(tr.disabled) {
+		pointer-events: none;
+	}
+}
+
 .name {
 	min-height: 45px;
 	display: flex;
@@ -248,10 +255,6 @@ export default defineComponent({
 	margin-left: 2px;
 }
 
-::v-deep tr.disabled {
-	pointer-events: none;
-}
-
 tr:hover .ops:not(.disabled) {
 	display: flex;
 }
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
index 32f4da6975edf..f327db503df98 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
@@ -3,11 +3,11 @@
 		<el-col :span="10">
 			<n8n-input
 				:placeholder="$locale.baseText('tagsTableHeader.searchTags')"
-				:value="search"
-				@input="onSearchChange"
+				:modelValue="search"
 				:disabled="disabled"
-				clearable
 				:maxlength="maxLength"
+				clearable
+				@update:modelValue="onSearchChange"
 			>
 				<template #prefix>
 					<font-awesome-icon icon="search" />
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
index a44d6b55fdd0b..f04504181226d 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
@@ -52,7 +52,7 @@ export default defineComponent({
 	computed: {
 		...mapStores(useUsersStore),
 		isCreateEnabled(): boolean {
-			return (this.tags || []).length === 0 || this.$data.createEnabled;
+			return (this.tags || []).length === 0 || this.createEnabled;
 		},
 		rows(): ITagRow[] {
 			const getUsage = (count: number | undefined) =>
@@ -60,16 +60,16 @@ export default defineComponent({
 					? this.$locale.baseText('tagsView.inUse', { adjustToNumber: count })
 					: this.$locale.baseText('tagsView.notBeingUsed');
 
-			const disabled = this.isCreateEnabled || this.$data.updateId || this.$data.deleteId;
+			const disabled = this.isCreateEnabled || this.updateId || this.deleteId;
 			const tagRows = (this.tags || [])
-				.filter((tag: ITag) => this.stickyIds.has(tag.id) || matches(tag.name, this.$data.search))
+				.filter((tag: ITag) => this.stickyIds.has(tag.id) || matches(tag.name, this.search))
 				.map(
 					(tag: ITag): ITagRow => ({
 						tag,
 						usage: getUsage(tag.usageCount),
-						disable: disabled && tag.id !== this.deleteId && tag.id !== this.$data.updateId,
-						update: disabled && tag.id === this.$data.updateId,
-						delete: disabled && tag.id === this.$data.deleteId,
+						disable: disabled && tag.id !== this.deleteId && tag.id !== this.updateId,
+						update: disabled && tag.id === this.updateId,
+						delete: disabled && tag.id === this.deleteId,
 						canDelete: this.usersStore.canUserDeleteTags,
 					}),
 				);
@@ -82,13 +82,11 @@ export default defineComponent({
 			this.newName = name;
 		},
 		onSearchChange(search: string): void {
-			this.$data.stickyIds.clear();
-			this.$data.search = search;
+			this.stickyIds.clear();
+			this.search = search;
 		},
 		isHeaderDisabled(): boolean {
-			return (
-				this.isLoading || !!(this.isCreateEnabled || this.$data.updateId || this.$data.deleteId)
-			);
+			return this.isLoading || !!(this.isCreateEnabled || this.updateId || this.deleteId);
 		},
 
 		onUpdateEnable(updateId: string): void {
@@ -99,10 +97,10 @@ export default defineComponent({
 			this.newName = '';
 		},
 		updateTag(): void {
-			this.$data.isSaving = true;
+			this.isSaving = true;
 			const name = this.newName.trim();
 			const onUpdate = (updated: boolean) => {
-				this.$data.isSaving = false;
+				this.isSaving = false;
 				if (updated) {
 					this.stickyIds.add(this.updateId);
 					this.disableUpdate();
@@ -119,58 +117,58 @@ export default defineComponent({
 			this.deleteId = '';
 		},
 		deleteTag(): void {
-			this.$data.isSaving = true;
+			this.isSaving = true;
 			const onDelete = (deleted: boolean) => {
 				if (deleted) {
 					this.disableDelete();
 				}
-				this.$data.isSaving = false;
+				this.isSaving = false;
 			};
 
 			this.$emit('delete', this.deleteId, onDelete);
 		},
 
 		onCreateEnable(): void {
-			this.$data.createEnabled = true;
-			this.$data.newName = '';
+			this.createEnabled = true;
+			this.newName = '';
 		},
 		disableCreate(): void {
-			this.$data.createEnabled = false;
+			this.createEnabled = false;
 			this.$emit('disableCreate');
 		},
 		createTag(): void {
-			this.$data.isSaving = true;
-			const name = this.$data.newName.trim();
+			this.isSaving = true;
+			const name = this.newName.trim();
 			const onCreate = (created: ITag | null, error?: Error) => {
 				if (created) {
 					this.stickyIds.add(created.id);
 					this.disableCreate();
 				}
-				this.$data.isSaving = false;
+				this.isSaving = false;
 			};
 
 			this.$emit('create', name, onCreate);
 		},
 
 		applyOperation(): void {
-			if (this.$data.isSaving) {
+			if (this.isSaving) {
 				return;
 			} else if (this.isCreateEnabled) {
 				this.createTag();
-			} else if (this.$data.updateId) {
+			} else if (this.updateId) {
 				this.updateTag();
-			} else if (this.$data.deleteId) {
+			} else if (this.deleteId) {
 				this.deleteTag();
 			}
 		},
 		cancelOperation(): void {
-			if (this.$data.isSaving) {
+			if (this.isSaving) {
 				return;
 			} else if (this.isCreateEnabled) {
 				this.disableCreate();
-			} else if (this.$data.updateId) {
+			} else if (this.updateId) {
 				this.disableUpdate();
-			} else if (this.$data.deleteId) {
+			} else if (this.deleteId) {
 				this.disableDelete();
 			}
 		},
diff --git a/packages/editor-ui/src/components/TemplateDetails.vue b/packages/editor-ui/src/components/TemplateDetails.vue
index d13f6c1907d1c..d40e33213a578 100644
--- a/packages/editor-ui/src/components/TemplateDetails.vue
+++ b/packages/editor-ui/src/components/TemplateDetails.vue
@@ -23,7 +23,7 @@
 			v-if="!loading && template?.categories.length > 0"
 			:title="$locale.baseText('template.details.categories')"
 		>
-			<n8n-tags :tags="template.categories" @click="redirectToCategory" />
+			<n8n-tags :tags="template.categories" @click:tag="redirectToCategory" />
 		</template-details-block>
 
 		<template-details-block v-if="!loading" :title="$locale.baseText('template.details.details')">
@@ -31,9 +31,8 @@
 				<n8n-text size="small" color="text-base">
 					{{ $locale.baseText('template.details.created') }}
 					<TimeAgo :date="template.createdAt" />
-					<span>{{ $locale.baseText('template.details.by') }}</span>
-					<span v-if="template.user"> {{ template.user.username }}</span>
-					<span v-else> n8n team</span>
+					{{ $locale.baseText('template.details.by') }}
+					{{ template.user ? template.user.username : 'n8n team' }}
 				</n8n-text>
 			</div>
 			<div :class="$style.text">
diff --git a/packages/editor-ui/src/components/TemplateFilters.vue b/packages/editor-ui/src/components/TemplateFilters.vue
index 741b5bc13b9f6..3fe428c859163 100644
--- a/packages/editor-ui/src/components/TemplateFilters.vue
+++ b/packages/editor-ui/src/components/TemplateFilters.vue
@@ -8,8 +8,8 @@
 			<li :class="$style.item">
 				<el-checkbox
 					:label="$locale.baseText('templates.allCategories')"
-					:value="allSelected"
-					@change="(value) => resetCategories(value)"
+					:modelValue="allSelected"
+					@update:modelValue="(value) => resetCategories(value)"
 				/>
 			</li>
 			<li
@@ -19,8 +19,8 @@
 			>
 				<el-checkbox
 					:label="category.name"
-					:value="isSelected(category.id)"
-					@change="(value) => handleCheckboxChanged(value, category)"
+					:modelValue="isSelected(category.id)"
+					@update:modelValue="(value) => handleCheckboxChanged(value, category)"
 				/>
 			</li>
 		</ul>
diff --git a/packages/editor-ui/src/components/TemplateList.vue b/packages/editor-ui/src/components/TemplateList.vue
index 93fc77a813eca..4f8d9699dbb19 100644
--- a/packages/editor-ui/src/components/TemplateList.vue
+++ b/packages/editor-ui/src/components/TemplateList.vue
@@ -71,7 +71,7 @@ export default defineComponent({
 			}
 		}
 	},
-	destroyed() {
+	beforeUnmount() {
 		const content = document.getElementById('content');
 		if (content) {
 			content.removeEventListener('scroll', this.onScroll);
diff --git a/packages/editor-ui/src/components/TextEdit.vue b/packages/editor-ui/src/components/TextEdit.vue
index c1ebda5687ba2..96bdd01c16e9e 100644
--- a/packages/editor-ui/src/components/TextEdit.vue
+++ b/packages/editor-ui/src/components/TextEdit.vue
@@ -1,7 +1,7 @@
 <template>
 	<div v-if="dialogVisible">
 		<el-dialog
-			:visible="dialogVisible"
+			:modelValue="dialogVisible"
 			append-to-body
 			width="80%"
 			:title="`${$locale.baseText('textEdit.edit')} ${$locale
@@ -16,11 +16,10 @@
 							v-model="tempValue"
 							type="textarea"
 							ref="inputField"
-							:value="value"
 							:placeholder="$locale.nodeText().placeholder(parameter, path)"
 							:readOnly="isReadOnly"
-							@change="valueChanged"
 							:rows="15"
+							@update:modelValue="valueChanged"
 						/>
 					</div>
 				</n8n-input-label>
@@ -34,7 +33,7 @@ import { nextTick, defineComponent } from 'vue';
 
 export default defineComponent({
 	name: 'TextEdit',
-	props: ['dialogVisible', 'parameter', 'path', 'value', 'isReadOnly'],
+	props: ['dialogVisible', 'parameter', 'path', 'modelValue', 'isReadOnly'],
 	data() {
 		return {
 			tempValue: '', // el-input does not seem to work without v-model so add one
@@ -42,12 +41,12 @@ export default defineComponent({
 	},
 	methods: {
 		valueChanged(value: string) {
-			this.$emit('valueChanged', value);
+			this.$emit('update:modelValue', value);
 		},
 
 		onKeyDownEsc() {
 			// Resetting input value when closing the dialog, required when closing it using the `Esc` key
-			this.tempValue = this.value;
+			this.tempValue = this.modelValue;
 
 			this.closeDialog();
 		},
@@ -60,18 +59,17 @@ export default defineComponent({
 		},
 	},
 	mounted() {
-		this.tempValue = this.value as string;
+		this.tempValue = this.modelValue as string;
 	},
 	watch: {
-		dialogVisible() {
+		async dialogVisible() {
 			if (this.dialogVisible === true) {
-				nextTick(() => {
-					(this.$refs.inputField as HTMLInputElement).focus();
-				});
+				await nextTick();
+				(this.$refs.inputField as HTMLInputElement).focus();
 			}
 		},
-		value() {
-			this.tempValue = this.value as string;
+		modelValue(value: string) {
+			this.tempValue = value;
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/editor-ui/src/components/TriggerPanel.vue
index f0f9cb266f5cb..7ec679ac480c7 100644
--- a/packages/editor-ui/src/components/TriggerPanel.vue
+++ b/packages/editor-ui/src/components/TriggerPanel.vue
@@ -94,7 +94,8 @@
 					:class="$style.accordion"
 					:title="$locale.baseText('ndv.trigger.executionsHint.question')"
 					:description="executionsHelp"
-					@click="onLinkClick"
+					:eventBus="executionsHelpEventBus"
+					@click:body="onLinkClick"
 				></n8n-info-accordion>
 			</div>
 		</transition>
@@ -118,6 +119,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { N8nInfoAccordion } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 type HelpRef = InstanceType<typeof N8nInfoAccordion>;
 
@@ -129,6 +131,11 @@ export default defineComponent({
 		CopyInput,
 		NodeIcon,
 	},
+	data: () => {
+		return {
+			executionsHelpEventBus: createEventBus(),
+		};
+	},
 	props: {
 		nodeName: {
 			type: String,
@@ -351,7 +358,7 @@ export default defineComponent({
 	methods: {
 		expandExecutionHelp() {
 			if (this.$refs.help) {
-				(this.$refs.help as HelpRef).$emit('expand');
+				this.executionsHelpEventBus.emit('expand');
 			}
 		},
 		onLinkClick(e: MouseEvent) {
diff --git a/packages/editor-ui/src/components/UpdatesPanel.vue b/packages/editor-ui/src/components/UpdatesPanel.vue
index a5a4f6e559466..b4568524b9e80 100644
--- a/packages/editor-ui/src/components/UpdatesPanel.vue
+++ b/packages/editor-ui/src/components/UpdatesPanel.vue
@@ -13,16 +13,20 @@
 							interpolate: { currentVersionName: currentVersion.name },
 						})
 					}}
-					<strong><TimeAgo :date="currentVersion.createdAt" /></strong
-					>{{ $locale.baseText('updatesPanel.andIs') }}
-					<strong>{{
-						$locale.baseText('updatesPanel.version', {
-							interpolate: {
-								numberOfVersions: nextVersions.length,
-								howManySuffix: nextVersions.length > 1 ? 's' : '',
-							},
-						})
-					}}</strong>
+					<strong>
+						<TimeAgo :date="currentVersion.createdAt" />
+					</strong>
+					{{ $locale.baseText('updatesPanel.andIs') }}
+					<strong>
+						{{
+							$locale.baseText('updatesPanel.version', {
+								interpolate: {
+									numberOfVersions: nextVersions.length,
+									howManySuffix: nextVersions.length > 1 ? 's' : '',
+								},
+							})
+						}}
+					</strong>
 					{{ $locale.baseText('updatesPanel.behindTheLatest') }}
 				</p>
 
diff --git a/packages/editor-ui/src/components/ValueSurvey.vue b/packages/editor-ui/src/components/ValueSurvey.vue
index f438ba483e0cc..2d3fb660c37d2 100644
--- a/packages/editor-ui/src/components/ValueSurvey.vue
+++ b/packages/editor-ui/src/components/ValueSurvey.vue
@@ -7,7 +7,7 @@
 		:wrapperClosable="false"
 		direction="btt"
 		width="120px"
-		class="value-survey"
+		:class="$style.valueSurvey"
 	>
 		<template #header>
 			<div :class="$style.title">
@@ -37,8 +37,7 @@
 						<n8n-input
 							v-model="form.email"
 							placeholder="Your email address"
-							size="medium"
-							@input="onInputChange"
+							@update:modelValue="onInputChange"
 						/>
 						<div :class="$style.button">
 							<n8n-button label="Send" float="right" @click="send" :disabled="!isEmailValid" />
@@ -66,7 +65,7 @@ import ModalDrawer from '@/components/ModalDrawer.vue';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import { useToast } from '@/composables';
 
 const DEFAULT_TITLE = 'How likely are you to recommend n8n to a friend or colleague?';
@@ -255,10 +254,9 @@ export default defineComponent({
 .disclaimer {
 	margin-top: var(--spacing-4xs);
 }
-</style>
 
-<style lang="scss">
-.value-survey {
+.valueSurvey {
+	background: var(--color-background-dark);
 	height: 120px;
 	top: auto;
 
@@ -266,32 +264,25 @@ export default defineComponent({
 		height: 140px;
 	}
 
-	.el-drawer {
-		background: var(--color-background-dark);
-
-		@media (max-width: $breakpoint-xs) {
-			height: 140px !important;
-		}
-
-		&__header {
-			height: 50px;
-			margin: 0;
-			padding: 18px 0 16px;
+	@media (max-width: $breakpoint-xs) {
+		height: 140px !important;
+	}
 
-			.el-drawer__close-btn {
-				top: 12px;
-				right: 16px;
-				position: absolute;
+	header {
+		height: 50px;
+		margin: 0;
+		padding: 18px 0 16px;
 
-				@media (max-width: $breakpoint-xs) {
-					top: 2px;
-					right: 2px;
-				}
-			}
+		button {
+			top: 12px;
+			right: 16px;
+			position: absolute;
+			font-weight: var(--font-weight-bold);
+			color: var(--color-text-xlight);
 
-			.el-dialog__close {
-				font-weight: var(--font-weight-bold);
-				color: var(--color-text-xlight);
+			@media (max-width: $breakpoint-xs) {
+				top: 2px;
+				right: 2px;
 			}
 		}
 	}
diff --git a/packages/editor-ui/src/components/VariablesRow.vue b/packages/editor-ui/src/components/VariablesRow.vue
index 19c59cd5d4682..03884b0848f94 100644
--- a/packages/editor-ui/src/components/VariablesRow.vue
+++ b/packages/editor-ui/src/components/VariablesRow.vue
@@ -7,7 +7,7 @@ import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore, useUsersStore } from '@/stores';
 import { getVariablesPermissions } from '@/permissions';
 
-const { i18n } = useI18n();
+const i18n = useI18n();
 const copyToClipboard = useCopyToClipboard();
 const { showMessage } = useToast();
 const settingsStore = useSettingsStore();
@@ -79,12 +79,11 @@ const valueValidationRules: Array<Rule | RuleGroup> = [
 
 watch(
 	() => modelValue.value.key,
-	() => {
-		nextTick(() => {
-			if (formValidationStatus.value.key) {
-				updateUsageSyntax();
-			}
-		});
+	async () => {
+		await nextTick();
+		if (formValidationStatus.value.key) {
+			updateUsageSyntax();
+		}
 	},
 );
 
diff --git a/packages/editor-ui/src/components/VersionCard.vue b/packages/editor-ui/src/components/VersionCard.vue
index 10e15296dd410..3539d14c7c0bf 100644
--- a/packages/editor-ui/src/components/VersionCard.vue
+++ b/packages/editor-ui/src/components/VersionCard.vue
@@ -1,21 +1,12 @@
 <template>
-	<!-- eslint-disable vue/no-mutating-props -->
-	<a
-		v-if="version"
-		:set="(version = version)"
-		:href="version.documentationUrl"
-		target="_blank"
-		:class="$style.card"
-	>
+	<a v-if="version" :href="version.documentationUrl" target="_blank" :class="$style.card">
 		<div :class="$style.header">
 			<div>
 				<div :class="$style.name">
 					{{ `${$locale.baseText('versionCard.version')} ${version.name}` }}
 				</div>
 				<WarningTooltip v-if="version.hasSecurityIssue">
-					<template>
-						<span v-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
-					</template>
+					<span v-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
 				</WarningTooltip>
 				<Badge
 					v-if="version.hasSecurityFix"
@@ -55,17 +46,24 @@
 </template>
 
 <script lang="ts">
+import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 import NodeIcon from './NodeIcon.vue';
 import TimeAgo from './TimeAgo.vue';
 import Badge from './Badge.vue';
 import WarningTooltip from './WarningTooltip.vue';
 import type { IVersionNode } from '@/Interface';
+import type { IVersion } from '@/Interface';
 
 export default defineComponent({
 	name: 'VersionCard',
 	components: { NodeIcon, TimeAgo, Badge, WarningTooltip },
-	props: ['version'],
+	props: {
+		version: {
+			type: Object as PropType<IVersion>,
+			required: true,
+		},
+	},
 	// @ts-ignore
 	nodeName(node: IVersionNode): string {
 		return node !== null ? node.displayName : this.$locale.baseText('versionCard.unknown');
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index e5789529e12f6..c6bd5274ff8fe 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -19,8 +19,8 @@
 			</template>
 			<el-switch
 				v-loading="updatingWorkflowActivation"
-				:value="workflowActive"
-				@change="activeChanged"
+				:modelValue="workflowActive"
+				@update:modelValue="activeChanged"
 				:title="
 					workflowActive
 						? $locale.baseText('workflowActivator.deactivateWorkflow')
@@ -65,6 +65,7 @@ export default defineComponent({
 	setup(props) {
 		return {
 			...useToast(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...workflowActivate.setup?.(props),
 		};
 	},
@@ -154,6 +155,10 @@ export default defineComponent({
 	display: inline-flex;
 	flex-wrap: nowrap;
 	align-items: center;
+
+	:deep(.el-loading-spinner) {
+		margin-top: -10px;
+	}
 }
 
 .could-not-be-started {
@@ -161,8 +166,4 @@ export default defineComponent({
 	color: #ff4949;
 	margin-left: 0.5em;
 }
-
-::v-deep .el-loading-spinner {
-	margin-top: -10px;
-}
 </style>
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index c3438942b4c4d..d15a72b634c7e 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -21,7 +21,7 @@
 						:tags="data.tags"
 						:truncateAt="3"
 						truncate
-						@click="onClickTag"
+						@click:tag="onClickTag"
 						@expand="onExpandTags"
 						data-test-id="workflow-card-tags"
 					/>
@@ -48,6 +48,7 @@
 					:actions="actions"
 					theme="dark"
 					@action="onAction"
+					@click.stop
 					data-test-id="workflow-card-actions"
 				/>
 			</div>
diff --git a/packages/editor-ui/src/components/WorkflowPreview.vue b/packages/editor-ui/src/components/WorkflowPreview.vue
index 814971bb1e002..c50f7d849d906 100644
--- a/packages/editor-ui/src/components/WorkflowPreview.vue
+++ b/packages/editor-ui/src/components/WorkflowPreview.vue
@@ -194,7 +194,7 @@ export default defineComponent({
 		window.addEventListener('message', this.receiveMessage);
 		document.addEventListener('scroll', this.onDocumentScroll);
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		window.removeEventListener('message', this.receiveMessage);
 		document.removeEventListener('scroll', this.onDocumentScroll);
 	},
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 590c606dd7f75..799e655b0249a 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -41,7 +41,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.errorWorkflow') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-html="helpTexts.errorWorkflow"></div>
 							</template>
@@ -52,7 +52,6 @@
 						<n8n-select
 							v-model="workflowSettings.errorWorkflow"
 							placeholder="Select Workflow"
-							size="medium"
 							filterable
 							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
@@ -72,7 +71,7 @@
 					<el-row>
 						<el-col :span="10" class="setting-name">
 							{{ $locale.baseText('workflowSettings.callerPolicy') + ':' }}
-							<n8n-tooltip class="setting-info" placement="top">
+							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.workflowCallerPolicy"></div>
 								</template>
@@ -85,7 +84,6 @@
 								v-model="workflowSettings.callerPolicy"
 								:disabled="readOnlyEnv"
 								:placeholder="$locale.baseText('workflowSettings.selectOption')"
-								size="medium"
 								filterable
 								:limit-popper-width="true"
 							>
@@ -102,7 +100,7 @@
 					<el-row v-if="workflowSettings.callerPolicy === 'workflowsFromAList'">
 						<el-col :span="10" class="setting-name">
 							{{ $locale.baseText('workflowSettings.callerIds') + ':' }}
-							<n8n-tooltip class="setting-info" placement="top">
+							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.workflowCallerIds"></div>
 								</template>
@@ -114,9 +112,8 @@
 								:disabled="readOnlyEnv"
 								:placeholder="$locale.baseText('workflowSettings.callerIds.placeholder')"
 								type="text"
-								size="medium"
 								v-model="workflowSettings.callerIds"
-								@input="onCallerIdsInput"
+								@update:modelValue="onCallerIdsInput"
 							/>
 						</el-col>
 					</el-row>
@@ -124,7 +121,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.timezone') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.timezone"></div>
 							</template>
@@ -135,7 +132,6 @@
 						<n8n-select
 							v-model="workflowSettings.timezone"
 							placeholder="Select Timezone"
-							size="medium"
 							filterable
 							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
@@ -154,7 +150,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveDataErrorExecution') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveDataErrorExecution"></div>
 							</template>
@@ -165,7 +161,6 @@
 						<n8n-select
 							v-model="workflowSettings.saveDataErrorExecution"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
 							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
@@ -184,7 +179,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveDataSuccessExecution') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveDataSuccessExecution"></div>
 							</template>
@@ -195,7 +190,6 @@
 						<n8n-select
 							v-model="workflowSettings.saveDataSuccessExecution"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
 							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
@@ -214,7 +208,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveManualExecutions') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveManualExecutions"></div>
 							</template>
@@ -225,7 +219,6 @@
 						<n8n-select
 							v-model="workflowSettings.saveManualExecutions"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
 							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
@@ -244,7 +237,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.saveExecutionProgress') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveExecutionProgress"></div>
 							</template>
@@ -255,7 +248,6 @@
 						<n8n-select
 							v-model="workflowSettings.saveExecutionProgress"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
-							size="medium"
 							filterable
 							:disabled="readOnlyEnv"
 							:limit-popper-width="true"
@@ -274,7 +266,7 @@
 				<el-row>
 					<el-col :span="10" class="setting-name">
 						{{ $locale.baseText('workflowSettings.timeoutWorkflow') + ':' }}
-						<n8n-tooltip class="setting-info" placement="top">
+						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.executionTimeoutToggle"></div>
 							</template>
@@ -286,8 +278,8 @@
 							<el-switch
 								ref="inputField"
 								:disabled="readOnlyEnv"
-								:value="workflowSettings.executionTimeout > -1"
-								@change="toggleTimeout"
+								:modelValue="workflowSettings.executionTimeout > -1"
+								@update:modelValue="toggleTimeout"
 								active-color="#13ce66"
 								data-test-id="workflow-settings-timeout-workflow"
 							></el-switch>
@@ -301,7 +293,7 @@
 					<el-row>
 						<el-col :span="10" class="setting-name">
 							{{ $locale.baseText('workflowSettings.timeoutAfter') + ':' }}
-							<n8n-tooltip class="setting-info" placement="top">
+							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.executionTimeout"></div>
 								</template>
@@ -310,10 +302,9 @@
 						</el-col>
 						<el-col :span="4">
 							<n8n-input
-								size="medium"
 								:disabled="readOnlyEnv"
-								:value="timeoutHMS.hours"
-								@input="(value) => setTimeout('hours', value)"
+								:modelValue="timeoutHMS.hours"
+								@update:modelValue="(value) => setTimeout('hours', value)"
 								:min="0"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.hours') }}</template>
@@ -321,24 +312,22 @@
 						</el-col>
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
-								size="medium"
 								:disabled="readOnlyEnv"
-								:value="timeoutHMS.minutes"
-								@input="(value) => setTimeout('minutes', value)"
+								:modelValue="timeoutHMS.minutes"
 								:min="0"
 								:max="60"
+								@update:modelValue="(value) => setTimeout('minutes', value)"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.minutes') }}</template>
 							</n8n-input>
 						</el-col>
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
-								size="medium"
 								:disabled="readOnlyEnv"
-								:value="timeoutHMS.seconds"
-								@input="(value) => setTimeout('seconds', value)"
+								:modelValue="timeoutHMS.seconds"
 								:min="0"
 								:max="60"
+								@update:modelValue="(value) => setTimeout('seconds', value)"
 							>
 								<template #append>{{ $locale.baseText('workflowSettings.seconds') }}</template>
 							</n8n-input>
@@ -392,7 +381,7 @@ import {
 	useWorkflowsEEStore,
 	useUsersStore,
 } from '@/stores';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'WorkflowSettings',
@@ -906,17 +895,19 @@ export default defineComponent({
 	}
 }
 
-.setting-info {
-	display: none;
-}
-
 .setting-name {
 	line-height: 32px;
-}
 
-.setting-name:hover {
-	.setting-info {
-		display: inline;
+	svg {
+		display: inline-flex;
+		opacity: 0;
+		transition: opacity 0.3s ease;
+	}
+
+	&:hover {
+		svg {
+			opacity: 1;
+		}
 	}
 }
 
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index dd35729124bad..1ee38e4d32499 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -39,7 +39,7 @@
 						:currentUserId="currentUser.id"
 						:placeholder="$locale.baseText('workflows.shareModal.select.placeholder')"
 						data-test-id="workflow-sharing-modal-users-select"
-						@input="onAddSharee"
+						@update:modelValue="onAddSharee"
 					>
 						<template #prefix>
 							<n8n-icon icon="search" />
@@ -55,9 +55,9 @@
 						<template #actions="{ user }">
 							<n8n-select
 								:class="$style.roleSelect"
-								value="editor"
+								modelValue="editor"
 								size="small"
-								@change="onRoleAction(user, $event)"
+								@update:modelValue="onRoleAction(user, $event)"
 							>
 								<n8n-option :label="$locale.baseText('workflows.roles.editor')" value="editor" />
 								<n8n-option :class="$style.roleSelectRemoveOption" value="remove">
@@ -70,14 +70,14 @@
 					</n8n-users-list>
 					<template #fallback>
 						<n8n-text>
-							<i18n
-								:path="
+							<i18n-t
+								:keypath="
 									uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.description
 								"
 								tag="span"
 							>
 								<template #action />
-							</i18n>
+							</i18n-t>
 						</n8n-text>
 					</template>
 				</enterprise-edition>
@@ -111,7 +111,6 @@
 					v-show="workflowPermissions.updateSharing"
 					:loading="loading"
 					:disabled="!isDirty"
-					size="medium"
 					data-test-id="workflow-sharing-modal-save-button"
 					@click="onSave"
 				>
@@ -125,7 +124,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 import Modal from './Modal.vue';
 import {
diff --git a/packages/editor-ui/src/components/__tests__/BannersStack.test.ts b/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
index cc8518ad0b4c8..7458b9804f0f8 100644
--- a/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
+++ b/packages/editor-ui/src/components/__tests__/BannersStack.test.ts
@@ -1,5 +1,4 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render, within } from '@testing-library/vue';
+import { within } from '@testing-library/vue';
 import { merge } from 'lodash-es';
 import userEvent from '@testing-library/user-event';
 
@@ -10,53 +9,52 @@ import { createTestingPinia } from '@pinia/testing';
 import BannerStack from '@/components/banners/BannerStack.vue';
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
+import type { RenderOptions } from '@/__tests__/render';
+import { createComponentRenderer } from '@/__tests__/render';
 
 let uiStore: ReturnType<typeof useUIStore>;
 let usersStore: ReturnType<typeof useUsersStore>;
 
-const DEFAULT_SETUP = {
-	pinia: createTestingPinia({
-		initialState: {
-			[STORES.SETTINGS]: {
-				settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-			},
-			[STORES.UI]: {
-				banners: {
-					V1: { dismissed: false },
-					TRIAL: { dismissed: false },
-					TRIAL_OVER: { dismissed: false },
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+	},
+	[STORES.UI]: {
+		banners: {
+			V1: { dismissed: false },
+			TRIAL: { dismissed: false },
+			TRIAL_OVER: { dismissed: false },
+		},
+	},
+	[STORES.USERS]: {
+		currentUserId: 'aaa-bbb',
+		users: {
+			'aaa-bbb': {
+				id: 'aaa-bbb',
+				globalRole: {
+					id: '1',
+					name: 'owner',
+					scope: 'global',
 				},
 			},
-			[STORES.USERS]: {
-				currentUserId: 'aaa-bbb',
-				users: {
-					'aaa-bbb': {
-						id: 'aaa-bbb',
-						globalRole: {
-							id: '1',
-							name: 'owner',
-							scope: 'global',
-						},
-					},
-					'bbb-bbb': {
-						id: 'bbb-bbb',
-						globalRoleId: 2,
-						globalRole: {
-							id: '2',
-							name: 'member',
-							scope: 'global',
-						},
-					},
+			'bbb-bbb': {
+				id: 'bbb-bbb',
+				globalRoleId: 2,
+				globalRole: {
+					id: '2',
+					name: 'member',
+					scope: 'global',
 				},
 			},
 		},
-	}),
+	},
 };
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(BannerStack, merge(DEFAULT_SETUP, renderOptions), (vue) => {
-		vue.use(PiniaVuePlugin);
-	});
+const defaultRenderOptions: RenderOptions = {
+	pinia: createTestingPinia({ initialState }),
+};
+
+const renderComponent = createComponentRenderer(BannerStack, defaultRenderOptions);
 
 describe('BannerStack', () => {
 	beforeEach(() => {
@@ -82,19 +80,17 @@ describe('BannerStack', () => {
 	it('should not render dismissed banners', async () => {
 		const { getByTestId } = renderComponent({
 			pinia: createTestingPinia({
-				initialState: merge(
-					{
-						[STORES.UI]: {
-							banners: {
-								V1: { dismissed: true },
-								TRIAL: { dismissed: true },
-							},
+				initialState: merge(initialState, {
+					[STORES.UI]: {
+						banners: {
+							V1: { dismissed: true },
+							TRIAL: { dismissed: true },
 						},
 					},
-					DEFAULT_SETUP.pinia,
-				),
+				}),
 			}),
 		});
+
 		const bannerStack = getByTestId('banner-stack');
 		expect(bannerStack).toBeInTheDocument();
 
@@ -117,7 +113,7 @@ describe('BannerStack', () => {
 	it('should permanently dismiss banner on click', async () => {
 		const { getByTestId } = renderComponent({
 			pinia: createTestingPinia({
-				initialState: merge(DEFAULT_SETUP.pinia, {
+				initialState: merge(initialState, {
 					[STORES.UI]: {
 						banners: {
 							V1: { dismissed: false },
@@ -139,7 +135,7 @@ describe('BannerStack', () => {
 	it('should not render permanent dismiss link if user is not owner', async () => {
 		const { queryByTestId } = renderComponent({
 			pinia: createTestingPinia({
-				initialState: merge(DEFAULT_SETUP.pinia, {
+				initialState: merge(initialState, {
 					[STORES.USERS]: {
 						currentUserId: 'bbb-bbb',
 					},
diff --git a/packages/editor-ui/src/components/__tests__/CopyInput.test.ts b/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
index 93991153b2679..31a44fd8f459c 100644
--- a/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
+++ b/packages/editor-ui/src/components/__tests__/CopyInput.test.ts
@@ -1,5 +1,3 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import { merge } from 'lodash-es';
 
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
@@ -7,6 +5,7 @@ import { STORES } from '@/constants';
 
 import { createTestingPinia } from '@pinia/testing';
 import CopyInput from '@/components/CopyInput.vue';
+import { createComponentRenderer } from '@/__tests__/render';
 
 const DEFAULT_SETUP = {
 	pinia: createTestingPinia({
@@ -22,10 +21,7 @@ const DEFAULT_SETUP = {
 	},
 };
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(CopyInput, merge(DEFAULT_SETUP, renderOptions), (vue) => {
-		vue.use(PiniaVuePlugin);
-	});
+const renderComponent = createComponentRenderer(CopyInput, DEFAULT_SETUP);
 
 describe('BannerStack', () => {
 	afterEach(() => {
diff --git a/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
index 8d4ccaf000e6f..b41770a9b7109 100644
--- a/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
@@ -1,29 +1,14 @@
 import { describe, test, expect } from 'vitest';
-import Vue from 'vue';
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import type { RenderOptions } from '@testing-library/vue';
-import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { faker } from '@faker-js/faker';
 import ExecutionFilter from '@/components/ExecutionFilter.vue';
 import { STORES } from '@/constants';
-import { i18nInstance } from '@/plugins/i18n';
 import type { IWorkflowShortResponse, ExecutionFilterType } from '@/Interface';
-import { useTelemetry } from '@/composables';
-
-vi.mock('@/composables', () => {
-	const track = vi.fn();
-	return {
-		useTelemetry: () => ({
-			track,
-		}),
-	};
-});
-
-let telemetry: ReturnType<typeof useTelemetry>;
-
-Vue.use(PiniaVuePlugin);
+import { createComponentRenderer } from '@/__tests__/render';
+import * as telemetryModule from '@/composables/useTelemetry';
+import type { Telemetry } from '@/plugins/telemetry';
+import { merge } from 'lodash-es';
 
 const defaultFilterState: ExecutionFilterType = {
 	status: 'all',
@@ -65,13 +50,36 @@ const initialState = {
 	},
 };
 
-const renderOptions: RenderOptions<ExecutionFilter> = {
-	i18n: i18nInstance,
-};
+const renderComponent = createComponentRenderer(ExecutionFilter, {
+	props: {
+		teleported: false,
+	},
+});
 
 describe('ExecutionFilter', () => {
-	beforeEach(() => {
-		telemetry = useTelemetry();
+	afterAll(() => {
+		vi.clearAllMocks();
+	});
+
+	test('telemetry sent only once after component is mounted', async () => {
+		const track = vi.fn();
+		const spy = vi.spyOn(telemetryModule, 'useTelemetry');
+		spy.mockImplementation(
+			() =>
+				({
+					track,
+				} as unknown as Telemetry),
+		);
+
+		const { getByTestId } = renderComponent({
+			pinia: createTestingPinia({ initialState }),
+		});
+		const customDataKeyInput = getByTestId('execution-filter-saved-data-key-input');
+
+		await userEvent.type(customDataKeyInput, 'test');
+		await userEvent.type(customDataKeyInput, 'key');
+
+		expect(track).toHaveBeenCalledTimes(1);
 	});
 
 	test.each([
@@ -86,30 +94,49 @@ describe('ExecutionFilter', () => {
 	])(
 		'renders in %s environment on %s deployment with advancedExecutionFilters %s and workflows %s',
 		async (environment, deployment, advancedExecutionFilters, workflows) => {
-			initialState[STORES.SETTINGS].settings.license.environment = environment;
-			initialState[STORES.SETTINGS].settings.deployment.type = deployment;
-			initialState[STORES.SETTINGS].settings.enterprise.advancedExecutionFilters =
-				advancedExecutionFilters;
-
-			renderOptions.pinia = createTestingPinia({ initialState });
-			renderOptions.props = { workflows };
-
-			const { getByTestId, queryByTestId } = render(ExecutionFilter, renderOptions);
+			const { html, getByTestId, queryByTestId, queryAllByTestId } = renderComponent({
+				props: { workflows },
+				pinia: createTestingPinia({
+					initialState: merge(initialState, {
+						[STORES.SETTINGS]: {
+							settings: {
+								license: {
+									environment,
+								},
+								deployment: {
+									type: deployment,
+								},
+								enterprise: {
+									advancedExecutionFilters,
+								},
+							},
+						},
+					}),
+				}),
+			});
 
 			await userEvent.click(getByTestId('executions-filter-button'));
 			await userEvent.hover(getByTestId('execution-filter-saved-data-key-input'));
 
 			if (advancedExecutionFilters) {
-				expect(queryByTestId('executions-filter-view-plans-link')).not.toBeInTheDocument();
+				expect(queryByTestId('executions-filter-view-plans-link')).not.toBeVisible();
 			}
 
 			expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
-			expect(!!queryByTestId('executions-filter-workflows-select')).toBe(!!workflows?.length);
+
+			const select = queryByTestId('executions-filter-workflows-select');
+			if (workflows && workflows.length > 0) {
+				expect(select).toBeVisible();
+			} else {
+				expect(select).not.toBeInTheDocument();
+			}
 		},
 	);
 
 	test('state change', async () => {
-		const { getByTestId, queryByTestId, emitted } = render(ExecutionFilter, renderOptions);
+		const { html, getByTestId, queryByTestId, emitted } = renderComponent({
+			pinia: createTestingPinia({ initialState }),
+		});
 
 		const filterChangedEvent = emitted().filterChanged;
 		expect(filterChangedEvent).toHaveLength(1);
@@ -123,6 +150,7 @@ describe('ExecutionFilter', () => {
 		expect(getByTestId('execution-filter-form')).toBeVisible();
 
 		await userEvent.click(getByTestId('executions-filter-status-select'));
+
 		await userEvent.click(getByTestId('executions-filter-status-select').querySelectorAll('li')[1]);
 
 		expect(emitted().filterChanged).toHaveLength(2);
@@ -136,14 +164,4 @@ describe('ExecutionFilter', () => {
 		expect(queryByTestId('executions-filter-reset-button')).not.toBeInTheDocument();
 		expect(queryByTestId('execution-filter-badge')).not.toBeInTheDocument();
 	});
-
-	test('telemetry sent only once after component is mounted', async () => {
-		const { getByTestId } = render(ExecutionFilter, renderOptions);
-		const customDataKeyInput = getByTestId('execution-filter-saved-data-key-input');
-
-		await userEvent.type(customDataKeyInput, 'test');
-		await userEvent.type(customDataKeyInput, 'key');
-
-		expect(telemetry.track).toHaveBeenCalledTimes(1);
-	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
index acafa33217c1a..7154cdcfe0c51 100644
--- a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
@@ -1,17 +1,16 @@
 import { vi, describe, it, expect } from 'vitest';
 import { merge } from 'lodash-es';
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { faker } from '@faker-js/faker';
 import { STORES } from '@/constants';
 import ExecutionsList from '@/components/ExecutionsList.vue';
-import { i18nInstance } from '@/plugins/i18n';
 import type { IWorkflowDb } from '@/Interface';
 import type { IExecutionsSummary } from 'n8n-workflow';
 import { retry, SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { RenderOptions } from '@/__tests__/render';
+import { createComponentRenderer } from '@/__tests__/render';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 
@@ -65,28 +64,19 @@ const generateExecutionsData = () =>
 		estimated: false,
 	}));
 
-const renderComponent = async () => {
-	const renderResult = render(
-		ExecutionsList,
-		{
-			pinia,
-			propsData: {
-				autoRefreshEnabled: false,
-			},
-			i18n: i18nInstance,
+const defaultRenderOptions: RenderOptions = {
+	props: {
+		autoRefreshEnabled: false,
+	},
+	global: {
+		stubs: {
 			stubs: ['font-awesome-icon'],
 		},
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-			vue.prototype.$telemetry = {
-				track: () => {},
-			};
-		},
-	);
-	await waitAllPromises();
-	return renderResult;
+	},
 };
 
+const renderComponent = createComponentRenderer(ExecutionsList, defaultRenderOptions);
+
 describe('ExecutionsList.vue', () => {
 	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
 	let workflowsData: IWorkflowDb[];
@@ -123,7 +113,13 @@ describe('ExecutionsList.vue', () => {
 			results: [],
 			estimated: false,
 		});
-		const { queryAllByTestId, queryByTestId, getByTestId } = await renderComponent();
+		const { queryAllByTestId, queryByTestId, getByTestId } = renderComponent({
+			global: {
+				plugins: [pinia],
+			},
+		});
+		await waitAllPromises();
+
 		await userEvent.click(getByTestId('execution-auto-refresh-checkbox'));
 
 		expect(queryAllByTestId('select-execution-checkbox').length).toBe(0);
@@ -132,58 +128,67 @@ describe('ExecutionsList.vue', () => {
 		expect(getByTestId('execution-list-empty')).toBeInTheDocument();
 	});
 
-	it('should handle selection flow when loading more items', async () => {
-		const storeSpy = vi
-			.spyOn(workflowsStore, 'getPastExecutions')
-			.mockResolvedValueOnce(executionsData[0])
-			.mockResolvedValueOnce(executionsData[1]);
+	it(
+		'should handle selection flow when loading more items',
+		async () => {
+			const storeSpy = vi
+				.spyOn(workflowsStore, 'getPastExecutions')
+				.mockResolvedValueOnce(executionsData[0])
+				.mockResolvedValueOnce(executionsData[1]);
+
+			const { getByTestId, getAllByTestId, queryByTestId } = renderComponent({
+				global: {
+					plugins: [pinia],
+				},
+			});
+			await waitAllPromises();
+
+			expect(storeSpy).toHaveBeenCalledTimes(1);
 
-		const { getByTestId, getAllByTestId, queryByTestId } = await renderComponent();
+			await userEvent.click(getByTestId('select-visible-executions-checkbox'));
 
-		expect(storeSpy).toHaveBeenCalledTimes(1);
+			await retry(() =>
+				expect(
+					getAllByTestId('select-execution-checkbox').filter((el) =>
+						el.contains(el.querySelector(':checked')),
+					).length,
+				).toBe(10),
+			);
+			expect(getByTestId('select-all-executions-checkbox')).toBeInTheDocument();
+			expect(getByTestId('selected-executions-info').textContent).toContain(10);
 
-		await userEvent.click(getByTestId('select-visible-executions-checkbox'));
+			await userEvent.click(getByTestId('load-more-button'));
 
-		await retry(() =>
+			expect(storeSpy).toHaveBeenCalledTimes(2);
+			expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
 			expect(
 				getAllByTestId('select-execution-checkbox').filter((el) =>
 					el.contains(el.querySelector(':checked')),
 				).length,
-			).toBe(10),
-		);
-		expect(getByTestId('select-all-executions-checkbox')).toBeInTheDocument();
-		expect(getByTestId('selected-executions-info').textContent).toContain(10);
-
-		await userEvent.click(getByTestId('load-more-button'));
-
-		expect(storeSpy).toHaveBeenCalledTimes(2);
-		expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(10);
-
-		await userEvent.click(getByTestId('select-all-executions-checkbox'));
-		expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(20);
-		expect(getByTestId('selected-executions-info').textContent).toContain(20);
-
-		await userEvent.click(getAllByTestId('select-execution-checkbox')[2]);
-		expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
-		expect(
-			getAllByTestId('select-execution-checkbox').filter((el) =>
-				el.contains(el.querySelector(':checked')),
-			).length,
-		).toBe(19);
-		expect(getByTestId('selected-executions-info').textContent).toContain(19);
-		expect(getByTestId('select-visible-executions-checkbox')).toBeInTheDocument();
-		expect(queryByTestId('select-all-executions-checkbox')).not.toBeInTheDocument();
-	});
+			).toBe(10);
+
+			await userEvent.click(getByTestId('select-all-executions-checkbox'));
+			expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
+			expect(
+				getAllByTestId('select-execution-checkbox').filter((el) =>
+					el.contains(el.querySelector(':checked')),
+				).length,
+			).toBe(20);
+			expect(getByTestId('selected-executions-info').textContent).toContain(20);
+
+			await userEvent.click(getAllByTestId('select-execution-checkbox')[2]);
+			expect(getAllByTestId('select-execution-checkbox').length).toBe(20);
+			expect(
+				getAllByTestId('select-execution-checkbox').filter((el) =>
+					el.contains(el.querySelector(':checked')),
+				).length,
+			).toBe(19);
+			expect(getByTestId('selected-executions-info').textContent).toContain(19);
+			expect(getByTestId('select-visible-executions-checkbox')).toBeInTheDocument();
+			expect(queryByTestId('select-all-executions-checkbox')).not.toBeInTheDocument();
+		},
+		{ timeout: 10000 },
+	);
 
 	it('should show "retry" data when appropriate', async () => {
 		vi.spyOn(workflowsStore, 'getPastExecutions').mockResolvedValue(executionsData[0]);
@@ -192,7 +197,12 @@ describe('ExecutionsList.vue', () => {
 			(execution) => !execution.retryOf && execution.retrySuccessId,
 		);
 
-		const { queryAllByText } = await renderComponent();
+		const { queryAllByText } = renderComponent({
+			global: {
+				plugins: [pinia],
+			},
+		});
+		await waitAllPromises();
 
 		expect(queryAllByText(/Retry of/).length).toBe(retryOf.length);
 		expect(queryAllByText(/Success retry/).length).toBe(retrySuccessId.length);
diff --git a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
index e8c19daf3b3a1..f6be1abc45af8 100644
--- a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
@@ -1,34 +1,22 @@
 import { describe, it, expect, vi } from 'vitest';
-import { render, waitFor } from '@testing-library/vue';
+import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, STORES } from '@/constants';
-import { i18nInstance } from '@/plugins/i18n';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
-import { useSourceControlStore, useUIStore } from '@/stores';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
+import { createComponentRenderer } from '@/__tests__/render';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 let sourceControlStore: ReturnType<typeof useSourceControlStore>;
 let uiStore: ReturnType<typeof useUIStore>;
 let usersStore: ReturnType<typeof useUsersStore>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) => {
-	return render(
-		MainSidebarSourceControl,
-		{
-			pinia,
-			i18n: i18nInstance,
-			...renderOptions,
-		},
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
-};
+const renderComponent = createComponentRenderer(MainSidebarSourceControl);
 
 describe('MainSidebarSourceControl', () => {
 	beforeEach(() => {
@@ -51,12 +39,12 @@ describe('MainSidebarSourceControl', () => {
 
 	it('should render nothing when not instance owner', async () => {
 		vi.spyOn(usersStore, 'isInstanceOwner', 'get').mockReturnValue(false);
-		const { container } = renderComponent({ props: { isCollapsed: false } });
+		const { container } = renderComponent({ pinia, props: { isCollapsed: false } });
 		expect(container).toBeEmptyDOMElement();
 	});
 
 	it('should render empty content when instance owner but not connected', async () => {
-		const { getByTestId } = renderComponent({ props: { isCollapsed: false } });
+		const { getByTestId } = renderComponent({ pinia, props: { isCollapsed: false } });
 		expect(getByTestId('main-sidebar-source-control')).toBeInTheDocument();
 		expect(getByTestId('main-sidebar-source-control')).toBeEmptyDOMElement();
 	});
@@ -75,7 +63,10 @@ describe('MainSidebarSourceControl', () => {
 		});
 
 		it('should render the appropriate content', async () => {
-			const { getByTestId, queryByTestId } = renderComponent({ props: { isCollapsed: false } });
+			const { getByTestId, queryByTestId } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
 			expect(getByTestId('main-sidebar-source-control-connected')).toBeInTheDocument();
 			expect(queryByTestId('main-sidebar-source-control-setup')).not.toBeInTheDocument();
 		});
@@ -84,7 +75,10 @@ describe('MainSidebarSourceControl', () => {
 			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
 				response: { status: 400 },
 			});
-			const { getAllByRole, getByRole } = renderComponent({ props: { isCollapsed: false } });
+			const { getAllByRole, getByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
 
 			await userEvent.click(getAllByRole('button')[0]);
 			await waitFor(() => expect(getByRole('alert')).toBeInTheDocument());
@@ -97,7 +91,10 @@ describe('MainSidebarSourceControl', () => {
 			});
 			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
 
-			const { getAllByRole, getByRole } = renderComponent({ props: { isCollapsed: false } });
+			const { getAllByRole, getByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
 
 			await userEvent.click(getAllByRole('button')[0]);
 			await waitFor(() =>
diff --git a/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts b/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
index b1f337385130c..aa50c757e0a69 100644
--- a/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
+++ b/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
@@ -1,19 +1,23 @@
-import { PiniaVuePlugin } from 'pinia';
-import { createLocalVue, mount } from '@vue/test-utils';
 import PersonalizationModal from '@/components/PersonalizationModal.vue';
 import { createTestingPinia } from '@pinia/testing';
-import { PERSONALIZATION_MODAL_KEY } from '@/constants';
+import { PERSONALIZATION_MODAL_KEY, STORES } from '@/constants';
 import { retry } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import { fireEvent } from '@testing-library/vue';
 
-describe('PersonalizationModal.vue', () => {
-	const pinia = createTestingPinia({
+const renderComponent = createComponentRenderer(PersonalizationModal, {
+	props: {
+		teleported: false,
+		appendToBody: false,
+	},
+	pinia: createTestingPinia({
 		initialState: {
-			ui: {
+			[STORES.UI]: {
 				modals: {
 					[PERSONALIZATION_MODAL_KEY]: { open: true },
 				},
 			},
-			settings: {
+			[STORES.SETTINGS]: {
 				settings: {
 					templates: {
 						host: '',
@@ -21,41 +25,39 @@ describe('PersonalizationModal.vue', () => {
 				},
 			},
 		},
-	});
-	const localVue = createLocalVue();
-	localVue.use(PiniaVuePlugin);
+	}),
+});
 
+describe('PersonalizationModal.vue', () => {
 	it('should render correctly', async () => {
-		const wrapper = mount(PersonalizationModal, {
-			localVue,
-			pinia,
-		});
+		const wrapper = renderComponent();
 
-		await retry(() => expect(wrapper.find('.modal-content').exists()).toBe(true));
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
 
-		expect(wrapper.findAll('.n8n-select').length).toEqual(5);
-		expect(wrapper.html()).toMatchSnapshot();
+		expect(wrapper.container.querySelectorAll('.n8n-select').length).toEqual(5);
 	});
 
 	it('should display new option when role is "Devops", "Engineering", "IT", or "Sales and marketing"', async () => {
-		const wrapper = mount(PersonalizationModal, {
-			localVue,
-			pinia,
-		});
+		const wrapper = renderComponent();
 
-		await retry(() => expect(wrapper.find('.modal-content').exists()).toBe(true));
+		await retry(() =>
+			expect(wrapper.container.querySelector('.modal-content')).toBeInTheDocument(),
+		);
 
 		for (const index of [3, 4, 5, 6]) {
-			await wrapper.find('.n8n-select[name="role"]').trigger('click');
-			await wrapper
-				.find('.n8n-select[name="role"]')
-				.findAll('.el-select-dropdown__item')
-				.at(index)
-				.trigger('click');
+			const select = wrapper.container.querySelectorAll('.n8n-select')[1]!;
+
+			await fireEvent.click(select);
+
+			const item = select.querySelectorAll('.el-select-dropdown__item')[index];
+
+			await fireEvent.click(item);
 
 			await retry(() => {
-				expect(wrapper.findAll('.n8n-select').length).toEqual(6);
-				expect(wrapper.find('.n8n-select[name^="automationGoal"]').exists()).toBe(true);
+				expect(wrapper.container.querySelectorAll('.n8n-select').length).toEqual(6);
+				expect(wrapper.container.querySelector('[name^="automationGoal"]')).toBeInTheDocument();
 			});
 		}
 	});
diff --git a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
index 91566b1a292df..f1e487e3efd3b 100644
--- a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
@@ -1,6 +1,3 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render, within } from '@testing-library/vue';
-import { merge } from 'lodash-es';
 import {
 	DEFAULT_SETUP,
 	MAPPING_COLUMNS_RESPONSE,
@@ -12,15 +9,13 @@ import { waitAllPromises } from '@/__tests__/utils';
 import * as workflowHelpers from '@/mixins/workflowHelpers';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
 import type { SpyInstance } from 'vitest';
 
 let nodeTypeStore: ReturnType<typeof useNodeTypesStore>;
 let fetchFieldsSpy: SpyInstance, resolveParameterSpy: SpyInstance;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(ResourceMapper, merge(DEFAULT_SETUP, renderOptions), (vue) => {
-		vue.use(PiniaVuePlugin);
-	});
+const renderComponent = createComponentRenderer(ResourceMapper, DEFAULT_SETUP);
 
 describe('ResourceMapper.vue', () => {
 	beforeAll(() => {
@@ -50,18 +45,21 @@ describe('ResourceMapper.vue', () => {
 		).toBe(MAPPING_COLUMNS_RESPONSE.fields.length);
 	});
 
-	it('renders add mode  properly', async () => {
-		const { getByTestId, queryByTestId } = renderComponent({
-			props: {
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							mode: 'add',
+	it('renders add mode properly', async () => {
+		const { getByTestId, queryByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
 		// This mode doesn't render matching column selector
@@ -69,113 +67,124 @@ describe('ResourceMapper.vue', () => {
 	});
 
 	it('renders multi-key match selector properly', async () => {
-		const { container, getByTestId } = renderComponent({
-			props: {
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							mode: 'upsert',
-							multiKeyMatch: true,
+		const { container, getByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'upsert',
+								multiKeyMatch: true,
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
 		expect(container.querySelector('.el-select__tags')).toBeInTheDocument();
 	});
 
 	it('does not render mapping mode selector if it is disabled', async () => {
-		const { getByTestId, queryByTestId } = renderComponent({
-			props: {
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							supportAutoMap: false,
+		const { getByTestId, queryByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: false,
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
 		expect(queryByTestId('mapping-mode-select')).not.toBeInTheDocument();
 	});
 
 	it('renders field on top of the list when they are selected for matching', async () => {
-		const { container, getByTestId } = renderComponent({
-			props: {
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							supportAutoMap: true,
-							mode: 'upsert',
-							multiKeyMatch: false,
+		const { container, getByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: true,
+								mode: 'upsert',
+								multiKeyMatch: false,
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
 		// Id should be the first field in the list
 		expect(container.querySelector('.parameter-item')).toContainHTML('id (using to match)');
-		// // Select Last Name as matching column
-		await userEvent.click(getByTestId('matching-column-select'));
-		const matchingColumnDropdown = getByTestId('matching-column-select');
-		await userEvent.click(within(matchingColumnDropdown).getByText('Last Name'));
-		// // Now, last name should be the first field in the list
-		expect(container.querySelector('.parameter-item')).toContainHTML('Last Name (using to match)');
+		// Select Last Name as matching column
+		await userEvent.click(getByTestId('matching-column-option-Last name'));
+		// Now, last name should be the first field in the list
+		expect(container.querySelector('.parameter-item  div.title')).toHaveTextContent(
+			'Last name (using to match)',
+		);
 	});
 
 	it('renders selected matching columns properly when multiple key matching is enabled', async () => {
-		const { getByTestId, getByText, queryByText } = renderComponent({
-			props: {
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							supportAutoMap: true,
-							mode: 'upsert',
-							multiKeyMatch: true,
+		const { getByTestId, getAllByText, queryByText } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								supportAutoMap: true,
+								mode: 'upsert',
+								multiKeyMatch: true,
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
-		const matchingColumnDropdown = getByTestId('matching-column-select');
-		await userEvent.click(matchingColumnDropdown);
-		await userEvent.click(within(matchingColumnDropdown).getByText('Username'));
-		// Both matching columns should be rendered in the dropdown
-		expect(getByTestId('matching-column-select')).toContainHTML(
-			'<span class="el-select__tags-text">id</span>',
-		);
-		expect(getByTestId('matching-column-select')).toContainHTML(
-			'<span class="el-select__tags-text">Username</span>',
-		);
+		await userEvent.click(getByTestId('matching-column-option-Username'));
+
+		// Both matching columns (id and Username) should be rendered in the dropdown
+		expect(
+			getByTestId('matching-column-select').querySelector('.el-select  > div'),
+		).toHaveTextContent('idUsername');
 		// All selected columns should have correct labels
-		expect(getByText('id (using to match)')).toBeInTheDocument();
-		expect(getByText('Username (using to match)')).toBeInTheDocument();
+		expect(getAllByText('id (using to match)')[0]).toBeInTheDocument();
+		expect(getAllByText('Username (using to match)')[0]).toBeInTheDocument();
 		expect(queryByText('First Name (using to match)')).not.toBeInTheDocument();
 	});
 
 	it('uses field words defined in node definition', async () => {
-		const { getByText } = renderComponent({
-			props: {
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							fieldWords: {
-								singular: 'foo',
-								plural: 'foos',
+		const { getByText } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								fieldWords: {
+									singular: 'foo',
+									plural: 'foos',
+								},
 							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		expect(getByText('Set the value for each foo')).toBeInTheDocument();
 		expect(
@@ -186,24 +195,27 @@ describe('ResourceMapper.vue', () => {
 	});
 
 	it('should render correct fields based on saved schema', async () => {
-		const { getByTestId, queryAllByTestId } = renderComponent({
-			props: {
-				node: {
-					parameters: {
-						columns: {
-							schema: UPDATED_SCHEMA,
+		const { getByTestId, queryAllByTestId } = renderComponent(
+			{
+				props: {
+					node: {
+						parameters: {
+							columns: {
+								schema: UPDATED_SCHEMA,
+							},
 						},
 					},
-				},
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							mode: 'add',
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		// There should be 4 fields rendered and only 1 of them should have remove button
 		expect(
@@ -213,24 +225,27 @@ describe('ResourceMapper.vue', () => {
 	});
 
 	it('should render correct options based on saved schema', async () => {
-		const { getByTestId } = renderComponent({
-			props: {
-				node: {
-					parameters: {
-						columns: {
-							schema: UPDATED_SCHEMA,
+		const { getByTestId } = renderComponent(
+			{
+				props: {
+					node: {
+						parameters: {
+							columns: {
+								schema: UPDATED_SCHEMA,
+							},
 						},
 					},
-				},
-				parameter: {
-					typeOptions: {
-						resourceMapper: {
-							mode: 'add',
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
 						},
 					},
 				},
 			},
-		});
+			{ merge: true },
+		);
 		await waitAllPromises();
 		// Should have one option in the bottom dropdown for one removed field
 		expect(getByTestId('add-fields-select').querySelectorAll('li').length).toBe(1);
diff --git a/packages/editor-ui/src/components/__tests__/RunData.test.ts b/packages/editor-ui/src/components/__tests__/RunData.test.ts
index 446f3f91b7c27..b1b07bdc60e84 100644
--- a/packages/editor-ui/src/components/__tests__/RunData.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunData.test.ts
@@ -1,150 +1,33 @@
-import type Vue from 'vue';
-import { defineComponent } from 'vue';
-import { PiniaVuePlugin } from 'pinia';
-import { render, waitFor } from '@testing-library/vue';
+import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
 import RunData from '@/components/RunData.vue';
 import { STORES, VIEWS } from '@/constants';
-import { useSSOStore } from '@/stores/sso.store';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import { externalHooks } from '@/mixins/externalHooks';
-import { genericHelpers } from '@/mixins/genericHelpers';
-import { pinData } from '@/mixins/pinData';
-import { useNDVStore, useWorkflowsStore } from '@/stores';
+import { createComponentRenderer } from '@/__tests__/render';
 
-let pinia: ReturnType<typeof createTestingPinia>;
-let ssoStore: ReturnType<typeof useSSOStore>;
-let workflowsStore: ReturnType<typeof useWorkflowsStore>;
-let ndvStore: ReturnType<typeof useNDVStore>;
-
-function TelemetryPlugin(vue: typeof Vue): void {
-	Object.defineProperty(vue, '$telemetry', {
-		get() {
-			return {
-				track: () => {},
-			};
-		},
-	});
-	Object.defineProperty(vue.prototype, '$telemetry', {
-		get() {
-			return {
-				track: () => {},
-			};
+const renderComponent = createComponentRenderer(RunData, {
+	props: {
+		nodeUi: {
+			name: 'Test Node',
 		},
-	});
-}
-
-const nodeHelpers = defineComponent({
-	methods: {
-		getNodeInputData: vi.fn().mockReturnValue([
-			{
-				json: {
-					id: 1,
-					name: 'Test 1',
-					json: {
-						data: 'Json data 1',
-					},
-				},
-			},
-			{
-				json: {
-					id: 2,
-					name: 'Test 2',
-					json: {
-						data: 'Json data 2',
-					},
-				},
-			},
-		]),
 	},
-});
-
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		RunData,
-		merge(
-			{
-				pinia,
-				mocks: {
-					$route: {
-						name: VIEWS.WORKFLOW,
-					},
-				},
-				mixins: [externalHooks, genericHelpers, nodeHelpers, pinData],
+	global: {
+		mocks: {
+			$route: {
+				name: VIEWS.WORKFLOW,
 			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(TelemetryPlugin);
-			vue.use(PiniaVuePlugin);
 		},
-	);
+	},
+});
 
 describe('RunData', () => {
-	beforeEach(() => {
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-				},
-			},
-		});
-		ssoStore = useSSOStore();
-		workflowsStore = useWorkflowsStore();
-		ndvStore = useNDVStore();
-
-		vi.spyOn(workflowsStore, 'getWorkflowExecution', 'get').mockReturnValue({
-			id: '1',
-			finished: true,
-			mode: 'trigger',
-			startedAt: new Date(),
-			workflowData: {
-				id: '1',
-				name: 'Test Workflow',
-				versionId: '1',
-				createdAt: new Date().toISOString(),
-				updatedAt: new Date().toISOString(),
-				active: false,
-				nodes: [],
-				connections: {},
-			},
-			data: {
-				resultData: {
-					runData: {
-						'Test Node': [
-							{
-								startTime: new Date().getTime(),
-								executionTime: new Date().getTime(),
-								data: {},
-								source: [null],
-							},
-						],
-					},
-				},
-			},
-		});
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
 	it('should render data correctly even when "item.json" has another "json" key', async () => {
-		vi.spyOn(ndvStore, 'getPanelDisplayMode').mockReturnValue('schema');
-		vi.spyOn(ndvStore, 'activeNode', 'get').mockReturnValue({
-			id: '1',
-			typeVersion: 1,
-			name: 'Test Node',
-			position: [0, 0],
-			type: 'test',
-			parameters: {},
-		});
-
-		const { getByText, getAllByTestId, getByTestId } = renderComponent({
+		const { html, getByText, getAllByTestId, getByTestId } = renderComponent({
 			props: {
 				nodeUi: {
+					id: '1',
 					name: 'Test Node',
 					position: [0, 0],
 				},
@@ -154,10 +37,90 @@ describe('RunData', () => {
 				mappingEnabled: true,
 				distanceFromActive: 0,
 			},
+			pinia: createTestingPinia({
+				initialState: {
+					[STORES.SETTINGS]: {
+						settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+					},
+					[STORES.NDV]: {
+						output: {
+							displayMode: 'schema',
+						},
+						activeNodeName: 'Test Node',
+					},
+					[STORES.WORKFLOWS]: {
+						workflow: {
+							nodes: [
+								{
+									id: '1',
+									typeVersion: 1,
+									name: 'Test Node',
+									position: [0, 0],
+									type: 'test',
+									parameters: {},
+								},
+							],
+						},
+						workflowExecutionData: {
+							id: '1',
+							finished: true,
+							mode: 'trigger',
+							startedAt: new Date(),
+							workflowData: {
+								id: '1',
+								name: 'Test Workflow',
+								versionId: '1',
+								createdAt: new Date().toISOString(),
+								updatedAt: new Date().toISOString(),
+								active: false,
+								nodes: [],
+								connections: {},
+							},
+							data: {
+								resultData: {
+									runData: {
+										'Test Node': [
+											{
+												startTime: new Date().getTime(),
+												executionTime: new Date().getTime(),
+												data: {
+													main: [
+														[
+															{
+																json: {
+																	id: 1,
+																	name: 'Test 1',
+																	json: {
+																		data: 'Json data 1',
+																	},
+																},
+															},
+															{
+																json: {
+																	id: 2,
+																	name: 'Test 2',
+																	json: {
+																		data: 'Json data 2',
+																	},
+																},
+															},
+														],
+													],
+												},
+												source: [null],
+											},
+										],
+									},
+								},
+							},
+						},
+					},
+				},
+			}),
 		});
 
 		await userEvent.click(getByTestId('ndv-pin-data'));
-		await waitFor(() => getAllByTestId('run-data-schema-item'));
+		await waitFor(() => getAllByTestId('run-data-schema-item'), { timeout: 1000 });
 		expect(getByText('Test 1')).toBeInTheDocument();
 		expect(getByText('Json data 1')).toBeInTheDocument();
 	});
diff --git a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts b/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
index 88f73367bbaf6..0016b54a2d880 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
@@ -1,44 +1,40 @@
-import Vue from 'vue';
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import { render, screen, cleanup } from '@testing-library/vue';
+import { screen, cleanup } from '@testing-library/vue';
 import RunDataJson from '@/components/RunDataJson.vue';
+import { createComponentRenderer } from '@/__tests__/render';
 
-Vue.use(PiniaVuePlugin);
-
-describe('RunDataJson.vue', () => {
-	const DEFAULT_SETUP = {
-		pinia: createTestingPinia(),
-		props: {
-			mappingEnabled: true,
-			editMode: { enabled: false },
-			inputData: [
-				{
-					json: {
-						list: [1, 2, 3],
-						record: { name: 'Joe' },
-						myNumber: 123,
-						myStringNumber: '456',
-						myStringText: 'abc',
-						nil: null,
-						d: undefined,
-					},
+const renderComponent = createComponentRenderer(RunDataJson, {
+	props: {
+		mappingEnabled: true,
+		editMode: { enabled: false },
+		inputData: [
+			{
+				json: {
+					list: [1, 2, 3],
+					record: { name: 'Joe' },
+					myNumber: 123,
+					myStringNumber: '456',
+					myStringText: 'abc',
+					nil: null,
+					d: undefined,
 				},
-			],
-			node: {
-				parameters: {
-					keepOnlySet: false,
-					values: {},
-					options: {},
-				},
-				id: '820ea733-d8a6-4379-8e73-88a2347ea003',
-				name: 'Set',
-				type: 'n8n-nodes-base.set',
-				typeVersion: 1,
-				position: [380, 1060],
-				disabled: false,
 			},
+		],
+		node: {
+			parameters: {
+				keepOnlySet: false,
+				values: {},
+				options: {},
+			},
+			id: '820ea733-d8a6-4379-8e73-88a2347ea003',
+			name: 'Set',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 1,
+			position: [380, 1060],
+			disabled: false,
 		},
+	},
+	global: {
 		mocks: {
 			$locale: {
 				baseText() {
@@ -49,13 +45,17 @@ describe('RunDataJson.vue', () => {
 				getters: {},
 			},
 		},
-	};
+	},
+});
 
+describe('RunDataJson.vue', () => {
 	beforeEach(cleanup);
 
 	it('renders json values properly', () => {
-		const { container } = render(RunDataJson, DEFAULT_SETUP, (vue) => {
-			vue.use(PiniaVuePlugin);
+		const { container } = renderComponent({
+			global: {
+				plugins: [createTestingPinia()],
+			},
 		});
 		expect(container).toMatchSnapshot();
 
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
index 0ae6b53458dd0..2c8cfc4c081e3 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
@@ -1,82 +1,86 @@
-import { PiniaVuePlugin } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import { render, cleanup } from '@testing-library/vue';
+import { cleanup } from '@testing-library/vue';
 import RunDataJsonSchema from '@/components/RunDataSchema.vue';
 import { STORES } from '@/constants';
+import { createComponentRenderer } from '@/__tests__/render';
 
-describe('RunDataJsonSchema.vue', () => {
-	const renderOptions = {
-		pinia: createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: {
-						templates: {
-							enabled: true,
-							host: 'https://api.n8n.io/api/',
+const renderComponent = createComponentRenderer(RunDataJsonSchema, {
+	global: {
+		stubs: ['font-awesome-icon'],
+		plugins: [
+			createTestingPinia({
+				initialState: {
+					[STORES.SETTINGS]: {
+						settings: {
+							templates: {
+								enabled: true,
+								host: 'https://api.n8n.io/api/',
+							},
 						},
 					},
 				},
+			}),
+		],
+	},
+	props: {
+		mappingEnabled: true,
+		distanceFromActive: 1,
+		runIndex: 1,
+		totalRuns: 2,
+		paneType: 'input',
+		node: {
+			parameters: {
+				keepOnlySet: false,
+				values: {},
+				options: {},
 			},
-		}),
-		stubs: ['font-awesome-icon'],
-		props: {
-			mappingEnabled: true,
-			distanceFromActive: 1,
-			runIndex: 1,
-			totalRuns: 2,
-			paneType: 'input',
-			node: {
-				parameters: {
-					keepOnlySet: false,
-					values: {},
-					options: {},
-				},
-				id: '820ea733-d8a6-4379-8e73-88a2347ea003',
-				name: 'Set',
-				type: 'n8n-nodes-base.set',
-				typeVersion: 1,
-				position: [380, 1060],
-				disabled: false,
-			},
-			data: [{}],
+			id: '820ea733-d8a6-4379-8e73-88a2347ea003',
+			name: 'Set',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 1,
+			position: [380, 1060],
+			disabled: false,
 		},
-	};
+		data: [{}],
+	},
+});
 
+describe('RunDataJsonSchema.vue', () => {
 	beforeEach(cleanup);
 
 	it('renders schema for empty data', () => {
-		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
-			vue.use(PiniaVuePlugin);
-		});
+		const { container } = renderComponent();
 		expect(container).toMatchSnapshot();
 	});
 
 	it('renders schema for data', () => {
-		renderOptions.props.data = [
-			{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-			{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-		];
-		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
-			vue.use(PiniaVuePlugin);
+		const { container } = renderComponent({
+			props: {
+				data: [
+					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
+					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
+				],
+			},
 		});
 		expect(container).toMatchSnapshot();
 	});
 
 	it('renders schema with spaces and dots', () => {
-		renderOptions.props.data = [
-			{
-				'hello world': [
+		const { container } = renderComponent({
+			props: {
+				data: [
 					{
-						test: {
-							'more to think about': 1,
-						},
-						'test.how': 'ignore',
+						'hello world': [
+							{
+								test: {
+									'more to think about': 1,
+								},
+								'test.how': 'ignore',
+							},
+						],
 					},
 				],
 			},
-		];
-		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
-			vue.use(PiniaVuePlugin);
 		});
 		expect(container).toMatchSnapshot();
 	});
diff --git a/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts b/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
index af33117c63e16..0469e9a72efa0 100644
--- a/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
+++ b/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
@@ -1,5 +1,3 @@
-import { render } from '@testing-library/vue';
-import { PiniaVuePlugin } from 'pinia';
 import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
 import { STORES } from '@/constants';
 import { createTestingPinia } from '@pinia/testing';
@@ -7,6 +5,7 @@ import { createTestingPinia } from '@pinia/testing';
 import SqlEditor from '@/components/SqlEditor/SqlEditor.vue';
 import { expressionManager } from '@/mixins/expressionManager';
 import type { TargetItem } from '@/Interface';
+import { renderComponent } from '@/__tests__/render';
 
 const EXPRESSION_OUTPUT_TEST_ID = 'inline-expression-editor-output';
 
@@ -19,24 +18,23 @@ const RESOLVABLES: { [key: string]: string | number | boolean } = {
 };
 
 const DEFAULT_SETUP = {
-	pinia: createTestingPinia({
-		initialState: {
-			[STORES.SETTINGS]: {
-				settings: SETTINGS_STORE_DEFAULT_STATE.settings,
-			},
-		},
-	}),
 	props: {
 		dialect: 'PostgreSQL',
 		isReadOnly: false,
 	},
+	global: {
+		plugins: [
+			createTestingPinia({
+				initialState: {
+					[STORES.SETTINGS]: {
+						settings: SETTINGS_STORE_DEFAULT_STATE.settings,
+					},
+				},
+			}),
+		],
+	},
 };
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(SqlEditor, { ...DEFAULT_SETUP, ...renderOptions }, (vue) => {
-		vue.use(PiniaVuePlugin);
-	});
-
 describe('SQL Editor Preview Tests', () => {
 	beforeEach(() => {
 		vi.spyOn(expressionManager.methods, 'resolve').mockImplementation(
@@ -51,9 +49,11 @@ describe('SQL Editor Preview Tests', () => {
 	});
 
 	it('renders basic query', async () => {
-		const { getByTestId } = renderComponent({
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
 			props: {
-				query: 'SELECT * FROM users',
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM users',
 			},
 		});
 		await waitAllPromises();
@@ -61,9 +61,11 @@ describe('SQL Editor Preview Tests', () => {
 	});
 
 	it('renders basic query with expression', async () => {
-		const { getByTestId } = renderComponent({
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
 			props: {
-				query: 'SELECT * FROM {{ $json.table }}',
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM {{ $json.table }}',
 			},
 		});
 		await waitAllPromises();
@@ -71,9 +73,11 @@ describe('SQL Editor Preview Tests', () => {
 	});
 
 	it('renders resolved expressions with dot between resolvables', async () => {
-		const { getByTestId } = renderComponent({
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
 			props: {
-				query: 'SELECT * FROM {{ $json.schema }}.{{ $json.table }}',
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM {{ $json.schema }}.{{ $json.table }}',
 			},
 		});
 		await waitAllPromises();
@@ -81,9 +85,11 @@ describe('SQL Editor Preview Tests', () => {
 	});
 
 	it('renders resolved expressions which resolve to 0', async () => {
-		const { getByTestId } = renderComponent({
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
 			props: {
-				query:
+				...DEFAULT_SETUP.props,
+				modelValue:
 					'SELECT * FROM {{ $json.schema }}.{{ $json.table }} WHERE {{ $json.id }} > {{ $json.limit - 10 }}',
 			},
 		});
@@ -94,9 +100,11 @@ describe('SQL Editor Preview Tests', () => {
 	});
 
 	it('keeps query formatting in rendered output', async () => {
-		const { getByTestId } = renderComponent({
+		const { getByTestId } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
 			props: {
-				query:
+				...DEFAULT_SETUP.props,
+				modelValue:
 					'SELECT * FROM {{ $json.schema }}.{{ $json.table }}\n  WHERE id > {{ $json.limit - 10 }}\n  AND active = {{ $json.active }};',
 			},
 		});
diff --git a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts b/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
index 89d6a662f5094..d387712d6192f 100644
--- a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
+++ b/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
@@ -1,5 +1,3 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
 import SSOLogin from '@/components/SSOLogin.vue';
@@ -7,28 +5,20 @@ import { STORES } from '@/constants';
 import { useSSOStore } from '@/stores/sso.store';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import { afterEach } from 'vitest';
+import { createComponentRenderer } from '@/__tests__/render';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SSOLogin,
-		merge(
-			{
-				pinia,
-				stubs: {
-					'n8n-button': {
-						template: '<button data-test-id="sso-button"></button>',
-					},
-				},
+const renderComponent = createComponentRenderer(SSOLogin, {
+	global: {
+		stubs: {
+			'n8n-button': {
+				template: '<button data-test-id="sso-button"></button>',
 			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
 		},
-	);
+	},
+});
 
 describe('SSOLogin', () => {
 	beforeEach(() => {
@@ -47,13 +37,13 @@ describe('SSOLogin', () => {
 	});
 
 	it('should not render button if conditions are not met', () => {
-		const { queryByRole } = renderComponent();
+		const { queryByRole } = renderComponent({ pinia });
 		expect(queryByRole('button')).not.toBeInTheDocument();
 	});
 
 	it('should render button if the store returns true for the conditions', () => {
 		vi.spyOn(ssoStore, 'showSsoLoginButton', 'get').mockReturnValue(true);
-		const { queryByRole } = renderComponent();
+		const { queryByRole } = renderComponent({ pinia });
 		expect(queryByRole('button')).toBeInTheDocument();
 	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts b/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
index 2a68e87a2a0a9..2e755ca322448 100644
--- a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
+++ b/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
@@ -1,24 +1,38 @@
 import VariablesRow from '../VariablesRow.vue';
 import type { EnvironmentVariable } from '@/Interface';
 import { fireEvent } from '@testing-library/vue';
-import { createPinia, setActivePinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
 import { afterAll, beforeAll } from 'vitest';
 import { useSettingsStore, useUsersStore } from '@/stores';
-import { renderComponent } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import { STORES } from '@/constants';
+
+const renderComponent = createComponentRenderer(VariablesRow, {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: {
+					enterprise: {
+						variables: true,
+					},
+				},
+			},
+		},
+	}),
+	global: {
+		stubs: ['n8n-tooltip'],
+	},
+});
 
 describe('VariablesRow', () => {
 	let server: ReturnType<typeof setupServer>;
-	let pinia: ReturnType<typeof createPinia>;
 
 	beforeAll(() => {
 		server = setupServer();
 	});
 
 	beforeEach(async () => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-
 		await useSettingsStore().getSettings();
 		await useUsersStore().loginWithCookie();
 	});
@@ -27,8 +41,6 @@ describe('VariablesRow', () => {
 		server.shutdown();
 	});
 
-	const stubs = ['n8n-tooltip'];
-
 	const environmentVariable: EnvironmentVariable = {
 		id: 1,
 		key: 'key',
@@ -36,25 +48,20 @@ describe('VariablesRow', () => {
 	};
 
 	it('should render correctly', () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 			},
-			stubs,
-			pinia,
 		});
 
-		expect(wrapper.html()).toMatchSnapshot();
 		expect(wrapper.container.querySelectorAll('td')).toHaveLength(4);
 	});
 
 	it('should show edit and delete buttons on hover', async () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 			},
-			stubs,
-			pinia,
 		});
 
 		await fireEvent.mouseEnter(wrapper.container);
@@ -64,13 +71,11 @@ describe('VariablesRow', () => {
 	});
 
 	it('should show key and value inputs in edit mode', async () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 				editing: true,
 			},
-			stubs,
-			pinia,
 		});
 
 		await fireEvent.mouseEnter(wrapper.container);
@@ -83,18 +88,14 @@ describe('VariablesRow', () => {
 		expect(wrapper.getByTestId('variable-row-value-input').querySelector('input')).toHaveValue(
 			environmentVariable.value,
 		);
-
-		expect(wrapper.html()).toMatchSnapshot();
 	});
 
 	it('should show cancel and save buttons in edit mode', async () => {
-		const wrapper = renderComponent(VariablesRow, {
+		const wrapper = renderComponent({
 			props: {
 				data: environmentVariable,
 				editing: true,
 			},
-			stubs,
-			pinia,
 		});
 
 		await fireEvent.mouseEnter(wrapper.container);
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
deleted file mode 100644
index a60c0d7529f2c..0000000000000
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
+++ /dev/null
@@ -1,284 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`PersonalizationModal.vue > should render correctly 1`] = `
-"<transition-stub name=\\"dialog-fade\\" data-test-id=\\"personalization-form\\" class=\\"dialog-wrapper\\" style=\\"z-index: 2001;\\">
-  <div class=\\"el-dialog__wrapper\\">
-    <div role=\\"dialog\\" aria-modal=\\"true\\" aria-label=\\"dialog\\" class=\\"el-dialog\\" style=\\"margin-top: 15vh; width: 460px;\\">
-      <div class=\\"el-dialog__header\\">
-        <div class=\\"centerTitle\\">
-          <div>
-            <h1 class=\\"n8n-heading size-xlarge regular\\">Customize n8n to you</h1>
-          </div>
-          <div class=\\"subtitle\\">
-            <h3 class=\\"n8n-heading text-light size-small regular\\">These questions help us tailor n8n to you</h3>
-          </div>
-        </div>
-        <!---->
-      </div>
-      <div class=\\"el-dialog__body\\">
-        <div class=\\"modal-content\\">
-          <div class=\\"container\\">
-            <div>
-              <div class=\\"grid\\">
-                <div class=\\"\\">
-                  <div data-test-id=\\"companyType\\" class=\\"container\\"><label for=\\"companyType\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> What best describes your company? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"companyType\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Software as a service</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Ecommerce</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Marketing agency / consultancy</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Systems integrator / Automation agency</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Education</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>I'm not using n8n for work</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div data-test-id=\\"role\\" class=\\"container\\"><label for=\\"role\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Which role best describes you? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"role\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Business Owner</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Customer support</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Data Science</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Devops</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>IT</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Engineering</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Sales and Marketing</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Security</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other (please specify)</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div data-test-id=\\"automationBeneficiary\\" class=\\"container\\"><label for=\\"automationBeneficiary\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Who will your automations mainly be for? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"automationBeneficiary\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Myself</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>My team</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other teams</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div data-test-id=\\"companySize\\" class=\\"container\\"><label for=\\"companySize\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How big is your company? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"companySize\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Less than 20 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>20-99 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>100-499 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>500-999 people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>1000+ people</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>I'm not using n8n for work</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-                <div class=\\"\\">
-                  <div data-test-id=\\"reportedSource\\" class=\\"container\\"><label for=\\"reportedSource\\" class=\\"n8n-input-label inputLabel heading medium\\">
-                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How did you hear about n8n? <!----></span></div>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </label>
-                    <div class=\\"\\">
-                      <div class=\\"n8n-select container\\" name=\\"reportedSource\\">
-                        <!---->
-                        <div class=\\"el-select el-select--large\\">
-                          <!---->
-                          <div class=\\"el-input el-input--large el-input--suffix\\">
-                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
-                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
-                            <!----></span>
-                            <!---->
-                            <!---->
-                          </div>
-                          <transition-stub name=\\"el-zoom-in-top\\">
-                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
-                              <div class=\\"el-scrollbar\\" style=\\"\\">
-                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
-                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
-                                    <!---->
-                                    <li class=\\"el-select-dropdown__item\\"><span>Google</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Twitter</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>LinkedIn</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>YouTube</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Friend / Word of mouth</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Podcast</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Event</span></li>
-                                    <li class=\\"el-select-dropdown__item\\"><span>Other (please specify)</span></li>
-                                  </ul>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-horizontal\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
-                                </div>
-                                <div class=\\"el-scrollbar__bar is-vertical\\">
-                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
-                                </div>
-                              </div>
-                              <!---->
-                            </div>
-                          </transition-stub>
-                        </div>
-                      </div>
-                    </div>
-                    <!---->
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class=\\"footer\\">
-          <div><button aria-live=\\"polite\\" class=\\"button button primary medium float-right\\">
-              <!----><span>Get started</span></button></div>
-        </div>
-      </div>
-      <!---->
-    </div>
-  </div>
-</transition-stub>"
-`;
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
index b4ea061a334d9..9bb3b5737cc3b 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
@@ -9,679 +9,734 @@ exports[`RunDataJson.vue > renders json values properly 1`] = `
     <div
       class=""
     >
+      
       <div
-        class="json-data vjs-tree"
+        class="vjs-tree json-data"
       >
+        
         <div
-          class="vjs-tree-list"
+          class="vjs-tree-node"
         >
+          <!---->
+          <!---->
           <div
-            class="vjs-tree-list-holder"
+            class="vjs-indent"
           >
+            
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              [
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
             <div
-              class="vjs-tree-list-holder-inner"
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
             >
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    [
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    {
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="list"
-                    data-path="[0].list"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.list }}"
-                  >
-                    "list"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    [
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="mappable"
-                      data-depth="3"
-                      data-name="list[0]"
-                      data-path="[0].list[0]"
-                      data-target="mappable"
-                      data-value="{{ $('Set').item.json.list[0] }}"
-                    >
-                      1
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="mappable"
-                      data-depth="3"
-                      data-name="list[1]"
-                      data-path="[0].list[1]"
-                      data-target="mappable"
-                      data-value="{{ $('Set').item.json.list[1] }}"
-                    >
-                      2
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span
-                      class="mappable"
-                      data-depth="3"
-                      data-name="list[2]"
-                      data-path="[0].list[2]"
-                      data-target="mappable"
-                      data-value="{{ $('Set').item.json.list[2] }}"
-                    >
-                      3
-                    </span>
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    ]
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="record"
-                    data-path="[0].record"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.record }}"
-                  >
-                    "record"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    {
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="3"
-                    data-name="name"
-                    data-path="[0].record.name"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.record.name }}"
-                  >
-                    "name"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-string"
-                  >
-                    <span>
-                      "Joe"
-                    </span>
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    }
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="myNumber"
-                    data-path="[0].myNumber"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.myNumber }}"
-                  >
-                    "myNumber"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-number"
-                  >
-                    <span>
-                      123
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="myStringNumber"
-                    data-path="[0].myStringNumber"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.myStringNumber }}"
-                  >
-                    "myStringNumber"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-string"
-                  >
-                    <span>
-                      "456"
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="myStringText"
-                    data-path="[0].myStringText"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.myStringText }}"
-                  >
-                    "myStringText"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-string"
-                  >
-                    <span>
-                      "abc"
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
-              >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="nil"
-                    data-path="[0].nil"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.nil }}"
-                  >
-                    "nil"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-null"
-                  >
-                    <span>
-                      null
-                    </span>
-                  </span>
-                  <span>
-                    ,
-                  </span>
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
+              {
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="list"
+              data-path="[0].list"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.list }}"
+            >
+              "list"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              [
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span
+                class="mappable ph-no-capture"
+                data-depth="3"
+                data-name="list[0]"
+                data-path="[0].list[0]"
+                data-target="mappable"
+                data-value="{{ $('Set').item.json.list[0] }}"
               >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <span
-                  class="vjs-key"
-                >
-                  <span
-                    class="mappable"
-                    data-depth="2"
-                    data-name="d"
-                    data-path="[0].d"
-                    data-target="mappable"
-                    data-value="{{ $('Set').item.json.d }}"
-                  >
-                    "d"
-                  </span>
-                  <span>
-                    :
-                  </span>
-                </span>
-                <span>
-                  <span
-                    class="vjs-value vjs-value-undefined"
-                  >
-                    <span>
-                      
-                    </span>
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
+                1
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span
+                class="mappable ph-no-capture"
+                data-depth="3"
+                data-name="list[1]"
+                data-path="[0].list[1]"
+                data-target="mappable"
+                data-value="{{ $('Set').item.json.list[1] }}"
               >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <div
-                    class="vjs-indent-unit has-line"
-                  />
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    }
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-              <div
-                class="vjs-tree-node"
-                collapsed-on-click-brackets="true"
+                2
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span
+                class="mappable ph-no-capture"
+                data-depth="3"
+                data-name="list[2]"
+                data-path="[0].list[2]"
+                data-target="mappable"
+                data-value="{{ $('Set').item.json.list[2] }}"
               >
-                <!---->
-                <!---->
-                <div
-                  class="vjs-indent"
-                >
-                  <!---->
-                </div>
-                <!---->
-                <span>
-                  <span
-                    class="vjs-tree-brackets"
-                  >
-                    ]
-                  </span>
-                  <!---->
-                  <!---->
-                </span>
-              </div>
-            </div>
+                3
+              </span>
+              
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              ]
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="record"
+              data-path="[0].record"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.record }}"
+            >
+              "record"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              {
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="3"
+              data-name="name"
+              data-path="[0].record.name"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.record.name }}"
+            >
+              "name"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-string"
+            >
+              
+              <span>
+                "Joe"
+              </span>
+              
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              }
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
           </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="myNumber"
+              data-path="[0].myNumber"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.myNumber }}"
+            >
+              "myNumber"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-number"
+            >
+              
+              <span>
+                123
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
         </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="myStringNumber"
+              data-path="[0].myStringNumber"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.myStringNumber }}"
+            >
+              "myStringNumber"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-string"
+            >
+              
+              <span>
+                "456"
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="myStringText"
+              data-path="[0].myStringText"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.myStringText }}"
+            >
+              "myStringText"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-string"
+            >
+              
+              <span>
+                "abc"
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="nil"
+              data-path="[0].nil"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.nil }}"
+            >
+              "nil"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-null"
+            >
+              
+              <span>
+                null
+              </span>
+              
+            </span>
+            <span>
+              ,
+            </span>
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <span
+            class="vjs-key"
+          >
+            
+            <span
+              class="mappable"
+              data-depth="2"
+              data-name="d"
+              data-path="[0].d"
+              data-target="mappable"
+              data-value="{{ $('Set').item.json.d }}"
+            >
+              "d"
+            </span>
+            
+            <span
+              class="vjs-colon"
+            >
+              : 
+            </span>
+          </span>
+          <span>
+            <span
+              class="vjs-value vjs-value-undefined"
+            >
+              
+              <span />
+              
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            <div
+              class="vjs-indent-unit has-line"
+            />
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              }
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        <div
+          class="vjs-tree-node"
+        >
+          <!---->
+          <!---->
+          <div
+            class="vjs-indent"
+          >
+            
+            
+            <!---->
+          </div>
+          <!---->
+          <span>
+            <span
+              class="vjs-tree-brackets"
+            >
+              ]
+            </span>
+            <!---->
+            <!---->
+          </span>
+        </div>
+        
       </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
+      
+      <!--teleport start-->
+      <!--teleport end-->
     </div>
   </div>
 </div>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
index 32223d9b399a3..88e58bc5bde53 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
@@ -8,6 +8,7 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
     <div
       class=""
     >
+      
       <div
         class="schema"
       >
@@ -15,13 +16,14 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
           class="item"
           data-test-id="run-data-schema-item"
         >
-          <!---->
-          <!---->
-          <!---->
-          <!---->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
           <div
             class="sub"
           >
+            
             <div
               class="item"
               data-test-id="run-data-schema-item"
@@ -39,11 +41,23 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   data-target="mappable"
                   data-value="{{ $json.name }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="font"
-                    size="sm"
-                  />
-                  <!---->
+                  <svg
+                    aria-hidden="true"
+                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
+                    data-icon="font"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    viewBox="0 0 448 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      class=""
+                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <!--v-if-->
                   <span
                     class=""
                   >
@@ -56,9 +70,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
               >
                 John
               </span>
-              <!---->
-              <!---->
-              <!---->
+              <!--v-if-->
+              <!--v-if-->
+              <!--v-if-->
             </div>
             <div
               class="item"
@@ -77,11 +91,23 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   data-target="mappable"
                   data-value="{{ $json.age }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="hashtag"
-                    size="sm"
-                  />
-                  <!---->
+                  <svg
+                    aria-hidden="true"
+                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
+                    data-icon="hashtag"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    viewBox="0 0 448 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      class=""
+                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <!--v-if-->
                   <span
                     class=""
                   >
@@ -94,9 +120,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
               >
                 22
               </span>
-              <!---->
-              <!---->
-              <!---->
+              <!--v-if-->
+              <!--v-if-->
+              <!--v-if-->
             </div>
             <div
               class="item"
@@ -115,11 +141,23 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   data-target="mappable"
                   data-value="{{ $json.hobbies }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="list"
-                    size="sm"
-                  />
-                  <!---->
+                  <svg
+                    aria-hidden="true"
+                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
+                    data-icon="list"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    viewBox="0 0 512 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      class=""
+                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <!--v-if-->
                   <span
                     class=""
                   >
@@ -127,9 +165,8 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   </span>
                 </span>
               </div>
-              <!---->
+              <!--v-if-->
               <input
-                checked="checked"
                 id="input_array-0-2"
                 type="checkbox"
               />
@@ -137,13 +174,27 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                 class="toggle"
                 for="input_array-0-2"
               >
-                <font-awesome-icon-stub
-                  icon="angle-up"
-                />
+                <svg
+                  aria-hidden="true"
+                  class="svg-inline--fa fa-angle-up fa-w-10"
+                  data-icon="angle-up"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  viewBox="0 0 320 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    class=""
+                    d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                    fill="currentColor"
+                  />
+                </svg>
               </label>
               <div
                 class="sub"
               >
+                
                 <div
                   class="item"
                   data-test-id="run-data-schema-item"
@@ -161,10 +212,22 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                       data-target="mappable"
                       data-value="{{ $json.hobbies[0] }}"
                     >
-                      <font-awesome-icon-stub
-                        icon="font"
-                        size="sm"
-                      />
+                      <svg
+                        aria-hidden="true"
+                        class="svg-inline--fa fa-font fa-w-14 fa-sm"
+                        data-icon="font"
+                        data-prefix="fas"
+                        focusable="false"
+                        role="img"
+                        viewBox="0 0 448 512"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          class=""
+                          d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
+                          fill="currentColor"
+                        />
+                      </svg>
                       <span>
                         hobbies
                       </span>
@@ -180,9 +243,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   >
                     surfing
                   </span>
-                  <!---->
-                  <!---->
-                  <!---->
+                  <!--v-if-->
+                  <!--v-if-->
+                  <!--v-if-->
                 </div>
                 <div
                   class="item"
@@ -201,10 +264,22 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                       data-target="mappable"
                       data-value="{{ $json.hobbies[1] }}"
                     >
-                      <font-awesome-icon-stub
-                        icon="font"
-                        size="sm"
-                      />
+                      <svg
+                        aria-hidden="true"
+                        class="svg-inline--fa fa-font fa-w-14 fa-sm"
+                        data-icon="font"
+                        data-prefix="fas"
+                        focusable="false"
+                        role="img"
+                        viewBox="0 0 448 512"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          class=""
+                          d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
+                          fill="currentColor"
+                        />
+                      </svg>
                       <span>
                         hobbies
                       </span>
@@ -220,19 +295,20 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   >
                     traveling
                   </span>
-                  <!---->
-                  <!---->
-                  <!---->
+                  <!--v-if-->
+                  <!--v-if-->
+                  <!--v-if-->
                 </div>
+                
               </div>
             </div>
+            
           </div>
         </div>
       </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
+      
+      <!--teleport start-->
+      <!--teleport end-->
     </div>
   </div>
 </div>
@@ -250,15 +326,31 @@ exports[`RunDataJsonSchema.vue > renders schema for empty data 1`] = `
         class="iconText"
       >
         <span
-          class="n8n-icon n8n-text compact size-medium regular"
+          class="n8n-text compact size-medium regular n8n-icon n8n-icon"
         >
-          <font-awesome-icon-stub
-            class="medium"
-            icon="info-circle"
-          />
+          
+          <svg
+            aria-hidden="true"
+            class="svg-inline--fa fa-info-circle fa-w-16 medium"
+            data-icon="info-circle"
+            data-prefix="fas"
+            focusable="false"
+            role="img"
+            viewBox="0 0 512 512"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              class=""
+              d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
+              fill="currentColor"
+            />
+          </svg>
+          
         </span>
         <span>
+          
           No data to show - item(s) exist, but they’re empty
+          
         </span>
       </span>
     </div>
@@ -274,6 +366,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
     <div
       class=""
     >
+      
       <div
         class="schema"
       >
@@ -281,13 +374,14 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
           class="item"
           data-test-id="run-data-schema-item"
         >
-          <!---->
-          <!---->
-          <!---->
-          <!---->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
           <div
             class="sub"
           >
+            
             <div
               class="item"
               data-test-id="run-data-schema-item"
@@ -305,11 +399,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                   data-target="mappable"
                   data-value="{{ $json['hello world'] }}"
                 >
-                  <font-awesome-icon-stub
-                    icon="list"
-                    size="sm"
-                  />
-                  <!---->
+                  <svg
+                    aria-hidden="true"
+                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
+                    data-icon="list"
+                    data-prefix="fas"
+                    focusable="false"
+                    role="img"
+                    viewBox="0 0 512 512"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      class=""
+                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                  <!--v-if-->
                   <span
                     class=""
                   >
@@ -317,9 +423,8 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                   </span>
                 </span>
               </div>
-              <!---->
+              <!--v-if-->
               <input
-                checked="checked"
                 id="input_array-0-0"
                 type="checkbox"
               />
@@ -327,13 +432,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                 class="toggle"
                 for="input_array-0-0"
               >
-                <font-awesome-icon-stub
-                  icon="angle-up"
-                />
+                <svg
+                  aria-hidden="true"
+                  class="svg-inline--fa fa-angle-up fa-w-10"
+                  data-icon="angle-up"
+                  data-prefix="fas"
+                  focusable="false"
+                  role="img"
+                  viewBox="0 0 320 512"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <path
+                    class=""
+                    d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                    fill="currentColor"
+                  />
+                </svg>
               </label>
               <div
                 class="sub"
               >
+                
                 <div
                   class="item"
                   data-test-id="run-data-schema-item"
@@ -351,10 +470,22 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                       data-target="mappable"
                       data-value="{{ $json['hello world'][0] }}"
                     >
-                      <font-awesome-icon-stub
-                        icon="cube"
-                        size="sm"
-                      />
+                      <svg
+                        aria-hidden="true"
+                        class="svg-inline--fa fa-cube fa-w-16 fa-sm"
+                        data-icon="cube"
+                        data-prefix="fas"
+                        focusable="false"
+                        role="img"
+                        viewBox="0 0 512 512"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          class=""
+                          d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"
+                          fill="currentColor"
+                        />
+                      </svg>
                       <span>
                         hello world
                       </span>
@@ -365,9 +496,8 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                       </span>
                     </span>
                   </div>
-                  <!---->
+                  <!--v-if-->
                   <input
-                    checked="checked"
                     id="input_object-1-0"
                     type="checkbox"
                   />
@@ -375,13 +505,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                     class="toggle"
                     for="input_object-1-0"
                   >
-                    <font-awesome-icon-stub
-                      icon="angle-up"
-                    />
+                    <svg
+                      aria-hidden="true"
+                      class="svg-inline--fa fa-angle-up fa-w-10"
+                      data-icon="angle-up"
+                      data-prefix="fas"
+                      focusable="false"
+                      role="img"
+                      viewBox="0 0 320 512"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        class=""
+                        d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                        fill="currentColor"
+                      />
+                    </svg>
                   </label>
                   <div
                     class="sub"
                   >
+                    
                     <div
                       class="item"
                       data-test-id="run-data-schema-item"
@@ -399,11 +543,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           data-target="mappable"
                           data-value="{{ $json['hello world'][0].test }}"
                         >
-                          <font-awesome-icon-stub
-                            icon="cube"
-                            size="sm"
-                          />
-                          <!---->
+                          <svg
+                            aria-hidden="true"
+                            class="svg-inline--fa fa-cube fa-w-16 fa-sm"
+                            data-icon="cube"
+                            data-prefix="fas"
+                            focusable="false"
+                            role="img"
+                            viewBox="0 0 512 512"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              class=""
+                              d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"
+                              fill="currentColor"
+                            />
+                          </svg>
+                          <!--v-if-->
                           <span
                             class=""
                           >
@@ -411,9 +567,8 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           </span>
                         </span>
                       </div>
-                      <!---->
+                      <!--v-if-->
                       <input
-                        checked="checked"
                         id="input_object-2-0"
                         type="checkbox"
                       />
@@ -421,13 +576,27 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         class="toggle"
                         for="input_object-2-0"
                       >
-                        <font-awesome-icon-stub
-                          icon="angle-up"
-                        />
+                        <svg
+                          aria-hidden="true"
+                          class="svg-inline--fa fa-angle-up fa-w-10"
+                          data-icon="angle-up"
+                          data-prefix="fas"
+                          focusable="false"
+                          role="img"
+                          viewBox="0 0 320 512"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            class=""
+                            d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"
+                            fill="currentColor"
+                          />
+                        </svg>
                       </label>
                       <div
                         class="sub"
                       >
+                        
                         <div
                           class="item"
                           data-test-id="run-data-schema-item"
@@ -445,11 +614,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                               data-target="mappable"
                               data-value="{{ $json['hello world'][0].test['more to think about'] }}"
                             >
-                              <font-awesome-icon-stub
-                                icon="hashtag"
-                                size="sm"
-                              />
-                              <!---->
+                              <svg
+                                aria-hidden="true"
+                                class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
+                                data-icon="hashtag"
+                                data-prefix="fas"
+                                focusable="false"
+                                role="img"
+                                viewBox="0 0 448 512"
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  class=""
+                                  d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
+                                  fill="currentColor"
+                                />
+                              </svg>
+                              <!--v-if-->
                               <span
                                 class=""
                               >
@@ -462,10 +643,11 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           >
                             1
                           </span>
-                          <!---->
-                          <!---->
-                          <!---->
+                          <!--v-if-->
+                          <!--v-if-->
+                          <!--v-if-->
                         </div>
+                        
                       </div>
                     </div>
                     <div
@@ -485,11 +667,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                           data-target="mappable"
                           data-value="{{ $json['hello world'][0]['test.how'] }}"
                         >
-                          <font-awesome-icon-stub
-                            icon="font"
-                            size="sm"
-                          />
-                          <!---->
+                          <svg
+                            aria-hidden="true"
+                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
+                            data-icon="font"
+                            data-prefix="fas"
+                            focusable="false"
+                            role="img"
+                            viewBox="0 0 448 512"
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              class=""
+                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
+                              fill="currentColor"
+                            />
+                          </svg>
+                          <!--v-if-->
                           <span
                             class=""
                           >
@@ -502,21 +696,23 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                       >
                         ignore
                       </span>
-                      <!---->
-                      <!---->
-                      <!---->
+                      <!--v-if-->
+                      <!--v-if-->
+                      <!--v-if-->
                     </div>
+                    
                   </div>
                 </div>
+                
               </div>
             </div>
+            
           </div>
         </div>
       </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
+      
+      <!--teleport start-->
+      <!--teleport end-->
     </div>
   </div>
 </div>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
deleted file mode 100644
index c4309d245103b..0000000000000
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/VariablesRow.spec.ts.snap
+++ /dev/null
@@ -1,78 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`VariablesRow > should render correctly 1`] = `
-"<tr data-test-id=\\"variables-row\\" class=\\"variablesRow\\">
-  <td class=\\"variables-key-column\\">
-    <div><span>key</span></div>
-  </td>
-  <td class=\\"variables-value-column\\">
-    <div><span>value</span></div>
-  </td>
-  <td class=\\"variables-usage-column\\">
-    <div>
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\"><span class=\\"usageSyntax\\">$vars.key</span></n8n-tooltip-stub>
-    </div>
-  </td>
-  <td>
-    <div class=\\"buttons hoverButtons\\">
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\">
-        <div><button disabled=\\"disabled\\" aria-disabled=\\"true\\" aria-live=\\"polite\\" class=\\"mr-xs button button tertiary medium disabled\\" data-test-id=\\"variable-row-edit-button\\">
-            <!----><span> Edit </span></button></div>
-      </n8n-tooltip-stub>
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\">
-        <div><button disabled=\\"disabled\\" aria-disabled=\\"true\\" aria-live=\\"polite\\" class=\\"button button tertiary medium disabled\\" data-test-id=\\"variable-row-delete-button\\">
-            <!----><span> Delete </span></button></div>
-      </n8n-tooltip-stub>
-    </div>
-  </td>
-</tr>"
-`;
-
-exports[`VariablesRow > should show key and value inputs in edit mode 1`] = `
-"<tr data-test-id=\\"variables-row\\" class=\\"variablesRow\\">
-  <td class=\\"variables-key-column\\">
-    <div>
-      <div data-test-id=\\"variable-row-key-input\\" class=\\"container\\">
-        <!---->
-        <div class=\\"\\">
-          <div class=\\"el-input el-input--large n8n-input\\">
-            <!----><input type=\\"text\\" autocomplete=\\"off\\" name=\\"key\\" placeholder=\\"Enter a name\\" class=\\"el-input__inner\\">
-            <!---->
-            <!---->
-            <!---->
-            <!---->
-          </div>
-        </div>
-        <!---->
-      </div>
-    </div>
-  </td>
-  <td class=\\"variables-value-column\\">
-    <div>
-      <div data-test-id=\\"variable-row-value-input\\" class=\\"container\\">
-        <!---->
-        <div class=\\"\\">
-          <div class=\\"el-input el-input--large n8n-input\\">
-            <!----><input type=\\"text\\" autocomplete=\\"off\\" name=\\"value\\" placeholder=\\"Enter a value\\" class=\\"el-input__inner\\">
-            <!---->
-            <!---->
-            <!---->
-            <!---->
-          </div>
-        </div>
-        <!---->
-      </div>
-    </div>
-  </td>
-  <td class=\\"variables-usage-column\\">
-    <div>
-      <n8n-tooltip-stub justifybuttons=\\"flex-end\\" buttons=\\"\\" placement=\\"top\\"><span class=\\"usageSyntax\\">$vars.key</span></n8n-tooltip-stub>
-    </div>
-  </td>
-  <td>
-    <div class=\\"buttons\\"><button aria-live=\\"polite\\" class=\\"mr-xs button button tertiary medium\\" data-test-id=\\"variable-row-cancel-button\\">
-        <!----><span> Cancel </span></button><button aria-live=\\"polite\\" class=\\"button button primary medium\\" data-test-id=\\"variable-row-save-button\\">
-        <!----><span> Save </span></button></div>
-  </td>
-</tr>"
-`;
diff --git a/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts b/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
index 94552b3e18d43..0a220f75c6047 100644
--- a/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
+++ b/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
@@ -101,6 +101,7 @@ export const DEFAULT_SETUP = {
 		dependentParametersValues: 'gid=0',
 		inputSize: 'small',
 		labelSize: 'small',
+		teleported: false,
 		node: {
 			parameters: NODE_PARAMETER_VALUES,
 			id: 'f63efb2d-3cc5-4500-89f9-b39aab19baf5',
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 9d79fb7a62754..1cbe786fff899 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -1,10 +1,9 @@
 <template>
-	<n8n-popover trigger="click">
+	<n8n-popover trigger="click" width="304" size="large">
 		<template #reference>
 			<n8n-button
 				icon="filter"
 				type="tertiary"
-				size="medium"
 				:active="hasFilters"
 				:class="[$style['filter-button'], 'ml-2xs']"
 				data-test-id="resources-list-filters-trigger"
@@ -16,7 +15,7 @@
 			</n8n-button>
 		</template>
 		<div :class="$style['filters-dropdown']" data-test-id="resources-list-filters-dropdown">
-			<slot :filters="value" :setKeyValue="setKeyValue" />
+			<slot :filters="modelValue" :setKeyValue="setKeyValue" />
 			<enterprise-edition
 				class="mb-s"
 				:features="[EnterpriseEditionFeature.Sharing]"
@@ -32,9 +31,9 @@
 				<n8n-user-select
 					:users="ownedByUsers"
 					:currentUserId="usersStore.currentUser.id"
-					:value="value.ownedBy"
+					:modelValue="modelValue.ownedBy"
 					size="medium"
-					@input="setKeyValue('ownedBy', $event)"
+					@update:modelValue="setKeyValue('ownedBy', $event)"
 				/>
 			</enterprise-edition>
 			<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]" v-if="shareable">
@@ -48,9 +47,9 @@
 				<n8n-user-select
 					:users="sharedWithUsers"
 					:currentUserId="usersStore.currentUser.id"
-					:value="value.sharedWith"
+					:modelValue="modelValue.sharedWith"
 					size="medium"
-					@input="setKeyValue('sharedWith', $event)"
+					@update:modelValue="setKeyValue('sharedWith', $event)"
 				/>
 			</enterprise-edition>
 			<div :class="[$style['filters-dropdown-footer'], 'mt-s']" v-if="hasFilters">
@@ -74,7 +73,7 @@ export type IResourceFiltersType = Record<string, boolean | string | string[]>;
 
 export default defineComponent({
 	props: {
-		value: {
+		modelValue: {
 			type: Object as PropType<IResourceFiltersType>,
 			default: () => ({}),
 		},
@@ -99,12 +98,12 @@ export default defineComponent({
 		...mapStores(useUsersStore),
 		ownedByUsers(): IUser[] {
 			return this.usersStore.allUsers.map((user) =>
-				user.id === this.value.sharedWith ? { ...user, disabled: true } : user,
+				user.id === this.modelValue.sharedWith ? { ...user, disabled: true } : user,
 			);
 		},
 		sharedWithUsers(): IUser[] {
 			return this.usersStore.allUsers.map((user) =>
-				user.id === this.value.ownedBy ? { ...user, disabled: true } : user,
+				user.id === this.modelValue.ownedBy ? { ...user, disabled: true } : user,
 			);
 		},
 		filtersLength(): number {
@@ -116,7 +115,9 @@ export default defineComponent({
 				}
 
 				length += (
-					Array.isArray(this.value[key]) ? this.value[key].length > 0 : this.value[key] !== ''
+					Array.isArray(this.modelValue[key])
+						? this.modelValue[key].length > 0
+						: this.modelValue[key] !== ''
 				)
 					? 1
 					: 0;
@@ -131,23 +132,23 @@ export default defineComponent({
 	methods: {
 		setKeyValue(key: string, value: unknown) {
 			const filters = {
-				...this.value,
+				...this.modelValue,
 				[key]: value,
 			};
 
-			this.$emit('input', filters);
+			this.$emit('update:modelValue', filters);
 		},
 		resetFilters() {
 			if (this.reset) {
 				this.reset();
 			} else {
-				const filters = { ...this.value };
+				const filters = { ...this.modelValue };
 
 				(this.keys as string[]).forEach((key) => {
-					filters[key] = Array.isArray(this.value[key]) ? [] : '';
+					filters[key] = Array.isArray(this.modelValue[key]) ? [] : '';
 				});
 
-				this.$emit('input', filters);
+				this.$emit('update:modelValue', filters);
 			}
 		},
 	},
@@ -161,7 +162,7 @@ export default defineComponent({
 
 <style lang="scss" module>
 .filter-button {
-	height: 36px;
+	height: 40px;
 	align-items: center;
 }
 
diff --git a/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue b/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
index 1c5ccc865782d..3cfcd9971d2e2 100644
--- a/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
+++ b/packages/editor-ui/src/components/forms/ResourceOwnershipSelect.ee.vue
@@ -1,10 +1,12 @@
 <template>
-	<n8n-menu
-		:items="menuItems"
-		mode="tabs"
-		:value="value ? 'owner' : 'all'"
-		@input="onSelectOwner"
-	/>
+	<div class="resource-ownership-select">
+		<n8n-menu
+			:items="menuItems"
+			mode="tabs"
+			:modelValue="value ? 'owner' : 'all'"
+			@update:modelValue="onSelectOwner"
+		/>
+	</div>
 </template>
 
 <script lang="ts">
@@ -46,7 +48,7 @@ export default defineComponent({
 	},
 	methods: {
 		onSelectOwner(type: string) {
-			this.$emit('input', type === 'owner');
+			this.$emit('update:modelValue', type === 'owner');
 		},
 	},
 });
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 3dd013490865b..bbf43af7c4eff 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -3,7 +3,7 @@
 		<template #aside v-if="showAside">
 			<div :class="[$style['heading-wrapper'], 'mb-xs']">
 				<n8n-heading size="2xlarge">
-					{{ $locale.baseText(`${resourceKey}.heading`) }}
+					{{ i18n.baseText(`${resourceKey}.heading`) }}
 				</n8n-heading>
 			</div>
 
@@ -16,7 +16,7 @@
 						@click="$emit('click:add', $event)"
 						data-test-id="resources-list-add"
 					>
-						{{ $locale.baseText(`${resourceKey}.add`) }}
+						{{ i18n.baseText(`${resourceKey}.add`) }}
 					</n8n-button>
 				</slot>
 			</div>
@@ -24,8 +24,8 @@
 			<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]" v-if="shareable">
 				<resource-ownership-select
 					v-model="isOwnerSubview"
-					:my-resources-label="$locale.baseText(`${resourceKey}.menu.my`)"
-					:all-resources-label="$locale.baseText(`${resourceKey}.menu.all`)"
+					:my-resources-label="i18n.baseText(`${resourceKey}.menu.my`)"
+					:all-resources-label="i18n.baseText(`${resourceKey}.menu.all`)"
 				/>
 			</enterprise-edition>
 		</template>
@@ -42,7 +42,7 @@
 						data-test-id="empty-resources-list"
 						emoji="👋"
 						:heading="
-							$locale.baseText(
+							i18n.baseText(
 								usersStore.currentUser.firstName
 									? `${resourceKey}.empty.heading`
 									: `${resourceKey}.empty.heading.userNotSetup`,
@@ -51,10 +51,10 @@
 								},
 							)
 						"
-						:description="$locale.baseText(`${resourceKey}.empty.description`)"
-						:buttonText="$locale.baseText(`${resourceKey}.empty.button`)"
+						:description="i18n.baseText(`${resourceKey}.empty.description`)"
+						:buttonText="i18n.baseText(`${resourceKey}.empty.button`)"
 						buttonType="secondary"
-						@click="$emit('click:add', $event)"
+						@click:button="$emit('click:add', $event)"
 					/>
 				</slot>
 			</div>
@@ -63,34 +63,35 @@
 					<div class="mb-xs">
 						<div :class="$style['filters-row']">
 							<n8n-input
+								:modelValue="filtersModel.search"
 								:class="[$style['search'], 'mr-2xs']"
-								:placeholder="$locale.baseText(`${resourceKey}.search.placeholder`)"
-								v-model="filters.search"
-								size="medium"
+								:placeholder="i18n.baseText(`${resourceKey}.search.placeholder`)"
 								clearable
 								ref="search"
 								data-test-id="resources-list-search"
+								@update:modelValue="onSearch"
 							>
 								<template #prefix>
 									<n8n-icon icon="search" />
 								</template>
 							</n8n-input>
 							<div :class="$style['sort-and-filter']">
-								<n8n-select v-model="sortBy" size="medium" data-test-id="resources-list-sort">
+								<n8n-select v-model="sortBy" data-test-id="resources-list-sort">
 									<n8n-option
 										v-for="sortOption in sortOptions"
+										data-test-id="resources-list-sort-item"
 										:key="sortOption"
 										:value="sortOption"
-										:label="$locale.baseText(`${resourceKey}.sort.${sortOption}`)"
+										:label="i18n.baseText(`${resourceKey}.sort.${sortOption}`)"
 									/>
 								</n8n-select>
 								<resource-filters-dropdown
 									v-if="showFiltersDropdown"
 									:keys="filterKeys"
 									:reset="resetFilters"
-									:value="filters"
+									:modelValue="filtersModel"
 									:shareable="shareable"
-									@input="$emit('update:filters', $event)"
+									@update:modelValue="$emit('update:filters', $event)"
 									@update:filtersLength="onUpdateFiltersLength"
 								>
 									<template #default="resourceFiltersSlotProps">
@@ -103,11 +104,11 @@
 
 					<slot name="callout"></slot>
 
-					<div v-show="hasFilters" class="mt-xs">
+					<div v-if="showFiltersDropdown" v-show="hasFilters" class="mt-xs">
 						<n8n-info-tip :bold="false">
-							{{ $locale.baseText(`${resourceKey}.filters.active`) }}
+							{{ i18n.baseText(`${resourceKey}.filters.active`) }}
 							<n8n-link @click="resetFilters" size="small">
-								{{ $locale.baseText(`${resourceKey}.filters.active.reset`) }}
+								{{ i18n.baseText(`${resourceKey}.filters.active.reset`) }}
 							</n8n-link>
 						</n8n-info-tip>
 					</div>
@@ -152,22 +153,20 @@
 				</div>
 
 				<n8n-text color="text-base" size="medium" data-test-id="resources-list-empty" v-else>
-					{{ $locale.baseText(`${resourceKey}.noResults`) }}
+					{{ i18n.baseText(`${resourceKey}.noResults`) }}
 					<template v-if="shouldSwitchToAllSubview">
-						<span v-if="!filters.search">
-							({{ $locale.baseText(`${resourceKey}.noResults.switchToShared.preamble`) }}
+						<span v-if="!filtersModel.search">
+							({{ i18n.baseText(`${resourceKey}.noResults.switchToShared.preamble`) }}
 							<n8n-link @click="setOwnerSubview(false)">
-								{{ $locale.baseText(`${resourceKey}.noResults.switchToShared.link`) }} </n8n-link
+								{{ i18n.baseText(`${resourceKey}.noResults.switchToShared.link`) }} </n8n-link
 							>)
 						</span>
 
 						<span v-else>
-							({{
-								$locale.baseText(`${resourceKey}.noResults.withSearch.switchToShared.preamble`)
-							}}
+							({{ i18n.baseText(`${resourceKey}.noResults.withSearch.switchToShared.preamble`) }}
 							<n8n-link @click="setOwnerSubview(false)">
 								{{
-									$locale.baseText(`${resourceKey}.noResults.withSearch.switchToShared.link`)
+									i18n.baseText(`${resourceKey}.noResults.withSearch.switchToShared.link`)
 								}} </n8n-link
 							>)
 						</span>
@@ -196,6 +195,7 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import type { N8nInput } from 'n8n-design-system';
 import type { DatatableColumn } from 'n8n-design-system';
+import { useI18n } from '@/composables';
 
 export interface IResource {
 	id: string;
@@ -285,12 +285,20 @@ export default defineComponent({
 			}),
 		},
 	},
+	setup() {
+		const i18n = useI18n();
+
+		return {
+			i18n,
+		};
+	},
 	data() {
 		return {
 			loading: true,
 			isOwnerSubview: false,
 			sortBy: this.sortOptions[0],
 			hasFilters: false,
+			filtersModel: { ...this.filters },
 			currentPage: 1,
 			rowsPerPage: 10 as number | '*',
 			resettingFilters: false,
@@ -316,33 +324,34 @@ export default defineComponent({
 			});
 		},
 		filterKeys(): string[] {
-			return Object.keys(this.filters);
+			return Object.keys(this.filtersModel);
 		},
 		filteredAndSortedSubviewResources(): IResource[] {
 			const filtered: IResource[] = this.subviewResources.filter((resource: IResource) => {
 				let matches = true;
 
-				if (this.filters.ownedBy) {
-					matches = matches && !!(resource.ownedBy && resource.ownedBy.id === this.filters.ownedBy);
+				if (this.filtersModel.ownedBy) {
+					matches =
+						matches && !!(resource.ownedBy && resource.ownedBy.id === this.filtersModel.ownedBy);
 				}
 
-				if (this.filters.sharedWith) {
+				if (this.filtersModel.sharedWith) {
 					matches =
 						matches &&
 						!!(
 							resource.sharedWith &&
-							resource.sharedWith.find((sharee) => sharee.id === this.filters.sharedWith)
+							resource.sharedWith.find((sharee) => sharee.id === this.filtersModel.sharedWith)
 						);
 				}
 
-				if (this.filters.search) {
-					const searchString = this.filters.search.toLowerCase();
+				if (this.filtersModel.search) {
+					const searchString = this.filtersModel.search.toLowerCase();
 
 					matches = matches && this.displayName(resource).toLowerCase().includes(searchString);
 				}
 
 				if (this.additionalFiltersHandler) {
-					matches = this.additionalFiltersHandler(resource, this.filters, matches);
+					matches = this.additionalFiltersHandler(resource, this.filtersModel, matches);
 				}
 
 				return matches;
@@ -385,7 +394,8 @@ export default defineComponent({
 			await this.initialize();
 
 			this.loading = false;
-			this.$nextTick(this.focusSearchInput);
+			await this.$nextTick();
+			this.focusSearchInput();
 		},
 		setCurrentPage(page: number) {
 			this.currentPage = page;
@@ -394,8 +404,8 @@ export default defineComponent({
 			this.rowsPerPage = rowsPerPage;
 		},
 		resetFilters() {
-			Object.keys(this.filters).forEach((key) => {
-				this.filters[key] = Array.isArray(this.filters[key]) ? [] : '';
+			Object.keys(this.filtersModel).forEach((key) => {
+				this.filtersModel[key] = Array.isArray(this.filtersModel[key]) ? [] : '';
 			});
 
 			this.resettingFilters = true;
@@ -410,7 +420,7 @@ export default defineComponent({
 			this.isOwnerSubview = active;
 		},
 		getTelemetrySubview(): string {
-			return this.$locale.baseText(
+			return this.i18n.baseText(
 				`${this.resourceKey as IResourceKeyType}.menu.${this.isOwnerSubview ? 'my' : 'all'}`,
 			);
 		},
@@ -436,7 +446,7 @@ export default defineComponent({
 				setTimeout(() => (this.resettingFilters = false), 1500);
 			}
 
-			const filters = this.filters as Record<string, string[] | string | boolean>;
+			const filters = this.filtersModel as Record<string, string[] | string | boolean>;
 			const filtersSet: string[] = [];
 			const filterValues: Array<string[] | string | boolean | null> = [];
 
@@ -458,6 +468,10 @@ export default defineComponent({
 		onUpdateFiltersLength(length: number) {
 			this.hasFilters = length > 0;
 		},
+		onSearch(search: string) {
+			this.filtersModel.search = search;
+			this.$emit('update:filters', this.filtersModel);
+		},
 	},
 	mounted() {
 		void this.onMounted();
@@ -466,16 +480,19 @@ export default defineComponent({
 		isOwnerSubview() {
 			this.sendSubviewTelemetry();
 		},
-		'filters.ownedBy'(value) {
+		filters(value) {
+			this.filtersModel = value;
+		},
+		'filtersModel.ownedBy'(value) {
 			if (value) {
 				this.setOwnerSubview(false);
 			}
 			this.sendFiltersTelemetry('ownedBy');
 		},
-		'filters.sharedWith'() {
+		'filtersModel.sharedWith'() {
 			this.sendFiltersTelemetry('sharedWith');
 		},
-		'filters.search'() {
+		'filtersModel.search'() {
 			void this.callDebounced(
 				'sendFiltersTelemetry',
 				{ debounceTime: 1000, trailing: true },
diff --git a/packages/editor-ui/src/components/transitions/SlideTransition.vue b/packages/editor-ui/src/components/transitions/SlideTransition.vue
index 872e1f43ea274..2f86c9073dc5c 100644
--- a/packages/editor-ui/src/components/transitions/SlideTransition.vue
+++ b/packages/editor-ui/src/components/transitions/SlideTransition.vue
@@ -18,7 +18,7 @@ export default defineComponent({
 	transition: 200ms ease;
 }
 .slide-leave-to,
-.slide-enter {
+.slide-enter-from {
 	transform: translateX(100%);
 }
 </style>
diff --git a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts b/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
index d1e75e17006ca..9176fd9d2e5d8 100644
--- a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
@@ -23,7 +23,7 @@ vi.mock('@/stores/history.store', () => {
 	};
 });
 vi.mock('@/stores/ui.store');
-vi.mock('vue-router/composables', () => ({
+vi.mock('vue-router', () => ({
 	useRoute: () => ({}),
 }));
 
diff --git a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
index b6b2c5a2291aa..23d2c1a5a9bae 100644
--- a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
+++ b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
@@ -224,6 +224,7 @@ export default function useCanvasMouseSelect() {
 	});
 
 	return {
+		selectActive,
 		getMousePositionWithinNodeView,
 		mouseUpMouseSelect,
 		mouseDownMouseSelect,
diff --git a/packages/editor-ui/src/composables/useGlobalLinkActions.ts b/packages/editor-ui/src/composables/useGlobalLinkActions.ts
index a7d70f1943afe..51f92c6eec296 100644
--- a/packages/editor-ui/src/composables/useGlobalLinkActions.ts
+++ b/packages/editor-ui/src/composables/useGlobalLinkActions.ts
@@ -2,7 +2,7 @@
  * Creates event listeners for `data-action` attribute to allow for actions to be called from locale without using
  * unsafe onclick attribute
  */
-import { reactive, del, computed, onMounted, onUnmounted, getCurrentInstance } from 'vue';
+import { reactive, computed, onMounted, onUnmounted, getCurrentInstance } from 'vue';
 import { globalLinkActionsEventBus } from '@/event-bus';
 
 const state = reactive({
@@ -14,7 +14,8 @@ export default () => {
 		state.customActions[key] = action;
 	}
 	function unregisterCustomAction(key: string) {
-		del(state.customActions, key);
+		const { [key]: _, ...rest } = state.customActions;
+		state.customActions = rest;
 	}
 	function delegateClick(e: MouseEvent) {
 		const clickedElement = e.target;
diff --git a/packages/editor-ui/src/composables/useI18n.ts b/packages/editor-ui/src/composables/useI18n.ts
index f673d0eca82f7..61d7bf807a50d 100644
--- a/packages/editor-ui/src/composables/useI18n.ts
+++ b/packages/editor-ui/src/composables/useI18n.ts
@@ -1,19 +1,5 @@
 import { i18n } from '@/plugins/i18n';
-import { useRootStore } from '@/stores/n8nRoot.store';
 
 export function useI18n() {
-	const isEnglishLocale = useRootStore().defaultLocale === 'en';
-
-	function localizeNodeName(nodeName: string, type: string) {
-		if (isEnglishLocale) return nodeName;
-
-		const nodeTypeName = i18n.shortNodeType(type);
-
-		return i18n.headerText({
-			key: `headers.${nodeTypeName}.displayName`,
-			fallback: nodeName,
-		});
-	}
-
-	return { i18n, localizeNodeName };
+	return i18n;
 }
diff --git a/packages/editor-ui/src/composables/useLoadingService.ts b/packages/editor-ui/src/composables/useLoadingService.ts
index a5195cb87ea9e..2ec61c5d9452d 100644
--- a/packages/editor-ui/src/composables/useLoadingService.ts
+++ b/packages/editor-ui/src/composables/useLoadingService.ts
@@ -1,6 +1,6 @@
 import { ref } from 'vue';
 import { useI18n } from '@/composables/useI18n';
-import { Loading } from 'element-ui';
+import { ElLoading as Loading } from 'element-plus';
 
 interface LoadingService {
 	text: string;
@@ -8,7 +8,7 @@ interface LoadingService {
 }
 
 export function useLoadingService() {
-	const { i18n } = useI18n();
+	const i18n = useI18n();
 	const loadingService = ref<LoadingService | null>(null);
 
 	function startLoading(text?: string) {
@@ -38,6 +38,7 @@ export function useLoadingService() {
 	}
 
 	return {
+		loadingService,
 		startLoading,
 		setLoadingText,
 		stopLoading,
diff --git a/packages/editor-ui/src/composables/useMessage.ts b/packages/editor-ui/src/composables/useMessage.ts
index 97ffd74ed13c0..ba58f851b9105 100644
--- a/packages/editor-ui/src/composables/useMessage.ts
+++ b/packages/editor-ui/src/composables/useMessage.ts
@@ -1,5 +1,5 @@
-import type { ElMessageBoxOptions } from 'element-ui/types/message-box';
-import { Message, MessageBox } from 'element-ui';
+import type { ElMessageBoxOptions } from 'element-plus';
+import { ElMessageBox as MessageBox } from 'element-plus';
 
 export function useMessage() {
 	const handleCancelOrClose = (e: unknown) => {
@@ -65,6 +65,6 @@ export function useMessage() {
 		alert,
 		confirm,
 		prompt,
-		message: Message,
+		message: MessageBox,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 5b46d0a2da0fa..f0c1b200c0992 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -1,27 +1,26 @@
-import { Notification } from 'element-ui';
-import type { ElNotificationComponent, ElNotificationOptions } from 'element-ui/types/notification';
-import type { MessageType } from 'element-ui/types/message';
+import { ElNotification as Notification } from 'element-plus';
+import type { NotificationInstance, NotificationOptions, MessageBoxState } from 'element-plus';
 import { sanitizeHtml } from '@/utils';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useI18n } from './useI18n';
 import { useExternalHooks } from './useExternalHooks';
 
-const messageDefaults: Partial<Omit<ElNotificationOptions, 'message'>> = {
+const messageDefaults: Partial<Omit<NotificationOptions, 'message'>> = {
 	dangerouslyUseHTMLString: true,
 	position: 'bottom-right',
 };
 
-const stickyNotificationQueue: ElNotificationComponent[] = [];
+const stickyNotificationQueue: NotificationInstance[] = [];
 
 export function useToast() {
 	const telemetry = useTelemetry();
 	const workflowsStore = useWorkflowsStore();
 	const externalHooks = useExternalHooks();
-	const { i18n } = useI18n();
+	const i18n = useI18n();
 
 	function showMessage(
-		messageData: Omit<ElNotificationOptions, 'message'> & { message?: string },
+		messageData: Omit<NotificationOptions, 'message'> & { message?: string },
 		track = true,
 	) {
 		messageData = { ...messageDefaults, ...messageData };
@@ -29,7 +28,8 @@ export function useToast() {
 			? sanitizeHtml(messageData.message)
 			: messageData.message;
 
-		const notification = Notification(messageData as ElNotificationOptions);
+		// @TODO Check if still working
+		const notification = Notification(messageData as NotificationOptions);
 
 		if (messageData.duration === 0) {
 			stickyNotificationQueue.push(notification);
@@ -55,11 +55,11 @@ export function useToast() {
 		duration?: number;
 		customClass?: string;
 		closeOnClick?: boolean;
-		type?: MessageType;
+		type?: MessageBoxState['type'];
 		dangerouslyUseHTMLString?: boolean;
 	}) {
 		// eslint-disable-next-line prefer-const
-		let notification: ElNotificationComponent;
+		let notification: NotificationInstance;
 		if (config.closeOnClick) {
 			const cb = config.onClick;
 			config.onClick = () => {
@@ -138,7 +138,7 @@ export function useToast() {
 		});
 	}
 
-	function showAlert(config: ElNotificationOptions): ElNotificationComponent {
+	function showAlert(config: NotificationOptions): NotificationInstance {
 		return Notification(config);
 	}
 
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 85a0369adfbdf..62254015552df 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -579,3 +579,6 @@ export const CLOUD_BASE_URL_STAGING = 'https://stage-api.n8n.cloud';
 export const CLOUD_BASE_URL_PRODUCTION = 'https://api.n8n.cloud';
 
 export const CLOUD_TRIAL_CHECK_INTERVAL = 5000;
+
+// A path that does not exist so that nothing is selected by default
+export const nonExistingJsonPath = '_!^&*';
diff --git a/packages/editor-ui/src/declarations/vue-json-pretty.d.ts b/packages/editor-ui/src/declarations/vue-json-pretty.d.ts
deleted file mode 100644
index 083e70eba349e..0000000000000
--- a/packages/editor-ui/src/declarations/vue-json-pretty.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module 'vue-json-pretty' {
-	import { Component } from 'vue';
-	const vueJsonPretty: Component;
-	export default vueJsonPretty;
-}
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/editor-ui/src/event-bus/code-node-editor.ts
index 01e549fa37de8..128e07606f2a0 100644
--- a/packages/editor-ui/src/event-bus/code-node-editor.ts
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const codeNodeEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/data-pinning.ts b/packages/editor-ui/src/event-bus/data-pinning.ts
index 4e3568451baf5..aa6548741f10a 100644
--- a/packages/editor-ui/src/event-bus/data-pinning.ts
+++ b/packages/editor-ui/src/event-bus/data-pinning.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const dataPinningEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/html-editor.ts b/packages/editor-ui/src/event-bus/html-editor.ts
index 2dfd72627ef6b..7a53bf86a4369 100644
--- a/packages/editor-ui/src/event-bus/html-editor.ts
+++ b/packages/editor-ui/src/event-bus/html-editor.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const htmlEditorEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/link-actions.ts b/packages/editor-ui/src/event-bus/link-actions.ts
index baffeabdb2885..41386147ea2e0 100644
--- a/packages/editor-ui/src/event-bus/link-actions.ts
+++ b/packages/editor-ui/src/event-bus/link-actions.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const globalLinkActionsEventBus = createEventBus();
diff --git a/packages/editor-ui/src/event-bus/node-view.ts b/packages/editor-ui/src/event-bus/node-view.ts
index cb4b2601483c5..9023b161b7f70 100644
--- a/packages/editor-ui/src/event-bus/node-view.ts
+++ b/packages/editor-ui/src/event-bus/node-view.ts
@@ -1,3 +1,3 @@
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export const nodeViewEventBus = createEventBus();
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index 1f196c3472947..71580ca21db5d 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -1,6 +1,4 @@
-// The Vue build version to load with the `import` command
-// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
-import Vue from 'vue';
+import { createApp } from 'vue';
 
 import 'vue-json-pretty/lib/styles.css';
 import '@jsplumb/browser-ui/css/jsplumbtoolkit.css';
@@ -26,24 +24,21 @@ import { runExternalHook } from '@/utils';
 import { createPinia, PiniaVuePlugin } from 'pinia';
 import { useWebhooksStore } from '@/stores';
 
-Vue.config.productionTip = false;
-
-Vue.use(TelemetryPlugin);
-Vue.use(PiniaVuePlugin);
+const pinia = createPinia();
 
-Vue.use(I18nPlugin);
-Vue.use(FontAwesomePlugin);
-Vue.use(GlobalComponentsPlugin);
-Vue.use(GlobalDirectivesPlugin);
+const app = createApp(App);
 
-const pinia = createPinia();
+app.use(TelemetryPlugin);
+app.use(PiniaVuePlugin);
+app.use(I18nPlugin);
+app.use(FontAwesomePlugin);
+app.use(GlobalComponentsPlugin);
+app.use(GlobalDirectivesPlugin);
+app.use(pinia);
+app.use(router);
+app.use(i18nInstance);
 
-new Vue({
-	i18n: i18nInstance,
-	router,
-	pinia,
-	render: (h) => h(App),
-}).$mount('#app');
+app.mount('#app');
 
 router.afterEach((to, from) => {
 	void runExternalHook('main.routeChange', useWebhooksStore(), { from, to });
diff --git a/packages/editor-ui/src/mixins/copyPaste.ts b/packages/editor-ui/src/mixins/copyPaste.ts
index 49c4ae830d233..c2fdb22328ca0 100644
--- a/packages/editor-ui/src/mixins/copyPaste.ts
+++ b/packages/editor-ui/src/mixins/copyPaste.ts
@@ -226,7 +226,7 @@ export const copyPaste = defineComponent({
 			}
 		},
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		if (this.hiddenInput) {
 			this.hiddenInput.remove();
 		}
diff --git a/packages/editor-ui/src/mixins/expressionManager.ts b/packages/editor-ui/src/mixins/expressionManager.ts
index f0cf517e5026e..adf6d0fd63236 100644
--- a/packages/editor-ui/src/mixins/expressionManager.ts
+++ b/packages/editor-ui/src/mixins/expressionManager.ts
@@ -24,6 +24,7 @@ export const expressionManager = defineComponent({
 		return {
 			editor: {} as EditorView,
 			skipSegments: [] as string[],
+			editorState: undefined,
 		};
 	},
 	watch: {
@@ -72,24 +73,24 @@ export const expressionManager = defineComponent({
 		},
 
 		segments(): Segment[] {
-			if (!this.editor?.state) return [];
+			if (!this.editorState || !this.editorState) return [];
 
 			const rawSegments: RawSegment[] = [];
 
 			const fullTree = ensureSyntaxTree(
-				this.editor.state,
-				this.editor.state.doc.length,
+				this.editorState,
+				this.editorState.doc.length,
 				EXPRESSION_EDITOR_PARSER_TIMEOUT,
 			);
 
 			if (fullTree === null) {
-				throw new Error(`Failed to parse expression: ${this.editor.state.doc.toString()}`);
+				throw new Error(`Failed to parse expression: ${this.editorValue}`);
 			}
 
 			const skipSegments = ['Program', 'Script', 'Document', ...this.skipSegments];
 
 			fullTree.cursor().iterate((node) => {
-				const text = this.editor.state.sliceDoc(node.from, node.to);
+				const text = this.editorState.sliceDoc(node.from, node.to);
 
 				if (skipSegments.includes(node.type.name)) return;
 
diff --git a/packages/editor-ui/src/mixins/pinData.ts b/packages/editor-ui/src/mixins/pinData.ts
index 0676d26877098..7191bb0590b4b 100644
--- a/packages/editor-ui/src/mixins/pinData.ts
+++ b/packages/editor-ui/src/mixins/pinData.ts
@@ -1,4 +1,4 @@
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 import type { INodeUi } from '@/Interface';
 import type { INodeTypeDescription, IPinData } from 'n8n-workflow';
 import { stringSizeInBytes } from '@/utils';
@@ -13,7 +13,7 @@ export interface IPinDataContext {
 	$showError(error: Error, title: string): void;
 }
 
-export const pinData = (Vue as Vue.VueConstructor<Vue & IPinDataContext>).extend({
+export const pinData = defineComponent({
 	setup() {
 		return {
 			...useToast(),
@@ -22,7 +22,7 @@ export const pinData = (Vue as Vue.VueConstructor<Vue & IPinDataContext>).extend
 	computed: {
 		...mapStores(useWorkflowsStore),
 		pinData(): IPinData[string] | undefined {
-			return this.node ? this.workflowsStore.pinDataByNodeName(this.node!.name) : undefined;
+			return this.node ? this.workflowsStore.pinDataByNodeName(this.node.name) : undefined;
 		},
 		hasPinData(): boolean {
 			return !!this.node && typeof this.pinData !== 'undefined';
diff --git a/packages/editor-ui/src/mixins/userHelpers.ts b/packages/editor-ui/src/mixins/userHelpers.ts
index ad2b78708ab19..01d2e0255186e 100644
--- a/packages/editor-ui/src/mixins/userHelpers.ts
+++ b/packages/editor-ui/src/mixins/userHelpers.ts
@@ -2,12 +2,12 @@ import type { IPermissions } from '@/Interface';
 import { isAuthorized } from '@/utils';
 import { useUsersStore } from '@/stores/users.store';
 import { defineComponent } from 'vue';
-import type { Route } from 'vue-router';
+import type { RouteLocation } from 'vue-router';
 
 export const userHelpers = defineComponent({
 	methods: {
 		canUserAccessRouteByName(name: string): boolean {
-			const { route } = this.$router.resolve({ name });
+			const route = this.$router.resolve({ name });
 
 			return this.canUserAccessRoute(route);
 		},
@@ -16,7 +16,7 @@ export const userHelpers = defineComponent({
 			return this.canUserAccessRoute(this.$route);
 		},
 
-		canUserAccessRoute(route: Route): boolean {
+		canUserAccessRoute(route: RouteLocation): boolean {
 			const permissions: IPermissions = route.meta && route.meta.permissions;
 			const usersStore = useUsersStore();
 			const currentUser = usersStore.currentUser;
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
index e18ec7d4eb44d..33867f078586e 100644
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/mixins/workflowHelpers.ts
@@ -58,11 +58,11 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import { useUsersStore } from '@/stores/users.store';
-import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
+import type { IPermissions } from '@/permissions';
 import type { ICredentialsResponse } from '@/Interface';
-import { useEnvironmentsStore } from '@/stores';
 
 export function resolveParameter(
 	parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
@@ -757,6 +757,8 @@ export const workflowHelpers = defineComponent({
 
 				return true;
 			} catch (error) {
+				console.error(error);
+
 				this.uiStore.removeActiveAction('workflowSaving');
 
 				if (error.errorCode === 100) {
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index e1cd5c5040668..2c94cc0741e7c 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -1,7 +1,7 @@
 import type { INodeUi } from '@/Interface';
 import type { IConnection } from 'n8n-workflow';
 import type { XYPosition } from '../Interface';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 // Command names don't serve any particular purpose in the app
 // but they make it easier to identify each command on stack
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index 74c528d3cf9f4..dd8262cebd084 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -69,6 +69,13 @@
 	.el-message-box__title {
 		color: $custom-dialog-text-color;
 	}
+	.el-message-box-icon {
+		width: var(--spacing-l);
+		height: var(--spacing-l);
+		&--warning {
+			color: var(--color-warning);
+		}
+	}
 }
 
 // Notification Message
@@ -156,18 +163,18 @@
 }
 
 .tags-container {
-	.el-tag {
-		color: $tag-text-color;
+
+	.el-select-tags-wrapper .el-tag {
 		font-size: 12px;
-		background-color: $tag-background-color;
-		border-radius: 12px;
-		height: auto;
-		border-color: $tag-background-color;
 		font-weight: 400;
+		display: flex;
+		align-items: flex-end;
 
-		.el-icon-close {
-			color: $tag-background-color;
-			background-color: $tag-close-background-color !important;
+		&.is-closable {
+			overflow-y: hidden;
+		}
+
+		.el-tag__close {
 			max-height: 15px;
 			max-width: 15px;
 			margin-right: 6px;
@@ -216,3 +223,7 @@
 		}
 	}
 }
+
+.el-popper:not(.el-popover) {
+  max-width: 265px;
+}
diff --git a/packages/editor-ui/src/plugins/components.ts b/packages/editor-ui/src/plugins/components.ts
index 71b7cd96c9586..e5d8d6cde5c85 100644
--- a/packages/editor-ui/src/plugins/components.ts
+++ b/packages/editor-ui/src/plugins/components.ts
@@ -1,31 +1,30 @@
-import type { PluginObject } from 'vue';
-import VueAgile from 'vue-agile';
+import type { Plugin } from 'vue';
 
 import 'regenerator-runtime/runtime';
 
-import ElementUI from 'element-ui';
-import { Loading, MessageBox, Notification } from 'element-ui';
+import ElementPlus from 'element-plus';
+import { ElLoading, ElMessageBox } from 'element-plus';
 import { N8nPlugin } from 'n8n-design-system';
-import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 import { useMessage } from '@/composables/useMessage';
+import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 
-export const GlobalComponentsPlugin: PluginObject<{}> = {
+export const GlobalComponentsPlugin: Plugin<{}> = {
 	install(app) {
 		const messageService = useMessage();
 
 		app.component('enterprise-edition', EnterpriseEdition);
 
-		app.use(VueAgile);
-		app.use(ElementUI);
+		app.use(ElementPlus);
 		app.use(N8nPlugin);
-		app.use(Loading.directive);
 
-		app.prototype.$loading = Loading.service;
-		app.prototype.$msgbox = MessageBox;
-		app.prototype.$alert = messageService.alert;
-		app.prototype.$confirm = messageService.confirm;
-		app.prototype.$prompt = messageService.prompt;
-		app.prototype.$message = messageService.message;
-		app.prototype.$notify = Notification;
+		// app.use(ElLoading);
+		// app.use(ElNotification);
+
+		app.config.globalProperties.$loading = ElLoading.service;
+		app.config.globalProperties.$msgbox = ElMessageBox;
+		app.config.globalProperties.$alert = messageService.alert;
+		app.config.globalProperties.$confirm = messageService.confirm;
+		app.config.globalProperties.$prompt = messageService.prompt;
+		app.config.globalProperties.$message = messageService.message;
 	},
 };
diff --git a/packages/editor-ui/src/plugins/directives.ts b/packages/editor-ui/src/plugins/directives.ts
index abf1e1c7387b0..9302499e3144b 100644
--- a/packages/editor-ui/src/plugins/directives.ts
+++ b/packages/editor-ui/src/plugins/directives.ts
@@ -1,11 +1,10 @@
-import type { PluginObject } from 'vue';
-import Vue2TouchEvents from 'vue2-touch-events';
-// @ts-ignore
-import vClickOutside from 'v-click-outside';
+import type { Plugin } from 'vue';
+import VueTouchEvents from 'vue3-touch-events';
+import { vOnClickOutside } from '@vueuse/components';
 
-export const GlobalDirectivesPlugin: PluginObject<{}> = {
+export const GlobalDirectivesPlugin: Plugin<{}> = {
 	install(app) {
-		app.use(Vue2TouchEvents);
-		app.use(vClickOutside);
+		app.use(VueTouchEvents);
+		app.directive('on-click-outside', vOnClickOutside);
 	},
 };
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 7de2c557abde9..834ed9b594bc2 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -1,7 +1,6 @@
-import Vue from 'vue';
-import type { PluginObject } from 'vue';
+import type { Plugin } from 'vue';
 import axios from 'axios';
-import VueI18n from 'vue-i18n';
+import { createI18n } from 'vue-i18n';
 import type { INodeTranslationHeaders } from '@/Interface';
 import {
 	deriveMiddleKey,
@@ -15,19 +14,17 @@ import englishBaseText from './locales/en.json';
 import { useUIStore } from '@/stores/ui.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
+import { useRootStore } from '@/stores';
 
-Vue.use(VueI18n);
-
-export const i18nInstance = new VueI18n({
+export const i18nInstance = createI18n({
 	locale: 'en',
 	fallbackLocale: 'en',
 	messages: { en: englishBaseText },
-	silentTranslationWarn: true,
 });
 
 export class I18nClass {
-	private get i18n(): VueI18n {
-		return i18nInstance;
+	private get i18n() {
+		return i18nInstance.global;
 	}
 
 	// ----------------------------------
@@ -315,6 +312,19 @@ export class I18nClass {
 		};
 	}
 
+	localizeNodeName(nodeName: string, type: string) {
+		const isEnglishLocale = useRootStore().defaultLocale === 'en';
+
+		if (isEnglishLocale) return nodeName;
+
+		const nodeTypeName = this.shortNodeType(type);
+
+		return this.headerText({
+			key: `headers.${nodeTypeName}.displayName`,
+			fallback: nodeName,
+		});
+	}
+
 	rootVars: Record<string, string | undefined> = {
 		$binary: this.baseText('codeNodeEditor.completer.binary'),
 		$execution: this.baseText('codeNodeEditor.completer.$execution'),
@@ -500,13 +510,13 @@ export class I18nClass {
 
 const loadedLanguages = ['en'];
 
-function setLanguage(language: string) {
-	i18nInstance.locale = language;
+async function setLanguage(language: string) {
+	i18nInstance.global.locale = language as 'en';
 	axios.defaults.headers.common['Accept-Language'] = language;
 	document!.querySelector('html')!.setAttribute('lang', language);
 
 	// update n8n design system and element ui
-	locale.use(language);
+	await locale.use(language);
 
 	return language;
 }
@@ -514,27 +524,25 @@ function setLanguage(language: string) {
 export async function loadLanguage(language?: string) {
 	if (!language) return;
 
-	if (i18nInstance.locale === language) {
-		setLanguage(language);
-		return;
+	if (i18nInstance.global.locale === language) {
+		return setLanguage(language);
 	}
 
 	if (loadedLanguages.includes(language)) {
-		setLanguage(language);
-		return;
+		return setLanguage(language);
 	}
 
 	const { numberFormats, ...rest } = (await import(`./locales/${language}.json`)).default;
 
-	i18nInstance.setLocaleMessage(language, rest);
+	i18nInstance.global.setLocaleMessage(language, rest);
 
 	if (numberFormats) {
-		i18nInstance.setNumberFormat(language, numberFormats);
+		i18nInstance.global.setNumberFormat(language, numberFormats);
 	}
 
 	loadedLanguages.push(language);
 
-	setLanguage(language);
+	return setLanguage(language);
 }
 
 /**
@@ -544,7 +552,7 @@ export function addNodeTranslation(
 	nodeTranslation: { [nodeType: string]: object },
 	language: string,
 ) {
-	const oldNodesBase = i18nInstance.messages[language]['n8n-nodes-base'] || {};
+	const oldNodesBase = i18nInstance.global.messages[language]['n8n-nodes-base'] || {};
 
 	const updatedNodes = {
 		// @ts-ignore
@@ -556,9 +564,9 @@ export function addNodeTranslation(
 		'n8n-nodes-base': Object.assign(oldNodesBase, { nodes: updatedNodes }),
 	};
 
-	i18nInstance.setLocaleMessage(
+	i18nInstance.global.setLocaleMessage(
 		language,
-		Object.assign(i18nInstance.messages[language], newNodesBase),
+		Object.assign(i18nInstance.global.messages[language], newNodesBase),
 	);
 }
 
@@ -569,7 +577,7 @@ export function addCredentialTranslation(
 	nodeCredentialTranslation: { [credentialType: string]: object },
 	language: string,
 ) {
-	const oldNodesBase = i18nInstance.messages[language]['n8n-nodes-base'] || {};
+	const oldNodesBase = i18nInstance.global.messages[language]['n8n-nodes-base'] || {};
 
 	const updatedCredentials = {
 		// @ts-ignore
@@ -581,9 +589,9 @@ export function addCredentialTranslation(
 		'n8n-nodes-base': Object.assign(oldNodesBase, { credentials: updatedCredentials }),
 	};
 
-	i18nInstance.setLocaleMessage(
+	i18nInstance.global.setLocaleMessage(
 		language,
-		Object.assign(i18nInstance.messages[language], newNodesBase),
+		Object.assign(i18nInstance.global.messages[language], newNodesBase),
 	);
 }
 
@@ -591,32 +599,23 @@ export function addCredentialTranslation(
  * Add a node's header strings to the i18n instance's `messages` object.
  */
 export function addHeaders(headers: INodeTranslationHeaders, language: string) {
-	i18nInstance.setLocaleMessage(
+	i18nInstance.global.setLocaleMessage(
 		language,
-		Object.assign(i18nInstance.messages[language], { headers }),
+		Object.assign(i18nInstance.global.messages[language], { headers }),
 	);
 }
 
 export const i18n: I18nClass = new I18nClass();
 
-export const I18nPlugin: PluginObject<{}> = {
-	install(app): void {
-		locale.use('en');
-		locale.i18n((key: string, options?: { interpolate: object }) =>
-			i18nInstance.t(key, options && options.interpolate),
+export const I18nPlugin: Plugin<{}> = {
+	async install(app) {
+		locale.i18n((key: string, options?: { interpolate: Record<string, unknown> }) =>
+			i18nInstance.global.t(key, options?.interpolate || {}),
 		);
 
-		Object.defineProperty(app, '$locale', {
-			get() {
-				return i18n;
-			},
-		});
+		app.config.globalProperties.$locale = i18n;
 
-		Object.defineProperty(app.prototype, '$locale', {
-			get() {
-				return i18n;
-			},
-		});
+		await locale.use('en');
 	},
 };
 
@@ -624,12 +623,6 @@ export const I18nPlugin: PluginObject<{}> = {
 //             typings
 // ----------------------------------
 
-declare module 'vue/types/vue' {
-	interface Vue {
-		$locale: I18nClass;
-	}
-}
-
 type GetBaseTextKey<T> = T extends `_${string}` ? never : T;
 
 export type BaseTextKey = GetBaseTextKey<keyof typeof englishBaseText>;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index f6bc151e41780..53a07d7819732 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1,21 +1,33 @@
 {
-	"_reusableBaseText.cancel": "Cancel",
-	"_reusableBaseText.codeNodeEditor.linter.useJson": "Access the properties of an item under `.json`, e.g. `item.json`",
-	"_reusableBaseText.codeNodeEditor.completer.all": "Get all items",
-	"_reusableBaseText.codeNodeEditor.completer.first": "Get the first item",
-	"_reusableBaseText.codeNodeEditor.completer.last": "Get the last item",
-	"_reusableBaseText.codeNodeEditor.completer.itemMatching": "Get the item matching a specified input item. Pass the input item index",
-	"_reusableBaseText.name": "Name",
-	"_reusableBaseText.save": "Save",
-	"_reusableBaseText.dismiss": "Dismiss",
-	"_reusableDynamicText.readMore": "Read more",
-	"_reusableDynamicText.learnMore": "Learn more",
-	"_reusableDynamicText.moreInfo": "More info",
-	"_reusableDynamicText.oauth2.clientId": "Client ID",
-	"_reusableDynamicText.oauth2.clientSecret": "Client Secret",
-	"_reusableBaseText.unlimited": "Unlimited",
-	"_reusableBaseText.activate": "Activate",
-	"_reusableBaseText.error": "Error",
+	"_reusableBaseText": {
+		"cancel": "Cancel",
+		"codeNodeEditor": {
+			"linter": {
+				"useJson": "Access the properties of an item under `.json`, e.g. `item.json`"
+			},
+			"completer": {
+				"all": "Get all items",
+				"first": "Get the first item",
+				"last": "Get the last item",
+				"itemMatching": "Get the item matching a specified input item. Pass the input item index"
+			}
+		},
+		"name": "Name",
+		"save": "Save",
+		"dismiss": "Dismiss",
+		"unlimited": "Unlimited",
+		"activate": "Activate",
+		"error": "Error"
+	},
+	"_reusableDynamicText": {
+		"readMore": "Read more",
+		"learnMore": "Learn more",
+		"moreInfo": "More info",
+		"oauth2": {
+			"clientId": "Client ID",
+			"clientSecret": "Client Secret"
+		}
+	},
 	"generic.any": "Any",
 	"generic.cancel": "Cancel",
 	"generic.confirm": "Confirm",
@@ -416,9 +428,9 @@
 	"dataMapping.dragFromPreviousHint": "Map data from previous nodes to <b>{name}</b> by first clicking this button",
 	"dataMapping.success.title": "You just mapped some data!",
 	"dataMapping.success.moreInfo": "Check out our <a href=\"https://docs.n8n.io/data/data-mapping\" target=\"_blank\">docs</a> for more details on mapping data in n8n",
-	"dataMapping.tableHint": "<img src='/static/data-mapping-gif.gif'/> Drag a column onto <b>{name}</b> to map it",
-	"dataMapping.jsonHint": "<img src='/static/json-mapping-gif.gif'/> Drag a JSON key onto <b>{name}</b> to map data",
-	"dataMapping.schemaHint": "<img src='/static/schema-mapping-gif.gif'/> Drag a datapill onto <b>{name}</b> to map data",
+	"dataMapping.tableHint": "<img src='/static/data-mapping-gif.gif'/><br/> Drag a column onto <b>{name}</b> to map it",
+	"dataMapping.jsonHint": "<img src='/static/json-mapping-gif.gif'/><br/> Drag a JSON key onto <b>{name}</b> to map data",
+	"dataMapping.schemaHint": "<img src='/static/schema-mapping-gif.gif'/><br/> Drag a datapill onto <b>{name}</b> to map data",
 	"dataMapping.tableView.tableColumnsExceeded": "Some columns are hidden",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip": "Your data has more than {columnLimit} columns so some are hidden. Switch to {link} to see all data.",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip.link": "JSON view",
@@ -559,8 +571,8 @@
 	"executionsFilter.customData.inputTooltip.link": "View plans",
 	"executionsFilter.customData.docsTooltip": "Filter executions by data that you have explicitly saved in them (by calling $execution.customData.set(key, value)). {link}",
 	"executionsFilter.customData.docsTooltip.link": "More info",
-	"expressionEdit.anythingInside": "Anything inside",
-	"expressionEdit.isJavaScript": "is JavaScript.",
+	"expressionEdit.anythingInside": "Anything inside ",
+	"expressionEdit.isJavaScript": " is JavaScript.",
 	"expressionEdit.learnMore": "Learn more",
 	"expressionEdit.editExpression": "Edit Expression",
 	"expressionEdit.expression": "Expression",
@@ -932,8 +944,8 @@
 	"openWorkflow.workflowImportError": "Could not import workflow",
 	"openWorkflow.workflowNotFoundError": "Could not find workflow",
 	"parameterInput.expressionResult": "e.g. {result}",
-	"parameterInput.anythingInside": "Anything inside",
-	"parameterInput.isJavaScript": "is JavaScript.",
+	"parameterInput.anythingInside": "Anything inside ",
+	"parameterInput.isJavaScript": " is JavaScript.",
 	"parameterInput.learnMore": "Learn more",
 	"parameterInput.resultForItem": "Result for Item",
 	"parameterInput.emptyString": "[empty]",
@@ -1169,7 +1181,7 @@
 	"settings.communityNodes.installModal.description": "Find community nodes to add on the npm public registry.",
 	"settings.communityNodes.browseButton.label": "Browse",
 	"settings.communityNodes.installModal.packageName.label": "npm Package Name",
-	"settings.communityNodes.installModal.packageName.tooltip": "<img src='/static/community_package_tooltip_img.png'/><p>This is the title of the package on <a href='{npmURL}'>npmjs.com</a></p><p>Install a specific version by adding it after @, e.g. <code>package-name@0.15.0</code></p>",
+	"settings.communityNodes.installModal.packageName.tooltip": "<img src='/static/community_package_tooltip_img.png'/><p>This is the title of the package on <a href='{npmURL}'>npmjs.com</a></p><p>Install a specific version by adding it after {'@'}, e.g. <code>package-name{'@'}0.15.0</code></p>",
 	"settings.communityNodes.installModal.packageName.placeholder": "e.g. n8n-nodes-chatwork",
 	"settings.communityNodes.installModal.checkbox.label": "I understand the risks of installing unverified code from a public source.",
 	"settings.communityNodes.installModal.installButton.label": "Install",
@@ -1296,7 +1308,7 @@
 	"settings.log-streaming.addDestination": "Add new destination",
 	"settings.log-streaming.destinations": "Log destinations",
 	"settings.api.trial.upgradePlan.title": "Upgrade to use API",
-	"settings.api.trial.upgradePlan.description": "To prevent abuse, we limit API access to your workspace during your trial. If this is hindering your evaluation of n8n, please contact <a href=\"mailto:support@n8n.io\">support@n8n.io</a>",
+	"settings.api.trial.upgradePlan.description": "To prevent abuse, we limit API access to your workspace during your trial. If this is hindering your evaluation of n8n, please contact <a href=\"mailto:support{'@'}n8n.io\">support{'@'}n8n.io</a>",
 	"settings.api.trial.upgradePlan.cta": "Upgrade plan",
 	"settings.api.create.description": "Control n8n programmatically using the <a href=\"https://docs.n8n.io/api\" target=\"_blank\">n8n API</a>",
 	"settings.api.create.button": "Create an API Key",
@@ -1348,7 +1360,7 @@
 	"settings.sourceControl.description.link": "More info",
 	"settings.sourceControl.gitConfig": "Git configuration",
 	"settings.sourceControl.repoUrl": "Git repository URL (SSH)",
-	"settings.sourceControl.repoUrlPlaceholder": "e.g. git@github.com:my-team/my-repository",
+	"settings.sourceControl.repoUrlPlaceholder": "e.g. git{'@'}github.com:my-team/my-repository",
 	"settings.sourceControl.repoUrlInvalid": "The Git repository URL is not valid",
 	"settings.sourceControl.authorName": "Commit author  name",
 	"settings.sourceControl.authorEmail": "Commit author  email",
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index a5b6d2b792717..d0bed8ee653bd 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -1,4 +1,4 @@
-import type { PluginObject } from 'vue';
+import type { Plugin } from 'vue';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import type { IconDefinition } from '@fortawesome/fontawesome-svg-core';
 import {
@@ -142,7 +142,7 @@ function addIcon(icon: IconDefinition) {
 	library.add(icon);
 }
 
-export const FontAwesomePlugin: PluginObject<{}> = {
+export const FontAwesomePlugin: Plugin<{}> = {
 	install: (app) => {
 		addIcon(faAngleDoubleLeft);
 		addIcon(faAngleDown);
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index bd3f630d99257..295ea7a0061dd 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -1,6 +1,6 @@
-import type _Vue from 'vue';
+import type { Plugin } from 'vue';
 import type { ITelemetrySettings, ITelemetryTrackProperties, IDataObject } from 'n8n-workflow';
-import type { Route } from 'vue-router';
+import type { RouteLocation } from 'vue-router';
 
 import type { INodeCreateElement, IUpdateInformation } from '@/Interface';
 import type { IUserNodesPanelSession } from './telemetry.types';
@@ -10,7 +10,7 @@ import { useTelemetryStore } from '@/stores/telemetry.store';
 import { SLACK_NODE_TYPE } from '@/constants';
 
 export class Telemetry {
-	private pageEventQueue: Array<{ route: Route }>;
+	private pageEventQueue: Array<{ route: RouteLocation }>;
 	private previousPath: string;
 
 	private get rudderStack() {
@@ -283,15 +283,8 @@ export class Telemetry {
 
 export const telemetry = new Telemetry();
 
-export function TelemetryPlugin(vue: typeof _Vue): void {
-	Object.defineProperty(vue, '$telemetry', {
-		get() {
-			return telemetry;
-		},
-	});
-	Object.defineProperty(vue.prototype, '$telemetry', {
-		get() {
-			return telemetry;
-		},
-	});
-}
+export const TelemetryPlugin: Plugin<{}> = {
+	install(app) {
+		app.config.globalProperties.$telemetry = telemetry;
+	},
+};
diff --git a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts b/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
index 960875d920311..b4d0078322ad4 100644
--- a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
+++ b/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
@@ -1,11 +1,3 @@
-import type { Telemetry } from '.';
-
-declare module 'vue/types/vue' {
-	interface Vue {
-		$telemetry: Telemetry;
-	}
-}
-
 declare global {
 	interface Window {
 		rudderanalytics: RudderStack;
@@ -60,3 +52,5 @@ interface RudderStack extends Array<unknown> {
 
 	reset(): void;
 }
+
+export {};
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 584ad030f678c..b8403a1d2a396 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -1,5 +1,3 @@
-import Vue from 'vue';
-
 import ChangePasswordView from './views/ChangePasswordView.vue';
 import ErrorView from './views/ErrorView.vue';
 import ForgotMyPasswordView from './views/ForgotMyPasswordView.vue';
@@ -20,8 +18,8 @@ import SettingsFakeDoorView from './views/SettingsFakeDoorView.vue';
 import SetupView from './views/SetupView.vue';
 import SigninView from './views/SigninView.vue';
 import SignupView from './views/SignupView.vue';
-import type { Route } from 'vue-router';
-import Router from 'vue-router';
+import type { RouteLocation, RouteRecordRaw } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
 
 import TemplatesCollectionView from '@/views/TemplatesCollectionView.vue';
 import TemplatesWorkflowView from '@/views/TemplatesWorkflowView.vue';
@@ -32,7 +30,6 @@ import WorkflowsView from '@/views/WorkflowsView.vue';
 import VariablesView from '@/views/VariablesView.vue';
 import type { IPermissions } from './Interface';
 import { LOGIN_STATUS, ROLE } from '@/utils';
-import type { RouteConfigSingleView } from 'vue-router/types/router';
 import { useSettingsStore } from './stores/settings.store';
 import { useTemplatesStore } from './stores/templates.store';
 import { useSSOStore } from './stores/sso.store';
@@ -44,9 +41,7 @@ import SettingsSourceControl from './views/SettingsSourceControl.vue';
 import SettingsAuditLogs from './views/SettingsAuditLogs.vue';
 import { VIEWS } from '@/constants';
 
-Vue.use(Router);
-
-interface IRouteConfig extends RouteConfigSingleView {
+interface IRouteConfig {
 	meta: {
 		nodeView?: boolean;
 		templatesEnabled?: boolean;
@@ -54,7 +49,7 @@ interface IRouteConfig extends RouteConfigSingleView {
 		permissions: IPermissions;
 		telemetry?: {
 			disabled?: true;
-			getProperties: (route: Route) => object;
+			getProperties: (route: RouteLocation) => object;
 		};
 		scrollOffset?: number;
 	};
@@ -74,10 +69,10 @@ export const routes = [
 	{
 		path: '/',
 		name: VIEWS.HOMEPAGE,
+		redirect: (to) => {
+			return { name: VIEWS.WORKFLOWS };
+		},
 		meta: {
-			getRedirect() {
-				return { name: VIEWS.WORKFLOWS };
-			},
 			permissions: {
 				allow: {
 					loginStatus: [LOGIN_STATUS.LoggedIn],
@@ -95,7 +90,7 @@ export const routes = [
 		meta: {
 			templatesEnabled: true,
 			telemetry: {
-				getProperties(route: Route) {
+				getProperties(route: RouteLocation) {
 					const templatesStore = useTemplatesStore();
 					return {
 						collection_id: route.params.id,
@@ -122,7 +117,7 @@ export const routes = [
 			templatesEnabled: true,
 			getRedirect: getTemplatesRedirect,
 			telemetry: {
-				getProperties(route: Route) {
+				getProperties(route: RouteLocation) {
 					const templatesStore = useTemplatesStore();
 					return {
 						template_id: route.params.id,
@@ -150,7 +145,7 @@ export const routes = [
 			// Templates view remembers it's scroll position on back
 			scrollOffset: 0,
 			telemetry: {
-				getProperties(route: Route) {
+				getProperties(route: RouteLocation) {
 					const templatesStore = useTemplatesStore();
 					return {
 						wf_template_repo_session_id: templatesStore.currentSessionId,
@@ -462,7 +457,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'usage',
 							};
@@ -493,7 +488,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'personal',
 							};
@@ -518,7 +513,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'users',
 							};
@@ -540,7 +535,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'api',
 							};
@@ -568,7 +563,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'environments',
 							};
@@ -590,7 +585,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'sso',
 							};
@@ -661,7 +656,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: route.params['featureId'],
 							};
@@ -700,7 +695,7 @@ export const routes = [
 				meta: {
 					telemetry: {
 						pageCategory: 'settings',
-						getProperties(route: Route) {
+						getProperties(route: RouteLocation) {
 							return {
 								feature: 'audit-logs',
 							};
@@ -747,7 +742,7 @@ export const routes = [
 		},
 	},
 	{
-		path: '*',
+		path: '/:pathMatch(.*)*',
 		name: VIEWS.NOT_FOUND,
 		component: ErrorView,
 		props: {
@@ -769,11 +764,10 @@ export const routes = [
 			},
 		},
 	},
-] as IRouteConfig[];
+] as Array<RouteRecordRaw & IRouteConfig>;
 
-const router = new Router({
-	mode: 'history',
-	base: import.meta.env.DEV ? '/' : window.BASE_PATH ?? '/',
+const router = createRouter({
+	history: createWebHistory(import.meta.env.DEV ? '/' : window.BASE_PATH ?? '/'),
 	scrollBehavior(to, from, savedPosition) {
 		// saved position == null means the page is NOT visited from history (back button)
 		if (savedPosition === null && to.name === VIEWS.TEMPLATES && to.meta) {
diff --git a/packages/editor-ui/src/shims-vue.d.ts b/packages/editor-ui/src/shims-vue.d.ts
index 84072c1301a6e..6d9f9c73096bd 100644
--- a/packages/editor-ui/src/shims-vue.d.ts
+++ b/packages/editor-ui/src/shims-vue.d.ts
@@ -1,13 +1,22 @@
-import Vue from 'vue';
-import 'n8n-design-system/shims-element-ui';
+import type { I18nClass } from '@/plugins/i18n';
+import type { Route } from 'vue-router';
+import type { Telemetry } from '@/plugins/telemetry';
 
-declare module '*.vue' {
-	import Vue from 'vue';
-	export default Vue;
-}
+declare module 'vue' {
+	interface ComponentCustomOptions {
+		beforeRouteEnter?(to: Route, from: Route, next: () => void): void;
+		beforeRouteLeave?(to: Route, from: Route, next: () => void): void;
+		beforeRouteUpdate?(to: Route, from: Route, next: () => void): void;
+	}
 
-declare module 'vue/types/vue' {
-	interface Vue {
+	interface ComponentCustomProperties {
 		$style: Record<string, string>;
+		$locale: I18nClass;
+		$telemetry: Telemetry;
 	}
 }
+
+/**
+ * @docs https://vuejs.org/guide/typescript/options-api.html#augmenting-global-properties
+ */
+export {};
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/editor-ui/src/shims.d.ts
index fc95a6f17da9c..0cc01780ae32f 100644
--- a/packages/editor-ui/src/shims.d.ts
+++ b/packages/editor-ui/src/shims.d.ts
@@ -1,4 +1,4 @@
-import Vue, { VNode } from 'vue';
+import { VNode, ComponentPublicInstance } from 'vue';
 import type { Store } from 'pinia';
 import type { IDataObject } from 'n8n-workflow';
 
@@ -27,7 +27,7 @@ declare global {
 
 	namespace JSX {
 		interface Element extends VNode {}
-		interface ElementClass extends Vue {}
+		interface ElementClass extends ComponentPublicInstance {}
 		interface IntrinsicElements {
 			[elem: string]: any;
 		}
diff --git a/packages/editor-ui/src/stores/logStreaming.store.ts b/packages/editor-ui/src/stores/logStreaming.store.ts
index ffacb70ffcf9c..205ed8aa34a7b 100644
--- a/packages/editor-ui/src/stores/logStreaming.store.ts
+++ b/packages/editor-ui/src/stores/logStreaming.store.ts
@@ -1,5 +1,4 @@
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
 import { defineStore } from 'pinia';
 import {
 	deleteDestinationFromDb,
@@ -40,14 +39,14 @@ export const useLogStreamingStore = defineStore('logStreaming', {
 	getters: {},
 	actions: {
 		addDestination(destination: MessageEventBusDestinationOptions) {
-			if (destination.id && destination.id in this.items) {
+			if (destination.id && this.items[destination.id]) {
 				this.items[destination.id].destination = destination;
 			} else {
 				this.setSelectionAndBuildItems(destination);
 			}
 		},
 		getDestination(destinationId: string): MessageEventBusDestinationOptions | undefined {
-			if (destinationId in this.items) {
+			if (this.items[destinationId]) {
 				return this.items[destinationId].destination;
 			} else {
 				return;
@@ -61,20 +60,20 @@ export const useLogStreamingStore = defineStore('logStreaming', {
 			return destinations;
 		},
 		updateDestination(destination: MessageEventBusDestinationOptions) {
-			if (destination.id && destination.id in this.items) {
+			if (destination.id && this.items[destination.id]) {
 				this.$patch((state) => {
-					if (destination.id && destination.id in this.items) {
+					if (destination.id && this.items[destination.id]) {
 						state.items[destination.id].destination = destination;
 					}
 					// to trigger refresh
-					state.items = deepCopy(state.items);
+					state.items = { ...state.items };
 				});
 			}
 		},
 		removeDestination(destinationId: string) {
 			if (!destinationId) return;
 			delete this.items[destinationId];
-			if (destinationId in this.items) {
+			if (this.items[destinationId]) {
 				this.$patch({
 					items: {
 						...this.items,
@@ -104,7 +103,7 @@ export const useLogStreamingStore = defineStore('logStreaming', {
 		},
 		getSelectedEvents(destinationId: string): string[] {
 			const selectedEvents: string[] = [];
-			if (destinationId in this.items) {
+			if (this.items[destinationId]) {
 				for (const group of this.items[destinationId].eventGroups) {
 					if (group.selected) {
 						selectedEvents.push(group.name);
@@ -119,7 +118,7 @@ export const useLogStreamingStore = defineStore('logStreaming', {
 			return selectedEvents;
 		},
 		setSelectedInGroup(destinationId: string, name: string, isSelected: boolean) {
-			if (destinationId in this.items) {
+			if (this.items[destinationId]) {
 				const groupName = eventGroupFromEventName(name);
 				const groupIndex = this.items[destinationId].eventGroups.findIndex(
 					(e) => e.name === groupName,
@@ -162,11 +161,13 @@ export const useLogStreamingStore = defineStore('logStreaming', {
 			delete this.items[id];
 		},
 		clearDestinationItemTrees() {
+			console.log('clearing destinations');
+
 			this.items = {} as DestinationSettingsStore;
 		},
 		setSelectionAndBuildItems(destination: MessageEventBusDestinationOptions) {
 			if (destination.id) {
-				if (!(destination.id in this.items)) {
+				if (!this.items[destination.id]) {
 					this.items[destination.id] = {
 						destination,
 						selectedEvents: new Set<string>(),
diff --git a/packages/editor-ui/src/stores/n8nRoot.store.ts b/packages/editor-ui/src/stores/n8nRoot.store.ts
index 1043040a66876..3e688cf6f3176 100644
--- a/packages/editor-ui/src/stores/n8nRoot.store.ts
+++ b/packages/editor-ui/src/stores/n8nRoot.store.ts
@@ -2,7 +2,6 @@ import { CLOUD_BASE_URL_PRODUCTION, CLOUD_BASE_URL_STAGING, STORES } from '@/con
 import type { IRestApiContext, RootState } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
 import { defineStore } from 'pinia';
-import { useNodeTypesStore } from './nodeTypes.store';
 
 const { VUE_APP_URL_BASE_API } = import.meta.env;
 
@@ -62,15 +61,6 @@ export const useRootStore = defineStore(STORES.ROOT, {
 				sessionId: this.sessionId,
 			};
 		},
-		/**
-		 * Getter for node default names ending with a number: `'S3'`, `'Magento 2'`, etc.
-		 */
-		nativelyNumberSuffixedDefaults: (): string[] => {
-			return useNodeTypesStore().allNodeTypes.reduce<string[]>((acc, cur) => {
-				if (/\d$/.test(cur.defaults.name as string)) acc.push(cur.defaults.name as string);
-				return acc;
-			}, []);
-		},
 	},
 	actions: {
 		setUrlBaseWebhook(urlBaseWebhook: string): void {
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index d740cb06ca61d..5b91796f44379 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -87,6 +87,15 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 		visibleNodeTypes(): INodeTypeDescription[] {
 			return this.allLatestNodeTypes.filter((nodeType: INodeTypeDescription) => !nodeType.hidden);
 		},
+		/**
+		 * Getter for node default names ending with a number: `'S3'`, `'Magento 2'`, etc.
+		 */
+		nativelyNumberSuffixedDefaults(): string[] {
+			return this.allNodeTypes.reduce<string[]>((acc, cur) => {
+				if (/\d$/.test(cur.defaults.name as string)) acc.push(cur.defaults.name as string);
+				return acc;
+			}, []);
+		},
 	},
 	actions: {
 		setNodeTypes(newNodeTypes: INodeTypeDescription[] = []): void {
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/editor-ui/src/stores/sourceControl.store.ts
index 06a76070bceaf..647a7f24f7a81 100644
--- a/packages/editor-ui/src/stores/sourceControl.store.ts
+++ b/packages/editor-ui/src/stores/sourceControl.store.ts
@@ -1,7 +1,9 @@
 import { computed, reactive } from 'vue';
 import { defineStore } from 'pinia';
 import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore, useRootStore, useUsersStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUsersStore } from '@/stores/users.store';
 import * as vcApi from '@/api/sourceControl';
 import type { SourceControlPreferences } from '@/Interface';
 
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index da185042bc65e..84a99f085b230 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -55,7 +55,7 @@ import type { BaseTextKey } from '@/plugins/i18n';
 import { i18n as locale } from '@/plugins/i18n';
 import type { Modals, NewCredentialsModal } from '@/Interface';
 import { useTelemetryStore } from '@/stores/telemetry.store';
-import { getStyleTokenValue } from '@/utils';
+import { getStyleTokenValue } from '@/utils/htmlUtils';
 import { dismissBannerPermanently } from '@/api/ui';
 import type { Banners } from 'n8n-workflow';
 
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 6172bcefcb98b..931704259d2aa 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -965,6 +965,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 		},
 
 		removeNode(node: INodeUi): void {
+			const uiStore = useUIStore();
 			const { [node.name]: removedNodeMetadata, ...remainingNodeMetadata } = this.nodeMetadata;
 			this.nodeMetadata = remainingNodeMetadata;
 
@@ -978,8 +979,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 
 			for (let i = 0; i < this.workflow.nodes.length; i++) {
 				if (this.workflow.nodes[i].name === node.name) {
-					this.workflow.nodes.splice(i, 1);
-					const uiStore = useUIStore();
+					this.workflow = {
+						...this.workflow,
+						nodes: [...this.workflow.nodes.slice(0, i), ...this.workflow.nodes.slice(i + 1)],
+					};
+
 					uiStore.stateIsDirty = true;
 					return;
 				}
@@ -1136,6 +1140,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 
 		pinDataByNodeName(nodeName: string): INodeExecutionData[] | undefined {
 			if (!this.workflow.pinData || !this.workflow.pinData[nodeName]) return undefined;
+
 			return this.workflow.pinData[nodeName].map((item) => item.json) as INodeExecutionData[];
 		},
 
diff --git a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts b/packages/editor-ui/src/utils/__tests__/userUtils.test.ts
index 60b711d5d369d..8ed6ed606a46f 100644
--- a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/userUtils.test.ts
@@ -1,13 +1,13 @@
 import { beforeAll } from 'vitest';
-import { setActivePinia, createPinia } from 'pinia';
+import { setActivePinia } from 'pinia';
 import { merge } from 'lodash-es';
-import { isAuthorized } from '@/utils';
-import { useSettingsStore, useSSOStore } from '@/stores';
+import { isAuthorized, ROLE } from '@/utils';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSSOStore } from '@/stores/sso.store';
 import type { IUser } from '@/Interface';
-import { routes } from '@/router';
-import { VIEWS } from '@/constants';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import type { IN8nUISettings } from 'n8n-workflow';
+import { createTestingPinia } from '@pinia/testing';
 
 const DEFAULT_SETTINGS: IN8nUISettings = SETTINGS_STORE_DEFAULT_STATE.settings;
 
@@ -30,15 +30,24 @@ describe('userUtils', () => {
 
 	describe('isAuthorized', () => {
 		beforeAll(() => {
-			setActivePinia(createPinia());
+			setActivePinia(createTestingPinia());
 			settingsStore = useSettingsStore();
 			ssoStore = useSSOStore();
 		});
 
+		// @TODO Move to routes tests in the future
 		it('should check SSO settings route permissions', () => {
-			const ssoSettingsPermissions = routes
-				.find((route) => route.path.startsWith('/settings'))
-				?.children?.find((route) => route.name === VIEWS.SSO_SETTINGS)?.meta?.permissions;
+			const ssoSettingsPermissions = {
+				allow: {
+					role: [ROLE.Owner],
+				},
+				deny: {
+					shouldDeny: () => {
+						const settingsStore = useSettingsStore();
+						return settingsStore.isDesktopDeployment;
+					},
+				},
+			};
 
 			const user: IUser = merge({}, DEFAULT_USER, {
 				isDefaultUser: false,
diff --git a/packages/editor-ui/src/views/AuthView.vue b/packages/editor-ui/src/views/AuthView.vue
index 7a3fa27ac7f7d..4d3b7a473c4be 100644
--- a/packages/editor-ui/src/views/AuthView.vue
+++ b/packages/editor-ui/src/views/AuthView.vue
@@ -13,7 +13,7 @@
 				:buttonLoading="formLoading"
 				@secondaryClick="onSecondaryClick"
 				@submit="onSubmit"
-				@input="onInput"
+				@update="onUpdate"
 			>
 				<SSOLogin v-if="withSso" />
 			</n8n-form-box>
@@ -48,8 +48,8 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		onInput(e: { name: string; value: string }) {
-			this.$emit('input', e);
+		onUpdate(e: { name: string; value: string }) {
+			this.$emit('update', e);
 		},
 		onSubmit(values: { [key: string]: string }) {
 			this.$emit('submit', values);
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index 4dace734ab95e..bf5c391473e33 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -7,8 +7,7 @@
 	>
 		<n8n-tooltip
 			placement="top"
-			:value="showTooltip"
-			manual
+			:visible="showTooltip"
 			:disabled="nodeCreatorStore.showScrim"
 			:popper-class="$style.tooltip"
 			:open-delay="700"
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/editor-ui/src/views/ChangePasswordView.vue
index 8975566c80db1..6ce3fb640920c 100644
--- a/packages/editor-ui/src/views/ChangePasswordView.vue
+++ b/packages/editor-ui/src/views/ChangePasswordView.vue
@@ -4,7 +4,7 @@
 		:form="config"
 		:formLoading="loading"
 		@submit="onSubmit"
-		@input="onInput"
+		@update="onInput"
 	/>
 </template>
 
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 4dc370456f023..f194740812f08 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -23,13 +23,13 @@
 					class="mb-3xs"
 				/>
 				<n8n-select
-					:value="filters.type"
+					:modelValue="filters.type"
 					size="medium"
 					multiple
 					filterable
 					ref="typeInput"
 					:class="$style['type-input']"
-					@input="setKeyValue('type', $event)"
+					@update:modelValue="setKeyValue('type', $event)"
 				>
 					<n8n-option
 						v-for="credentialType in allCredentialTypes"
@@ -51,7 +51,6 @@ import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import CredentialCard from '@/components/CredentialCard.vue';
 import type { ICredentialType } from 'n8n-workflow';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '@/constants';
-import type Vue from 'vue';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
@@ -59,7 +58,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 
-type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
+type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
 
 export default defineComponent({
 	name: 'CredentialsView',
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index f86b6a6229f93..f6e6162f407a6 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -41,49 +41,45 @@
 						@hook:mounted="canvasStore.setRecenteredCanvasAddButtonPosition"
 						data-test-id="canvas-add-button"
 					/>
-					<template v-for="nodeData in nodes">
-						<node
-							v-if="nodeData.type !== STICKY_NODE_TYPE"
-							@duplicateNode="duplicateNode"
-							@deselectAllNodes="deselectAllNodes"
-							@deselectNode="nodeDeselectedByName"
-							@nodeSelected="nodeSelectedByName"
-							@removeNode="(name) => removeNode(name, true)"
-							@runWorkflow="onRunNode"
-							@moved="onNodeMoved"
-							@run="onNodeRun"
-							:key="`${nodeData.id}_node`"
-							:name="nodeData.name"
-							:isReadOnly="isReadOnlyRoute || readOnlyEnv"
-							:instance="instance"
-							:isActive="!!activeNode && activeNode.name === nodeData.name"
-							:hideActions="pullConnActive"
-							:isProductionExecutionPreview="isProductionExecutionPreview"
-						>
-							<template #custom-tooltip>
-								<span
-									v-text="
-										$locale.baseText('nodeView.placeholderNode.addTriggerNodeBeforeExecuting')
-									"
-								/>
-							</template>
-						</node>
-						<sticky
-							v-else
-							@deselectAllNodes="deselectAllNodes"
-							@deselectNode="nodeDeselectedByName"
-							@nodeSelected="nodeSelectedByName"
-							@removeNode="(name) => removeNode(name, true)"
-							:key="`${nodeData.id}_sticky`"
-							:name="nodeData.name"
-							:isReadOnly="isReadOnlyRoute || readOnlyEnv"
-							:instance="instance"
-							:isActive="!!activeNode && activeNode.name === nodeData.name"
-							:nodeViewScale="nodeViewScale"
-							:gridSize="GRID_SIZE"
-							:hideActions="pullConnActive"
-						/>
-					</template>
+					<node
+						v-for="nodeData in nodesToRender"
+						@duplicateNode="duplicateNode"
+						@deselectAllNodes="deselectAllNodes"
+						@deselectNode="nodeDeselectedByName"
+						@nodeSelected="nodeSelectedByName"
+						@removeNode="(name) => removeNode(name, true)"
+						@runWorkflow="onRunNode"
+						@moved="onNodeMoved"
+						@run="onNodeRun"
+						:key="`${nodeData.id}_node`"
+						:name="nodeData.name"
+						:isReadOnly="isReadOnlyRoute || readOnlyEnv"
+						:instance="instance"
+						:isActive="!!activeNode && activeNode.name === nodeData.name"
+						:hideActions="pullConnActive"
+						:isProductionExecutionPreview="isProductionExecutionPreview"
+					>
+						<template #custom-tooltip>
+							<span
+								v-text="$locale.baseText('nodeView.placeholderNode.addTriggerNodeBeforeExecuting')"
+							/>
+						</template>
+					</node>
+					<sticky
+						v-for="stickyData in stickiesToRender"
+						@deselectAllNodes="deselectAllNodes"
+						@deselectNode="nodeDeselectedByName"
+						@nodeSelected="nodeSelectedByName"
+						@removeNode="(name) => removeNode(name, true)"
+						:key="`${stickyData.id}_sticky`"
+						:name="stickyData.name"
+						:isReadOnly="isReadOnlyRoute || readOnlyEnv"
+						:instance="instance"
+						:isActive="!!activeNode && activeNode.name === stickyData.name"
+						:nodeViewScale="nodeViewScale"
+						:gridSize="GRID_SIZE"
+						:hideActions="pullConnActive"
+					/>
 				</div>
 			</div>
 			<node-details-view
@@ -94,14 +90,18 @@
 				@stopExecution="stopExecution"
 				@saveKeyboardShortcut="onSaveKeyboardShortcut"
 			/>
-			<node-creation
-				v-if="!isReadOnlyRoute && !readOnlyEnv"
-				:create-node-active="createNodeActive"
-				:node-view-scale="nodeViewScale"
-				@toggleNodeCreator="onToggleNodeCreator"
-				@addNode="onAddNode"
-			/>
-			<canvas-controls />
+			<Suspense>
+				<NodeCreation
+					v-if="!isReadOnlyRoute && !readOnlyEnv"
+					:create-node-active="createNodeActive"
+					:node-view-scale="nodeViewScale"
+					@toggleNodeCreator="onToggleNodeCreator"
+					@addNode="onAddNode"
+				/>
+			</Suspense>
+			<Suspense>
+				<CanvasControls />
+			</Suspense>
 			<div class="workflow-execute-wrapper" v-if="!isReadOnlyRoute && !readOnlyEnv">
 				<span
 					@mouseenter="showTriggerMissingToltip(true)"
@@ -168,7 +168,7 @@
 </template>
 
 <script lang="ts">
-import Vue, { defineComponent } from 'vue';
+import { defineAsyncComponent, defineComponent, nextTick } from 'vue';
 import { mapStores } from 'pinia';
 
 import type {
@@ -185,7 +185,7 @@ import {
 	EVENT_CONNECTION_MOVED,
 	INTERCEPT_BEFORE_DROP,
 } from '@jsplumb/core';
-import type { MessageBoxInputData } from 'element-ui/types/message-box';
+import type { MessageBoxInputData } from 'element-plus';
 
 import {
 	FIRST_ONBOARDING_PROMPT_TIMEOUT,
@@ -315,7 +315,7 @@ import {
 	N8nPlusEndpointType,
 	EVENT_PLUS_ENDPOINT_CLICK,
 } from '@/plugins/endpoints/N8nPlusEndpointType';
-import type { ElNotificationComponent } from 'element-ui/types/notification';
+import type { ElNotification } from 'element-plus';
 import { sourceControlEventBus } from '@/event-bus/source-control';
 
 interface AddNodeOptions {
@@ -323,8 +323,8 @@ interface AddNodeOptions {
 	dragAndDrop?: boolean;
 }
 
-const NodeCreation = async () => import('@/components/Node/NodeCreation.vue');
-const CanvasControls = async () => import('@/components/CanvasControls.vue');
+const NodeCreation = defineAsyncComponent(async () => import('@/components/Node/NodeCreation.vue'));
+const CanvasControls = defineAsyncComponent(async () => import('@/components/CanvasControls.vue'));
 
 export default defineComponent({
 	name: 'NodeView',
@@ -346,14 +346,17 @@ export default defineComponent({
 		CanvasControls,
 	},
 	setup(props) {
+		const locale = useI18n();
+
 		return {
+			locale,
 			...useCanvasMouseSelect(),
 			...useGlobalLinkActions(),
 			...useTitleChange(),
 			...useToast(),
 			...useMessage(),
 			...useUniqueNodeName(),
-			...useI18n(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...workflowRun.setup?.(props),
 		};
 	},
@@ -372,6 +375,7 @@ export default defineComponent({
 				from.params.name !== to.params.name &&
 				// Both 'new' and __EMPTY__ are new workflow names, so ignore them when detecting if wf changed
 				!(from.params.name === 'new' && this.currentWorkflow === PLACEHOLDER_EMPTY_WORKFLOW_ID) &&
+				!(from.name === VIEWS.NEW_WORKFLOW) &&
 				// Also ignore if workflow id changes when saving new workflow
 				to.params.action !== 'workflowSave';
 			const isOpeningTemplate = to.name === VIEWS.TEMPLATE_IMPORT;
@@ -453,7 +457,7 @@ export default defineComponent({
 				if (from.name === VIEWS.NEW_WORKFLOW) {
 					// Replace the current route with the new workflow route
 					// before navigating to the new route when saving new workflow.
-					this.$router.replace(
+					await this.$router.replace(
 						{ name: VIEWS.WORKFLOW, params: { name: this.currentWorkflow } },
 						() => {
 							// We can't use next() here since vue-router
@@ -494,7 +498,7 @@ export default defineComponent({
 			useHistoryStore,
 		),
 		nativelyNumberSuffixedDefaults(): string[] {
-			return this.rootStore.nativelyNumberSuffixedDefaults;
+			return this.nodeTypesStore.nativelyNumberSuffixedDefaults;
 		},
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
@@ -519,6 +523,12 @@ export default defineComponent({
 		nodes(): INodeUi[] {
 			return this.workflowsStore.allNodes;
 		},
+		nodesToRender(): INodeUi[] {
+			return this.workflowsStore.allNodes.filter((node) => node.type !== STICKY_NODE_TYPE);
+		},
+		stickiesToRender(): INodeUi[] {
+			return this.workflowsStore.allNodes.filter((node) => node.type === STICKY_NODE_TYPE);
+		},
 		runButtonText(): string {
 			if (!this.workflowRunning) {
 				return this.$locale.baseText('nodeView.runButtonText.executeWorkflow');
@@ -624,7 +634,7 @@ export default defineComponent({
 			isProductionExecutionPreview: false,
 			enterTimer: undefined as undefined | ReturnType<typeof setTimeout>,
 			exitTimer: undefined as undefined | ReturnType<typeof setTimeout>,
-			readOnlyNotification: null as null | ElNotificationComponent,
+			readOnlyNotification: null as null | ElNotification,
 			// jsplumb automatically deletes all loose connections which is in turn recorded
 			// in undo history as a user action.
 			// This should prevent automatically removed connections from populating undo stack
@@ -632,14 +642,6 @@ export default defineComponent({
 			NODE_CREATOR_OPEN_SOURCES,
 		};
 	},
-	beforeDestroy() {
-		this.resetWorkspace();
-		// Make sure the event listeners get removed again else we
-		// could add up with them registered multiple times
-		document.removeEventListener('keydown', this.keyDown);
-		document.removeEventListener('keyup', this.keyUp);
-		this.unregisterCustomAction('showNodeCreator');
-	},
 	methods: {
 		editAllowedCheck(): boolean {
 			if (this.readOnlyNotification?.visible) {
@@ -779,10 +781,9 @@ export default defineComponent({
 				deepCopy(data.workflowData.nodes),
 				deepCopy(data.workflowData.connections),
 			);
-			this.$nextTick(() => {
-				this.canvasStore.zoomToFit();
-				this.uiStore.stateIsDirty = false;
-			});
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
+			this.uiStore.stateIsDirty = false;
 			void this.$externalHooks().run('execution.open', {
 				workflowId: data.workflowData.id,
 				workflowName: data.workflowData.name,
@@ -850,9 +851,8 @@ export default defineComponent({
 				this.workflowsStore.setWorkflowPinData(data.workflow.pinData);
 			}
 
-			this.$nextTick(() => {
-				this.canvasStore.zoomToFit();
-			});
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
 		},
 		async openWorkflowTemplate(templateId: string) {
 			this.startLoading();
@@ -876,7 +876,7 @@ export default defineComponent({
 				}
 			} catch (error) {
 				this.showError(error, this.$locale.baseText('nodeView.couldntImportWorkflow'));
-				void this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
+				await this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
 				return;
 			}
 
@@ -889,14 +889,13 @@ export default defineComponent({
 			});
 
 			this.blankRedirect = true;
-			void this.$router.replace({ name: VIEWS.NEW_WORKFLOW, query: { templateId } });
+			await this.$router.replace({ name: VIEWS.NEW_WORKFLOW, query: { templateId } });
 
 			await this.addNodes(data.workflow.nodes, data.workflow.connections);
 			this.workflowData = (await this.workflowsStore.getNewWorkflowData(data.name)) || {};
-			this.$nextTick(() => {
-				this.canvasStore.zoomToFit();
-				this.uiStore.stateIsDirty = true;
-			});
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
+			this.uiStore.stateIsDirty = true;
 
 			void this.$externalHooks().run('template.open', {
 				templateId,
@@ -1938,7 +1937,7 @@ export default defineComponent({
 				newNodeData.position = NodeViewUtils.getNewNodePosition(this.nodes, position);
 			}
 
-			const localizedName = this.localizeNodeName(newNodeData.name, newNodeData.type);
+			const localizedName = this.locale.localizeNodeName(newNodeData.name, newNodeData.type);
 
 			newNodeData.name = this.uniqueNodeName(localizedName);
 
@@ -2074,7 +2073,7 @@ export default defineComponent({
 
 			// If a node is last selected then connect between the active and its child ones
 			if (lastSelectedNode) {
-				await Vue.nextTick();
+				await this.$nextTick();
 
 				if (lastSelectedConnection && lastSelectedConnection.__meta) {
 					this.__deleteJSPlumbConnection(lastSelectedConnection, trackHistory);
@@ -2749,7 +2748,7 @@ export default defineComponent({
 				const newNodeData = deepCopy(this.getNodeDataToSave(node));
 				newNodeData.id = uuid();
 
-				const localizedName = this.localizeNodeName(newNodeData.name, newNodeData.type);
+				const localizedName = this.locale.localizeNodeName(newNodeData.name, newNodeData.type);
 
 				newNodeData.name = this.uniqueNodeName(localizedName);
 
@@ -3047,7 +3046,7 @@ export default defineComponent({
 				}
 			}
 
-			setTimeout(() => {
+			void nextTick(() => {
 				// Suspend drawing
 				this.instance?.setSuspendDrawing(true);
 				(this.instance?.endpointsByElement[node.id] || [])
@@ -3069,7 +3068,8 @@ export default defineComponent({
 				if (trackHistory) {
 					this.historyStore.pushCommandToUndo(new RemoveNodeCommand(node));
 				}
-			}, 0); // allow other events to finish like drag stop
+			}); // allow other events to finish like drag stop
+
 			if (trackHistory && trackBulk) {
 				const recordingTimeout = waitForNewConnection ? 100 : 0;
 				setTimeout(() => {
@@ -3099,7 +3099,7 @@ export default defineComponent({
 				);
 
 				// Wait till it had time to display
-				await Vue.nextTick();
+				await this.$nextTick();
 
 				// Get the input and select the text in it
 				const nameInput = document.querySelector('.rename-prompt .el-input__inner') as
@@ -3153,7 +3153,7 @@ export default defineComponent({
 			this.workflowsStore.removeAllNodes({ removePinData: false, setStateDirty: true });
 
 			// Wait a tick that the old nodes had time to get removed
-			await Vue.nextTick();
+			await this.$nextTick();
 
 			// Add the new updated nodes
 			await this.addNodes(Object.values(workflow.nodes), workflow.connectionsBySourceNode, false);
@@ -3311,7 +3311,7 @@ export default defineComponent({
 			});
 
 			// Wait for the node to be rendered
-			await Vue.nextTick();
+			await this.$nextTick();
 
 			// Suspend drawing
 			this.instance?.setSuspendDrawing(true);
@@ -3401,7 +3401,7 @@ export default defineComponent({
 
 				oldName = node.name;
 
-				const localized = this.localizeNodeName(node.name, node.type);
+				const localized = this.locale.localizeNodeName(node.name, node.type);
 
 				newName = this.uniqueNodeName(localized, newNodeNames);
 
@@ -3558,14 +3558,11 @@ export default defineComponent({
 			// Reset nodes
 			this.deleteEveryEndpoint();
 
+			// Make sure that if there is a waiting test-webhook that it gets removed
 			if (this.executionWaitingForWebhook) {
-				// Make sure that if there is a waiting test-webhook that
-				// it gets removed
-				this.restApi()
-					.removeTestWebhook(this.workflowsStore.workflowId)
-					.catch(() => {
-						// Ignore all errors
-					});
+				try {
+					void this.workflowsStore.removeTestWebhook(this.workflowsStore.workflowId);
+				} catch (error) {}
 			}
 			this.workflowsStore.resetState();
 			this.uiStore.removeActiveAction('workflowRunning');
@@ -3764,14 +3761,10 @@ export default defineComponent({
 				// exist
 				const actionWatcher = this.workflowsStore.$onAction(({ name, after, args }) => {
 					if (name === 'addNode' && args[0].type === nodeTypeName) {
-						after(() => {
+						after(async () => {
 							const lastAddedNode = this.nodes[this.nodes.length - 1];
 							const previouslyAddedNode = this.nodes[this.nodes.length - 2];
 
-							this.$nextTick(() =>
-								this.connectTwoNodes(previouslyAddedNode.name, 0, lastAddedNode.name, 0),
-							);
-
 							// Position the added node to the right side of the previously added one
 							lastAddedNode.position = [
 								previouslyAddedNode.position[0] +
@@ -3779,6 +3772,9 @@ export default defineComponent({
 									NodeViewUtils.GRID_SIZE,
 								previouslyAddedNode.position[1],
 							];
+							await this.$nextTick();
+							this.connectTwoNodes(previouslyAddedNode.name, 0, lastAddedNode.name, 0);
+
 							actionWatcher();
 						});
 					}
@@ -3845,7 +3841,7 @@ export default defineComponent({
 				this.readOnlyEnv &&
 				[VIEWS.NEW_WORKFLOW, VIEWS.TEMPLATE_IMPORT].includes(this.$route.name)
 			) {
-				this.$nextTick(async () => {
+				void this.$nextTick(async () => {
 					this.resetWorkspace();
 					this.uiStore.stateIsDirty = false;
 
@@ -4025,7 +4021,13 @@ export default defineComponent({
 		dataPinningEventBus.off('unpin-data', this.removePinDataConnections);
 		nodeViewEventBus.off('saveWorkflow', this.saveCurrentWorkflowExternal);
 	},
-	destroyed() {
+	beforeUnmount() {
+		// Make sure the event listeners get removed again else we
+		// could add up with them registered multiple times
+		document.removeEventListener('keydown', this.keyDown);
+		document.removeEventListener('keyup', this.keyUp);
+		this.unregisterCustomAction('showNodeCreator');
+
 		this.resetWorkspace();
 		this.instance.unbind();
 		this.instance.destroy();
diff --git a/packages/editor-ui/src/views/SamlOnboarding.vue b/packages/editor-ui/src/views/SamlOnboarding.vue
index 9b5e83faf54db..af6b11ac647ac 100644
--- a/packages/editor-ui/src/views/SamlOnboarding.vue
+++ b/packages/editor-ui/src/views/SamlOnboarding.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
-import { useRouter } from 'vue-router/composables';
-import { Notification } from 'element-ui';
+import { useRouter } from 'vue-router';
+import { ElNotification as Notification } from 'element-plus';
 import type { IFormBoxConfig } from 'n8n-design-system';
 import AuthView from '@/views/AuthView.vue';
 import { i18n as locale } from '@/plugins/i18n';
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index ed863a2a30002..1d36b09d50932 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -12,7 +12,7 @@
 		<div v-if="apiKey">
 			<p class="mb-s">
 				<n8n-info-tip :bold="false">
-					<i18n path="settings.api.view.info" tag="span">
+					<i18n-t keypath="settings.api.view.info" tag="span">
 						<template #apiAction>
 							<a
 								href="https://docs.n8n.io/api"
@@ -27,7 +27,7 @@
 								v-text="$locale.baseText('settings.api.view.info.webhook')"
 							/>
 						</template>
-					</i18n>
+					</i18n-t>
 				</n8n-info-tip>
 			</p>
 			<n8n-card class="mb-4xs" :class="$style.card">
@@ -53,6 +53,7 @@
 						$locale.baseText(`settings.api.view.${swaggerUIEnabled ? 'tryapi' : 'more-details'}`)
 					}}
 				</n8n-text>
+				{{ ' ' }}
 				<n8n-link :to="apiDocsURL" :newWindow="true" size="small">
 					{{
 						$locale.baseText(
@@ -67,7 +68,7 @@
 			:heading="$locale.baseText('settings.api.trial.upgradePlan.title')"
 			:description="$locale.baseText('settings.api.trial.upgradePlan.description')"
 			:buttonText="$locale.baseText('settings.api.trial.upgradePlan.cta')"
-			@click="onUpgrade"
+			@click:button="onUpgrade"
 		/>
 		<n8n-action-box
 			v-else-if="mounted && !isLoadingCloudPlans"
@@ -77,7 +78,7 @@
 				)
 			"
 			:description="$locale.baseText('settings.api.create.description')"
-			@click="createApiKey"
+			@click:button="createApiKey"
 		/>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/views/SettingsAuditLogs.vue b/packages/editor-ui/src/views/SettingsAuditLogs.vue
index e7d0caf90c9fa..fa9332b965a87 100644
--- a/packages/editor-ui/src/views/SettingsAuditLogs.vue
+++ b/packages/editor-ui/src/views/SettingsAuditLogs.vue
@@ -2,7 +2,7 @@
 import { useI18n } from '@/composables';
 import { useUIStore, useAuditLogsStore } from '@/stores';
 
-const { i18n: locale } = useI18n();
+const locale = useI18n();
 const uiStore = useUIStore();
 const auditLogsStore = useAuditLogsStore();
 
@@ -26,7 +26,7 @@ const goToUpgrade = () => {
 			:class="$style.actionBox"
 			:description="locale.baseText('settings.auditLogs.actionBox.description')"
 			:buttonText="locale.baseText('settings.auditLogs.actionBox.buttonText')"
-			@click="goToUpgrade"
+			@click:button="goToUpgrade"
 		>
 			<template #heading>
 				<span>{{ locale.baseText('settings.auditLogs.actionBox.title') }}</span>
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index 00f50df77ffa1..ea94c52bb96db 100644
--- a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
+++ b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
@@ -38,7 +38,7 @@
 				:buttonText="getEmptyStateButtonText"
 				:calloutText="actionBoxConfig.calloutText"
 				:calloutTheme="actionBoxConfig.calloutTheme"
-				@click="onClickEmptyStateButton"
+				@click:button="onClickEmptyStateButton"
 			/>
 		</div>
 		<div :class="$style.cardsContainer" v-else>
@@ -79,6 +79,7 @@ export default defineComponent({
 	setup(props) {
 		return {
 			...useToast(),
+			// eslint-disable-next-line @typescript-eslint/no-misused-promises
 			...pushConnection.setup?.(props),
 		};
 	},
@@ -92,7 +93,7 @@ export default defineComponent({
 		this.pushConnect();
 
 		try {
-			this.$data.loading = true;
+			this.loading = true;
 			await this.communityNodesStore.fetchInstalledPackages();
 
 			const installedPackages: PublicInstalledPackage[] =
@@ -126,15 +127,15 @@ export default defineComponent({
 				this.$locale.baseText('settings.communityNodes.fetchError.message'),
 			);
 		} finally {
-			this.$data.loading = false;
+			this.loading = false;
 		}
 		try {
 			await this.communityNodesStore.fetchAvailableCommunityPackageCount();
 		} finally {
-			this.$data.loading = false;
+			this.loading = false;
 		}
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		this.pushDisconnect();
 	},
 	computed: {
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index cc2568e57f004..674e03a9394a6 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -12,7 +12,7 @@
 		<n8n-action-box
 			:description="$locale.baseText('settings.ldap.disabled.description')"
 			:buttonText="$locale.baseText('settings.ldap.disabled.buttonText')"
-			@click="goToUpgrade"
+			@click:button="goToUpgrade"
 		>
 			<template #heading>
 				<span>{{ $locale.baseText('settings.ldap.disabled.title') }}</span>
@@ -28,9 +28,7 @@
 			</div>
 			<div :class="$style.docsInfoTip">
 				<n8n-info-tip theme="info" type="note">
-					<template>
-						<span v-html="$locale.baseText('settings.ldap.infoTip')"></span>
-					</template>
+					<span v-html="$locale.baseText('settings.ldap.infoTip')"></span>
 				</n8n-info-tip>
 			</div>
 			<div :class="$style.settingsForm">
@@ -41,7 +39,7 @@
 					:eventBus="formBus"
 					:columnView="true"
 					verticalSpacing="l"
-					@input="onInput"
+					@update="onInput"
 					@ready="onReadyToSubmit"
 					@submit="onSubmit"
 				/>
@@ -157,19 +155,20 @@ import type {
 import { MODAL_CONFIRM } from '@/constants';
 
 import humanizeDuration from 'humanize-duration';
-import type { rowCallbackParams, cellCallbackParams } from 'element-ui/types/table';
+import { ElTable, ElTableColumn } from 'element-plus';
 import { capitalizeFirstLetter } from '@/utils';
-import InfiniteLoading from 'vue-infinite-loading';
+import InfiniteLoading from 'v3-infinite-loading';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 import type { N8nFormInputs } from 'n8n-design-system';
+import type { CellStyle } from 'element-plus';
 
 type N8nFormInputsRef = InstanceType<typeof N8nFormInputs>;
 
-type tableRow = {
+type TableRow = {
 	status: string;
 	startAt: string;
 	endedAt: string;
@@ -177,14 +176,12 @@ type tableRow = {
 	runMode: string;
 };
 
-type rowType = rowCallbackParams & tableRow;
-
-type cellType = cellCallbackParams & { property: keyof tableRow };
-
 export default defineComponent({
 	name: 'SettingsLdapView',
 	components: {
 		InfiniteLoading,
+		ElTable,
+		ElTableColumn,
 	},
 	setup() {
 		return {
@@ -227,7 +224,7 @@ export default defineComponent({
 		goToUpgrade() {
 			this.uiStore.goToUpgrade('ldap', 'upgrade-ldap');
 		},
-		cellClassStyle({ row, column }: { row: rowType; column: cellType }) {
+		cellClassStyle({ row, column }: CellStyle<TableRow>) {
 			if (column.property === 'status') {
 				if (row.status === 'Success') {
 					return { color: 'green' };
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index 69ccf2eb21a41..c8841b170a787 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -14,9 +14,7 @@
 		<template v-if="isLicensed">
 			<div class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<template>
-						<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
-					</template>
+					<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<template v-if="storeHasItems()">
@@ -42,32 +40,28 @@
 					</n8n-button>
 				</div>
 			</template>
-			<template v-else>
-				<div data-test-id="action-box-licensed">
-					<n8n-action-box
-						:buttonText="$locale.baseText(`settings.log-streaming.add`)"
-						@click="addDestination"
-					>
-						<template #heading>
-							<span v-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
-						</template>
-					</n8n-action-box>
-				</div>
-			</template>
+			<div v-else data-test-id="action-box-licensed">
+				<n8n-action-box
+					:buttonText="$locale.baseText(`settings.log-streaming.add`)"
+					@click:button="addDestination"
+				>
+					<template #heading>
+						<span v-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
+					</template>
+				</n8n-action-box>
+			</div>
 		</template>
 		<template v-else>
 			<div v-if="$locale.baseText('settings.log-streaming.infoText')" class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<template>
-						<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
-					</template>
+					<span v-html="$locale.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<div data-test-id="action-box-unlicensed">
 				<n8n-action-box
 					:description="$locale.baseText('settings.log-streaming.actionBox.description')"
 					:buttonText="$locale.baseText('settings.log-streaming.actionBox.button')"
-					@click="goToUpgrade"
+					@click:button="goToUpgrade"
 				>
 					<template #heading>
 						<span v-html="$locale.baseText('settings.log-streaming.actionBox.title')" />
@@ -79,7 +73,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent, nextTick } from 'vue';
 import { mapStores } from 'pinia';
 import { v4 as uuid } from 'uuid';
 import { useWorkflowsStore } from '../stores/workflows.store';
@@ -92,7 +86,7 @@ import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '../constants';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'SettingsLogStreamingView',
@@ -136,7 +130,7 @@ export default defineComponent({
 		// listen to modal closing and remove nodes from store
 		this.eventBus.on('closing', this.onBusClosing);
 	},
-	destroyed() {
+	beforeUnmount() {
 		this.eventBus.off('destinationWasSaved', this.onDestinationWasSaved);
 		this.eventBus.off('remove', this.onRemove);
 		this.eventBus.off('closing', this.onBusClosing);
@@ -203,6 +197,7 @@ export default defineComponent({
 			const newDestination = deepCopy(defaultMessageEventBusDestinationOptions);
 			newDestination.id = uuid();
 			this.logStreamingStore.addDestination(newDestination);
+			await nextTick();
 			this.uiStore.openModalWithData({
 				name: LOG_STREAM_MODAL_KEY,
 				data: {
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index d86ceede04444..950c609ddcdaf 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -2,7 +2,7 @@
 	<div :class="$style.container" data-test-id="personal-settings-container">
 		<div :class="$style.header">
 			<n8n-heading size="2xlarge">{{
-				$locale.baseText('settings.personal.personalSettings')
+				i18n.baseText('settings.personal.personalSettings')
 			}}</n8n-heading>
 			<div :class="$style.user">
 				<span :class="$style.username" data-test-id="current-user-name">
@@ -18,7 +18,7 @@
 		<div>
 			<div :class="$style.sectionHeader">
 				<n8n-heading size="large">{{
-					$locale.baseText('settings.personal.basicInformation')
+					i18n.baseText('settings.personal.basicInformation')
 				}}</n8n-heading>
 			</div>
 			<div data-test-id="personal-data-form">
@@ -26,7 +26,7 @@
 					v-if="formInputs"
 					:inputs="formInputs"
 					:eventBus="formBus"
-					@input="onInput"
+					@update="onInput"
 					@ready="onReadyToSubmit"
 					@submit="onSubmit"
 				/>
@@ -34,12 +34,12 @@
 		</div>
 		<div v-if="!signInWithLdap && !signInWithSaml">
 			<div :class="$style.sectionHeader">
-				<n8n-heading size="large">{{ $locale.baseText('settings.personal.security') }}</n8n-heading>
+				<n8n-heading size="large">{{ i18n.baseText('settings.personal.security') }}</n8n-heading>
 			</div>
 			<div>
-				<n8n-input-label :label="$locale.baseText('auth.password')">
+				<n8n-input-label :label="i18n.baseText('auth.password')">
 					<n8n-link @click="openPasswordModal" data-test-id="change-password-link">{{
-						$locale.baseText('auth.changePassword')
+						i18n.baseText('auth.changePassword')
 					}}</n8n-link>
 				</n8n-input-label>
 			</div>
@@ -47,7 +47,7 @@
 		<div>
 			<n8n-button
 				float="right"
-				:label="$locale.baseText('settings.personal.save')"
+				:label="i18n.baseText('settings.personal.save')"
 				size="large"
 				:disabled="!hasAnyChanges || !readyToSubmit"
 				data-test-id="save-settings-button"
@@ -58,7 +58,7 @@
 </template>
 
 <script lang="ts">
-import { useToast } from '@/composables';
+import { useI18n, useToast } from '@/composables';
 import { CHANGE_PASSWORD_MODAL_KEY } from '@/constants';
 import type { IFormInputs, IUser } from '@/Interface';
 import { useUIStore } from '@/stores/ui.store';
@@ -66,12 +66,15 @@ import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
 
 export default defineComponent({
 	name: 'SettingsPersonalView',
 	setup() {
+		const i18n = useI18n();
+
 		return {
+			i18n,
 			...useToast(),
 		};
 	},
@@ -89,7 +92,7 @@ export default defineComponent({
 				name: 'firstName',
 				initialValue: this.currentUser?.firstName,
 				properties: {
-					label: this.$locale.baseText('auth.firstName'),
+					label: this.i18n.baseText('auth.firstName'),
 					maxlength: 32,
 					required: true,
 					autocomplete: 'given-name',
@@ -101,7 +104,7 @@ export default defineComponent({
 				name: 'lastName',
 				initialValue: this.currentUser?.lastName,
 				properties: {
-					label: this.$locale.baseText('auth.lastName'),
+					label: this.i18n.baseText('auth.lastName'),
 					maxlength: 32,
 					required: true,
 					autocomplete: 'family-name',
@@ -113,7 +116,7 @@ export default defineComponent({
 				name: 'email',
 				initialValue: this.currentUser?.email,
 				properties: {
-					label: this.$locale.baseText('auth.email'),
+					label: this.i18n.baseText('auth.email'),
 					type: 'email',
 					required: true,
 					validationRules: [{ name: 'VALID_EMAIL' }],
@@ -160,13 +163,13 @@ export default defineComponent({
 					email: form.email,
 				});
 				this.showToast({
-					title: this.$locale.baseText('settings.personal.personalSettingsUpdated'),
+					title: this.i18n.baseText('settings.personal.personalSettingsUpdated'),
 					message: '',
 					type: 'success',
 				});
 				this.hasAnyChanges = false;
 			} catch (e) {
-				this.showError(e, this.$locale.baseText('settings.personal.personalSettingsUpdatedError'));
+				this.showError(e, this.i18n.baseText('settings.personal.personalSettingsUpdatedError'));
 			}
 		},
 		onSaveClick() {
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
index 21b1faf890adb..842ba2c47905d 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -6,7 +6,7 @@ import { useUIStore, useSourceControlStore } from '@/stores';
 import { useToast, useMessage, useLoadingService, useI18n } from '@/composables';
 import CopyInput from '@/components/CopyInput.vue';
 
-const { i18n: locale } = useI18n();
+const locale = useI18n();
 const sourceControlStore = useSourceControlStore();
 const uiStore = useUIStore();
 const toast = useToast();
@@ -177,13 +177,13 @@ const refreshBranches = async () => {
 			data-test-id="source-control-content-licensed"
 		>
 			<n8n-callout theme="secondary" icon="info-circle" class="mt-2xl mb-l">
-				<i18n path="settings.sourceControl.description">
+				<i18n-t keypath="settings.sourceControl.description" tag="span">
 					<template #link>
 						<a :href="locale.baseText('settings.sourceControl.docs.url')" target="_blank">
 							{{ locale.baseText('settings.sourceControl.description.link') }}
 						</a>
 					</template>
-				</i18n>
+				</i18n-t>
 			</n8n-callout>
 			<n8n-heading size="xlarge" tag="h2" class="mb-s">{{
 				locale.baseText('settings.sourceControl.gitConfig')
@@ -236,7 +236,7 @@ const refreshBranches = async () => {
 					</n8n-button>
 				</div>
 				<n8n-notice type="info" class="mt-s">
-					<i18n path="settings.sourceControl.sshKeyDescription">
+					<i18n-t keypath="settings.sourceControl.sshKeyDescription" tag="span">
 						<template #link>
 							<a
 								:href="locale.baseText('settings.sourceControl.docs.setup.ssh.url')"
@@ -244,7 +244,7 @@ const refreshBranches = async () => {
 								>{{ locale.baseText('settings.sourceControl.sshKeyDescriptionLink') }}</a
 							>
 						</template>
-					</i18n>
+					</i18n-t>
 				</n8n-notice>
 			</div>
 			<n8n-button
@@ -274,9 +274,9 @@ const refreshBranches = async () => {
 							validateOnBlur
 							:validationRules="branchNameValidationRules"
 							:options="branchNameOptions"
-							:value="sourceControlStore.preferences.branchName"
+							:modelValue="sourceControlStore.preferences.branchName"
 							@validate="(value) => onValidate('branchName', value)"
-							@input="onSelect"
+							@update:modelValue="onSelect"
 						/>
 						<n8n-tooltip placement="top">
 							<template #content>
@@ -299,11 +299,11 @@ const refreshBranches = async () => {
 						v-model="sourceControlStore.preferences.branchReadOnly"
 						:class="$style.readOnly"
 					>
-						<i18n path="settings.sourceControl.protected">
+						<i18n-t keypath="settings.sourceControl.protected" tag="span">
 							<template #bold>
 								<strong>{{ locale.baseText('settings.sourceControl.protected.bold') }}</strong>
 							</template>
-						</i18n>
+						</i18n-t>
 					</n8n-checkbox>
 				</div>
 				<div :class="$style.group">
@@ -329,7 +329,7 @@ const refreshBranches = async () => {
 			:class="$style.actionBox"
 			:description="locale.baseText('settings.sourceControl.actionBox.description')"
 			:buttonText="locale.baseText('settings.sourceControl.actionBox.buttonText')"
-			@click="goToUpgrade"
+			@click:button="goToUpgrade"
 		>
 			<template #heading>
 				<span>{{ locale.baseText('settings.sourceControl.actionBox.title') }}</span>
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index 7a7208b8f6330..e67993e85d7c8 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -10,7 +10,7 @@ const IdentityProviderSettingsType = {
 	XML: 'xml',
 };
 
-const { i18n } = useI18n();
+const i18n = useI18n();
 const ssoStore = useSSOStore();
 const uiStore = useUIStore();
 const message = useMessage();
@@ -225,7 +225,7 @@ onMounted(async () => {
 			:class="$style.actionBox"
 			:description="i18n.baseText('settings.sso.actionBox.description')"
 			:buttonText="i18n.baseText('settings.sso.actionBox.buttonText')"
-			@click="goToUpgrade"
+			@click:button="goToUpgrade"
 		>
 			<template #heading>
 				<span>{{ i18n.baseText('settings.sso.actionBox.title') }}</span>
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index 9e23492804f7e..08d191d7d506c 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -1,18 +1,19 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router/composables';
-import { Notification } from 'element-ui';
+import { useRoute, useRouter } from 'vue-router';
 import type { UsageTelemetry } from '@/stores/usage.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { telemetry } from '@/plugins/telemetry';
 import { i18n as locale } from '@/plugins/i18n';
 import { useUIStore } from '@/stores';
 import { N8N_PRICING_PAGE_URL } from '@/constants';
+import { useToast } from '@/composables';
 
 const usageStore = useUsageStore();
 const route = useRoute();
 const router = useRouter();
 const uiStore = useUIStore();
+const toast = useToast();
 
 const queryParamCallback = ref<string>(
 	`callback=${encodeURIComponent(`${window.location.origin}${window.location.pathname}`)}`,
@@ -26,7 +27,8 @@ const activationKey = ref('');
 const activationKeyInput = ref<HTMLInputElement | null>(null);
 
 const showActivationSuccess = () => {
-	Notification.success({
+	toast.showMessage({
+		type: 'success',
 		title: locale.baseText('settings.usageAndPlan.license.activation.success.title'),
 		message: locale.baseText('settings.usageAndPlan.license.activation.success.message', {
 			interpolate: {
@@ -36,16 +38,15 @@ const showActivationSuccess = () => {
 					: locale.baseText('settings.usageAndPlan.edition'),
 			},
 		}),
-		position: 'bottom-right',
 	});
 };
 
 const showActivationError = (error: Error) => {
-	Notification.error({
-		title: locale.baseText('settings.usageAndPlan.license.activation.error.title'),
-		message: error.message,
-		position: 'bottom-right',
-	});
+	toast.showError(
+		error,
+		locale.baseText('settings.usageAndPlan.license.activation.error.title'),
+		error.message,
+	);
 };
 
 const onLicenseActivation = async () => {
@@ -86,11 +87,7 @@ onMounted(async () => {
 		if (!error.name) {
 			error.name = locale.baseText('settings.usageAndPlan.error');
 		}
-		Notification.error({
-			title: error.name,
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, error.name, error.message);
 	}
 });
 
@@ -129,7 +126,7 @@ const openPricingPage = () => {
 </script>
 
 <template>
-	<div>
+	<div class="settings-usage-and-plan">
 		<n8n-heading size="2xlarge">{{ locale.baseText('settings.usageAndPlan.title') }}</n8n-heading>
 		<n8n-action-box
 			v-if="usageStore.isDesktop"
@@ -137,11 +134,11 @@ const openPricingPage = () => {
 			:heading="locale.baseText('settings.usageAndPlan.desktop.title')"
 			:description="locale.baseText('settings.usageAndPlan.desktop.description')"
 			:buttonText="locale.baseText('settings.usageAndPlan.button.plans')"
-			@click="openPricingPage"
+			@click:button="openPricingPage"
 		/>
 		<div v-if="!usageStore.isDesktop && !usageStore.isLoading">
 			<n8n-heading :class="$style.title" size="large">
-				<i18n path="settings.usageAndPlan.description">
+				<i18n-t keypath="settings.usageAndPlan.description" tag="span">
 					<template #name>{{ usageStore.planName }}</template>
 					<template #type>
 						<span v-if="usageStore.planId">{{
@@ -149,7 +146,7 @@ const openPricingPage = () => {
 						}}</span>
 						<span v-else>{{ locale.baseText('settings.usageAndPlan.edition') }}</span>
 					</template>
-				</i18n>
+				</i18n-t>
 			</n8n-heading>
 
 			<div :class="$style.quota">
@@ -163,7 +160,11 @@ const openPricingPage = () => {
 							:style="{ width: `${usageStore.executionPercentage}%` }"
 						></span>
 					</span>
-					<i18n :class="$style.count" path="settings.usageAndPlan.activeWorkflows.count">
+					<i18n-t
+						tag="span"
+						:class="$style.count"
+						keypath="settings.usageAndPlan.activeWorkflows.count"
+					>
 						<template #count>{{ usageStore.executionCount }}</template>
 						<template #limit>
 							<span v-if="usageStore.executionLimit < 0">{{
@@ -171,7 +172,7 @@ const openPricingPage = () => {
 							}}</span>
 							<span v-else>{{ usageStore.executionLimit }}</span>
 						</template>
-					</i18n>
+					</i18n-t>
 				</div>
 			</div>
 
@@ -206,22 +207,21 @@ const openPricingPage = () => {
 				top="0"
 				@closed="onDialogClosed"
 				@opened="onDialogOpened"
-				:visible.sync="activationKeyModal"
+				v-model="activationKeyModal"
 				:title="locale.baseText('settings.usageAndPlan.dialog.activation.title')"
 			>
 				<template #default>
 					<n8n-input
 						ref="activationKeyInput"
 						v-model="activationKey"
-						size="medium"
 						:placeholder="locale.baseText('settings.usageAndPlan.dialog.activation.label')"
 					/>
 				</template>
 				<template #footer>
-					<n8n-button @click="activationKeyModal = false" size="medium" type="secondary">
+					<n8n-button @click="activationKeyModal = false" type="secondary">
 						{{ locale.baseText('settings.usageAndPlan.dialog.activation.cancel') }}
 					</n8n-button>
-					<n8n-button @click="onLicenseActivation" size="medium">
+					<n8n-button @click="onLicenseActivation">
 						{{ locale.baseText('settings.usageAndPlan.dialog.activation.activate') }}
 					</n8n-button>
 				</template>
@@ -324,17 +324,19 @@ div[class*='info'] > span > span:last-child {
 </style>
 
 <style lang="scss" scoped>
-:deep(.el-dialog__wrapper) {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-
-	.el-dialog {
-		margin: 0;
-
-		.el-dialog__footer {
-			button {
-				margin-left: var(--spacing-xs);
+.settings-usage-and-plan {
+	:deep(.el-dialog__wrapper) {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.el-dialog {
+			margin: 0;
+
+			.el-dialog__footer {
+				button {
+					margin-left: var(--spacing-xs);
+				}
 			}
 		}
 	}
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index aad90e97859da..5b6a93da416d0 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -32,7 +32,7 @@
 				:buttonText="
 					$locale.baseText(uiStore.contextBasedTranslationKeys.users.settings.unavailable.button)
 				"
-				@click="goToUpgrade"
+				@click:button="goToUpgrade"
 			/>
 		</div>
 		<!-- If there's more than 1 user it means the account quota was more than 1 in the past. So we need to allow instance owner to be able to delete users and transfer workflows.
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/editor-ui/src/views/TemplatesSearchView.vue
index 060ecef2d3819..03423e6ce950e 100644
--- a/packages/editor-ui/src/views/TemplatesSearchView.vue
+++ b/packages/editor-ui/src/views/TemplatesSearchView.vue
@@ -32,9 +32,9 @@
 				<div :class="$style.search">
 					<template v-if="!isFixedListExperiment">
 						<n8n-input
-							:value="search"
+							:modelValue="search"
 							:placeholder="$locale.baseText('templates.searchPlaceholder')"
-							@input="onSearchInput"
+							@update:modelValue="onSearchInput"
 							@blur="trackSearch"
 							clearable
 						>
@@ -52,7 +52,6 @@
 									<span v-if="!loadingCollections" v-text="`(${collections.length})`" />
 								</n8n-heading>
 							</div>
-
 							<CollectionsCarousel
 								:collections="collections"
 								:loading="loadingCollections"
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 9e1f742f8a512..d6812991631c4 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -26,7 +26,7 @@ const environmentsStore = useEnvironmentsStore();
 const usersStore = useUsersStore();
 const uiStore = useUIStore();
 const telemetry = useTelemetry();
-const { i18n } = useI18n();
+const i18n = useI18n();
 const message = useMessage();
 const sourceControlStore = useSourceControlStore();
 let sourceControlStoreUnsubscribe = () => {};
@@ -228,6 +228,7 @@ onBeforeUnmount(() => {
 
 <template>
 	<ResourcesListLayout
+		class="variables-view"
 		ref="layoutRef"
 		resource-key="variables"
 		:disabled="!isFeatureEnabled"
@@ -275,7 +276,7 @@ onBeforeUnmount(() => {
 				"
 				:buttonText="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button)"
 				buttonType="secondary"
-				@click="goToUpgrade"
+				@click:button="goToUpgrade"
 			/>
 		</template>
 		<template v-if="!isFeatureEnabled || (isFeatureEnabled && !canCreateVariables)" #empty>
@@ -289,7 +290,7 @@ onBeforeUnmount(() => {
 				"
 				:buttonText="$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button)"
 				buttonType="secondary"
-				@click="goToUpgrade"
+				@click:button="goToUpgrade"
 			/>
 			<n8n-action-box
 				v-else-if="!canCreateVariables"
@@ -331,43 +332,45 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 @use 'n8n-design-system/css/common/var.scss';
 
-:deep(.datatable) {
-	table {
-		table-layout: fixed;
-	}
-
-	th,
-	td {
-		width: 25%;
-
-		@media screen and (max-width: var.$md) {
-			width: 33.33%;
+.variables-view {
+	:deep(.datatable) {
+		table {
+			table-layout: fixed;
 		}
 
-		&.variables-value-column,
-		&.variables-key-column,
-		&.variables-usage-column {
-			> div {
-				width: 100%;
-
-				> span {
-					max-width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					height: 18px;
-				}
+		th,
+		td {
+			width: 25%;
 
+			@media screen and (max-width: var.$md) {
+				width: 33.33%;
+			}
+
+			&.variables-value-column,
+			&.variables-key-column,
+			&.variables-usage-column {
 				> div {
 					width: 100%;
+
+					> span {
+						max-width: 100%;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						height: 18px;
+					}
+
+					> div {
+						width: 100%;
+					}
 				}
 			}
 		}
-	}
 
-	.variables-usage-column {
-		@media screen and (max-width: var.$md) {
-			display: none;
+		.variables-usage-column {
+			@media screen and (max-width: var.$md) {
+				display: none;
+			}
 		}
 	}
 }
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index a5de85f9bca97..06661b14e73eb 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -88,9 +88,9 @@
 				/>
 				<TagsDropdown
 					:placeholder="$locale.baseText('workflowOpen.filterWorkflows')"
-					:currentTagIds="filters.tags"
+					:modelValue="filters.tags"
 					:createEnabled="false"
-					@update="setKeyValue('tags', $event)"
+					@update:modelValue="setKeyValue('tags', $event)"
 				/>
 			</div>
 			<div class="mb-s">
@@ -101,7 +101,7 @@
 					color="text-base"
 					class="mb-3xs"
 				/>
-				<n8n-select :value="filters.status" @input="setKeyValue('status', $event)" size="medium">
+				<n8n-select :modelValue="filters.status" @update:modelValue="setKeyValue('status', $event)">
 					<n8n-option
 						v-for="option in statusFilterOptions"
 						:key="option.label"
@@ -120,7 +120,6 @@ import { defineComponent } from 'vue';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import { EnterpriseEditionFeature, VIEWS } from '@/constants';
-import type Vue from 'vue';
 import type { ITag, IUser, IWorkflowDb } from '@/Interface';
 import TagsDropdown from '@/components/TagsDropdown.vue';
 import { mapStores } from 'pinia';
@@ -132,7 +131,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { genericHelpers } from '@/mixins/genericHelpers';
 
-type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
+type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
 
 const StatusFilter = {
 	ACTIVE: true,
diff --git a/packages/editor-ui/src/views/__tests__/AuthView.test.ts b/packages/editor-ui/src/views/__tests__/AuthView.test.ts
index 2b23ed4c088e8..e776e86942c3c 100644
--- a/packages/editor-ui/src/views/__tests__/AuthView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/AuthView.test.ts
@@ -1,27 +1,17 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
 import AuthView from '@/views/AuthView.vue';
+import { createComponentRenderer } from '@/__tests__/render';
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		AuthView,
-		merge(
-			{
-				pinia: createTestingPinia(),
-				stubs: {
-					SSOLogin: {
-						template: '<div data-test-id="sso-login"></div>',
-					},
-				},
+const renderComponent = createComponentRenderer(AuthView, {
+	pinia: createTestingPinia(),
+	global: {
+		stubs: {
+			SSOLogin: {
+				template: '<div data-test-id="sso-login"></div>',
 			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
 		},
-	);
+	},
+});
 
 describe('AuthView', () => {
 	it('should render with subtitle', () => {
diff --git a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts b/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
index fbf6ef5736650..13158b217eeb8 100644
--- a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
@@ -1,16 +1,14 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { useRouter } from 'vue-router/composables';
+import { useRouter } from 'vue-router';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
 import SamlOnboarding from '@/views/SamlOnboarding.vue';
 import { useSSOStore } from '@/stores/sso.store';
 import { STORES } from '@/constants';
 import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
-import { i18nInstance } from '@/plugins/i18n';
+import { createComponentRenderer } from '@/__tests__/render';
 
-vi.mock('vue-router/composables', () => {
+vi.mock('vue-router', () => {
 	const push = vi.fn();
 	return {
 		useRouter: () => ({
@@ -23,20 +21,7 @@ let pinia: ReturnType<typeof createTestingPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
 let router: ReturnType<typeof useRouter>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SamlOnboarding,
-		merge(
-			{
-				pinia,
-				i18n: i18nInstance,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+const renderComponent = createComponentRenderer(SamlOnboarding);
 
 describe('SamlOnboarding', () => {
 	beforeEach(() => {
@@ -61,7 +46,7 @@ describe('SamlOnboarding', () => {
 			isPending: false,
 		});
 
-		const { getByRole, getAllByRole } = renderComponent();
+		const { getByRole, getAllByRole } = renderComponent({ pinia });
 
 		const inputs = getAllByRole('textbox');
 		const submit = getByRole('button');
diff --git a/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts b/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
index 8b3b01115e5cf..c5006e8ddee17 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
@@ -1,55 +1,56 @@
 import { vi } from 'vitest';
-import { render } from '@testing-library/vue';
-import { createPinia, setActivePinia, PiniaVuePlugin } from 'pinia';
-import { merge } from 'lodash-es';
-import { i18nInstance } from '@/plugins/i18n';
+import { createPinia, setActivePinia } from 'pinia';
 import { useAuditLogsStore, useSettingsStore } from '@/stores';
 import SettingsAuditLogs from '@/views/SettingsAuditLogs.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
+import { nextTick } from 'vue';
+import { setupServer } from '@/__tests__/server';
 
 let pinia: ReturnType<typeof createPinia>;
 let settingsStore: ReturnType<typeof useSettingsStore>;
 let auditLogsStore: ReturnType<typeof useAuditLogsStore>;
+let server: ReturnType<typeof setupServer>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SettingsAuditLogs,
-		merge(
-			{
-				pinia,
-				i18n: i18nInstance,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+const renderComponent = createComponentRenderer(SettingsAuditLogs);
 
 describe('SettingsAuditLogs', () => {
-	beforeEach(() => {
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
 		pinia = createPinia();
 		setActivePinia(pinia);
 		settingsStore = useSettingsStore();
 		auditLogsStore = useAuditLogsStore();
+
+		await settingsStore.getSettings();
 	});
 
 	afterEach(() => {
 		vi.clearAllMocks();
 	});
 
-	it('should render paywall state when there is no license', () => {
-		vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(false);
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render paywall state when there is no license', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.AuditLogs] = false;
+		await nextTick();
 
-		const { getByTestId, queryByTestId } = renderComponent();
+		const { getByTestId, queryByTestId } = renderComponent({ pinia });
 
 		expect(queryByTestId('audit-logs-content-licensed')).not.toBeInTheDocument();
 		expect(getByTestId('audit-logs-content-unlicensed')).toBeInTheDocument();
 	});
 
-	it('should render licensed content', () => {
-		vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+	it('should render licensed content', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.AuditLogs] = true;
+		await nextTick();
 
-		const { getByTestId, queryByTestId } = renderComponent();
+		const { getByTestId, queryByTestId } = renderComponent({ pinia });
 
 		expect(getByTestId('audit-logs-content-licensed')).toBeInTheDocument();
 		expect(queryByTestId('audit-logs-content-unlicensed')).not.toBeInTheDocument();
diff --git a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
index 62ebff677edae..f975d2e24f176 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
@@ -1,63 +1,56 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
-import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
+import { createPinia } from 'pinia';
 import type { IN8nUISettings } from 'n8n-workflow';
-import { STORES } from '@/constants';
 import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
-import { i18n } from '@/plugins/i18n';
 import SettingsPersonalView from '@/views/SettingsPersonalView.vue';
 import { useSettingsStore } from '@/stores';
 import { useUsersStore } from '@/stores/users.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { setupServer } from '@/__tests__/server';
 
-let pinia: ReturnType<typeof createTestingPinia>;
+let pinia: ReturnType<typeof createPinia>;
 let settingsStore: ReturnType<typeof useSettingsStore>;
 let usersStore: ReturnType<typeof useUsersStore>;
+let server: ReturnType<typeof setupServer>;
 
 const DEFAULT_SETTINGS: IN8nUISettings = SETTINGS_STORE_DEFAULT_STATE.settings;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SettingsPersonalView,
-		merge(
-			{
-				pinia,
-				i18n,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+const renderComponent = createComponentRenderer(SettingsPersonalView);
+
+const currentUser = {
+	id: '1',
+	firstName: 'John',
+	lastName: 'Doe',
+	email: 'joh.doe@example.com',
+	createdAt: Date().toString(),
+	isOwner: true,
+	isDefaultUser: false,
+	isPendingUser: false,
+	isPending: false,
+};
 
 describe('SettingsPersonalView', () => {
-	beforeEach(() => {
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: DEFAULT_SETTINGS,
-				},
-			},
-		});
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+
 		settingsStore = useSettingsStore(pinia);
 		usersStore = useUsersStore(pinia);
 
-		vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
-			id: '1',
-			firstName: 'John',
-			lastName: 'Doe',
-			email: 'joh.doe@example.com',
-			createdAt: Date().toString(),
-			isOwner: true,
-			isDefaultUser: false,
-			isPendingUser: false,
-			isPending: false,
-		});
+		usersStore.users[currentUser.id] = currentUser;
+		usersStore.currentUserId = currentUser.id;
+
+		await settingsStore.getSettings();
+	});
+
+	afterAll(() => {
+		server.shutdown();
 	});
 
 	it('should enable email and pw change', async () => {
-		const { getByTestId, getAllByRole } = renderComponent();
+		const { getByTestId, getAllByRole } = renderComponent({ pinia });
 		await waitAllPromises();
 
 		expect(getAllByRole('textbox').find((el) => el.getAttribute('type') === 'email')).toBeEnabled();
@@ -68,7 +61,7 @@ describe('SettingsPersonalView', () => {
 		vi.spyOn(settingsStore, 'isSamlLoginEnabled', 'get').mockReturnValue(true);
 		vi.spyOn(settingsStore, 'isDefaultAuthenticationSaml', 'get').mockReturnValue(true);
 
-		const { queryByTestId, getAllByRole } = renderComponent();
+		const { queryByTestId, getAllByRole } = renderComponent({ pinia });
 		await waitAllPromises();
 
 		expect(
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
index 6185054ebee7a..8b513aadebf55 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
@@ -1,43 +1,33 @@
 import { vi } from 'vitest';
-import { screen, render, waitFor, within } from '@testing-library/vue';
+import { screen, waitFor, within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { createPinia, setActivePinia, PiniaVuePlugin } from 'pinia';
-import { merge } from 'lodash-es';
+import { createPinia, setActivePinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
-import { i18nInstance } from '@/plugins/i18n';
 import { useSettingsStore, useSourceControlStore } from '@/stores';
 import SettingsSourceControl from '@/views/SettingsSourceControl.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
+import { nextTick } from 'vue';
 
 let pinia: ReturnType<typeof createPinia>;
 let server: ReturnType<typeof setupServer>;
 let settingsStore: ReturnType<typeof useSettingsStore>;
 let sourceControlStore: ReturnType<typeof useSourceControlStore>;
 
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SettingsSourceControl,
-		merge(
-			{
-				pinia,
-				i18n: i18nInstance,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+const renderComponent = createComponentRenderer(SettingsSourceControl);
 
 describe('SettingsSourceControl', () => {
 	beforeAll(() => {
 		server = setupServer();
 	});
 
-	beforeEach(() => {
+	beforeEach(async () => {
 		pinia = createPinia();
 		setActivePinia(pinia);
 		settingsStore = useSettingsStore();
 		sourceControlStore = useSourceControlStore();
+
+		await settingsStore.getSettings();
 	});
 
 	afterEach(() => {
@@ -48,19 +38,25 @@ describe('SettingsSourceControl', () => {
 		server.shutdown();
 	});
 
-	it('should render paywall state when there is no license', () => {
-		vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(false);
+	it('should render paywall state when there is no license', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = false;
+		await nextTick();
 
-		const { getByTestId, queryByTestId } = renderComponent();
+		const { getByTestId, queryByTestId } = renderComponent({
+			pinia,
+		});
 
 		expect(queryByTestId('source-control-content-licensed')).not.toBeInTheDocument();
 		expect(getByTestId('source-control-content-unlicensed')).toBeInTheDocument();
 	});
 
-	it('should render licensed content', () => {
-		vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+	it('should render licensed content', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = true;
+		await nextTick();
 
-		const { getByTestId, queryByTestId } = renderComponent();
+		const { getByTestId, queryByTestId } = renderComponent({
+			pinia,
+		});
 
 		expect(getByTestId('source-control-content-licensed')).toBeInTheDocument();
 		expect(queryByTestId('source-control-content-unlicensed')).not.toBeInTheDocument();
@@ -68,11 +64,17 @@ describe('SettingsSourceControl', () => {
 	});
 
 	it('should render user flow happy path', async () => {
-		vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.SourceControl] = true;
+		await nextTick();
 
 		const updatePreferencesSpy = vi.spyOn(sourceControlStore, 'updatePreferences');
 
-		const { container, getByTestId, queryByTestId, getByRole } = renderComponent();
+		const { html, container, getByTestId, getByText, queryByTestId, getByRole } = renderComponent({
+			pinia,
+			global: {
+				stubs: ['teleport'],
+			},
+		});
 
 		await waitFor(() => expect(sourceControlStore.preferences.publicKey).not.toEqual(''));
 
@@ -103,8 +105,8 @@ describe('SettingsSourceControl', () => {
 		const branchSelect = getByTestId('source-control-branch-select');
 		await userEvent.click(within(branchSelect).getByRole('textbox'));
 
-		await waitFor(() => expect(within(branchSelect).getByText('main')).toBeVisible());
-		await userEvent.click(within(branchSelect).getByText('main'));
+		await waitFor(() => expect(getByText('main')).toBeVisible());
+		await userEvent.click(getByText('main'));
 
 		await waitFor(() => expect(saveSettingsButton).toBeEnabled());
 		await userEvent.click(saveSettingsButton);
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
index 36fb4bb386531..2e20da824fea8 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
@@ -1,31 +1,38 @@
 import { createPinia, setActivePinia } from 'pinia';
 import SettingsSso from '@/views/SettingsSso.vue';
 
-import { renderComponent, retry } from '@/__tests__/utils';
+import { retry } from '@/__tests__/utils';
 import { setupServer } from '@/__tests__/server';
 import { afterAll, beforeAll } from 'vitest';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 import userEvent from '@testing-library/user-event';
 import { useSSOStore } from '@/stores/sso.store';
-import { i18nInstance } from '@/plugins/i18n';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
+import { nextTick } from 'vue';
 
 let pinia: ReturnType<typeof createPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
 let server: ReturnType<typeof setupServer>;
 
+const renderComponent = createComponentRenderer(SettingsSso);
+
 describe('SettingsSso', () => {
 	beforeAll(() => {
 		server = setupServer();
 	});
 
 	beforeEach(async () => {
+		window.open = vi.fn();
+
 		pinia = createPinia();
 		setActivePinia(pinia);
 
-		window.open = vi.fn();
-
-		await useSettingsStore().getSettings();
 		ssoStore = useSSOStore();
+		settingsStore = useSettingsStore();
+
+		await settingsStore.getSettings();
 	});
 
 	afterEach(() => {
@@ -37,9 +44,8 @@ describe('SettingsSso', () => {
 	});
 
 	it('should render paywall state when there is no license', () => {
-		const { getByTestId, queryByTestId, queryByRole } = renderComponent(SettingsSso, {
+		const { getByTestId, queryByTestId, queryByRole } = renderComponent({
 			pinia,
-			i18n: i18nInstance,
 		});
 
 		expect(queryByRole('checkbox')).not.toBeInTheDocument();
@@ -47,50 +53,54 @@ describe('SettingsSso', () => {
 		expect(getByTestId('sso-content-unlicensed')).toBeInTheDocument();
 	});
 
-	it('should render licensed content', () => {
-		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
+	it('should render licensed content', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
 
-		const { getByTestId, queryByTestId, getByRole } = renderComponent(SettingsSso, {
+		const { getByTestId, queryByTestId, getByRole } = renderComponent({
 			pinia,
-			i18n: i18nInstance,
 		});
 
-		expect(getByRole('checkbox')).toBeInTheDocument();
+		expect(getByRole('switch')).toBeInTheDocument();
 		expect(getByTestId('sso-content-licensed')).toBeInTheDocument();
 		expect(queryByTestId('sso-content-unlicensed')).not.toBeInTheDocument();
 	});
 
 	it('should enable activation checkbox and test button if data is already saved', async () => {
-		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
+		await ssoStore.getSamlConfig();
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
 
-		const { container, getByTestId, getByRole } = renderComponent(SettingsSso, {
+		const { container, getByTestId, getByRole } = renderComponent({
 			pinia,
-			i18n: i18nInstance,
 		});
 
+		const xmlRadioButton = getByTestId('radio-button-xml');
+		await userEvent.click(xmlRadioButton);
+
 		await retry(() =>
 			expect(container.querySelector('textarea[name="metadata"]')).toHaveValue(
 				'<?xml version="1.0"?>',
 			),
 		);
 
-		expect(getByRole('checkbox')).toBeEnabled();
+		expect(getByRole('switch')).toBeEnabled();
 		expect(getByTestId('sso-test')).toBeEnabled();
 	});
 
 	it('should enable activation checkbox after data is saved', async () => {
 		await ssoStore.saveSamlConfig({ metadata: '' });
 
-		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
 
 		const saveSpy = vi.spyOn(ssoStore, 'saveSamlConfig');
 		const getSpy = vi.spyOn(ssoStore, 'getSamlConfig');
 
-		const { container, getByRole, getByTestId } = renderComponent(SettingsSso, {
+		const { container, getByRole, getByTestId } = renderComponent({
 			pinia,
-			i18n: i18nInstance,
 		});
-		const checkbox = getByRole('checkbox');
+		const checkbox = getByRole('switch');
 		const btnSave = getByTestId('sso-save');
 		const btnTest = getByTestId('sso-test');
 
diff --git a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
index 6afc35de1edcd..0ca5fe691f794 100644
--- a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
+++ b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
@@ -4,7 +4,8 @@ import { waitFor } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
 import VariablesView from '@/views/VariablesView.vue';
 import { useSettingsStore, useUsersStore } from '@/stores';
-import { renderComponent } from '@/__tests__/utils';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
 
 describe('VariablesView', () => {
 	let server: ReturnType<typeof setupServer>;
@@ -12,6 +13,8 @@ describe('VariablesView', () => {
 	let settingsStore: ReturnType<typeof useSettingsStore>;
 	let usersStore: ReturnType<typeof useUsersStore>;
 
+	const renderComponent = createComponentRenderer(VariablesView);
+
 	beforeAll(() => {
 		server = setupServer();
 	});
@@ -32,19 +35,19 @@ describe('VariablesView', () => {
 	});
 
 	it('should render loading state', () => {
-		const wrapper = renderComponent(VariablesView, { pinia });
+		const wrapper = renderComponent({ pinia });
 
 		expect(wrapper.container.querySelectorAll('.n8n-loading')).toHaveLength(3);
 	});
 
 	describe('should render empty state', () => {
 		it('when feature is enabled and logged in user is owner', async () => {
-			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
 			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
 				isOwner: true,
 			});
 
-			const { queryByTestId } = renderComponent(VariablesView, { pinia });
+			const { queryByTestId } = renderComponent({ pinia });
 
 			await waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).toBeVisible();
@@ -54,7 +57,7 @@ describe('VariablesView', () => {
 		});
 
 		it('when feature is disabled and logged in user is owner', async () => {
-			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(false);
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = false;
 			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
 				isOwner: true,
 			});
@@ -69,7 +72,7 @@ describe('VariablesView', () => {
 		});
 
 		it('when feature is eanbled and logged in user is not owner', async () => {
-			vi.spyOn(settingsStore, 'isEnterpriseFeatureEnabled').mockReturnValue(true);
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
 			vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
 				isDefaultUser: true,
 			});
@@ -87,7 +90,7 @@ describe('VariablesView', () => {
 	it('should render variable entries', async () => {
 		server.createList('variable', 3);
 
-		const wrapper = renderComponent(VariablesView, { pinia });
+		const wrapper = renderComponent({ pinia });
 
 		const table = await wrapper.findByTestId('resources-table');
 		expect(table).toBeVisible();
diff --git a/packages/editor-ui/src/vue-agile.d.ts b/packages/editor-ui/src/vue-agile.d.ts
deleted file mode 100644
index 23b389c3ebe71..0000000000000
--- a/packages/editor-ui/src/vue-agile.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'vue-agile';
diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index c72ffb1fad0ca..be4fc04c58bf8 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -1,5 +1,5 @@
-import vue from '@vitejs/plugin-vue2';
-import path, { resolve } from 'path';
+import vue from '@vitejs/plugin-vue';
+import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
 import { defineConfig as defineVitestConfig } from 'vitest/config';
 import { sentryVitePlugin } from '@sentry/vite-plugin';
@@ -11,10 +11,9 @@ const { coverageReporters } = require('../../jest.config.js');
 const vendorChunks = ['vue', 'vue-router'];
 const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
 const ignoreChunks = [
-	'vue2-boring-avatars',
-	'vue-template-compiler',
 	'@fontsource/open-sans',
 	'normalize-wheel',
+	'@vueuse/components',
 	// TODO: remove this. It's currently required by xml2js in NodeErrors
 	'stream-browserify',
 ];
@@ -45,11 +44,15 @@ const { NODE_ENV } = process.env;
 const alias = [
 	{ find: '@', replacement: resolve(__dirname, 'src') },
 	{ find: 'stream', replacement: 'stream-browserify' },
+	{
+		find: /^n8n-design-system$/,
+		replacement: resolve(__dirname, '..', 'design-system', 'src', 'main.ts'),
+	},
 	{
 		find: /^n8n-design-system\//,
 		replacement: resolve(__dirname, '..', 'design-system', 'src') + '/',
 	},
-	...['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCase'].map((name) => ({
+	...['orderBy', 'camelCase', 'cloneDeep', 'startCase'].map((name) => ({
 		find: new RegExp(`^lodash.${name}$`, 'i'),
 		replacement: require.resolve(`lodash-es/${name}`),
 	})),
@@ -57,18 +60,6 @@ const alias = [
 		find: /^lodash\.(.+)$/,
 		replacement: 'lodash-es/$1',
 	},
-	{
-		find: 'vue2-boring-avatars',
-		replacement: require.resolve('vue2-boring-avatars'),
-	},
-	{
-		find: /element-ui\/(packages|lib)\/button$/,
-		replacement: path.resolve(
-			__dirname,
-			'..',
-			'design-system/src/components/N8nButton/overrides/ElButton.ts',
-		),
-	},
 ];
 
 const plugins = [vue()];
@@ -94,8 +85,8 @@ export default mergeConfig(
 	defineConfig({
 		define: {
 			// This causes test to fail but is required for actually running it
-			...(NODE_ENV !== 'test' ? { global: 'globalThis' } : {}),
-			...(NODE_ENV === 'development' ? { process: { env: {} } } : {}),
+			// ...(NODE_ENV !== 'test' ? { 'global': 'globalThis' } : {}),
+			...(NODE_ENV === 'development' ? { 'process.env': {} } : {}),
 			BASE_PATH: `'${publicPath}'`,
 		},
 		plugins,
diff --git a/patches/element-ui@2.15.12.patch b/patches/element-ui@2.15.12.patch
deleted file mode 100644
index 3f7ef6e50a915..0000000000000
--- a/patches/element-ui@2.15.12.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/lib/element-ui.common.js b/lib/element-ui.common.js
-index 6209b8b7f21c6eea447dd4671b7c4cfc1ef5e9c2..a26772af8dcdcbc0e3a6058bda30c7f9f143cd5d 100644
---- a/lib/element-ui.common.js
-+++ b/lib/element-ui.common.js
-@@ -21471,14 +21471,8 @@ mainvue_type_template_id_52060272_render._withStripped = true
-       popper.setAttribute('tabindex', 0);
- 
-       if (this.trigger !== 'click') {
--        Object(dom_["on"])(reference, 'focusin', function () {
--          _this.handleFocus();
--          var instance = reference.__vue__;
--          if (instance && typeof instance.focus === 'function') {
--            instance.focus();
--          }
--        });
--        Object(dom_["on"])(popper, 'focusin', this.handleFocus);
-+        Object(dom_["on"])(reference, 'focusin', this.handleRefrenceFocus);
-+        Object(dom_["on"])(popper, 'focusin', this.handlePopperFocus);
-         Object(dom_["on"])(reference, 'focusout', this.handleBlur);
-         Object(dom_["on"])(popper, 'focusout', this.handleBlur);
-       }
-@@ -21524,7 +21518,17 @@ mainvue_type_template_id_52060272_render._withStripped = true
-     doClose: function doClose() {
-       this.showPopper = false;
-     },
--    handleFocus: function handleFocus() {
-+    handleRefrenceFocus: function handleRefrenceFocus() {
-+      this.handlePopperFocus();
-+      if (!this.referenceElm) {
-+        return;
-+      }
-+      const instance = this.referenceElm.__vue__;
-+      if (instance && typeof instance.focus === 'function') {
-+        instance.focus();
-+      }
-+    },
-+    handlePopperFocus: function handlePopperFocus() {
-       Object(dom_["addClass"])(this.referenceElm, 'focusing');
-       if (this.trigger === 'click' || this.trigger === 'focus') this.showPopper = true;
-     },
-@@ -21570,7 +21574,7 @@ mainvue_type_template_id_52060272_render._withStripped = true
-       var popper = this.popper || this.$refs.popper;
- 
-       if (!reference && this.$refs.wrapper.children) {
--        reference = this.referenceElm = this.$refs.wrapper.children[0];
-+        reference = this.$refs.wrapper.children[0];
-       }
-       if (!this.$el || !reference || this.$el.contains(e.target) || reference.contains(e.target) || !popper || popper.contains(e.target)) return;
-       this.showPopper = false;
-@@ -21590,18 +21594,28 @@ mainvue_type_template_id_52060272_render._withStripped = true
-   },
- 
-   destroyed: function destroyed() {
--    var reference = this.reference;
-+    var reference = this.referenceElm;
-+    var popper = this.popper || this.$refs.popper;
- 
-+    Object(dom_["off"])(reference, 'focusin', this.handleRefrenceFocus);
-+    Object(dom_["off"])(popper, 'focusin', this.handlePopperFocus);
-+    Object(dom_["off"])(reference, 'focusout', this.handleBlur);
-+    Object(dom_["off"])(popper, 'focusout', this.handleBlur);
-+    Object(dom_["off"])(reference, 'keydown', this.handleKeydown);
-+    Object(dom_["off"])(reference, 'click', this.handleClick);
-     Object(dom_["off"])(reference, 'click', this.doToggle);
-+    Object(dom_["off"])(document, 'click', this.handleDocumentClick);
-+    Object(dom_["off"])(reference, 'mouseenter', this.handleMouseEnter);
-+    Object(dom_["off"])(popper, 'mouseenter', this.handleMouseEnter);
-+    Object(dom_["off"])(reference, 'mouseleave', this.handleMouseLeave);
-+    Object(dom_["off"])(popper, 'mouseleave', this.handleMouseLeave);
-     Object(dom_["off"])(reference, 'mouseup', this.doClose);
-     Object(dom_["off"])(reference, 'mousedown', this.doShow);
-     Object(dom_["off"])(reference, 'focusin', this.doShow);
-     Object(dom_["off"])(reference, 'focusout', this.doClose);
-     Object(dom_["off"])(reference, 'mousedown', this.doShow);
-     Object(dom_["off"])(reference, 'mouseup', this.doClose);
--    Object(dom_["off"])(reference, 'mouseleave', this.handleMouseLeave);
--    Object(dom_["off"])(reference, 'mouseenter', this.handleMouseEnter);
--    Object(dom_["off"])(document, 'click', this.handleDocumentClick);
-+    this.referenceElm = undefined;
-   }
- });
- // CONCATENATED MODULE: ./packages/popover/src/main.vue?vue&type=script&lang=js&
-@@ -21805,18 +21819,7 @@ main.directive = directive;
-       this.$el.setAttribute('tabindex', this.tabindex);
-       Object(dom_["on"])(this.referenceElm, 'mouseenter', this.show);
-       Object(dom_["on"])(this.referenceElm, 'mouseleave', this.hide);
--      Object(dom_["on"])(this.referenceElm, 'focus', function () {
--        if (!_this3.$slots.default || !_this3.$slots.default.length) {
--          _this3.handleFocus();
--          return;
--        }
--        var instance = _this3.$slots.default[0].componentInstance;
--        if (instance && instance.focus) {
--          instance.focus();
--        } else {
--          _this3.handleFocus();
--        }
--      });
-+      Object(dom_["on"])(this.referenceElm, 'focus', this.handleFocus);
-       Object(dom_["on"])(this.referenceElm, 'blur', this.handleBlur);
-       Object(dom_["on"])(this.referenceElm, 'click', this.removeFocusing);
-     }
-@@ -21849,8 +21852,18 @@ main.directive = directive;
-       this.debounceClose();
-     },
-     handleFocus: function handleFocus() {
--      this.focusing = true;
--      this.show();
-+      if (!this.$slots.default || !this.$slots.default.length) {
-+        this.focusing = true;
-+        this.show();
-+        return;
-+      }
-+      var instance = this.$slots.default[0].componentInstance;
-+      if (instance && instance.focus) {
-+        instance.focus();
-+      } else {
-+        this.focusing = true;
-+        this.show();
-+      }
-     },
-     handleBlur: function handleBlur() {
-       this.focusing = false;
-@@ -21918,6 +21931,7 @@ main.directive = directive;
-     this.popperVM && this.popperVM.$destroy();
-   },
-   destroyed: function destroyed() {
-+    this.popperVM && this.popperVM.$destroy();
-     var reference = this.referenceElm;
-     if (reference.nodeType === 1) {
-       Object(dom_["off"])(reference, 'mouseenter', this.show);
-diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue
-index ab5d060182c2e671989f1aba190c85a074d2c754..8b464ad39a78ac6efead5f687d977500642e45dc 100644
---- a/packages/popover/src/main.vue
-+++ b/packages/popover/src/main.vue
-@@ -98,16 +98,9 @@ export default {
-       reference.setAttribute('aria-describedby', this.tooltipId);
-       reference.setAttribute('tabindex', this.tabindex); // tab序列
-       popper.setAttribute('tabindex', 0);
--
-       if (this.trigger !== 'click') {
--        on(reference, 'focusin', () => {
--          this.handleFocus();
--          const instance = reference.__vue__;
--          if (instance && typeof instance.focus === 'function') {
--            instance.focus();
--          }
--        });
--        on(popper, 'focusin', this.handleFocus);
-+        on(reference, 'focusin', this.handleRefrenceFocus);
-+        on(popper, 'focusin', this.handlePopperFocus);
-         on(reference, 'focusout', this.handleBlur);
-         on(popper, 'focusout', this.handleBlur);
-       }
-@@ -154,7 +147,17 @@ export default {
-     doClose() {
-       this.showPopper = false;
-     },
--    handleFocus() {
-+    handleRefrenceFocus() {
-+      this.handlePopperFocus();
-+      if (!this.referenceElm) {
-+        return;
-+      }
-+      const instance = this.referenceElm.__vue__;
-+      if (instance && typeof instance.focus === 'function') {
-+        instance.focus();
-+      }
-+    },
-+    handlePopperFocus() {
-       addClass(this.referenceElm, 'focusing');
-       if (this.trigger === 'click' || this.trigger === 'focus') this.showPopper = true;
-     },
-@@ -193,9 +196,8 @@ export default {
-     handleDocumentClick(e) {
-       let reference = this.reference || this.$refs.reference;
-       const popper = this.popper || this.$refs.popper;
--
-       if (!reference && this.$refs.wrapper.children) {
--        reference = this.referenceElm = this.$refs.wrapper.children[0];
-+        reference = this.$refs.wrapper.children[0];
-       }
-       if (!this.$el ||
-         !reference ||
-@@ -218,20 +220,26 @@ export default {
-       }
-     }
-   },
--
-   destroyed() {
--    const reference = this.reference;
--
-+    const reference = this.referenceElm;
-+    const popper = this.popper || this.$refs.popper;
-+    off(reference, 'focusin', this.handleRefrenceFocus);
-+    off(popper, 'focusin', this.handlePopperFocus);
-+    off(reference, 'focusout', this.handleBlur);
-+    off(popper, 'focusout', this.handleBlur);
-+    off(reference, 'keydown', this.handleKeydown);
-+    off(reference, 'click', this.handleClick);
-     off(reference, 'click', this.doToggle);
--    off(reference, 'mouseup', this.doClose);
--    off(reference, 'mousedown', this.doShow);
-+    off(document, 'click', this.handleDocumentClick);
-+    off(reference, 'mouseenter', this.handleMouseEnter);
-+    off(popper, 'mouseenter', this.handleMouseEnter);
-+    off(reference, 'mouseleave', this.handleMouseLeave);
-+    off(popper, 'mouseleave', this.handleMouseLeave);
-     off(reference, 'focusin', this.doShow);
-     off(reference, 'focusout', this.doClose);
-     off(reference, 'mousedown', this.doShow);
-     off(reference, 'mouseup', this.doClose);
--    off(reference, 'mouseleave', this.handleMouseLeave);
--    off(reference, 'mouseenter', this.handleMouseEnter);
--    off(document, 'click', this.handleDocumentClick);
-+    this.referenceElm = undefined;
-   }
- };
- </script>
-diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js
-index dc930ec58d42328a4d62cddb22fd513db31793cf..d9a6afc80d27ea89b838a47f395e249131c1370c 100644
---- a/packages/tooltip/src/main.js
-+++ b/packages/tooltip/src/main.js
-@@ -113,18 +113,7 @@ export default {
-       this.$el.setAttribute('tabindex', this.tabindex);
-       on(this.referenceElm, 'mouseenter', this.show);
-       on(this.referenceElm, 'mouseleave', this.hide);
--      on(this.referenceElm, 'focus', () => {
--        if (!this.$slots.default || !this.$slots.default.length) {
--          this.handleFocus();
--          return;
--        }
--        const instance = this.$slots.default[0].componentInstance;
--        if (instance && instance.focus) {
--          instance.focus();
--        } else {
--          this.handleFocus();
--        }
--      });
-+      on(this.referenceElm, 'focus', this.handleFocus);
-       on(this.referenceElm, 'blur', this.handleBlur);
-       on(this.referenceElm, 'click', this.removeFocusing);
-     }
-@@ -157,6 +146,18 @@ export default {
-       this.debounceClose();
-     },
-     handleFocus() {
-+      if (!this.$slots.default || !this.$slots.default.length) {
-+        this.doFocus();
-+        return;
-+      }
-+      const instance = this.$slots.default[0].componentInstance;
-+      if (instance && instance.focus) {
-+        instance.focus();
-+      } else {
-+        this.doFocus();
-+      }
-+    },
-+    doFocus() {
-       this.focusing = true;
-       this.show();
-     },
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ca1dd00054751..7b91c4c30ad2a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -31,9 +31,6 @@ patchedDependencies:
   '@sentry/cli@2.17.0':
     hash: nchnoezkq6p37qaiku3vrpwraq
     path: patches/@sentry__cli@2.17.0.patch
-  element-ui@2.15.12:
-    hash: prckukfdop5sl2her6de25cod4
-    path: patches/element-ui@2.15.12.patch
   pkce-challenge@3.0.0:
     hash: dypouzb3lve7vncq25i5fuanki
     path: patches/pkce-challenge@3.0.0.patch
@@ -64,9 +61,6 @@ importers:
       '@types/supertest':
         specifier: ^2.0.12
         version: 2.0.12
-      '@vitejs/plugin-vue2':
-        specifier: ^2.2.0
-        version: 2.2.0(vite@4.0.4)(vue@2.7.14)
       '@vitest/coverage-c8':
         specifier: ^0.28.5
         version: 0.28.5
@@ -132,13 +126,10 @@ importers:
         version: 5.1.3
       vite:
         specifier: ^4.0.4
-        version: 4.0.4(@types/node@18.16.16)
+        version: 4.0.4(less@4.1.3)(sass@1.63.4)
       vitest:
         specifier: ^0.28.5
         version: 0.28.5
-      vue-template-compiler:
-        specifier: ^2.7.14
-        version: 2.7.14
       vue-tsc:
         specifier: ^1.0.24
         version: 1.0.24(typescript@5.1.3)
@@ -657,9 +648,9 @@ importers:
 
   packages/design-system:
     dependencies:
-      element-ui:
-        specifier: ~2.15.12
-        version: 2.15.12(patch_hash=prckukfdop5sl2her6de25cod4)(vue@2.7.14)
+      element-plus:
+        specifier: ^2.3.6
+        version: 2.3.6(vue@3.3.4)
       markdown-it:
         specifier: ^13.0.1
         version: 13.0.1
@@ -676,11 +667,11 @@ importers:
         specifier: 2.10.0
         version: 2.10.0
       vue:
-        specifier: ^2.7.14
-        version: 2.7.14
-      vue2-boring-avatars:
-        specifier: ^0.3.8
-        version: 0.3.8
+        specifier: ^3.3.4
+        version: 3.3.4
+      vue-boring-avatars:
+        specifier: ^1.3.0
+        version: 1.3.0(vue@3.3.4)
       xss:
         specifier: ^1.0.14
         version: 1.0.14
@@ -692,38 +683,44 @@ importers:
         specifier: ^5.15.4
         version: 5.15.4
       '@fortawesome/vue-fontawesome':
-        specifier: ^2.0.9
-        version: 2.0.9(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14)
+        specifier: ^3.0.3
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4)
+      '@storybook/addon-a11y':
+        specifier: ^7.0.21
+        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-actions':
-        specifier: ^7.0.7
-        version: 7.0.7(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.0.21
+        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-docs':
-        specifier: ^7.0.7
-        version: 7.0.7(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.0.21
+        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-essentials':
-        specifier: ^7.0.7
-        version: 7.0.7(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.0.21
+        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-links':
-        specifier: ^7.0.7
-        version: 7.0.7(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.0.21
+        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-postcss':
-        specifier: ^3.0.0-alpha.1
+        specifier: 3.0.0-alpha.1
         version: 3.0.0-alpha.1(webpack@5.75.0)
-      '@storybook/vue':
-        specifier: ^7.0.7
-        version: 7.0.7(@babel/core@7.21.8)(babel-loader@9.1.2)(css-loader@6.7.3)(vue@2.7.14)
-      '@storybook/vue-webpack5':
-        specifier: ^7.0.7
-        version: 7.0.7(@babel/core@7.21.8)(@babel/preset-env@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.17.18)(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14)
+      '@storybook/addon-styling':
+        specifier: ^1.3.0
+        version: 1.3.0(less@4.1.3)(postcss@8.4.21)(react-dom@18.2.0)(react@17.0.2)(sass@1.63.4)(webpack@5.75.0)
+      '@storybook/vue3':
+        specifier: ^7.0.21
+        version: 7.0.21(vue@3.3.4)
+      '@storybook/vue3-vite':
+        specifier: ^7.0.21
+        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vite@4.0.4)(vue@3.3.4)
       '@testing-library/jest-dom':
         specifier: ^5.16.5
         version: 5.16.5
       '@testing-library/user-event':
         specifier: ^14.4.3
-        version: 14.4.3(@testing-library/dom@7.31.2)
+        version: 14.4.3(@testing-library/dom@8.20.1)
       '@testing-library/vue':
-        specifier: ^5.8.3
-        version: 5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14)
+        specifier: ^6.6.1
+        version: 6.6.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
       '@types/markdown-it':
         specifier: ^12.2.3
         version: 12.2.3
@@ -734,29 +731,38 @@ importers:
         specifier: ^3.0.1
         version: 3.0.1
       '@types/sanitize-html':
-        specifier: ^2.8.0
-        version: 2.8.0
+        specifier: ^2.9.0
+        version: 2.9.0
+      '@vitejs/plugin-vue':
+        specifier: ^4.2.3
+        version: 4.2.3(vite@4.0.4)(vue@3.3.4)
+      '@vue/test-utils':
+        specifier: ^2.4.1
+        version: 2.4.1(vue@3.3.4)
       autoprefixer:
-        specifier: ^10.4.13
-        version: 10.4.13(postcss@8.4.21)
+        specifier: ^10.4.14
+        version: 10.4.14(postcss@8.4.21)
       core-js:
-        specifier: ^3.27.2
-        version: 3.27.2
+        specifier: ^3.31.0
+        version: 3.31.0
       jsdom:
         specifier: 21.1.0
         version: 21.1.0
       sass:
-        specifier: ^1.58.0
-        version: 1.58.0
+        specifier: ^1.63.4
+        version: 1.63.4
       sass-loader:
-        specifier: ^13.2.0
-        version: 13.2.0(sass@1.58.0)(webpack@5.75.0)
+        specifier: ^13.3.2
+        version: 13.3.2(sass@1.63.4)(webpack@5.75.0)
       storybook:
-        specifier: ^7.0.7
-        version: 7.0.7
+        specifier: ^7.0.21
+        version: 7.0.21
       storybook-addon-themes:
         specifier: ^6.1.0
-        version: 6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@2.7.14)
+        version: 6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@3.3.4)
+      storybook-dark-mode:
+        specifier: ^3.0.0
+        version: 3.0.0(react-dom@18.2.0)(react@17.0.2)
 
   packages/editor-ui:
     dependencies:
@@ -800,8 +806,8 @@ importers:
         specifier: ^5.15.3
         version: 5.15.4
       '@fortawesome/vue-fontawesome':
-        specifier: ^2.0.10
-        version: 2.0.10(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14)
+        specifier: ^3.0.3
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4)
       '@jsplumb/browser-ui':
         specifier: ^5.13.2
         version: 5.13.2
@@ -820,6 +826,12 @@ importers:
       '@n8n/codemirror-lang-sql':
         specifier: ^1.0.1
         version: 1.0.1(@codemirror/view@6.5.1)(@lezer/common@1.0.1)
+      '@vueuse/components':
+        specifier: ^10.2.0
+        version: 10.2.0(vue@3.3.4)
+      '@vueuse/core':
+        specifier: ^10.2.0
+        version: 10.2.0(vue@3.3.4)
       axios:
         specifier: ^0.21.1
         version: 0.21.4
@@ -870,7 +882,7 @@ importers:
         version: 1.0.1
       pinia:
         specifier: ^2.0.22
-        version: 2.0.23(typescript@5.1.3)(vue@2.7.14)
+        version: 2.0.23(typescript@5.1.3)(vue@3.3.4)
       prettier:
         specifier: ^2.8.3
         version: 2.8.3
@@ -883,33 +895,27 @@ importers:
       uuid:
         specifier: ^8.3.2
         version: 8.3.2
-      v-click-outside:
-        specifier: ^3.1.2
-        version: 3.2.0
+      v3-infinite-loading:
+        specifier: ^1.2.2
+        version: 1.2.2
       vue:
-        specifier: ^2.7.14
-        version: 2.7.14
+        specifier: ^3.3.4
+        version: 3.3.4
       vue-agile:
         specifier: ^2.0.0
         version: 2.0.0
       vue-i18n:
-        specifier: ^8.26.7
-        version: 8.27.2(vue@2.7.14)
-      vue-infinite-loading:
-        specifier: ^2.4.5
-        version: 2.4.5(vue@2.7.14)
+        specifier: ^9.2.2
+        version: 9.2.2(vue@3.3.4)
       vue-json-pretty:
-        specifier: 1.9.3
-        version: 1.9.3
+        specifier: 2.2.4
+        version: 2.2.4(vue@3.3.4)
       vue-router:
-        specifier: ^3.6.5
-        version: 3.6.5(vue@2.7.14)
-      vue2-teleport:
-        specifier: ^1.0.1
-        version: 1.0.1
-      vue2-touch-events:
-        specifier: ^3.2.1
-        version: 3.2.2
+        specifier: ^4.2.2
+        version: 4.2.2(vue@3.3.4)
+      vue3-touch-events:
+        specifier: ^4.1.3
+        version: 4.1.3
       xss:
         specifier: ^1.0.14
         version: 1.0.14
@@ -919,7 +925,7 @@ importers:
         version: 7.6.0
       '@pinia/testing':
         specifier: ^0.0.14
-        version: 0.0.14(pinia@2.0.23)(vue@2.7.14)
+        version: 0.0.14(pinia@2.0.23)(vue@3.3.4)
       '@sentry/vite-plugin':
         specifier: ^0.4.0
         version: 0.4.0
@@ -928,10 +934,10 @@ importers:
         version: 5.16.5
       '@testing-library/user-event':
         specifier: ^14.4.3
-        version: 14.4.3(@testing-library/dom@7.31.2)
+        version: 14.4.3(@testing-library/dom@8.20.1)
       '@testing-library/vue':
-        specifier: ^5.8.3
-        version: 5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14)
+        specifier: ^6.6.1
+        version: 6.6.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
@@ -953,6 +959,9 @@ importers:
       '@types/uuid':
         specifier: ^8.3.2
         version: 8.3.4
+      '@vitejs/plugin-vue':
+        specifier: ^4.2.3
+        version: 4.2.3(vite@4.0.4)(vue@3.3.4)
       miragejs:
         specifier: ^0.1.47
         version: 0.1.47
@@ -1651,13 +1660,6 @@ packages:
       - encoding
     dev: false
 
-  /@babel/code-frame@7.18.6:
-    resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.18.6
-    dev: true
-
   /@babel/code-frame@7.21.4:
     resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
     engines: {node: '>=6.9.0'}
@@ -1665,39 +1667,11 @@ packages:
       '@babel/highlight': 7.18.6
     dev: true
 
-  /@babel/compat-data@7.20.10:
-    resolution: {integrity: sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/compat-data@7.21.7:
     resolution: {integrity: sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/core@7.20.12:
-    resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.7
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12)
-      '@babel/helper-module-transforms': 7.20.11
-      '@babel/helpers': 7.20.7
-      '@babel/parser': 7.20.7
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-      convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/core@7.21.8:
     resolution: {integrity: sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==}
     engines: {node: '>=6.9.0'}
@@ -1721,15 +1695,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/generator@7.20.7:
-    resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.5
-      '@jridgewell/gen-mapping': 0.3.2
-      jsesc: 2.5.2
-    dev: true
-
   /@babel/generator@7.21.5:
     resolution: {integrity: sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==}
     engines: {node: '>=6.9.0'}
@@ -1755,34 +1720,6 @@ packages:
       '@babel/types': 7.21.5
     dev: true
 
-  /@babel/helper-compilation-targets@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.20.12
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 7.5.4
-    dev: true
-
-  /@babel/helper-compilation-targets@7.21.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.20.12
-      '@babel/helper-validator-option': 7.21.0
-      browserslist: 4.21.4
-      lru-cache: 5.1.1
-      semver: 7.5.4
-    dev: true
-
   /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==}
     engines: {node: '>=6.9.0'}
@@ -1797,44 +1734,6 @@ packages:
       semver: 7.5.4
     dev: true
 
-  /@babel/helper-create-class-features-plugin@7.20.12(@babel/core@7.20.12):
-    resolution: {integrity: sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-create-class-features-plugin@7.20.12(@babel/core@7.21.8):
-    resolution: {integrity: sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.21.8):
     resolution: {integrity: sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==}
     engines: {node: '>=6.9.0'}
@@ -1855,17 +1754,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      regexpu-core: 5.2.2
-    dev: true
-
   /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==}
     engines: {node: '>=6.9.0'}
@@ -1877,22 +1765,6 @@ packages:
       regexpu-core: 5.2.2
     dev: true
 
-  /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-      debug: 4.3.4(supports-color@8.1.1)
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
     peerDependencies:
@@ -1936,13 +1808,6 @@ packages:
       '@babel/types': 7.21.5
     dev: true
 
-  /@babel/helper-member-expression-to-functions@7.20.7:
-    resolution: {integrity: sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.5
-    dev: true
-
   /@babel/helper-member-expression-to-functions@7.21.5:
     resolution: {integrity: sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==}
     engines: {node: '>=6.9.0'}
@@ -1950,13 +1815,6 @@ packages:
       '@babel/types': 7.21.5
     dev: true
 
-  /@babel/helper-module-imports@7.18.6:
-    resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.5
-    dev: true
-
   /@babel/helper-module-imports@7.21.4:
     resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
     engines: {node: '>=6.9.0'}
@@ -1964,22 +1822,6 @@ packages:
       '@babel/types': 7.21.5
     dev: true
 
-  /@babel/helper-module-transforms@7.20.11:
-    resolution: {integrity: sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.20.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-module-transforms@7.21.5:
     resolution: {integrity: sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==}
     engines: {node: '>=6.9.0'}
@@ -2003,31 +1845,11 @@ packages:
       '@babel/types': 7.21.5
     dev: true
 
-  /@babel/helper-plugin-utils@7.20.2:
-    resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-plugin-utils@7.21.5:
     resolution: {integrity: sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-wrap-function': 7.20.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.21.8):
     resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
     engines: {node: '>=6.9.0'}
@@ -2043,20 +1865,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helper-replace-supers@7.20.7:
-    resolution: {integrity: sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-member-expression-to-functions': 7.20.7
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-replace-supers@7.21.5:
     resolution: {integrity: sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==}
     engines: {node: '>=6.9.0'}
@@ -2071,13 +1879,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helper-simple-access@7.20.2:
-    resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.21.5
-    dev: true
-
   /@babel/helper-simple-access@7.21.5:
     resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==}
     engines: {node: '>=6.9.0'}
@@ -2107,11 +1908,6 @@ packages:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-option@7.18.6:
-    resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-validator-option@7.21.0:
     resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==}
     engines: {node: '>=6.9.0'}
@@ -2129,17 +1925,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helpers@7.20.7:
-    resolution: {integrity: sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helpers@7.21.5:
     resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==}
     engines: {node: '>=6.9.0'}
@@ -2160,30 +1945,12 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/parser@7.20.7:
-    resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.20.7
-
   /@babel/parser@7.21.8:
     resolution: {integrity: sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
       '@babel/types': 7.21.5
-    dev: true
-
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
 
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==}
@@ -2195,18 +1962,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.13.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.21.8):
     resolution: {integrity: sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==}
     engines: {node: '>=6.9.0'}
@@ -2219,21 +1974,6 @@ packages:
       '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.20.12)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.21.8):
     resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
     engines: {node: '>=6.9.0'}
@@ -2249,19 +1989,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
@@ -2269,22 +1996,8 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.8
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-class-static-block@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
+      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.20.12)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -2303,17 +2016,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
     engines: {node: '>=6.9.0'}
@@ -2325,83 +2027,39 @@ packages:
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.20.12):
+  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.21.8):
     resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
+      '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.20.12)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
+  /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.21.8):
+    resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.8)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
+  /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.21.8):
+    resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.20.12)
-    dev: true
-
-  /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8)
-    dev: true
-
-  /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.20.12)
-    dev: true
-
-  /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
+      '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
       '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
     engines: {node: '>=6.9.0'}
@@ -2413,17 +2071,6 @@ packages:
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
     engines: {node: '>=6.9.0'}
@@ -2435,20 +2082,6 @@ packages:
       '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.21.8):
     resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
     engines: {node: '>=6.9.0'}
@@ -2463,17 +2096,6 @@ packages:
       '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
     engines: {node: '>=6.9.0'}
@@ -2485,42 +2107,6 @@ packages:
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.20.12)
-    dev: true
-
-  /@babel/plugin-proposal-optional-chaining@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8)
-    dev: true
-
-  /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.20.12):
-    resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.20.12)
-    dev: true
-
   /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.21.8):
     resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
     engines: {node: '>=6.9.0'}
@@ -2533,19 +2119,6 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
     engines: {node: '>=6.9.0'}
@@ -2553,23 +2126,8 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.8
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-private-property-in-object@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.20.12(@babel/core@7.20.12)
+      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.20.12)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -2589,17 +2147,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
     engines: {node: '>=4'}
@@ -2611,15 +2158,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.20.12):
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.8):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -2638,15 +2176,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.20.12):
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.8):
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
@@ -2656,16 +2185,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
     engines: {node: '>=6.9.0'}
@@ -2676,15 +2195,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
@@ -2694,15 +2204,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
@@ -2722,16 +2223,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.20.12):
-    resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.21.8):
     resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
     engines: {node: '>=6.9.0'}
@@ -2751,15 +2242,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
@@ -2769,16 +2251,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
@@ -2786,15 +2258,6 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.20.12):
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
@@ -2807,15 +2270,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
@@ -2825,15 +2279,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.20.12):
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.8):
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
@@ -2843,15 +2288,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
@@ -2861,15 +2297,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
@@ -2879,15 +2306,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
@@ -2897,16 +2315,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
     engines: {node: '>=6.9.0'}
@@ -2917,16 +2325,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
@@ -2947,16 +2345,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-arrow-functions@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-arrow-functions@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==}
     engines: {node: '>=6.9.0'}
@@ -2967,94 +2355,40 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.20.12):
+  /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.21.8):
     resolution: {integrity: sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-imports': 7.18.6
+      '@babel/core': 7.21.8
+      '@babel/helper-module-imports': 7.21.4
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.20.12)
+      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.8)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==}
+  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.21.8):
+    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.21.8
-      '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
+  /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.21.8):
+    resolution: {integrity: sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
+      '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-block-scoping@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-classes@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-transform-classes@7.21.0(@babel/core@7.21.8):
     resolution: {integrity: sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==}
     engines: {node: '>=6.9.0'}
@@ -3068,24 +2402,13 @@ packages:
       '@babel/helper-function-name': 7.21.0
       '@babel/helper-optimise-call-expression': 7.18.6
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-replace-supers': 7.20.7
+      '@babel/helper-replace-supers': 7.21.5
       '@babel/helper-split-export-declaration': 7.18.6
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-computed-properties@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/template': 7.20.7
-    dev: true
-
   /@babel/plugin-transform-computed-properties@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==}
     engines: {node: '>=6.9.0'}
@@ -3097,16 +2420,6 @@ packages:
       '@babel/template': 7.20.7
     dev: true
 
-  /@babel/plugin-transform-destructuring@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-destructuring@7.21.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==}
     engines: {node: '>=6.9.0'}
@@ -3117,17 +2430,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
     engines: {node: '>=6.9.0'}
@@ -3139,16 +2441,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.21.8):
     resolution: {integrity: sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==}
     engines: {node: '>=6.9.0'}
@@ -3159,17 +2451,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
     engines: {node: '>=6.9.0'}
@@ -3192,16 +2473,6 @@ packages:
       '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.21.8)
     dev: true
 
-  /@babel/plugin-transform-for-of@7.18.8(@babel/core@7.20.12):
-    resolution: {integrity: sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-for-of@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==}
     engines: {node: '>=6.9.0'}
@@ -3212,18 +2483,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.20.12)
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.21.8):
     resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
     engines: {node: '>=6.9.0'}
@@ -3236,16 +2495,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-literals@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-literals@7.18.9(@babel/core@7.21.8):
     resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
     engines: {node: '>=6.9.0'}
@@ -3256,16 +2505,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
     engines: {node: '>=6.9.0'}
@@ -3276,19 +2515,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.21.8):
     resolution: {integrity: sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==}
     engines: {node: '>=6.9.0'}
@@ -3302,34 +2528,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-simple-access': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-commonjs@7.20.11(@babel/core@7.21.8):
-    resolution: {integrity: sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-simple-access': 7.20.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
     engines: {node: '>=6.9.0'}
@@ -3344,21 +2542,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.20.12):
-    resolution: {integrity: sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-validator-identifier': 7.19.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.21.8):
     resolution: {integrity: sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==}
     engines: {node: '>=6.9.0'}
@@ -3374,19 +2557,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==}
     engines: {node: '>=6.9.0'}
@@ -3400,17 +2570,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==}
     engines: {node: '>=6.9.0'}
@@ -3422,16 +2581,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==}
     engines: {node: '>=6.9.0'}
@@ -3442,19 +2591,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-replace-supers': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
     engines: {node: '>=6.9.0'}
@@ -3463,31 +2599,11 @@ packages:
     dependencies:
       '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-replace-supers': 7.20.7
+      '@babel/helper-replace-supers': 7.21.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-parameters@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==}
     engines: {node: '>=6.9.0'}
@@ -3498,16 +2614,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
     engines: {node: '>=6.9.0'}
@@ -3518,29 +2624,18 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.20.7(@babel/core@7.20.12):
+  /@babel/plugin-transform-react-jsx@7.20.7(@babel/core@7.21.8):
     resolution: {integrity: sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
+      '@babel/core': 7.21.8
       '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.20.12)
-      '@babel/types': 7.20.7
-    dev: true
-
-  /@babel/plugin-transform-regenerator@7.20.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
+      '@babel/helper-module-imports': 7.21.4
       '@babel/helper-plugin-utils': 7.21.5
-      regenerator-transform: 0.15.1
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.8)
+      '@babel/types': 7.21.5
     dev: true
 
   /@babel/plugin-transform-regenerator@7.21.5(@babel/core@7.21.8):
@@ -3554,16 +2649,6 @@ packages:
       regenerator-transform: 0.15.1
     dev: true
 
-  /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==}
     engines: {node: '>=6.9.0'}
@@ -3574,60 +2659,8 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.20.12):
-    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-    dev: true
-
-  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-    dev: true
-
-  /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
-  /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
+  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.21.8):
+    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3636,18 +2669,19 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
+  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.21.8):
+    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
+      '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
+  /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.21.8):
+    resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -3656,13 +2690,13 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.20.12):
-    resolution: {integrity: sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==}
+  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.21.8):
+    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.20.12
+      '@babel/core': 7.21.8
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
@@ -3690,16 +2724,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes@7.18.10(@babel/core@7.20.12):
-    resolution: {integrity: sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-unicode-escapes@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==}
     engines: {node: '>=6.9.0'}
@@ -3710,17 +2734,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.20.12):
-    resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.21.5
-    dev: true
-
   /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.21.8):
     resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
     engines: {node: '>=6.9.0'}
@@ -3732,92 +2745,6 @@ packages:
       '@babel/helper-plugin-utils': 7.21.5
     dev: true
 
-  /@babel/preset-env@7.20.2(@babel/core@7.20.12):
-    resolution: {integrity: sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.20.10
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12)
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-class-static-block': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-dynamic-import': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-proposal-json-strings': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-logical-assignment-operators': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-proposal-private-property-in-object': 7.20.5(@babel/core@7.20.12)
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.20.12)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.20.12)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.20.12)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.20.12)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.20.12)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.20.12)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.20.12)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.20.12)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.20.12)
-      '@babel/plugin-transform-arrow-functions': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-block-scoping': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-classes': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-computed-properties': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-destructuring': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-for-of': 7.18.8(@babel/core@7.20.12)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.20.12)
-      '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.20.12)
-      '@babel/plugin-transform-new-target': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-parameters': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-regenerator': 7.20.5(@babel/core@7.20.12)
-      '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.20.12)
-      '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.20.12)
-      '@babel/plugin-transform-unicode-escapes': 7.18.10(@babel/core@7.20.12)
-      '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/preset-modules': 0.1.5(@babel/core@7.20.12)
-      '@babel/types': 7.21.5
-      babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.20.12)
-      babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.20.12)
-      babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.20.12)
-      core-js-compat: 3.27.1
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/preset-env@7.21.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==}
     engines: {node: '>=6.9.0'}
@@ -3917,19 +2844,6 @@ packages:
       '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.21.8)
     dev: true
 
-  /@babel/preset-modules@0.1.5(@babel/core@7.20.12):
-    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.20.12)
-      '@babel/types': 7.21.5
-      esutils: 2.0.3
-    dev: true
-
   /@babel/preset-modules@0.1.5(@babel/core@7.21.8):
     resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
     peerDependencies:
@@ -3971,26 +2885,18 @@ packages:
       source-map-support: 0.5.21
     dev: true
 
-  /@babel/runtime-corejs3@7.20.7:
-    resolution: {integrity: sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      core-js-pure: 3.27.1
-      regenerator-runtime: 0.13.11
-    dev: true
-
   /@babel/runtime@7.19.4:
     resolution: {integrity: sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
+    dev: false
 
   /@babel/runtime@7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
-    dev: true
 
   /@babel/template@7.20.7:
     resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
@@ -4001,24 +2907,6 @@ packages:
       '@babel/types': 7.21.5
     dev: true
 
-  /@babel/traverse@7.20.12:
-    resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.5
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
-      debug: 4.3.4(supports-color@8.1.1)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/traverse@7.21.5:
     resolution: {integrity: sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==}
     engines: {node: '>=6.9.0'}
@@ -4037,14 +2925,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/types@7.20.7:
-    resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.21.5
-      '@babel/helper-validator-identifier': 7.19.1
-      to-fast-properties: 2.0.0
-
   /@babel/types@7.21.5:
     resolution: {integrity: sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==}
     engines: {node: '>=6.9.0'}
@@ -4052,7 +2932,6 @@ packages:
       '@babel/helper-string-parser': 7.21.5
       '@babel/helper-validator-identifier': 7.19.1
       to-fast-properties: 2.0.0
-    dev: true
 
   /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
@@ -4159,6 +3038,11 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
+  /@ctrl/tinycolor@3.6.0:
+    resolution: {integrity: sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==}
+    engines: {node: '>=10'}
+    dev: false
+
   /@curlconverter/yargs-parser@0.0.1:
     resolution: {integrity: sha512-DbEVRYqrorzwqc63MQ3RODflut1tNla8ZCKo1h83lF7+fbntgubZsDfRDBv5Lxj3vkKuvAolysNM2ekwJev8wA==}
     engines: {node: '>=10'}
@@ -4223,6 +3107,14 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: true
 
+  /@element-plus/icons-vue@2.1.0(vue@3.3.4):
+    resolution: {integrity: sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==}
+    peerDependencies:
+      vue: ^3.2.0
+    dependencies:
+      vue: 3.3.4
+    dev: false
+
   /@emotion/use-insertion-effect-with-fallbacks@1.0.0(react@17.0.2):
     resolution: {integrity: sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==}
     peerDependencies:
@@ -4635,6 +3527,16 @@ packages:
     resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
     dev: true
 
+  /@floating-ui/core@1.3.1:
+    resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==}
+    dev: false
+
+  /@floating-ui/dom@1.4.5:
+    resolution: {integrity: sha512-96KnRWkRnuBSSFbj0sFGwwOUd8EkiecINVl0O9wiZlZ64EkpyAOG3Xc2vKKNJmru0Z7RqWNymA+6b8OZqjgyyw==}
+    dependencies:
+      '@floating-ui/core': 1.3.1
+    dev: false
+
   /@fontsource/open-sans@4.5.12:
     resolution: {integrity: sha512-WKCexsVbOECJUSOgG7GnrUxe+3ds4Sa1yhsTjSnszI+0TaJvMZnDnn5YDKwA/KwLbkZqCaV3nvMTH97jJuxWNA==}
     dev: false
@@ -4667,25 +3569,14 @@ packages:
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
 
-  /@fortawesome/vue-fontawesome@2.0.10(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14):
-    resolution: {integrity: sha512-OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg==}
-    peerDependencies:
-      '@fortawesome/fontawesome-svg-core': ~1 || ~6
-      vue: ~2
-    dependencies:
-      '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 2.7.14
-    dev: false
-
-  /@fortawesome/vue-fontawesome@2.0.9(@fortawesome/fontawesome-svg-core@1.2.36)(vue@2.7.14):
-    resolution: {integrity: sha512-tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw==}
+  /@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4):
+    resolution: {integrity: sha512-KCPHi9QemVXGMrfuwf3nNnNo129resAIQWut9QTAMXmXqL2ErABC6ohd2yY5Ipq0CLWNbKHk8TMdTXL/Zf3ZhA==}
     peerDependencies:
       '@fortawesome/fontawesome-svg-core': ~1 || ~6
-      vue: ~2
+      vue: '>= 3.0.0 < 4'
     dependencies:
       '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 2.7.14
-    dev: true
+      vue: 3.3.4
 
   /@gar/promisify@1.1.3:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
@@ -4774,6 +3665,44 @@ packages:
       xregexp: 2.0.0
     dev: false
 
+  /@intlify/core-base@9.2.2:
+    resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/devtools-if': 9.2.2
+      '@intlify/message-compiler': 9.2.2
+      '@intlify/shared': 9.2.2
+      '@intlify/vue-devtools': 9.2.2
+    dev: false
+
+  /@intlify/devtools-if@9.2.2:
+    resolution: {integrity: sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/shared': 9.2.2
+    dev: false
+
+  /@intlify/message-compiler@9.2.2:
+    resolution: {integrity: sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/shared': 9.2.2
+      source-map: 0.6.1
+    dev: false
+
+  /@intlify/shared@9.2.2:
+    resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==}
+    engines: {node: '>= 14'}
+    dev: false
+
+  /@intlify/vue-devtools@9.2.2:
+    resolution: {integrity: sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==}
+    engines: {node: '>= 14'}
+    dependencies:
+      '@intlify/core-base': 9.2.2
+      '@intlify/shared': 9.2.2
+    dev: false
+
   /@ioredis/commands@1.2.0:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
     dev: false
@@ -4990,7 +3919,7 @@ packages:
     resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.20.12
+      '@babel/core': 7.21.8
       '@jest/types': 29.5.0
       '@jridgewell/trace-mapping': 0.3.17
       babel-plugin-istanbul: 6.1.1
@@ -5009,17 +3938,6 @@ packages:
       - supports-color
     dev: true
 
-  /@jest/types@26.6.2:
-    resolution: {integrity: sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
-      '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.16.16
-      '@types/yargs': 15.0.15
-      chalk: 4.1.2
-    dev: true
-
   /@jest/types@29.5.0:
     resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -5037,7 +3955,7 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
+      '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
   /@jridgewell/gen-mapping@0.3.2:
@@ -5045,7 +3963,7 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
+      '@jridgewell/sourcemap-codec': 1.4.15
       '@jridgewell/trace-mapping': 0.3.17
     dev: true
 
@@ -5070,6 +3988,9 @@ packages:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
     dev: true
 
+  /@jridgewell/sourcemap-codec@1.4.15:
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+
   /@jridgewell/trace-mapping@0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
@@ -5549,18 +4470,22 @@ packages:
     engines: {node: '>=12.0.0'}
     dev: false
 
+  /@one-ini/wasm@0.1.1:
+    resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
+    dev: true
+
   /@opentelemetry/api@1.2.0:
     resolution: {integrity: sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==}
     engines: {node: '>=8.0.0'}
     dev: false
 
-  /@pinia/testing@0.0.14(pinia@2.0.23)(vue@2.7.14):
+  /@pinia/testing@0.0.14(pinia@2.0.23)(vue@3.3.4):
     resolution: {integrity: sha512-ZmZwVNd/NnKYLIfjfuKl0zlJ3UdiXFpsHzSlL6wCeezSlyrqGMxsIQKv0J6fleu38gyCNTPBEipfxrt8V4+VIg==}
     peerDependencies:
       pinia: '>=2.0.19'
     dependencies:
-      pinia: 2.0.23(typescript@5.1.3)(vue@2.7.14)
-      vue-demi: 0.13.11(vue@2.7.14)
+      pinia: 2.0.23(typescript@5.1.3)(vue@3.3.4)
+      vue-demi: 0.13.11(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -5771,8 +4696,8 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@storybook/addon-actions@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-WxsnSjAvdf6NhUfTqcwV+FJmsJV56gh2cY4QnGfqfwO5zoBWTUYnhz57TgxSMhJY0kspyX9Q1Kc//r1d5lt1qA==}
+  /@storybook/addon-a11y@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-bUpJXzXm6cVcHdyIzN004m/mC/yU314dBRrmXmnuZQV5FYuaykrJ7BxmjlsZovl/UZ5fcPm3TdstqqQ1UJMsrQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5782,14 +4707,42 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.7
+      '@storybook/addon-highlight': 7.0.21
+      '@storybook/channels': 7.0.21
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
+      axe-core: 4.7.2
+      lodash: 4.17.21
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+      react-resize-detector: 7.1.2(react-dom@18.2.0)(react@17.0.2)
+    dev: true
+
+  /@storybook/addon-actions@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-wYH1rDHY4KzLkNeXiMonrAZ4uIZFJVjo3E439mWylnJRqs6lKukCU3iHUx02J0KKeJH+GywRg87B/i42qQK62g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
+    dependencies:
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       dequal: 2.0.3
       lodash: 4.17.21
       polished: 4.2.2
@@ -5802,8 +4755,8 @@ packages:
       uuid: 9.0.0
     dev: true
 
-  /@storybook/addon-backgrounds@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-DhT32K1+ti7MXY9oqt36b9jlg7iY68IP0ZQbR3gjShcsIXZpFqh18TQo0vwDY1ldqnBvkTk6Jd5vcxA8tfyshw==}
+  /@storybook/addon-backgrounds@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-dTifOZQsldBCu5de9p6ucNTh1AwjnbTfy4jj593zUAjnDHaGHvWTSlpvksdYuQ2ru+SdZd6xwGcrk4wyMIo/6g==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5813,22 +4766,22 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-controls@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-/QEzleKoWRQ3i7KB32QvqDGcGMw4kG2BxEf0d+ymxd2SjoeL6kX2eHE0b4OxFPXiWUyTfXBFwmcI2Re3fRUJnQ==}
+  /@storybook/addon-controls@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-EDYidCent5P8GBiJeeHIi/apGS76icFEFLmGcSZod1Smzdt7546bb61ozf1fz3qe2wJRoVCnmRazCo4Zqc4iWA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5838,15 +4791,15 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/blocks': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.7
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.7
-      '@storybook/preview-api': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/blocks': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-common': 7.0.21
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/node-logger': 7.0.21
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       lodash: 4.17.21
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
@@ -5855,29 +4808,29 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-docs@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-5PT7aiTD6QPH+4CZLcv4PiUgWucD9JNGHVMRbQMEyFW6qbs87dHmu1m1uXIvx3BF5h3mTo4FHNAf8IQIq5HH9w==}
+  /@storybook/addon-docs@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-eJxNCMZLN9QHmpEMPoWKw8m6TqL+R38F7fRYuJAAB9VICF8nBn79QD46yKlSxL6UXGyhFmtuQn/Wf3E3a7ywEw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/plugin-transform-react-jsx': 7.20.7(@babel/core@7.20.12)
+      '@babel/core': 7.21.8
+      '@babel/plugin-transform-react-jsx': 7.20.7(@babel/core@7.21.8)
       '@jest/transform': 29.5.0
       '@mdx-js/react': 2.3.0(react@17.0.2)
-      '@storybook/blocks': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/csf-plugin': 7.0.7
-      '@storybook/csf-tools': 7.0.7
+      '@storybook/blocks': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/csf-plugin': 7.0.21
+      '@storybook/csf-tools': 7.0.21
       '@storybook/global': 5.0.0
       '@storybook/mdx2-csf': 1.0.0
-      '@storybook/node-logger': 7.0.7
-      '@storybook/postinstall': 7.0.7
-      '@storybook/preview-api': 7.0.7
-      '@storybook/react-dom-shim': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/node-logger': 7.0.21
+      '@storybook/postinstall': 7.0.21
+      '@storybook/preview-api': 7.0.21
+      '@storybook/react-dom-shim': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       fs-extra: 11.1.0
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
@@ -5888,25 +4841,25 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-essentials@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-uNx0BvN1XP7cNnk/L4oiFQlEB/KABqOeIyI8/mhfIyTvvwo9uAYIQAyiwWuz9MFmofCNm7CgLNOUaEwNDkM4CA==}
+  /@storybook/addon-essentials@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-XWPuYpvV30Jp/L/now+yGh7qmx433bvUdKZak8Mg/6U7s84xhWIncAyXoB4ptDE4MlggRAdTEqvkmCybHvY7uw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/addon-actions': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-backgrounds': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-controls': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-docs': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-highlight': 7.0.7
-      '@storybook/addon-measure': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-outline': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-toolbars': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-viewport': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.7
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.7
-      '@storybook/preview-api': 7.0.7
+      '@storybook/addon-actions': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-backgrounds': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-controls': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-docs': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-highlight': 7.0.21
+      '@storybook/addon-measure': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-outline': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-toolbars': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-viewport': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-common': 7.0.21
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/node-logger': 7.0.21
+      '@storybook/preview-api': 7.0.21
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
@@ -5914,16 +4867,16 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/addon-highlight@7.0.7:
-    resolution: {integrity: sha512-expme2GzzCXX7/lL7UjCDi1Tfj+4LeNsAdWiurVLH7glK7yKPPeXXkIldbLP/XjJv4NKlqCwnNRHQx0vDLlE6g==}
+  /@storybook/addon-highlight@7.0.21:
+    resolution: {integrity: sha512-BMMkqLza05VeQl4+U7Gb9GrYm0BnLCU0WzcpPXlqbAZhRw1KliXyofH8buVzXoJ1Ozr9+sOHgc3ujThOrG3KAQ==}
     dependencies:
-      '@storybook/core-events': 7.0.7
+      '@storybook/core-events': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.0.7
+      '@storybook/preview-api': 7.0.21
     dev: true
 
-  /@storybook/addon-links@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-DEjDxjHb3mT8Sdnx4In5Ev9gJ/XdjlHOq4iuy0wnMyrCV4wnzTQnIeSCx8nkrXFb314zc33JPnCcrb5pQoD5GQ==}
+  /@storybook/addon-links@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-QqbjnYn+516rMfb5JNhI5RZoa+uh1gVMN0iNKfcgF9tE4Ts7tY0OIody11bhBZksb6ryv4mIe4jIGUMW3DgcgA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5933,22 +4886,22 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/core-events': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/core-events': 7.0.21
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/router': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/router': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       prop-types: 15.8.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-measure@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-lb4wEIvIVF+ePx1sC+n9rDI0+49sRa6MWbcvZ+BhbAoCeGcX7uACQFdW6HyXolmBuZASsTnzVQ4KqzzvY1dSWw==}
+  /@storybook/addon-measure@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-In31QpV810NgHT9wrIXnLOwTnySvm86D1rksDlTunq4EOnE3Q4ngw+oM6JBPn+UhMOHnZGfwBHxOCOsF5DNHtQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5958,19 +4911,19 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/types': 7.0.7
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/types': 7.0.21
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
-  /@storybook/addon-outline@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-AxbNZ4N1fXBTeMYM9tFudfW+Gzq7UikCjPxn5ax3Pde+zZjaEMppUxv5EMz4g5GIJupLYRmKH5pN0YcYoRLY6w==}
+  /@storybook/addon-outline@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-2NaIixgLjEvGRinLPw7R4VWfZURuce4acpkhjF3QYLqaWCYzxch4nw50fVu2FAPHB3uYh5tjllG9IyMY9PEClQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5980,13 +4933,13 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/types': 7.0.7
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/types': 7.0.21
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
@@ -6005,8 +4958,8 @@ packages:
       - webpack
     dev: true
 
-  /@storybook/addon-toolbars@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-/NkYHhU1VAz5lXjWuV8+ADWB84HzktvZv4jfiKX7Zzu6JVzrBu7FotQSWh3pDqqVwCB50RClUGtcHmSSac9CAQ==}
+  /@storybook/addon-styling@1.3.0(less@4.1.3)(postcss@8.4.21)(react-dom@18.2.0)(react@17.0.2)(sass@1.63.4)(webpack@5.75.0):
+    resolution: {integrity: sha512-+Ak9+SysMepRdXGlqDBlhR4cOSDCFEIfGuOW7nyA5eOgHi0IyTg9M+yfBgHVru7dEh+rq47XTVr44UhsWd4xgA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6016,17 +4969,40 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
+      '@babel/template': 7.20.7
+      '@babel/types': 7.21.5
+      '@storybook/api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-common': 7.0.21
+      '@storybook/core-events': 7.0.21
+      '@storybook/csf-tools': 7.0.21
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/node-logger': 7.0.21
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
+      css-loader: 6.7.3(webpack@5.75.0)
+      less-loader: 11.1.3(less@4.1.3)(webpack@5.75.0)
+      postcss-loader: 7.3.3(postcss@8.4.21)(webpack@5.75.0)
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
+      recast: 0.23.3
+      resolve-url-loader: 5.0.0
+      sass-loader: 13.3.2(sass@1.63.4)(webpack@5.75.0)
+      style-loader: 3.3.3(webpack@5.75.0)
+    transitivePeerDependencies:
+      - fibers
+      - less
+      - node-sass
+      - postcss
+      - sass
+      - sass-embedded
+      - supports-color
+      - webpack
     dev: true
 
-  /@storybook/addon-viewport@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-znqhd8JFEFoXcAdwYhz1CwrCpVAzhuSyUVBUNDsDs+mgBEfGth4D4abIdWWGcfP6+CmI5ebFHtk443cExZebag==}
+  /@storybook/addon-toolbars@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-5Fgv1gxSVALvRG7bwm+laLT87Np2BBniPaDzJArItic80LivX5N9/duJ2CO6fjZMu4IVq80F4ESj/LfWTbPJVw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6036,13 +5012,33 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
+  /@storybook/addon-viewport@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-OYi5+cB7Fk4ArUpQRK6WrbkaGC1tdSDr8gJkh6Uq7DyCnkQSb01WxEoBMHAgUtVZG26SCquk+Q50LntUmepb9Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
+    dependencies:
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
       memoizerific: 1.11.3
       prop-types: 15.8.1
       react: 17.0.2
@@ -6063,7 +5059,7 @@ packages:
       '@storybook/router': 6.5.15(react-dom@18.2.0)(react@17.0.2)
       '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
       '@types/webpack-env': 1.18.0
-      core-js: 3.27.2
+      core-js: 3.31.0
       global: 4.4.0
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
@@ -6096,7 +5092,7 @@ packages:
       '@storybook/router': 6.5.15(react-dom@18.2.0)(react@17.0.2)
       '@storybook/semver': 7.3.2
       '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      core-js: 3.27.2
+      core-js: 3.31.0
       fast-deep-equal: 3.1.3
       global: 4.4.0
       lodash: 4.17.21
@@ -6127,23 +5123,40 @@ packages:
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
-  /@storybook/blocks@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-ehR0hAFWNHHqmrmbwYPKhLpgbIBKtyMbeoGClTRSnrVBGONciYJdmxegkCTReUklCY+HBJjtlwNowT+7+5sSaw==}
+  /@storybook/api@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-beZ9NbGOkFqPBVnZLE67Q5b7hBKwm+OINbeN9DC5v8jrJmU/seLFs/itKzW2tEUFadyMjhJv+kcpyPjxK77m4g==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
     dependencies:
-      '@storybook/channels': 7.0.7
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.7
+      '@storybook/client-logger': 7.1.1
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
+  /@storybook/blocks@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-afyr5qR2uO2gsJEXlzXPhOhMg0tAkUga5WbHQYF+7BxODYRXyXWhx95E1UHulgwTwgZHdzTrON4DmPH8M7NK0A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@storybook/channels': 7.0.21
+      '@storybook/client-logger': 7.0.21
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
       '@storybook/csf': 0.1.0
-      '@storybook/docs-tools': 7.0.7
+      '@storybook/docs-tools': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       '@types/lodash': 4.14.195
       color-convert: 2.0.1
       dequal: 2.0.3
@@ -6161,13 +5174,13 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-manager@7.0.7:
-    resolution: {integrity: sha512-VI/0iEjAlzQDt1yKu8GXugNIz7t46IHIKgMNmltQ05KPypMgInUoMmbfP5AYOVddjLdSqjMLO7EK58pBLOInpw==}
+  /@storybook/builder-manager@7.0.21:
+    resolution: {integrity: sha512-end2biIWtnDLd2JHGphxjNApfjzc76VMU6unhY1LnIi+uDNCbu+KcHcsaz8LHSLpTX4td5+AEuJNqSUOyaNtsQ==}
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 7.0.7
-      '@storybook/manager': 7.0.7
-      '@storybook/node-logger': 7.0.7
+      '@storybook/core-common': 7.0.21
+      '@storybook/manager': 7.0.21
+      '@storybook/node-logger': 7.0.21
       '@types/ejs': 3.1.1
       '@types/find-cache-dir': 3.2.1
       '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.17.18)
@@ -6184,70 +5197,56 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-webpack5@7.0.7(esbuild@0.17.18)(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vue-template-compiler@2.7.14):
-    resolution: {integrity: sha512-VdPPgQau9150arge3IVW+CkVBNwkQgmtJlUst7pIe/7lTP/m+ClWLTfhdkZHZk5Qb24EAdq6rmEO3LlvRBMUAg==}
+  /@storybook/builder-vite@7.0.21(typescript@5.1.3)(vite@4.0.4):
+    resolution: {integrity: sha512-Zves9giQs6oxsQeGKdmwlaywQaz9ZZqArgOzgYb8WytoDSlVrK81BzZN+gsm6cdxPOzdjOma2KhWi5YTz/d/Zg==}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
+      '@preact/preset-vite': '*'
+      typescript: '>= 4.3.x'
+      vite: ^3.0.0 || ^4.0.0
+      vite-plugin-glimmerx: '*'
     peerDependenciesMeta:
+      '@preact/preset-vite':
+        optional: true
       typescript:
         optional: true
-    dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/addons': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/channel-postmessage': 7.0.7
-      '@storybook/channel-websocket': 7.0.7
-      '@storybook/channels': 7.0.7
-      '@storybook/client-api': 7.0.7
-      '@storybook/client-logger': 7.0.7
-      '@storybook/components': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.7
-      '@storybook/core-events': 7.0.7
-      '@storybook/core-webpack': 7.0.7
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.7
-      '@storybook/preview': 7.0.7
-      '@storybook/preview-api': 7.0.7
-      '@storybook/router': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/store': 7.0.7
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@types/node': 18.16.16
-      '@types/semver': 7.3.13
-      babel-loader: 9.1.2(@babel/core@7.20.12)(webpack@5.75.0)
-      babel-plugin-named-exports-order: 0.0.2
+      vite-plugin-glimmerx:
+        optional: true
+    dependencies:
+      '@storybook/channel-postmessage': 7.0.21
+      '@storybook/channel-websocket': 7.0.21
+      '@storybook/client-logger': 7.0.21
+      '@storybook/core-common': 7.0.21
+      '@storybook/csf-plugin': 7.0.21
+      '@storybook/mdx2-csf': 1.0.0
+      '@storybook/node-logger': 7.0.21
+      '@storybook/preview': 7.0.21
+      '@storybook/preview-api': 7.0.21
+      '@storybook/types': 7.0.21
       browser-assert: 1.2.1
-      case-sensitive-paths-webpack-plugin: 2.4.0
-      css-loader: 6.7.3(webpack@5.75.0)
+      es-module-lexer: 0.9.3
       express: 4.18.2
-      fork-ts-checker-webpack-plugin: 6.5.2(typescript@5.1.3)(vue-template-compiler@2.7.14)(webpack@5.75.0)
       fs-extra: 11.1.0
-      html-webpack-plugin: 5.5.0(webpack@5.75.0)
-      path-browserify: 1.0.1
-      process: 0.11.10
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      semver: 7.5.4
-      style-loader: 3.3.1(webpack@5.75.0)
-      terser-webpack-plugin: 5.3.6(esbuild@0.17.18)(webpack@5.75.0)
-      ts-dedent: 2.2.0
+      glob: 8.1.0
+      glob-promise: 6.0.2(glob@8.1.0)
+      magic-string: 0.27.0
+      remark-external-links: 8.0.0
+      remark-slug: 6.1.0
+      rollup: 3.10.0
       typescript: 5.1.3
-      util: 0.12.5
-      util-deprecate: 1.0.2
-      webpack: 5.75.0(esbuild@0.17.18)
-      webpack-dev-middleware: 5.3.3(webpack@5.75.0)
-      webpack-hot-middleware: 2.25.3
-      webpack-virtual-modules: 0.4.6
+      vite: 4.0.4(less@4.1.3)(sass@1.63.4)
     transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - eslint
       - supports-color
-      - uglify-js
-      - vue-template-compiler
-      - webpack-cli
+    dev: true
+
+  /@storybook/channel-postmessage@7.0.21:
+    resolution: {integrity: sha512-zlm40ZMhi76gVPMJsOLyorcKQy4RpAoVQfdXne83x+xP/A2ppOyXEAhC9pQ5oaKM+ag3EQuIS+yK4zGIeriaYg==}
+    dependencies:
+      '@storybook/channels': 7.0.21
+      '@storybook/client-logger': 7.0.21
+      '@storybook/core-events': 7.0.21
+      '@storybook/global': 5.0.0
+      qs: 6.11.0
+      telejson: 7.0.4
     dev: true
 
   /@storybook/channel-postmessage@7.0.7:
@@ -6261,11 +5260,11 @@ packages:
       telejson: 7.0.4
     dev: true
 
-  /@storybook/channel-websocket@7.0.7:
-    resolution: {integrity: sha512-KDbLiQts4/dCow3qk5WJSPA6SlaX3iP9RhF0Fjj03hoG2TRskrvo+AkUiJr8gF6dpkPndfuCYUCRsO2Ml8B+AA==}
+  /@storybook/channel-websocket@7.0.21:
+    resolution: {integrity: sha512-YX0h1CAHFNh4i0CsbIwEAMQsHxHhZXgN5SD5I0QGgqttErN4an90k4aah9MNnkyLO8Af9nFp2wL8Nj/yPmJ5bA==}
     dependencies:
-      '@storybook/channels': 7.0.7
-      '@storybook/client-logger': 7.0.7
+      '@storybook/channels': 7.0.21
+      '@storybook/client-logger': 7.0.21
       '@storybook/global': 5.0.0
       telejson: 7.0.4
     dev: true
@@ -6273,29 +5272,44 @@ packages:
   /@storybook/channels@6.5.15:
     resolution: {integrity: sha512-gPpsBgirv2NCXbH4WbYqdkI0JLE96aiVuu7UEWfn9yu071pQ9CLHbhXGD9fSFNrfOkyBBY10ppSE7uCXw3Wexg==}
     dependencies:
-      core-js: 3.27.2
+      core-js: 3.31.0
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
     dev: true
 
+  /@storybook/channels@7.0.21:
+    resolution: {integrity: sha512-8h4lvGQsdWrn/eLW9D9ZGB8FGTzRuC1almykVThb9SkATKZjUyUvtRT+BklsDIinptham83+0QiSdTrv52kAfA==}
+    dev: true
+
   /@storybook/channels@7.0.7:
     resolution: {integrity: sha512-Om4ovBLNw8pVrBu83MpOKgAuGO9Dpr1Coh2qp8t64WRPkejX1mxOY9IgH723//zH3igx8LCkf9rvBvcrsyaScQ==}
     dev: true
 
-  /@storybook/cli@7.0.7:
-    resolution: {integrity: sha512-koTkWr7wlaHF14T5moRP/tYM44+Jf4GEzQ/rqx/Jfn7EbNlVUOibdLJj4JnseMGRc7ZP6tKYku2n+B8g7hJX4w==}
+  /@storybook/channels@7.1.1:
+    resolution: {integrity: sha512-uhkZFtLIeRnbBhyLlvQAZQmsRbftX/YMGQL+9WRzICrCkwl4xfZPAvMxEgCj1iJzNFcaX5ma9XzHb7q/i+wUCw==}
+    dependencies:
+      '@storybook/client-logger': 7.1.1
+      '@storybook/core-events': 7.1.1
+      '@storybook/global': 5.0.0
+      qs: 6.11.0
+      telejson: 7.0.4
+      tiny-invariant: 1.3.1
+    dev: true
+
+  /@storybook/cli@7.0.21:
+    resolution: {integrity: sha512-emLFo3CUKFvJJscuJZPTHDPqw7xfV06DAnTH2HskQQN6lhscWYuY+fK804iyk+FTRYZwaHJSyECYmYm06Q1H9w==}
     hasBin: true
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/preset-env': 7.20.2(@babel/core@7.20.12)
+      '@babel/core': 7.21.8
+      '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
       '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 7.0.7
-      '@storybook/core-common': 7.0.7
-      '@storybook/core-server': 7.0.7
-      '@storybook/csf-tools': 7.0.7
-      '@storybook/node-logger': 7.0.7
-      '@storybook/telemetry': 7.0.7
-      '@storybook/types': 7.0.7
+      '@storybook/codemod': 7.0.21
+      '@storybook/core-common': 7.0.21
+      '@storybook/core-server': 7.0.21
+      '@storybook/csf-tools': 7.0.21
+      '@storybook/node-logger': 7.0.21
+      '@storybook/telemetry': 7.0.21
+      '@storybook/types': 7.0.21
       '@types/semver': 7.3.13
       boxen: 5.1.2
       chalk: 4.1.2
@@ -6311,8 +5325,9 @@ packages:
       get-port: 5.1.1
       giget: 1.0.0
       globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.20.2)
+      jscodeshift: 0.14.0(@babel/preset-env@7.21.5)
       leven: 3.1.0
+      ora: 5.4.1
       prettier: 2.8.3
       prompts: 2.4.2
       puppeteer-core: 2.1.1
@@ -6331,42 +5346,47 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/client-api@7.0.7:
-    resolution: {integrity: sha512-O8HLBWR4TVuUifF8RBSi5++TjetSlQ6bgtGEWLkmPB9+135gczJuRYAZ7xbNw2xACzFa5KWka4OE30+MXOUiDA==}
-    dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/preview-api': 7.0.7
-    dev: true
-
   /@storybook/client-logger@6.5.15:
     resolution: {integrity: sha512-0uyxKvodq+FycGv6aUwC1wUR6suXf2+7ywMFAOlYolI4UvNj8NyU/5AfgKT5XnxYAgPmoCiAjOE700TrfHrosw==}
     dependencies:
-      core-js: 3.27.2
+      core-js: 3.31.0
       global: 4.4.0
     dev: true
 
+  /@storybook/client-logger@7.0.21:
+    resolution: {integrity: sha512-ENoBDuVr3RPepm6cBp61GGtGGUuogBzqMUaN4Rti+wYx9sKJlmDA8SR/fMk+GxeiJ5NOnYoa1Q1kCaF8/VFD9A==}
+    dependencies:
+      '@storybook/global': 5.0.0
+    dev: true
+
   /@storybook/client-logger@7.0.7:
     resolution: {integrity: sha512-EclHjDs5HwHMKB4X2orn/KKA0DTIDmp4AXAUJGRfxb5ArpKEb7tXLHsgrRBlaoz1j5LAwKTmEyZOONh9G3etjg==}
     dependencies:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/codemod@7.0.7:
-    resolution: {integrity: sha512-VlkDlkvfbzLe+NOmzs5zGrGb4jnaeAFZqpvIkXxevr6aGcOwgeelNv8gTmgBAcy+xbGW4Pp0XA2BlMweIvKEKA==}
+  /@storybook/client-logger@7.1.1:
+    resolution: {integrity: sha512-R0bdVjzJ5CwLNAG3XMyMZ0e9XDteBkFkTTIZJ9m+WMh/+oa2PInCpXDxoYb180UI6abrqh1jEaAsrHMC1pTKnA==}
+    dependencies:
+      '@storybook/global': 5.0.0
+    dev: true
+
+  /@storybook/codemod@7.0.21:
+    resolution: {integrity: sha512-0ZGoNLstaELNb+e2njEmtiMv9gDxBIYKz2xei6Mv9HcaEzIVF0TnRE0Y+gIfCEbNAAERiytaHLkl5TAnE3/LrA==}
     dependencies:
       '@babel/core': 7.21.8
       '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
       '@babel/types': 7.21.5
       '@storybook/csf': 0.1.0
-      '@storybook/csf-tools': 7.0.7
-      '@storybook/node-logger': 7.0.7
-      '@storybook/types': 7.0.7
+      '@storybook/csf-tools': 7.0.21
+      '@storybook/node-logger': 7.0.21
+      '@storybook/types': 7.0.21
       cross-spawn: 7.0.3
       globby: 11.1.0
       jscodeshift: 0.14.0(@babel/preset-env@7.21.5)
       lodash: 4.17.21
       prettier: 2.8.3
-      recast: 0.23.1
+      recast: 0.23.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6380,7 +5400,7 @@ packages:
       '@storybook/client-logger': 6.5.15
       '@storybook/csf': 0.0.2--canary.4566f4d.1
       '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      core-js: 3.27.2
+      core-js: 3.31.0
       memoizerific: 1.11.3
       qs: 6.11.0
       react: 17.0.2
@@ -6389,17 +5409,17 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/components@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-6PLs9LMkBuhH/w4bSJ72tYgICMbOOIHuoB/fQdVlzhsdnXL2fM/v4RVW2N7v+Oz3lYXp/JtV8V9Ub8h6eDQKXg==}
+  /@storybook/components@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-5h3ptaQxSwFetd0dhlNTZeaLfDYY7Mj9n/N6pTs71piW5gaM+o/Na7EMhuDDWa001zBXYdJYdcKU/a7FDQDuGQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/client-logger': 7.0.7
+      '@storybook/client-logger': 7.0.21
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/theming': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.7
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
@@ -6407,18 +5427,18 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/core-client@7.0.7:
-    resolution: {integrity: sha512-eydcpR28qV3A3BwR5V6wsixoI1BRLA0SzFiwH/1ajrgX13inv+gV97gHv47Ojf/+YAZ3HqdVaUKFsUfMKwKieA==}
+  /@storybook/core-client@7.0.21:
+    resolution: {integrity: sha512-J3MIJoVCN4M9exC8DVzRqtG6SyINQ0yHXhzjfdCfmHP9OqU7ObywqEFJgMot7By9g/p39Ceqzz6ISbMySw+pmg==}
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/preview-api': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/preview-api': 7.0.21
     dev: true
 
-  /@storybook/core-common@7.0.7:
-    resolution: {integrity: sha512-c8T24wex9bnCYdZVZFNX4VV+wfhrp47OLzVONZDqxMhq6G//Bgv5zH4Awcx5UfWf/05VcP7KGF1VKj8ebRyEEA==}
+  /@storybook/core-common@7.0.21:
+    resolution: {integrity: sha512-hxQXufZxbrDqASTfrJ/C4PlIvRwwmdElOrnzeWA4e4pRGK2YUInAsKxN7WKRDL42fBLfrHo3XmdshkvPej4M4A==}
     dependencies:
-      '@storybook/node-logger': 7.0.7
-      '@storybook/types': 7.0.7
+      '@storybook/node-logger': 7.0.21
+      '@storybook/types': 7.0.21
       '@types/node': 18.16.16
       '@types/pretty-hrtime': 1.0.1
       chalk: 4.1.2
@@ -6443,30 +5463,38 @@ packages:
   /@storybook/core-events@6.5.15:
     resolution: {integrity: sha512-B1Ba6l5W7MeNclclqMMTMHgYgfdpB5SIhNCQFnzIz8blynzRhNFMdxvbAl6Je5G0S4xydYYd7Lno2kXQebs7HA==}
     dependencies:
-      core-js: 3.27.2
+      core-js: 3.31.0
+    dev: true
+
+  /@storybook/core-events@7.0.21:
+    resolution: {integrity: sha512-Qjtjrj+hFaC3b00p6q2aAxyLaRQWBf5eEPw5r0djcm5esXIs/q2xvu2xby7PR6KnKg/jT1bU9TOBxWbtKycijQ==}
     dev: true
 
   /@storybook/core-events@7.0.7:
     resolution: {integrity: sha512-XNsR2RgaL2vBwuqsu+KA1DzGmB1UFfrAhpxhmyWTKDCniwtTLlaXgfKbqwcrOrPu/o1YswgIup/9UHepRHaf4A==}
     dev: true
 
-  /@storybook/core-server@7.0.7:
-    resolution: {integrity: sha512-PB4zoClH7aKG4XeJhxx43iK9n/C9gctXubNN5DSN6thPm4UITOas+/q4N7AHbCPyRbcMyoW7M31KtpzZu4Fjew==}
+  /@storybook/core-events@7.1.1:
+    resolution: {integrity: sha512-P5iI4zvCJo85de/sghglEHFK/GGkWAQQKzRFrz9kbVBX5LNaosfD7IYHIz/6ZWNPzxWR+RBOKcrRUfcArL4Njg==}
+    dev: true
+
+  /@storybook/core-server@7.0.21:
+    resolution: {integrity: sha512-8MX+tdgiwscQLdoTtlI+jg1Hr76AvE1B5CDYr+L5b/GdiEJa6zJjAtMgrGjCmd+9GYMrV6r6Ef2PuB8GlMvnvQ==}
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.88
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 7.0.7
-      '@storybook/core-common': 7.0.7
-      '@storybook/core-events': 7.0.7
+      '@storybook/builder-manager': 7.0.21
+      '@storybook/core-common': 7.0.21
+      '@storybook/core-events': 7.0.21
       '@storybook/csf': 0.1.0
-      '@storybook/csf-tools': 7.0.7
+      '@storybook/csf-tools': 7.0.21
       '@storybook/docs-mdx': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 7.0.7
-      '@storybook/node-logger': 7.0.7
-      '@storybook/preview-api': 7.0.7
-      '@storybook/telemetry': 7.0.7
-      '@storybook/types': 7.0.7
+      '@storybook/manager': 7.0.21
+      '@storybook/node-logger': 7.0.21
+      '@storybook/preview-api': 7.0.21
+      '@storybook/telemetry': 7.0.21
+      '@storybook/types': 7.0.21
       '@types/detect-port': 1.3.2
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.2
@@ -6502,38 +5530,26 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/core-webpack@7.0.7:
-    resolution: {integrity: sha512-6s2PN4yoaIubs/Lv02/un9zQd/OSxFmx+dLStz3nI6JWzHjboIkIwjU3aryJuhM0OrQ/3Sxmv1WxgMiCnSCagg==}
-    dependencies:
-      '@storybook/core-common': 7.0.7
-      '@storybook/node-logger': 7.0.7
-      '@storybook/types': 7.0.7
-      '@types/node': 18.16.16
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@storybook/csf-plugin@7.0.7:
-    resolution: {integrity: sha512-uhf2g077gXA6ZEMXIPQ0RnX+IoOTBJbj+6+VQfT7K5tvJeop1z0Fvk0FoknNXcUe7aUA0nzA/cUQ1v4vXqbY3Q==}
+  /@storybook/csf-plugin@7.0.21:
+    resolution: {integrity: sha512-oaCgizetktTzxgJlJURA3RLQSDYAECw80XGbcUdruCMVgU1WrMrMJIdiYLqDDPUWSAZuFp4RsmfRjWTK6WxRUA==}
     dependencies:
-      '@storybook/csf-tools': 7.0.7
+      '@storybook/csf-tools': 7.0.21
       unplugin: 0.10.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/csf-tools@7.0.7:
-    resolution: {integrity: sha512-KbO5K2RS0oFm94eR49bAPvoyXY3Q6+ozvBek/F05RP7iAV790icQc59Xci9YDM1ONgb3afS+gSJGFBsE0h4pmg==}
+  /@storybook/csf-tools@7.0.21:
+    resolution: {integrity: sha512-a3oN29dgf+5pLOTtXyZhfzPhTEPvw44GAoQmi5giUMB486j6PSEq9IPj/birJk9+lX/ho6M9ZzI9QiBMXVeXlQ==}
     dependencies:
       '@babel/generator': 7.21.5
       '@babel/parser': 7.21.8
       '@babel/traverse': 7.21.5
       '@babel/types': 7.21.5
       '@storybook/csf': 0.1.0
-      '@storybook/types': 7.0.7
+      '@storybook/types': 7.0.21
       fs-extra: 11.1.0
-      recast: 0.23.1
+      recast: 0.23.3
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
@@ -6555,13 +5571,13 @@ packages:
     resolution: {integrity: sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==}
     dev: true
 
-  /@storybook/docs-tools@7.0.7:
-    resolution: {integrity: sha512-VB4Qa33DYNxXALWcXyDid246r9Q6SGM+Q+pGWOuEJsxRxDmrUspXHaHG0CO1NIjMWfbqpOoz61vquZO0GZoAAg==}
+  /@storybook/docs-tools@7.0.21:
+    resolution: {integrity: sha512-V2rgkmLdcariZQEx2VFtmFhQRRj7LyvlrRZjNyL5jMyWYXYG1W/LZhIXgnMOhf0gjkJlCnRAF4LBZVK8dN84BA==}
     dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/core-common': 7.0.7
-      '@storybook/preview-api': 7.0.7
-      '@storybook/types': 7.0.7
+      '@babel/core': 7.21.8
+      '@storybook/core-common': 7.0.21
+      '@storybook/preview-api': 7.0.21
+      '@storybook/types': 7.0.21
       '@types/doctrine': 0.0.3
       doctrine: 3.0.0
       lodash: 4.17.21
@@ -6573,6 +5589,31 @@ packages:
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
     dev: true
 
+  /@storybook/manager-api@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-YgS676/OMq2KmvYomcNzjwsVUtMYUylIt/0z5Fmg7exPXubEGpRd4OZIrQGHgcLKQRKZMK9GcsSkxebHO+qrsg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@storybook/channels': 7.0.21
+      '@storybook/client-logger': 7.0.21
+      '@storybook/core-events': 7.0.21
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/router': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.0.21
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+      semver: 7.5.4
+      store2: 2.14.2
+      telejson: 7.0.4
+      ts-dedent: 2.2.0
+    dev: true
+
   /@storybook/manager-api@7.0.7(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-QTd/P72peAhofKqK+8yzIO9iWAEfPn8WUGGveV2KGaTlSlgbr87RLHEKilcXMZcYhBWC9izFRmjKum9ROdskrQ==}
     peerDependencies:
@@ -6598,8 +5639,33 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/manager@7.0.7:
-    resolution: {integrity: sha512-FhquwUpUOHsjZROf6E6kzUnJ6EmMeJ9b+HYg6yYPyIMYVMjAhnkRKbIj0phGx2lhgKFlmxik+3pgchK5SLdcZA==}
+  /@storybook/manager-api@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-gk429qAGMW33rAZwFXo7fDoeYGrnSbj4ddHXJYc0nzBcC6emlq5IS5GHgJthQ3Oe8CPbq8bwUkWW6I5E7OePWA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@storybook/channels': 7.1.1
+      '@storybook/client-logger': 7.1.1
+      '@storybook/core-events': 7.1.1
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/router': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+      semver: 7.5.4
+      store2: 2.14.2
+      telejson: 7.0.4
+      ts-dedent: 2.2.0
+    dev: true
+
+  /@storybook/manager@7.0.21:
+    resolution: {integrity: sha512-8aOADfVHgejcpJ3cvt92Z3VknaYslH/1LmarOGpcocN7UtXGUuRnkbpHbx7dLYR586hWSXJ7jZmHAQseS+etvw==}
     dev: true
 
   /@storybook/mdx2-csf@1.0.0:
@@ -6611,13 +5677,13 @@ packages:
     dependencies:
       '@types/npmlog': 4.1.4
       chalk: 4.1.2
-      core-js: 3.27.2
+      core-js: 3.31.0
       npmlog: 5.0.1
       pretty-hrtime: 1.0.3
     dev: true
 
-  /@storybook/node-logger@7.0.7:
-    resolution: {integrity: sha512-5Y4LLgKeCStq1ktCKZ5eNPzQQSQ+CYZAlkEdzQ3Pp//0KXaZvVxEvGtaYhAymP2HatLpI8Oneo4lHrJioRfgww==}
+  /@storybook/node-logger@7.0.21:
+    resolution: {integrity: sha512-km7MfQ7Hk04UsH/ZgwW5iqSxlGi/Z/lw8Mb0Zdv7ms+FllPBPf5BhgjuC7LA6y+3WUghl6ESpDoig2771TNy4w==}
     dependencies:
       '@types/npmlog': 4.1.4
       chalk: 4.1.2
@@ -6625,42 +5691,28 @@ packages:
       pretty-hrtime: 1.0.3
     dev: true
 
-  /@storybook/postinstall@7.0.7:
-    resolution: {integrity: sha512-APcZ2KaR7z1aJje3pID4Ywmt1/aVcP3Sc4ltzNdH9mCkEsuq0fZHHQrYSa9Ya1IPRmSeLZ5/23q1iyqmGU3zoQ==}
+  /@storybook/postinstall@7.0.21:
+    resolution: {integrity: sha512-eSq+24DQpa58Dw+TlV4KCNbWnyjTAZ7hvBYRs8578qAMB0gsPh6MCPAKcrpN9TTNBMWKQxC5W6QGGVsVJ+8ByQ==}
     dev: true
 
-  /@storybook/preset-vue-webpack@7.0.7(@babel/core@7.21.8)(@babel/preset-env@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.17.18)(typescript@5.1.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-iuCWRlvc1lRa6s6KB39MCCxVFBp40BJAip+rluSuvjZyDva/9L6+TIB2tkz3d4dqRHee8Y8C2KSnx9OT8Ue6Iw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
-      css-loader: '*'
-      vue: ^2.6.8
-      vue-loader: ^15.7.0
-      vue-template-compiler: ^2.6.14
+  /@storybook/preview-api@7.0.21:
+    resolution: {integrity: sha512-IvOxQdSLV3B+82zS8MDHSO/pMEQdKIXJaz3knizhRuuB+cCdfv2Sro3IL3l8m2+90ySSwkfCqVEI4tdIC1ODXg==}
     dependencies:
-      '@babel/core': 7.21.8
-      '@storybook/core-webpack': 7.0.7
-      '@storybook/docs-tools': 7.0.7
-      '@types/node': 18.16.16
-      babel-loader: 9.1.2(@babel/core@7.21.8)(webpack@5.75.0)
-      css-loader: 6.7.3(webpack@5.75.0)
-      ts-loader: 9.4.2(typescript@5.1.3)(webpack@5.75.0)
-      vue: 2.7.14
-      vue-docgen-api: 4.56.4(vue@2.7.14)
-      vue-docgen-loader: 1.5.1(@babel/preset-env@7.21.5)(vue-docgen-api@4.56.4)(webpack@5.75.0)
-      vue-loader: 15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0)
-      vue-template-compiler: 2.7.14
-      webpack: 5.75.0(esbuild@0.17.18)
-    transitivePeerDependencies:
-      - '@babel/preset-env'
-      - '@swc/core'
-      - esbuild
-      - supports-color
-      - typescript
-      - uglify-js
-      - webpack-cli
+      '@storybook/channel-postmessage': 7.0.21
+      '@storybook/channels': 7.0.21
+      '@storybook/client-logger': 7.0.21
+      '@storybook/core-events': 7.0.21
+      '@storybook/csf': 0.1.0
+      '@storybook/global': 5.0.0
+      '@storybook/types': 7.0.21
+      '@types/qs': 6.9.7
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      synchronous-promise: 2.0.16
+      ts-dedent: 2.2.0
+      util-deprecate: 1.0.2
     dev: true
 
   /@storybook/preview-api@7.0.7:
@@ -6683,12 +5735,12 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview@7.0.7:
-    resolution: {integrity: sha512-uL3ZcFao6UvxiSxCIcXKFakxEr9Nn0lvu0zzC2yQCVepzA7a+GDr1cK5VbZ6Mez38CnOvBmb5pkCbgRqSf/oug==}
+  /@storybook/preview@7.0.21:
+    resolution: {integrity: sha512-WHAD0dlwlJGGTEJ2Lv2rbO9KGBbs4P9uy0oofCuVT+W/eKy26Y6cglnBZpT/lSvK3lNJWONtGRWwBqgdb2E9OQ==}
     dev: true
 
-  /@storybook/react-dom-shim@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-INGwFeu9M+RzpvktSKuwy8Rk/70mXGqxxsb9lPtq7phmETvfpNX7GnLJqiVazTaQiB1DkB0iAPUsK2MNbBu+Kw==}
+  /@storybook/react-dom-shim@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-hccpaFWZjZjD5F/hBXU59RdaF2pnN3hvygIAY7P8cIRu9lfhMZWpZyuEJBjHUqHSX+6CoNLzpSQHeVv+6Vo0rg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6704,7 +5756,7 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 6.5.15
-      core-js: 3.27.2
+      core-js: 3.31.0
       memoizerific: 1.11.3
       qs: 6.11.0
       react: 17.0.2
@@ -6712,6 +5764,19 @@ packages:
       regenerator-runtime: 0.13.11
     dev: true
 
+  /@storybook/router@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-zVEwW8PPrg3UXaBlVw9s5wXlJhm9AwG0Lta9Oc0limg1JeXtE1alV+VH8b/O5ECjp34mTXHIAyNU1EF0bozgVw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@storybook/client-logger': 7.0.21
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
   /@storybook/router@7.0.7(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-/lM8/NHQKeshfnC3ayFuO8Y9TCSHnCAPRhIsVxvanBzcj+ILbCIyZ+TspvB3hT4MbX/Ez+JR8VrMbjXIGwmH8w==}
     peerDependencies:
@@ -6725,27 +5790,33 @@ packages:
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
+  /@storybook/router@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-GRYYWVsqAtDm7DHxnGXuaAmr3PQfj+tonYsP8/L3gC5sOdQNF3yaBmvv1pu+bqezwXVowq0ew+iVYECiaGoB3Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@storybook/client-logger': 7.1.1
+      memoizerific: 1.11.3
+      qs: 6.11.0
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
   /@storybook/semver@7.3.2:
     resolution: {integrity: sha512-SWeszlsiPsMI0Ps0jVNtH64cI5c0UF3f7KgjVKJoNP30crQ6wUSddY2hsdeczZXEKVJGEn50Q60flcGsQGIcrg==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      core-js: 3.27.2
+      core-js: 3.31.0
       find-up: 4.1.0
     dev: true
 
-  /@storybook/store@7.0.7:
-    resolution: {integrity: sha512-yXVuh6DF9kOcpMGeT7lZ1kQV8bKkeGMZMRFwCfy7TeusXqUXZLCPYfgqm8gvd05dP+XZegDAXVsm/9d/NVLcwA==}
+  /@storybook/telemetry@7.0.21:
+    resolution: {integrity: sha512-yTT38LhCUuk7DULm88tWGGYWkvPMSfeuRESqSfda7MjHOx2K8VAfpX7HTta9fH9QeE3ormV8KSl/x2R6bNeXeQ==}
     dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/preview-api': 7.0.7
-    dev: true
-
-  /@storybook/telemetry@7.0.7:
-    resolution: {integrity: sha512-Ka6pwWr3sWs3A/6WQ0wsoSYzXx3Mhr7eByNZZKuuCu9jnw3I8AbIOqQX2iOVzaQBLZsvXEeqvYY8iZ+GuRbbGQ==}
-    dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/core-common': 7.0.7
+      '@storybook/client-logger': 7.0.21
+      '@storybook/core-common': 7.0.21
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.3
@@ -6765,13 +5836,27 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 6.5.15
-      core-js: 3.27.2
+      core-js: 3.31.0
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       regenerator-runtime: 0.13.11
     dev: true
 
+  /@storybook/theming@7.0.21(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-tgWoT0IdyPQIg+s/JMnP+MGTsAvNm6FJuiuKPebngids6rdYQ3EA5uQjBVV7De650JLhBFTFocS2Puj4Lti2bw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@17.0.2)
+      '@storybook/client-logger': 7.0.21
+      '@storybook/global': 5.0.0
+      memoizerific: 1.11.3
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
   /@storybook/theming@7.0.7(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-InTZe+Sgco1NsxgiG+cyUKWQe3GsjlIyU/o5qDdtOTXcZ64HzyBuAZlAequSddqfDeMDqxRFPc2w1J28MAUHxA==}
     peerDependencies:
@@ -6786,6 +5871,29 @@ packages:
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
+  /@storybook/theming@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-8ri/BvfgUzBln9EYB8N/xgRaxZIFFTG0IEEekuV2H5uv4q9JW9p3E5zqghmM1OC/vspJJa8e4Eajb1YiTO0W6w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@17.0.2)
+      '@storybook/client-logger': 7.1.1
+      '@storybook/global': 5.0.0
+      memoizerific: 1.11.3
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
+  /@storybook/types@7.0.21:
+    resolution: {integrity: sha512-gZ8XEsg0upyiisbe2Qv+G+XN2+nZCxj6vJKvgWxuBPCjqN3Uw34cgDrIJuSa8YjE/yl/nsaV5s0xYdFXAl7JVQ==}
+    dependencies:
+      '@storybook/channels': 7.0.21
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.14
+      file-system-cache: 2.0.2
+    dev: true
+
   /@storybook/types@7.0.7:
     resolution: {integrity: sha512-v9piuwp8FvTiHXIOOi5lEyTEJKhnbcbhVxgJ3VFhhXYFd0DTz6Bst0XIIgkgs21ITb3xhkfPbCRUueMcbXO1MA==}
     dependencies:
@@ -6795,71 +5903,66 @@ packages:
       file-system-cache: 2.0.2
     dev: true
 
-  /@storybook/vue-webpack5@7.0.7(@babel/core@7.21.8)(@babel/preset-env@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.17.18)(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-SNxmyIxZl7kkCWhJfyvyIkhb11muKYHAcXMJTSlcIAKRQN37ft0jhPBciQZ4GLOLorqmIm14NLIdzInBXcm++A==}
-    engines: {node: '>=16.0.0'}
+  /@storybook/types@7.1.1:
+    resolution: {integrity: sha512-0yxEHxYd/N0XfVCGrEq86QIMC4ljZBspHSDrjdLSCIYmmglMvwKboZBgHlLQmpcLP+of8m1E8Frbslpnt0giBg==}
+    dependencies:
+      '@storybook/channels': 7.1.1
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.14
+      file-system-cache: 2.3.0
+    dev: true
+
+  /@storybook/vue3-vite@7.0.21(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vite@4.0.4)(vue@3.3.4):
+    resolution: {integrity: sha512-F5pz26uECQmJKS1G6/9jXm4lBv2QZ701nECPVMBtZJDu1Ex0cIFA7xjhLIzTDHP4KPDBE15ZDHxFrMEknRuU8w==}
+    engines: {node: ^14.18 || >=16}
     peerDependencies:
-      '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
-      css-loader: '*'
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      vue: ^2.6.8
-      vue-loader: ^15.7.0
-      vue-template-compiler: ^2.6.8
+      vite: ^3.0.0 || ^4.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@storybook/builder-webpack5': 7.0.7(esbuild@0.17.18)(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vue-template-compiler@2.7.14)
-      '@storybook/core-common': 7.0.7
-      '@storybook/preset-vue-webpack': 7.0.7(@babel/core@7.21.8)(@babel/preset-env@7.21.5)(babel-loader@9.1.2)(css-loader@6.7.3)(esbuild@0.17.18)(typescript@5.1.3)(vue-loader@15.10.1)(vue-template-compiler@2.7.14)(vue@2.7.14)
-      '@storybook/vue': 7.0.7(@babel/core@7.21.8)(babel-loader@9.1.2)(css-loader@6.7.3)(vue@2.7.14)
-      '@types/node': 18.16.16
-      babel-loader: 9.1.2(@babel/core@7.21.8)(webpack@5.75.0)
-      css-loader: 6.7.3(webpack@5.75.0)
+      '@storybook/builder-vite': 7.0.21(typescript@5.1.3)(vite@4.0.4)
+      '@storybook/core-server': 7.0.21
+      '@storybook/vue3': 7.0.21(vue@3.3.4)
+      '@vitejs/plugin-vue': 4.2.3(vite@4.0.4)(vue@3.3.4)
+      magic-string: 0.27.0
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
-      vue: 2.7.14
-      vue-loader: 15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0)
-      vue-template-compiler: 2.7.14
+      vite: 4.0.4(less@4.1.3)(sass@1.63.4)
+      vue-docgen-api: 4.56.4(vue@3.3.4)
     transitivePeerDependencies:
-      - '@babel/preset-env'
-      - '@swc/core'
-      - esbuild
-      - eslint
+      - '@preact/preset-vite'
+      - bufferutil
+      - encoding
       - supports-color
       - typescript
-      - uglify-js
-      - webpack-cli
+      - utf-8-validate
+      - vite-plugin-glimmerx
+      - vue
     dev: true
 
-  /@storybook/vue@7.0.7(@babel/core@7.21.8)(babel-loader@9.1.2)(css-loader@6.7.3)(vue@2.7.14):
-    resolution: {integrity: sha512-xz4yU+iIy3lmlPsfqhtYWZC2kVvgwMtL/gNvROTnTGgxjAcr0TK0GiIvCoJDnY+8CE83Ek+/8Qmf26/VtpzJCw==}
+  /@storybook/vue3@7.0.21(vue@3.3.4):
+    resolution: {integrity: sha512-/b89ebjveYC7uFcmncP4y2q2K0g3aBt4DLvVRymgWaI873v9OSjzf4mo9ktuWQAL31o+/r/oaQ/9kC9k1oi2hw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
-      css-loader: '*'
-      vue: ^2.6.8
-    peerDependenciesMeta:
-      babel-loader:
-        optional: true
+      vue: ^3.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@storybook/client-logger': 7.0.7
-      '@storybook/core-client': 7.0.7
-      '@storybook/docs-tools': 7.0.7
+      '@storybook/core-client': 7.0.21
+      '@storybook/docs-tools': 7.0.21
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.0.7
-      '@storybook/types': 7.0.7
-      babel-loader: 9.1.2(@babel/core@7.21.8)(webpack@5.75.0)
-      css-loader: 6.7.3(webpack@5.75.0)
+      '@storybook/preview-api': 7.0.21
+      '@storybook/types': 7.0.21
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 2.7.14
+      vue: 3.3.4
+      vue-component-type-helpers: 1.8.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@sxzz/popperjs-es@2.11.7:
+    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
+    dev: false
+
   /@techteamer/ocsp@1.0.0:
     resolution: {integrity: sha512-lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog==}
     dependencies:
@@ -6874,18 +5977,18 @@ packages:
     resolution: {integrity: sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ==}
     dev: false
 
-  /@testing-library/dom@7.31.2:
-    resolution: {integrity: sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==}
-    engines: {node: '>=10'}
+  /@testing-library/dom@8.20.1:
+    resolution: {integrity: sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==}
+    engines: {node: '>=12'}
     dependencies:
-      '@babel/code-frame': 7.18.6
+      '@babel/code-frame': 7.21.4
       '@babel/runtime': 7.20.7
-      '@types/aria-query': 4.2.2
-      aria-query: 4.2.2
+      '@types/aria-query': 5.0.1
+      aria-query: 5.1.3
       chalk: 4.1.2
       dom-accessibility-api: 0.5.15
-      lz-string: 1.4.4
-      pretty-format: 26.6.2
+      lz-string: 1.5.0
+      pretty-format: 27.5.1
     dev: true
 
   /@testing-library/jest-dom@5.16.5:
@@ -6903,27 +6006,29 @@ packages:
       redent: 3.0.0
     dev: true
 
-  /@testing-library/user-event@14.4.3(@testing-library/dom@7.31.2):
+  /@testing-library/user-event@14.4.3(@testing-library/dom@8.20.1):
     resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@testing-library/dom': 7.31.2
+      '@testing-library/dom': 8.20.1
     dev: true
 
-  /@testing-library/vue@5.8.3(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-M6+QqP1xuFHixKOeXF9pCLbtiyJZRKfJRP+unBf6Ljm7aS1V2CSS95oTetFoblaj0W1+AC9XJgwmUDtlLoaakQ==}
-    engines: {node: '>10.18'}
+  /@testing-library/vue@6.6.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4):
+    resolution: {integrity: sha512-vpyBPrHzKTwEGS7ehUC8/IXgnqTBEMk6jd52Gouf51arG2jUorPhmkbsxUwJOyxz6L0gj2ZcmWnznG1OJcTCDQ==}
+    engines: {node: '>=12'}
     peerDependencies:
-      vue: ^2.6.10
-      vue-template-compiler: ^2.6.10
+      '@vue/compiler-sfc': '>= 3'
+      vue: '>= 3'
     dependencies:
-      '@babel/runtime': 7.19.4
-      '@testing-library/dom': 7.31.2
-      '@vue/test-utils': 1.3.0(vue-template-compiler@2.7.14)(vue@2.7.14)
-      vue: 2.7.14
-      vue-template-compiler: 2.7.14
+      '@babel/runtime': 7.20.7
+      '@testing-library/dom': 8.20.1
+      '@vue/compiler-sfc': 3.3.4
+      '@vue/test-utils': 2.4.1(vue@3.3.4)
+      vue: 3.3.4
+    transitivePeerDependencies:
+      - '@vue/server-renderer'
     dev: true
 
   /@tokenizer/token@0.3.0:
@@ -6945,8 +6050,8 @@ packages:
       '@types/node': 18.16.16
     dev: true
 
-  /@types/aria-query@4.2.2:
-    resolution: {integrity: sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==}
+  /@types/aria-query@5.0.1:
+    resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
     dev: true
 
   /@types/asn1@0.2.0:
@@ -7196,10 +6301,6 @@ packages:
       '@types/node': 18.16.16
     dev: true
 
-  /@types/html-minifier-terser@6.1.0:
-    resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}
-    dev: true
-
   /@types/humanize-duration@3.27.1:
     resolution: {integrity: sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==}
     dev: true
@@ -7306,7 +6407,6 @@ packages:
     resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==}
     dependencies:
       '@types/lodash': 4.14.195
-    dev: true
 
   /@types/lodash@4.14.195:
     resolution: {integrity: sha512-Hwx9EUgdwf2GLarOjQp5ZH8ZmblzcbTBC2wtQWNKARBSxM9ezRIAUpeDTgoQRAFB0+8CNWXVA9+MaSOzOF3nPg==}
@@ -7510,8 +6610,8 @@ packages:
       form-data: 2.5.1
     dev: true
 
-  /@types/sanitize-html@2.8.0:
-    resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
+  /@types/sanitize-html@2.9.0:
+    resolution: {integrity: sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==}
     dependencies:
       htmlparser2: 8.0.1
     dev: true
@@ -7673,6 +6773,14 @@ packages:
     resolution: {integrity: sha512-y9Ydpp4K9k+gGKFFmpnYNXJxhaq7smglPMcF2wymMaEbPhMS2gHkkD9OMoaqhktJErI+VeHG1ciy1JNz1nhOTQ==}
     dev: true
 
+  /@types/web-bluetooth@0.0.16:
+    resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
+    dev: false
+
+  /@types/web-bluetooth@0.0.17:
+    resolution: {integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==}
+    dev: false
+
   /@types/webidl-conversions@7.0.0:
     resolution: {integrity: sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==}
     dev: false
@@ -7708,12 +6816,6 @@ packages:
     resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
     dev: true
 
-  /@types/yargs@15.0.15:
-    resolution: {integrity: sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==}
-    dependencies:
-      '@types/yargs-parser': 21.0.0
-    dev: true
-
   /@types/yargs@17.0.19:
     resolution: {integrity: sha512-cAx3qamwaYX9R0fzOIZAlFpo4A+1uBVCxqpKz9D26uTF4srRXaGTTsikQmaotCtNdbhzyUH7ft6p9ktz9s6UNQ==}
     dependencies:
@@ -8049,15 +7151,15 @@ packages:
       eslint-visitor-keys: 3.4.0
     dev: true
 
-  /@vitejs/plugin-vue2@2.2.0(vite@4.0.4)(vue@2.7.14):
-    resolution: {integrity: sha512-1km7zEuZ/9QRPvzXSjikbTYGQPG86Mq1baktpC4sXqsXlb02HQKfi+fl8qVS703JM7cgm24Ga9j+RwKmvFn90A==}
-    engines: {node: ^14.18.0 || >= 16.0.0}
+  /@vitejs/plugin-vue@4.2.3(vite@4.0.4)(vue@3.3.4):
+    resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      vite: ^3.0.0 || ^4.0.0
-      vue: ^2.7.0-0
+      vite: ^4.0.0
+      vue: ^3.2.25
     dependencies:
-      vite: 4.0.4(@types/node@18.16.16)
-      vue: 2.7.14
+      vite: 4.0.4(less@4.1.3)(sass@1.63.4)
+      vue: 3.3.4
     dev: true
 
   /@vitest/coverage-c8@0.28.5:
@@ -8137,10 +7239,10 @@ packages:
     dependencies:
       '@volar/language-core': 1.0.24
       '@volar/source-map': 1.0.24
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-sfc': 3.2.45
-      '@vue/reactivity': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-sfc': 3.3.4
+      '@vue/reactivity': 3.3.4
+      '@vue/shared': 3.3.4
       minimatch: 5.1.5
       vue-template-compiler: 2.7.14
     dev: true
@@ -8152,123 +7254,47 @@ packages:
       '@volar/vue-language-core': 1.0.24
     dev: true
 
-  /@vue/compiler-core@3.2.45:
-    resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==}
+  /@vue/compiler-core@3.3.4:
+    resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
     dependencies:
       '@babel/parser': 7.21.8
-      '@vue/shared': 3.2.45
+      '@vue/shared': 3.3.4
       estree-walker: 2.0.2
-      source-map: 0.6.1
-    dev: true
-
-  /@vue/compiler-dom@3.2.45:
-    resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
-    dependencies:
-      '@vue/compiler-core': 3.2.45
-      '@vue/shared': 3.2.45
-    dev: true
+      source-map-js: 1.0.2
 
-  /@vue/compiler-sfc@2.7.14:
-    resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
-    dependencies:
-      '@babel/parser': 7.20.7
-      postcss: 8.4.21
-      source-map: 0.6.1
+  /@vue/compiler-dom@3.3.4:
+    resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==}
+    dependencies:
+      '@vue/compiler-core': 3.3.4
+      '@vue/shared': 3.3.4
 
-  /@vue/compiler-sfc@3.2.45:
-    resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==}
+  /@vue/compiler-sfc@3.3.4:
+    resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
     dependencies:
       '@babel/parser': 7.21.8
-      '@vue/compiler-core': 3.2.45
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-ssr': 3.2.45
-      '@vue/reactivity-transform': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/compiler-core': 3.3.4
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-ssr': 3.3.4
+      '@vue/reactivity-transform': 3.3.4
+      '@vue/shared': 3.3.4
       estree-walker: 2.0.2
-      magic-string: 0.25.9
+      magic-string: 0.30.1
       postcss: 8.4.21
-      source-map: 0.6.1
-    dev: true
-
-  /@vue/compiler-ssr@3.2.45:
-    resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
-    dependencies:
-      '@vue/compiler-dom': 3.2.45
-      '@vue/shared': 3.2.45
-    dev: true
+      source-map-js: 1.0.2
 
-  /@vue/component-compiler-utils@3.3.0(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==}
+  /@vue/compiler-ssr@3.3.4:
+    resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==}
     dependencies:
-      consolidate: 0.15.1(react-dom@18.2.0)(react@17.0.2)
-      hash-sum: 1.0.2
-      lru-cache: 4.1.5
-      merge-source-map: 1.1.0
-      postcss: 7.0.39
-      postcss-selector-parser: 6.0.11
-      source-map: 0.6.1
-      vue-template-es2015-compiler: 1.9.1
-    optionalDependencies:
-      prettier: 2.8.3
-    transitivePeerDependencies:
-      - arc-templates
-      - atpl
-      - babel-core
-      - bracket-template
-      - coffee-script
-      - dot
-      - dust
-      - dustjs-helpers
-      - dustjs-linkedin
-      - eco
-      - ect
-      - ejs
-      - haml-coffee
-      - hamlet
-      - hamljs
-      - handlebars
-      - hogan.js
-      - htmling
-      - jade
-      - jazz
-      - jqtpl
-      - just
-      - liquid-node
-      - liquor
-      - lodash
-      - marko
-      - mote
-      - mustache
-      - nunjucks
-      - plates
-      - pug
-      - qejs
-      - ractive
-      - razor-tmpl
-      - react
-      - react-dom
-      - slm
-      - squirrelly
-      - swig
-      - swig-templates
-      - teacup
-      - templayed
-      - then-jade
-      - then-pug
-      - tinyliquid
-      - toffee
-      - twig
-      - twing
-      - underscore
-      - vash
-      - velocityjs
-      - walrus
-      - whiskers
-    dev: true
+      '@vue/compiler-dom': 3.3.4
+      '@vue/shared': 3.3.4
 
   /@vue/devtools-api@6.4.5:
     resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
 
+  /@vue/devtools-api@6.5.0:
+    resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
+    dev: false
+
   /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.12.0)(eslint@8.39.0)(typescript@5.1.3):
     resolution: {integrity: sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==}
     engines: {node: ^14.17.0 || >=16.0.0}
@@ -8290,39 +7316,120 @@ packages:
       - supports-color
     dev: true
 
-  /@vue/reactivity-transform@3.2.45:
-    resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
+  /@vue/reactivity-transform@3.3.4:
+    resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
     dependencies:
       '@babel/parser': 7.21.8
-      '@vue/compiler-core': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/compiler-core': 3.3.4
+      '@vue/shared': 3.3.4
       estree-walker: 2.0.2
-      magic-string: 0.25.9
-    dev: true
+      magic-string: 0.30.1
 
-  /@vue/reactivity@3.2.45:
-    resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
+  /@vue/reactivity@3.3.4:
+    resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==}
     dependencies:
-      '@vue/shared': 3.2.45
-    dev: true
+      '@vue/shared': 3.3.4
 
-  /@vue/shared@3.2.45:
-    resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
-    dev: true
+  /@vue/runtime-core@3.3.4:
+    resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==}
+    dependencies:
+      '@vue/reactivity': 3.3.4
+      '@vue/shared': 3.3.4
+
+  /@vue/runtime-dom@3.3.4:
+    resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==}
+    dependencies:
+      '@vue/runtime-core': 3.3.4
+      '@vue/shared': 3.3.4
+      csstype: 3.1.1
 
-  /@vue/test-utils@1.3.0(vue-template-compiler@2.7.14)(vue@2.7.14):
-    resolution: {integrity: sha512-Xk2Xiyj2k5dFb8eYUKkcN9PzqZSppTlx7LaQWBbdA8tqh3jHr/KHX2/YLhNFc/xwDrgeLybqd+4ZCPJSGPIqeA==}
+  /@vue/server-renderer@3.3.4(vue@3.3.4):
+    resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==}
     peerDependencies:
-      vue: 2.x
-      vue-template-compiler: ^2.x
+      vue: 3.3.4
     dependencies:
-      dom-event-types: 1.1.0
-      lodash: 4.17.21
-      pretty: 2.0.0
-      vue: 2.7.14
-      vue-template-compiler: 2.7.14
+      '@vue/compiler-ssr': 3.3.4
+      '@vue/shared': 3.3.4
+      vue: 3.3.4
+
+  /@vue/shared@3.3.4:
+    resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
+
+  /@vue/test-utils@2.4.1(vue@3.3.4):
+    resolution: {integrity: sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==}
+    peerDependencies:
+      '@vue/server-renderer': ^3.0.1
+      vue: ^3.0.1
+    peerDependenciesMeta:
+      '@vue/server-renderer':
+        optional: true
+    dependencies:
+      js-beautify: 1.14.9
+      vue: 3.3.4
+      vue-component-type-helpers: 1.8.4
     dev: true
 
+  /@vueuse/components@10.2.0(vue@3.3.4):
+    resolution: {integrity: sha512-fpGtxx8G3BCJUoTd6d4xI7qELvm4nwVKLZYgIVdv7weqprKWwK5IO+t3LULovPuS7W2guVZgpyMy9NkD4qa2Bw==}
+    dependencies:
+      '@vueuse/core': 10.2.0(vue@3.3.4)
+      '@vueuse/shared': 10.2.0(vue@3.3.4)
+      vue-demi: 0.14.5(vue@3.3.4)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
+  /@vueuse/core@10.2.0(vue@3.3.4):
+    resolution: {integrity: sha512-aHBnoCteIS3hFu7ZZkVB93SanVDY6t4TIb7XDLxJT/HQdAZz+2RdIEJ8rj5LUoEJr7Damb5+sJmtpCwGez5ozQ==}
+    dependencies:
+      '@types/web-bluetooth': 0.0.17
+      '@vueuse/metadata': 10.2.0
+      '@vueuse/shared': 10.2.0(vue@3.3.4)
+      vue-demi: 0.14.5(vue@3.3.4)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
+  /@vueuse/core@9.13.0(vue@3.3.4):
+    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
+    dependencies:
+      '@types/web-bluetooth': 0.0.16
+      '@vueuse/metadata': 9.13.0
+      '@vueuse/shared': 9.13.0(vue@3.3.4)
+      vue-demi: 0.14.5(vue@3.3.4)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
+  /@vueuse/metadata@10.2.0:
+    resolution: {integrity: sha512-IR7Mkq6QSgZ38q/2ZzOt+Zz1OpcEsnwE64WBumDQ+RGKrosFCtUA2zgRrOqDEzPBXrVB+4HhFkwDjQMu0fDBKw==}
+    dev: false
+
+  /@vueuse/metadata@9.13.0:
+    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
+    dev: false
+
+  /@vueuse/shared@10.2.0(vue@3.3.4):
+    resolution: {integrity: sha512-dIeA8+g9Av3H5iF4NXR/sft4V6vys76CpZ6hxwj8eMXybXk2WRl3scSsOVi+kQ9SX38COR7AH7WwY83UcuxbSg==}
+    dependencies:
+      vue-demi: 0.14.5(vue@3.3.4)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
+  /@vueuse/shared@9.13.0(vue@3.3.4):
+    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
+    dependencies:
+      vue-demi: 0.14.5(vue@3.3.4)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - vue
+    dev: false
+
   /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
     dependencies:
@@ -8519,6 +7626,14 @@ packages:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
     engines: {node: '>= 10.0.0'}
 
+  /adjust-sourcemap-loader@4.0.0:
+    resolution: {integrity: sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==}
+    engines: {node: '>=8.9'}
+    dependencies:
+      loader-utils: 2.0.4
+      regex-parser: 2.2.11
+    dev: true
+
   /agent-base@5.1.1:
     resolution: {integrity: sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==}
     engines: {node: '>= 6.0.0'}
@@ -8551,17 +7666,6 @@ packages:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  /ajv-formats@2.1.1(ajv@8.12.0):
-    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-    dependencies:
-      ajv: 8.12.0
-    dev: true
-
   /ajv-keywords@3.5.2(ajv@6.12.6):
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
@@ -8570,15 +7674,6 @@ packages:
       ajv: 6.12.6
     dev: true
 
-  /ajv-keywords@5.1.0(ajv@8.12.0):
-    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
-    peerDependencies:
-      ajv: ^8.8.2
-    dependencies:
-      ajv: 8.12.0
-      fast-deep-equal: 3.1.3
-    dev: true
-
   /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
@@ -8587,15 +7682,6 @@ packages:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  /ajv@8.12.0:
-    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
-    dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
-    dev: true
-
   /amqplib@0.10.3:
     resolution: {integrity: sha512-UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw==}
     engines: {node: '>=10'}
@@ -8643,12 +7729,6 @@ packages:
       ansi-wrap: 0.1.0
     dev: true
 
-  /ansi-html-community@0.0.8:
-    resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==}
-    engines: {'0': node >= 0.8.0}
-    hasBin: true
-    dev: true
-
   /ansi-regex@2.1.1:
     resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
     engines: {node: '>=0.10.0'}
@@ -8774,14 +7854,6 @@ packages:
   /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  /aria-query@4.2.2:
-    resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
-    engines: {node: '>=6.0'}
-    dependencies:
-      '@babel/runtime': 7.20.7
-      '@babel/runtime-corejs3': 7.20.7
-    dev: true
-
   /aria-query@5.1.3:
     resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
     dependencies:
@@ -9040,10 +8112,8 @@ packages:
       async-done: 1.3.2
     dev: true
 
-  /async-validator@1.8.5:
-    resolution: {integrity: sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==}
-    dependencies:
-      babel-runtime: 6.26.0
+  /async-validator@4.2.5:
+    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
     dev: false
 
   /async@3.2.4:
@@ -9067,7 +8137,7 @@ packages:
     hasBin: true
     dependencies:
       commander: 5.1.0
-      core-js: 3.27.2
+      core-js: 3.31.0
       handlebars: 4.7.7
       lodash.uniqby: 4.7.0
       node-fetch: 2.6.8
@@ -9078,15 +8148,15 @@ packages:
       - encoding
     dev: false
 
-  /autoprefixer@10.4.13(postcss@8.4.21):
-    resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
+  /autoprefixer@10.4.14(postcss@8.4.21):
+    resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
       browserslist: 4.21.4
-      caniuse-lite: 1.0.30001445
+      caniuse-lite: 1.0.30001517
       fraction.js: 4.2.0
       normalize-range: 0.1.2
       picocolors: 1.0.0
@@ -9125,6 +8195,11 @@ packages:
   /aws4@1.11.0:
     resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
 
+  /axe-core@4.7.2:
+    resolution: {integrity: sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==}
+    engines: {node: '>=4'}
+    dev: true
+
   /axios-retry@3.3.1:
     resolution: {integrity: sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==}
     dependencies:
@@ -9164,10 +8239,6 @@ packages:
       '@babel/core': 7.21.8
     dev: true
 
-  /babel-helper-vue-jsx-merge-props@2.0.3:
-    resolution: {integrity: sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==}
-    dev: false
-
   /babel-jest@29.5.0(@babel/core@7.21.8):
     resolution: {integrity: sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -9186,37 +8257,11 @@ packages:
       - supports-color
     dev: true
 
-  /babel-loader@9.1.2(@babel/core@7.20.12)(webpack@5.75.0):
-    resolution: {integrity: sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==}
-    engines: {node: '>= 14.15.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-      webpack: '>=5'
-    dependencies:
-      '@babel/core': 7.20.12
-      find-cache-dir: 3.3.2
-      schema-utils: 4.0.0
-      webpack: 5.75.0(esbuild@0.17.18)
-    dev: true
-
-  /babel-loader@9.1.2(@babel/core@7.21.8)(webpack@5.75.0):
-    resolution: {integrity: sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==}
-    engines: {node: '>= 14.15.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-      webpack: '>=5'
-    dependencies:
-      '@babel/core': 7.21.8
-      find-cache-dir: 3.3.2
-      schema-utils: 4.0.0
-      webpack: 5.75.0(esbuild@0.17.18)
-    dev: true
-
   /babel-plugin-istanbul@6.1.1:
     resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-plugin-utils': 7.21.5
       '@istanbuljs/load-nyc-config': 1.1.0
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-instrument: 5.2.1
@@ -9235,23 +8280,6 @@ packages:
       '@types/babel__traverse': 7.18.2
     dev: true
 
-  /babel-plugin-named-exports-order@0.0.2:
-    resolution: {integrity: sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==}
-    dev: true
-
-  /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.20.12):
-    resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-      semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.21.8):
     resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
     peerDependencies:
@@ -9265,18 +8293,6 @@ packages:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.20.12):
-    resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-      core-js-compat: 3.27.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.21.8):
     resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
     peerDependencies:
@@ -9289,17 +8305,6 @@ packages:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.20.12):
-    resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.20.12)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.21.8):
     resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
     peerDependencies:
@@ -9342,13 +8347,6 @@ packages:
       babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.8)
     dev: true
 
-  /babel-runtime@6.26.0:
-    resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
-    dependencies:
-      core-js: 2.6.12
-      regenerator-runtime: 0.11.1
-    dev: false
-
   /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
@@ -9594,7 +8592,7 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001445
+      caniuse-lite: 1.0.30001517
       electron-to-chromium: 1.4.284
       node-releases: 2.0.8
       update-browserslist-db: 1.0.10(browserslist@4.21.4)
@@ -9854,8 +8852,8 @@ packages:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
 
-  /caniuse-lite@1.0.30001445:
-    resolution: {integrity: sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==}
+  /caniuse-lite@1.0.30001517:
+    resolution: {integrity: sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==}
     dev: true
 
   /capital-case@1.0.4:
@@ -9873,11 +8871,6 @@ packages:
       ansicolors: 0.3.2
       redeyed: 2.1.1
 
-  /case-sensitive-paths-webpack-plugin@2.4.0:
-    resolution: {integrity: sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==}
-    engines: {node: '>=4'}
-    dev: true
-
   /caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
@@ -10021,10 +9014,6 @@ packages:
     resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
     dev: true
 
-  /clamp@1.0.1:
-    resolution: {integrity: sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==}
-    dev: false
-
   /class-transformer@0.5.1:
     resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==}
     dev: false
@@ -10047,13 +9036,6 @@ packages:
       validator: 13.7.0
     dev: false
 
-  /clean-css@5.3.2:
-    resolution: {integrity: sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==}
-    engines: {node: '>= 10.0'}
-    dependencies:
-      source-map: 0.6.1
-    dev: true
-
   /clean-regexp@1.0.0:
     resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==}
     engines: {node: '>=4'}
@@ -10101,6 +9083,11 @@ packages:
     dependencies:
       string-width: 4.2.3
 
+  /cli-spinners@2.9.0:
+    resolution: {integrity: sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==}
+    engines: {node: '>=6'}
+    dev: true
+
   /cli-table3@0.6.3:
     resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
     engines: {node: 10.* || >= 12.*}
@@ -10223,6 +9210,11 @@ packages:
     resolution: {integrity: sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==}
     dev: true
 
+  /clone@1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+    dev: true
+
   /clone@2.1.2:
     resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
     engines: {node: '>=0.8'}
@@ -10358,6 +9350,11 @@ packages:
     dependencies:
       delayed-stream: 1.0.0
 
+  /commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+    dev: true
+
   /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
@@ -10370,11 +9367,6 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
-  /commander@8.3.0:
-    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
-    engines: {node: '>= 12'}
-    dev: true
-
   /commander@9.4.1:
     resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
     engines: {node: ^12.20.0 || >=14}
@@ -10461,15 +9453,6 @@ packages:
       yargs: 13.3.2
     dev: true
 
-  /condense-newlines@0.2.1:
-    resolution: {integrity: sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      extend-shallow: 2.0.1
-      is-whitespace: 0.3.0
-      kind-of: 3.2.2
-    dev: true
-
   /config-chain@1.1.13:
     resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
     dependencies:
@@ -10477,189 +9460,18 @@ packages:
       proto-list: 1.2.4
     dev: true
 
-  /confusing-browser-globals@1.0.11:
-    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
-    dev: true
-
-  /connect-history-api-fallback@1.6.0:
-    resolution: {integrity: sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==}
-    engines: {node: '>=0.8'}
-    dev: false
-
-  /console-control-strings@1.1.0:
-    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
-
-  /consolidate@0.15.1(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==}
-    engines: {node: '>= 0.10.0'}
-    deprecated: Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog
-    peerDependencies:
-      arc-templates: ^0.5.3
-      atpl: '>=0.7.6'
-      babel-core: ^6.26.3
-      bracket-template: ^1.1.5
-      coffee-script: ^1.12.7
-      dot: ^1.1.3
-      dust: ^0.3.0
-      dustjs-helpers: ^1.7.4
-      dustjs-linkedin: ^2.7.5
-      eco: ^1.1.0-rc-3
-      ect: ^0.5.9
-      ejs: ^3.1.5
-      haml-coffee: ^1.14.1
-      hamlet: ^0.3.3
-      hamljs: ^0.6.2
-      handlebars: ^4.7.6
-      hogan.js: ^3.0.2
-      htmling: ^0.0.8
-      jade: ^1.11.0
-      jazz: ^0.0.18
-      jqtpl: ~1.1.0
-      just: ^0.1.8
-      liquid-node: ^3.0.1
-      liquor: ^0.0.5
-      lodash: ^4.17.20
-      marko: ^3.14.4
-      mote: ^0.2.0
-      mustache: ^3.0.0
-      nunjucks: ^3.2.2
-      plates: ~0.4.11
-      pug: ^3.0.0
-      qejs: ^3.0.5
-      ractive: ^1.3.12
-      razor-tmpl: ^1.3.1
-      react: ^16.13.1
-      react-dom: ^16.13.1
-      slm: ^2.0.0
-      squirrelly: ^5.1.0
-      swig: ^1.4.2
-      swig-templates: ^2.0.3
-      teacup: ^2.0.0
-      templayed: '>=0.2.3'
-      then-jade: '*'
-      then-pug: '*'
-      tinyliquid: ^0.2.34
-      toffee: ^0.3.6
-      twig: ^1.15.2
-      twing: ^5.0.2
-      underscore: ^1.11.0
-      vash: ^0.13.0
-      velocityjs: ^2.0.1
-      walrus: ^0.10.1
-      whiskers: ^0.4.0
-    peerDependenciesMeta:
-      arc-templates:
-        optional: true
-      atpl:
-        optional: true
-      babel-core:
-        optional: true
-      bracket-template:
-        optional: true
-      coffee-script:
-        optional: true
-      dot:
-        optional: true
-      dust:
-        optional: true
-      dustjs-helpers:
-        optional: true
-      dustjs-linkedin:
-        optional: true
-      eco:
-        optional: true
-      ect:
-        optional: true
-      ejs:
-        optional: true
-      haml-coffee:
-        optional: true
-      hamlet:
-        optional: true
-      hamljs:
-        optional: true
-      handlebars:
-        optional: true
-      hogan.js:
-        optional: true
-      htmling:
-        optional: true
-      jade:
-        optional: true
-      jazz:
-        optional: true
-      jqtpl:
-        optional: true
-      just:
-        optional: true
-      liquid-node:
-        optional: true
-      liquor:
-        optional: true
-      lodash:
-        optional: true
-      marko:
-        optional: true
-      mote:
-        optional: true
-      mustache:
-        optional: true
-      nunjucks:
-        optional: true
-      plates:
-        optional: true
-      pug:
-        optional: true
-      qejs:
-        optional: true
-      ractive:
-        optional: true
-      razor-tmpl:
-        optional: true
-      react:
-        optional: true
-      react-dom:
-        optional: true
-      slm:
-        optional: true
-      squirrelly:
-        optional: true
-      swig:
-        optional: true
-      swig-templates:
-        optional: true
-      teacup:
-        optional: true
-      templayed:
-        optional: true
-      then-jade:
-        optional: true
-      then-pug:
-        optional: true
-      tinyliquid:
-        optional: true
-      toffee:
-        optional: true
-      twig:
-        optional: true
-      twing:
-        optional: true
-      underscore:
-        optional: true
-      vash:
-        optional: true
-      velocityjs:
-        optional: true
-      walrus:
-        optional: true
-      whiskers:
-        optional: true
-    dependencies:
-      bluebird: 3.7.2
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
+  /confusing-browser-globals@1.0.11:
+    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
+    dev: true
+
+  /connect-history-api-fallback@1.6.0:
+    resolution: {integrity: sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==}
+    engines: {node: '>=0.8'}
+    dev: false
+
+  /console-control-strings@1.1.0:
+    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
+
   /constant-case@3.0.4:
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
@@ -10729,6 +9541,12 @@ packages:
     resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
     dev: true
 
+  /copy-anything@2.0.6:
+    resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}
+    dependencies:
+      is-what: 3.14.1
+    dev: true
+
   /copy-descriptor@0.1.1:
     resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
     engines: {node: '>=0.10.0'}
@@ -10757,17 +9575,8 @@ packages:
       browserslist: 4.21.4
     dev: true
 
-  /core-js-pure@3.27.1:
-    resolution: {integrity: sha512-BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw==}
-    dev: true
-
-  /core-js@2.6.12:
-    resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==}
-    deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
-    dev: false
-
-  /core-js@3.27.2:
-    resolution: {integrity: sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w==}
+  /core-js@3.31.0:
+    resolution: {integrity: sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==}
 
   /core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
@@ -10775,9 +9584,9 @@ packages:
   /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
-  /cosmiconfig@6.0.0:
-    resolution: {integrity: sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==}
-    engines: {node: '>=8'}
+  /cosmiconfig@7.1.0:
+    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
+    engines: {node: '>=10'}
     dependencies:
       '@types/parse-json': 4.0.0
       import-fresh: 3.3.0
@@ -10786,15 +9595,14 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /cosmiconfig@7.1.0:
-    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
-    engines: {node: '>=10'}
+  /cosmiconfig@8.2.0:
+    resolution: {integrity: sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==}
+    engines: {node: '>=14'}
     dependencies:
-      '@types/parse-json': 4.0.0
       import-fresh: 3.3.0
+      js-yaml: 4.1.0
       parse-json: 5.2.0
       path-type: 4.0.0
-      yaml: 1.10.2
     dev: true
 
   /cpu-features@0.0.4:
@@ -10934,10 +9742,12 @@ packages:
       domhandler: 4.3.1
       domutils: 2.8.0
       nth-check: 2.1.1
+    dev: false
 
   /css-what@6.1.0:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
     engines: {node: '>= 6'}
+    dev: false
 
   /css.escape@1.5.1:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
@@ -11087,7 +9897,6 @@ packages:
 
   /dayjs@1.11.6:
     resolution: {integrity: sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==}
-    dev: true
 
   /de-indent@1.0.2:
     resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
@@ -11201,11 +10010,6 @@ packages:
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
-  /deepmerge@1.5.2:
-    resolution: {integrity: sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
   /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
@@ -11237,6 +10041,12 @@ packages:
       os-name: 1.0.3
     dev: false
 
+  /defaults@1.0.4:
+    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+    dependencies:
+      clone: 1.0.4
+    dev: true
+
   /define-lazy-prop@2.0.0:
     resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
     engines: {node: '>=8'}
@@ -11432,22 +10242,13 @@ packages:
     resolution: {integrity: sha512-8o+oVqLQZoruQPYy3uAAQtc6YbtSiRq5aPJBhJ82YTJRHvI6ofhYAkC81WmjFTnfUbqg6T3aCglIpU9p/5e7Cw==}
     dev: true
 
-  /dom-converter@0.2.0:
-    resolution: {integrity: sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==}
-    dependencies:
-      utila: 0.4.0
-    dev: true
-
-  /dom-event-types@1.1.0:
-    resolution: {integrity: sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==}
-    dev: true
-
   /dom-serializer@1.4.1:
     resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
     dependencies:
       domelementtype: 2.3.0
       domhandler: 4.3.1
       entities: 2.2.0
+    dev: false
 
   /dom-serializer@2.0.0:
     resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
@@ -11475,6 +10276,7 @@ packages:
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
+    dev: false
 
   /domhandler@5.0.3:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
@@ -11493,6 +10295,7 @@ packages:
       dom-serializer: 1.4.1
       domelementtype: 2.3.0
       domhandler: 4.3.1
+    dev: false
 
   /domutils@3.0.1:
     resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
@@ -11506,6 +10309,7 @@ packages:
     dependencies:
       no-case: 3.0.4
       tslib: 2.5.0
+    dev: false
 
   /dotenv-expand@10.0.0:
     resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
@@ -11571,14 +10375,15 @@ packages:
     dependencies:
       safe-buffer: 5.2.1
 
-  /editorconfig@0.15.3:
-    resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==}
+  /editorconfig@1.0.4:
+    resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
+    engines: {node: '>=14'}
     hasBin: true
     dependencies:
-      commander: 2.20.3
-      lru-cache: 4.1.5
+      '@one-ini/wasm': 0.1.1
+      commander: 10.0.1
+      minimatch: 9.0.1
       semver: 7.5.4
-      sigmund: 1.0.1
     dev: true
 
   /ee-first@1.1.1:
@@ -11595,20 +10400,30 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
-  /element-ui@2.15.12(patch_hash=prckukfdop5sl2her6de25cod4)(vue@2.7.14):
-    resolution: {integrity: sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==}
+  /element-plus@2.3.6(vue@3.3.4):
+    resolution: {integrity: sha512-GLz0pXUYI2zRfIgyI6W7SWmHk6dSEikP9yR++hsQUyy63+WjutoiGpA3SZD4cGPSXUzRFeKfVr8CnYhK5LqXZw==}
     peerDependencies:
-      vue: ^2.5.17
+      vue: ^3.2.0
     dependencies:
-      async-validator: 1.8.5
-      babel-helper-vue-jsx-merge-props: 2.0.3
-      deepmerge: 1.5.2
-      normalize-wheel: 1.0.1
-      resize-observer-polyfill: 1.5.1
-      throttle-debounce: 1.1.0
-      vue: 2.7.14
+      '@ctrl/tinycolor': 3.6.0
+      '@element-plus/icons-vue': 2.1.0(vue@3.3.4)
+      '@floating-ui/dom': 1.4.5
+      '@popperjs/core': /@sxzz/popperjs-es@2.11.7
+      '@types/lodash': 4.14.195
+      '@types/lodash-es': 4.17.6
+      '@vueuse/core': 9.13.0(vue@3.3.4)
+      async-validator: 4.2.5
+      dayjs: 1.11.6
+      escape-html: 1.0.3
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+      lodash-unified: 1.0.3(@types/lodash-es@4.17.6)(lodash-es@4.17.21)(lodash@4.17.21)
+      memoize-one: 6.0.0
+      normalize-wheel-es: 1.2.0
+      vue: 3.3.4
+    transitivePeerDependencies:
+      - '@vue/composition-api'
     dev: false
-    patched: true
 
   /emittery@0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
@@ -11677,6 +10492,7 @@ packages:
 
   /entities@2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+    dev: false
 
   /entities@3.0.1:
     resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==}
@@ -11703,6 +10519,14 @@ packages:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
     dev: false
 
+  /errno@0.1.8:
+    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
+    hasBin: true
+    dependencies:
+      prr: 1.0.1
+    dev: true
+    optional: true
+
   /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
@@ -12345,7 +11169,6 @@ packages:
 
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
-    dev: true
 
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@@ -12774,6 +11597,13 @@ packages:
       ramda: 0.28.0
     dev: true
 
+  /file-system-cache@2.3.0:
+    resolution: {integrity: sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==}
+    dependencies:
+      fs-extra: 11.1.1
+      ramda: 0.29.0
+    dev: true
+
   /file-type@16.5.4:
     resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==}
     engines: {node: '>=10'}
@@ -13005,38 +11835,6 @@ packages:
   /forever-agent@0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
 
-  /fork-ts-checker-webpack-plugin@6.5.2(typescript@5.1.3)(vue-template-compiler@2.7.14)(webpack@5.75.0):
-    resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==}
-    engines: {node: '>=10', yarn: '>=1.0.0'}
-    peerDependencies:
-      eslint: '>= 6'
-      typescript: '>= 2.7'
-      vue-template-compiler: '*'
-      webpack: '>= 4'
-    peerDependenciesMeta:
-      eslint:
-        optional: true
-      vue-template-compiler:
-        optional: true
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@types/json-schema': 7.0.11
-      chalk: 4.1.2
-      chokidar: 3.5.2
-      cosmiconfig: 6.0.0
-      deepmerge: 4.2.2
-      fs-extra: 9.1.0
-      glob: 7.2.3
-      memfs: 3.4.13
-      minimatch: 3.1.2
-      schema-utils: 2.7.0
-      semver: 7.5.4
-      tapable: 1.1.3
-      typescript: 5.1.3
-      vue-template-compiler: 2.7.14
-      webpack: 5.75.0(esbuild@0.17.18)
-    dev: true
-
   /form-data@2.3.3:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
@@ -13128,6 +11926,15 @@ packages:
       universalify: 2.0.0
     dev: true
 
+  /fs-extra@11.1.1:
+    resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
+    engines: {node: '>=14.14'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
+
   /fs-extra@6.0.1:
     resolution: {integrity: sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==}
     dependencies:
@@ -13167,10 +11974,6 @@ packages:
       through2: 2.0.5
     dev: true
 
-  /fs-monkey@1.0.3:
-    resolution: {integrity: sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==}
-    dev: true
-
   /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -13854,28 +12657,10 @@ packages:
       whatwg-encoding: 2.0.0
     dev: true
 
-  /html-entities@2.3.3:
-    resolution: {integrity: sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==}
-    dev: true
-
   /html-escaper@2.0.2:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
-  /html-minifier-terser@6.1.0:
-    resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    dependencies:
-      camel-case: 4.1.2
-      clean-css: 5.3.2
-      commander: 8.3.0
-      he: 1.2.0
-      param-case: 3.0.4
-      relateurl: 0.2.7
-      terser: 5.16.1
-    dev: true
-
   /html-to-text@8.2.0:
     resolution: {integrity: sha512-CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ==}
     engines: {node: '>=10.23.2'}
@@ -13889,20 +12674,6 @@ packages:
       selderee: 0.6.0
     dev: false
 
-  /html-webpack-plugin@5.5.0(webpack@5.75.0):
-    resolution: {integrity: sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==}
-    engines: {node: '>=10.13.0'}
-    peerDependencies:
-      webpack: ^5.20.0
-    dependencies:
-      '@types/html-minifier-terser': 6.1.0
-      html-minifier-terser: 6.1.0
-      lodash: 4.17.21
-      pretty-error: 4.0.0
-      tapable: 2.2.1
-      webpack: 5.75.0(esbuild@0.17.18)
-    dev: true
-
   /htmlparser2@6.1.0:
     resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
     dependencies:
@@ -13910,6 +12681,7 @@ packages:
       domhandler: 4.3.1
       domutils: 2.8.0
       entities: 2.2.0
+    dev: false
 
   /htmlparser2@8.0.1:
     resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
@@ -14080,6 +12852,13 @@ packages:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
+  /image-size@0.5.5:
+    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+    dev: true
+    optional: true
+
   /imap-simple@4.3.0:
     resolution: {integrity: sha512-SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ==}
     dependencies:
@@ -14486,6 +13265,11 @@ packages:
       is-path-inside: 3.0.3
     dev: true
 
+  /is-interactive@1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+    dev: true
+
   /is-lambda@1.0.1:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
     dev: false
@@ -14672,9 +13456,8 @@ packages:
       call-bind: 1.0.2
       get-intrinsic: 1.1.3
 
-  /is-whitespace@0.3.0:
-    resolution: {integrity: sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==}
-    engines: {node: '>=0.10.0'}
+  /is-what@3.14.1:
+    resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}
     dev: true
 
   /is-windows@1.0.2:
@@ -15076,7 +13859,7 @@ packages:
     resolution: {integrity: sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/code-frame': 7.18.6
+      '@babel/code-frame': 7.21.4
       '@jest/types': 29.5.0
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
@@ -15331,6 +14114,11 @@ packages:
       - ts-node
     dev: true
 
+  /jiti@1.19.1:
+    resolution: {integrity: sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==}
+    hasBin: true
+    dev: true
+
   /jmespath@0.16.0:
     resolution: {integrity: sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==}
     engines: {node: '>= 0.6.0'}
@@ -15358,13 +14146,13 @@ packages:
     resolution: {integrity: sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==}
     dev: false
 
-  /js-beautify@1.14.7:
-    resolution: {integrity: sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==}
-    engines: {node: '>=10'}
+  /js-beautify@1.14.9:
+    resolution: {integrity: sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==}
+    engines: {node: '>=12'}
     hasBin: true
     dependencies:
       config-chain: 1.1.13
-      editorconfig: 0.15.3
+      editorconfig: 1.0.4
       glob: 8.1.0
       nopt: 6.0.0
     dev: true
@@ -15409,66 +14197,6 @@ packages:
   /jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
-  /jscodeshift@0.13.1(@babel/preset-env@7.21.5):
-    resolution: {integrity: sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==}
-    hasBin: true
-    peerDependencies:
-      '@babel/preset-env': ^7.1.6
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/parser': 7.21.8
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.21.8)
-      '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
-      '@babel/preset-flow': 7.18.6(@babel/core@7.21.8)
-      '@babel/preset-typescript': 7.18.6(@babel/core@7.21.8)
-      '@babel/register': 7.18.9(@babel/core@7.21.8)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.21.8)
-      chalk: 4.1.2
-      flow-parser: 0.197.0
-      graceful-fs: 4.2.10
-      micromatch: 3.1.10
-      neo-async: 2.6.2
-      node-dir: 0.1.17
-      recast: 0.20.5
-      temp: 0.8.4
-      write-file-atomic: 2.4.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /jscodeshift@0.14.0(@babel/preset-env@7.20.2):
-    resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
-    hasBin: true
-    peerDependencies:
-      '@babel/preset-env': ^7.1.6
-    dependencies:
-      '@babel/core': 7.21.8
-      '@babel/parser': 7.21.8
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.21.8)
-      '@babel/preset-env': 7.20.2(@babel/core@7.20.12)
-      '@babel/preset-flow': 7.18.6(@babel/core@7.21.8)
-      '@babel/preset-typescript': 7.18.6(@babel/core@7.21.8)
-      '@babel/register': 7.18.9(@babel/core@7.21.8)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.21.8)
-      chalk: 4.1.2
-      flow-parser: 0.197.0
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      neo-async: 2.6.2
-      node-dir: 0.1.17
-      recast: 0.21.5
-      temp: 0.8.4
-      write-file-atomic: 2.4.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /jscodeshift@0.14.0(@babel/preset-env@7.21.5):
     resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
     hasBin: true
@@ -15479,8 +14207,8 @@ packages:
       '@babel/parser': 7.21.8
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8)
       '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-optional-chaining': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-commonjs': 7.20.11(@babel/core@7.21.8)
+      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8)
+      '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.21.8)
       '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
       '@babel/preset-flow': 7.18.6(@babel/core@7.21.8)
       '@babel/preset-typescript': 7.18.6(@babel/core@7.21.8)
@@ -15630,10 +14358,6 @@ packages:
   /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
-  /json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
-
   /json-schema@0.4.0:
     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
 
@@ -15871,6 +14595,37 @@ packages:
       flush-write-stream: 1.1.1
     dev: true
 
+  /less-loader@11.1.3(less@4.1.3)(webpack@5.75.0):
+    resolution: {integrity: sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==}
+    engines: {node: '>= 14.15.0'}
+    peerDependencies:
+      less: ^3.5.0 || ^4.0.0
+      webpack: ^5.0.0
+    dependencies:
+      less: 4.1.3
+      webpack: 5.75.0(esbuild@0.17.18)
+    dev: true
+
+  /less@4.1.3:
+    resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dependencies:
+      copy-anything: 2.0.6
+      parse-node-version: 1.0.1
+      tslib: 2.5.0
+    optionalDependencies:
+      errno: 0.1.8
+      graceful-fs: 4.2.10
+      image-size: 0.5.5
+      make-dir: 2.1.0
+      mime: 1.6.0
+      needle: 3.2.0
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /leven@2.1.0:
     resolution: {integrity: sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==}
     engines: {node: '>=0.10.0'}
@@ -16073,6 +14828,18 @@ packages:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
+  /lodash-unified@1.0.3(@types/lodash-es@4.17.6)(lodash-es@4.17.21)(lodash@4.17.21):
+    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
+    peerDependencies:
+      '@types/lodash-es': '*'
+      lodash: '*'
+      lodash-es: '*'
+    dependencies:
+      '@types/lodash-es': 4.17.6
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+    dev: false
+
   /lodash.assign@4.2.0:
     resolution: {integrity: sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==}
     dev: true
@@ -16306,17 +15073,11 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /lz-string@1.4.4:
-    resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
+  /lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
     dev: true
 
-  /magic-string@0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
-    dependencies:
-      sourcemap-codec: 1.4.8
-    dev: true
-
   /magic-string@0.27.0:
     resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
     engines: {node: '>=12'}
@@ -16324,6 +15085,12 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
+  /magic-string@0.30.1:
+    resolution: {integrity: sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+
   /mailparser@3.5.0:
     resolution: {integrity: sha512-mdr2DFgz8LKC0/Q6io6znA0HVnzaPFT0a4TTnLeZ7mWHlkfnm227Wxlq7mHh7AgeP32h7gOUpXvyhSfJJIEeyg==}
     dependencies:
@@ -16471,10 +15238,6 @@ packages:
       - supports-color
     dev: true
 
-  /material-colors@1.2.6:
-    resolution: {integrity: sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==}
-    dev: false
-
   /md5@2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
     dependencies:
@@ -16506,12 +15269,9 @@ packages:
     engines: {node: '>= 0.8'}
     dev: false
 
-  /memfs@3.4.13:
-    resolution: {integrity: sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==}
-    engines: {node: '>= 4.0.0'}
-    dependencies:
-      fs-monkey: 1.0.3
-    dev: true
+  /memoize-one@6.0.0:
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
+    dev: false
 
   /memoizerific@1.11.3:
     resolution: {integrity: sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==}
@@ -16527,12 +15287,6 @@ packages:
   /merge-descriptors@1.0.1:
     resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
 
-  /merge-source-map@1.1.0:
-    resolution: {integrity: sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==}
-    dependencies:
-      source-map: 0.6.1
-    dev: true
-
   /merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: true
@@ -16644,6 +15398,13 @@ packages:
       brace-expansion: 2.0.1
     dev: false
 
+  /minimatch@9.0.1:
+    resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
@@ -17029,6 +15790,19 @@ packages:
       randexp: 0.4.6
     dev: false
 
+  /needle@3.2.0:
+    resolution: {integrity: sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==}
+    engines: {node: '>= 4.4.x'}
+    hasBin: true
+    dependencies:
+      debug: 3.2.7(supports-color@8.1.1)
+      iconv-lite: 0.6.3
+      sax: 1.2.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+    optional: true
+
   /negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
     engines: {node: '>= 0.6'}
@@ -17266,6 +16040,10 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /normalize-wheel-es@1.2.0:
+    resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
+    dev: false
+
   /normalize-wheel@1.0.1:
     resolution: {integrity: sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==}
     dev: false
@@ -17543,6 +16321,21 @@ packages:
       word-wrap: 1.2.3
     dev: true
 
+  /ora@5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      bl: 4.1.0
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-spinners: 2.9.0
+      is-interactive: 1.0.0
+      is-unicode-supported: 0.1.0
+      log-symbols: 4.1.0
+      strip-ansi: 6.0.1
+      wcwidth: 1.0.1
+    dev: true
+
   /ordered-read-streams@1.0.1:
     resolution: {integrity: sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==}
     dependencies:
@@ -17703,6 +16496,7 @@ packages:
     dependencies:
       dot-case: 3.0.4
       tslib: 2.5.0
+    dev: false
 
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
@@ -17840,10 +16634,6 @@ packages:
       ansi-escapes: 3.2.0
       cross-spawn: 6.0.5
 
-  /path-browserify@1.0.1:
-    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
-    dev: true
-
   /path-case@3.0.4:
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
@@ -18075,7 +16865,7 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /pinia@2.0.23(typescript@5.1.3)(vue@2.7.14):
+  /pinia@2.0.23(typescript@5.1.3)(vue@3.3.4):
     resolution: {integrity: sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
@@ -18089,8 +16879,8 @@ packages:
     dependencies:
       '@vue/devtools-api': 6.4.5
       typescript: 5.1.3
-      vue: 2.7.14
-      vue-demi: 0.13.11(vue@2.7.14)
+      vue: 3.3.4
+      vue-demi: 0.13.11(vue@3.3.4)
 
   /pinkie-promise@2.0.1:
     resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==}
@@ -18184,6 +16974,20 @@ packages:
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
 
+  /postcss-loader@7.3.3(postcss@8.4.21)(webpack@5.75.0):
+    resolution: {integrity: sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==}
+    engines: {node: '>= 14.15.0'}
+    peerDependencies:
+      postcss: ^7.0.0 || ^8.0.1
+      webpack: ^5.0.0
+    dependencies:
+      cosmiconfig: 8.2.0
+      jiti: 1.19.1
+      postcss: 8.4.21
+      semver: 7.5.4
+      webpack: 5.75.0(esbuild@0.17.18)
+    dev: true
+
   /postcss-modules-extract-imports@2.0.0:
     resolution: {integrity: sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==}
     engines: {node: '>= 6'}
@@ -18348,23 +17152,6 @@ packages:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
     engines: {node: '>=6'}
 
-  /pretty-error@4.0.0:
-    resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==}
-    dependencies:
-      lodash: 4.17.21
-      renderkid: 3.0.0
-    dev: true
-
-  /pretty-format@26.6.2:
-    resolution: {integrity: sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==}
-    engines: {node: '>= 10'}
-    dependencies:
-      '@jest/types': 26.6.2
-      ansi-regex: 5.0.1
-      ansi-styles: 4.3.0
-      react-is: 17.0.2
-    dev: true
-
   /pretty-format@27.5.1:
     resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
@@ -18397,15 +17184,6 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  /pretty@2.0.0:
-    resolution: {integrity: sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      condense-newlines: 0.2.1
-      extend-shallow: 2.0.1
-      js-beautify: 1.14.7
-    dev: true
-
   /process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
@@ -18538,6 +17316,11 @@ packages:
   /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
+  /prr@1.0.1:
+    resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
+    dev: true
+    optional: true
+
   /ps-tree@1.2.0:
     resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
     engines: {node: '>= 0.10'}
@@ -18764,12 +17547,6 @@ packages:
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: false
 
-  /querystring@0.2.1:
-    resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
-    engines: {node: '>=0.4.x'}
-    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
-    dev: true
-
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
 
@@ -18795,6 +17572,10 @@ packages:
     resolution: {integrity: sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==}
     dev: true
 
+  /ramda@0.29.0:
+    resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
+    dev: true
+
   /randexp@0.4.6:
     resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==}
     engines: {node: '>=0.12'}
@@ -18866,6 +17647,17 @@ packages:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
     dev: true
 
+  /react-resize-detector@7.1.2(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-zXnPJ2m8+6oq9Nn8zsep/orts9vQv3elrpA+R8XTcW7DVVUJ9vwDwMXaBtykAYjMnkCIaOoK9vObyR7ZgFNlOw==}
+    peerDependencies:
+      react: ^16.0.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      lodash: 4.17.21
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
   /react@17.0.2:
     resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
     engines: {node: '>=0.10.0'}
@@ -18960,16 +17752,6 @@ packages:
     dependencies:
       picomatch: 2.3.1
 
-  /recast@0.20.5:
-    resolution: {integrity: sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==}
-    engines: {node: '>= 4'}
-    dependencies:
-      ast-types: 0.14.2
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.5.0
-    dev: true
-
   /recast@0.21.5:
     resolution: {integrity: sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==}
     engines: {node: '>= 4'}
@@ -18990,8 +17772,8 @@ packages:
       tslib: 2.5.0
     dev: true
 
-  /recast@0.23.1:
-    resolution: {integrity: sha512-RokaBcoxSjXUDzz1TXSZmZsSW6ZpLmlA3GGqJ8uuTrQ9hZhEz+4Tpsc+gRvYRJ2BU4H+ZyUlg91eSGDw7bwy7g==}
+  /recast@0.23.3:
+    resolution: {integrity: sha512-HbCVFh2ANP6a09nzD4lx7XthsxMOJWKX5pIcUwtLrmeEIl3I0DwjCoVXDE0Aobk+7k/mS3H50FK4iuYArpcT6Q==}
     engines: {node: '>= 4'}
     dependencies:
       assert: 2.0.0
@@ -19061,10 +17843,6 @@ packages:
     resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
     dev: true
 
-  /regenerator-runtime@0.11.1:
-    resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==}
-    dev: false
-
   /regenerator-runtime@0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
 
@@ -19086,6 +17864,10 @@ packages:
       safe-regex: 1.1.0
     dev: true
 
+  /regex-parser@2.2.11:
+    resolution: {integrity: sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==}
+    dev: true
+
   /regexp-tree@0.1.25:
     resolution: {integrity: sha512-szcL3aqw+vEeuxhL1AMYRyeMP+goYF5I/guaH10uJX5xbGyeQeNPPneaj3ZWVmGLCDxrVaaYekkr5R12gk4dJw==}
     hasBin: true
@@ -19126,11 +17908,6 @@ packages:
     resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
     dev: false
 
-  /relateurl@0.2.7:
-    resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
-    engines: {node: '>= 0.10'}
-    dev: true
-
   /remark-external-links@8.0.0:
     resolution: {integrity: sha512-5vPSX0kHoSsqtdftSHhIYofVINC8qmp0nctkeU9YoJwV3YfiBRiI6cbFRJ0oI/1F9xS+bopXG0m2KS8VFscuKA==}
     dependencies:
@@ -19173,16 +17950,6 @@ packages:
     resolution: {integrity: sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==}
     dev: false
 
-  /renderkid@3.0.0:
-    resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}
-    dependencies:
-      css-select: 4.3.0
-      dom-converter: 0.2.0
-      htmlparser2: 6.1.0
-      lodash: 4.17.21
-      strip-ansi: 6.0.1
-    dev: true
-
   /repeat-element@1.1.4:
     resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
     engines: {node: '>=0.10.0'}
@@ -19262,11 +18029,6 @@ packages:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
-  /require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /require-main-filename@1.0.1:
     resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
     dev: true
@@ -19278,10 +18040,6 @@ packages:
   /requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
-  /resize-observer-polyfill@1.5.1:
-    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
-    dev: false
-
   /resolve-cwd@3.0.0:
     resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
     engines: {node: '>=8'}
@@ -19314,6 +18072,17 @@ packages:
       value-or-function: 3.0.0
     dev: true
 
+  /resolve-url-loader@5.0.0:
+    resolution: {integrity: sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==}
+    engines: {node: '>=12'}
+    dependencies:
+      adjust-sourcemap-loader: 4.0.0
+      convert-source-map: 1.9.0
+      loader-utils: 2.0.4
+      postcss: 8.4.21
+      source-map: 0.6.1
+    dev: true
+
   /resolve-url@0.2.1:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
@@ -19519,12 +18288,12 @@ packages:
     dev: false
     optional: true
 
-  /sass-loader@13.2.0(sass@1.58.0)(webpack@5.75.0):
-    resolution: {integrity: sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==}
+  /sass-loader@13.3.2(sass@1.63.4)(webpack@5.75.0):
+    resolution: {integrity: sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==}
     engines: {node: '>= 14.15.0'}
     peerDependencies:
       fibers: '>= 3.1.0'
-      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
       sass: ^1.3.0
       sass-embedded: '*'
       webpack: ^5.0.0
@@ -19538,15 +18307,14 @@ packages:
       sass-embedded:
         optional: true
     dependencies:
-      klona: 2.0.6
       neo-async: 2.6.2
-      sass: 1.58.0
+      sass: 1.63.4
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
 
-  /sass@1.58.0:
-    resolution: {integrity: sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==}
-    engines: {node: '>=12.0.0'}
+  /sass@1.63.4:
+    resolution: {integrity: sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
       chokidar: 3.5.2
@@ -19560,7 +18328,6 @@ packages:
 
   /sax@1.2.4:
     resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==}
-    dev: false
 
   /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
@@ -19587,15 +18354,6 @@ packages:
       loose-envify: 1.4.0
     dev: true
 
-  /schema-utils@2.7.0:
-    resolution: {integrity: sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==}
-    engines: {node: '>= 8.9.0'}
-    dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
-    dev: true
-
   /schema-utils@2.7.1:
     resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
     engines: {node: '>= 8.9.0'}
@@ -19614,16 +18372,6 @@ packages:
       ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
 
-  /schema-utils@4.0.0:
-    resolution: {integrity: sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==}
-    engines: {node: '>= 12.13.0'}
-    dependencies:
-      '@types/json-schema': 7.0.11
-      ajv: 8.12.0
-      ajv-formats: 2.1.1(ajv@8.12.0)
-      ajv-keywords: 5.1.0(ajv@8.12.0)
-    dev: true
-
   /seedrandom@3.0.5:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
     dev: true
@@ -19797,10 +18545,6 @@ packages:
     resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
     dev: true
 
-  /sigmund@1.0.1:
-    resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==}
-    dev: true
-
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
@@ -20038,11 +18782,6 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
-  /sourcemap-codec@1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    deprecated: Please use @jridgewell/sourcemap-codec instead
-    dev: true
-
   /space-separated-tokens@1.1.5:
     resolution: {integrity: sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==}
     dev: true
@@ -20272,7 +19011,7 @@ packages:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
     dev: true
 
-  /storybook-addon-themes@6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@2.7.14):
+  /storybook-addon-themes@6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@3.3.4):
     resolution: {integrity: sha512-ZT8aNgrwFVNEOmOPBLNS0WBacjvMFo/bZ83P8MmsJ3Ewqt0AbmPioghTZccARUn/EQ+LrDxyh2D0QgmLaKo07Q==}
     peerDependencies:
       react: '*'
@@ -20291,20 +19030,43 @@ packages:
       '@storybook/components': 6.5.15(react-dom@18.2.0)(react@17.0.2)
       '@storybook/core-events': 6.5.15
       '@storybook/theming': 6.5.15(react-dom@18.2.0)(react@17.0.2)
-      core-js: 3.27.2
+      core-js: 3.31.0
       global: 4.4.0
       memoizerific: 1.11.3
       react: 17.0.2
-      vue: 2.7.14
+      vue: 3.3.4
     transitivePeerDependencies:
       - react-dom
     dev: true
 
-  /storybook@7.0.7:
-    resolution: {integrity: sha512-MaFAhpPm/KsaoIQfGzapnRyXNh1VbS8l38BNZR5ZD97ejGkLukJ7TO4fFS87Hyy6whAXo6tTdtqeCByMQ9gRFA==}
+  /storybook-dark-mode@3.0.0(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-aeAvqP/mmdccEiCsvx6aw3M0i7mZSiXROsrAsEQN8vl1lAg3FZN+y3Xu/f+ye59wLMRuKJC/JBp7E3/H7vLBRQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
+    dependencies:
+      '@storybook/addons': 7.0.7(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.0.21
+      '@storybook/global': 5.0.0
+      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      fast-deep-equal: 3.1.3
+      memoizerific: 1.11.3
+      react: 17.0.2
+      react-dom: 18.2.0(react@17.0.2)
+    dev: true
+
+  /storybook@7.0.21:
+    resolution: {integrity: sha512-NjHn7g4BXoJ5qisMkGQmSdjnXrlEETqmirQpi/NgrwfMV2gE7BO2KmPgxGh1jT0M04y788OSZhffOdKbuvDFMQ==}
     hasBin: true
     dependencies:
-      '@storybook/cli': 7.0.7
+      '@storybook/cli': 7.0.21
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -20539,8 +19301,8 @@ packages:
       webpack: 5.75.0(esbuild@0.17.18)
     dev: true
 
-  /style-loader@3.3.1(webpack@5.75.0):
-    resolution: {integrity: sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==}
+  /style-loader@3.3.3(webpack@5.75.0):
+    resolution: {integrity: sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==}
     engines: {node: '>= 12.13.0'}
     peerDependencies:
       webpack: ^5.0.0
@@ -20658,11 +19420,6 @@ packages:
     resolution: {integrity: sha512-c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw==}
     dev: false
 
-  /tapable@1.1.3:
-    resolution: {integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==}
-    engines: {node: '>=6'}
-    dev: true
-
   /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
@@ -20853,11 +19610,6 @@ packages:
       any-promise: 1.3.0
     dev: false
 
-  /throttle-debounce@1.1.0:
-    resolution: {integrity: sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==}
-    engines: {node: '>=4'}
-    dev: false
-
   /throttleit@1.0.0:
     resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==}
     dev: true
@@ -20893,14 +19645,14 @@ packages:
       globrex: 0.1.2
     dev: true
 
+  /tiny-invariant@1.3.1:
+    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
+    dev: true
+
   /tinybench@2.3.1:
     resolution: {integrity: sha512-hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA==}
     dev: true
 
-  /tinycolor2@1.5.2:
-    resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
-    dev: false
-
   /tinypool@0.3.1:
     resolution: {integrity: sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ==}
     engines: {node: '>=14.0.0'}
@@ -21113,21 +19865,6 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-loader@9.4.2(typescript@5.1.3)(webpack@5.75.0):
-    resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      typescript: '*'
-      webpack: ^5.0.0
-    dependencies:
-      chalk: 4.1.2
-      enhanced-resolve: 5.13.0
-      micromatch: 4.0.5
-      semver: 7.5.4
-      typescript: 5.1.3
-      webpack: 5.75.0(esbuild@0.17.18)
-    dev: true
-
   /ts-map@1.0.3:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
@@ -21759,10 +20496,6 @@ packages:
       is-typed-array: 1.1.10
       which-typed-array: 1.1.9
 
-  /utila@0.4.0:
-    resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==}
-    dev: true
-
   /utility@0.1.11:
     resolution: {integrity: sha512-epFsJ71+/yC7MKMX7CM9azP31QBIQhywkiBUj74i/T3Y2TXtEor26QBkat7lGamrrNTr5CBI1imd/8F0Bmqw4g==}
     engines: {node: '>= 0.8.0'}
@@ -21808,9 +20541,8 @@ packages:
     resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
     hasBin: true
 
-  /v-click-outside@3.2.0:
-    resolution: {integrity: sha512-QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w==}
-    engines: {node: '>=6'}
+  /v3-infinite-loading@1.2.2:
+    resolution: {integrity: sha512-MWJc6yChnqeUasBFJ3Enu8IGPcQgRMSTrAEtT1MsHBEx+QjwvNTaY8o+8V9DgVt1MVhQSl3MC55hsaWLJmpRMw==}
     dev: false
 
   /v8-to-istanbul@9.0.1:
@@ -21962,6 +20694,41 @@ packages:
       fsevents: 2.3.2
     dev: true
 
+  /vite@4.0.4(less@4.1.3)(sass@1.63.4):
+    resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': '>= 14'
+      less: '*'
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+    dependencies:
+      esbuild: 0.16.17
+      less: 4.1.3
+      postcss: 8.4.21
+      resolve: 1.22.1
+      rollup: 3.10.0
+      sass: 1.63.4
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: true
+
   /vitest@0.28.5:
     resolution: {integrity: sha512-pyCQ+wcAOX7mKMcBNkzDwEHRGqQvHUl0XnoHR+3Pb1hytAHISgSxv9h0gUiSiYtISXUU3rMrKiKzFYDrI6ZIHA==}
     engines: {node: '>=v14.16.0'}
@@ -22038,16 +20805,23 @@ packages:
       lodash.throttle: 4.1.1
     dev: false
 
-  /vue-color@2.8.1:
-    resolution: {integrity: sha512-BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==}
+  /vue-boring-avatars@1.3.0(vue@3.3.4):
+    resolution: {integrity: sha512-X0Ur6+aYE8jXjKyY/LaWKrZ+FeJmc4xsirdz/lLuvm68wiokJc26Y9WpYPDuS1L2GwbvRDqLrnd9F2eL46buzA==}
+    peerDependencies:
+      vue: ^3.0.0
     dependencies:
-      clamp: 1.0.1
-      lodash.throttle: 4.1.1
-      material-colors: 1.2.6
-      tinycolor2: 1.5.2
+      vue: 3.3.4
     dev: false
 
-  /vue-demi@0.13.11(vue@2.7.14):
+  /vue-component-type-helpers@1.8.4:
+    resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
+    dev: true
+
+  /vue-component-type-helpers@1.8.6:
+    resolution: {integrity: sha512-vKWeoKVEV51ZzoB8+UY0apMXiifbPQxWlcZlvQRDVdiOHmEkCBClWeIGbqQ8cCR9P4j+oCyLW87sraZFMz/qnA==}
+    dev: true
+
+  /vue-demi@0.13.11(vue@3.3.4):
     resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
     engines: {node: '>=12'}
     hasBin: true
@@ -22059,44 +20833,41 @@ packages:
       '@vue/composition-api':
         optional: true
     dependencies:
-      vue: 2.7.14
+      vue: 3.3.4
+
+  /vue-demi@0.14.5(vue@3.3.4):
+    resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+    dependencies:
+      vue: 3.3.4
+    dev: false
 
-  /vue-docgen-api@4.56.4(vue@2.7.14):
+  /vue-docgen-api@4.56.4(vue@3.3.4):
     resolution: {integrity: sha512-Z59qNUYZNHMZL0QITNbqobGKJgmqyOs4OiAdzr1Ug7ys1gkFBGewiuwPURTsoM2zi4GWZWy2eW4B5FevwT7gpA==}
     dependencies:
       '@babel/parser': 7.21.8
       '@babel/types': 7.21.5
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-sfc': 3.2.45
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-sfc': 3.3.4
       ast-types: 0.14.2
       hash-sum: 1.0.2
       lru-cache: 4.1.5
       pug: 3.0.2
       recast: 0.22.0
       ts-map: 1.0.3
-      vue-inbrowser-compiler-independent-utils: 4.56.2(vue@2.7.14)
+      vue-inbrowser-compiler-independent-utils: 4.56.2(vue@3.3.4)
     transitivePeerDependencies:
       - vue
     dev: true
 
-  /vue-docgen-loader@1.5.1(@babel/preset-env@7.21.5)(vue-docgen-api@4.56.4)(webpack@5.75.0):
-    resolution: {integrity: sha512-coMmQYsg+fy18SVtBNU7/tztdqEyrneFfwQFLmx8O7jaJ11VZ//9tRWXlwGzJM07cPRwMHDKMlAdWrpuw3U46A==}
-    engines: {node: '>= 8.16'}
-    peerDependencies:
-      vue-docgen-api: '>=3'
-      webpack: '>=4'
-    dependencies:
-      clone: 2.1.2
-      jscodeshift: 0.13.1(@babel/preset-env@7.21.5)
-      loader-utils: 1.4.2
-      querystring: 0.2.1
-      vue-docgen-api: 4.56.4(vue@2.7.14)
-      webpack: 5.75.0(esbuild@0.17.18)
-    transitivePeerDependencies:
-      - '@babel/preset-env'
-      - supports-color
-    dev: true
-
   /vue-eslint-parser@9.3.0(eslint@8.39.0):
     resolution: {integrity: sha512-48IxT9d0+wArT1+3wNIy0tascRoywqSUe2E1YalIC1L8jsUGe5aJQItWfRok7DVFGz3UYvzEI7n5wiTXsCMAcQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
@@ -22115,134 +20886,45 @@ packages:
       - supports-color
     dev: true
 
-  /vue-hot-reload-api@2.3.4:
-    resolution: {integrity: sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==}
-    dev: true
-
-  /vue-i18n@8.27.2(vue@2.7.14):
-    resolution: {integrity: sha512-QVzn7u2WVH8F7eSKIM00lujC7x1mnuGPaTnDTmB01Hd709jDtB9kYtBqM+MWmp5AJRx3gnqAdZbee9MelqwFBg==}
+  /vue-i18n@9.2.2(vue@3.3.4):
+    resolution: {integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==}
+    engines: {node: '>= 14'}
     peerDependencies:
-      vue: ^2
+      vue: ^3.0.0
     dependencies:
-      vue: 2.7.14
+      '@intlify/core-base': 9.2.2
+      '@intlify/shared': 9.2.2
+      '@intlify/vue-devtools': 9.2.2
+      '@vue/devtools-api': 6.4.5
+      vue: 3.3.4
     dev: false
 
-  /vue-inbrowser-compiler-independent-utils@4.56.2(vue@2.7.14):
+  /vue-inbrowser-compiler-independent-utils@4.56.2(vue@3.3.4):
     resolution: {integrity: sha512-szE2vZDSkZlItq+K4MevgvCGKt5IzM6OkIjyCuj/09ty2akixeQGNFRXyDELMdmVVzmN+9nJn02YKnoPkhXHwA==}
     peerDependencies:
       vue: '>=2'
     dependencies:
-      vue: 2.7.14
+      vue: 3.3.4
     dev: true
 
-  /vue-infinite-loading@2.4.5(vue@2.7.14):
-    resolution: {integrity: sha512-xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g==}
+  /vue-json-pretty@2.2.4(vue@3.3.4):
+    resolution: {integrity: sha512-JX80b3QDrspcH43C53CdtYeq/froApQGSV5y43bEMWFj2LGOxB96aH1VmvrFA21nD1WTP6nwfFMQqGXuS4jyFQ==}
+    engines: {node: '>= 10.0.0', npm: '>= 5.0.0'}
     peerDependencies:
-      vue: ^2.6.10
+      vue: '>=3.0.0'
     dependencies:
-      vue: 2.7.14
+      vue: 3.3.4
     dev: false
 
-  /vue-json-pretty@1.9.3:
-    resolution: {integrity: sha512-b13DP1WGQ+ACUU2K5hmwFfHrHnydCFSTerE7fppeYMojSWN/5EOPODQECfIIRaJ7zzHtPW9OifkThFGPyY0xRg==}
-    engines: {node: '>= 10.0.0', npm: '>= 5.0.0'}
-    dev: false
-
-  /vue-loader@15.10.1(css-loader@6.7.3)(react-dom@18.2.0)(react@17.0.2)(vue-template-compiler@2.7.14)(webpack@5.75.0):
-    resolution: {integrity: sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==}
-    peerDependencies:
-      '@vue/compiler-sfc': ^3.0.8
-      cache-loader: '*'
-      css-loader: '*'
-      vue-template-compiler: '*'
-      webpack: ^3.0.0 || ^4.1.0 || ^5.0.0-0
-    peerDependenciesMeta:
-      '@vue/compiler-sfc':
-        optional: true
-      cache-loader:
-        optional: true
-      vue-template-compiler:
-        optional: true
-    dependencies:
-      '@vue/component-compiler-utils': 3.3.0(react-dom@18.2.0)(react@17.0.2)
-      css-loader: 6.7.3(webpack@5.75.0)
-      hash-sum: 1.0.2
-      loader-utils: 1.4.2
-      vue-hot-reload-api: 2.3.4
-      vue-style-loader: 4.1.3
-      vue-template-compiler: 2.7.14
-      webpack: 5.75.0(esbuild@0.17.18)
-    transitivePeerDependencies:
-      - arc-templates
-      - atpl
-      - babel-core
-      - bracket-template
-      - coffee-script
-      - dot
-      - dust
-      - dustjs-helpers
-      - dustjs-linkedin
-      - eco
-      - ect
-      - ejs
-      - haml-coffee
-      - hamlet
-      - hamljs
-      - handlebars
-      - hogan.js
-      - htmling
-      - jade
-      - jazz
-      - jqtpl
-      - just
-      - liquid-node
-      - liquor
-      - lodash
-      - marko
-      - mote
-      - mustache
-      - nunjucks
-      - plates
-      - pug
-      - qejs
-      - ractive
-      - razor-tmpl
-      - react
-      - react-dom
-      - slm
-      - squirrelly
-      - swig
-      - swig-templates
-      - teacup
-      - templayed
-      - then-jade
-      - then-pug
-      - tinyliquid
-      - toffee
-      - twig
-      - twing
-      - underscore
-      - vash
-      - velocityjs
-      - walrus
-      - whiskers
-    dev: true
-
-  /vue-router@3.6.5(vue@2.7.14):
-    resolution: {integrity: sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==}
+  /vue-router@4.2.2(vue@3.3.4):
+    resolution: {integrity: sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==}
     peerDependencies:
-      vue: ^2
+      vue: ^3.2.0
     dependencies:
-      vue: 2.7.14
+      '@vue/devtools-api': 6.5.0
+      vue: 3.3.4
     dev: false
 
-  /vue-style-loader@4.1.3:
-    resolution: {integrity: sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==}
-    dependencies:
-      hash-sum: 1.0.2
-      loader-utils: 1.4.2
-    dev: true
-
   /vue-template-compiler@2.7.14:
     resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==}
     dependencies:
@@ -22250,10 +20932,6 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-template-es2015-compiler@1.9.1:
-    resolution: {integrity: sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==}
-    dev: true
-
   /vue-tsc@1.0.24(typescript@5.1.3):
     resolution: {integrity: sha512-mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg==}
     hasBin: true
@@ -22265,27 +20943,18 @@ packages:
       typescript: 5.1.3
     dev: true
 
-  /vue2-boring-avatars@0.3.8:
-    resolution: {integrity: sha512-8vNN+zhCIiIMnSQDu0DwhJ11e9r3t4t12dromXmXDtRryBhV58NPn4XgMb4JKrBlfNK92KFrY/cxRy3nzhQfpQ==}
-    dependencies:
-      core-js: 3.27.2
-      vue: 2.7.14
-      vue-color: 2.8.1
-    dev: false
-
-  /vue2-teleport@1.0.1:
-    resolution: {integrity: sha512-hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw==}
-    dev: false
-
-  /vue2-touch-events@3.2.2:
-    resolution: {integrity: sha512-rGV8jxgOQEJYkJCp7uOBe3hjvmG1arThrq1wGtJHwJTgi65+P2a+0l4CYcQO/U1ZFqTq2/TT2+oTE6H7Y+6Eog==}
+  /vue3-touch-events@4.1.3:
+    resolution: {integrity: sha512-uXTclRzn7de1mgiDIZ8N4J/wnWl1vBPLTWr60fqoLXu7ifhDKpl83Q2m9qA20KfEiAy+L4X/xXGc5ptGmdPh4A==}
     dev: false
 
-  /vue@2.7.14:
-    resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
+  /vue@3.3.4:
+    resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==}
     dependencies:
-      '@vue/compiler-sfc': 2.7.14
-      csstype: 3.1.1
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-sfc': 3.3.4
+      '@vue/runtime-dom': 3.3.4
+      '@vue/server-renderer': 3.3.4(vue@3.3.4)
+      '@vue/shared': 3.3.4
 
   /w3c-keyname@2.2.6:
     resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
@@ -22333,6 +21002,12 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
+  /wcwidth@1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+    dependencies:
+      defaults: 1.0.4
+    dev: true
+
   /web-streams-polyfill@3.2.1:
     resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
     engines: {node: '>= 8'}
@@ -22345,28 +21020,6 @@ packages:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
 
-  /webpack-dev-middleware@5.3.3(webpack@5.75.0):
-    resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
-    dependencies:
-      colorette: 2.0.19
-      memfs: 3.4.13
-      mime-types: 2.1.35
-      range-parser: 1.2.1
-      schema-utils: 4.0.0
-      webpack: 5.75.0(esbuild@0.17.18)
-    dev: true
-
-  /webpack-hot-middleware@2.25.3:
-    resolution: {integrity: sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA==}
-    dependencies:
-      ansi-html-community: 0.0.8
-      html-entities: 2.3.3
-      strip-ansi: 6.0.1
-    dev: true
-
   /webpack-sources@3.2.3:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
@@ -22921,7 +21574,7 @@ packages:
     resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/runtime': 7.19.4
+      '@babel/runtime': 7.20.7
       '@types/lodash': 4.14.195
       lodash: 4.17.21
       lodash-es: 4.17.21

From 1b0d27098087b983c5de02eefae93ab530ffd1bd Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Fri, 28 Jul 2023 10:22:30 +0200
Subject: [PATCH 073/116] perf(editor): Memoize locale translate calls during
 actions generation (#6773)

performance(editor): Memoize locale translate calls during actions generation

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../composables/useActionsGeneration.ts       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
index 5876995e7b0f9..1cc1636f35e62 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
@@ -1,11 +1,10 @@
-import { startCase } from 'lodash-es';
+import { memoize, startCase } from 'lodash-es';
 import type {
 	INodePropertyCollection,
 	INodePropertyOptions,
 	INodeProperties,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
 import { CUSTOM_API_CALL_KEY } from '@/constants';
 import type { ActionTypeDescription, SimplifiedNodeType, ActionsRecord } from '@/Interface';
 
@@ -13,6 +12,13 @@ import { i18n } from '@/plugins/i18n';
 
 const PLACEHOLDER_RECOMMENDED_ACTION_KEY = 'placeholder_recommended';
 
+function translate(...args: Parameters<typeof i18n.baseText>) {
+	return i18n.baseText(...args);
+}
+// Memoize the translation function so we don't have to re-translate the same string
+// multiple times when generating the actions
+const cachedBaseText = memoize(translate, (...args) => JSON.stringify(args));
+
 const customNodeActionsParsers: {
 	[key: string]: (
 		matchedProperty: INodeProperties,
@@ -26,7 +32,7 @@ const customNodeActionsParsers: {
 			(categoryItem): ActionTypeDescription => ({
 				...getNodeTypeBase(nodeTypeDescription),
 				actionKey: categoryItem.value as string,
-				displayName: i18n.baseText('nodeCreator.actionsCategory.onEvent', {
+				displayName: cachedBaseText('nodeCreator.actionsCategory.onEvent', {
 					interpolate: { event: startCase(categoryItem.name) },
 				}),
 				description: categoryItem.description || '',
@@ -40,8 +46,8 @@ const customNodeActionsParsers: {
 function getNodeTypeBase(nodeTypeDescription: INodeTypeDescription, label?: string) {
 	const isTrigger = nodeTypeDescription.group.includes('trigger');
 	const category = isTrigger
-		? i18n.baseText('nodeCreator.actionsCategory.triggers')
-		: i18n.baseText('nodeCreator.actionsCategory.actions');
+		? cachedBaseText('nodeCreator.actionsCategory.triggers')
+		: cachedBaseText('nodeCreator.actionsCategory.actions');
 	return {
 		name: nodeTypeDescription.name,
 		group: nodeTypeDescription.group,
@@ -101,7 +107,7 @@ function triggersCategory(nodeTypeDescription: INodeTypeDescription): ActionType
 			{
 				...getNodeTypeBase(nodeTypeDescription),
 				actionKey: PLACEHOLDER_RECOMMENDED_ACTION_KEY,
-				displayName: i18n.baseText('nodeCreator.actionsCategory.onNewEvent', {
+				displayName: cachedBaseText('nodeCreator.actionsCategory.onNewEvent', {
 					interpolate: { event: nodeTypeDescription.displayName.replace('Trigger', '').trimEnd() },
 				}),
 				description: '',
@@ -125,7 +131,7 @@ function triggersCategory(nodeTypeDescription: INodeTypeDescription): ActionType
 			actionKey: categoryItem.value as string,
 			displayName:
 				categoryItem.action ??
-				i18n.baseText('nodeCreator.actionsCategory.onEvent', {
+				cachedBaseText('nodeCreator.actionsCategory.onEvent', {
 					interpolate: { event: startCase(categoryItem.name) },
 				}),
 			description: categoryItem.description || '',
@@ -175,7 +181,7 @@ function resourceCategories(nodeTypeDescription: INodeTypeDescription): ActionTy
 						return {
 							...getNodeTypeBase(
 								nodeTypeDescription,
-								`${resourceOption.name} ${i18n.baseText('nodeCreator.actionsCategory.actions')}`,
+								`${resourceOption.name} ${cachedBaseText('nodeCreator.actionsCategory.actions')}`,
 							),
 							actionKey: operationOption.value as string,
 							description: operationOption?.description ?? '',
@@ -234,7 +240,7 @@ export function useActionsGenerator() {
 	}
 
 	function generateMergedNodesAndActions(nodeTypes: INodeTypeDescription[]) {
-		const visibleNodeTypes = deepCopy(nodeTypes);
+		const visibleNodeTypes = [...nodeTypes];
 		const actions: ActionsRecord<typeof mergedNodes> = {};
 		const mergedNodes: SimplifiedNodeType[] = [];
 

From c25a4a2ce89b5ea9a0499449fc034b49c803f670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 28 Jul 2023 10:45:46 +0200
Subject: [PATCH 074/116] fix(editor): Close tags dropdown when modal is opened
 (#6766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: remove vue-fragment (no-changelog)

* feat: partial design-system migration

* feat: migrate info-accordion and info-tip components

* feat: migrate several components to vue 3

* feat: migrated several components

* feat: migrate several components

* feat: migrate several components

* feat: migrate several components

* feat: re-exported all design system components

* fix: fix design for popper components

* fix: editor kind of working, lots of issues to fix

* fix: fix several vue 3 migration issues

* fix: replace @change with @update:modelValue in several places

* fix: fix translation linking

* fix: fix inline-edit input

* fix: fix ndv and dialog design

* fix: update parameter input event bindings

* fix: rename deprecated lifecycle methods

* fix: fix json view mapping

* build: update lock file

* fix(editor): revisit last conflict with master and fix issues

* fix(editor): revisit last conflict with master and fix issues

* fix: fix expression editor bug causing code mirror to no longer be reactive

* fix: fix resource locator bug

* fix: fix vue-agile integration

* fix: remove global import for vue-agile

* fix: replace element-plus buttons with n8n-buttons everywhere

* fix(editor): Fix various element-plus styles (#6571)

* fix(editor): Fix various element-plus styles

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Remove debugging code

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Address PR comments

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix(editor): Fix loading in production mode [Vue 3] (#6578)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix(editor): First round of e2e tests fixes with Vue 3 (#6579)

* fix(editor): Fix broken smoke and workflow list e2e tests
* ✔️ Fix failing canvas action tests. Updating some selectors used in credentials and workflow tests

* feat: add vue 3 eslint rules and fix issues

* fix: fix tags-dropdown

* fix: fix white-space issues caused by i18n-t

* fix: rename non-generic click events

* fix: fix search in resources list layout

* fix: fix datatable paginator

* fix: fix popper select caret and dropdown size

* fix: add width to action-dropdown

* fix: fix workflow settings icon not being hidden

* fix: refactor newly added code

* fix: fix merge issue

* fix: fix ndv credentials watcher

* fix: fix workflow saving and grabber notch

* fix: fix nodes list panel transition

* fix: fix node title visibility

* fix: fix data unpinning

* fix: fix value access

* fix: show  input panel only if trigger panel enabled or not trigger node

* fix: fix tags dropdown and executions status spcing

* fix(editor): Prevent execution list to load back when leaving the route (#6697)

fix(editor): prevent execution list to load back when leaving the route

* fix: fix drawer visibility

* fix: fix expression toggle padding

* fix: fix expressions editor styling

* chore: prepare for testing

* fix: fix styling for el-button without patching

* test: fix unit tests in design-system

* test: fix most unit tests

* fix: remove import cycle.

* fix: fix personalization modal tests

* fix further resource mapper test adjustments

* fix: fix multiple tests and n8n-route attr duplication

* fix: fix source control tets

* fix: fixed remaining unit tests

* fix: fix workflows and credentials e2e tests

* fix: fix localizeNodeNames

* fix: update ndv e2e tests

* fix: fix popper left placement arrow

* fix: fix 5-ndv e2e tests

* fix: fix 6-code-node e2e tests

* fix(editor): Drop click outside directive from NodeCreator (#6716)

* fix(editor): Drop click outside directive from NodeCreator

* fix(editor): make sure mouseup outside is unbound at least before the component is unmounted

* fix: fix 10-settings-log-streaming e2e tests

* fix: fix node redrawing

* fix: fix tooltip buttons styling

* fix: fix varous e2e suites

* fix: fix 15-scheduler-node e2e suite

* fix: fix route watcher

* fix: fixed param name update and credential edit

* feat: update event names

* refactor: Remove deprecated `$data` (#6576)

Co-authored-by: Alex Grozav <alex@grozav.com>

* fix: fix 17-sharing e2e suite

* fix: fix tags dropdown

* fix: fix tags manager

* fix(editor): move :deep selectors to a separate scoped style block

* fix: fix sticky component and inline text edit

* fix: update e2e tests

* fix: remove button override references

* fix(editor): Adjust spacing in templates for Vue 3 (#6744)

* fix(editor): Adjust spacing in templates

* fix: Undo unneeded change

* fix: Undo unneeded change

* fix(editor): Adjust NDV height for Vue 3 (#6742)

fix(editor): Adjust NDV height

* fix(editor): Restore collapsed sidebar items for Vue 3 (#6743)

fix(editor): Restore collapsed sidebar items

* fix: fix linting issues

* fix: fix design-system deps

* fix: post-merge fixes

* fix: update tests

* fix: increase timeout for executionslist tets

* chore: fix linting issue

* fix: fix 14-mapping e2e tests in ci

* fix: re-enable tests

* fix: fix workflow duplication e2e tests after tags update

* fix(editor): Change component prop to be typed

* fix: fix tags dropdown in duplicate wf modal

* fix: fix focus behaviour in tags selector

* fix: fix tag creation

* fix: fix log streaming e2e race condition

* fix(editor): Fix Vue 3 linting issues (#6748)

* fix(editor): Fix Vue 3 linting issues

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix MainSidebar linter issues

* revert pnpm lock

* update pnpm lock file

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* fix(editor): Some css fixes for vue3 branch (#6749)

* ✨ Fixing filter button height

* ✨ Update input modal button position

* ✨ Updating tags styling

* ✨ Fix event logging settings spacing

* 👕 Fixing lint errors

* fix: fix linting issues

* Revert to `// eslint-disable-next-line @typescript-eslint/no-misused-promises` disabling of mixins init

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix: fix css issue

* fix(editor): Lint fix

* fix(editor): Fix settings initialisation (#6750)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix: fix initial settings loading

* fix: replace realClick with click force

* fix: fix randomly failing mapping e2e tests

* fix(editor): Fix menu item event handling

* fix: fix resource filters dropdown events (#6752)

* fix: fix resource filters dropdown events

* fix: remove teleported:false

* fix: fix event selection event naming (#6753)

* fix: removed console.log (#6754)

* fix: rever await nextTick changes

* fix: redo linting changes

* fix(editor): Redraw node connections if adding more than one node to canvas (#6755)

* fix(editor): Redraw node connections if adding more than one node to canvas

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Update position before connection two nodes

* Lint fix

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* fix(editor): Fix `ResourceMapper` unit tests (#6758)

* ✔️ Fix matching columns test

* ✔️ Fix multiple matching columns test

* ✔️ Removing `skip` from the last test

* fix: Allow pasting a big workflow (#6760)

* fix: pasting a big workflow

* chore: update comment

* refactor: move try/catch to function

* refactor: move try/catch to function

* fix(editor): Fix modal layer width

* fix: fix position changes

* fix: undo it.only

* fix: make undo/redo multiple steps more verbose

* fix: Fix value survey styles (#6764)

* fix: fix value survey styles

* fix: lint

* Revert "fix: lint"

72869c431f1448861df021be041b61c62f1e3118

* fix: lint

* fix(editor): Close tags dropdown when modal is opened

* ✔️ Updating tag selectors in e2e tests

* ✔️ Using tab to blur dropdown after adding tags

* ✔️ Clicking on the New Tab button instead of the tags dropdown to open it

* Reverting merge changes added by mistake

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>
Co-authored-by: Csaba Tuncsik <csaba@n8n.io>
Co-authored-by: OlegIvaniv <me@olegivaniv.com>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
---
 cypress/e2e/17-workflow-tags.cy.ts                 | 5 +++--
 cypress/pages/workflow.ts                          | 6 +++---
 packages/design-system/src/css/drawer.scss         | 1 -
 packages/editor-ui/src/components/TagsDropdown.vue | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 966a506e7bf2b..299c96b41d94d 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -30,6 +30,7 @@ describe('Workflow tags', () => {
 		}
 		cy.contains('Done').click();
 
+		wf.getters.createTagButton().click();
 		wf.getters.tagsDropdown().click();
 		wf.getters.tagsInDropdown().should('have.length', 5);
 		wf.getters.tagPills().should('have.length', 0); // none attached
@@ -45,7 +46,7 @@ describe('Workflow tags', () => {
 		});
 
 		cy.contains('Done').click();
-		wf.getters.tagsDropdown().click();
+		wf.getters.createTagButton().click();
 		wf.getters.tagsInDropdown().should('have.length', 0); // none stored
 		wf.getters.tagPills().should('have.length', 0); // none attached
 	});
@@ -66,7 +67,7 @@ describe('Workflow tags', () => {
 			.type(' Updated')
 			.type('{enter}');
 		cy.contains('Done').click();
-		wf.getters.tagsDropdown().click();
+		wf.getters.createTagButton().click();
 		wf.getters.tagsInDropdown().should('have.length', 1); // one stored
 		wf.getters.tagsInDropdown().contains('Updated').should('exist');
 		wf.getters.tagPills().should('have.length', 0); // none attached
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 72aca5977ab90..afe2a2081a9f3 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -13,9 +13,9 @@ export class WorkflowPage extends BasePage {
 		workflowTagsContainer: () => cy.getByTestId('workflow-tags-container'),
 		workflowTagsInput: () =>
 			this.getters.workflowTagsContainer().then(($el) => cy.wrap($el.find('input').first())),
-		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.tags > span'),
+		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.el-tag'),
 		nthTagPill: (n: number) =>
-			cy.get(`[data-test-id="workflow-tags-container"] span.tags > span:nth-child(${n})`),
+			cy.get(`[data-test-id="workflow-tags-container"] span.el-tag:nth-child(${n})`),
 		tagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
 		tagsInDropdown: () => getVisibleSelect().find('li').filter('.tag'),
 		createTagButton: () => cy.getByTestId('new-tag-link'),
@@ -214,7 +214,7 @@ export class WorkflowPage extends BasePage {
 				this.getters.workflowTagsInput().type(tag);
 				this.getters.workflowTagsInput().type('{enter}');
 			});
-			cy.get('body').click(0, 0);
+			cy.realPress('Tab')
 			// For a brief moment the Element UI tag component shows the tags as(+X) string
 			// so we need to wait for it to disappear
 			this.getters.workflowTagsContainer().should('not.contain', `+${tags.length}`);
diff --git a/packages/design-system/src/css/drawer.scss b/packages/design-system/src/css/drawer.scss
index 1ef1ba76f369d..cc2dbc72661de 100644
--- a/packages/design-system/src/css/drawer.scss
+++ b/packages/design-system/src/css/drawer.scss
@@ -68,7 +68,6 @@ $directions: rtl, ltr, ttb, btt;
   &__body {
     flex: 1;
 		padding: 0;
-		
     overflow: auto;
     & > * {
       box-sizing: border-box;
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 298cbf5c77537..70002cd55ba02 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -209,6 +209,7 @@ export default defineComponent({
 			if (manage) {
 				filter.value = '';
 				uiStore.openModal(TAGS_MANAGER_MODAL_KEY);
+				emit('blur');
 			} else if (create) {
 				void onCreate();
 			} else {

From 8d88810fea25263337577ab04c16af89e6d7e53d Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 28 Jul 2023 12:48:26 +0300
Subject: [PATCH 075/116] fix: Show NodeIcon tooltips by removing
 pointer-events: none (#6777)

fix: show NodeIcon tooltips by removing pointer-events: none
---
 .../design-system/src/components/N8nNodeIcon/NodeIcon.vue   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
index 7f71177992437..91863a27a2945 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
@@ -126,12 +126,16 @@ export default defineComponent({
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	pointer-events: none;
 
 	svg {
 		max-width: 100%;
 		max-height: 100%;
 	}
+
+	img,
+	svg {
+		pointer-events: none;
+	}
 }
 .nodeIconPlaceholder {
 	text-align: center;

From bbaa3fb449e6abbd0b2a7c949d19f8a11c450d67 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Fri, 28 Jul 2023 12:05:10 +0200
Subject: [PATCH 076/116] fix: Respect set modal widths (#6771)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: remove vue-fragment (no-changelog)

* feat: partial design-system migration

* feat: migrate info-accordion and info-tip components

* feat: migrate several components to vue 3

* feat: migrated several components

* feat: migrate several components

* feat: migrate several components

* feat: migrate several components

* feat: re-exported all design system components

* fix: fix design for popper components

* fix: editor kind of working, lots of issues to fix

* fix: fix several vue 3 migration issues

* fix: replace @change with @update:modelValue in several places

* fix: fix translation linking

* fix: fix inline-edit input

* fix: fix ndv and dialog design

* fix: update parameter input event bindings

* fix: rename deprecated lifecycle methods

* fix: fix json view mapping

* build: update lock file

* fix(editor): revisit last conflict with master and fix issues

* fix(editor): revisit last conflict with master and fix issues

* fix: fix expression editor bug causing code mirror to no longer be reactive

* fix: fix resource locator bug

* fix: fix vue-agile integration

* fix: remove global import for vue-agile

* fix: replace element-plus buttons with n8n-buttons everywhere

* fix(editor): Fix various element-plus styles (#6571)

* fix(editor): Fix various element-plus styles

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Remove debugging code

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Address PR comments

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix(editor): Fix loading in production mode [Vue 3] (#6578)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix(editor): First round of e2e tests fixes with Vue 3 (#6579)

* fix(editor): Fix broken smoke and workflow list e2e tests
* ✔️ Fix failing canvas action tests. Updating some selectors used in credentials and workflow tests

* feat: add vue 3 eslint rules and fix issues

* fix: fix tags-dropdown

* fix: fix white-space issues caused by i18n-t

* fix: rename non-generic click events

* fix: fix search in resources list layout

* fix: fix datatable paginator

* fix: fix popper select caret and dropdown size

* fix: add width to action-dropdown

* fix: fix workflow settings icon not being hidden

* fix: refactor newly added code

* fix: fix merge issue

* fix: fix ndv credentials watcher

* fix: fix workflow saving and grabber notch

* fix: fix nodes list panel transition

* fix: fix node title visibility

* fix: fix data unpinning

* fix: fix value access

* fix: show  input panel only if trigger panel enabled or not trigger node

* fix: fix tags dropdown and executions status spcing

* fix(editor): Prevent execution list to load back when leaving the route (#6697)

fix(editor): prevent execution list to load back when leaving the route

* fix: fix drawer visibility

* fix: fix expression toggle padding

* fix: fix expressions editor styling

* chore: prepare for testing

* fix: fix styling for el-button without patching

* test: fix unit tests in design-system

* test: fix most unit tests

* fix: remove import cycle.

* fix: fix personalization modal tests

* fix further resource mapper test adjustments

* fix: fix multiple tests and n8n-route attr duplication

* fix: fix source control tets

* fix: fixed remaining unit tests

* fix: fix workflows and credentials e2e tests

* fix: fix localizeNodeNames

* fix: update ndv e2e tests

* fix: fix popper left placement arrow

* fix: fix 5-ndv e2e tests

* fix: fix 6-code-node e2e tests

* fix(editor): Drop click outside directive from NodeCreator (#6716)

* fix(editor): Drop click outside directive from NodeCreator

* fix(editor): make sure mouseup outside is unbound at least before the component is unmounted

* fix: fix 10-settings-log-streaming e2e tests

* fix: fix node redrawing

* fix: fix tooltip buttons styling

* fix: fix varous e2e suites

* fix: fix 15-scheduler-node e2e suite

* fix: fix route watcher

* fix: fixed param name update and credential edit

* feat: update event names

* refactor: Remove deprecated `$data` (#6576)

Co-authored-by: Alex Grozav <alex@grozav.com>

* fix: fix 17-sharing e2e suite

* fix: fix tags dropdown

* fix: fix tags manager

* fix(editor): move :deep selectors to a separate scoped style block

* fix: fix sticky component and inline text edit

* fix: update e2e tests

* fix: remove button override references

* fix(editor): Adjust spacing in templates for Vue 3 (#6744)

* fix(editor): Adjust spacing in templates

* fix: Undo unneeded change

* fix: Undo unneeded change

* fix(editor): Adjust NDV height for Vue 3 (#6742)

fix(editor): Adjust NDV height

* fix(editor): Restore collapsed sidebar items for Vue 3 (#6743)

fix(editor): Restore collapsed sidebar items

* fix: fix linting issues

* fix: fix design-system deps

* fix: post-merge fixes

* fix: update tests

* fix: increase timeout for executionslist tets

* chore: fix linting issue

* fix: fix 14-mapping e2e tests in ci

* fix: re-enable tests

* fix: fix workflow duplication e2e tests after tags update

* fix(editor): Change component prop to be typed

* fix: fix tags dropdown in duplicate wf modal

* fix: fix focus behaviour in tags selector

* fix: fix tag creation

* fix: fix log streaming e2e race condition

* fix(editor): Fix Vue 3 linting issues (#6748)

* fix(editor): Fix Vue 3 linting issues

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix MainSidebar linter issues

* revert pnpm lock

* update pnpm lock file

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* fix(editor): Some css fixes for vue3 branch (#6749)

* ✨ Fixing filter button height

* ✨ Update input modal button position

* ✨ Updating tags styling

* ✨ Fix event logging settings spacing

* 👕 Fixing lint errors

* fix: fix linting issues

* Revert to `// eslint-disable-next-line @typescript-eslint/no-misused-promises` disabling of mixins init

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix: fix css issue

* fix(editor): Lint fix

* fix(editor): Fix settings initialisation (#6750)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* fix: fix initial settings loading

* fix: replace realClick with click force

* fix: fix randomly failing mapping e2e tests

* fix(editor): Fix menu item event handling

* fix: fix resource filters dropdown events (#6752)

* fix: fix resource filters dropdown events

* fix: remove teleported:false

* fix: fix event selection event naming (#6753)

* fix: removed console.log (#6754)

* fix: rever await nextTick changes

* fix: redo linting changes

* fix(editor): Redraw node connections if adding more than one node to canvas (#6755)

* fix(editor): Redraw node connections if adding more than one node to canvas

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Update position before connection two nodes

* Lint fix

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* fix(editor): Fix `ResourceMapper` unit tests (#6758)

* ✔️ Fix matching columns test

* ✔️ Fix multiple matching columns test

* ✔️ Removing `skip` from the last test

* fix: Allow pasting a big workflow (#6760)

* fix: pasting a big workflow

* chore: update comment

* refactor: move try/catch to function

* refactor: move try/catch to function

* fix(editor): Fix modal layer width

* fix: fix position changes

* fix: undo it.only

* fix: make undo/redo multiple steps more verbose

* fix: Fix value survey styles (#6764)

* fix: fix value survey styles

* fix: lint

* Revert "fix: lint"

72869c431f1448861df021be041b61c62f1e3118

* fix: lint

* fix(editor): Fix collapsed sub menu

* fix: Fix drawer animation (#6767)

fix: drawer animation

* fix(editor): Fix source control buttons (#6769)

* fix: Respect modal width

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Alex Grozav <alex@grozav.com>
Co-authored-by: Csaba Tuncsik <csaba@n8n.io>
Co-authored-by: OlegIvaniv <me@olegivaniv.com>
Co-authored-by: Milorad FIlipović <milorad@n8n.io>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
---
 packages/design-system/src/css/dialog.scss |  2 +-
 packages/design-system/src/utils.scss      | 15 +++++++++++++++
 packages/editor-ui/src/App.vue             |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/design-system/src/css/dialog.scss b/packages/design-system/src/css/dialog.scss
index 7abf11c46e3bb..69f99fa80ee57 100644
--- a/packages/design-system/src/css/dialog.scss
+++ b/packages/design-system/src/css/dialog.scss
@@ -38,7 +38,7 @@
 	border-radius: var(--border-radius-small);
 	box-shadow: var.$dialog-box-shadow;
 	box-sizing: border-box;
-	width: 50%;
+	width: var(#{getCssVarName('dialog-width')}, 50%);
 
 	@include mixins.when(fullscreen) {
 		width: 100%;
diff --git a/packages/design-system/src/utils.scss b/packages/design-system/src/utils.scss
index f81567d968656..7a951fe126cac 100644
--- a/packages/design-system/src/utils.scss
+++ b/packages/design-system/src/utils.scss
@@ -5,3 +5,18 @@
 @function saturation($h, $s, $l, $saturation) {
 	@return hsl(var(#{$h}), calc(var(#{$s}) + #{$saturation}), var(#{$l}));
 }
+
+@function joinVarName($list) {
+  $name: '--' + 'el';
+  @each $item in $list {
+    @if $item != '' {
+      $name: $name + '-' + $item;
+    }
+  }
+  @return $name;
+}
+
+// getCssVarName('button', 'text-color') => '--el-button-text-color'
+@function getCssVarName($args...) {
+  @return joinVarName($args);
+}
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index c185ca03ba3a5..01760505b0d7f 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -254,7 +254,7 @@ export default defineComponent({
 			this.postAuthenticateDone = true;
 		},
 	},
-	async mounted() {
+	async created() {
 		this.setTheme();
 		await this.initialize();
 		this.logHiringBanner();

From c3f65d5d7ffa3d5b020841ae07b9caaf0b7af506 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 28 Jul 2023 13:57:33 +0300
Subject: [PATCH 077/116] fix(editor): Fix tooltip opening delay prop name
 (#6776)

fix(editor): fix tooltip opening delay prop name
---
 .../design-system/src/components/N8nMenuItem/MenuItem.vue     | 4 ++--
 .../editor-ui/src/components/MainSidebarSourceControl.vue     | 4 ++--
 packages/editor-ui/src/components/RunDataTable.vue            | 2 +-
 packages/editor-ui/src/views/CanvasAddButton.vue              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index e532b9b4f73ae..fe2be58207110 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -38,7 +38,7 @@
 			placement="right"
 			:content="item.label"
 			:disabled="!compact"
-			:open-delay="tooltipDelay"
+			:show-after="tooltipDelay"
 		>
 			<el-menu-item
 				:id="item.id"
@@ -66,7 +66,7 @@
 					:placement="item.secondaryIcon?.tooltip?.placement || 'right'"
 					:content="item.secondaryIcon?.tooltip?.content"
 					:disabled="compact || !item.secondaryIcon?.tooltip?.content"
-					:open-delay="tooltipDelay"
+					:show-after="tooltipDelay"
 				>
 					<n8n-icon :icon="item.secondaryIcon.name" :size="item.secondaryIcon.size || 'small'" />
 				</n8n-tooltip>
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 20712ff8eb2ee..332dce0827539 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -141,7 +141,7 @@ const goToSourceControlSetup = async () => {
 				{{ currentBranch }}
 			</span>
 			<div :class="{ 'pt-xs': !isCollapsed }">
-				<n8n-tooltip :disabled="!isCollapsed" :open-delay="tooltipOpenDelay" placement="right">
+				<n8n-tooltip :disabled="!isCollapsed" :show-after="tooltipOpenDelay" placement="right">
 					<template #content>
 						<div>
 							{{ i18n.baseText('settings.sourceControl.button.pull') }}
@@ -163,7 +163,7 @@ const goToSourceControlSetup = async () => {
 				<n8n-tooltip
 					v-if="!sourceControlStore.preferences.branchReadOnly"
 					:disabled="!isCollapsed"
-					:open-delay="tooltipOpenDelay"
+					:show-after="tooltipOpenDelay"
 					placement="right"
 				>
 					<template #content>
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 6e67221947a5f..f953a0b09d75a 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -25,7 +25,7 @@
 			<thead>
 				<tr>
 					<th v-for="(column, i) in tableData.columns || []" :key="column">
-						<n8n-tooltip placement="bottom-start" :disabled="!mappingEnabled" :open-delay="1000">
+						<n8n-tooltip placement="bottom-start" :disabled="!mappingEnabled" :show-after="1000">
 							<template #content>
 								<div>
 									<img src="/static/data-mapping-gif.gif" />
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index bf5c391473e33..a05ff89d82185 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -10,7 +10,7 @@
 			:visible="showTooltip"
 			:disabled="nodeCreatorStore.showScrim"
 			:popper-class="$style.tooltip"
-			:open-delay="700"
+			:show-after="700"
 		>
 			<button :class="$style.button" @click="$emit('click')" data-test-id="canvas-plus-button">
 				<font-awesome-icon icon="plus" size="lg" />

From 2e2b8c8f2753dcf28d7af4c32f42d5f2e1bc2aaa Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 28 Jul 2023 13:09:44 +0200
Subject: [PATCH 078/116] fix(editor): Fix collapsed sub menu elements (#6778)

---
 .../src/components/N8nMenuItem/MenuItem.vue   | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index fe2be58207110..2e9cfe8581c0d 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -25,7 +25,7 @@
 				v-for="child in availableChildren"
 				:key="child.id"
 				:item="child"
-				:compact="compact"
+				:compact="false"
 				:tooltipDelay="tooltipDelay"
 				:popperClass="popperClass"
 				:mode="mode"
@@ -184,22 +184,6 @@ export default defineComponent({
 	--sub-menu-item-height: 27px;
 }
 
-@mixin compact() {
-	.icon {
-		margin: 0;
-		overflow: visible !important;
-		visibility: visible !important;
-		width: initial !important;
-		height: initial !important;
-	}
-	.label {
-		display: none;
-	}
-	.secondaryIcon {
-		display: none;
-	}
-}
-
 .submenu {
 	background: none !important;
 
@@ -307,7 +291,19 @@ export default defineComponent({
 }
 
 .compact {
-	@include compact();
+	.icon {
+		margin: 0;
+		overflow: visible !important;
+		visibility: visible !important;
+		width: initial !important;
+		height: initial !important;
+	}
+	.label {
+		display: none;
+	}
+	.secondaryIcon {
+		display: none;
+	}
 }
 
 .submenuPopper {
@@ -327,9 +323,8 @@ export default defineComponent({
 	}
 
 	&.compact {
-		:global(.el-menu--popup) {
-			min-width: auto;
-			@include compact();
+		.label {
+			display: inline-block;
 		}
 	}
 }

From 1bb7616031950f920b26f465a256a547dc74406d Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 28 Jul 2023 14:33:43 +0300
Subject: [PATCH 079/116] fix: Remove number input arrows (no-changelog)
 (#6782)

fix: remove number input arrows
---
 packages/design-system/src/css/input-number.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/design-system/src/css/input-number.scss b/packages/design-system/src/css/input-number.scss
index 5ffc77acffda5..0fef6a703ff94 100644
--- a/packages/design-system/src/css/input-number.scss
+++ b/packages/design-system/src/css/input-number.scss
@@ -8,6 +8,18 @@
 	line-height: #{var.$input-height - 2};
 	width: 100%;
 
+	/* Chrome, Safari, Edge, Opera */
+	input::-webkit-outer-spin-button,
+	input::-webkit-inner-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
+	}
+
+	/* Firefox */
+	input[type='number'] {
+		-moz-appearance: textfield !important;
+	}
+
 	.el-input {
 		display: block;
 

From 2b010391782ca8c3c13f42d5992e8d89fbb428eb 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, 28 Jul 2023 13:55:16 +0200
Subject: [PATCH 080/116] ci: Update most of the dev tooling (no-changelog)
 (#6780)

---
 package.json                                  |   52 +-
 .../@n8n/client-oauth2/src/ClientOAuth2.ts    |    6 +-
 .../client-oauth2/src/ClientOAuth2Token.ts    |    5 +-
 packages/@n8n/client-oauth2/src/utils.ts      |    6 +-
 packages/@n8n_io/eslint-config/base.js        |    8 +-
 packages/@n8n_io/eslint-config/package.json   |   30 +-
 packages/cli/package.json                     |    9 +-
 packages/design-system/.storybook/main.js     |   42 -
 packages/design-system/.storybook/main.ts     |   25 +
 packages/design-system/package.json           |   26 +-
 .../__snapshots__/ActionBox.spec.ts.snap      |    2 +-
 .../__snapshots__/ActionDropdown.spec.ts.snap |    2 +-
 .../__snapshots__/Badge.spec.ts.snap          |    2 +-
 .../__snapshots__/Button.spec.ts.snap         |    2 +-
 .../__snapshots__/Callout.spec.ts.snap        |    2 +-
 .../__tests__/__snapshots__/Card.spec.ts.snap |    2 +-
 .../__snapshots__/Checkbox.spec.ts.snap       |    2 +-
 .../__snapshots__/ColorPicker.spec.ts.snap    |    2 +-
 .../__snapshots__/Datatable.spec.ts.snap      |    2 +-
 .../__snapshots__/InfoTip.spec.ts.snap        |    2 +-
 .../__snapshots__/Input.spec.ts.snap          |    2 +-
 .../__snapshots__/Notice.spec.ts.snap         |    2 +-
 .../RecycleScroller.spec.ts.snap              |    2 +-
 .../__snapshots__/Select.spec.ts.snap         |    2 +-
 .../__tests__/__snapshots__/Tree.spec.ts.snap |    2 +-
 packages/design-system/vite.config.ts         |    2 +-
 packages/editor-ui/.eslintrc.js               |    6 +-
 packages/editor-ui/package.json               |   14 +-
 packages/editor-ui/src/Interface.ts           |    2 -
 .../src/components/ExecutionFilter.vue        |   33 +-
 .../ResourceLocator/ResourceLocator.vue       |    4 +-
 .../src/components/VariableSelector.vue       |    2 +-
 .../__tests__/ExecutionFilter.test.ts         |    8 +-
 .../__tests__/ExecutionsList.test.ts          |   14 +-
 .../__snapshots__/RunDataJson.test.ts.snap    |    2 +-
 .../__snapshots__/RunDataSchema.test.ts.snap  |    2 +-
 .../codemirror/resolvableHighlighter.ts       |    4 +-
 .../plugins/connectors/N8nCustomConnector.ts  |    5 +-
 .../src/stores/sourceControl.store.ts         |    2 +-
 .../editor-ui/src/views/WorkflowsView.vue     |   13 +-
 packages/editor-ui/vite.config.ts             |    2 +-
 packages/node-dev/package.json                |    9 +-
 pnpm-lock.yaml                                | 6042 +++++++++--------
 43 files changed, 3200 insertions(+), 3205 deletions(-)
 delete mode 100644 packages/design-system/.storybook/main.js
 create mode 100644 packages/design-system/.storybook/main.ts

diff --git a/package.json b/package.json
index 015172f52aedd..97ee59687d284 100644
--- a/package.json
+++ b/package.json
@@ -37,54 +37,48 @@
   },
   "devDependencies": {
     "@n8n_io/eslint-config": "workspace:*",
-    "@ngneat/falso": "^6.1.0",
-    "@types/jest": "^29.5.0",
+    "@ngneat/falso": "^6.4.0",
+    "@types/jest": "^29.5.3",
     "@types/supertest": "^2.0.12",
-    "@vitest/coverage-c8": "^0.28.5",
-    "c8": "^7.12.0",
+    "@vitest/coverage-v8": "^0.33.0",
     "cross-env": "^7.0.3",
-    "cypress": "^12.8.1",
-    "cypress-real-events": "^1.7.6",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "cypress": "^12.17.2",
+    "cypress-real-events": "^1.9.1",
+    "jest": "^29.6.2",
+    "jest-environment-jsdom": "^29.6.2",
     "jest-expect-message": "^1.1.3",
-    "jest-mock": "^29.5.0",
+    "jest-mock": "^29.6.2",
     "jest-mock-extended": "^3.0.4",
-    "nock": "^13.2.9",
+    "nock": "^13.3.2",
+    "nodemon": "^3.0.1",
     "p-limit": "^3.1.0",
-    "prettier": "^2.8.3",
-    "rimraf": "^3.0.2",
+    "prettier": "*",
+    "rimraf": "^5.0.1",
     "run-script-os": "^1.0.7",
-    "start-server-and-test": "^1.14.0",
+    "start-server-and-test": "^2.0.0",
     "supertest": "^6.3.3",
-    "ts-jest": "^29.1.0",
-    "tsc-watch": "^6.0.0",
-    "turbo": "1.8.8",
+    "ts-jest": "^29.1.1",
+    "tsc-watch": "^6.0.4",
+    "turbo": "1.10.12",
     "typescript": "*",
-    "vite": "^4.0.4",
-    "vitest": "^0.28.5",
-    "vue-tsc": "^1.0.24"
+    "vite": "^4.4.7",
+    "vitest": "^0.33.0",
+    "vue-tsc": "^1.8.8"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
-      "sqlite3",
-      "vue-demi"
+      "sqlite3"
     ],
     "overrides": {
       "@types/node": "^18.16.16",
-      "browserslist": "^4.21.4",
       "chokidar": "3.5.2",
-      "decode-uri-component": "0.2.2",
-      "ejs": "^3.1.8",
-      "fork-ts-checker-webpack-plugin": "^6.0.4",
-      "http-cache-semantics": "4.1.1",
       "jsonwebtoken": "9.0.0",
-      "prettier": "^2.8.3",
+      "prettier": "^3.0.0",
       "semver": "^7.5.4",
       "tough-cookie": "^4.1.3",
-      "tslib": "^2.5.0",
+      "tslib": "^2.6.1",
       "ts-node": "^10.9.1",
-      "typescript": "^5.1.3",
+      "typescript": "^5.1.6",
       "xml2js": "^0.5.0",
       "cpy@8>globby": "^11.1.0",
       "qqjs>globby": "^11.1.0"
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
index c9e21a6a42a63..1fb6304e36765 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -39,7 +39,11 @@ export interface ClientOAuth2Options {
 }
 
 class ResponseError extends Error {
-	constructor(readonly status: number, readonly body: object, readonly code = 'ESTATUS') {
+	constructor(
+		readonly status: number,
+		readonly body: object,
+		readonly code = 'ESTATUS',
+	) {
 		super(`HTTP status ${status}`);
 	}
 }
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
index a532ccd86d472..fe2e71deaecc3 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
@@ -24,7 +24,10 @@ export class ClientOAuth2Token {
 
 	private expires: Date;
 
-	constructor(readonly client: ClientOAuth2, readonly data: ClientOAuth2TokenData) {
+	constructor(
+		readonly client: ClientOAuth2,
+		readonly data: ClientOAuth2TokenData,
+	) {
 		this.tokenType = data.token_type?.toLowerCase() ?? 'bearer';
 		this.accessToken = data.access_token;
 		this.refreshToken = data.refresh_token;
diff --git a/packages/@n8n/client-oauth2/src/utils.ts b/packages/@n8n/client-oauth2/src/utils.ts
index 9d57c78b224bf..3b3bd88d975bf 100644
--- a/packages/@n8n/client-oauth2/src/utils.ts
+++ b/packages/@n8n/client-oauth2/src/utils.ts
@@ -22,7 +22,11 @@ export function expects<Keys extends keyof ClientOAuth2Options>(
 }
 
 export class AuthError extends Error {
-	constructor(message: string, readonly body: any, readonly code = 'EAUTH') {
+	constructor(
+		message: string,
+		readonly body: any,
+		readonly code = 'EAUTH',
+	) {
 		super(message);
 	}
 }
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index 20bc0ec1aca73..bef8d2c9f880f 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -253,9 +253,9 @@ const config = (module.exports = {
 		],
 
 		/**
-		 * https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-duplicate-imports.md
+		 * https://github.com/import-js/eslint-plugin-import/blob/HEAD/docs/rules/no-duplicates.md
 		 */
-		'@typescript-eslint/no-duplicate-imports': 'error',
+		'import/no-duplicates': 'error',
 
 		/**
 		 * https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-invalid-void-type.md
@@ -451,7 +451,7 @@ const config = (module.exports = {
 			},
 		},
 		{
-			files: ['test/**/*.ts'],
+			files: ['test/**/*.ts', 'src/__tests__/*.ts'],
 			rules: {
 				'n8n-local-rules/no-skipped-tests':
 					process.env.NODE_ENV === 'development' ? 'warn' : 'error',
@@ -460,7 +460,7 @@ const config = (module.exports = {
 				'@typescript-eslint/await-thenable': 'off',
 				'@typescript-eslint/ban-ts-comment': 'off',
 				'@typescript-eslint/naming-convention': 'off',
-				'@typescript-eslint/no-duplicate-imports': 'off',
+				'import/no-duplicates': 'off',
 				'@typescript-eslint/no-empty-function': 'off',
 				'@typescript-eslint/no-loop-func': 'off',
 				'@typescript-eslint/no-non-null-assertion': 'off',
diff --git a/packages/@n8n_io/eslint-config/package.json b/packages/@n8n_io/eslint-config/package.json
index dfc131cd35cb1..9502402f6ccfd 100644
--- a/packages/@n8n_io/eslint-config/package.json
+++ b/packages/@n8n_io/eslint-config/package.json
@@ -3,22 +3,22 @@
   "private": true,
   "version": "0.0.1",
   "devDependencies": {
-    "@types/eslint": "~8.37",
-    "@typescript-eslint/eslint-plugin": "~5.59",
-    "@typescript-eslint/parser": "~5.59",
+    "@types/eslint": "^8.44.1",
+    "@typescript-eslint/eslint-plugin": "^6.2.0",
+    "@typescript-eslint/parser": "^6.2.0",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "eslint": "~8.39",
-    "eslint-config-airbnb-typescript": "~17.0",
-    "eslint-config-prettier": "~8.8",
-    "eslint-import-resolver-typescript": "~3.5",
-    "eslint-plugin-diff": "~2.0",
-    "eslint-plugin-import": "~2.27",
-    "eslint-plugin-n8n-local-rules": "~1.0",
-    "eslint-plugin-prettier": "~4.2",
-    "eslint-plugin-unicorn": "~46.0",
-    "eslint-plugin-unused-imports": "~2.0",
-    "eslint-plugin-vue": "^9.12.0",
-    "vue-eslint-parser": "^9.3.0"
+    "eslint": "^8.45.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-import-resolver-typescript": "^3.5.5",
+    "eslint-plugin-diff": "^2.0.1",
+    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-n8n-local-rules": "^1.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-unicorn": "^48.0.1",
+    "eslint-plugin-unused-imports": "^3.0.0",
+    "eslint-plugin-vue": "^9.15.1",
+    "vue-eslint-parser": "^9.3.1"
   },
   "scripts": {
     "clean": "rimraf .turbo",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 419aedd46bbde..93192fe7d4eeb 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -93,13 +93,10 @@
     "@types/ws": "^8.5.4",
     "@types/yamljs": "^0.2.31",
     "chokidar": "^3.5.2",
-    "concurrently": "^5.1.0",
-    "mock-jwks": "^1.0.9",
-    "nodemon": "^2.0.2",
-    "run-script-os": "^1.0.7",
+    "concurrently": "^8.2.0",
     "ts-essentials": "^7.0.3",
-    "tsc-alias": "^1.8.2",
-    "tsconfig-paths": "^4.1.2"
+    "tsc-alias": "^1.8.7",
+    "tsconfig-paths": "^4.2.0"
   },
   "dependencies": {
     "@n8n/client-oauth2": "workspace:*",
diff --git a/packages/design-system/.storybook/main.js b/packages/design-system/.storybook/main.js
deleted file mode 100644
index 8db209694203f..0000000000000
--- a/packages/design-system/.storybook/main.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const { mergeConfig } = require('vite');
-const { resolve } = require('path');
-
-module.exports = {
-	stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
-	addons: [
-		'@storybook/addon-styling',
-		'@storybook/addon-links',
-		'@storybook/addon-essentials',
-		// Disabled until this is actually used rather otherwise its a blank tab
-		// '@storybook/addon-interactions',
-		'@storybook/addon-a11y',
-		'storybook-dark-mode',
-	],
-	staticDirs: ['../public'],
-	framework: {
-		name: '@storybook/vue3-vite',
-		options: {},
-	},
-	disableTelemetry: true,
-	async viteFinal(config, { configType }) {
-		// return the customized config
-		return mergeConfig(config, {
-			// customize the Vite config here
-			resolve: {
-				alias: [
-					{
-						find: /^@n8n-design-system\//,
-						replacement: `${resolve(__dirname, '..')}/src/`,
-					},
-					{
-						find: /^n8n-design-system$/,
-						replacement: `${resolve(__dirname, '..')}/src/main.ts`,
-					},
-				],
-			},
-		});
-	},
-	docs: {
-		autodocs: true,
-	},
-};
diff --git a/packages/design-system/.storybook/main.ts b/packages/design-system/.storybook/main.ts
new file mode 100644
index 0000000000000..4c10fc9207cec
--- /dev/null
+++ b/packages/design-system/.storybook/main.ts
@@ -0,0 +1,25 @@
+import type { StorybookConfig } from '@storybook/vue3-vite';
+
+const config: StorybookConfig = {
+	stories: ['../src/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
+	addons: [
+		'@storybook/addon-styling',
+		'@storybook/addon-links',
+		'@storybook/addon-essentials',
+		'@storybook/addon-a11y',
+		'storybook-dark-mode',
+	],
+	staticDirs: ['../public'],
+	framework: {
+		name: '@storybook/vue3-vite',
+		options: {},
+	},
+	core: {
+		disableTelemetry: true,
+	},
+	docs: {
+		autodocs: true,
+	},
+};
+
+export default config;
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 0e7b3b07a8a47..44d0c8908fc0a 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -41,18 +41,18 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^3.0.3",
-    "@storybook/addon-a11y": "^7.0.21",
-    "@storybook/addon-actions": "^7.0.21",
-    "@storybook/addon-docs": "^7.0.21",
-    "@storybook/addon-essentials": "^7.0.21",
-    "@storybook/addon-links": "^7.0.21",
+    "@storybook/addon-a11y": "^7.1.1",
+    "@storybook/addon-actions": "^7.1.1",
+    "@storybook/addon-docs": "^7.1.1",
+    "@storybook/addon-essentials": "^7.1.1",
+    "@storybook/addon-links": "^7.1.1",
     "@storybook/addon-postcss": "3.0.0-alpha.1",
-    "@storybook/addon-styling": "^1.3.0",
-    "@storybook/vue3": "^7.0.21",
-    "@storybook/vue3-vite": "^7.0.21",
-    "@testing-library/jest-dom": "^5.16.5",
+    "@storybook/addon-styling": "^1.3.4",
+    "@storybook/vue3": "^7.1.1",
+    "@storybook/vue3-vite": "^7.1.1",
+    "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/user-event": "^14.4.3",
-    "@testing-library/vue": "^6.6.1",
+    "@testing-library/vue": "^7.0.0",
     "@types/markdown-it": "^12.2.3",
     "@types/markdown-it-emoji": "^2.0.2",
     "@types/markdown-it-link-attributes": "^3.0.1",
@@ -62,11 +62,11 @@
     "autoprefixer": "^10.4.14",
     "core-js": "^3.31.0",
     "jsdom": "21.1.0",
-    "sass": "^1.63.4",
+    "sass": "^1.64.1",
     "sass-loader": "^13.3.2",
-    "storybook": "^7.0.21",
+    "storybook": "^7.1.1",
     "storybook-addon-themes": "^6.1.0",
-    "storybook-dark-mode": "^3.0.0"
+    "storybook-dark-mode": "^3.0.1"
   },
   "dependencies": {
     "element-plus": "^2.3.6",
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
index 491d107483b22..6679585f190bd 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`N8NActionBox > should render correctly 1`] = `
 "<div class=\\"n8n-action-box container\\" data-test-id=\\"action-box\\">
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
index 56a9fe695dced..869a4ed160c31 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nActionDropdown > should render custom styling correctly 1`] = `
 "<div class=\\"action-dropdown-container actionDropdownContainer\\">
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap b/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
index 5749263b7bbae..985e4019b90ba 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
+++ b/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nBadge > props > should render default theme correctly 1`] = `"<span class=\\"n8n-badge default\\"><n8n-text-stub bold=\\"true\\" size=\\"large\\" compact=\\"true\\" tag=\\"span\\"></n8n-text-stub></span>"`;
 
diff --git a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
index 97079c01efd78..162da77b5d108 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
+++ b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button class=\\"button button primary medium withIcon\\" aria-live=\\"polite\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\" spin=\\"false\\"></n8n-icon-stub></span><span>Button</span></button>"`;
 
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
index 74ef4858f1372..3e04a43141d65 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCallout > should render additional slots correctly 1`] = `
 "<div class=\\"n8n-callout callout custom round\\" role=\\"alert\\">
diff --git a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap b/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
index 96751ee3e9305..05cb131a7924a 100644
--- a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCard > should render correctly 1`] = `
 "<div class=\\"card\\">
diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
index e9a85b0eeb61a..9008ca6000680 100644
--- a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nCheckbox > should render with both child and label 1`] = `
 <div>
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
index 0480e052b40cb..0e235831c7aa0 100644
--- a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
+++ b/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nColorPicker > should render with input 1`] = `
 <div>
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
index 9f29f40805581..6d712ddeec9e4 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
+++ b/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nDatatable > should render correctly 1`] = `
 "<div class=\\"datatable datatableWrapper\\">
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
index e43f3a560b55b..b4d194cdabb3f 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
+++ b/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`N8nInfoTip > should render correctly as note 1`] = `"<div class=\\"n8n-info-tip info note bold\\"><span class=\\"iconText\\"><span class=\\"n8n-text compact size-medium regular n8n-icon n8n-icon\\"><!----></span><span>Need help doing something?<a href=\\"/docs\\" target=\\"_blank\\">Open docs</a></span></span></div>"`;
 
diff --git a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap b/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
index dbd6077335cf6..d0ad14e3fb206 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
+++ b/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`N8nInput > should render correctly 1`] = `
 "<div class=\\"el-input el-input--large n8n-input\\">
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
index 8b156ee73bbc2..461fcac742718 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
+++ b/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nNotice > props > content > should render HTML 1`] = `
 "<div id=\\"notice\\" class=\\"notice notice warning\\" role=\\"alert\\">
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap b/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
index 1b40af1f1d222..09da3dec0cb28 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
+++ b/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nRecycleScroller > should render correctly 1`] = `
 "<div class=\\"recycle-scroller-wrapper\\">
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
index 629386ebc8603..3e6ae5470fc6b 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
+++ b/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nSelect > should render correctly 1`] = `
 "<div class=\\"n8n-select container\\">
diff --git a/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap b/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
index e74a67282d28c..d0c0ef1346bdb 100644
--- a/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
+++ b/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nTree > should render each tree with node class 1`] = `
 "<div class=\\"n8n-tree\\">
diff --git a/packages/design-system/vite.config.ts b/packages/design-system/vite.config.ts
index b37ff74b3fef5..0f62568a148a6 100644
--- a/packages/design-system/vite.config.ts
+++ b/packages/design-system/vite.config.ts
@@ -41,7 +41,7 @@ export default mergeConfig(
 			environment: 'jsdom',
 			setupFiles: ['./src/__tests__/setup.ts'],
 			coverage: {
-				provider: 'c8',
+				provider: 'v8',
 				reporter: coverageReporters,
 				all: true,
 			},
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index 2961530515154..94174db5c4636 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -16,13 +16,13 @@ module.exports = {
 		'import/no-extraneous-dependencies': 'off',
 		'import/order': 'off',
 		'import/no-cycle': 'warn',
+		'import/no-duplicates': 'off',
 		indent: 'off',
 		'@typescript-eslint/ban-types': 'off',
 		'@typescript-eslint/dot-notation': 'off',
 		'@typescript-eslint/lines-between-class-members': 'off',
 		'@typescript-eslint/member-delimiter-style': 'off',
 		'@typescript-eslint/naming-convention': 'off',
-		'@typescript-eslint/no-duplicate-imports': 'off',
 		'@typescript-eslint/no-empty-interface': 'off',
 		'@typescript-eslint/no-for-in-array': 'off',
 		'@typescript-eslint/no-loop-func': 'off',
@@ -46,5 +46,9 @@ module.exports = {
 		'@typescript-eslint/restrict-template-expressions': 'off',
 		'@typescript-eslint/unbound-method': 'off',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
+		'@typescript-eslint/no-redundant-type-constituents': 'off',
+		'@typescript-eslint/no-base-to-string': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/no-unsafe-enum-comparison': 'off',
 	},
 };
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index f5b9d5722963d..cfa12225a01a5 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -64,8 +64,8 @@
     "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
     "normalize-wheel": "^1.0.1",
-    "pinia": "^2.0.22",
-    "prettier": "^2.8.3",
+    "pinia": "^2.1.6",
+    "prettier": "*",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
     "uuid": "^8.3.2",
@@ -79,12 +79,9 @@
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@faker-js/faker": "^7.6.0",
-    "@pinia/testing": "^0.0.14",
-    "@sentry/vite-plugin": "^0.4.0",
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/user-event": "^14.4.3",
-    "@testing-library/vue": "^6.6.1",
+    "@faker-js/faker": "^8.0.2",
+    "@pinia/testing": "^0.1.3",
+    "@sentry/vite-plugin": "^2.5.0",
     "@types/dateformat": "^3.0.0",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
@@ -92,7 +89,6 @@
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
     "@types/uuid": "^8.3.2",
-    "@vitejs/plugin-vue": "^4.2.3",
     "miragejs": "^0.1.47"
   }
 }
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 5e17b2d1f440e..967b9b12c3ef8 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1548,9 +1548,7 @@ export type UTMCampaign =
 	| 'upgrade-custom-data-filter'
 	| 'upgrade-canvas-nav'
 	| 'upgrade-workflow-sharing'
-	| 'upgrade-canvas-nav'
 	| 'upgrade-credentials-sharing'
-	| 'upgrade-workflow-sharing'
 	| 'upgrade-api'
 	| 'upgrade-audit-logs'
 	| 'upgrade-ldap'
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
index 874a1e1abdda2..5be71deadce85 100644
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ b/packages/editor-ui/src/components/ExecutionFilter.vue
@@ -57,21 +57,24 @@ const filter = reactive(getDefaultFilter());
 
 // Automatically set up v-models based on filter properties
 const vModel = reactive(
-	getObjectKeys(filter).reduce((acc, key) => {
-		acc[key] = computed({
-			get() {
-				return filter[key];
-			},
-			set(value) {
-				// TODO: find out what exactly is typechecker complaining about
-				// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-				// @ts-ignore
-				filter[key] = value;
-				emit('filterChanged', filter);
-			},
-		});
-		return acc;
-	}, {} as Record<keyof ExecutionFilterType, ReturnType<typeof computed>>),
+	getObjectKeys(filter).reduce(
+		(acc, key) => {
+			acc[key] = computed({
+				get() {
+					return filter[key];
+				},
+				set(value) {
+					// TODO: find out what exactly is typechecker complaining about
+					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+					// @ts-ignore
+					filter[key] = value;
+					emit('filterChanged', filter);
+				},
+			});
+			return acc;
+		},
+		{} as Record<keyof ExecutionFilterType, ReturnType<typeof computed>>,
+	),
 );
 
 const statuses = computed(() => [
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index a84cf16407556..59e199a2218ab 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -842,7 +842,9 @@ $--mode-selector-width: 92px;
 .selectIcon {
 	cursor: pointer;
 	font-size: 14px;
-	transition: transform 0.3s, -webkit-transform 0.3s;
+	transition:
+		transform 0.3s,
+		-webkit-transform 0.3s;
 	-webkit-transform: rotateZ(0);
 	transform: rotateZ(0);
 
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
index 6601bf9958772..7bee3034fd88e 100644
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ b/packages/editor-ui/src/components/VariableSelector.vue
@@ -361,7 +361,7 @@ export default defineComponent({
 			filterText: string,
 			useShort = false,
 		): IVariableSelectorOption[] | null {
-			const outputData = pinData.map((data) => ({ json: data } as INodeExecutionData))[0];
+			const outputData = pinData.map((data) => ({ json: data }) as INodeExecutionData)[0];
 
 			return this.getNodeOutput(nodeName, outputData, filterText, useShort);
 		},
diff --git a/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
index b41770a9b7109..bd86e1606ed92 100644
--- a/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ExecutionFilter.test.ts
@@ -22,8 +22,8 @@ const defaultFilterState: ExecutionFilterType = {
 const workflowDataFactory = (): IWorkflowShortResponse => ({
 	createdAt: faker.date.past().toDateString(),
 	updatedAt: faker.date.past().toDateString(),
-	id: faker.datatype.uuid(),
-	name: faker.datatype.string(),
+	id: faker.string.uuid(),
+	name: faker.string.sample(),
 	active: faker.datatype.boolean(),
 	tags: [],
 });
@@ -68,7 +68,7 @@ describe('ExecutionFilter', () => {
 			() =>
 				({
 					track,
-				} as unknown as Telemetry),
+				}) as unknown as Telemetry,
 		);
 
 		const { getByTestId } = renderComponent({
@@ -92,7 +92,7 @@ describe('ExecutionFilter', () => {
 		['production', 'default', false, undefined],
 		['production', 'default', true, workflowsData],
 	])(
-		'renders in %s environment on %s deployment with advancedExecutionFilters %s and workflows %s',
+		'renders in %s environment on %s deployment with advancedExecutionFilters %s',
 		async (environment, deployment, advancedExecutionFilters, workflows) => {
 			const { html, getByTestId, queryByTestId, queryAllByTestId } = renderComponent({
 				props: { workflows },
diff --git a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
index 7154cdcfe0c51..e9e57a2197836 100644
--- a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
+++ b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts
@@ -21,7 +21,7 @@ const generateUndefinedNullOrString = () => {
 		case 1:
 			return null;
 		case 2:
-			return faker.datatype.uuid();
+			return faker.string.uuid();
 		case 3:
 			return '';
 		default:
@@ -32,23 +32,23 @@ const generateUndefinedNullOrString = () => {
 const workflowDataFactory = (): IWorkflowDb => ({
 	createdAt: faker.date.past().toDateString(),
 	updatedAt: faker.date.past().toDateString(),
-	id: faker.datatype.uuid(),
-	name: faker.datatype.string(),
+	id: faker.string.uuid(),
+	name: faker.string.sample(),
 	active: faker.datatype.boolean(),
 	tags: [],
 	nodes: [],
 	connections: {},
-	versionId: faker.datatype.number().toString(),
+	versionId: faker.number.int().toString(),
 });
 
 const executionDataFactory = (): IExecutionsSummary => ({
-	id: faker.datatype.uuid(),
+	id: faker.string.uuid(),
 	finished: faker.datatype.boolean(),
 	mode: faker.helpers.arrayElement(['manual', 'trigger']),
 	startedAt: faker.date.past(),
 	stoppedAt: faker.date.past(),
-	workflowId: faker.datatype.number().toString(),
-	workflowName: faker.datatype.string(),
+	workflowId: faker.number.int().toString(),
+	workflowName: faker.string.sample(),
 	status: faker.helpers.arrayElement(['failed', 'success']),
 	nodeExecutionStatus: {},
 	retryOf: generateUndefinedNullOrString(),
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
index 9bb3b5737cc3b..0f8242eacead8 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`RunDataJson.vue > renders json values properly 1`] = `
 <div>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
index 88e58bc5bde53..394d4b03c1402 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
@@ -1,4 +1,4 @@
-// Vitest Snapshot v1
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
 <div>
diff --git a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
index 8b5baa51fa082..254f2fa2dea55 100644
--- a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
+++ b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
@@ -4,7 +4,7 @@ import { StateField, StateEffect } from '@codemirror/state';
 import { tags } from '@lezer/highlight';
 import { syntaxHighlighting, HighlightStyle } from '@codemirror/language';
 
-import type { ColoringStateEffect, Plaintext, Resolvable, Resolved } from '@/types/expressions';
+import type { ColoringStateEffect, Plaintext, Resolvable } from '@/types/expressions';
 
 const cssClasses = {
 	validResolvable: 'cm-valid-resolvable',
@@ -80,7 +80,7 @@ const coloringStateField = StateField.define<DecorationSet>({
 	},
 });
 
-function addColor(view: EditorView, segments: Array<Resolvable | Resolved>) {
+function addColor(view: EditorView, segments: Resolvable[]) {
 	const effects: Array<StateEffect<unknown>> = segments.map(({ from, to, kind, error }) =>
 		coloringStateEffects.addColorEffect.of({ from, to, kind, error }),
 	);
diff --git a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
index 56d7f1fdb3e6b..07f44e50bbd47 100644
--- a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
+++ b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
@@ -158,7 +158,10 @@ export class N8nConnector extends AbstractConnector {
 	getEndpointOffset: Function | null;
 	private internalSegments: FlowchartSegment[] = [];
 
-	constructor(public connection: Connection, params: N8nConnectorOptions) {
+	constructor(
+		public connection: Connection,
+		params: N8nConnectorOptions,
+	) {
 		super(connection, params);
 		params = params || {};
 		this.minorAnchor = 0; // seems to be angle at which connector leaves endpoint
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/editor-ui/src/stores/sourceControl.store.ts
index 647a7f24f7a81..aad181f1d4fa3 100644
--- a/packages/editor-ui/src/stores/sourceControl.store.ts
+++ b/packages/editor-ui/src/stores/sourceControl.store.ts
@@ -70,7 +70,7 @@ export const useSourceControlStore = defineStore('sourceControl', () => {
 	};
 
 	const makePreferencesAction =
-		(action: typeof vcApi.savePreferences | typeof vcApi.updatePreferences) =>
+		(action: typeof vcApi.savePreferences) =>
 		async (preferences: Partial<SourceControlPreferences>) => {
 			const data = await action(rootStore.getRestApiContext, preferences);
 			setPreferences(data);
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 06661b14e73eb..a88cb66ba6308 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -224,12 +224,13 @@ const WorkflowsView = defineComponent({
 			if (this.settingsStore.areTagsEnabled && filters.tags.length > 0) {
 				matches =
 					matches &&
-					filters.tags.every((tag) =>
-						(resource.tags as ITag[])?.find((resourceTag) =>
-							typeof resourceTag === 'object'
-								? `${resourceTag.id}` === `${tag}`
-								: `${resourceTag}` === `${tag}`,
-						),
+					filters.tags.every(
+						(tag) =>
+							(resource.tags as ITag[])?.find((resourceTag) =>
+								typeof resourceTag === 'object'
+									? `${resourceTag.id}` === `${tag}`
+									: `${resourceTag}` === `${tag}`,
+							),
 					);
 			}
 
diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index be4fc04c58bf8..aaf4cd92ffa49 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -122,7 +122,7 @@ export default mergeConfig(
 			environment: 'jsdom',
 			setupFiles: ['./src/__tests__/setup.ts'],
 			coverage: {
-				provider: 'c8',
+				provider: 'v8',
 				reporter: coverageReporters,
 				all: true,
 			},
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index b8c1a23834944..514ec7a02712d 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -48,10 +48,7 @@
   ],
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.2",
-    "@types/express": "^4.17.6",
-    "@types/inquirer": "^6.5.0",
-    "@types/tmp": "^0.2.0",
-    "@types/vorpal": "^1.11.0"
+    "@types/inquirer": "^6.5.0"
   },
   "dependencies": {
     "@oclif/command": "^1.5.18",
@@ -61,9 +58,7 @@
     "inquirer": "^7.0.1",
     "n8n-core": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
-    "request": "^2.88.2",
-    "tmp-promise": "^3.0.2"
+    "tmp-promise": "^3.0.3"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7b91c4c30ad2a..e06fe46bddefa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,23 +6,17 @@ settings:
 
 onlyBuiltDependencies:
   - sqlite3
-  - vue-demi
 
 overrides:
   '@types/node': ^18.16.16
-  browserslist: ^4.21.4
   chokidar: 3.5.2
-  decode-uri-component: 0.2.2
-  ejs: ^3.1.8
-  fork-ts-checker-webpack-plugin: ^6.0.4
-  http-cache-semantics: 4.1.1
   jsonwebtoken: 9.0.0
-  prettier: ^2.8.3
+  prettier: ^3.0.0
   semver: ^7.5.4
   tough-cookie: ^4.1.3
-  tslib: ^2.5.0
+  tslib: ^2.6.1
   ts-node: ^10.9.1
-  typescript: ^5.1.3
+  typescript: ^5.1.6
   xml2js: ^0.5.0
   cpy@8>globby: ^11.1.0
   qqjs>globby: ^11.1.0
@@ -53,86 +47,86 @@ importers:
         specifier: workspace:*
         version: link:packages/@n8n_io/eslint-config
       '@ngneat/falso':
-        specifier: ^6.1.0
-        version: 6.1.0
+        specifier: ^6.4.0
+        version: 6.4.0
       '@types/jest':
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.5.3
+        version: 29.5.3
       '@types/supertest':
         specifier: ^2.0.12
         version: 2.0.12
-      '@vitest/coverage-c8':
-        specifier: ^0.28.5
-        version: 0.28.5
-      c8:
-        specifier: ^7.12.0
-        version: 7.12.0
+      '@vitest/coverage-v8':
+        specifier: ^0.33.0
+        version: 0.33.0(vitest@0.33.0)
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
       cypress:
-        specifier: ^12.8.1
-        version: 12.8.1
+        specifier: ^12.17.2
+        version: 12.17.2
       cypress-real-events:
-        specifier: ^1.7.6
-        version: 1.7.6(cypress@12.8.1)
+        specifier: ^1.9.1
+        version: 1.9.1(cypress@12.17.2)
       jest:
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.6.2
+        version: 29.6.2
       jest-environment-jsdom:
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.6.2
+        version: 29.6.2
       jest-expect-message:
         specifier: ^1.1.3
         version: 1.1.3
       jest-mock:
-        specifier: ^29.5.0
-        version: 29.5.0
+        specifier: ^29.6.2
+        version: 29.6.2
       jest-mock-extended:
         specifier: ^3.0.4
-        version: 3.0.4(jest@29.5.0)(typescript@5.1.3)
+        version: 3.0.4(jest@29.6.2)(typescript@5.1.6)
       nock:
-        specifier: ^13.2.9
-        version: 13.2.9
+        specifier: ^13.3.2
+        version: 13.3.2
+      nodemon:
+        specifier: ^3.0.1
+        version: 3.0.1
       p-limit:
         specifier: ^3.1.0
         version: 3.1.0
       prettier:
-        specifier: ^2.8.3
-        version: 2.8.3
+        specifier: ^3.0.0
+        version: 3.0.0
       rimraf:
-        specifier: ^3.0.2
-        version: 3.0.2
+        specifier: ^5.0.1
+        version: 5.0.1
       run-script-os:
         specifier: ^1.0.7
         version: 1.1.6
       start-server-and-test:
-        specifier: ^1.14.0
-        version: 1.14.0
+        specifier: ^2.0.0
+        version: 2.0.0
       supertest:
         specifier: ^6.3.3
         version: 6.3.3
       ts-jest:
-        specifier: ^29.1.0
-        version: 29.1.0(@babel/core@7.21.8)(jest@29.5.0)(typescript@5.1.3)
+        specifier: ^29.1.1
+        version: 29.1.1(@babel/core@7.22.9)(jest@29.6.2)(typescript@5.1.6)
       tsc-watch:
-        specifier: ^6.0.0
-        version: 6.0.0(typescript@5.1.3)
+        specifier: ^6.0.4
+        version: 6.0.4(typescript@5.1.6)
       turbo:
-        specifier: 1.8.8
-        version: 1.8.8
+        specifier: 1.10.12
+        version: 1.10.12
       typescript:
-        specifier: ^5.1.3
-        version: 5.1.3
+        specifier: ^5.1.6
+        version: 5.1.6
       vite:
-        specifier: ^4.0.4
-        version: 4.0.4(less@4.1.3)(sass@1.63.4)
+        specifier: ^4.4.7
+        version: 4.4.7(less@4.1.3)(sass@1.64.1)
       vitest:
-        specifier: ^0.28.5
-        version: 0.28.5
+        specifier: ^0.33.0
+        version: 0.33.0
       vue-tsc:
-        specifier: ^1.0.24
-        version: 1.0.24(typescript@5.1.3)
+        specifier: ^1.8.8
+        version: 1.8.8(typescript@5.1.6)
 
   packages/@n8n/client-oauth2:
     dependencies:
@@ -143,53 +137,53 @@ importers:
   packages/@n8n_io/eslint-config:
     devDependencies:
       '@types/eslint':
-        specifier: ~8.37
-        version: 8.37.0
+        specifier: ^8.44.1
+        version: 8.44.1
       '@typescript-eslint/eslint-plugin':
-        specifier: ~5.59
-        version: 5.59.0(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.1.3)
+        specifier: ^6.2.0
+        version: 6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.1.6)
       '@typescript-eslint/parser':
-        specifier: ~5.59
-        version: 5.59.0(eslint@8.39.0)(typescript@5.1.3)
+        specifier: ^6.2.0
+        version: 6.2.0(eslint@8.45.0)(typescript@5.1.6)
       '@vue/eslint-config-typescript':
         specifier: ^11.0.3
-        version: 11.0.3(eslint-plugin-vue@9.12.0)(eslint@8.39.0)(typescript@5.1.3)
+        version: 11.0.3(eslint-plugin-vue@9.15.1)(eslint@8.45.0)(typescript@5.1.6)
       eslint:
-        specifier: ~8.39
-        version: 8.39.0
+        specifier: ^8.45.0
+        version: 8.45.0
       eslint-config-airbnb-typescript:
-        specifier: ~17.0
-        version: 17.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0)
+        specifier: ^17.1.0
+        version: 17.1.0(@typescript-eslint/eslint-plugin@6.2.0)(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
       eslint-config-prettier:
-        specifier: ~8.8
-        version: 8.8.0(eslint@8.39.0)
+        specifier: ^8.9.0
+        version: 8.9.0(eslint@8.45.0)
       eslint-import-resolver-typescript:
-        specifier: ~3.5
-        version: 3.5.5(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0)
+        specifier: ^3.5.5
+        version: 3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
       eslint-plugin-diff:
-        specifier: ~2.0
-        version: 2.0.1(eslint@8.39.0)
+        specifier: ^2.0.1
+        version: 2.0.1(eslint@8.45.0)
       eslint-plugin-import:
-        specifier: ~2.27
-        version: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
+        specifier: ^2.28.0
+        version: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
       eslint-plugin-n8n-local-rules:
-        specifier: ~1.0
+        specifier: ^1.0.0
         version: 1.0.0
       eslint-plugin-prettier:
-        specifier: ~4.2
-        version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.39.0)(prettier@2.8.3)
+        specifier: ^5.0.0
+        version: 5.0.0(@types/eslint@8.44.1)(eslint-config-prettier@8.9.0)(eslint@8.45.0)(prettier@3.0.0)
       eslint-plugin-unicorn:
-        specifier: ~46.0
-        version: 46.0.0(eslint@8.39.0)
+        specifier: ^48.0.1
+        version: 48.0.1(eslint@8.45.0)
       eslint-plugin-unused-imports:
-        specifier: ~2.0
-        version: 2.0.0(@typescript-eslint/eslint-plugin@5.59.0)(eslint@8.39.0)
+        specifier: ^3.0.0
+        version: 3.0.0(@typescript-eslint/eslint-plugin@6.2.0)(eslint@8.45.0)
       eslint-plugin-vue:
-        specifier: ^9.12.0
-        version: 9.12.0(eslint@8.39.0)
+        specifier: ^9.15.1
+        version: 9.15.1(eslint@8.45.0)
       vue-eslint-parser:
-        specifier: ^9.3.0
-        version: 9.3.0(eslint@8.39.0)
+        specifier: ^9.3.1
+        version: 9.3.1(eslint@8.45.0)
 
   packages/cli:
     dependencies:
@@ -546,26 +540,17 @@ importers:
         specifier: 3.5.2
         version: 3.5.2
       concurrently:
-        specifier: ^5.1.0
-        version: 5.3.0
-      mock-jwks:
-        specifier: ^1.0.9
-        version: 1.0.9(nock@13.2.9)
-      nodemon:
-        specifier: ^2.0.2
-        version: 2.0.20
-      run-script-os:
-        specifier: ^1.0.7
-        version: 1.1.6
+        specifier: ^8.2.0
+        version: 8.2.0
       ts-essentials:
         specifier: ^7.0.3
-        version: 7.0.3(typescript@5.1.3)
+        version: 7.0.3(typescript@5.1.6)
       tsc-alias:
-        specifier: ^1.8.2
-        version: 1.8.2
+        specifier: ^1.8.7
+        version: 1.8.7
       tsconfig-paths:
-        specifier: ^4.1.2
-        version: 4.1.2
+        specifier: ^4.2.0
+        version: 4.2.0
 
   packages/core:
     dependencies:
@@ -686,41 +671,41 @@ importers:
         specifier: ^3.0.3
         version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.3.4)
       '@storybook/addon-a11y':
-        specifier: ^7.0.21
-        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.1.1
+        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-actions':
-        specifier: ^7.0.21
-        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.1.1
+        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-docs':
-        specifier: ^7.0.21
-        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.1.1
+        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-essentials':
-        specifier: ^7.0.21
-        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.1.1
+        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-links':
-        specifier: ^7.0.21
-        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^7.1.1
+        version: 7.1.1(react-dom@18.2.0)(react@17.0.2)
       '@storybook/addon-postcss':
         specifier: 3.0.0-alpha.1
         version: 3.0.0-alpha.1(webpack@5.75.0)
       '@storybook/addon-styling':
-        specifier: ^1.3.0
-        version: 1.3.0(less@4.1.3)(postcss@8.4.21)(react-dom@18.2.0)(react@17.0.2)(sass@1.63.4)(webpack@5.75.0)
+        specifier: ^1.3.4
+        version: 1.3.4(less@4.1.3)(postcss@8.4.27)(react-dom@18.2.0)(react@17.0.2)(sass@1.64.1)(webpack@5.75.0)
       '@storybook/vue3':
-        specifier: ^7.0.21
-        version: 7.0.21(vue@3.3.4)
+        specifier: ^7.1.1
+        version: 7.1.1(@vue/compiler-core@3.3.4)(vue@3.3.4)
       '@storybook/vue3-vite':
-        specifier: ^7.0.21
-        version: 7.0.21(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vite@4.0.4)(vue@3.3.4)
+        specifier: ^7.1.1
+        version: 7.1.1(@vue/compiler-core@3.3.4)(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.6)(vite@4.4.7)(vue@3.3.4)
       '@testing-library/jest-dom':
-        specifier: ^5.16.5
-        version: 5.16.5
+        specifier: ^5.17.0
+        version: 5.17.0
       '@testing-library/user-event':
         specifier: ^14.4.3
-        version: 14.4.3(@testing-library/dom@8.20.1)
+        version: 14.4.3(@testing-library/dom@9.3.1)
       '@testing-library/vue':
-        specifier: ^6.6.1
-        version: 6.6.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
+        specifier: ^7.0.0
+        version: 7.0.0(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
       '@types/markdown-it':
         specifier: ^12.2.3
         version: 12.2.3
@@ -735,13 +720,13 @@ importers:
         version: 2.9.0
       '@vitejs/plugin-vue':
         specifier: ^4.2.3
-        version: 4.2.3(vite@4.0.4)(vue@3.3.4)
+        version: 4.2.3(vite@4.4.7)(vue@3.3.4)
       '@vue/test-utils':
         specifier: ^2.4.1
         version: 2.4.1(vue@3.3.4)
       autoprefixer:
         specifier: ^10.4.14
-        version: 10.4.14(postcss@8.4.21)
+        version: 10.4.14(postcss@8.4.27)
       core-js:
         specifier: ^3.31.0
         version: 3.31.0
@@ -749,20 +734,20 @@ importers:
         specifier: 21.1.0
         version: 21.1.0
       sass:
-        specifier: ^1.63.4
-        version: 1.63.4
+        specifier: ^1.64.1
+        version: 1.64.1
       sass-loader:
         specifier: ^13.3.2
-        version: 13.3.2(sass@1.63.4)(webpack@5.75.0)
+        version: 13.3.2(sass@1.64.1)(webpack@5.75.0)
       storybook:
-        specifier: ^7.0.21
-        version: 7.0.21
+        specifier: ^7.1.1
+        version: 7.1.1
       storybook-addon-themes:
         specifier: ^6.1.0
         version: 6.1.0(react-dom@18.2.0)(react@17.0.2)(vue@3.3.4)
       storybook-dark-mode:
-        specifier: ^3.0.0
-        version: 3.0.0(react-dom@18.2.0)(react@17.0.2)
+        specifier: ^3.0.1
+        version: 3.0.1(react-dom@18.2.0)(react@17.0.2)
 
   packages/editor-ui:
     dependencies:
@@ -881,11 +866,11 @@ importers:
         specifier: ^1.0.1
         version: 1.0.1
       pinia:
-        specifier: ^2.0.22
-        version: 2.0.23(typescript@5.1.3)(vue@3.3.4)
+        specifier: ^2.1.6
+        version: 2.1.6(typescript@5.1.6)(vue@3.3.4)
       prettier:
-        specifier: ^2.8.3
-        version: 2.8.3
+        specifier: ^3.0.0
+        version: 3.0.0
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
@@ -921,23 +906,14 @@ importers:
         version: 1.0.14
     devDependencies:
       '@faker-js/faker':
-        specifier: ^7.6.0
-        version: 7.6.0
+        specifier: ^8.0.2
+        version: 8.0.2
       '@pinia/testing':
-        specifier: ^0.0.14
-        version: 0.0.14(pinia@2.0.23)(vue@3.3.4)
+        specifier: ^0.1.3
+        version: 0.1.3(pinia@2.1.6)(vue@3.3.4)
       '@sentry/vite-plugin':
-        specifier: ^0.4.0
-        version: 0.4.0
-      '@testing-library/jest-dom':
-        specifier: ^5.16.5
-        version: 5.16.5
-      '@testing-library/user-event':
-        specifier: ^14.4.3
-        version: 14.4.3(@testing-library/dom@8.20.1)
-      '@testing-library/vue':
-        specifier: ^6.6.1
-        version: 6.6.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4)
+        specifier: ^2.5.0
+        version: 2.5.0
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
@@ -959,9 +935,6 @@ importers:
       '@types/uuid':
         specifier: ^8.3.2
         version: 8.3.4
-      '@vitejs/plugin-vue':
-        specifier: ^4.2.3
-        version: 4.2.3(vite@4.0.4)(vue@3.3.4)
       miragejs:
         specifier: ^0.1.47
         version: 0.1.47
@@ -989,34 +962,19 @@ importers:
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
-      oauth-1.0a:
-        specifier: ^2.2.6
-        version: 2.2.6
       replace-in-file:
         specifier: ^6.0.0
         version: 6.3.5
-      request:
-        specifier: ^2.88.2
-        version: 2.88.2
       tmp-promise:
-        specifier: ^3.0.2
+        specifier: ^3.0.3
         version: 3.0.3
     devDependencies:
       '@oclif/dev-cli':
         specifier: ^1.22.2
         version: 1.26.10
-      '@types/express':
-        specifier: ^4.17.6
-        version: 4.17.14
       '@types/inquirer':
         specifier: ^6.5.0
         version: 6.5.0
-      '@types/tmp':
-        specifier: ^0.2.0
-        version: 0.2.3
-      '@types/vorpal':
-        specifier: ^1.11.0
-        version: 1.12.2
 
   packages/nodes-base:
     dependencies:
@@ -1287,7 +1245,7 @@ importers:
         version: 0.4.11
       eslint-plugin-n8n-nodes-base:
         specifier: ^1.12.0
-        version: 1.12.0(eslint@8.39.0)(typescript@5.1.3)
+        version: 1.12.0(eslint@8.45.0)(typescript@5.1.6)
       gulp:
         specifier: ^4.0.0
         version: 4.0.2
@@ -1364,6 +1322,11 @@ importers:
 
 packages:
 
+  /@aashutoshrathi/word-wrap@1.2.6:
+    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /@acuminous/bitsyntax@0.1.2:
     resolution: {integrity: sha512-29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ==}
     engines: {node: '>=0.8'}
@@ -1379,11 +1342,11 @@ packages:
     resolution: {integrity: sha512-Fx6tYjk2wKUgLi8uMANZr8GNZx05u44ArIJldn9VxLvolzlJVgHbTUCbwhMd6bcYky178+WUSxPHO3DAtGLWpw==}
     dev: true
 
-  /@ampproject/remapping@2.2.0:
-    resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
+  /@ampproject/remapping@2.2.1:
+    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
     engines: {node: '>=6.0.0'}
     dependencies:
-      '@jridgewell/gen-mapping': 0.1.1
+      '@jridgewell/gen-mapping': 0.3.2
       '@jridgewell/trace-mapping': 0.3.17
     dev: true
 
@@ -1399,7 +1362,7 @@ packages:
     resolution: {integrity: sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==}
     dependencies:
       '@jsdevtools/ono': 7.1.3
-      '@types/json-schema': 7.0.11
+      '@types/json-schema': 7.0.12
       call-me-maybe: 1.0.1
       js-yaml: 4.1.0
     dev: false
@@ -1445,8 +1408,8 @@ packages:
       xpath: 0.0.32
     dev: false
 
-  /@aw-web-design/x-default-browser@1.4.88:
-    resolution: {integrity: sha512-AkEmF0wcwYC2QkhK703Y83fxWARttIWXDmQN8+cof8FmFZ5BRhnNXGymeb1S73bOCLfWjYELxtujL56idCN/XA==}
+  /@aw-web-design/x-default-browser@1.4.126:
+    resolution: {integrity: sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==}
     hasBin: true
     dependencies:
       default-browser-id: 3.0.0
@@ -1456,7 +1419,7 @@ packages:
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/core-auth@1.4.0:
@@ -1464,7 +1427,7 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@azure/abort-controller': 1.1.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/core-client@1.6.1:
@@ -1477,7 +1440,7 @@ packages:
       '@azure/core-tracing': 1.0.1
       '@azure/core-util': 1.1.1
       '@azure/logger': 1.0.3
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1502,13 +1465,13 @@ packages:
       '@azure/core-tracing': 1.0.0-preview.13
       '@azure/core-util': 1.1.1
       '@azure/logger': 1.0.3
-      '@types/node-fetch': 2.6.2
+      '@types/node-fetch': 2.6.4
       '@types/tunnel': 0.0.3
       form-data: 4.0.0
       node-fetch: 2.6.8
       process: 0.11.10
       tough-cookie: 4.1.3
-      tslib: 2.5.0
+      tslib: 2.6.1
       tunnel: 0.0.6
       uuid: 8.3.2
       xml2js: 0.5.0
@@ -1522,14 +1485,14 @@ packages:
     dependencies:
       '@azure/abort-controller': 1.1.0
       '@azure/logger': 1.0.3
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/core-paging@1.3.0:
     resolution: {integrity: sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/core-rest-pipeline@1.9.2:
@@ -1544,7 +1507,7 @@ packages:
       form-data: 4.0.0
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
-      tslib: 2.5.0
+      tslib: 2.6.1
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -1555,14 +1518,14 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@opentelemetry/api': 1.2.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/core-tracing@1.0.1:
     resolution: {integrity: sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/core-util@1.1.1:
@@ -1570,7 +1533,7 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@azure/abort-controller': 1.1.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/identity@2.1.0:
@@ -1591,7 +1554,7 @@ packages:
       jws: 4.0.0
       open: 8.4.0
       stoppable: 1.1.0
-      tslib: 2.5.0
+      tslib: 2.6.1
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -1611,7 +1574,7 @@ packages:
       '@azure/core-tracing': 1.0.1
       '@azure/core-util': 1.1.1
       '@azure/logger': 1.0.3
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1620,7 +1583,7 @@ packages:
     resolution: {integrity: sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@azure/msal-browser@2.30.0:
@@ -1655,37 +1618,37 @@ packages:
       '@azure/core-tracing': 1.0.0-preview.13
       '@azure/logger': 1.0.3
       events: 3.3.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - encoding
     dev: false
 
-  /@babel/code-frame@7.21.4:
-    resolution: {integrity: sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==}
+  /@babel/code-frame@7.22.5:
+    resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.18.6
+      '@babel/highlight': 7.22.5
     dev: true
 
-  /@babel/compat-data@7.21.7:
-    resolution: {integrity: sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==}
+  /@babel/compat-data@7.22.9:
+    resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/core@7.21.8:
-    resolution: {integrity: sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==}
+  /@babel/core@7.22.9:
+    resolution: {integrity: sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.5
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8)
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helpers': 7.21.5
-      '@babel/parser': 7.21.8
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.22.5
+      '@babel/generator': 7.22.9
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helpers': 7.22.6
+      '@babel/parser': 7.22.7
+      '@babel/template': 7.22.5
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.22.5
       convert-source-map: 1.9.0
       debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
@@ -1695,154 +1658,178 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/generator@7.21.5:
-    resolution: {integrity: sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==}
+  /@babel/generator@7.22.9:
+    resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
       '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
     dev: true
 
-  /@babel/helper-annotate-as-pure@7.18.6:
-    resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
+  /@babel/helper-annotate-as-pure@7.22.5:
+    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-builder-binary-assignment-operator-visitor@7.18.9:
-    resolution: {integrity: sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==}
+  /@babel/helper-builder-binary-assignment-operator-visitor@7.22.5:
+    resolution: {integrity: sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-explode-assignable-expression': 7.18.6
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-compilation-targets@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==}
+  /@babel/helper-compilation-targets@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.21.8
-      '@babel/helper-validator-option': 7.21.0
-      browserslist: 4.21.4
+      '@babel/compat-data': 7.22.9
+      '@babel/core': 7.22.9
+      '@babel/helper-validator-option': 7.22.5
+      browserslist: 4.21.9
       lru-cache: 5.1.1
       semver: 7.5.4
     dev: true
 
-  /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.21.8):
+  /@babel/helper-create-class-features-plugin@7.21.8(@babel/core@7.22.9):
     resolution: {integrity: sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
       '@babel/helper-member-expression-to-functions': 7.21.5
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-replace-supers': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
       semver: 7.5.4
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
-  /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.21.8):
+  /@babel/helper-create-class-features-plugin@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-member-expression-to-functions': 7.22.5
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      semver: 7.5.4
+    dev: true
+
+  /@babel/helper-create-regexp-features-plugin@7.20.5(@babel/core@7.22.9):
     resolution: {integrity: sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.2.2
     dev: true
 
-  /@babel/helper-define-polyfill-provider@0.3.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
+  /@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      regexpu-core: 5.3.2
+      semver: 7.5.4
+    dev: true
+
+  /@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.22.9):
+    resolution: {integrity: sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==}
     peerDependencies:
-      '@babel/core': ^7.4.0-0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
       debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 7.5.4
+      resolve: 1.22.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/helper-environment-visitor@7.21.5:
-    resolution: {integrity: sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==}
+  /@babel/helper-environment-visitor@7.22.5:
+    resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-explode-assignable-expression@7.18.6:
-    resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==}
+  /@babel/helper-function-name@7.22.5:
+    resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/template': 7.22.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-function-name@7.21.0:
-    resolution: {integrity: sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==}
+  /@babel/helper-hoist-variables@7.22.5:
+    resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-hoist-variables@7.18.6:
-    resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
+  /@babel/helper-member-expression-to-functions@7.21.5:
+    resolution: {integrity: sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-member-expression-to-functions@7.21.5:
-    resolution: {integrity: sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==}
+  /@babel/helper-member-expression-to-functions@7.22.5:
+    resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-module-imports@7.21.4:
-    resolution: {integrity: sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==}
+  /@babel/helper-module-imports@7.22.5:
+    resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-module-transforms@7.21.5:
-    resolution: {integrity: sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==}
+  /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-module-imports': 7.21.4
-      '@babel/helper-simple-access': 7.21.5
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-module-imports': 7.22.5
+      '@babel/helper-simple-access': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/helper-validator-identifier': 7.22.5
     dev: true
 
-  /@babel/helper-optimise-call-expression@7.18.6:
-    resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==}
+  /@babel/helper-optimise-call-expression@7.22.5:
+    resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
   /@babel/helper-plugin-utils@7.21.5:
@@ -1850,1034 +1837,1096 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-remap-async-to-generator@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==}
+  /@babel/helper-plugin-utils@7.22.5:
+    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
+    engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-wrap-function': 7.20.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-wrap-function': 7.22.9
     dev: true
 
-  /@babel/helper-replace-supers@7.21.5:
-    resolution: {integrity: sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==}
+  /@babel/helper-replace-supers@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-member-expression-to-functions': 7.21.5
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-member-expression-to-functions': 7.22.5
+      '@babel/helper-optimise-call-expression': 7.22.5
     dev: true
 
-  /@babel/helper-simple-access@7.21.5:
-    resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==}
+  /@babel/helper-simple-access@7.22.5:
+    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-skip-transparent-expression-wrappers@7.20.0:
-    resolution: {integrity: sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==}
+  /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
+    resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helper-split-export-declaration@7.18.6:
-    resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
+  /@babel/helper-split-export-declaration@7.22.6:
+    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
   /@babel/helper-string-parser@7.21.5:
     resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
     engines: {node: '>=6.9.0'}
+    dev: true
+
+  /@babel/helper-string-parser@7.22.5:
+    resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
+    engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-identifier@7.19.1:
-    resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
+  /@babel/helper-validator-identifier@7.22.5:
+    resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-option@7.21.0:
-    resolution: {integrity: sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==}
+  /@babel/helper-validator-option@7.22.5:
+    resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==}
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-wrap-function@7.20.5:
-    resolution: {integrity: sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==}
+  /@babel/helper-wrap-function@7.22.9:
+    resolution: {integrity: sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-function-name': 7.21.0
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/helper-function-name': 7.22.5
+      '@babel/template': 7.22.5
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/helpers@7.21.5:
-    resolution: {integrity: sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==}
+  /@babel/helpers@7.22.6:
+    resolution: {integrity: sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
+      '@babel/template': 7.22.5
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.22.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/highlight@7.18.6:
-    resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
+  /@babel/highlight@7.22.5:
+    resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/helper-validator-identifier': 7.22.5
       chalk: 2.4.2
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/parser@7.21.8:
-    resolution: {integrity: sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==}
+  /@babel/parser@7.22.7:
+    resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==}
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==}
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.13.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
+  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
+  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-proposal-class-static-block@7.21.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==}
+  /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.22.9):
+    resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.12.0
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
+  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.9):
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
     dev: true
 
-  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
+    engines: {node: '>=4'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.9):
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
+  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.21.8
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
+  /@babel/plugin-syntax-flow@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
+  /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object@7.21.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==}
+  /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
-    engines: {node: '>=4'}
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.8):
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.21.8):
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.9):
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-flow@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+  /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.22.9):
+    resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.21.8):
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+  /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.21.8):
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+  /@babel/plugin-transform-async-generator-functions@7.22.7(@babel/core@7.22.9):
+    resolution: {integrity: sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.9)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+  /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-module-imports': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+  /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+  /@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+  /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+  /@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.12.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==}
+  /@babel/plugin-transform-classes@7.22.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-split-export-declaration': 7.22.6
+      globals: 11.12.0
     dev: true
 
-  /@babel/plugin-transform-arrow-functions@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==}
+  /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/template': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-async-to-generator@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==}
+  /@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-module-imports': 7.21.4
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-remap-async-to-generator': 7.18.9(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==}
+  /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-block-scoping@7.21.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==}
+  /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-classes@7.21.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==}
+  /@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8)
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-optimise-call-expression': 7.18.6
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-replace-supers': 7.21.5
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-computed-properties@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==}
+  /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/template': 7.20.7
+      '@babel/core': 7.22.9
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-destructuring@7.21.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==}
+  /@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-dotall-regex@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==}
+  /@babel/plugin-transform-flow-strip-types@7.19.0(@babel/core@7.22.9):
+    resolution: {integrity: sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-duplicate-keys@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==}
+  /@babel/plugin-transform-for-of@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==}
+  /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.18.9
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-flow-strip-types@7.19.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==}
+  /@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-for-of@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==}
+  /@babel/plugin-transform-literals@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-function-name@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==}
+  /@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8)
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-literals@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==}
+  /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==}
+  /@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-amd@7.20.11(@babel/core@7.21.8):
-    resolution: {integrity: sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==}
+  /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-simple-access': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
+  /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-simple-access': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-simple-access': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs@7.20.11(@babel/core@7.21.8):
-    resolution: {integrity: sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==}
+  /@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-validator-identifier': 7.19.1
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-umd@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==}
+  /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-module-transforms': 7.21.5
-      '@babel/helper-plugin-utils': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.20.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==}
+  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-new-target@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==}
+  /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-object-super@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==}
+  /@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-replace-supers': 7.21.5
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-parameters@7.21.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==}
+  /@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-property-literals@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==}
+  /@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/compat-data': 7.22.9
+      '@babel/core': 7.22.9
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ==}
+  /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.21.4
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.8)
-      '@babel/types': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-regenerator@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==}
+  /@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.9)
+    dev: true
+
+  /@babel/plugin-transform-optional-chaining@7.22.6(@babel/core@7.22.9):
+    resolution: {integrity: sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.9)
+    dev: true
+
+  /@babel/plugin-transform-parameters@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.9)
+    dev: true
+
+  /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
       regenerator-transform: 0.15.1
     dev: true
 
-  /@babel/plugin-transform-reserved-words@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==}
+  /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==}
+  /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-spread@7.20.7(@babel/core@7.21.8):
-    resolution: {integrity: sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==}
+  /@babel/plugin-transform-spread@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.20.0
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-sticky-regex@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==}
+  /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==}
+  /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol@7.18.9(@babel/core@7.21.8):
-    resolution: {integrity: sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==}
+  /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-typescript@7.20.7(@babel/core@7.21.8):
+  /@babel/plugin-transform-typescript@7.20.7(@babel/core@7.22.9):
     resolution: {integrity: sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-create-class-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.22.9)
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==}
+  /@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-regex@7.18.6(@babel/core@7.21.8):
-    resolution: {integrity: sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==}
+  /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-create-regexp-features-plugin': 7.20.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/preset-env@7.21.5(@babel/core@7.21.8):
-    resolution: {integrity: sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==}
+  /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.21.8
-      '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8)
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-validator-option': 7.21.0
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-class-static-block': 7.21.0(@babel/core@7.21.8)
-      '@babel/plugin-proposal-dynamic-import': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-proposal-json-strings': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-logical-assignment-operators': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-proposal-optional-catch-binding': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8)
-      '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0(@babel/core@7.21.8)
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.8)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.21.8)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.21.8)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.21.8)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-arrow-functions': 7.21.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-async-to-generator': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-transform-block-scoped-functions': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8)
-      '@babel/plugin-transform-classes': 7.21.0(@babel/core@7.21.8)
-      '@babel/plugin-transform-computed-properties': 7.21.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-destructuring': 7.21.3(@babel/core@7.21.8)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-duplicate-keys': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-transform-exponentiation-operator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-for-of': 7.21.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-function-name': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-transform-literals': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-transform-member-expression-literals': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-systemjs': 7.20.11(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-umd': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.20.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-new-target': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-object-super': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-parameters': 7.21.3(@babel/core@7.21.8)
-      '@babel/plugin-transform-property-literals': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-regenerator': 7.21.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-reserved-words': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-shorthand-properties': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-spread': 7.20.7(@babel/core@7.21.8)
-      '@babel/plugin-transform-sticky-regex': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-template-literals': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-transform-typeof-symbol': 7.18.9(@babel/core@7.21.8)
-      '@babel/plugin-transform-unicode-escapes': 7.21.5(@babel/core@7.21.8)
-      '@babel/plugin-transform-unicode-regex': 7.18.6(@babel/core@7.21.8)
-      '@babel/preset-modules': 0.1.5(@babel/core@7.21.8)
-      '@babel/types': 7.21.5
-      babel-plugin-polyfill-corejs2: 0.3.3(@babel/core@7.21.8)
-      babel-plugin-polyfill-corejs3: 0.6.0(@babel/core@7.21.8)
-      babel-plugin-polyfill-regenerator: 0.4.1(@babel/core@7.21.8)
-      core-js-compat: 3.27.1
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.22.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+    dev: true
+
+  /@babel/preset-env@7.22.9(@babel/core@7.22.9):
+    resolution: {integrity: sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.22.9
+      '@babel/core': 7.22.9
+      '@babel/helper-compilation-targets': 7.22.9(@babel/core@7.22.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.22.5
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.9)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.9)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.9)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.9)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-async-generator-functions': 7.22.7(@babel/core@7.22.9)
+      '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-block-scoping': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-class-static-block': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-classes': 7.22.6(@babel/core@7.22.9)
+      '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-destructuring': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-dynamic-import': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-export-namespace-from': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-json-strings': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-logical-assignment-operators': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-modules-systemjs': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-numeric-separator': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-object-rest-spread': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-optional-catch-binding': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-optional-chaining': 7.22.6(@babel/core@7.22.9)
+      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-private-property-in-object': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-regenerator': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-unicode-escapes': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/preset-modules': 0.1.5(@babel/core@7.22.9)
+      '@babel/types': 7.22.5
+      babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.22.9)
+      babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.22.9)
+      babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.22.9)
+      core-js-compat: 3.32.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/preset-flow@7.18.6(@babel/core@7.21.8):
+  /@babel/preset-flow@7.18.6(@babel/core@7.22.9):
     resolution: {integrity: sha512-E7BDhL64W6OUqpuyHnSroLnqyRTcG6ZdOBl1OKI/QK/HJfplqK/S3sq1Cckx7oTodJ5yOXyfw7rEADJ6UjoQDQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-validator-option': 7.21.0
-      '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.22.5
+      '@babel/plugin-transform-flow-strip-types': 7.19.0(@babel/core@7.22.9)
     dev: true
 
-  /@babel/preset-modules@0.1.5(@babel/core@7.21.8):
+  /@babel/preset-modules@0.1.5(@babel/core@7.22.9):
     resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-transform-dotall-regex': 7.18.6(@babel/core@7.21.8)
-      '@babel/types': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.9)
+      '@babel/types': 7.22.5
       esutils: 2.0.3
     dev: true
 
-  /@babel/preset-typescript@7.18.6(@babel/core@7.21.8):
+  /@babel/preset-typescript@7.18.6(@babel/core@7.22.9):
     resolution: {integrity: sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-plugin-utils': 7.21.5
-      '@babel/helper-validator-option': 7.21.0
-      '@babel/plugin-transform-typescript': 7.20.7(@babel/core@7.21.8)
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/core': 7.22.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-validator-option': 7.22.5
+      '@babel/plugin-transform-typescript': 7.20.7(@babel/core@7.22.9)
     dev: true
 
-  /@babel/register@7.18.9(@babel/core@7.21.8):
+  /@babel/register@7.18.9(@babel/core@7.22.9):
     resolution: {integrity: sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
+      '@babel/core': 7.22.9
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
@@ -2885,15 +2934,12 @@ packages:
       source-map-support: 0.5.21
     dev: true
 
-  /@babel/runtime@7.19.4:
-    resolution: {integrity: sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
-    dev: false
+  /@babel/regjsgen@0.8.0:
+    resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==}
+    dev: true
 
-  /@babel/runtime@7.20.7:
-    resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
+  /@babel/runtime@7.22.6:
+    resolution: {integrity: sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
@@ -2902,23 +2948,32 @@ packages:
     resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
+      '@babel/code-frame': 7.22.5
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
     dev: true
 
-  /@babel/traverse@7.21.5:
-    resolution: {integrity: sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==}
+  /@babel/template@7.22.5:
+    resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/generator': 7.21.5
-      '@babel/helper-environment-visitor': 7.21.5
-      '@babel/helper-function-name': 7.21.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
+      '@babel/code-frame': 7.22.5
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
+    dev: true
+
+  /@babel/traverse@7.22.8:
+    resolution: {integrity: sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.22.5
+      '@babel/generator': 7.22.9
+      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
       debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -2930,7 +2985,16 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-string-parser': 7.21.5
-      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/helper-validator-identifier': 7.22.5
+      to-fast-properties: 2.0.0
+    dev: true
+
+  /@babel/types@7.22.5:
+    resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.5
       to-fast-properties: 2.0.0
 
   /@bcoe/v8-coverage@0.2.3:
@@ -3061,8 +3125,8 @@ packages:
       y18n: 5.0.8
     dev: false
 
-  /@cypress/request@2.88.10:
-    resolution: {integrity: sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==}
+  /@cypress/request@2.88.11:
+    resolution: {integrity: sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==}
     engines: {node: '>= 6'}
     dependencies:
       aws-sign2: 0.7.0
@@ -3078,7 +3142,7 @@ packages:
       json-stringify-safe: 5.0.1
       mime-types: 2.1.35
       performance-now: 2.1.0
-      qs: 6.5.3
+      qs: 6.10.5
       safe-buffer: 5.2.1
       tough-cookie: 4.1.3
       tunnel-agent: 0.6.0
@@ -3123,366 +3187,190 @@ packages:
       react: 17.0.2
     dev: true
 
-  /@esbuild/android-arm64@0.16.17:
-    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm64@0.17.18:
-    resolution: {integrity: sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==}
+  /@esbuild/android-arm64@0.18.17:
+    resolution: {integrity: sha512-9np+YYdNDed5+Jgr1TdWBsozZ85U1Oa3xW0c7TWqH0y2aGghXtZsuT8nYRbzOMcl0bXZXjOGbksoTtVOlWrRZg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
     dev: true
     optional: true
 
-  /@esbuild/android-arm@0.16.17:
-    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm@0.17.18:
-    resolution: {integrity: sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==}
+  /@esbuild/android-arm@0.18.17:
+    resolution: {integrity: sha512-wHsmJG/dnL3OkpAcwbgoBTTMHVi4Uyou3F5mf58ZtmUyIKfcdA7TROav/6tCzET4A3QW2Q2FC+eFneMU+iyOxg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
     dev: true
     optional: true
 
-  /@esbuild/android-x64@0.16.17:
-    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    dev: true
-    optional: true
-
-  /@esbuild/android-x64@0.17.18:
-    resolution: {integrity: sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==}
+  /@esbuild/android-x64@0.18.17:
+    resolution: {integrity: sha512-O+FeWB/+xya0aLg23hHEM2E3hbfwZzjqumKMSIqcHbNvDa+dza2D0yLuymRBQQnC34CWrsJUXyH2MG5VnLd6uw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.16.17:
-    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-arm64@0.17.18:
-    resolution: {integrity: sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==}
+  /@esbuild/darwin-arm64@0.18.17:
+    resolution: {integrity: sha512-M9uJ9VSB1oli2BE/dJs3zVr9kcCBBsE883prage1NWz6pBS++1oNn/7soPNS3+1DGj0FrkSvnED4Bmlu1VAE9g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64@0.16.17:
-    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-x64@0.17.18:
-    resolution: {integrity: sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==}
+  /@esbuild/darwin-x64@0.18.17:
+    resolution: {integrity: sha512-XDre+J5YeIJDMfp3n0279DFNrGCXlxOuGsWIkRb1NThMZ0BsrWXoTg23Jer7fEXQ9Ye5QjrvXpxnhzl3bHtk0g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.16.17:
-    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-arm64@0.17.18:
-    resolution: {integrity: sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==}
+  /@esbuild/freebsd-arm64@0.18.17:
+    resolution: {integrity: sha512-cjTzGa3QlNfERa0+ptykyxs5A6FEUQQF0MuilYXYBGdBxD3vxJcKnzDlhDCa1VAJCmAxed6mYhA2KaJIbtiNuQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.16.17:
-    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-x64@0.17.18:
-    resolution: {integrity: sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==}
+  /@esbuild/freebsd-x64@0.18.17:
+    resolution: {integrity: sha512-sOxEvR8d7V7Kw8QqzxWc7bFfnWnGdaFBut1dRUYtu+EIRXefBc/eIsiUiShnW0hM3FmQ5Zf27suDuHsKgZ5QrA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64@0.16.17:
-    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm64@0.17.18:
-    resolution: {integrity: sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==}
+  /@esbuild/linux-arm64@0.18.17:
+    resolution: {integrity: sha512-c9w3tE7qA3CYWjT+M3BMbwMt+0JYOp3vCMKgVBrCl1nwjAlOMYzEo+gG7QaZ9AtqZFj5MbUc885wuBBmu6aADQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-arm@0.16.17:
-    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm@0.17.18:
-    resolution: {integrity: sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==}
+  /@esbuild/linux-arm@0.18.17:
+    resolution: {integrity: sha512-2d3Lw6wkwgSLC2fIvXKoMNGVaeY8qdN0IC3rfuVxJp89CRfA3e3VqWifGDfuakPmp90+ZirmTfye1n4ncjv2lg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.16.17:
-    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ia32@0.17.18:
-    resolution: {integrity: sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==}
+  /@esbuild/linux-ia32@0.18.17:
+    resolution: {integrity: sha512-1DS9F966pn5pPnqXYz16dQqWIB0dmDfAQZd6jSSpiT9eX1NzKh07J6VKR3AoXXXEk6CqZMojiVDSZi1SlmKVdg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64@0.16.17:
-    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.17.18:
-    resolution: {integrity: sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==}
+  /@esbuild/linux-loong64@0.18.17:
+    resolution: {integrity: sha512-EvLsxCk6ZF0fpCB6w6eOI2Fc8KW5N6sHlIovNe8uOFObL2O+Mr0bflPHyHwLT6rwMg9r77WOAWb2FqCQrVnwFg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.16.17:
-    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-mips64el@0.17.18:
-    resolution: {integrity: sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==}
+  /@esbuild/linux-mips64el@0.18.17:
+    resolution: {integrity: sha512-e0bIdHA5p6l+lwqTE36NAW5hHtw2tNRmHlGBygZC14QObsA3bD4C6sXLJjvnDIjSKhW1/0S3eDy+QmX/uZWEYQ==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.16.17:
-    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ppc64@0.17.18:
-    resolution: {integrity: sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==}
+  /@esbuild/linux-ppc64@0.18.17:
+    resolution: {integrity: sha512-BAAilJ0M5O2uMxHYGjFKn4nJKF6fNCdP1E0o5t5fvMYYzeIqy2JdAP88Az5LHt9qBoUa4tDaRpfWt21ep5/WqQ==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.16.17:
-    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-riscv64@0.17.18:
-    resolution: {integrity: sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==}
+  /@esbuild/linux-riscv64@0.18.17:
+    resolution: {integrity: sha512-Wh/HW2MPnC3b8BqRSIme/9Zhab36PPH+3zam5pqGRH4pE+4xTrVLx2+XdGp6fVS3L2x+DrsIcsbMleex8fbE6g==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x@0.16.17:
-    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-s390x@0.17.18:
-    resolution: {integrity: sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==}
+  /@esbuild/linux-s390x@0.18.17:
+    resolution: {integrity: sha512-j/34jAl3ul3PNcK3pfI0NSlBANduT2UO5kZ7FCaK33XFv3chDhICLY8wJJWIhiQ+YNdQ9dxqQctRg2bvrMlYgg==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/linux-x64@0.16.17:
-    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    dev: true
-    optional: true
-
-  /@esbuild/linux-x64@0.17.18:
-    resolution: {integrity: sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==}
+  /@esbuild/linux-x64@0.18.17:
+    resolution: {integrity: sha512-QM50vJ/y+8I60qEmFxMoxIx4de03pGo2HwxdBeFd4nMh364X6TIBZ6VQ5UQmPbQWUVWHWws5MmJXlHAXvJEmpQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.16.17:
-    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    dev: true
-    optional: true
-
-  /@esbuild/netbsd-x64@0.17.18:
-    resolution: {integrity: sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==}
+  /@esbuild/netbsd-x64@0.18.17:
+    resolution: {integrity: sha512-/jGlhWR7Sj9JPZHzXyyMZ1RFMkNPjC6QIAan0sDOtIo2TYk3tZn5UDrkE0XgsTQCxWTTOcMPf9p6Rh2hXtl5TQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.16.17:
-    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    dev: true
-    optional: true
-
-  /@esbuild/openbsd-x64@0.17.18:
-    resolution: {integrity: sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==}
+  /@esbuild/openbsd-x64@0.18.17:
+    resolution: {integrity: sha512-rSEeYaGgyGGf4qZM2NonMhMOP/5EHp4u9ehFiBrg7stH6BYEEjlkVREuDEcQ0LfIl53OXLxNbfuIj7mr5m29TA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64@0.16.17:
-    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    dev: true
-    optional: true
-
-  /@esbuild/sunos-x64@0.17.18:
-    resolution: {integrity: sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==}
+  /@esbuild/sunos-x64@0.18.17:
+    resolution: {integrity: sha512-Y7ZBbkLqlSgn4+zot4KUNYst0bFoO68tRgI6mY2FIM+b7ZbyNVtNbDP5y8qlu4/knZZ73fgJDlXID+ohY5zt5g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64@0.16.17:
-    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    dev: true
-    optional: true
-
-  /@esbuild/win32-arm64@0.17.18:
-    resolution: {integrity: sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==}
+  /@esbuild/win32-arm64@0.18.17:
+    resolution: {integrity: sha512-bwPmTJsEQcbZk26oYpc4c/8PvTY3J5/QK8jM19DVlEsAB41M39aWovWoHtNm78sd6ip6prilxeHosPADXtEJFw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32@0.16.17:
-    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    dev: true
-    optional: true
-
-  /@esbuild/win32-ia32@0.17.18:
-    resolution: {integrity: sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==}
+  /@esbuild/win32-ia32@0.18.17:
+    resolution: {integrity: sha512-H/XaPtPKli2MhW+3CQueo6Ni3Avggi6hP/YvgkEe1aSaxw+AeO8MFjq8DlgfTd9Iz4Yih3QCZI6YLMoyccnPRg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
     dev: true
     optional: true
 
-  /@esbuild/win32-x64@0.16.17:
-    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    dev: true
-    optional: true
-
-  /@esbuild/win32-x64@0.17.18:
-    resolution: {integrity: sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==}
+  /@esbuild/win32-x64@0.18.17:
+    resolution: {integrity: sha512-fGEb8f2BSA3CW7riJVurug65ACLuQAzKq0SSqkY2b2yHHH0MzDfbLyKIGzHwOI/gkHcxM/leuSW6D5w/LMNitA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
     dev: true
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.39.0):
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.45.0):
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
     dependencies:
-      eslint: 8.39.0
-      eslint-visitor-keys: 3.4.0
+      eslint: 8.45.0
+      eslint-visitor-keys: 3.4.1
     dev: true
 
   /@eslint-community/regexpp@4.5.0:
@@ -3490,13 +3378,18 @@ packages:
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
-  /@eslint/eslintrc@2.0.2:
-    resolution: {integrity: sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==}
+  /@eslint-community/regexpp@4.6.2:
+    resolution: {integrity: sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+    dev: true
+
+  /@eslint/eslintrc@2.1.0:
+    resolution: {integrity: sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4(supports-color@8.1.1)
-      espree: 9.5.1
+      espree: 9.6.1
       globals: 13.20.0
       ignore: 5.2.4
       import-fresh: 3.3.0
@@ -3507,8 +3400,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/js@8.39.0:
-    resolution: {integrity: sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==}
+  /@eslint/js@8.44.0:
+    resolution: {integrity: sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -3518,9 +3411,9 @@ packages:
       heap: 0.2.7
     dev: false
 
-  /@faker-js/faker@7.6.0:
-    resolution: {integrity: sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==}
-    engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+  /@faker-js/faker@8.0.2:
+    resolution: {integrity: sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'}
     dev: true
 
   /@fal-works/esbuild-plugin-global-externals@2.1.2:
@@ -3637,8 +3530,8 @@ packages:
       '@hapi/hoek': 9.3.0
     dev: true
 
-  /@humanwhocodes/config-array@0.11.8:
-    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
+  /@humanwhocodes/config-array@0.11.10:
+    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -3707,6 +3600,18 @@ packages:
     resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
     dev: false
 
+  /@isaacs/cliui@8.0.2:
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: /string-width@4.2.3
+      strip-ansi: 7.0.1
+      strip-ansi-cjs: /strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: /wrap-ansi@7.0.0
+    dev: true
+
   /@istanbuljs/load-nyc-config@1.1.0:
     resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
     engines: {node: '>=8'}
@@ -3723,20 +3628,20 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /@jest/console@29.5.0:
-    resolution: {integrity: sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==}
+  /@jest/console@29.6.2:
+    resolution: {integrity: sha512-0N0yZof5hi44HAR2pPS+ikJ3nzKNoZdVu8FffRf3wy47I7Dm7etk/3KetMdRUqzVd16V4O2m2ISpNTbnIuqy1w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       chalk: 4.1.2
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
       slash: 3.0.0
     dev: true
 
-  /@jest/core@29.5.0:
-    resolution: {integrity: sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==}
+  /@jest/core@29.6.2:
+    resolution: {integrity: sha512-Oj+5B+sDMiMWLhPFF+4/DvHOf+U10rgvCLGPHP8Xlsy/7QxS51aU/eBngudHlJXnaWD5EohAgJ4js+T6pa+zOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3744,106 +3649,93 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/reporters': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/console': 29.6.2
+      '@jest/reporters': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       ansi-escapes: 4.3.2
       chalk: 4.1.2
-      ci-info: 3.7.1
+      ci-info: 3.8.0
       exit: 0.1.2
       graceful-fs: 4.2.10
       jest-changed-files: 29.5.0
-      jest-config: 29.5.0(@types/node@18.16.16)
-      jest-haste-map: 29.5.0
-      jest-message-util: 29.5.0
+      jest-config: 29.6.2(@types/node@18.16.16)
+      jest-haste-map: 29.6.2
+      jest-message-util: 29.6.2
       jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-resolve-dependencies: 29.5.0
-      jest-runner: 29.5.0
-      jest-runtime: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      jest-watcher: 29.5.0
+      jest-resolve: 29.6.2
+      jest-resolve-dependencies: 29.6.2
+      jest-runner: 29.6.2
+      jest-runtime: 29.6.2
+      jest-snapshot: 29.6.2
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
+      jest-watcher: 29.6.2
       micromatch: 4.0.5
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
       - ts-node
     dev: true
 
-  /@jest/environment@29.5.0:
-    resolution: {integrity: sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==}
+  /@jest/environment@29.6.2:
+    resolution: {integrity: sha512-AEcW43C7huGd/vogTddNNTDRpO6vQ2zaQNrttvWV18ArBx9Z56h7BIsXkNFJVOO4/kblWEQz30ckw0+L3izc+Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/fake-timers': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
-      jest-mock: 29.5.0
-    dev: true
-
-  /@jest/expect-utils@29.3.1:
-    resolution: {integrity: sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.2.0
-    dev: true
-
-  /@jest/expect-utils@29.4.2:
-    resolution: {integrity: sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.4.2
+      jest-mock: 29.6.2
     dev: true
 
-  /@jest/expect-utils@29.5.0:
-    resolution: {integrity: sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==}
+  /@jest/expect-utils@29.6.2:
+    resolution: {integrity: sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-get-type: 29.4.3
     dev: true
 
-  /@jest/expect@29.5.0:
-    resolution: {integrity: sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==}
+  /@jest/expect@29.6.2:
+    resolution: {integrity: sha512-m6DrEJxVKjkELTVAztTLyS/7C92Y2b0VYqmDROYKLLALHn8T/04yPs70NADUYPrV3ruI+H3J0iUIuhkjp7vkfg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 29.5.0
-      jest-snapshot: 29.5.0
+      expect: 29.6.2
+      jest-snapshot: 29.6.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@jest/fake-timers@29.5.0:
-    resolution: {integrity: sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==}
+  /@jest/fake-timers@29.6.2:
+    resolution: {integrity: sha512-euZDmIlWjm1Z0lJ1D0f7a0/y5Kh/koLFMUBE5SUYWrmy8oNhJpbTBDAP6CxKnadcMLDoDf4waRYCe35cH6G6PA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       '@sinonjs/fake-timers': 10.0.2
       '@types/node': 18.16.16
-      jest-message-util: 29.5.0
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
+      jest-message-util: 29.6.2
+      jest-mock: 29.6.2
+      jest-util: 29.6.2
     dev: true
 
-  /@jest/globals@29.5.0:
-    resolution: {integrity: sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==}
+  /@jest/globals@29.6.2:
+    resolution: {integrity: sha512-cjuJmNDjs6aMijCmSa1g2TNG4Lby/AeU7/02VtpW+SLcZXzOLK2GpN2nLqcFjmhy3B3AoPeQVx7BnyOf681bAw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/expect': 29.5.0
-      '@jest/types': 29.5.0
-      jest-mock: 29.5.0
+      '@jest/environment': 29.6.2
+      '@jest/expect': 29.6.2
+      '@jest/types': 29.6.1
+      jest-mock: 29.6.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@jest/reporters@29.5.0:
-    resolution: {integrity: sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==}
+  /@jest/reporters@29.6.2:
+    resolution: {integrity: sha512-sWtijrvIav8LgfJZlrGCdN0nP2EWbakglJY49J1Y5QihcQLfy7ovyxxjJBRXMNltgt4uPtEcFmIMbVshEDfFWw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3852,11 +3744,11 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jest/console': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      '@jridgewell/trace-mapping': 0.3.18
       '@types/node': 18.16.16
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
@@ -3868,13 +3760,13 @@ packages:
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.5
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
-      jest-worker: 29.5.0
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
+      jest-worker: 29.6.2
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
-      v8-to-istanbul: 9.0.1
+      v8-to-istanbul: 9.1.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3886,32 +3778,39 @@ packages:
       '@sinclair/typebox': 0.25.21
     dev: true
 
-  /@jest/source-map@29.4.3:
-    resolution: {integrity: sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==}
+  /@jest/schemas@29.6.0:
+    resolution: {integrity: sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
+      '@sinclair/typebox': 0.27.8
+    dev: true
+
+  /@jest/source-map@29.6.0:
+    resolution: {integrity: sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.18
       callsites: 3.1.0
       graceful-fs: 4.2.10
     dev: true
 
-  /@jest/test-result@29.5.0:
-    resolution: {integrity: sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==}
+  /@jest/test-result@29.6.2:
+    resolution: {integrity: sha512-3VKFXzcV42EYhMCsJQURptSqnyjqCGbtLuX5Xxb6Pm6gUf1wIRIl+mandIRGJyWKgNKYF9cnstti6Ls5ekduqw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/console': 29.6.2
+      '@jest/types': 29.6.1
       '@types/istanbul-lib-coverage': 2.0.4
       collect-v8-coverage: 1.0.1
     dev: true
 
-  /@jest/test-sequencer@29.5.0:
-    resolution: {integrity: sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==}
+  /@jest/test-sequencer@29.6.2:
+    resolution: {integrity: sha512-GVYi6PfPwVejO7slw6IDO0qKVum5jtrJ3KoLGbgBWyr2qr4GaxFV6su+ZAjdTX75Sr1DkMFRk09r2ZVa+wtCGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.5.0
+      '@jest/test-result': 29.6.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
+      jest-haste-map: 29.6.2
       slash: 3.0.0
     dev: true
 
@@ -3919,8 +3818,8 @@ packages:
     resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.21.8
-      '@jest/types': 29.5.0
+      '@babel/core': 7.22.9
+      '@jest/types': 29.6.1
       '@jridgewell/trace-mapping': 0.3.17
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
@@ -3929,7 +3828,7 @@ packages:
       graceful-fs: 4.2.10
       jest-haste-map: 29.5.0
       jest-regex-util: 29.4.3
-      jest-util: 29.5.0
+      jest-util: 29.6.2
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
@@ -3938,11 +3837,34 @@ packages:
       - supports-color
     dev: true
 
-  /@jest/types@29.5.0:
-    resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
+  /@jest/transform@29.6.2:
+    resolution: {integrity: sha512-ZqCqEISr58Ce3U+buNFJYUktLJZOggfyvR+bZMaiV1e8B1SIvJbwZMrYz3gx/KAPn9EXmOmN+uB08yLCjWkQQg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.4.3
+      '@babel/core': 7.22.9
+      '@jest/types': 29.6.1
+      '@jridgewell/trace-mapping': 0.3.18
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 2.0.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.10
+      jest-haste-map: 29.6.2
+      jest-regex-util: 29.4.3
+      jest-util: 29.6.2
+      micromatch: 4.0.5
+      pirates: 4.0.5
+      slash: 3.0.0
+      write-file-atomic: 4.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@jest/types@29.6.1:
+    resolution: {integrity: sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.6.0
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
       '@types/node': 18.16.16
@@ -3950,21 +3872,13 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@jridgewell/gen-mapping@0.1.1:
-    resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: true
-
   /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
     dev: true
 
   /@jridgewell/resolve-uri@3.1.0:
@@ -3981,7 +3895,7 @@ packages:
     resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
     dev: true
 
   /@jridgewell/sourcemap-codec@1.4.14:
@@ -3998,6 +3912,13 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
+  /@jridgewell/trace-mapping@0.3.18:
+    resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.0
+      '@jridgewell/sourcemap-codec': 1.4.14
+    dev: true
+
   /@js-joda/core@5.4.1:
     resolution: {integrity: sha512-+uMco2Xm9VYJ81XYWwrvgsM9xEvqs9JvLNrN4/fOg7YJKk4yeqAg+O/cpoFPTGxvfL2Zy0mUcnKlIz9UV0Cadw==}
     dev: false
@@ -4219,8 +4140,8 @@ packages:
       tar-fs: 2.1.1
     dev: true
 
-  /@ngneat/falso@6.1.0:
-    resolution: {integrity: sha512-eka5OxW65B1RphpLJ04Pd4PEkrmTab/Ut50K0OceAdM+O+MZA7YF9xo51uZgkxbhg8bJ5zEh5vucDRMSofcqsw==}
+  /@ngneat/falso@6.4.0:
+    resolution: {integrity: sha512-f6r036h2fX/AoHw1eV2t8+qWQwrbSrozs3zXMhhwoO7SJBc+DGMxRWEhFeYIinfwx0uhUH8ggx5+PDLzYESLOA==}
     dependencies:
       seedrandom: 3.0.5
       uuid: 8.3.2
@@ -4318,7 +4239,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-wsl: 2.2.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4332,7 +4253,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-wsl: 2.2.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
 
@@ -4365,7 +4286,7 @@ packages:
       strip-ansi: 6.0.1
       supports-color: 8.1.1
       supports-hyperlinks: 2.3.0
-      tslib: 2.5.0
+      tslib: 2.6.1
       widest-line: 3.1.0
       wrap-ansi: 7.0.0
     dev: false
@@ -4387,7 +4308,7 @@ packages:
       lodash: 4.17.21
       normalize-package-data: 3.0.3
       qqjs: 0.3.11
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4439,7 +4360,7 @@ packages:
       '@oclif/errors': 1.3.6
       '@oclif/linewrap': 1.0.0
       chalk: 4.1.2
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /@oclif/plugin-help@3.2.18:
     resolution: {integrity: sha512-5n5Pkz4L0duknIvFwx2Ko9Xda3miT6RZP8bgaaK3Q/9fzVBrhi4bOM0u05/OThI6V+3NsSdxYS2o1NLcXToWDg==}
@@ -4479,18 +4400,24 @@ packages:
     engines: {node: '>=8.0.0'}
     dev: false
 
-  /@pinia/testing@0.0.14(pinia@2.0.23)(vue@3.3.4):
-    resolution: {integrity: sha512-ZmZwVNd/NnKYLIfjfuKl0zlJ3UdiXFpsHzSlL6wCeezSlyrqGMxsIQKv0J6fleu38gyCNTPBEipfxrt8V4+VIg==}
+  /@pinia/testing@0.1.3(pinia@2.1.6)(vue@3.3.4):
+    resolution: {integrity: sha512-D2Ds2s69kKFaRf2KCcP1NhNZEg5+we59aRyQalwRm7ygWfLM25nDH66267U3hNvRUOTx8ofL24GzodZkOmB5xw==}
     peerDependencies:
-      pinia: '>=2.0.19'
+      pinia: '>=2.1.5'
     dependencies:
-      pinia: 2.0.23(typescript@5.1.3)(vue@3.3.4)
-      vue-demi: 0.13.11(vue@3.3.4)
+      pinia: 2.1.6(typescript@5.1.6)(vue@3.3.4)
+      vue-demi: 0.14.5(vue@3.3.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
     dev: true
 
+  /@pkgjs/parseargs@0.11.0:
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+    dev: true
+    optional: true
+
   /@pkgr/utils@2.3.1:
     resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
@@ -4500,7 +4427,7 @@ packages:
       open: 8.4.0
       picocolors: 1.0.0
       tiny-glob: 0.2.9
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
   /@rudderstack/rudder-sdk-node@1.0.6:
@@ -4540,23 +4467,26 @@ packages:
       selderee: 0.6.0
     dev: false
 
-  /@sentry-internal/tracing@7.47.0:
-    resolution: {integrity: sha512-udpHnCzF8DQsWf0gQwd0XFGp6Y8MOiwnl8vGt2ohqZGS3m1+IxoRLXsSkD8qmvN6KKDnwbaAvYnK0z0L+AW95g==}
+  /@sentry-internal/tracing@7.60.1:
+    resolution: {integrity: sha512-2vM+3/ddzmoBfi92OOD9FFTHXf0HdQhKtNM26+/RsmkKnTid+/inbvA7nKi+Qa7ExcnlC6eclEHQEg+0X3yDkQ==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/core': 7.47.0
-      '@sentry/types': 7.47.0
-      '@sentry/utils': 7.47.0
-      tslib: 2.5.0
+      '@sentry/core': 7.60.1
+      '@sentry/types': 7.60.1
+      '@sentry/utils': 7.60.1
+      tslib: 2.6.1
     dev: true
 
-  /@sentry/bundler-plugin-core@0.4.0:
-    resolution: {integrity: sha512-Xi+dqaSOoxbdmxegX7f66FVOxm2dVJLmrMXUpoNyuV6ASoccRWzouGaFekP059SUTTD05ytk1mHqwgVuBCA0Dw==}
-    engines: {node: '>= 10'}
+  /@sentry/bundler-plugin-core@2.5.0:
+    resolution: {integrity: sha512-UNjeTSf0Irt/RsC1Xsfxa+RC92mBvjzuWQnvHJ5c+mXwUt+jLcFgGMCSVK/FCDZO+gAeKzmU1+G2UexbsNAP8w==}
+    engines: {node: '>= 14'}
     dependencies:
       '@sentry/cli': 2.17.0(patch_hash=nchnoezkq6p37qaiku3vrpwraq)
-      '@sentry/node': 7.28.1
-      '@sentry/tracing': 7.47.0
+      '@sentry/node': 7.60.1
+      '@sentry/utils': 7.60.1
+      dotenv: 16.3.1
+      find-up: 5.0.0
+      glob: 9.3.2
       magic-string: 0.27.0
       unplugin: 1.0.1
     transitivePeerDependencies:
@@ -4586,15 +4516,16 @@ packages:
     dependencies:
       '@sentry/types': 7.28.1
       '@sentry/utils': 7.28.1
-      tslib: 2.5.0
+      tslib: 2.6.1
+    dev: false
 
-  /@sentry/core@7.47.0:
-    resolution: {integrity: sha512-EFhZhKdMu7wKmWYZwbgTi8FNZ7Fq+HdlXiZWNz51Bqe3pHmfAkdHtAEs0Buo0v623MKA0CA4EjXIazGUM34XTg==}
+  /@sentry/core@7.60.1:
+    resolution: {integrity: sha512-yr/0VFYWOJyXj+F2nifkRYxXskotsNnDggUnFOZZN2ZgTG94IzRFsOZQ6RslHJ8nrYPTBNO74reU0C0GB++xRw==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/types': 7.47.0
-      '@sentry/utils': 7.47.0
-      tslib: 2.5.0
+      '@sentry/types': 7.60.1
+      '@sentry/utils': 7.60.1
+      tslib: 2.6.1
     dev: true
 
   /@sentry/integrations@7.28.1:
@@ -4604,7 +4535,7 @@ packages:
       '@sentry/types': 7.28.1
       '@sentry/utils': 7.28.1
       localforage: 1.10.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /@sentry/node@7.28.1:
@@ -4617,23 +4548,34 @@ packages:
       cookie: 0.4.2
       https-proxy-agent: 5.0.1
       lru_map: 0.3.3
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /@sentry/tracing@7.47.0:
-    resolution: {integrity: sha512-hJCpKdekwaFNbCVXxfCz5IxfSEJIKnkPmRSVHITOm5VhKwq2e5kmy4Rn6bzSETwJFSDE8LGbR/3eSfGTqw37XA==}
+  /@sentry/node@7.60.1:
+    resolution: {integrity: sha512-lBt3RqncY4XbzM+PlTbH/tUWeOsm24anwEzvA2DSDP1NL3WZ5MdvT77q7NqpvpVNd2LeGAQ6x7AXDzE53YBfnQ==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry-internal/tracing': 7.47.0
+      '@sentry-internal/tracing': 7.60.1
+      '@sentry/core': 7.60.1
+      '@sentry/types': 7.60.1
+      '@sentry/utils': 7.60.1
+      cookie: 0.4.2
+      https-proxy-agent: 5.0.1
+      lru_map: 0.3.3
+      tslib: 2.6.1
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@sentry/types@7.28.1:
     resolution: {integrity: sha512-DvSplMVrVEmOzR2M161V5+B8Up3vR71xMqJOpWTzE9TqtFJRGPtqT/5OBsNJJw1+/j2ssMcnKwbEo9Q2EGeS6g==}
     engines: {node: '>=8'}
+    dev: false
 
-  /@sentry/types@7.47.0:
-    resolution: {integrity: sha512-GxXocplN0j1+uczovHrfkykl9wvkamDtWxlPUQgyGlbLGZn+UH1Y79D4D58COaFWGEZdSNKr62gZAjfEYu9nQA==}
+  /@sentry/types@7.60.1:
+    resolution: {integrity: sha512-8lKKSCOhZ953cWxwnfZwoR3ZFFlZG4P3PQFTaFt/u4LxLh/0zYbdtgvtUqXRURjMCi5P6ddeE9Uw9FGnTJCsTw==}
     engines: {node: '>=8'}
     dev: true
 
@@ -4642,21 +4584,23 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       '@sentry/types': 7.28.1
-      tslib: 2.5.0
+      tslib: 2.6.1
+    dev: false
 
-  /@sentry/utils@7.47.0:
-    resolution: {integrity: sha512-A89SaOLp6XeZfByeYo2C8Ecye/YAtk/gENuyOUhQEdMulI6mZdjqtHAp7pTMVgkBc/YNARVuoa+kR/IdRrTPkQ==}
+  /@sentry/utils@7.60.1:
+    resolution: {integrity: sha512-ik+5sKGBx4DWuvf6UUKPSafaDiASxP+Xvjg3C9ppop2I/JWxP1FfZ5g22n5ZmPmNahD6clTSoTWly8qyDUlUOw==}
     engines: {node: '>=8'}
     dependencies:
-      '@sentry/types': 7.47.0
-      tslib: 2.5.0
+      '@sentry/types': 7.60.1
+      tslib: 2.6.1
     dev: true
 
-  /@sentry/vite-plugin@0.4.0:
-    resolution: {integrity: sha512-dBxM00MCLzO/idzAqj33ZfbIBKZxP+FzpxtS2WaV0yzad9yLBAFZ/VGDIGHQJC0Qo3fsFi/CZpmN39wJkJoWFA==}
-    engines: {node: '>= 10'}
+  /@sentry/vite-plugin@2.5.0:
+    resolution: {integrity: sha512-u5lfIysy6UVzUGn/adyDcRXfzFyip4mLGThTnKeOeA9rCgmJUVnErH8TD8xhTKdpq/MBiQ+KqrC6xG9pKCa96g==}
+    engines: {node: '>= 14'}
     dependencies:
-      '@sentry/bundler-plugin-core': 0.4.0
+      '@sentry/bundler-plugin-core': 2.5.0
+      unplugin: 1.0.1
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -4680,6 +4624,10 @@ packages:
     resolution: {integrity: sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==}
     dev: true
 
+  /@sinclair/typebox@0.27.8:
+    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
+    dev: true
+
   /@sinonjs/commons@2.0.0:
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
@@ -4696,8 +4644,8 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@storybook/addon-a11y@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-bUpJXzXm6cVcHdyIzN004m/mC/yU314dBRrmXmnuZQV5FYuaykrJ7BxmjlsZovl/UZ5fcPm3TdstqqQ1UJMsrQ==}
+  /@storybook/addon-a11y@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-wUf0ogOhoUIvZ3w8FbaRuJ4eIjmatw/JOc0PSuBbgMxlc3s6EjYALcYbVmrJx6zkvbQRXP7cFex3d3uGgimpkg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4707,16 +4655,16 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addon-highlight': 7.0.21
-      '@storybook/channels': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/addon-highlight': 7.1.1
+      '@storybook/channels': 7.1.1
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       axe-core: 4.7.2
       lodash: 4.17.21
       react: 17.0.2
@@ -4724,8 +4672,8 @@ packages:
       react-resize-detector: 7.1.2(react-dom@18.2.0)(react@17.0.2)
     dev: true
 
-  /@storybook/addon-actions@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-wYH1rDHY4KzLkNeXiMonrAZ4uIZFJVjo3E439mWylnJRqs6lKukCU3iHUx02J0KKeJH+GywRg87B/i42qQK62g==}
+  /@storybook/addon-actions@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-IDxBmNnVgLFfQ407MxOUJmqjz0hgiZB9syi4sfp7BKp5MIPUDT1m+z603kGrvx0bk0W0DPqkp/H8ySEGEx0x6g==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4735,14 +4683,14 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       dequal: 2.0.3
       lodash: 4.17.21
       polished: 4.2.2
@@ -4755,8 +4703,8 @@ packages:
       uuid: 9.0.0
     dev: true
 
-  /@storybook/addon-backgrounds@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-dTifOZQsldBCu5de9p6ucNTh1AwjnbTfy4jj593zUAjnDHaGHvWTSlpvksdYuQ2ru+SdZd6xwGcrk4wyMIo/6g==}
+  /@storybook/addon-backgrounds@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-6YAjF01R/qFxeZc1B5cSxseaGXJzikMPPExSZaKkD0eW3max5Kpk+qb7rOX95m3jP2WD/0zfX6lEQUCbmDcxlg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4766,22 +4714,22 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-controls@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-EDYidCent5P8GBiJeeHIi/apGS76icFEFLmGcSZod1Smzdt7546bb61ozf1fz3qe2wJRoVCnmRazCo4Zqc4iWA==}
+  /@storybook/addon-controls@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-qi7fxUSovTLFWeejZLagMV+4SedL0DIhZrufuQCnEeO1gbTJJPaL/KLZnilFlI3SgspkzGehhGDR6SVkDuwnZg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4791,92 +4739,93 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/blocks': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.21
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.21
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/blocks': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-common': 7.1.1
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/node-logger': 7.1.1
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       lodash: 4.17.21
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-docs@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-eJxNCMZLN9QHmpEMPoWKw8m6TqL+R38F7fRYuJAAB9VICF8nBn79QD46yKlSxL6UXGyhFmtuQn/Wf3E3a7ywEw==}
+  /@storybook/addon-docs@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-KfsrqvR6RA0qyCwBpJjeivu/+F+n3jcMMKkBtI56E/pyQCx4+pMTJXJ2l5gJibNWYoR1CVlS9f5n5ZNGz8BzeQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/plugin-transform-react-jsx': 7.20.7(@babel/core@7.21.8)
       '@jest/transform': 29.5.0
       '@mdx-js/react': 2.3.0(react@17.0.2)
-      '@storybook/blocks': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/csf-plugin': 7.0.21
-      '@storybook/csf-tools': 7.0.21
+      '@storybook/blocks': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/csf-plugin': 7.1.1
+      '@storybook/csf-tools': 7.1.1
       '@storybook/global': 5.0.0
       '@storybook/mdx2-csf': 1.0.0
-      '@storybook/node-logger': 7.0.21
-      '@storybook/postinstall': 7.0.21
-      '@storybook/preview-api': 7.0.21
-      '@storybook/react-dom-shim': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
-      fs-extra: 11.1.0
+      '@storybook/node-logger': 7.1.1
+      '@storybook/postinstall': 7.1.1
+      '@storybook/preview-api': 7.1.1
+      '@storybook/react-dom-shim': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
+      fs-extra: 11.1.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-essentials@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-XWPuYpvV30Jp/L/now+yGh7qmx433bvUdKZak8Mg/6U7s84xhWIncAyXoB4ptDE4MlggRAdTEqvkmCybHvY7uw==}
+  /@storybook/addon-essentials@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-eCty+Q7zBjkBbaJ0HaM/UaXxJ+77uKBtEc9g+hLZFqga50auPCfCcqjnqNnxkTmewkJomx3N91BJUJJzVPUlJA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/addon-actions': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-backgrounds': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-controls': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-docs': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-highlight': 7.0.21
-      '@storybook/addon-measure': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-outline': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-toolbars': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/addon-viewport': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.21
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.21
-      '@storybook/preview-api': 7.0.21
+      '@storybook/addon-actions': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-backgrounds': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-controls': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-docs': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-highlight': 7.1.1
+      '@storybook/addon-measure': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-outline': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-toolbars': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/addon-viewport': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-common': 7.1.1
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/node-logger': 7.1.1
+      '@storybook/preview-api': 7.1.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/addon-highlight@7.0.21:
-    resolution: {integrity: sha512-BMMkqLza05VeQl4+U7Gb9GrYm0BnLCU0WzcpPXlqbAZhRw1KliXyofH8buVzXoJ1Ozr9+sOHgc3ujThOrG3KAQ==}
+  /@storybook/addon-highlight@7.1.1:
+    resolution: {integrity: sha512-iOLzcv4JK2R2EBcbeDLB5uuYaW96M9Vh+ZrkpKEJvHwrQzzvBo3kJ7bP/AArAEXtR5MN1al3x7mnvRofu3OIdQ==}
     dependencies:
-      '@storybook/core-events': 7.0.21
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.0.21
+      '@storybook/preview-api': 7.1.1
     dev: true
 
-  /@storybook/addon-links@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-QqbjnYn+516rMfb5JNhI5RZoa+uh1gVMN0iNKfcgF9tE4Ts7tY0OIody11bhBZksb6ryv4mIe4jIGUMW3DgcgA==}
+  /@storybook/addon-links@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-cdc2OQj1LZkEd2dlaAc3Fp4TAHwLmnHKko/Aet3Dhm6TqH/C6UsSflZJbLXmV06x2f/Tm5UK0QQxPHBmOE7aXw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4886,22 +4835,22 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/core-events': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/core-events': 7.1.1
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/router': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/router': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       prop-types: 15.8.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/addon-measure@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-In31QpV810NgHT9wrIXnLOwTnySvm86D1rksDlTunq4EOnE3Q4ngw+oM6JBPn+UhMOHnZGfwBHxOCOsF5DNHtQ==}
+  /@storybook/addon-measure@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-LKJ9vN0qdFVeqjPeF44R2issR0UMAuL2LzbZNxAfeNX9SxdV7qONBOt8OZNKkmm7mJ+jBZsR9Ok68PCOsXA7Xw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4911,19 +4860,20 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/types': 7.1.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
+      tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/addon-outline@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-2NaIixgLjEvGRinLPw7R4VWfZURuce4acpkhjF3QYLqaWCYzxch4nw50fVu2FAPHB3uYh5tjllG9IyMY9PEClQ==}
+  /@storybook/addon-outline@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-zdgOA46n61o/rqvnAn1OxAczl/C99D64e+6EoK8t+Xf9fvykPQCgfBUAPq19qEAaBG4RoPpTvGSJXH2nFqJZDw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4933,13 +4883,13 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/types': 7.1.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       ts-dedent: 2.2.0
@@ -4958,51 +4908,61 @@ packages:
       - webpack
     dev: true
 
-  /@storybook/addon-styling@1.3.0(less@4.1.3)(postcss@8.4.21)(react-dom@18.2.0)(react@17.0.2)(sass@1.63.4)(webpack@5.75.0):
-    resolution: {integrity: sha512-+Ak9+SysMepRdXGlqDBlhR4cOSDCFEIfGuOW7nyA5eOgHi0IyTg9M+yfBgHVru7dEh+rq47XTVr44UhsWd4xgA==}
+  /@storybook/addon-styling@1.3.4(less@4.1.3)(postcss@8.4.27)(react-dom@18.2.0)(react@17.0.2)(sass@1.64.1)(webpack@5.75.0):
+    resolution: {integrity: sha512-JWZ5X9IEcqB5vr6nAgutIYBLT6SlRGfK/Z7kRaWIdvU7VDA0CQl8G1vA0nuKCERvZl9QPelv3CA+7D0H9G8uTA==}
+    hasBin: true
     peerDependencies:
+      less: ^3.5.0 || ^4.0.0
+      postcss: ^7.0.0 || ^8.0.1
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      webpack: ^5.0.0
     peerDependenciesMeta:
+      less:
+        optional: true
+      postcss:
+        optional: true
       react:
         optional: true
       react-dom:
         optional: true
+      webpack:
+        optional: true
     dependencies:
       '@babel/template': 7.20.7
       '@babel/types': 7.21.5
       '@storybook/api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-common': 7.0.21
-      '@storybook/core-events': 7.0.21
-      '@storybook/csf-tools': 7.0.21
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/node-logger': 7.0.21
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-common': 7.1.1
+      '@storybook/core-events': 7.1.1
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/node-logger': 7.1.1
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       css-loader: 6.7.3(webpack@5.75.0)
+      less: 4.1.3
       less-loader: 11.1.3(less@4.1.3)(webpack@5.75.0)
-      postcss-loader: 7.3.3(postcss@8.4.21)(webpack@5.75.0)
+      postcss: 8.4.27
+      postcss-loader: 7.3.3(postcss@8.4.27)(webpack@5.75.0)
+      prettier: 3.0.0
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
-      recast: 0.23.3
       resolve-url-loader: 5.0.0
-      sass-loader: 13.3.2(sass@1.63.4)(webpack@5.75.0)
+      sass-loader: 13.3.2(sass@1.64.1)(webpack@5.75.0)
       style-loader: 3.3.3(webpack@5.75.0)
+      webpack: 5.75.0(esbuild@0.18.17)
     transitivePeerDependencies:
+      - encoding
       - fibers
-      - less
       - node-sass
-      - postcss
       - sass
       - sass-embedded
       - supports-color
-      - webpack
     dev: true
 
-  /@storybook/addon-toolbars@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-5Fgv1gxSVALvRG7bwm+laLT87Np2BBniPaDzJArItic80LivX5N9/duJ2CO6fjZMu4IVq80F4ESj/LfWTbPJVw==}
+  /@storybook/addon-toolbars@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-tHMv1a8hg0kmxwtKf31BZ2Z1ULnxRF/TEoDLJKVvTthhcWLQm0LmqVIG82/bnuWn4vlDrsdGT7sAN+TU7B8p0A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5012,17 +4972,17 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
-  /@storybook/addon-viewport@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-OYi5+cB7Fk4ArUpQRK6WrbkaGC1tdSDr8gJkh6Uq7DyCnkQSb01WxEoBMHAgUtVZG26SCquk+Q50LntUmepb9Q==}
+  /@storybook/addon-viewport@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-OAb3+NSQF0zAVdKhZwW0YOC/VMCXDncXp51ufxaz/LkF3qOGuqfmHTOfDDwjx3P6d3kX1aWV+vLVuoRS0JRK5g==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5032,13 +4992,13 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
       memoizerific: 1.11.3
       prop-types: 15.8.1
       react: 17.0.2
@@ -5106,23 +5066,6 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/api@7.0.7(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-0++LcK6PX1Z2HsI9fyZyqvmeFrB5NDMcsbmIvJfA2NfK92UW8y7t6Ft2fq/2jUCJcWT8Jp3xpatUvYb28irfwg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-    dependencies:
-      '@storybook/client-logger': 7.0.7
-      '@storybook/manager-api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
   /@storybook/api@7.1.1(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-beZ9NbGOkFqPBVnZLE67Q5b7hBKwm+OINbeN9DC5v8jrJmU/seLFs/itKzW2tEUFadyMjhJv+kcpyPjxK77m4g==}
     peerDependencies:
@@ -5140,23 +5083,23 @@ packages:
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
-  /@storybook/blocks@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-afyr5qR2uO2gsJEXlzXPhOhMg0tAkUga5WbHQYF+7BxODYRXyXWhx95E1UHulgwTwgZHdzTrON4DmPH8M7NK0A==}
+  /@storybook/blocks@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-YIpIJi/+sByZhKrpKbVmXazUP1hj/QXybVOzwz2PT6tphfhrubGLBgu3RJIp6hwJ/lWf9RfghR7P8n+7aN6U9w==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/channels': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/channels': 7.1.1
+      '@storybook/client-logger': 7.1.1
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/csf': 0.1.0
-      '@storybook/docs-tools': 7.0.21
+      '@storybook/docs-tools': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/preview-api': 7.0.21
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/manager-api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/preview-api': 7.1.1
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       '@types/lodash': 4.14.195
       color-convert: 2.0.1
       dequal: 2.0.3
@@ -5168,37 +5111,40 @@ packages:
       react-colorful: 5.6.1(react-dom@18.2.0)(react@17.0.2)
       react-dom: 18.2.0(react@17.0.2)
       telejson: 7.0.4
+      tocbot: 4.21.0
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/builder-manager@7.0.21:
-    resolution: {integrity: sha512-end2biIWtnDLd2JHGphxjNApfjzc76VMU6unhY1LnIi+uDNCbu+KcHcsaz8LHSLpTX4td5+AEuJNqSUOyaNtsQ==}
+  /@storybook/builder-manager@7.1.1:
+    resolution: {integrity: sha512-vocO/JjrXPOnkFnwCV2NqKxbTfyYD2qV8PGH8EFNw2+I13GNbZ5CphEZMhI7HmKm0aIYPKdZKbN4KNWkwOxyAQ==}
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 7.0.21
-      '@storybook/manager': 7.0.21
-      '@storybook/node-logger': 7.0.21
+      '@storybook/core-common': 7.1.1
+      '@storybook/manager': 7.1.1
+      '@storybook/node-logger': 7.1.1
       '@types/ejs': 3.1.1
       '@types/find-cache-dir': 3.2.1
-      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.17.18)
+      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.18.17)
       browser-assert: 1.2.1
       ejs: 3.1.8
-      esbuild: 0.17.18
+      esbuild: 0.18.17
       esbuild-plugin-alias: 0.2.1
       express: 4.18.2
       find-cache-dir: 3.3.2
-      fs-extra: 11.1.0
+      fs-extra: 11.1.1
       process: 0.11.10
       util: 0.12.5
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/builder-vite@7.0.21(typescript@5.1.3)(vite@4.0.4):
-    resolution: {integrity: sha512-Zves9giQs6oxsQeGKdmwlaywQaz9ZZqArgOzgYb8WytoDSlVrK81BzZN+gsm6cdxPOzdjOma2KhWi5YTz/d/Zg==}
+  /@storybook/builder-vite@7.1.1(typescript@5.1.6)(vite@4.4.7):
+    resolution: {integrity: sha512-OIQv8V7r6fqBqAXQT9mqgu1aqP+wlFGDRACyS2iym5y5B3e6fhCOUS/31pBp3vmgNRK6LAfEI0FXI71aOp82MQ==}
     peerDependencies:
       '@preact/preset-vite': '*'
       typescript: '>= 4.3.x'
@@ -5212,43 +5158,32 @@ packages:
       vite-plugin-glimmerx:
         optional: true
     dependencies:
-      '@storybook/channel-postmessage': 7.0.21
-      '@storybook/channel-websocket': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/core-common': 7.0.21
-      '@storybook/csf-plugin': 7.0.21
+      '@storybook/channels': 7.1.1
+      '@storybook/client-logger': 7.1.1
+      '@storybook/core-common': 7.1.1
+      '@storybook/csf-plugin': 7.1.1
       '@storybook/mdx2-csf': 1.0.0
-      '@storybook/node-logger': 7.0.21
-      '@storybook/preview': 7.0.21
-      '@storybook/preview-api': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/node-logger': 7.1.1
+      '@storybook/preview': 7.1.1
+      '@storybook/preview-api': 7.1.1
+      '@storybook/types': 7.1.1
+      '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 0.9.3
       express: 4.18.2
-      fs-extra: 11.1.0
-      glob: 8.1.0
-      glob-promise: 6.0.2(glob@8.1.0)
-      magic-string: 0.27.0
+      find-cache-dir: 3.3.2
+      fs-extra: 11.1.1
+      magic-string: 0.30.1
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
-      rollup: 3.10.0
-      typescript: 5.1.3
-      vite: 4.0.4(less@4.1.3)(sass@1.63.4)
+      rollup: 3.26.3
+      typescript: 5.1.6
+      vite: 4.4.7(less@4.1.3)(sass@1.64.1)
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/channel-postmessage@7.0.21:
-    resolution: {integrity: sha512-zlm40ZMhi76gVPMJsOLyorcKQy4RpAoVQfdXne83x+xP/A2ppOyXEAhC9pQ5oaKM+ag3EQuIS+yK4zGIeriaYg==}
-    dependencies:
-      '@storybook/channels': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/core-events': 7.0.21
-      '@storybook/global': 5.0.0
-      qs: 6.11.0
-      telejson: 7.0.4
-    dev: true
-
   /@storybook/channel-postmessage@7.0.7:
     resolution: {integrity: sha512-XMtYfcaE0UoY/V7K1cTu9PcWETD4iyWb/Yswc4F9VrPw0Ui4UwGS1j4iaAu8DC06yyoJs4XvxYFBMlCQmKja6A==}
     dependencies:
@@ -5260,13 +5195,11 @@ packages:
       telejson: 7.0.4
     dev: true
 
-  /@storybook/channel-websocket@7.0.21:
-    resolution: {integrity: sha512-YX0h1CAHFNh4i0CsbIwEAMQsHxHhZXgN5SD5I0QGgqttErN4an90k4aah9MNnkyLO8Af9nFp2wL8Nj/yPmJ5bA==}
+  /@storybook/channel-postmessage@7.1.1:
+    resolution: {integrity: sha512-Gmjh3feilXKLmZkQdjgkT8BRrfHnrBJJ8CY86MwD4wQlohObeFIXfhueRof4vJEGvIfJwooUrk9CkkXb5YbluQ==}
     dependencies:
-      '@storybook/channels': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/global': 5.0.0
-      telejson: 7.0.4
+      '@storybook/channels': 7.1.1
+      '@storybook/client-logger': 7.1.1
     dev: true
 
   /@storybook/channels@6.5.15:
@@ -5277,10 +5210,6 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/channels@7.0.21:
-    resolution: {integrity: sha512-8h4lvGQsdWrn/eLW9D9ZGB8FGTzRuC1almykVThb9SkATKZjUyUvtRT+BklsDIinptham83+0QiSdTrv52kAfA==}
-    dev: true
-
   /@storybook/channels@7.0.7:
     resolution: {integrity: sha512-Om4ovBLNw8pVrBu83MpOKgAuGO9Dpr1Coh2qp8t64WRPkejX1mxOY9IgH723//zH3igx8LCkf9rvBvcrsyaScQ==}
     dev: true
@@ -5296,22 +5225,24 @@ packages:
       tiny-invariant: 1.3.1
     dev: true
 
-  /@storybook/cli@7.0.21:
-    resolution: {integrity: sha512-emLFo3CUKFvJJscuJZPTHDPqw7xfV06DAnTH2HskQQN6lhscWYuY+fK804iyk+FTRYZwaHJSyECYmYm06Q1H9w==}
+  /@storybook/cli@7.1.1:
+    resolution: {integrity: sha512-xQU0GBIRQpwlvTnzOvDo05H5aH660DaZ9JlXd8ThPkEicoTvhkH0oQVEMYaWKChp5Ok7Wu8+kB7fzgUSOGzj+Q==}
     hasBin: true
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
+      '@babel/types': 7.22.5
       '@ndelangen/get-tarball': 3.0.7
-      '@storybook/codemod': 7.0.21
-      '@storybook/core-common': 7.0.21
-      '@storybook/core-server': 7.0.21
-      '@storybook/csf-tools': 7.0.21
-      '@storybook/node-logger': 7.0.21
-      '@storybook/telemetry': 7.0.21
-      '@storybook/types': 7.0.21
-      '@types/semver': 7.3.13
-      boxen: 5.1.2
+      '@storybook/codemod': 7.1.1
+      '@storybook/core-common': 7.1.1
+      '@storybook/core-server': 7.1.1
+      '@storybook/csf-tools': 7.1.1
+      '@storybook/node-logger': 7.1.1
+      '@storybook/telemetry': 7.1.1
+      '@storybook/types': 7.1.1
+      '@types/semver': 7.5.0
+      '@yarnpkg/fslib': 2.10.3
+      '@yarnpkg/libzip': 2.3.0
       chalk: 4.1.2
       commander: 6.2.1
       cross-spawn: 7.0.3
@@ -5320,20 +5251,19 @@ packages:
       execa: 5.1.1
       express: 4.18.2
       find-up: 5.0.0
-      fs-extra: 11.1.0
+      fs-extra: 11.1.1
       get-npm-tarball-url: 2.0.3
       get-port: 5.1.1
       giget: 1.0.0
       globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.21.5)
+      jscodeshift: 0.14.0(@babel/preset-env@7.22.9)
       leven: 3.1.0
       ora: 5.4.1
-      prettier: 2.8.3
+      prettier: 3.0.0
       prompts: 2.4.2
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
       semver: 7.5.4
-      shelljs: 0.8.5
       simple-update-notifier: 1.0.7
       strip-json-comments: 3.1.1
       tempy: 1.0.1
@@ -5353,12 +5283,6 @@ packages:
       global: 4.4.0
     dev: true
 
-  /@storybook/client-logger@7.0.21:
-    resolution: {integrity: sha512-ENoBDuVr3RPepm6cBp61GGtGGUuogBzqMUaN4Rti+wYx9sKJlmDA8SR/fMk+GxeiJ5NOnYoa1Q1kCaF8/VFD9A==}
-    dependencies:
-      '@storybook/global': 5.0.0
-    dev: true
-
   /@storybook/client-logger@7.0.7:
     resolution: {integrity: sha512-EclHjDs5HwHMKB4X2orn/KKA0DTIDmp4AXAUJGRfxb5ArpKEb7tXLHsgrRBlaoz1j5LAwKTmEyZOONh9G3etjg==}
     dependencies:
@@ -5371,21 +5295,22 @@ packages:
       '@storybook/global': 5.0.0
     dev: true
 
-  /@storybook/codemod@7.0.21:
-    resolution: {integrity: sha512-0ZGoNLstaELNb+e2njEmtiMv9gDxBIYKz2xei6Mv9HcaEzIVF0TnRE0Y+gIfCEbNAAERiytaHLkl5TAnE3/LrA==}
+  /@storybook/codemod@7.1.1:
+    resolution: {integrity: sha512-QB4MoeFXA4QsX0LuwjHoTVqsX7krRXmqfwSWIQMB8/qsAfyBp/jiG2xWmwa2agKwtlYvZzkvGdCjAOmK4SUSHQ==}
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
-      '@babel/types': 7.21.5
+      '@babel/core': 7.22.9
+      '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
+      '@babel/types': 7.22.5
       '@storybook/csf': 0.1.0
-      '@storybook/csf-tools': 7.0.21
-      '@storybook/node-logger': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/csf-tools': 7.1.1
+      '@storybook/node-logger': 7.1.1
+      '@storybook/types': 7.1.1
+      '@types/cross-spawn': 6.0.2
       cross-spawn: 7.0.3
       globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.21.5)
+      jscodeshift: 0.14.0(@babel/preset-env@7.22.9)
       lodash: 4.17.21
-      prettier: 2.8.3
+      prettier: 3.0.0
       recast: 0.23.3
     transitivePeerDependencies:
       - supports-color
@@ -5409,17 +5334,17 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/components@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-5h3ptaQxSwFetd0dhlNTZeaLfDYY7Mj9n/N6pTs71piW5gaM+o/Na7EMhuDDWa001zBXYdJYdcKU/a7FDQDuGQ==}
+  /@storybook/components@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-RUSjDj2RDTZsdKfs48oY+3iaL/y3GHU07zuHm/V4kuEHqJscXUt3n5vIX/Z/GtezMrxc0aPDlCSyS/N/EU6bUQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/client-logger': 7.0.21
+      '@storybook/client-logger': 7.1.1
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/types': 7.1.1
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
@@ -5427,36 +5352,40 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/core-client@7.0.21:
-    resolution: {integrity: sha512-J3MIJoVCN4M9exC8DVzRqtG6SyINQ0yHXhzjfdCfmHP9OqU7ObywqEFJgMot7By9g/p39Ceqzz6ISbMySw+pmg==}
+  /@storybook/core-client@7.1.1:
+    resolution: {integrity: sha512-yFd617XKFS+Q5IFmItXR+DdMfpreHHcdy3f67dt8PLnnjNcGMpi7gEcp8t9yBAT+pIgnqSfE/FNUFTg0OEpRpw==}
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/preview-api': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/preview-api': 7.1.1
     dev: true
 
-  /@storybook/core-common@7.0.21:
-    resolution: {integrity: sha512-hxQXufZxbrDqASTfrJ/C4PlIvRwwmdElOrnzeWA4e4pRGK2YUInAsKxN7WKRDL42fBLfrHo3XmdshkvPej4M4A==}
+  /@storybook/core-common@7.1.1:
+    resolution: {integrity: sha512-DO7ZS6YDITykvqMHeOWSmnsPYk2w7gka9GtO2LPbEm0f6p5kG2nohBO5+nsI3PuXpKiHXOB7vKJjwfQqxvPj5A==}
     dependencies:
-      '@storybook/node-logger': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/node-logger': 7.1.1
+      '@storybook/types': 7.1.1
+      '@types/find-cache-dir': 3.2.1
       '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
       '@types/pretty-hrtime': 1.0.1
       chalk: 4.1.2
-      esbuild: 0.17.18
-      esbuild-register: 3.4.2(esbuild@0.17.18)
-      file-system-cache: 2.0.2
+      esbuild: 0.18.17
+      esbuild-register: 3.4.2(esbuild@0.18.17)
+      file-system-cache: 2.3.0
+      find-cache-dir: 3.3.2
       find-up: 5.0.0
-      fs-extra: 11.1.0
-      glob: 8.1.0
-      glob-promise: 6.0.2(glob@8.1.0)
+      fs-extra: 11.1.1
+      glob: 10.3.3
       handlebars: 4.7.7
       lazy-universal-dotenv: 4.0.0
+      node-fetch: 2.6.8
       picomatch: 2.3.1
       pkg-dir: 5.0.0
       pretty-hrtime: 1.0.3
       resolve-from: 5.0.0
       ts-dedent: 2.2.0
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
@@ -5466,10 +5395,6 @@ packages:
       core-js: 3.31.0
     dev: true
 
-  /@storybook/core-events@7.0.21:
-    resolution: {integrity: sha512-Qjtjrj+hFaC3b00p6q2aAxyLaRQWBf5eEPw5r0djcm5esXIs/q2xvu2xby7PR6KnKg/jT1bU9TOBxWbtKycijQ==}
-    dev: true
-
   /@storybook/core-events@7.0.7:
     resolution: {integrity: sha512-XNsR2RgaL2vBwuqsu+KA1DzGmB1UFfrAhpxhmyWTKDCniwtTLlaXgfKbqwcrOrPu/o1YswgIup/9UHepRHaf4A==}
     dev: true
@@ -5478,40 +5403,38 @@ packages:
     resolution: {integrity: sha512-P5iI4zvCJo85de/sghglEHFK/GGkWAQQKzRFrz9kbVBX5LNaosfD7IYHIz/6ZWNPzxWR+RBOKcrRUfcArL4Njg==}
     dev: true
 
-  /@storybook/core-server@7.0.21:
-    resolution: {integrity: sha512-8MX+tdgiwscQLdoTtlI+jg1Hr76AvE1B5CDYr+L5b/GdiEJa6zJjAtMgrGjCmd+9GYMrV6r6Ef2PuB8GlMvnvQ==}
+  /@storybook/core-server@7.1.1:
+    resolution: {integrity: sha512-IfrkdcYwVoP4bltBTx8Yr1e++UAfICV8IYCgW8VFW26Uvl22biCVWwliE35iTYpUmHJgn+U489hCnEdGpr2CWw==}
     dependencies:
-      '@aw-web-design/x-default-browser': 1.4.88
+      '@aw-web-design/x-default-browser': 1.4.126
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 7.0.21
-      '@storybook/core-common': 7.0.21
-      '@storybook/core-events': 7.0.21
+      '@storybook/builder-manager': 7.1.1
+      '@storybook/channels': 7.1.1
+      '@storybook/core-common': 7.1.1
+      '@storybook/core-events': 7.1.1
       '@storybook/csf': 0.1.0
-      '@storybook/csf-tools': 7.0.21
+      '@storybook/csf-tools': 7.1.1
       '@storybook/docs-mdx': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 7.0.21
-      '@storybook/node-logger': 7.0.21
-      '@storybook/preview-api': 7.0.21
-      '@storybook/telemetry': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/manager': 7.1.1
+      '@storybook/node-logger': 7.1.1
+      '@storybook/preview-api': 7.1.1
+      '@storybook/telemetry': 7.1.1
+      '@storybook/types': 7.1.1
       '@types/detect-port': 1.3.2
       '@types/node': 18.16.16
-      '@types/node-fetch': 2.6.2
       '@types/pretty-hrtime': 1.0.1
-      '@types/semver': 7.3.13
-      better-opn: 2.1.1
-      boxen: 5.1.2
+      '@types/semver': 7.5.0
+      better-opn: 3.0.2
       chalk: 4.1.2
       cli-table3: 0.6.3
       compression: 1.7.4
       detect-port: 1.5.1
       express: 4.18.2
-      fs-extra: 11.1.0
+      fs-extra: 11.1.1
       globby: 11.1.0
       ip: 2.0.0
       lodash: 4.17.21
-      node-fetch: 2.6.8
       open: 8.4.0
       pretty-hrtime: 1.0.3
       prompts: 2.4.2
@@ -5519,7 +5442,9 @@ packages:
       semver: 7.5.4
       serve-favicon: 2.5.0
       telejson: 7.0.4
+      tiny-invariant: 1.3.1
       ts-dedent: 2.2.0
+      util: 0.12.5
       util-deprecate: 1.0.2
       watchpack: 2.4.0
       ws: 8.12.0
@@ -5530,25 +5455,25 @@ packages:
       - utf-8-validate
     dev: true
 
-  /@storybook/csf-plugin@7.0.21:
-    resolution: {integrity: sha512-oaCgizetktTzxgJlJURA3RLQSDYAECw80XGbcUdruCMVgU1WrMrMJIdiYLqDDPUWSAZuFp4RsmfRjWTK6WxRUA==}
+  /@storybook/csf-plugin@7.1.1:
+    resolution: {integrity: sha512-bokV+HU6rV/wlWIvgAtn1PUot1W71pto/Wft5hCUATDCsXDz4B5aI9d/ZCJhu7G1R4cYtjsxVdBJSHe9dem7Lg==}
     dependencies:
-      '@storybook/csf-tools': 7.0.21
-      unplugin: 0.10.2
+      '@storybook/csf-tools': 7.1.1
+      unplugin: 1.4.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@storybook/csf-tools@7.0.21:
-    resolution: {integrity: sha512-a3oN29dgf+5pLOTtXyZhfzPhTEPvw44GAoQmi5giUMB486j6PSEq9IPj/birJk9+lX/ho6M9ZzI9QiBMXVeXlQ==}
+  /@storybook/csf-tools@7.1.1:
+    resolution: {integrity: sha512-IdDW+NsTIxqv7BjeFaTonvX0Ac5HzzNiKvGkhydXrpaz7kJX4g0T96xpR+RhbEtPfQ0AcpiHnW0kMPx9YLJRew==}
     dependencies:
-      '@babel/generator': 7.21.5
-      '@babel/parser': 7.21.8
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
+      '@babel/generator': 7.22.9
+      '@babel/parser': 7.22.7
+      '@babel/traverse': 7.22.8
+      '@babel/types': 7.22.5
       '@storybook/csf': 0.1.0
-      '@storybook/types': 7.0.21
-      fs-extra: 11.1.0
+      '@storybook/types': 7.1.1
+      fs-extra: 11.1.1
       recast: 0.23.3
       ts-dedent: 2.2.0
     transitivePeerDependencies:
@@ -5571,49 +5496,24 @@ packages:
     resolution: {integrity: sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==}
     dev: true
 
-  /@storybook/docs-tools@7.0.21:
-    resolution: {integrity: sha512-V2rgkmLdcariZQEx2VFtmFhQRRj7LyvlrRZjNyL5jMyWYXYG1W/LZhIXgnMOhf0gjkJlCnRAF4LBZVK8dN84BA==}
+  /@storybook/docs-tools@7.1.1:
+    resolution: {integrity: sha512-noDgogRHum1FuqgXBdlv2+wOdkIJOJqSUSi0ZGiuP1OEOdA9YdbCfbWn/z734UEmhwraoQSXYb2tvrIEjfzYSw==}
     dependencies:
-      '@babel/core': 7.21.8
-      '@storybook/core-common': 7.0.21
-      '@storybook/preview-api': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/core-common': 7.1.1
+      '@storybook/preview-api': 7.1.1
+      '@storybook/types': 7.1.1
       '@types/doctrine': 0.0.3
       doctrine: 3.0.0
       lodash: 4.17.21
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
-  /@storybook/global@5.0.0:
-    resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
-    dev: true
-
-  /@storybook/manager-api@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-YgS676/OMq2KmvYomcNzjwsVUtMYUylIt/0z5Fmg7exPXubEGpRd4OZIrQGHgcLKQRKZMK9GcsSkxebHO+qrsg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/channels': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/core-events': 7.0.21
-      '@storybook/csf': 0.1.0
-      '@storybook/global': 5.0.0
-      '@storybook/router': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/types': 7.0.21
-      dequal: 2.0.3
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-      semver: 7.5.4
-      store2: 2.14.2
-      telejson: 7.0.4
-      ts-dedent: 2.2.0
-    dev: true
-
+  /@storybook/global@5.0.0:
+    resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
+    dev: true
+
   /@storybook/manager-api@7.0.7(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-QTd/P72peAhofKqK+8yzIO9iWAEfPn8WUGGveV2KGaTlSlgbr87RLHEKilcXMZcYhBWC9izFRmjKum9ROdskrQ==}
     peerDependencies:
@@ -5664,8 +5564,8 @@ packages:
       ts-dedent: 2.2.0
     dev: true
 
-  /@storybook/manager@7.0.21:
-    resolution: {integrity: sha512-8aOADfVHgejcpJ3cvt92Z3VknaYslH/1LmarOGpcocN7UtXGUuRnkbpHbx7dLYR586hWSXJ7jZmHAQseS+etvw==}
+  /@storybook/manager@7.1.1:
+    resolution: {integrity: sha512-kRW9sPuJWsEi8Swcyt9rYwdfvA0rqKEuPBCCbrmmjyIwZR60IYg2KHXcF7q4qdkvts2xee5YTbgHcdfc0iIPSg==}
     dev: true
 
   /@storybook/mdx2-csf@1.0.0:
@@ -5682,29 +5582,24 @@ packages:
       pretty-hrtime: 1.0.3
     dev: true
 
-  /@storybook/node-logger@7.0.21:
-    resolution: {integrity: sha512-km7MfQ7Hk04UsH/ZgwW5iqSxlGi/Z/lw8Mb0Zdv7ms+FllPBPf5BhgjuC7LA6y+3WUghl6ESpDoig2771TNy4w==}
-    dependencies:
-      '@types/npmlog': 4.1.4
-      chalk: 4.1.2
-      npmlog: 5.0.1
-      pretty-hrtime: 1.0.3
+  /@storybook/node-logger@7.1.1:
+    resolution: {integrity: sha512-gnAuNM+wNoOcGnUM6hLsYV0lwUgRI39Ep/Pp3VF1oXZAthEyrQRm7ImbeAdt93ObPc9DZgqTx9OI8QnErZuJiA==}
     dev: true
 
-  /@storybook/postinstall@7.0.21:
-    resolution: {integrity: sha512-eSq+24DQpa58Dw+TlV4KCNbWnyjTAZ7hvBYRs8578qAMB0gsPh6MCPAKcrpN9TTNBMWKQxC5W6QGGVsVJ+8ByQ==}
+  /@storybook/postinstall@7.1.1:
+    resolution: {integrity: sha512-qpe6BiFLVs9YYFQVGgRT0dJxPOKBtGLIAsnVEpXKUPrltEWQpTxQEqqOSJlut+FLoWB5MTxrwiJ/7891h4a5pw==}
     dev: true
 
-  /@storybook/preview-api@7.0.21:
-    resolution: {integrity: sha512-IvOxQdSLV3B+82zS8MDHSO/pMEQdKIXJaz3knizhRuuB+cCdfv2Sro3IL3l8m2+90ySSwkfCqVEI4tdIC1ODXg==}
+  /@storybook/preview-api@7.0.7:
+    resolution: {integrity: sha512-R5pmGTodpu6hbwEg2RM2ulWtW3d426YzsisHrZJ+FT9lecWauN1y9xHCz7HdNzEFhT8r4YOa24L9ZS3mosZ7hA==}
     dependencies:
-      '@storybook/channel-postmessage': 7.0.21
-      '@storybook/channels': 7.0.21
-      '@storybook/client-logger': 7.0.21
-      '@storybook/core-events': 7.0.21
+      '@storybook/channel-postmessage': 7.0.7
+      '@storybook/channels': 7.0.7
+      '@storybook/client-logger': 7.0.7
+      '@storybook/core-events': 7.0.7
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.0.21
+      '@storybook/types': 7.0.7
       '@types/qs': 6.9.7
       dequal: 2.0.3
       lodash: 4.17.21
@@ -5715,16 +5610,16 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview-api@7.0.7:
-    resolution: {integrity: sha512-R5pmGTodpu6hbwEg2RM2ulWtW3d426YzsisHrZJ+FT9lecWauN1y9xHCz7HdNzEFhT8r4YOa24L9ZS3mosZ7hA==}
+  /@storybook/preview-api@7.1.1:
+    resolution: {integrity: sha512-uI8TVuoFfg3EBdaKdRVUa17JfGdmK78JI3+byLZLkzl6nR+q846BWHgi8eJmU8MHmO5CFaqT2kts/e8T34JDgw==}
     dependencies:
-      '@storybook/channel-postmessage': 7.0.7
-      '@storybook/channels': 7.0.7
-      '@storybook/client-logger': 7.0.7
-      '@storybook/core-events': 7.0.7
+      '@storybook/channel-postmessage': 7.1.1
+      '@storybook/channels': 7.1.1
+      '@storybook/client-logger': 7.1.1
+      '@storybook/core-events': 7.1.1
       '@storybook/csf': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.0.7
+      '@storybook/types': 7.1.1
       '@types/qs': 6.9.7
       dequal: 2.0.3
       lodash: 4.17.21
@@ -5735,12 +5630,12 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/preview@7.0.21:
-    resolution: {integrity: sha512-WHAD0dlwlJGGTEJ2Lv2rbO9KGBbs4P9uy0oofCuVT+W/eKy26Y6cglnBZpT/lSvK3lNJWONtGRWwBqgdb2E9OQ==}
+  /@storybook/preview@7.1.1:
+    resolution: {integrity: sha512-F3ikRKzwmT9MlptYXxYOQmaSwmJckPag0k9lM0LvI0xYplLbyWJ5rfs2gLKl++wX+ag2A+1K4gId5Xaz4SKnxQ==}
     dev: true
 
-  /@storybook/react-dom-shim@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-hccpaFWZjZjD5F/hBXU59RdaF2pnN3hvygIAY7P8cIRu9lfhMZWpZyuEJBjHUqHSX+6CoNLzpSQHeVv+6Vo0rg==}
+  /@storybook/react-dom-shim@7.1.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-yfc0tCtg+OEfvOKwCF0+E0ot8XGpubMTpbfChahhzEYyI9zz1rA7OCwRzERMnX/C7TYW3aLab9f5MzWIKQClmQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -5764,19 +5659,6 @@ packages:
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/router@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-zVEwW8PPrg3UXaBlVw9s5wXlJhm9AwG0Lta9Oc0limg1JeXtE1alV+VH8b/O5ECjp34mTXHIAyNU1EF0bozgVw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/client-logger': 7.0.21
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
   /@storybook/router@7.0.7(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-/lM8/NHQKeshfnC3ayFuO8Y9TCSHnCAPRhIsVxvanBzcj+ILbCIyZ+TspvB3hT4MbX/Ez+JR8VrMbjXIGwmH8w==}
     peerDependencies:
@@ -5812,17 +5694,16 @@ packages:
       find-up: 4.1.0
     dev: true
 
-  /@storybook/telemetry@7.0.21:
-    resolution: {integrity: sha512-yTT38LhCUuk7DULm88tWGGYWkvPMSfeuRESqSfda7MjHOx2K8VAfpX7HTta9fH9QeE3ormV8KSl/x2R6bNeXeQ==}
+  /@storybook/telemetry@7.1.1:
+    resolution: {integrity: sha512-7bQBfphEHJA1kHyPVVvrRXRet57JhyRD4uxoWYfp4jkSt2wHzAAdGU8Iz7U+ozv4TG7AA1gb1Uh5BS4nCiijsw==}
     dependencies:
-      '@storybook/client-logger': 7.0.21
-      '@storybook/core-common': 7.0.21
+      '@storybook/client-logger': 7.1.1
+      '@storybook/core-common': 7.1.1
+      '@storybook/csf-tools': 7.1.1
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.3
-      fs-extra: 11.1.0
-      isomorphic-unfetch: 3.1.0
-      nanoid: 3.3.6
+      fs-extra: 11.1.1
       read-pkg-up: 7.0.1
     transitivePeerDependencies:
       - encoding
@@ -5843,20 +5724,6 @@ packages:
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/theming@7.0.21(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-tgWoT0IdyPQIg+s/JMnP+MGTsAvNm6FJuiuKPebngids6rdYQ3EA5uQjBVV7De650JLhBFTFocS2Puj4Lti2bw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@17.0.2)
-      '@storybook/client-logger': 7.0.21
-      '@storybook/global': 5.0.0
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0(react@17.0.2)
-    dev: true
-
   /@storybook/theming@7.0.7(react-dom@18.2.0)(react@17.0.2):
     resolution: {integrity: sha512-InTZe+Sgco1NsxgiG+cyUKWQe3GsjlIyU/o5qDdtOTXcZ64HzyBuAZlAequSddqfDeMDqxRFPc2w1J28MAUHxA==}
     peerDependencies:
@@ -5885,22 +5752,13 @@ packages:
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
-  /@storybook/types@7.0.21:
-    resolution: {integrity: sha512-gZ8XEsg0upyiisbe2Qv+G+XN2+nZCxj6vJKvgWxuBPCjqN3Uw34cgDrIJuSa8YjE/yl/nsaV5s0xYdFXAl7JVQ==}
-    dependencies:
-      '@storybook/channels': 7.0.21
-      '@types/babel__core': 7.20.0
-      '@types/express': 4.17.14
-      file-system-cache: 2.0.2
-    dev: true
-
   /@storybook/types@7.0.7:
     resolution: {integrity: sha512-v9piuwp8FvTiHXIOOi5lEyTEJKhnbcbhVxgJ3VFhhXYFd0DTz6Bst0XIIgkgs21ITb3xhkfPbCRUueMcbXO1MA==}
     dependencies:
       '@storybook/channels': 7.0.7
       '@types/babel__core': 7.20.0
       '@types/express': 4.17.14
-      file-system-cache: 2.0.2
+      file-system-cache: 2.3.0
     dev: true
 
   /@storybook/types@7.1.1:
@@ -5912,25 +5770,26 @@ packages:
       file-system-cache: 2.3.0
     dev: true
 
-  /@storybook/vue3-vite@7.0.21(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.3)(vite@4.0.4)(vue@3.3.4):
-    resolution: {integrity: sha512-F5pz26uECQmJKS1G6/9jXm4lBv2QZ701nECPVMBtZJDu1Ex0cIFA7xjhLIzTDHP4KPDBE15ZDHxFrMEknRuU8w==}
+  /@storybook/vue3-vite@7.1.1(@vue/compiler-core@3.3.4)(react-dom@18.2.0)(react@17.0.2)(typescript@5.1.6)(vite@4.4.7)(vue@3.3.4):
+    resolution: {integrity: sha512-BHBDbxz8XjXBcVZjeb5JKrS4czNCGJixb2E0cRxM1ZbxrtWozk0ped153PrwJzK73M6y+MynAR5ySchD36MlwA==}
     engines: {node: ^14.18 || >=16}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
       vite: ^3.0.0 || ^4.0.0
     dependencies:
-      '@storybook/builder-vite': 7.0.21(typescript@5.1.3)(vite@4.0.4)
-      '@storybook/core-server': 7.0.21
-      '@storybook/vue3': 7.0.21(vue@3.3.4)
-      '@vitejs/plugin-vue': 4.2.3(vite@4.0.4)(vue@3.3.4)
-      magic-string: 0.27.0
+      '@storybook/builder-vite': 7.1.1(typescript@5.1.6)(vite@4.4.7)
+      '@storybook/core-server': 7.1.1
+      '@storybook/vue3': 7.1.1(@vue/compiler-core@3.3.4)(vue@3.3.4)
+      '@vitejs/plugin-vue': 4.2.3(vite@4.4.7)(vue@3.3.4)
+      magic-string: 0.30.1
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
-      vite: 4.0.4(less@4.1.3)(sass@1.63.4)
+      vite: 4.4.7(less@4.1.3)(sass@1.64.1)
       vue-docgen-api: 4.56.4(vue@3.3.4)
     transitivePeerDependencies:
       - '@preact/preset-vite'
+      - '@vue/compiler-core'
       - bufferutil
       - encoding
       - supports-color
@@ -5940,22 +5799,26 @@ packages:
       - vue
     dev: true
 
-  /@storybook/vue3@7.0.21(vue@3.3.4):
-    resolution: {integrity: sha512-/b89ebjveYC7uFcmncP4y2q2K0g3aBt4DLvVRymgWaI873v9OSjzf4mo9ktuWQAL31o+/r/oaQ/9kC9k1oi2hw==}
+  /@storybook/vue3@7.1.1(@vue/compiler-core@3.3.4)(vue@3.3.4):
+    resolution: {integrity: sha512-Q72N+QQL3a4Ws+vZM79PQZq9TuxbTJgQHH0PhBOEvlAGKdCLUu7CNkLR2OwMYqryePLNTcj0MKJRoE7NUKRswQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
+      '@vue/compiler-core': ^3.0.0
       vue: ^3.0.0
     dependencies:
-      '@storybook/core-client': 7.0.21
-      '@storybook/docs-tools': 7.0.21
+      '@storybook/core-client': 7.1.1
+      '@storybook/docs-tools': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.0.21
-      '@storybook/types': 7.0.21
+      '@storybook/preview-api': 7.1.1
+      '@storybook/types': 7.1.1
+      '@vue/compiler-core': 3.3.4
+      lodash: 4.17.21
       ts-dedent: 2.2.0
-      type-fest: 2.19.0
+      type-fest: 3.13.1
       vue: 3.3.4
-      vue-component-type-helpers: 1.8.6
+      vue-component-type-helpers: 1.8.8
     transitivePeerDependencies:
+      - encoding
       - supports-color
     dev: true
 
@@ -5977,12 +5840,12 @@ packages:
     resolution: {integrity: sha512-d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ==}
     dev: false
 
-  /@testing-library/dom@8.20.1:
-    resolution: {integrity: sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==}
-    engines: {node: '>=12'}
+  /@testing-library/dom@9.3.1:
+    resolution: {integrity: sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==}
+    engines: {node: '>=14'}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@babel/runtime': 7.20.7
+      '@babel/code-frame': 7.22.5
+      '@babel/runtime': 7.22.6
       '@types/aria-query': 5.0.1
       aria-query: 5.1.3
       chalk: 4.1.2
@@ -5991,12 +5854,12 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /@testing-library/jest-dom@5.16.5:
-    resolution: {integrity: sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==}
+  /@testing-library/jest-dom@5.17.0:
+    resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==}
     engines: {node: '>=8', npm: '>=6', yarn: '>=1'}
     dependencies:
       '@adobe/css-tools': 4.0.2
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.22.6
       '@types/testing-library__jest-dom': 5.14.5
       aria-query: 5.1.3
       chalk: 3.0.0
@@ -6006,24 +5869,24 @@ packages:
       redent: 3.0.0
     dev: true
 
-  /@testing-library/user-event@14.4.3(@testing-library/dom@8.20.1):
+  /@testing-library/user-event@14.4.3(@testing-library/dom@9.3.1):
     resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@testing-library/dom': 8.20.1
+      '@testing-library/dom': 9.3.1
     dev: true
 
-  /@testing-library/vue@6.6.1(@vue/compiler-sfc@3.3.4)(vue@3.3.4):
-    resolution: {integrity: sha512-vpyBPrHzKTwEGS7ehUC8/IXgnqTBEMk6jd52Gouf51arG2jUorPhmkbsxUwJOyxz6L0gj2ZcmWnznG1OJcTCDQ==}
-    engines: {node: '>=12'}
+  /@testing-library/vue@7.0.0(@vue/compiler-sfc@3.3.4)(vue@3.3.4):
+    resolution: {integrity: sha512-JU/q93HGo2qdm1dCgWymkeQlfpC0/0/DBZ2nAHgEAsVZxX11xVIxT7gbXdI7HACQpUbsUWt1zABGU075Fzt9XQ==}
+    engines: {node: '>=14'}
     peerDependencies:
       '@vue/compiler-sfc': '>= 3'
       vue: '>= 3'
     dependencies:
-      '@babel/runtime': 7.20.7
-      '@testing-library/dom': 8.20.1
+      '@babel/runtime': 7.22.6
+      '@testing-library/dom': 9.3.1
       '@vue/compiler-sfc': 3.3.4
       '@vue/test-utils': 2.4.1(vue@3.3.4)
       vue: 3.3.4
@@ -6068,8 +5931,8 @@ packages:
   /@types/babel__core@7.20.0:
     resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
     dependencies:
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.2
@@ -6078,20 +5941,20 @@ packages:
   /@types/babel__generator@7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
   /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
     dev: true
 
   /@types/babel__traverse@7.18.2:
     resolution: {integrity: sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
   /@types/basic-auth@1.1.3:
@@ -6131,11 +5994,11 @@ packages:
   /@types/chai-subset@1.3.3:
     resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
     dependencies:
-      '@types/chai': 4.3.4
+      '@types/chai': 4.3.5
     dev: true
 
-  /@types/chai@4.3.4:
-    resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==}
+  /@types/chai@4.3.5:
+    resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==}
     dev: true
 
   /@types/cheerio@0.22.31:
@@ -6191,6 +6054,12 @@ packages:
       moment: 2.29.4
     dev: true
 
+  /@types/cross-spawn@6.0.2:
+    resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
+    dependencies:
+      '@types/node': 18.16.16
+    dev: true
+
   /@types/crypto-js@4.1.1:
     resolution: {integrity: sha512-BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA==}
     dev: true
@@ -6215,6 +6084,10 @@ packages:
     resolution: {integrity: sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==}
     dev: true
 
+  /@types/emscripten@1.39.7:
+    resolution: {integrity: sha512-tLqYV94vuqDrXh515F/FOGtBcRMTPGvVV1LzLbtYDcQmmhtpf/gLYf+hikBbQk8MzOHNz37wpFfJbYAuSn8HqA==}
+    dev: true
+
   /@types/es-aggregate-error@1.0.2:
     resolution: {integrity: sha512-erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA==}
     dependencies:
@@ -6224,12 +6097,12 @@ packages:
   /@types/eslint-scope@3.7.4:
     resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
     dependencies:
-      '@types/eslint': 8.37.0
+      '@types/eslint': 8.44.1
       '@types/estree': 1.0.0
     dev: true
 
-  /@types/eslint@8.37.0:
-    resolution: {integrity: sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==}
+  /@types/eslint@8.44.1:
+    resolution: {integrity: sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==}
     dependencies:
       '@types/estree': 1.0.0
       '@types/json-schema': 7.0.11
@@ -6345,20 +6218,13 @@ packages:
       '@types/istanbul-lib-report': 3.0.0
     dev: true
 
-  /@types/jest@29.2.5:
-    resolution: {integrity: sha512-H2cSxkKgVmqNHXP7TC2L/WUorrZu8ZigyRywfVzv6EyBlxj39n4C00hjXYQWsbwqgElaj/CiAeSRmk5GoaKTgw==}
+  /@types/jest@29.5.3:
+    resolution: {integrity: sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==}
     dependencies:
-      expect: 29.3.1
+      expect: 29.5.0
       pretty-format: 29.5.0
     dev: true
 
-  /@types/jest@29.5.0:
-    resolution: {integrity: sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg==}
-    dependencies:
-      expect: 29.4.2
-      pretty-format: 29.4.2
-    dev: true
-
   /@types/jmespath@0.15.0:
     resolution: {integrity: sha512-uaht4XcYSq5ZrPriQW8C+g5DhptewRd1E84ph7L167sCyzLObz+U3JTpmYq/CNkvjNsz2mtyQoHPNEYQYTzWmg==}
     dev: true
@@ -6381,6 +6247,10 @@ packages:
 
   /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
+    dev: true
+
+  /@types/json-schema@7.0.12:
+    resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
 
   /@types/json5@0.0.29:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
@@ -6480,8 +6350,8 @@ packages:
       '@types/express': 4.17.14
     dev: false
 
-  /@types/node-fetch@2.6.2:
-    resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
+  /@types/node-fetch@2.6.4:
+    resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
     dependencies:
       '@types/node': 18.16.16
       form-data: 3.0.1
@@ -6542,10 +6412,6 @@ packages:
       '@types/express': 4.17.14
     dev: true
 
-  /@types/prettier@2.7.1:
-    resolution: {integrity: sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==}
-    dev: true
-
   /@types/pretty-hrtime@1.0.1:
     resolution: {integrity: sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==}
     dev: true
@@ -6624,6 +6490,10 @@ packages:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
 
+  /@types/semver@7.5.0:
+    resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
+    dev: true
+
   /@types/send@0.17.1:
     resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
     dependencies:
@@ -6727,7 +6597,7 @@ packages:
   /@types/testing-library__jest-dom@5.14.5:
     resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
     dependencies:
-      '@types/jest': 29.2.5
+      '@types/jest': 29.5.3
     dev: true
 
   /@types/through@0.0.30:
@@ -6769,10 +6639,6 @@ packages:
     resolution: {integrity: sha512-jiEw2kTUJ8Jsh4A1K4b5Pkjj9Xz6FktLLOQ36ZVLRkmxFbpTvAV2VRoKMojz8UlZxNg/2dZqzpigH4JYn1bkQg==}
     dev: true
 
-  /@types/vorpal@1.12.2:
-    resolution: {integrity: sha512-y9Ydpp4K9k+gGKFFmpnYNXJxhaq7smglPMcF2wymMaEbPhMS2gHkkD9OMoaqhktJErI+VeHG1ciy1JNz1nhOTQ==}
-    dev: true
-
   /@types/web-bluetooth@0.0.16:
     resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
     dev: false
@@ -6829,8 +6695,8 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin@5.59.0(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-p0QgrEyrxAWBecR56gyn3wkG15TJdI//eetInP3zYRewDh0XS+DhB3VUAd3QqvziFsfaQIoIuZMxZRB7vXYaYw==}
+  /@typescript-eslint/eslint-plugin@5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -6840,53 +6706,55 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@eslint-community/regexpp': 4.5.0
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
-      '@typescript-eslint/scope-manager': 5.59.0
-      '@typescript-eslint/type-utils': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
-      '@typescript-eslint/utils': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
+      '@eslint-community/regexpp': 4.6.2
+      '@typescript-eslint/parser': 5.59.5(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/scope-manager': 5.59.5
+      '@typescript-eslint/type-utils': 5.59.5(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/utils': 5.59.5(eslint@8.45.0)(typescript@5.1.6)
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
+      eslint: 8.45.0
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      tsutils: 3.21.0(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/eslint-plugin@5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/eslint-plugin@6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha
+      eslint: ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@eslint-community/regexpp': 4.5.0
-      '@typescript-eslint/parser': 5.59.5(eslint@8.39.0)(typescript@5.1.3)
-      '@typescript-eslint/scope-manager': 5.59.5
-      '@typescript-eslint/type-utils': 5.59.5(eslint@8.39.0)(typescript@5.1.3)
-      '@typescript-eslint/utils': 5.59.5(eslint@8.39.0)(typescript@5.1.3)
+      '@eslint-community/regexpp': 4.6.2
+      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/scope-manager': 6.2.0
+      '@typescript-eslint/type-utils': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/utils': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/visitor-keys': 6.2.0
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      grapheme-splitter: 1.0.4
+      eslint: 8.45.0
+      graphemer: 1.4.0
       ignore: 5.2.4
+      natural-compare: 1.4.0
       natural-compare-lite: 1.4.0
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      ts-api-utils: 1.0.1(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.59.0(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w==}
+  /@typescript-eslint/parser@5.59.5(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -6895,32 +6763,33 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.59.0
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.1.3)
+      '@typescript-eslint/scope-manager': 5.59.5
+      '@typescript-eslint/types': 5.59.5
+      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.6)
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      typescript: 5.1.3
+      eslint: 8.45.0
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.59.5(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/parser@6.2.0(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-igVYOqtiK/UsvKAmmloQAruAdUHihsOCvplJpplPZ+3h4aDkC/UKZZNKgB6h93ayuYLuEymU3h8nF1xMRbh37g==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      eslint: ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.59.5
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.3)
+      '@typescript-eslint/scope-manager': 6.2.0
+      '@typescript-eslint/types': 6.2.0
+      '@typescript-eslint/typescript-estree': 6.2.0(typescript@5.1.6)
+      '@typescript-eslint/visitor-keys': 6.2.0
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      typescript: 5.1.3
+      eslint: 8.45.0
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6933,14 +6802,6 @@ packages:
       '@typescript-eslint/visitor-keys': 5.45.0
     dev: true
 
-  /@typescript-eslint/scope-manager@5.59.0:
-    resolution: {integrity: sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/visitor-keys': 5.59.0
-    dev: true
-
   /@typescript-eslint/scope-manager@5.59.5:
     resolution: {integrity: sha512-jVecWwnkX6ZgutF+DovbBJirZcAxgxC0EOHYt/niMROf8p4PwxxG32Qdhj/iIQQIuOflLjNkxoXyArkcIP7C3A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -6949,8 +6810,16 @@ packages:
       '@typescript-eslint/visitor-keys': 5.59.5
     dev: true
 
-  /@typescript-eslint/type-utils@5.59.0(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-d/B6VSWnZwu70kcKQSCqjcXpVH+7ABKH8P1KNn4K7j5PXXuycZTPXF44Nui0TEm6rbWGi8kc78xRgOC4n7xFgA==}
+  /@typescript-eslint/scope-manager@6.2.0:
+    resolution: {integrity: sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 6.2.0
+      '@typescript-eslint/visitor-keys': 6.2.0
+    dev: true
+
+  /@typescript-eslint/type-utils@5.59.5(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -6959,32 +6828,32 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.1.3)
-      '@typescript-eslint/utils': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
+      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.6)
+      '@typescript-eslint/utils': 5.59.5(eslint@8.45.0)(typescript@5.1.6)
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      eslint: 8.45.0
+      tsutils: 3.21.0(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/type-utils@5.59.5(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/type-utils@6.2.0(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: '*'
+      eslint: ^7.0.0 || ^8.0.0
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.3)
-      '@typescript-eslint/utils': 5.59.5(eslint@8.39.0)(typescript@5.1.3)
+      '@typescript-eslint/typescript-estree': 6.2.0(typescript@5.1.6)
+      '@typescript-eslint/utils': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      eslint: 8.45.0
+      ts-api-utils: 1.0.1(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6994,17 +6863,17 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/types@5.59.0:
-    resolution: {integrity: sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
   /@typescript-eslint/types@5.59.5:
     resolution: {integrity: sha512-xkfRPHbqSH4Ggx4eHRIO/eGL8XL4Ysb4woL8c87YuAo8Md7AUjyWKa9YMwTL519SyDPrfEgKdewjkxNCVeJW7w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.45.0(typescript@5.1.3):
+  /@typescript-eslint/types@6.2.0:
+    resolution: {integrity: sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree@5.45.0(typescript@5.1.6):
     resolution: {integrity: sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -7019,14 +6888,14 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      tsutils: 3.21.0(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.59.0(typescript@5.1.3):
-    resolution: {integrity: sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg==}
+  /@typescript-eslint/typescript-estree@5.59.5(typescript@5.1.6):
+    resolution: {integrity: sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -7034,72 +6903,72 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/visitor-keys': 5.59.0
+      '@typescript-eslint/types': 5.59.5
+      '@typescript-eslint/visitor-keys': 5.59.5
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      tsutils: 3.21.0(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/typescript-estree@5.59.5(typescript@5.1.3):
-    resolution: {integrity: sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/typescript-estree@6.2.0(typescript@5.1.6):
+    resolution: {integrity: sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/visitor-keys': 5.59.5
+      '@typescript-eslint/types': 6.2.0
+      '@typescript-eslint/visitor-keys': 6.2.0
       debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.5.4
-      tsutils: 3.21.0(typescript@5.1.3)
-      typescript: 5.1.3
+      ts-api-utils: 1.0.1(typescript@5.1.6)
+      typescript: 5.1.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.45.0(eslint@8.39.0)(typescript@5.1.3):
+  /@typescript-eslint/utils@5.45.0(eslint@8.45.0)(typescript@5.1.6):
     resolution: {integrity: sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@types/json-schema': 7.0.11
+      '@types/json-schema': 7.0.12
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.45.0
       '@typescript-eslint/types': 5.45.0
-      '@typescript-eslint/typescript-estree': 5.45.0(typescript@5.1.3)
-      eslint: 8.39.0
+      '@typescript-eslint/typescript-estree': 5.45.0(typescript@5.1.6)
+      eslint: 8.45.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0(eslint@8.39.0)
+      eslint-utils: 3.0.0(eslint@8.45.0)
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@5.59.0(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-GGLFd+86drlHSvPgN/el6dRQNYYGOvRSDVydsUaQluwIW3HvbXuxyuD5JETvBt/9qGYe+lOrDk6gRrWOHb/FvA==}
+  /@typescript-eslint/utils@5.59.5(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      '@types/json-schema': 7.0.11
-      '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.59.0
-      '@typescript-eslint/types': 5.59.0
-      '@typescript-eslint/typescript-estree': 5.59.0(typescript@5.1.3)
-      eslint: 8.39.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
+      '@types/json-schema': 7.0.12
+      '@types/semver': 7.5.0
+      '@typescript-eslint/scope-manager': 5.59.5
+      '@typescript-eslint/types': 5.59.5
+      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.6)
+      eslint: 8.45.0
       eslint-scope: 5.1.1
       semver: 7.5.4
     transitivePeerDependencies:
@@ -7107,20 +6976,19 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/utils@5.59.5(eslint@8.39.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /@typescript-eslint/utils@6.2.0(eslint@8.45.0)(typescript@5.1.6):
+    resolution: {integrity: sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      '@types/json-schema': 7.0.11
-      '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.59.5
-      '@typescript-eslint/types': 5.59.5
-      '@typescript-eslint/typescript-estree': 5.59.5(typescript@5.1.3)
-      eslint: 8.39.0
-      eslint-scope: 5.1.1
+      eslint: ^7.0.0 || ^8.0.0
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
+      '@types/json-schema': 7.0.12
+      '@types/semver': 7.5.0
+      '@typescript-eslint/scope-manager': 6.2.0
+      '@typescript-eslint/types': 6.2.0
+      '@typescript-eslint/typescript-estree': 6.2.0(typescript@5.1.6)
+      eslint: 8.45.0
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
@@ -7132,15 +7000,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       '@typescript-eslint/types': 5.45.0
-      eslint-visitor-keys: 3.4.0
-    dev: true
-
-  /@typescript-eslint/visitor-keys@5.59.0:
-    resolution: {integrity: sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.59.0
-      eslint-visitor-keys: 3.4.0
+      eslint-visitor-keys: 3.4.1
     dev: true
 
   /@typescript-eslint/visitor-keys@5.59.5:
@@ -7148,116 +7008,109 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       '@typescript-eslint/types': 5.59.5
-      eslint-visitor-keys: 3.4.0
+      eslint-visitor-keys: 3.4.1
+    dev: true
+
+  /@typescript-eslint/visitor-keys@6.2.0:
+    resolution: {integrity: sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==}
+    engines: {node: ^16.0.0 || >=18.0.0}
+    dependencies:
+      '@typescript-eslint/types': 6.2.0
+      eslint-visitor-keys: 3.4.1
     dev: true
 
-  /@vitejs/plugin-vue@4.2.3(vite@4.0.4)(vue@3.3.4):
+  /@vitejs/plugin-vue@4.2.3(vite@4.4.7)(vue@3.3.4):
     resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.0.4(less@4.1.3)(sass@1.63.4)
+      vite: 4.4.7(less@4.1.3)(sass@1.64.1)
       vue: 3.3.4
     dev: true
 
-  /@vitest/coverage-c8@0.28.5:
-    resolution: {integrity: sha512-zCNyurjudoG0BAqAgknvlBhkV2V9ZwyYLWOAGtHSDhL/St49MJT+V2p1G0yPaoqBbKOTATVnP5H2p1XL15H75g==}
+  /@vitest/coverage-v8@0.33.0(vitest@0.33.0):
+    resolution: {integrity: sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==}
+    peerDependencies:
+      vitest: '>=0.32.0 <1'
     dependencies:
-      c8: 7.12.0
+      '@ampproject/remapping': 2.2.1
+      '@bcoe/v8-coverage': 0.2.3
+      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-report: 3.0.0
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.5
+      magic-string: 0.30.1
       picocolors: 1.0.0
-      std-env: 3.3.2
-      vitest: 0.28.5
+      std-env: 3.3.3
+      test-exclude: 6.0.0
+      v8-to-istanbul: 9.1.0
+      vitest: 0.33.0
     transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - happy-dom
-      - jsdom
-      - less
-      - sass
-      - stylus
-      - sugarss
       - supports-color
-      - terser
     dev: true
 
-  /@vitest/expect@0.28.5:
-    resolution: {integrity: sha512-gqTZwoUTwepwGIatnw4UKpQfnoyV0Z9Czn9+Lo2/jLIt4/AXLTn+oVZxlQ7Ng8bzcNkR+3DqLJ08kNr8jRmdNQ==}
+  /@vitest/expect@0.33.0:
+    resolution: {integrity: sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==}
     dependencies:
-      '@vitest/spy': 0.28.5
-      '@vitest/utils': 0.28.5
+      '@vitest/spy': 0.33.0
+      '@vitest/utils': 0.33.0
       chai: 4.3.7
     dev: true
 
-  /@vitest/runner@0.28.5:
-    resolution: {integrity: sha512-NKkHtLB+FGjpp5KmneQjTcPLWPTDfB7ie+MmF1PnUBf/tGe2OjGxWyB62ySYZ25EYp9krR5Bw0YPLS/VWh1QiA==}
+  /@vitest/runner@0.33.0:
+    resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==}
     dependencies:
-      '@vitest/utils': 0.28.5
+      '@vitest/utils': 0.33.0
       p-limit: 4.0.0
-      pathe: 1.1.0
-    dev: true
-
-  /@vitest/spy@0.28.5:
-    resolution: {integrity: sha512-7if6rsHQr9zbmvxN7h+gGh2L9eIIErgf8nSKYDlg07HHimCxp4H6I/X/DPXktVPPLQfiZ1Cw2cbDIx9fSqDjGw==}
-    dependencies:
-      tinyspy: 1.0.2
+      pathe: 1.1.1
     dev: true
 
-  /@vitest/utils@0.28.5:
-    resolution: {integrity: sha512-UyZdYwdULlOa4LTUSwZ+Paz7nBHGTT72jKwdFSV4IjHF1xsokp+CabMdhjvVhYwkLfO88ylJT46YMilnkSARZA==}
+  /@vitest/snapshot@0.33.0:
+    resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==}
     dependencies:
-      cli-truncate: 3.1.0
-      diff: 5.1.0
-      loupe: 2.3.6
-      picocolors: 1.0.0
-      pretty-format: 27.5.1
+      magic-string: 0.30.1
+      pathe: 1.1.1
+      pretty-format: 29.6.2
     dev: true
 
-  /@volar/language-core@1.0.24:
-    resolution: {integrity: sha512-vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg==}
+  /@vitest/spy@0.33.0:
+    resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==}
     dependencies:
-      '@volar/source-map': 1.0.24
-      muggle-string: 0.1.0
+      tinyspy: 2.1.1
     dev: true
 
-  /@volar/source-map@1.0.24:
-    resolution: {integrity: sha512-Qsv/tkplx18pgBr8lKAbM1vcDqgkGKQzbChg6NW+v0CZc3G7FLmK+WrqEPzKlN7Cwdc6XVL559Nod8WKAfKr4A==}
+  /@vitest/utils@0.33.0:
+    resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==}
     dependencies:
-      muggle-string: 0.1.0
+      diff-sequences: 29.4.3
+      loupe: 2.3.6
+      pretty-format: 29.6.2
     dev: true
 
-  /@volar/typescript@1.0.24:
-    resolution: {integrity: sha512-f8hCSk+PfKR1/RQHxZ79V1NpDImHoivqoizK+mstphm25tn/YJ/JnKNjZHB+o21fuW0yKlI26NV3jkVb2Cc/7A==}
+  /@volar/language-core@1.10.0:
+    resolution: {integrity: sha512-ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ==}
     dependencies:
-      '@volar/language-core': 1.0.24
+      '@volar/source-map': 1.10.0
     dev: true
 
-  /@volar/vue-language-core@1.0.24:
-    resolution: {integrity: sha512-2NTJzSgrwKu6uYwPqLiTMuAzi7fAY3yFy5PJ255bGJc82If0Xr+cW8pC80vpjG0D/aVLmlwAdO4+Ya2BI8GdDg==}
+  /@volar/source-map@1.10.0:
+    resolution: {integrity: sha512-/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw==}
     dependencies:
-      '@volar/language-core': 1.0.24
-      '@volar/source-map': 1.0.24
-      '@vue/compiler-dom': 3.3.4
-      '@vue/compiler-sfc': 3.3.4
-      '@vue/reactivity': 3.3.4
-      '@vue/shared': 3.3.4
-      minimatch: 5.1.5
-      vue-template-compiler: 2.7.14
+      muggle-string: 0.3.1
     dev: true
 
-  /@volar/vue-typescript@1.0.24:
-    resolution: {integrity: sha512-9a25oHDvGaNC0okRS47uqJI6FxY4hUQZUsxeOUFHcqVxZEv8s17LPuP/pMMXyz7jPygrZubB/qXqHY5jEu/akA==}
+  /@volar/typescript@1.10.0:
+    resolution: {integrity: sha512-OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg==}
     dependencies:
-      '@volar/typescript': 1.0.24
-      '@volar/vue-language-core': 1.0.24
+      '@volar/language-core': 1.10.0
     dev: true
 
   /@vue/compiler-core@3.3.4:
     resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
     dependencies:
-      '@babel/parser': 7.21.8
+      '@babel/parser': 7.22.7
       '@vue/shared': 3.3.4
       estree-walker: 2.0.2
       source-map-js: 1.0.2
@@ -7271,7 +7124,7 @@ packages:
   /@vue/compiler-sfc@3.3.4:
     resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
     dependencies:
-      '@babel/parser': 7.21.8
+      '@babel/parser': 7.22.7
       '@vue/compiler-core': 3.3.4
       '@vue/compiler-dom': 3.3.4
       '@vue/compiler-ssr': 3.3.4
@@ -7290,12 +7143,12 @@ packages:
 
   /@vue/devtools-api@6.4.5:
     resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
+    dev: false
 
   /@vue/devtools-api@6.5.0:
     resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==}
-    dev: false
 
-  /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.12.0)(eslint@8.39.0)(typescript@5.1.3):
+  /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.15.1)(eslint@8.45.0)(typescript@5.1.6):
     resolution: {integrity: sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -7306,20 +7159,39 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.39.0)(typescript@5.1.3)
-      '@typescript-eslint/parser': 5.59.5(eslint@8.39.0)(typescript@5.1.3)
-      eslint: 8.39.0
-      eslint-plugin-vue: 9.12.0(eslint@8.39.0)
-      typescript: 5.1.3
-      vue-eslint-parser: 9.3.0(eslint@8.39.0)
+      '@typescript-eslint/eslint-plugin': 5.59.5(@typescript-eslint/parser@5.59.5)(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/parser': 5.59.5(eslint@8.45.0)(typescript@5.1.6)
+      eslint: 8.45.0
+      eslint-plugin-vue: 9.15.1(eslint@8.45.0)
+      typescript: 5.1.6
+      vue-eslint-parser: 9.3.1(eslint@8.45.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@vue/language-core@1.8.8(typescript@5.1.6):
+    resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@volar/language-core': 1.10.0
+      '@volar/source-map': 1.10.0
+      '@vue/compiler-dom': 3.3.4
+      '@vue/reactivity': 3.3.4
+      '@vue/shared': 3.3.4
+      minimatch: 9.0.1
+      muggle-string: 0.3.1
+      typescript: 5.1.6
+      vue-template-compiler: 2.7.14
+    dev: true
+
   /@vue/reactivity-transform@3.3.4:
     resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
     dependencies:
-      '@babel/parser': 7.21.8
+      '@babel/parser': 7.22.7
       '@vue/compiler-core': 3.3.4
       '@vue/shared': 3.3.4
       estree-walker: 2.0.2
@@ -7369,6 +7241,15 @@ packages:
       vue-component-type-helpers: 1.8.4
     dev: true
 
+  /@vue/typescript@1.8.8(typescript@5.1.6):
+    resolution: {integrity: sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==}
+    dependencies:
+      '@volar/typescript': 1.10.0
+      '@vue/language-core': 1.8.8(typescript@5.1.6)
+    transitivePeerDependencies:
+      - typescript
+    dev: true
+
   /@vueuse/components@10.2.0(vue@3.3.4):
     resolution: {integrity: sha512-fpGtxx8G3BCJUoTd6d4xI7qELvm4nwVKLZYgIVdv7weqprKWwK5IO+t3LULovPuS7W2guVZgpyMy9NkD4qa2Bw==}
     dependencies:
@@ -7549,14 +7430,30 @@ packages:
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
     dev: true
 
-  /@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.17.18):
+  /@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.18.17):
     resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       esbuild: '>=0.10.0'
     dependencies:
-      esbuild: 0.17.18
-      tslib: 2.5.0
+      esbuild: 0.18.17
+      tslib: 2.6.1
+    dev: true
+
+  /@yarnpkg/fslib@2.10.3:
+    resolution: {integrity: sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==}
+    engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
+    dependencies:
+      '@yarnpkg/libzip': 2.3.0
+      tslib: 2.6.1
+    dev: true
+
+  /@yarnpkg/libzip@2.3.0:
+    resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
+    engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
+    dependencies:
+      '@types/emscripten': 1.39.7
+      tslib: 2.6.1
     dev: true
 
   /a-sync-waterfall@1.0.1:
@@ -7591,20 +7488,20 @@ packages:
       acorn-walk: 8.2.0
     dev: true
 
-  /acorn-import-assertions@1.8.0(acorn@8.8.1):
+  /acorn-import-assertions@1.8.0(acorn@8.10.0):
     resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
     peerDependencies:
       acorn: ^8
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.10.0
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.8.1):
+  /acorn-jsx@5.3.2(acorn@8.10.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.10.0
     dev: true
 
   /acorn-walk@8.2.0:
@@ -7617,6 +7514,12 @@ packages:
     hasBin: true
     dev: true
 
+  /acorn@8.10.0:
+    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: true
+
   /acorn@8.8.1:
     resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
     engines: {node: '>=0.4.0'}
@@ -7694,12 +7597,6 @@ packages:
       - supports-color
     dev: false
 
-  /ansi-align@3.0.1:
-    resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==}
-    dependencies:
-      string-width: 4.2.3
-    dev: true
-
   /ansi-colors@1.1.0:
     resolution: {integrity: sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==}
     engines: {node: '>=0.10.0'}
@@ -7734,11 +7631,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /ansi-regex@4.1.1:
-    resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==}
-    engines: {node: '>=6'}
-    dev: true
-
   /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -7846,6 +7738,10 @@ packages:
     dev: false
     optional: true
 
+  /arg@5.0.2:
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
+    dev: true
+
   /argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
@@ -7889,6 +7785,12 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /array-buffer-byte-length@1.0.0:
+    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
+    dependencies:
+      call-bind: 1.0.2
+      is-array-buffer: 3.0.2
+
   /array-each@1.0.1:
     resolution: {integrity: sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==}
     engines: {node: '>=0.10.0'}
@@ -7954,6 +7856,17 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /array.prototype.findlastindex@1.2.2:
+    resolution: {integrity: sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.21.1
+      es-shim-unscopables: 1.0.0
+      get-intrinsic: 1.1.3
+    dev: true
+
   /array.prototype.flat@1.3.1:
     resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
     engines: {node: '>= 0.4'}
@@ -7979,12 +7892,23 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       es-array-method-boxes-properly: 1.0.0
       is-string: 1.0.7
     dev: false
 
+  /arraybuffer.prototype.slice@1.0.1:
+    resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      get-intrinsic: 1.2.1
+      is-array-buffer: 3.0.2
+      is-shared-array-buffer: 1.0.2
+
   /arrify@2.0.1:
     resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
     engines: {node: '>=8'}
@@ -8057,27 +7981,27 @@ packages:
     resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /ast-types@0.14.2:
     resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
   /ast-types@0.15.2:
     resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /ast-types@0.16.1:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
   /astral-regex@2.0.0:
@@ -8148,19 +8072,19 @@ packages:
       - encoding
     dev: false
 
-  /autoprefixer@10.4.14(postcss@8.4.21):
+  /autoprefixer@10.4.14(postcss@8.4.27):
     resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      browserslist: 4.21.4
+      browserslist: 4.21.9
       caniuse-lite: 1.0.30001517
       fraction.js: 4.2.0
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.4.21
+      postcss: 8.4.27
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -8191,6 +8115,7 @@ packages:
 
   /aws-sign2@0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
+    dev: true
 
   /aws4@1.11.0:
     resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
@@ -8203,14 +8128,14 @@ packages:
   /axios-retry@3.3.1:
     resolution: {integrity: sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==}
     dependencies:
-      '@babel/runtime': 7.19.4
+      '@babel/runtime': 7.22.6
       is-retry-allowed: 2.2.0
     dev: false
 
   /axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
     dependencies:
-      follow-redirects: 1.15.2(debug@3.2.7)
+      follow-redirects: 1.15.2(debug@4.3.4)
     transitivePeerDependencies:
       - debug
     dev: false
@@ -8221,35 +8146,44 @@ packages:
       follow-redirects: 1.15.2(debug@4.3.2)
     transitivePeerDependencies:
       - debug
+    dev: false
+
+  /axios@0.27.2(debug@3.2.7):
+    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
+    dependencies:
+      follow-redirects: 1.15.2(debug@3.2.7)
+      form-data: 4.0.0
+    transitivePeerDependencies:
+      - debug
+    dev: false
 
-  /axios@0.27.2(debug@3.2.7):
+  /axios@0.27.2(debug@4.3.4):
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.15.2(debug@3.2.7)
+      follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
     transitivePeerDependencies:
       - debug
-    dev: false
 
-  /babel-core@7.0.0-bridge.0(@babel/core@7.21.8):
+  /babel-core@7.0.0-bridge.0(@babel/core@7.22.9):
     resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.21.8
+      '@babel/core': 7.22.9
     dev: true
 
-  /babel-jest@29.5.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==}
+  /babel-jest@29.6.2(@babel/core@7.22.9):
+    resolution: {integrity: sha512-BYCzImLos6J3BH/+HvUCHG1dTf2MzmAB4jaVxHV+29RZLjR29XuYTmsf2sdDwkrb+FczkGo3kOhE7ga6sI0P4A==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@jest/transform': 29.5.0
+      '@babel/core': 7.22.9
+      '@jest/transform': 29.6.2
       '@types/babel__core': 7.20.0
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.5.0(@babel/core@7.21.8)
+      babel-preset-jest: 29.5.0(@babel/core@7.22.9)
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -8274,84 +8208,84 @@ packages:
     resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/template': 7.20.7
-      '@babel/types': 7.21.5
+      '@babel/template': 7.22.5
+      '@babel/types': 7.22.5
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
     dev: true
 
-  /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.21.8):
-    resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==}
+  /babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.22.9):
+    resolution: {integrity: sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/compat-data': 7.21.7
-      '@babel/core': 7.21.8
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8)
+      '@babel/compat-data': 7.22.9
+      '@babel/core': 7.22.9
+      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.9)
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-corejs3@0.6.0(@babel/core@7.21.8):
-    resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
+  /babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.22.9):
+    resolution: {integrity: sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8)
-      core-js-compat: 3.27.1
+      '@babel/core': 7.22.9
+      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.9)
+      core-js-compat: 3.32.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-regenerator@0.4.1(@babel/core@7.21.8):
-    resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==}
+  /babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.22.9):
+    resolution: {integrity: sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==}
     peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.9)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.21.8):
+  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.9):
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.21.8)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.21.8)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.21.8)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.21.8)
-    dev: true
-
-  /babel-preset-jest@29.5.0(@babel/core@7.21.8):
+      '@babel/core': 7.22.9
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.9)
+    dev: true
+
+  /babel-preset-jest@29.5.0(@babel/core@7.22.9):
     resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.21.8
+      '@babel/core': 7.22.9
       babel-plugin-jest-hoist: 29.5.0
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.8)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.9)
     dev: true
 
   /babel-walk@3.0.0-canary-5:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@babel/types': 7.21.5
+      '@babel/types': 7.22.5
     dev: true
 
   /bach@1.2.0:
@@ -8379,11 +8313,6 @@ packages:
   /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  /base64-url@2.3.3:
-    resolution: {integrity: sha512-dLMhIsK7OplcDauDH/tZLvK7JmUZK3A7KiQpjNzsBrM6Etw7hzNI1tLEywqJk9NnwkgWuFKSlx/IUO7vF6Mo8Q==}
-    engines: {node: '>=6'}
-    dev: true
-
   /base@0.11.2:
     resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
     engines: {node: '>=0.10.0'}
@@ -8417,11 +8346,11 @@ packages:
     resolution: {integrity: sha512-rQdKZHTWok2uC3wHyGwoV6mOxhnOyp07iHhyWQlS+U5zkYyhOEOT6Ri4Q0vPThTqCYs6RCbtAfTbPG+lUZkocw==}
     dev: false
 
-  /better-opn@2.1.1:
-    resolution: {integrity: sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==}
-    engines: {node: '>8.0.0'}
+  /better-opn@3.0.2:
+    resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
+    engines: {node: '>=12.0.0'}
     dependencies:
-      open: 7.4.2
+      open: 8.4.0
     dev: true
 
   /big-integer@1.6.51:
@@ -8516,20 +8445,6 @@ packages:
   /boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
 
-  /boxen@5.1.2:
-    resolution: {integrity: sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-align: 3.0.1
-      camelcase: 6.3.0
-      chalk: 4.1.2
-      cli-boxes: 2.2.1
-      string-width: 4.2.3
-      type-fest: 0.20.2
-      widest-line: 3.1.0
-      wrap-ansi: 7.0.0
-    dev: true
-
   /bplist-parser@0.2.0:
     resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}
     engines: {node: '>= 5.10.0'}
@@ -8587,15 +8502,15 @@ packages:
       pako: 0.2.9
     dev: true
 
-  /browserslist@4.21.4:
-    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
+  /browserslist@4.21.9:
+    resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
       caniuse-lite: 1.0.30001517
-      electron-to-chromium: 1.4.284
-      node-releases: 2.0.8
-      update-browserslist-db: 1.0.10(browserslist@4.21.4)
+      electron-to-chromium: 1.4.475
+      node-releases: 2.0.13
+      update-browserslist-db: 1.0.11(browserslist@4.21.9)
     dev: true
 
   /bs-logger@0.2.6:
@@ -8624,6 +8539,7 @@ packages:
 
   /buffer-equal-constant-time@1.0.1:
     resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+    dev: false
 
   /buffer-equal@1.0.1:
     resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==}
@@ -8724,25 +8640,6 @@ packages:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
 
-  /c8@7.12.0:
-    resolution: {integrity: sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==}
-    engines: {node: '>=10.12.0'}
-    hasBin: true
-    dependencies:
-      '@bcoe/v8-coverage': 0.2.3
-      '@istanbuljs/schema': 0.1.3
-      find-up: 5.0.0
-      foreground-child: 2.0.0
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-report: 3.0.0
-      istanbul-reports: 3.1.5
-      rimraf: 3.0.2
-      test-exclude: 6.0.0
-      v8-to-istanbul: 9.0.1
-      yargs: 16.2.0
-      yargs-parser: 20.2.9
-    dev: true
-
   /cac@6.7.14:
     resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
     engines: {node: '>=8'}
@@ -8836,7 +8733,7 @@ packages:
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /camelcase@3.0.0:
     resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
@@ -8860,7 +8757,7 @@ packages:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
       upper-case-first: 2.0.2
     dev: false
 
@@ -8873,6 +8770,7 @@ packages:
 
   /caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+    dev: true
 
   /chai@4.3.7:
     resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==}
@@ -8925,7 +8823,7 @@ packages:
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /char-regex@1.0.2:
@@ -9005,8 +8903,8 @@ packages:
     engines: {node: '>=6.0'}
     dev: true
 
-  /ci-info@3.7.1:
-    resolution: {integrity: sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==}
+  /ci-info@3.8.0:
+    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
     engines: {node: '>=8'}
     dev: true
 
@@ -9053,11 +8951,6 @@ packages:
     dependencies:
       escape-string-regexp: 4.0.0
 
-  /cli-boxes@2.2.1:
-    resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==}
-    engines: {node: '>=6'}
-    dev: true
-
   /cli-cursor@3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
@@ -9105,14 +8998,6 @@ packages:
       string-width: 4.2.3
     dev: true
 
-  /cli-truncate@3.1.0:
-    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      slice-ansi: 5.0.0
-      string-width: 5.1.2
-    dev: true
-
   /cli-ux@5.6.7(@oclif/config@1.18.5):
     resolution: {integrity: sha512-dsKAurMNyFDnO6X1TiiRNiVbL90XReLKcvIq4H777NMqXGBxBws23ag8ubCJE97vVZEgWG2eSUhsyLf63Jv8+g==}
     engines: {node: '>=8.0.0'}
@@ -9143,7 +9028,7 @@ packages:
       strip-ansi: 6.0.1
       supports-color: 8.1.1
       supports-hyperlinks: 2.3.0
-      tslib: 2.5.0
+      tslib: 2.6.1
     transitivePeerDependencies:
       - '@oclif/config'
     dev: true
@@ -9161,14 +9046,6 @@ packages:
       wrap-ansi: 2.1.0
     dev: true
 
-  /cliui@5.0.0:
-    resolution: {integrity: sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==}
-    dependencies:
-      string-width: 3.1.0
-      strip-ansi: 5.2.0
-      wrap-ansi: 5.1.0
-    dev: true
-
   /cliui@6.0.0:
     resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
     dependencies:
@@ -9183,6 +9060,7 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
+    dev: false
 
   /cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
@@ -9361,6 +9239,7 @@ packages:
   /commander@5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
+    dev: false
 
   /commander@6.2.1:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
@@ -9375,7 +9254,7 @@ packages:
     resolution: {integrity: sha512-rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==}
     dependencies:
       leven: 2.1.0
-      minimist: 1.2.7
+      minimist: 1.2.8
     dev: false
 
   /common-tags@1.8.2:
@@ -9437,20 +9316,20 @@ packages:
       typedarray: 0.0.6
     dev: false
 
-  /concurrently@5.3.0:
-    resolution: {integrity: sha512-8MhqOB6PWlBfA2vJ8a0bSFKATOdWlHiQlk11IfmQBPaHVP8oP2gsh2MObE6UR3hqDHqvaIvLTyceNW6obVuFHQ==}
-    engines: {node: '>=6.0.0'}
+  /concurrently@8.2.0:
+    resolution: {integrity: sha512-nnLMxO2LU492mTUj9qX/az/lESonSZu81UznYDoXtz1IQf996ixVqPAgHXwvHiHCAef/7S8HIK+fTFK7Ifk8YA==}
+    engines: {node: ^14.13.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      chalk: 2.4.2
-      date-fns: 2.29.3
+      chalk: 4.1.2
+      date-fns: 2.30.0
       lodash: 4.17.21
-      read-pkg: 4.0.1
-      rxjs: 6.6.7
-      spawn-command: 0.0.2-1
-      supports-color: 6.1.0
+      rxjs: 7.8.1
+      shell-quote: 1.8.1
+      spawn-command: 0.0.2
+      supports-color: 8.1.1
       tree-kill: 1.2.2
-      yargs: 13.3.2
+      yargs: 17.7.2
     dev: true
 
   /config-chain@1.1.13:
@@ -9476,15 +9355,15 @@ packages:
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
       upper-case: 2.0.2
     dev: false
 
   /constantinople@4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
     dependencies:
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
     dev: true
 
   /content-disposition@0.5.4:
@@ -9569,10 +9448,10 @@ packages:
     resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
     dev: false
 
-  /core-js-compat@3.27.1:
-    resolution: {integrity: sha512-Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA==}
+  /core-js-compat@3.32.0:
+    resolution: {integrity: sha512-7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw==}
     dependencies:
-      browserslist: 4.21.4
+      browserslist: 4.21.9
     dev: true
 
   /core-js@3.31.0:
@@ -9580,6 +9459,7 @@ packages:
 
   /core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
+    dev: true
 
   /core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
@@ -9714,7 +9594,7 @@ packages:
       postcss-value-parser: 4.2.0
       schema-utils: 2.7.1
       semver: 7.5.4
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /css-loader@6.7.3(webpack@5.75.0):
@@ -9723,15 +9603,15 @@ packages:
     peerDependencies:
       webpack: ^5.0.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.21)
-      postcss-modules-local-by-default: 4.0.0(postcss@8.4.21)
-      postcss-modules-scope: 3.0.0(postcss@8.4.21)
-      postcss-modules-values: 4.0.0(postcss@8.4.21)
+      icss-utils: 5.1.0(postcss@8.4.27)
+      postcss: 8.4.27
+      postcss-modules-extract-imports: 3.0.0(postcss@8.4.27)
+      postcss-modules-local-by-default: 4.0.0(postcss@8.4.27)
+      postcss-modules-scope: 3.0.0(postcss@8.4.27)
+      postcss-modules-values: 4.0.0(postcss@8.4.27)
       postcss-value-parser: 4.2.0
       semver: 7.5.4
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /css-select@4.3.0:
@@ -9803,20 +9683,21 @@ packages:
       nub: 0.0.0
     dev: false
 
-  /cypress-real-events@1.7.6(cypress@12.8.1):
-    resolution: {integrity: sha512-yP6GnRrbm6HK5q4DH6Nnupz37nOfZu/xn1xFYqsE2o4G73giPWQOdu6375QYpwfU1cvHNCgyD2bQ2hPH9D7NMw==}
+  /cypress-real-events@1.9.1(cypress@12.17.2):
+    resolution: {integrity: sha512-eDYW6NagNs8+68ugyPbB6U1aIsYF0E0WHR6upXo0PbTXZNqBNc2s9Y0u/N+pbU9HpFh+krl6iMhoz/ENlYBdCg==}
     peerDependencies:
       cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x
     dependencies:
-      cypress: 12.8.1
+      cypress: 12.17.2
+      prettier: 3.0.0
     dev: true
 
-  /cypress@12.8.1:
-    resolution: {integrity: sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==}
+  /cypress@12.17.2:
+    resolution: {integrity: sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==}
     engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
     hasBin: true
     dependencies:
-      '@cypress/request': 2.88.10
+      '@cypress/request': 2.88.11
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
       '@types/node': 18.16.16
       '@types/sinonjs__fake-timers': 8.1.1
@@ -9830,7 +9711,7 @@ packages:
       check-more-types: 2.24.0
       cli-cursor: 3.1.0
       cli-table3: 0.6.3
-      commander: 5.1.0
+      commander: 6.2.1
       common-tags: 1.8.2
       dayjs: 1.11.6
       debug: 4.3.4(supports-color@8.1.1)
@@ -9848,7 +9729,7 @@ packages:
       listr2: 3.14.0(enquirer@2.3.6)
       lodash: 4.17.21
       log-symbols: 4.1.0
-      minimist: 1.2.7
+      minimist: 1.2.8
       ospath: 1.2.2
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
@@ -9890,6 +9771,14 @@ packages:
   /date-fns@2.29.3:
     resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
     engines: {node: '>=0.11'}
+    dev: false
+
+  /date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
+    dependencies:
+      '@babel/runtime': 7.22.6
+    dev: true
 
   /dateformat@3.0.3:
     resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}
@@ -9922,7 +9811,6 @@ packages:
     dependencies:
       ms: 2.1.3
       supports-color: 5.5.0
-    dev: true
 
   /debug@3.2.7(supports-color@8.1.1):
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
@@ -9934,6 +9822,7 @@ packages:
     dependencies:
       ms: 2.1.3
       supports-color: 8.1.1
+    dev: true
 
   /debug@4.3.2:
     resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==}
@@ -9945,6 +9834,7 @@ packages:
         optional: true
     dependencies:
       ms: 2.1.2
+    dev: false
 
   /debug@4.3.4(supports-color@8.1.1):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
@@ -9975,8 +9865,13 @@ packages:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
     engines: {node: '>=0.10'}
 
-  /dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+  /dedent@1.3.0:
+    resolution: {integrity: sha512-7glNLfvdsMzZm3FpRY1CHuI2lbYDR+71YmrhmTZjYFD5pfT0ACgnGRdrrC9Mk2uICnzkcdelCx5at787UDGOvg==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
     dev: true
 
   /deep-eql@4.1.3:
@@ -10058,6 +9953,13 @@ packages:
       has-property-descriptors: 1.0.0
       object-keys: 1.1.1
 
+  /define-properties@1.2.0:
+    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-property-descriptors: 1.0.0
+      object-keys: 1.1.1
+
   /define-property@0.2.5:
     resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
     engines: {node: '>=0.10.0'}
@@ -10188,21 +10090,11 @@ packages:
       wrappy: 1.0.2
     dev: true
 
-  /diff-sequences@29.4.2:
-    resolution: {integrity: sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
-
   /diff-sequences@29.4.3:
     resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /diff@5.1.0:
-    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
-    engines: {node: '>=0.3.1'}
-    dev: true
-
   /digest-header@0.0.1:
     resolution: {integrity: sha512-Qi0KOZgRnkQJuvMWbs1ZRRajEnbsMU8xlJI4rHIbPC+skHQ30heO5cIHpUFT4jAvAe+zPtdavLSAxASqoyZ3cg==}
     engines: {node: '>= 0.10.0'}
@@ -10308,7 +10200,7 @@ packages:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /dotenv-expand@10.0.0:
@@ -10319,6 +10211,12 @@ packages:
   /dotenv@16.0.3:
     resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
     engines: {node: '>=12'}
+    dev: false
+
+  /dotenv@16.3.1:
+    resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
+    engines: {node: '>=12'}
+    dev: true
 
   /dotenv@8.6.0:
     resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
@@ -10374,6 +10272,7 @@ packages:
     resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
     dependencies:
       safe-buffer: 5.2.1
+    dev: false
 
   /editorconfig@1.0.4:
     resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
@@ -10396,8 +10295,8 @@ packages:
     dependencies:
       jake: 10.8.5
 
-  /electron-to-chromium@1.4.284:
-    resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
+  /electron-to-chromium@1.4.475:
+    resolution: {integrity: sha512-mTye5u5P98kSJO2n7zYALhpJDmoSQejIGya0iR01GpoRady8eK3bw7YHHnjA1Rfi4ZSLdpuzlAC7Zw+1Zu7Z6A==}
     dev: true
 
   /element-plus@2.3.6(vue@3.3.4):
@@ -10430,10 +10329,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /emoji-regex@7.0.3:
-    resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==}
-    dev: true
-
   /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -10571,15 +10466,59 @@ packages:
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.9
 
+  /es-abstract@1.22.1:
+    resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      arraybuffer.prototype.slice: 1.0.1
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      es-set-tostringtag: 2.0.1
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.5
+      get-intrinsic: 1.2.1
+      get-symbol-description: 1.0.0
+      globalthis: 1.0.3
+      gopd: 1.0.1
+      has: 1.0.3
+      has-property-descriptors: 1.0.0
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      internal-slot: 1.0.5
+      is-array-buffer: 3.0.2
+      is-callable: 1.2.7
+      is-negative-zero: 2.0.2
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      is-string: 1.0.7
+      is-typed-array: 1.1.10
+      is-weakref: 1.0.2
+      object-inspect: 1.12.3
+      object-keys: 1.1.1
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.5.0
+      safe-array-concat: 1.0.0
+      safe-regex-test: 1.0.0
+      string.prototype.trim: 1.2.7
+      string.prototype.trimend: 1.0.6
+      string.prototype.trimstart: 1.0.6
+      typed-array-buffer: 1.0.0
+      typed-array-byte-length: 1.0.0
+      typed-array-byte-offset: 1.0.0
+      typed-array-length: 1.0.4
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.11
+
   /es-aggregate-error@1.0.8:
     resolution: {integrity: sha512-AKUb5MKLWMozPlFRHOKqWD7yta5uaEhH21qwtnf6FlKjNjTJOoqFi0/G14+FfSkIQhhu6X68Af4xgRC6y8qG4A==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       function-bind: 1.1.1
       functions-have-names: 1.2.3
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
       globalthis: 1.0.3
       has-property-descriptors: 1.0.0
     dev: false
@@ -10609,7 +10548,7 @@ packages:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
       has: 1.0.3
       has-tostringtag: 1.0.0
 
@@ -10668,73 +10607,44 @@ packages:
     resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==}
     dev: true
 
-  /esbuild-register@3.4.2(esbuild@0.17.18):
+  /esbuild-register@3.4.2(esbuild@0.18.17):
     resolution: {integrity: sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==}
     peerDependencies:
       esbuild: '>=0.12 <1'
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
-      esbuild: 0.17.18
+      esbuild: 0.18.17
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /esbuild@0.16.17:
-    resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.16.17
-      '@esbuild/android-arm64': 0.16.17
-      '@esbuild/android-x64': 0.16.17
-      '@esbuild/darwin-arm64': 0.16.17
-      '@esbuild/darwin-x64': 0.16.17
-      '@esbuild/freebsd-arm64': 0.16.17
-      '@esbuild/freebsd-x64': 0.16.17
-      '@esbuild/linux-arm': 0.16.17
-      '@esbuild/linux-arm64': 0.16.17
-      '@esbuild/linux-ia32': 0.16.17
-      '@esbuild/linux-loong64': 0.16.17
-      '@esbuild/linux-mips64el': 0.16.17
-      '@esbuild/linux-ppc64': 0.16.17
-      '@esbuild/linux-riscv64': 0.16.17
-      '@esbuild/linux-s390x': 0.16.17
-      '@esbuild/linux-x64': 0.16.17
-      '@esbuild/netbsd-x64': 0.16.17
-      '@esbuild/openbsd-x64': 0.16.17
-      '@esbuild/sunos-x64': 0.16.17
-      '@esbuild/win32-arm64': 0.16.17
-      '@esbuild/win32-ia32': 0.16.17
-      '@esbuild/win32-x64': 0.16.17
-    dev: true
-
-  /esbuild@0.17.18:
-    resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==}
+  /esbuild@0.18.17:
+    resolution: {integrity: sha512-1GJtYnUxsJreHYA0Y+iQz2UEykonY66HNWOb0yXYZi9/kNrORUEHVg87eQsCtqh59PEJ5YVZJO98JHznMJSWjg==}
     engines: {node: '>=12'}
     hasBin: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.17.18
-      '@esbuild/android-arm64': 0.17.18
-      '@esbuild/android-x64': 0.17.18
-      '@esbuild/darwin-arm64': 0.17.18
-      '@esbuild/darwin-x64': 0.17.18
-      '@esbuild/freebsd-arm64': 0.17.18
-      '@esbuild/freebsd-x64': 0.17.18
-      '@esbuild/linux-arm': 0.17.18
-      '@esbuild/linux-arm64': 0.17.18
-      '@esbuild/linux-ia32': 0.17.18
-      '@esbuild/linux-loong64': 0.17.18
-      '@esbuild/linux-mips64el': 0.17.18
-      '@esbuild/linux-ppc64': 0.17.18
-      '@esbuild/linux-riscv64': 0.17.18
-      '@esbuild/linux-s390x': 0.17.18
-      '@esbuild/linux-x64': 0.17.18
-      '@esbuild/netbsd-x64': 0.17.18
-      '@esbuild/openbsd-x64': 0.17.18
-      '@esbuild/sunos-x64': 0.17.18
-      '@esbuild/win32-arm64': 0.17.18
-      '@esbuild/win32-ia32': 0.17.18
-      '@esbuild/win32-x64': 0.17.18
+      '@esbuild/android-arm': 0.18.17
+      '@esbuild/android-arm64': 0.18.17
+      '@esbuild/android-x64': 0.18.17
+      '@esbuild/darwin-arm64': 0.18.17
+      '@esbuild/darwin-x64': 0.18.17
+      '@esbuild/freebsd-arm64': 0.18.17
+      '@esbuild/freebsd-x64': 0.18.17
+      '@esbuild/linux-arm': 0.18.17
+      '@esbuild/linux-arm64': 0.18.17
+      '@esbuild/linux-ia32': 0.18.17
+      '@esbuild/linux-loong64': 0.18.17
+      '@esbuild/linux-mips64el': 0.18.17
+      '@esbuild/linux-ppc64': 0.18.17
+      '@esbuild/linux-riscv64': 0.18.17
+      '@esbuild/linux-s390x': 0.18.17
+      '@esbuild/linux-x64': 0.18.17
+      '@esbuild/netbsd-x64': 0.18.17
+      '@esbuild/openbsd-x64': 0.18.17
+      '@esbuild/sunos-x64': 0.18.17
+      '@esbuild/win32-arm64': 0.18.17
+      '@esbuild/win32-ia32': 0.18.17
+      '@esbuild/win32-x64': 0.18.17
     dev: true
 
   /escalade@3.1.1:
@@ -10783,7 +10693,7 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.27.5)(eslint@8.39.0):
+  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.28.0)(eslint@8.45.0):
     resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -10791,35 +10701,35 @@ packages:
       eslint-plugin-import: ^2.25.2
     dependencies:
       confusing-browser-globals: 1.0.11
-      eslint: 8.39.0
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
+      eslint: 8.45.0
+      eslint-plugin-import: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
       object.assign: 4.1.4
       object.entries: 1.1.5
       semver: 7.5.4
     dev: true
 
-  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.59.0)(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
+  /eslint-config-airbnb-typescript@17.1.0(@typescript-eslint/eslint-plugin@6.2.0)(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0):
+    resolution: {integrity: sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.13.0
-      '@typescript-eslint/parser': ^5.0.0
+      '@typescript-eslint/eslint-plugin': ^5.13.0 || ^6.0.0
+      '@typescript-eslint/parser': ^5.0.0 || ^6.0.0
       eslint: ^7.32.0 || ^8.2.0
       eslint-plugin-import: ^2.25.3
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.0(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.1.3)
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
-      eslint: 8.39.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.27.5)(eslint@8.39.0)
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
+      '@typescript-eslint/eslint-plugin': 6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.1.6)
+      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
+      eslint: 8.45.0
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.28.0)(eslint@8.45.0)
+      eslint-plugin-import: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
     dev: true
 
-  /eslint-config-prettier@8.8.0(eslint@8.39.0):
-    resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==}
+  /eslint-config-prettier@8.9.0(eslint@8.45.0):
+    resolution: {integrity: sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.39.0
+      eslint: 8.45.0
     dev: true
 
   /eslint-config-riot@1.0.0:
@@ -10829,14 +10739,14 @@ packages:
   /eslint-import-resolver-node@0.3.7:
     resolution: {integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==}
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
-      is-core-module: 2.11.0
-      resolve: 1.22.1
+      debug: 3.2.7(supports-color@5.5.0)
+      is-core-module: 2.12.1
+      resolve: 1.22.3
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0):
+  /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0):
     resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -10845,9 +10755,9 @@ packages:
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
       enhanced-resolve: 5.13.0
-      eslint: 8.39.0
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
+      eslint: 8.45.0
+      eslint-module-utils: 2.7.4(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
+      eslint-plugin-import: 2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
       get-tsconfig: 4.5.0
       globby: 13.1.3
       is-core-module: 2.11.0
@@ -10860,7 +10770,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0):
+  /eslint-module-utils@2.7.4(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0):
     resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -10881,26 +10791,55 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
-      debug: 3.2.7(supports-color@8.1.1)
-      eslint: 8.39.0
+      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
+      debug: 3.2.7(supports-color@5.5.0)
+      eslint: 8.45.0
+      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0):
+    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
+      debug: 3.2.7(supports-color@5.5.0)
+      eslint: 8.45.0
       eslint-import-resolver-node: 0.3.7
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.0)(eslint-plugin-import@2.27.5)(eslint@8.39.0)
+      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@6.2.0)(eslint-plugin-import@2.28.0)(eslint@8.45.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-diff@2.0.1(eslint@8.39.0):
+  /eslint-plugin-diff@2.0.1(eslint@8.45.0):
     resolution: {integrity: sha512-qqbvwaaO1cfkUprliqiRojRsD0qGsvzmJNqNrb9s0h15sDVzZMXYdu0TUFpUwauLeU28etSsfWIp0Uu+OAcXXw==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       eslint: '>=6.7.0'
     dependencies:
-      eslint: 8.39.0
+      eslint: 8.45.0
     dev: true
 
-  /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0):
-    resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
+  /eslint-plugin-import@2.28.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0):
+    resolution: {integrity: sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
@@ -10909,23 +10848,26 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.59.0(eslint@8.39.0)(typescript@5.1.3)
+      '@typescript-eslint/parser': 6.2.0(eslint@8.45.0)(typescript@5.1.6)
       array-includes: 3.1.6
+      array.prototype.findlastindex: 1.2.2
       array.prototype.flat: 1.3.1
       array.prototype.flatmap: 1.3.1
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       doctrine: 2.1.0
-      eslint: 8.39.0
+      eslint: 8.45.0
       eslint-import-resolver-node: 0.3.7
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.39.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.2.0)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.45.0)
       has: 1.0.3
-      is-core-module: 2.11.0
+      is-core-module: 2.12.1
       is-glob: 4.0.3
       minimatch: 3.1.2
+      object.fromentries: 2.0.6
+      object.groupby: 1.0.0
       object.values: 1.1.6
-      resolve: 1.22.1
+      resolve: 1.22.3
       semver: 7.5.4
-      tsconfig-paths: 3.14.1
+      tsconfig-paths: 3.14.2
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -10936,15 +10878,15 @@ packages:
     resolution: {integrity: sha512-qe6sVFDP1Vj5eXlqZxYZpIjwYvhuqXlI0P8OfPyhiPOhMkFtr0TpFphD8/6WCzkm7LJCvG1eJEzURCtMIsFTAg==}
     dev: true
 
-  /eslint-plugin-n8n-nodes-base@1.12.0(eslint@8.39.0)(typescript@5.1.3):
+  /eslint-plugin-n8n-nodes-base@1.12.0(eslint@8.45.0)(typescript@5.1.6):
     resolution: {integrity: sha512-AotXR6IsxLNnxp4OxhD33xcmRFwVq7ZImBd0mTgpirV3VX8pCJDdiDlI2zCAICcICZxtOdbVtHOMhhnMjTh71A==}
     dependencies:
-      '@typescript-eslint/utils': 5.45.0(eslint@8.39.0)(typescript@5.1.3)
+      '@typescript-eslint/utils': 5.45.0(eslint@8.45.0)(typescript@5.1.6)
       camel-case: 4.1.2
       indefinite: 2.4.1
       pascal-case: 3.1.2
       pluralize: 8.0.0
-      prettier: 2.8.3
+      prettier: 3.0.0
       sentence-case: 3.0.4
       title-case: 3.0.3
     transitivePeerDependencies:
@@ -10953,34 +10895,39 @@ packages:
       - typescript
     dev: true
 
-  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.39.0)(prettier@2.8.3):
-    resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
-    engines: {node: '>=12.0.0'}
+  /eslint-plugin-prettier@5.0.0(@types/eslint@8.44.1)(eslint-config-prettier@8.9.0)(eslint@8.45.0)(prettier@3.0.0):
+    resolution: {integrity: sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==}
+    engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      eslint: '>=7.28.0'
+      '@types/eslint': '>=8.0.0'
+      eslint: '>=8.0.0'
       eslint-config-prettier: '*'
-      prettier: '>=2.0.0'
+      prettier: '>=3.0.0'
     peerDependenciesMeta:
+      '@types/eslint':
+        optional: true
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.39.0
-      eslint-config-prettier: 8.8.0(eslint@8.39.0)
-      prettier: 2.8.3
+      '@types/eslint': 8.44.1
+      eslint: 8.45.0
+      eslint-config-prettier: 8.9.0(eslint@8.45.0)
+      prettier: 3.0.0
       prettier-linter-helpers: 1.0.0
+      synckit: 0.8.5
     dev: true
 
-  /eslint-plugin-unicorn@46.0.0(eslint@8.39.0):
-    resolution: {integrity: sha512-j07WkC+PFZwk8J33LYp6JMoHa1lXc1u6R45pbSAipjpfpb7KIGr17VE2D685zCxR5VL4cjrl65kTJflziQWMDA==}
-    engines: {node: '>=14.18'}
+  /eslint-plugin-unicorn@48.0.1(eslint@8.45.0):
+    resolution: {integrity: sha512-FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw==}
+    engines: {node: '>=16'}
     peerDependencies:
-      eslint: '>=8.28.0'
+      eslint: '>=8.44.0'
     dependencies:
-      '@babel/helper-validator-identifier': 7.19.1
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      ci-info: 3.7.1
+      '@babel/helper-validator-identifier': 7.22.5
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
+      ci-info: 3.8.0
       clean-regexp: 1.0.0
-      eslint: 8.39.0
+      eslint: 8.45.0
       esquery: 1.5.0
       indent-string: 4.0.0
       is-builtin-module: 3.2.1
@@ -10988,41 +10935,40 @@ packages:
       lodash: 4.17.21
       pluralize: 8.0.0
       read-pkg-up: 7.0.1
-      regexp-tree: 0.1.25
-      regjsparser: 0.9.1
-      safe-regex: 2.1.1
+      regexp-tree: 0.1.27
+      regjsparser: 0.10.0
       semver: 7.5.4
       strip-indent: 3.0.0
     dev: true
 
-  /eslint-plugin-unused-imports@2.0.0(@typescript-eslint/eslint-plugin@5.59.0)(eslint@8.39.0):
-    resolution: {integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==}
+  /eslint-plugin-unused-imports@3.0.0(@typescript-eslint/eslint-plugin@6.2.0)(eslint@8.45.0):
+    resolution: {integrity: sha512-sduiswLJfZHeeBJ+MQaG+xYzSWdRXoSw61DpU13mzWumCkR0ufD0HmO4kdNokjrkluMHpj/7PJeN35pgbhW3kw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.0.0
+      '@typescript-eslint/eslint-plugin': ^6.0.0
       eslint: ^8.0.0
     peerDependenciesMeta:
       '@typescript-eslint/eslint-plugin':
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.0(@typescript-eslint/parser@5.59.0)(eslint@8.39.0)(typescript@5.1.3)
-      eslint: 8.39.0
+      '@typescript-eslint/eslint-plugin': 6.2.0(@typescript-eslint/parser@6.2.0)(eslint@8.45.0)(typescript@5.1.6)
+      eslint: 8.45.0
       eslint-rule-composer: 0.3.0
     dev: true
 
-  /eslint-plugin-vue@9.12.0(eslint@8.39.0):
-    resolution: {integrity: sha512-xH8PgpDW2WwmFSmRfs/3iWogef1CJzQqX264I65zz77jDuxF2yLy7+GA2diUM8ZNATuSl1+UehMQkb5YEyau5w==}
+  /eslint-plugin-vue@9.15.1(eslint@8.45.0):
+    resolution: {integrity: sha512-CJE/oZOslvmAR9hf8SClTdQ9JLweghT6JCBQNrT2Iel1uVw0W0OLJxzvPd6CxmABKCvLrtyDnqGV37O7KQv6+A==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
-      eslint: 8.39.0
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
+      eslint: 8.45.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.11
       semver: 7.5.4
-      vue-eslint-parser: 9.3.0(eslint@8.39.0)
+      vue-eslint-parser: 9.3.1(eslint@8.45.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -11049,13 +10995,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils@3.0.0(eslint@8.39.0):
+  /eslint-utils@3.0.0(eslint@8.45.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.39.0
+      eslint: 8.45.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -11069,16 +11015,21 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint@8.39.0:
-    resolution: {integrity: sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==}
+  /eslint-visitor-keys@3.4.1:
+    resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint@8.45.0:
+    resolution: {integrity: sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.39.0)
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.45.0)
       '@eslint-community/regexpp': 4.5.0
-      '@eslint/eslintrc': 2.0.2
-      '@eslint/js': 8.39.0
-      '@humanwhocodes/config-array': 0.11.8
+      '@eslint/eslintrc': 2.1.0
+      '@eslint/js': 8.44.0
+      '@humanwhocodes/config-array': 0.11.10
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
@@ -11088,8 +11039,8 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.0
-      eslint-visitor-keys: 3.4.0
-      espree: 9.5.1
+      eslint-visitor-keys: 3.4.1
+      espree: 9.6.1
       esquery: 1.5.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
@@ -11097,22 +11048,19 @@ packages:
       find-up: 5.0.0
       glob-parent: 6.0.2
       globals: 13.20.0
-      grapheme-splitter: 1.0.4
+      graphemer: 1.4.0
       ignore: 5.2.4
-      import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
-      js-sdsl: 4.1.5
       js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.1.2
       natural-compare: 1.4.0
-      optionator: 0.9.1
+      optionator: 0.9.3
       strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
@@ -11122,9 +11070,18 @@ packages:
     resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.8.1
-      acorn-jsx: 5.3.2(acorn@8.8.1)
-      eslint-visitor-keys: 3.4.0
+      acorn: 8.10.0
+      acorn-jsx: 5.3.2(acorn@8.10.0)
+      eslint-visitor-keys: 3.4.1
+    dev: true
+
+  /espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      acorn: 8.10.0
+      acorn-jsx: 5.3.2(acorn@8.10.0)
+      eslint-visitor-keys: 3.4.1
     dev: true
 
   /esprima-next@5.8.4:
@@ -11289,37 +11246,27 @@ packages:
     dependencies:
       homedir-polyfill: 1.0.3
 
-  /expect@29.3.1:
-    resolution: {integrity: sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/expect-utils': 29.3.1
-      jest-get-type: 29.2.0
-      jest-matcher-utils: 29.3.1
-      jest-message-util: 29.3.1
-      jest-util: 29.5.0
-    dev: true
-
-  /expect@29.4.2:
-    resolution: {integrity: sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/expect-utils': 29.4.2
-      jest-get-type: 29.4.2
-      jest-matcher-utils: 29.4.2
-      jest-message-util: 29.4.2
-      jest-util: 29.5.0
-    dev: true
-
   /expect@29.5.0:
     resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/expect-utils': 29.5.0
+      '@jest/expect-utils': 29.6.2
       jest-get-type: 29.4.3
       jest-matcher-utils: 29.5.0
       jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      jest-util: 29.6.2
+    dev: true
+
+  /expect@29.6.2:
+    resolution: {integrity: sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/expect-utils': 29.6.2
+      '@types/node': 18.16.16
+      jest-get-type: 29.4.3
+      jest-matcher-utils: 29.6.2
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
     dev: true
 
   /express-async-errors@3.1.1(express@4.18.2):
@@ -11487,6 +11434,7 @@ packages:
   /extsprintf@1.3.0:
     resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
     engines: {'0': node >=0.6.0}
+    dev: true
 
   /fake-xml-http-request@2.1.2:
     resolution: {integrity: sha512-HaFMBi7r+oEC9iJNpc3bvcW7Z7iLmM26hPDmlb0mFwyANSsOQAtJxbdWsXITKOzZUyMYK0zYCv3h5yDj9TsiXg==}
@@ -11590,13 +11538,6 @@ packages:
     resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
     dev: false
 
-  /file-system-cache@2.0.2:
-    resolution: {integrity: sha512-lp4BHO4CWqvRyx88Tt3quZic9ZMf4cJyquYq7UI8sH42Bm2ArlBBjKQAalZOo+UfaBassb7X123Lik5qZ/tSAA==}
-    dependencies:
-      fs-extra: 11.1.0
-      ramda: 0.28.0
-    dev: true
-
   /file-system-cache@2.3.0:
     resolution: {integrity: sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==}
     dependencies:
@@ -11793,7 +11734,7 @@ packages:
       debug:
         optional: true
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
     dev: false
 
   /follow-redirects@1.15.2(debug@4.3.2):
@@ -11806,6 +11747,18 @@ packages:
         optional: true
     dependencies:
       debug: 4.3.2
+    dev: false
+
+  /follow-redirects@1.15.2(debug@4.3.4):
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4(supports-color@8.1.1)
 
   /for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
@@ -11824,16 +11777,17 @@ packages:
       for-in: 1.0.2
     dev: true
 
-  /foreground-child@2.0.0:
-    resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
-    engines: {node: '>=8.0.0'}
+  /foreground-child@3.1.1:
+    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+    engines: {node: '>=14'}
     dependencies:
       cross-spawn: 7.0.3
-      signal-exit: 3.0.7
+      signal-exit: 4.0.2
     dev: true
 
   /forever-agent@0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+    dev: true
 
   /form-data@2.3.3:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
@@ -11842,6 +11796,7 @@ packages:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
+    dev: true
 
   /form-data@2.5.1:
     resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
@@ -11917,15 +11872,6 @@ packages:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
     dev: true
 
-  /fs-extra@11.1.0:
-    resolution: {integrity: sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==}
-    engines: {node: '>=14.14'}
-    dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 6.1.0
-      universalify: 2.0.0
-    dev: true
-
   /fs-extra@11.1.1:
     resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
     engines: {node: '>=14.14'}
@@ -11999,8 +11945,8 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       functions-have-names: 1.2.3
 
   /functions-have-names@1.2.3:
@@ -12093,6 +12039,14 @@ packages:
       has: 1.0.3
       has-symbols: 1.0.3
 
+  /get-intrinsic@1.2.1:
+    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
+    dependencies:
+      function-bind: 1.1.1
+      has: 1.0.3
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+
   /get-npm-tarball-url@2.0.3:
     resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
     engines: {node: '>=12.17'}
@@ -12128,7 +12082,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
 
   /get-system-fonts@2.0.2:
     resolution: {integrity: sha512-zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ==}
@@ -12178,7 +12132,7 @@ packages:
       https-proxy-agent: 5.0.1
       mri: 1.2.0
       node-fetch-native: 1.0.1
-      pathe: 1.1.0
+      pathe: 1.1.1
       tar: 6.1.13
     transitivePeerDependencies:
       - supports-color
@@ -12211,16 +12165,6 @@ packages:
       is-glob: 4.0.3
     dev: true
 
-  /glob-promise@6.0.2(glob@8.1.0):
-    resolution: {integrity: sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      glob: ^8.0.3
-    dependencies:
-      '@types/glob': 8.0.0
-      glob: 8.1.0
-    dev: true
-
   /glob-stream@6.1.0:
     resolution: {integrity: sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==}
     engines: {node: '>= 0.10'}
@@ -12255,6 +12199,18 @@ packages:
       - supports-color
     dev: true
 
+  /glob@10.3.3:
+    resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+    dependencies:
+      foreground-child: 3.1.1
+      jackspeak: 2.2.2
+      minimatch: 9.0.1
+      minipass: 7.0.2
+      path-scurry: 1.10.1
+    dev: true
+
   /glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     dependencies:
@@ -12285,6 +12241,16 @@ packages:
       path-scurry: 1.6.2
     dev: false
 
+  /glob@9.3.2:
+    resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      fs.realpath: 1.0.0
+      minimatch: 7.4.2
+      minipass: 4.2.5
+      path-scurry: 1.10.1
+    dev: true
+
   /global-dirs@3.0.0:
     resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
     engines: {node: '>=10'}
@@ -12335,7 +12301,7 @@ packages:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-properties: 1.1.4
+      define-properties: 1.2.0
 
   /globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
@@ -12381,7 +12347,7 @@ packages:
       array-parallel: 0.1.3
       array-series: 0.1.5
       cross-spawn: 4.0.2
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -12419,7 +12385,7 @@ packages:
   /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
 
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
@@ -12428,6 +12394,10 @@ packages:
     resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
     dev: true
 
+  /graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+    dev: true
+
   /gtoken@6.1.2:
     resolution: {integrity: sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==}
     engines: {node: '>=12.0.0'}
@@ -12511,27 +12481,12 @@ packages:
     optionalDependencies:
       uglify-js: 3.17.4
 
-  /har-schema@2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
-    engines: {node: '>=4'}
-    dev: false
-
-  /har-validator@5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
-    dependencies:
-      ajv: 6.12.6
-      har-schema: 2.0.0
-    dev: false
-
   /has-bigints@1.0.2:
     resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
 
   /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
-    dev: true
 
   /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
@@ -12540,7 +12495,7 @@ packages:
   /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
 
   /has-proto@1.0.1:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
@@ -12608,7 +12563,7 @@ packages:
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /heap@0.2.7:
@@ -12670,7 +12625,7 @@ packages:
       deepmerge: 4.2.2
       he: 1.2.0
       htmlparser2: 6.1.0
-      minimist: 1.2.7
+      minimist: 1.2.8
       selderee: 0.6.0
     dev: false
 
@@ -12741,15 +12696,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /http-signature@1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 1.4.2
-      sshpk: 1.17.0
-    dev: false
-
   /http-signature@1.3.6:
     resolution: {integrity: sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==}
     engines: {node: '>=0.10'}
@@ -12828,13 +12774,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /icss-utils@5.1.0(postcss@8.4.21):
+  /icss-utils@5.1.0(postcss@8.4.27):
     resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.21
+      postcss: 8.4.27
     dev: true
 
   /ieee754@1.1.13:
@@ -12966,7 +12912,15 @@ packages:
     resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
+      has: 1.0.3
+      side-channel: 1.0.4
+
+  /internal-slot@1.0.5:
+    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.1
       has: 1.0.3
       side-channel: 1.0.4
 
@@ -13083,6 +13037,13 @@ packages:
       get-intrinsic: 1.1.3
       is-typed-array: 1.1.10
 
+  /is-array-buffer@3.0.2:
+    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      is-typed-array: 1.1.10
+
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
@@ -13127,13 +13088,19 @@ packages:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
     dependencies:
-      ci-info: 3.7.1
+      ci-info: 3.8.0
     dev: true
 
   /is-core-module@2.11.0:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
       has: 1.0.3
+    dev: true
+
+  /is-core-module@2.12.1:
+    resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==}
+    dependencies:
+      has: 1.0.3
 
   /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
@@ -13211,20 +13178,10 @@ packages:
       number-is-nan: 1.0.1
     dev: true
 
-  /is-fullwidth-code-point@2.0.0:
-    resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
-    engines: {node: '>=4'}
-    dev: true
-
   /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  /is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-    dev: true
-
   /is-function@1.0.2:
     resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==}
     dev: true
@@ -13283,7 +13240,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
+      define-properties: 1.2.0
 
   /is-negated-glob@1.0.0:
     resolution: {integrity: sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==}
@@ -13421,6 +13378,7 @@ packages:
 
   /is-typedarray@1.0.0:
     resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+    dev: true
 
   /is-unc-path@1.0.0:
     resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
@@ -13454,7 +13412,7 @@ packages:
     resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
 
   /is-what@3.14.1:
     resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}
@@ -13510,17 +13468,9 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /isomorphic-unfetch@3.1.0:
-    resolution: {integrity: sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==}
-    dependencies:
-      node-fetch: 2.6.8
-      unfetch: 4.2.0
-    transitivePeerDependencies:
-      - encoding
-    dev: true
-
   /isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
+    dev: true
 
   /istanbul-lib-coverage@3.2.0:
     resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
@@ -13531,8 +13481,8 @@ packages:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/parser': 7.21.8
+      '@babel/core': 7.22.9
+      '@babel/parser': 7.22.7
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 7.5.4
@@ -13568,6 +13518,15 @@ packages:
       istanbul-lib-report: 3.0.0
     dev: true
 
+  /jackspeak@2.2.2:
+    resolution: {integrity: sha512-mgNtVv4vUuaKA97yxUHoA3+FkuhtxkjdXEWOyB/N76fjy0FjezEt34oy3epBtvCvS+7DyKwqCFWx/oJLV5+kCg==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+    dev: true
+
   /jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
@@ -13586,36 +13545,37 @@ packages:
       p-limit: 3.1.0
     dev: true
 
-  /jest-circus@29.5.0:
-    resolution: {integrity: sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==}
+  /jest-circus@29.6.2:
+    resolution: {integrity: sha512-G9mN+KOYIUe2sB9kpJkO9Bk18J4dTDArNFPwoZ7WKHKel55eKIS/u2bLthxgojwlf9NLCVQfgzM/WsOVvoC6Fw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/expect': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.2
+      '@jest/expect': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       chalk: 4.1.2
       co: 4.6.0
-      dedent: 0.7.0
+      dedent: 1.3.0
       is-generator-fn: 2.1.0
-      jest-each: 29.5.0
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-runtime: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
+      jest-each: 29.6.2
+      jest-matcher-utils: 29.6.2
+      jest-message-util: 29.6.2
+      jest-runtime: 29.6.2
+      jest-snapshot: 29.6.2
+      jest-util: 29.6.2
       p-limit: 3.1.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       pure-rand: 6.0.1
       slash: 3.0.0
       stack-utils: 2.0.6
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
     dev: true
 
-  /jest-cli@29.5.0:
-    resolution: {integrity: sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==}
+  /jest-cli@29.6.2:
+    resolution: {integrity: sha512-TT6O247v6dCEX2UGHGyflMpxhnrL0DNqP2fRTKYm3nJJpCTfXX3GCMQPGFjXDoj0i5/Blp3jriKXFgdfmbYB6Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -13624,26 +13584,27 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/core': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/types': 29.6.1
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.5.0(@types/node@18.16.16)
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
+      jest-config: 29.6.2(@types/node@18.16.16)
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
       prompts: 2.4.2
-      yargs: 17.6.2
+      yargs: 17.7.2
     transitivePeerDependencies:
       - '@types/node'
+      - babel-plugin-macros
       - supports-color
       - ts-node
     dev: true
 
-  /jest-config@29.5.0(@types/node@18.16.16):
-    resolution: {integrity: sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==}
+  /jest-config@29.6.2(@types/node@18.16.16):
+    resolution: {integrity: sha512-VxwFOC8gkiJbuodG9CPtMRjBUNZEHxwfQXmIudSTzFWxaci3Qub1ddTRbFNQlD/zUeaifLndh/eDccFX4wCMQw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
@@ -13654,61 +13615,52 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.21.8
-      '@jest/test-sequencer': 29.5.0
-      '@jest/types': 29.5.0
+      '@babel/core': 7.22.9
+      '@jest/test-sequencer': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
-      babel-jest: 29.5.0(@babel/core@7.21.8)
+      babel-jest: 29.6.2(@babel/core@7.22.9)
       chalk: 4.1.2
-      ci-info: 3.7.1
+      ci-info: 3.8.0
       deepmerge: 4.2.2
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-circus: 29.5.0
-      jest-environment-node: 29.5.0
+      jest-circus: 29.6.2
+      jest-environment-node: 29.6.2
       jest-get-type: 29.4.3
       jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-runner: 29.5.0
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
+      jest-resolve: 29.6.2
+      jest-runner: 29.6.2
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       slash: 3.0.0
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
     dev: true
 
-  /jest-diff@29.3.1:
-    resolution: {integrity: sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.4.2
-      jest-get-type: 29.4.2
-      pretty-format: 29.5.0
-    dev: true
-
-  /jest-diff@29.4.2:
-    resolution: {integrity: sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g==}
+  /jest-diff@29.5.0:
+    resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      diff-sequences: 29.4.2
-      jest-get-type: 29.4.2
-      pretty-format: 29.5.0
+      diff-sequences: 29.4.3
+      jest-get-type: 29.4.3
+      pretty-format: 29.6.2
     dev: true
 
-  /jest-diff@29.5.0:
-    resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
+  /jest-diff@29.6.2:
+    resolution: {integrity: sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       diff-sequences: 29.4.3
       jest-get-type: 29.4.3
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
     dev: true
 
   /jest-docblock@29.4.3:
@@ -13718,19 +13670,19 @@ packages:
       detect-newline: 3.1.0
     dev: true
 
-  /jest-each@29.5.0:
-    resolution: {integrity: sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==}
+  /jest-each@29.6.2:
+    resolution: {integrity: sha512-MsrsqA0Ia99cIpABBc3izS1ZYoYfhIy0NNWqPSE0YXbQjwchyt6B1HD2khzyPe1WiJA7hbxXy77ZoUQxn8UlSw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       chalk: 4.1.2
       jest-get-type: 29.4.3
-      jest-util: 29.5.0
-      pretty-format: 29.5.0
+      jest-util: 29.6.2
+      pretty-format: 29.6.2
     dev: true
 
-  /jest-environment-jsdom@29.5.0:
-    resolution: {integrity: sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==}
+  /jest-environment-jsdom@29.6.2:
+    resolution: {integrity: sha512-7oa/+266AAEgkzae8i1awNEfTfjwawWKLpiw2XesZmaoVVj9u9t8JOYx18cG29rbPNtkUlZ8V4b5Jb36y/VxoQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       canvas: ^2.5.0
@@ -13738,13 +13690,13 @@ packages:
       canvas:
         optional: true
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.2
+      '@jest/fake-timers': 29.6.2
+      '@jest/types': 29.6.1
       '@types/jsdom': 20.0.1
       '@types/node': 18.16.16
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
+      jest-mock: 29.6.2
+      jest-util: 29.6.2
       jsdom: 20.0.2
     transitivePeerDependencies:
       - bufferutil
@@ -13752,32 +13704,22 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jest-environment-node@29.5.0:
-    resolution: {integrity: sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==}
+  /jest-environment-node@29.6.2:
+    resolution: {integrity: sha512-YGdFeZ3T9a+/612c5mTQIllvWkddPbYcN2v95ZH24oWMbGA4GGS2XdIF92QMhUhvrjjuQWYgUGW2zawOyH63MQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.2
+      '@jest/fake-timers': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
+      jest-mock: 29.6.2
+      jest-util: 29.6.2
     dev: true
 
   /jest-expect-message@1.1.3:
     resolution: {integrity: sha512-bTK77T4P+zto+XepAX3low8XVQxDgaEqh3jSTQOG8qvPpD69LsIdyJTa+RmnJh3HNSzJng62/44RPPc7OIlFxg==}
     dev: true
 
-  /jest-get-type@29.2.0:
-    resolution: {integrity: sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
-
-  /jest-get-type@29.4.2:
-    resolution: {integrity: sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: true
-
   /jest-get-type@29.4.3:
     resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -13787,14 +13729,14 @@ packages:
     resolution: {integrity: sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       '@types/graceful-fs': 4.1.6
       '@types/node': 18.16.16
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.10
       jest-regex-util: 29.4.3
-      jest-util: 29.5.0
+      jest-util: 29.6.2
       jest-worker: 29.5.0
       micromatch: 4.0.5
       walker: 1.0.8
@@ -13802,32 +13744,31 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /jest-leak-detector@29.5.0:
-    resolution: {integrity: sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: true
-
-  /jest-matcher-utils@29.3.1:
-    resolution: {integrity: sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==}
+  /jest-haste-map@29.6.2:
+    resolution: {integrity: sha512-+51XleTDAAysvU8rT6AnS1ZJ+WHVNqhj1k6nTvN2PYP+HjU3kqlaKQ1Lnw3NYW3bm2r8vq82X0Z1nDDHZMzHVA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.3.1
-      jest-get-type: 29.2.0
-      pretty-format: 29.5.0
+      '@jest/types': 29.6.1
+      '@types/graceful-fs': 4.1.6
+      '@types/node': 18.16.16
+      anymatch: 3.1.3
+      fb-watchman: 2.0.2
+      graceful-fs: 4.2.10
+      jest-regex-util: 29.4.3
+      jest-util: 29.6.2
+      jest-worker: 29.6.2
+      micromatch: 4.0.5
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.2
     dev: true
 
-  /jest-matcher-utils@29.4.2:
-    resolution: {integrity: sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg==}
+  /jest-leak-detector@29.6.2:
+    resolution: {integrity: sha512-aNqYhfp5uYEO3tdWMb2bfWv6f0b4I0LOxVRpnRLAeque2uqOVVMLh6khnTcE2qJ5wAKop0HcreM1btoysD6bPQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.4.2
-      jest-get-type: 29.4.2
-      pretty-format: 29.5.0
+      jest-get-type: 29.4.3
+      pretty-format: 29.6.2
     dev: true
 
   /jest-matcher-utils@29.5.0:
@@ -13837,75 +13778,70 @@ packages:
       chalk: 4.1.2
       jest-diff: 29.5.0
       jest-get-type: 29.4.3
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
     dev: true
 
-  /jest-message-util@29.3.1:
-    resolution: {integrity: sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==}
+  /jest-matcher-utils@29.6.2:
+    resolution: {integrity: sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@jest/types': 29.5.0
-      '@types/stack-utils': 2.0.1
       chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 29.5.0
-      slash: 3.0.0
-      stack-utils: 2.0.6
+      jest-diff: 29.6.2
+      jest-get-type: 29.4.3
+      pretty-format: 29.6.2
     dev: true
 
-  /jest-message-util@29.4.2:
-    resolution: {integrity: sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g==}
+  /jest-message-util@29.5.0:
+    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@jest/types': 29.5.0
+      '@babel/code-frame': 7.22.5
+      '@jest/types': 29.6.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       slash: 3.0.0
       stack-utils: 2.0.6
     dev: true
 
-  /jest-message-util@29.5.0:
-    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
+  /jest-message-util@29.6.2:
+    resolution: {integrity: sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/code-frame': 7.21.4
-      '@jest/types': 29.5.0
+      '@babel/code-frame': 7.22.5
+      '@jest/types': 29.6.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       slash: 3.0.0
       stack-utils: 2.0.6
     dev: true
 
-  /jest-mock-extended@3.0.4(jest@29.5.0)(typescript@5.1.3):
+  /jest-mock-extended@3.0.4(jest@29.6.2)(typescript@5.1.6):
     resolution: {integrity: sha512-2ynEZ7IEJNrhrgshklDMhrOdnmW4Nt+PhkyRqZxRgpwMo7JjmFWMzyp0+eSyk+H9KK1QjXI5xTZIw6x7cVDcRg==}
     peerDependencies:
       jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0
       typescript: ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      jest: 29.5.0
-      ts-essentials: 7.0.3(typescript@5.1.3)
-      typescript: 5.1.3
+      jest: 29.6.2
+      ts-essentials: 7.0.3(typescript@5.1.6)
+      typescript: 5.1.6
     dev: true
 
-  /jest-mock@29.5.0:
-    resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
+  /jest-mock@29.6.2:
+    resolution: {integrity: sha512-hoSv3lb3byzdKfwqCuT6uTscan471GUECqgNYykg6ob0yiAw3zYc7OrPnI9Qv8Wwoa4lC7AZ9hyS4AiIx5U2zg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
-      jest-util: 29.5.0
+      jest-util: 29.6.2
     dev: true
 
-  /jest-pnp-resolver@1.2.2(jest-resolve@29.5.0):
+  /jest-pnp-resolver@1.2.2(jest-resolve@29.6.2):
     resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -13914,7 +13850,7 @@ packages:
       jest-resolve:
         optional: true
     dependencies:
-      jest-resolve: 29.5.0
+      jest-resolve: 29.6.2
     dev: true
 
   /jest-regex-util@29.4.3:
@@ -13922,116 +13858,113 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /jest-resolve-dependencies@29.5.0:
-    resolution: {integrity: sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==}
+  /jest-resolve-dependencies@29.6.2:
+    resolution: {integrity: sha512-LGqjDWxg2fuQQm7ypDxduLu/m4+4Lb4gczc13v51VMZbVP5tSBILqVx8qfWcsdP8f0G7aIqByIALDB0R93yL+w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-regex-util: 29.4.3
-      jest-snapshot: 29.5.0
+      jest-snapshot: 29.6.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-resolve@29.5.0:
-    resolution: {integrity: sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==}
+  /jest-resolve@29.6.2:
+    resolution: {integrity: sha512-G/iQUvZWI5e3SMFssc4ug4dH0aZiZpsDq9o1PtXTV1210Ztyb2+w+ZgQkB3iOiC5SmAEzJBOHWz6Hvrd+QnNPw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-pnp-resolver: 1.2.2(jest-resolve@29.5.0)
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      resolve: 1.22.1
+      jest-haste-map: 29.6.2
+      jest-pnp-resolver: 1.2.2(jest-resolve@29.6.2)
+      jest-util: 29.6.2
+      jest-validate: 29.6.2
+      resolve: 1.22.3
       resolve.exports: 2.0.0
       slash: 3.0.0
     dev: true
 
-  /jest-runner@29.5.0:
-    resolution: {integrity: sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==}
+  /jest-runner@29.6.2:
+    resolution: {integrity: sha512-wXOT/a0EspYgfMiYHxwGLPCZfC0c38MivAlb2lMEAlwHINKemrttu1uSbcGbfDV31sFaPWnWJPmb2qXM8pqZ4w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/environment': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/console': 29.6.2
+      '@jest/environment': 29.6.2
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.10
       jest-docblock: 29.4.3
-      jest-environment-node: 29.5.0
-      jest-haste-map: 29.5.0
-      jest-leak-detector: 29.5.0
-      jest-message-util: 29.5.0
-      jest-resolve: 29.5.0
-      jest-runtime: 29.5.0
-      jest-util: 29.5.0
-      jest-watcher: 29.5.0
-      jest-worker: 29.5.0
+      jest-environment-node: 29.6.2
+      jest-haste-map: 29.6.2
+      jest-leak-detector: 29.6.2
+      jest-message-util: 29.6.2
+      jest-resolve: 29.6.2
+      jest-runtime: 29.6.2
+      jest-util: 29.6.2
+      jest-watcher: 29.6.2
+      jest-worker: 29.6.2
       p-limit: 3.1.0
       source-map-support: 0.5.13
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-runtime@29.5.0:
-    resolution: {integrity: sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==}
+  /jest-runtime@29.6.2:
+    resolution: {integrity: sha512-2X9dqK768KufGJyIeLmIzToDmsN0m7Iek8QNxRSI/2+iPFYHF0jTwlO3ftn7gdKd98G/VQw9XJCk77rbTGZnJg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/globals': 29.5.0
-      '@jest/source-map': 29.4.3
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.2
+      '@jest/fake-timers': 29.6.2
+      '@jest/globals': 29.6.2
+      '@jest/source-map': 29.6.0
+      '@jest/test-result': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-message-util: 29.5.0
-      jest-mock: 29.5.0
+      jest-haste-map: 29.6.2
+      jest-message-util: 29.6.2
+      jest-mock: 29.6.2
       jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
+      jest-resolve: 29.6.2
+      jest-snapshot: 29.6.2
+      jest-util: 29.6.2
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-snapshot@29.5.0:
-    resolution: {integrity: sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==}
+  /jest-snapshot@29.6.2:
+    resolution: {integrity: sha512-1OdjqvqmRdGNvWXr/YZHuyhh5DeaLp1p/F8Tht/MrMw4Kr1Uu/j4lRG+iKl1DAqUJDWxtQBMk41Lnf/JETYBRA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/generator': 7.21.5
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.21.8)
-      '@babel/traverse': 7.21.5
-      '@babel/types': 7.21.5
-      '@jest/expect-utils': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/babel__traverse': 7.18.2
-      '@types/prettier': 2.7.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/generator': 7.22.9
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.22.9)
+      '@babel/types': 7.22.5
+      '@jest/expect-utils': 29.6.2
+      '@jest/transform': 29.6.2
+      '@jest/types': 29.6.1
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.9)
       chalk: 4.1.2
-      expect: 29.5.0
+      expect: 29.6.2
       graceful-fs: 4.2.10
-      jest-diff: 29.5.0
+      jest-diff: 29.6.2
       jest-get-type: 29.4.3
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      jest-matcher-utils: 29.6.2
+      jest-message-util: 29.6.2
+      jest-util: 29.6.2
       natural-compare: 1.4.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
       semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
@@ -14041,37 +13974,49 @@ packages:
     resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
+      '@types/node': 18.16.16
+      chalk: 4.1.2
+      ci-info: 3.8.0
+      graceful-fs: 4.2.10
+      picomatch: 2.3.1
+    dev: true
+
+  /jest-util@29.6.2:
+    resolution: {integrity: sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       chalk: 4.1.2
-      ci-info: 3.7.1
+      ci-info: 3.8.0
       graceful-fs: 4.2.10
       picomatch: 2.3.1
     dev: true
 
-  /jest-validate@29.5.0:
-    resolution: {integrity: sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==}
+  /jest-validate@29.6.2:
+    resolution: {integrity: sha512-vGz0yMN5fUFRRbpJDPwxMpgSXW1LDKROHfBopAvDcmD6s+B/s8WJrwi+4bfH4SdInBA5C3P3BI19dBtKzx1Arg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.1
       camelcase: 6.3.0
       chalk: 4.1.2
       jest-get-type: 29.4.3
       leven: 3.1.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.2
     dev: true
 
-  /jest-watcher@29.5.0:
-    resolution: {integrity: sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==}
+  /jest-watcher@29.6.2:
+    resolution: {integrity: sha512-GZitlqkMkhkefjfN/p3SJjrDaxPflqxEAv3/ik10OirZqJGYH5rPiIsgVcfof0Tdqg3shQGdEIxDBx+B4tuLzA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/test-result': 29.6.2
+      '@jest/types': 29.6.1
       '@types/node': 18.16.16
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
-      jest-util: 29.5.0
+      jest-util: 29.6.2
       string-length: 4.0.2
     dev: true
 
@@ -14089,13 +14034,23 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@types/node': 18.16.16
-      jest-util: 29.5.0
+      jest-util: 29.6.2
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest@29.5.0:
-    resolution: {integrity: sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==}
+  /jest-worker@29.6.2:
+    resolution: {integrity: sha512-l3ccBOabTdkng8I/ORCkADz4eSMKejTYv1vB/Z83UiubqhC1oQ5Li6dWCyqOIvSifGjUBxuvxvlm6KGK2DtuAQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@types/node': 18.16.16
+      jest-util: 29.6.2
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+    dev: true
+
+  /jest@29.6.2:
+    resolution: {integrity: sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -14104,12 +14059,13 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/core': 29.6.2
+      '@jest/types': 29.6.1
       import-local: 3.1.0
-      jest-cli: 29.5.0
+      jest-cli: 29.6.2
     transitivePeerDependencies:
       - '@types/node'
+      - babel-plugin-macros
       - supports-color
       - ts-node
     dev: true
@@ -14165,10 +14121,6 @@ packages:
     resolution: {integrity: sha512-HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q==}
     dev: false
 
-  /js-sdsl@4.1.5:
-    resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
-    dev: true
-
   /js-stringify@1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
     dev: true
@@ -14197,23 +14149,23 @@ packages:
   /jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
-  /jscodeshift@0.14.0(@babel/preset-env@7.21.5):
+  /jscodeshift@0.14.0(@babel/preset-env@7.22.9):
     resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
     hasBin: true
     peerDependencies:
       '@babel/preset-env': ^7.1.6
     dependencies:
-      '@babel/core': 7.21.8
-      '@babel/parser': 7.21.8
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8)
-      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8)
-      '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.21.8)
-      '@babel/preset-env': 7.21.5(@babel/core@7.21.8)
-      '@babel/preset-flow': 7.18.6(@babel/core@7.21.8)
-      '@babel/preset-typescript': 7.18.6(@babel/core@7.21.8)
-      '@babel/register': 7.18.9(@babel/core@7.21.8)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.21.8)
+      '@babel/core': 7.22.9
+      '@babel/parser': 7.22.7
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.22.9)
+      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.9)
+      '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.22.9)
+      '@babel/preset-env': 7.22.9(@babel/core@7.22.9)
+      '@babel/preset-flow': 7.18.6(@babel/core@7.22.9)
+      '@babel/preset-typescript': 7.18.6(@babel/core@7.22.9)
+      '@babel/register': 7.18.9(@babel/core@7.22.9)
+      babel-core: 7.0.0-bridge.0(@babel/core@7.22.9)
       chalk: 4.1.2
       flow-parser: 0.197.0
       graceful-fs: 4.2.10
@@ -14237,7 +14189,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.8.1
+      acorn: 8.10.0
       acorn-globals: 7.0.1
       cssom: 0.5.0
       cssstyle: 2.3.0
@@ -14360,18 +14312,20 @@ packages:
 
   /json-schema@0.4.0:
     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
+    dev: true
 
   /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
   /json-stringify-safe@5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+    dev: true
 
   /json5@1.0.2:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
     dependencies:
-      minimist: 1.2.7
+      minimist: 1.2.8
     dev: true
 
   /json5@2.2.3:
@@ -14416,15 +14370,6 @@ packages:
       lodash: 4.17.21
       ms: 2.1.3
       semver: 7.5.4
-
-  /jsprim@1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
-    engines: {node: '>=0.6.0'}
-    dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.4.0
-      verror: 1.10.0
     dev: false
 
   /jsprim@2.0.2:
@@ -14458,6 +14403,7 @@ packages:
       buffer-equal-constant-time: 1.0.1
       ecdsa-sig-formatter: 1.0.11
       safe-buffer: 5.2.1
+    dev: false
 
   /jwa@2.0.0:
     resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
@@ -14486,6 +14432,7 @@ packages:
     dependencies:
       jwa: 1.4.1
       safe-buffer: 5.2.1
+    dev: false
 
   /jws@4.0.0:
     resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
@@ -14555,7 +14502,7 @@ packages:
     engines: {node: '>=14.0.0'}
     dependencies:
       app-root-dir: 1.0.2
-      dotenv: 16.0.3
+      dotenv: 16.3.1
       dotenv-expand: 10.0.0
     dev: true
 
@@ -14603,7 +14550,7 @@ packages:
       webpack: ^5.0.0
     dependencies:
       less: 4.1.3
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /less@4.1.3:
@@ -14613,7 +14560,7 @@ packages:
     dependencies:
       copy-anything: 2.0.6
       parse-node-version: 1.0.1
-      tslib: 2.5.0
+      tslib: 2.6.1
     optionalDependencies:
       errno: 0.1.8
       graceful-fs: 4.2.10
@@ -14689,7 +14636,7 @@ packages:
       is-plain-object: 2.0.4
       object.map: 1.0.1
       rechoir: 0.6.2
-      resolve: 1.22.1
+      resolve: 1.22.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -14729,7 +14676,7 @@ packages:
       log-update: 4.0.0
       p-map: 4.0.0
       rfdc: 1.3.0
-      rxjs: 7.5.7
+      rxjs: 7.8.1
       through: 2.3.8
       wrap-ansi: 7.0.0
     dev: true
@@ -14778,8 +14725,8 @@ packages:
       json5: 2.2.3
     dev: true
 
-  /local-pkg@0.4.2:
-    resolution: {integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg==}
+  /local-pkg@0.4.3:
+    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
     engines: {node: '>=14'}
     dev: true
 
@@ -15022,7 +14969,7 @@ packages:
   /lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /lru-cache@4.0.2:
     resolution: {integrity: sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==}
@@ -15056,7 +15003,6 @@ packages:
   /lru-cache@9.1.2:
     resolution: {integrity: sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==}
     engines: {node: 14 || >=16.14}
-    dev: false
 
   /lru-memoizer@2.1.4:
     resolution: {integrity: sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==}
@@ -15082,7 +15028,7 @@ packages:
     resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
     engines: {node: '>=12'}
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.14
+      '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
   /magic-string@0.30.1:
@@ -15232,7 +15178,7 @@ packages:
     dependencies:
       findup-sync: 2.0.0
       micromatch: 3.1.10
-      resolve: 1.22.1
+      resolve: 1.22.3
       stack-trace: 0.0.10
     transitivePeerDependencies:
       - supports-color
@@ -15396,7 +15342,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
-    dev: false
 
   /minimatch@9.0.1:
     resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
@@ -15408,6 +15353,9 @@ packages:
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
 
+  /minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
   /minipass-collect@1.0.2:
     resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
     engines: {node: '>= 8'}
@@ -15462,6 +15410,11 @@ packages:
     resolution: {integrity: sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==}
     engines: {node: '>=8'}
 
+  /minipass@7.0.2:
+    resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dev: true
+
   /minizlib@2.1.2:
     resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
     engines: {node: '>= 8'}
@@ -15517,7 +15470,7 @@ packages:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
     dependencies:
-      minimist: 1.2.7
+      minimist: 1.2.8
 
   /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
@@ -15530,25 +15483,13 @@ packages:
     hasBin: true
     dev: false
 
-  /mlly@1.1.0:
-    resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
+  /mlly@1.4.0:
+    resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==}
     dependencies:
-      acorn: 8.8.1
-      pathe: 1.1.0
-      pkg-types: 1.0.1
-      ufo: 1.0.1
-    dev: true
-
-  /mock-jwks@1.0.9(nock@13.2.9):
-    resolution: {integrity: sha512-kshOXv5h5hA5bGR0Mb2S24GFdKkFvrWoRTv3phLRKH/HRu/UoPUx0zJLAorOE8SmFtGsfOTPFD7jfQD5Y9ZlZA==}
-    peerDependencies:
-      nock: ^11 || ^12 || ^13
-    dependencies:
-      base64-url: 2.3.3
-      jsonwebtoken: 9.0.0
-      nock: 13.2.9
-      node-forge: 1.3.1
-      node-rsa: 1.1.1
+      acorn: 8.10.0
+      pathe: 1.1.1
+      pkg-types: 1.0.3
+      ufo: 1.1.2
     dev: true
 
   /moment-timezone@0.5.37:
@@ -15672,8 +15613,8 @@ packages:
       - supports-color
     dev: false
 
-  /muggle-string@0.1.0:
-    resolution: {integrity: sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==}
+  /muggle-string@0.3.1:
+    resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
     dev: true
 
   /multer@1.4.5-lts.1:
@@ -15795,7 +15736,7 @@ packages:
     engines: {node: '>= 4.4.x'}
     hasBin: true
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       iconv-lite: 0.6.3
       sax: 1.2.4
     transitivePeerDependencies:
@@ -15826,10 +15767,10 @@ packages:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.5.0
+      tslib: 2.6.1
 
-  /nock@13.2.9:
-    resolution: {integrity: sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA==}
+  /nock@13.3.2:
+    resolution: {integrity: sha512-CwbljitiWJhF1gL83NbanhoKs1l23TDlRioNraPTZrzZIEooPemrHRj5m0FZCPkB1ecdYCSWWGcHysJgX/ngnQ==}
     engines: {node: '>= 10.13'}
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
@@ -15877,6 +15818,7 @@ packages:
   /node-forge@1.3.1:
     resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
     engines: {node: '>= 6.13.0'}
+    dev: false
 
   /node-gyp-build-optional-packages@5.0.3:
     resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==}
@@ -15927,14 +15869,15 @@ packages:
     resolution: {integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==}
     dev: false
 
-  /node-releases@2.0.8:
-    resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
+  /node-releases@2.0.13:
+    resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==}
     dev: true
 
   /node-rsa@1.1.1:
     resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
     dependencies:
       asn1: 0.2.6
+    dev: false
 
   /node-ssh@12.0.5:
     resolution: {integrity: sha512-uN2GTGdBRUUKkZmcNBr9OM+xKL6zq74emnkSyb1TshBdVWegj3boue6QallQeqZzo7YGVheP5gAovUL+8hZSig==}
@@ -15965,9 +15908,9 @@ packages:
     engines: {node: '>=6.0.0'}
     dev: false
 
-  /nodemon@2.0.20:
-    resolution: {integrity: sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==}
-    engines: {node: '>=8.10.0'}
+  /nodemon@3.0.1:
+    resolution: {integrity: sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==}
+    engines: {node: '>=10'}
     hasBin: true
     dependencies:
       chokidar: 3.5.2
@@ -15976,7 +15919,7 @@ packages:
       minimatch: 3.1.2
       pstree.remy: 1.1.8
       semver: 7.5.4
-      simple-update-notifier: 1.0.7
+      simple-update-notifier: 2.0.0
       supports-color: 5.5.0
       touch: 3.1.0
       undefsafe: 2.0.5
@@ -16009,7 +15952,7 @@ packages:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
-      resolve: 1.22.1
+      resolve: 1.22.3
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -16019,7 +15962,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       hosted-git-info: 4.1.0
-      is-core-module: 2.11.0
+      is-core-module: 2.12.1
       semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
@@ -16126,10 +16069,6 @@ packages:
     resolution: {integrity: sha512-6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ==}
     dev: false
 
-  /oauth-sign@0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
-    dev: false
-
   /object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -16190,6 +16129,15 @@ packages:
   /object.entries@1.1.5:
     resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
     engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+    dev: true
+
+  /object.fromentries@2.0.6:
+    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
+    engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
@@ -16202,10 +16150,19 @@ packages:
     dependencies:
       array.prototype.reduce: 1.0.4
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: false
 
+  /object.groupby@1.0.0:
+    resolution: {integrity: sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      get-intrinsic: 1.2.1
+    dev: true
+
   /object.map@1.0.1:
     resolution: {integrity: sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==}
     engines: {node: '>=0.10.0'}
@@ -16277,6 +16234,7 @@ packages:
     dependencies:
       is-docker: 2.2.1
       is-wsl: 2.2.0
+    dev: false
 
   /open@8.4.0:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
@@ -16309,16 +16267,16 @@ packages:
       type-check: 0.3.2
       word-wrap: 1.2.3
 
-  /optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
+  /optionator@0.9.3:
+    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
     dependencies:
+      '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
-      word-wrap: 1.2.3
     dev: true
 
   /ora@5.4.1:
@@ -16371,7 +16329,7 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
     dependencies:
-      minimist: 1.2.7
+      minimist: 1.2.8
     dev: false
 
   /otpauth@9.1.1:
@@ -16495,7 +16453,7 @@ packages:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /parent-module@1.0.1:
@@ -16539,7 +16497,7 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/code-frame': 7.21.4
+      '@babel/code-frame': 7.22.5
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -16593,7 +16551,7 @@ packages:
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /pascalcase@0.1.1:
     resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
@@ -16638,7 +16596,7 @@ packages:
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /path-dirname@1.0.2:
@@ -16689,6 +16647,14 @@ packages:
       path-root-regex: 0.1.2
     dev: true
 
+  /path-scurry@1.10.1:
+    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      lru-cache: 9.1.2
+      minipass: 7.0.2
+    dev: true
+
   /path-scurry@1.6.2:
     resolution: {integrity: sha512-J6MQNh56h6eHFY3vsQ+Lq+zKPwn71POieutmVt2leU8W+zz8HVIdJyn3I3Zs6IKbIQtuKXirVjTBFNBcbFO44Q==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -16717,8 +16683,8 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
-  /pathe@1.1.0:
-    resolution: {integrity: sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==}
+  /pathe@1.1.1:
+    resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
     dev: true
 
   /pathval@1.1.1:
@@ -16765,6 +16731,7 @@ packages:
 
   /performance-now@2.1.0:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
+    dev: true
 
   /pg-connection-string@2.5.0:
     resolution: {integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==}
@@ -16855,32 +16822,27 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-    dev: true
-
   /pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
     dev: true
 
-  /pinia@2.0.23(typescript@5.1.3)(vue@3.3.4):
-    resolution: {integrity: sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==}
+  /pinia@2.1.6(typescript@5.1.6)(vue@3.3.4):
+    resolution: {integrity: sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
       typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.2.0
+      vue: ^2.6.14 || ^3.3.0
     peerDependenciesMeta:
       '@vue/composition-api':
         optional: true
       typescript:
         optional: true
     dependencies:
-      '@vue/devtools-api': 6.4.5
-      typescript: 5.1.3
+      '@vue/devtools-api': 6.5.0
+      typescript: 5.1.6
       vue: 3.3.4
-      vue-demi: 0.13.11(vue@3.3.4)
+      vue-demi: 0.14.5(vue@3.3.4)
 
   /pinkie-promise@2.0.1:
     resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==}
@@ -16927,12 +16889,12 @@ packages:
       find-up: 5.0.0
     dev: true
 
-  /pkg-types@1.0.1:
-    resolution: {integrity: sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==}
+  /pkg-types@1.0.3:
+    resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.1.0
-      pathe: 1.1.0
+      mlly: 1.4.0
+      pathe: 1.1.1
     dev: true
 
   /plimit-lit@1.4.1:
@@ -16950,7 +16912,7 @@ packages:
     resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.22.6
     dev: true
 
   /posix-character-classes@0.1.1:
@@ -16971,10 +16933,10 @@ packages:
       postcss: 7.0.39
       schema-utils: 3.1.1
       semver: 7.5.4
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
-  /postcss-loader@7.3.3(postcss@8.4.21)(webpack@5.75.0):
+  /postcss-loader@7.3.3(postcss@8.4.27)(webpack@5.75.0):
     resolution: {integrity: sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA==}
     engines: {node: '>= 14.15.0'}
     peerDependencies:
@@ -16983,9 +16945,9 @@ packages:
     dependencies:
       cosmiconfig: 8.2.0
       jiti: 1.19.1
-      postcss: 8.4.21
+      postcss: 8.4.27
       semver: 7.5.4
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /postcss-modules-extract-imports@2.0.0:
@@ -16995,13 +16957,13 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.21):
+  /postcss-modules-extract-imports@3.0.0(postcss@8.4.27):
     resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.21
+      postcss: 8.4.27
     dev: true
 
   /postcss-modules-local-by-default@3.0.3:
@@ -17014,14 +16976,14 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /postcss-modules-local-by-default@4.0.0(postcss@8.4.21):
+  /postcss-modules-local-by-default@4.0.0(postcss@8.4.27):
     resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
+      icss-utils: 5.1.0(postcss@8.4.27)
+      postcss: 8.4.27
       postcss-selector-parser: 6.0.11
       postcss-value-parser: 4.2.0
     dev: true
@@ -17034,13 +16996,13 @@ packages:
       postcss-selector-parser: 6.0.11
     dev: true
 
-  /postcss-modules-scope@3.0.0(postcss@8.4.21):
+  /postcss-modules-scope@3.0.0(postcss@8.4.27):
     resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.21
+      postcss: 8.4.27
       postcss-selector-parser: 6.0.11
     dev: true
 
@@ -17051,14 +17013,14 @@ packages:
       postcss: 7.0.39
     dev: true
 
-  /postcss-modules-values@4.0.0(postcss@8.4.21):
+  /postcss-modules-values@4.0.0(postcss@8.4.27):
     resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.21)
-      postcss: 8.4.21
+      icss-utils: 5.1.0(postcss@8.4.27)
+      postcss: 8.4.27
     dev: true
 
   /postcss-selector-parser@6.0.11:
@@ -17089,6 +17051,15 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
+  /postcss@8.4.27:
+    resolution: {integrity: sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.6
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: true
+
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
     engines: {node: '>=4'}
@@ -17115,7 +17086,7 @@ packages:
     resolution: {integrity: sha512-aXYe/D+28kF63W8Cz53t09ypEORz+ULeDCahdAqhVrRm2scbOXFbtnn0GGhvMpYe45grepLKuwui9KxrZ2ZuMw==}
     engines: {node: '>=14.17.0'}
     dependencies:
-      axios: 0.27.2(debug@3.2.7)
+      axios: 0.27.2(debug@4.3.4)
     transitivePeerDependencies:
       - debug
     dev: false
@@ -17143,9 +17114,9 @@ packages:
       fast-diff: 1.2.0
     dev: true
 
-  /prettier@2.8.3:
-    resolution: {integrity: sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==}
-    engines: {node: '>=10.13.0'}
+  /prettier@3.0.0:
+    resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==}
+    engines: {node: '>=14'}
     hasBin: true
 
   /pretty-bytes@5.6.0:
@@ -17161,8 +17132,8 @@ packages:
       react-is: 17.0.2
     dev: true
 
-  /pretty-format@29.4.2:
-    resolution: {integrity: sha512-qKlHR8yFVCbcEWba0H0TOC8dnLlO4vPlyEjRPw31FZ2Rupy9nLa8ZLbYny8gWEl8CkEhJqAE6IzdNELTBVcBEg==}
+  /pretty-format@29.5.0:
+    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/schemas': 29.4.3
@@ -17170,11 +17141,11 @@ packages:
       react-is: 18.2.0
     dev: true
 
-  /pretty-format@29.5.0:
-    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
+  /pretty-format@29.6.2:
+    resolution: {integrity: sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.4.3
+      '@jest/schemas': 29.6.0
       ansi-styles: 5.2.0
       react-is: 18.2.0
     dev: true
@@ -17371,7 +17342,7 @@ packages:
       jstransformer: 1.0.0
       pug-error: 2.0.0
       pug-walk: 2.0.0
-      resolve: 1.22.1
+      resolve: 1.22.3
     dev: true
 
   /pug-lexer@5.0.1:
@@ -17521,15 +17492,19 @@ packages:
       - supports-color
     dev: true
 
-  /qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
+  /qs@6.10.5:
+    resolution: {integrity: sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==}
     engines: {node: '>=0.6'}
+    deprecated: when using stringify with arrayFormat comma, `[]` is appended on single-item arrays. Upgrade to v6.11.0 or downgrade to v6.10.4 to fix.
     dependencies:
       side-channel: 1.0.4
+    dev: true
 
-  /qs@6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
+  /qs@6.11.0:
+    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
     engines: {node: '>=0.6'}
+    dependencies:
+      side-channel: 1.0.4
 
   /query-string@7.1.1:
     resolution: {integrity: sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==}
@@ -17568,10 +17543,6 @@ packages:
     resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
     dev: false
 
-  /ramda@0.28.0:
-    resolution: {integrity: sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==}
-    dev: true
-
   /ramda@0.29.0:
     resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
     dev: true
@@ -17692,15 +17663,6 @@ packages:
       path-type: 1.1.0
     dev: true
 
-  /read-pkg@4.0.1:
-    resolution: {integrity: sha512-+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w==}
-    engines: {node: '>=6'}
-    dependencies:
-      normalize-package-data: 2.5.0
-      parse-json: 4.0.0
-      pify: 3.0.0
-    dev: true
-
   /read-pkg@5.2.0:
     resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
     engines: {node: '>=8'}
@@ -17759,7 +17721,7 @@ packages:
       ast-types: 0.15.2
       esprima: 4.0.1
       source-map: 0.6.1
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /recast@0.22.0:
     resolution: {integrity: sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ==}
@@ -17769,7 +17731,7 @@ packages:
       ast-types: 0.15.2
       esprima: 4.0.1
       source-map: 0.6.1
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
   /recast@0.23.3:
@@ -17780,14 +17742,14 @@ packages:
       ast-types: 0.16.1
       esprima: 4.0.1
       source-map: 0.6.1
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
   /rechoir@0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
     engines: {node: '>= 0.10'}
     dependencies:
-      resolve: 1.22.1
+      resolve: 1.22.3
 
   /redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
@@ -17853,7 +17815,7 @@ packages:
   /regenerator-transform@0.15.1:
     resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==}
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.22.6
     dev: true
 
   /regex-not@1.0.2:
@@ -17868,8 +17830,8 @@ packages:
     resolution: {integrity: sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==}
     dev: true
 
-  /regexp-tree@0.1.25:
-    resolution: {integrity: sha512-szcL3aqw+vEeuxhL1AMYRyeMP+goYF5I/guaH10uJX5xbGyeQeNPPneaj3ZWVmGLCDxrVaaYekkr5R12gk4dJw==}
+  /regexp-tree@0.1.27:
+    resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
     dev: true
 
@@ -17881,6 +17843,14 @@ packages:
       define-properties: 1.1.4
       functions-have-names: 1.2.3
 
+  /regexp.prototype.flags@1.5.0:
+    resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      functions-have-names: 1.2.3
+
   /regexpu-core@5.2.2:
     resolution: {integrity: sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==}
     engines: {node: '>=4'}
@@ -17893,10 +17863,29 @@ packages:
       unicode-match-property-value-ecmascript: 2.1.0
     dev: true
 
+  /regexpu-core@5.3.2:
+    resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      '@babel/regjsgen': 0.8.0
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.1.0
+      regjsparser: 0.9.1
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.1.0
+    dev: true
+
   /regjsgen@0.7.1:
     resolution: {integrity: sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==}
     dev: true
 
+  /regjsparser@0.10.0:
+    resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
+    hasBin: true
+    dependencies:
+      jsesc: 0.5.0
+    dev: true
+
   /regjsparser@0.9.1:
     resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
     hasBin: true
@@ -17998,33 +17987,6 @@ packages:
       throttleit: 1.0.0
     dev: true
 
-  /request@2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
-    dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.11.0
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 2.3.3
-      har-validator: 5.1.5
-      http-signature: 1.2.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.35
-      oauth-sign: 0.9.0
-      performance-now: 2.1.0
-      qs: 6.5.3
-      safe-buffer: 5.2.1
-      tough-cookie: 4.1.3
-      tunnel-agent: 0.6.0
-      uuid: 3.4.0
-    dev: false
-
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -18079,7 +18041,7 @@ packages:
       adjust-sourcemap-loader: 4.0.0
       convert-source-map: 1.9.0
       loader-utils: 2.0.4
-      postcss: 8.4.21
+      postcss: 8.4.27
       source-map: 0.6.1
     dev: true
 
@@ -18093,11 +18055,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /resolve@1.22.1:
-    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
+  /resolve@1.22.3:
+    resolution: {integrity: sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==}
     hasBin: true
     dependencies:
-      is-core-module: 2.11.0
+      is-core-module: 2.12.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
@@ -18142,7 +18104,7 @@ packages:
   /rhea@1.0.24:
     resolution: {integrity: sha512-PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA==}
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -18167,12 +18129,20 @@ packages:
     dependencies:
       glob: 7.2.3
 
+  /rimraf@5.0.1:
+    resolution: {integrity: sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==}
+    engines: {node: '>=14'}
+    hasBin: true
+    dependencies:
+      glob: 10.3.3
+    dev: true
+
   /rndm@1.2.0:
     resolution: {integrity: sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==}
     dev: false
 
-  /rollup@3.10.0:
-    resolution: {integrity: sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==}
+  /rollup@3.26.3:
+    resolution: {integrity: sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -18209,14 +18179,23 @@ packages:
     resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
     engines: {npm: '>=2.0.0'}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
 
-  /rxjs@7.5.7:
-    resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
+  /rxjs@7.8.1:
+    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
+  /safe-array-concat@1.0.0:
+    resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+
   /safe-buffer@5.1.1:
     resolution: {integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==}
     dev: true
@@ -18231,7 +18210,7 @@ packages:
     resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
       is-regex: 1.1.4
 
   /safe-regex@1.1.0:
@@ -18240,12 +18219,6 @@ packages:
       ret: 0.1.15
     dev: true
 
-  /safe-regex@2.1.1:
-    resolution: {integrity: sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==}
-    dependencies:
-      regexp-tree: 0.1.25
-    dev: true
-
   /safe-stable-stringify@2.4.0:
     resolution: {integrity: sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA==}
     engines: {node: '>=10'}
@@ -18288,7 +18261,7 @@ packages:
     dev: false
     optional: true
 
-  /sass-loader@13.3.2(sass@1.63.4)(webpack@5.75.0):
+  /sass-loader@13.3.2(sass@1.64.1)(webpack@5.75.0):
     resolution: {integrity: sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==}
     engines: {node: '>= 14.15.0'}
     peerDependencies:
@@ -18308,12 +18281,12 @@ packages:
         optional: true
     dependencies:
       neo-async: 2.6.2
-      sass: 1.63.4
-      webpack: 5.75.0(esbuild@0.17.18)
+      sass: 1.64.1
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
-  /sass@1.63.4:
-    resolution: {integrity: sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==}
+  /sass@1.64.1:
+    resolution: {integrity: sha512-16rRACSOFEE8VN7SCgBu1MpYCyN7urj9At898tyzdXFhC+a+yOX5dXwAR7L8/IdPJ1NB8OYoXmD55DM30B2kEQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -18358,7 +18331,7 @@ packages:
     resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==}
     engines: {node: '>= 8.9.0'}
     dependencies:
-      '@types/json-schema': 7.0.11
+      '@types/json-schema': 7.0.12
       ajv: 6.12.6
       ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
@@ -18367,7 +18340,7 @@ packages:
     resolution: {integrity: sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/json-schema': 7.0.11
+      '@types/json-schema': 7.0.12
       ajv: 6.12.6
       ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
@@ -18420,7 +18393,7 @@ packages:
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
       upper-case-first: 2.0.2
 
   /seq-queue@0.0.5:
@@ -18518,6 +18491,10 @@ packages:
     resolution: {integrity: sha512-uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw==}
     dev: false
 
+  /shell-quote@1.8.1:
+    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
+    dev: true
+
   /shelljs@0.8.5:
     resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
     engines: {node: '>=4'}
@@ -18526,6 +18503,7 @@ packages:
       glob: 7.2.3
       interpret: 1.4.0
       rechoir: 0.6.2
+    dev: false
 
   /showdown@2.1.0:
     resolution: {integrity: sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==}
@@ -18548,6 +18526,11 @@ packages:
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
+  /signal-exit@4.0.2:
+    resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==}
+    engines: {node: '>=14'}
+    dev: true
+
   /simple-git@3.17.0:
     resolution: {integrity: sha512-JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw==}
     dependencies:
@@ -18575,6 +18558,13 @@ packages:
       semver: 7.5.4
     dev: true
 
+  /simple-update-notifier@2.0.0:
+    resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
+    engines: {node: '>=10'}
+    dependencies:
+      semver: 7.5.4
+    dev: true
+
   /sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
     dev: true
@@ -18606,14 +18596,6 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
-  /slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      ansi-styles: 6.2.1
-      is-fullwidth-code-point: 4.0.0
-    dev: true
-
   /smart-buffer@4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -18623,7 +18605,7 @@ packages:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /snapdragon-node@2.1.1:
@@ -18676,7 +18658,7 @@ packages:
       binascii: 0.0.2
       bn.js: 5.2.1
       browser-request: 0.3.3
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       expand-tilde: 2.0.2
       extend: 3.0.2
       fast-xml-parser: 4.2.4
@@ -18798,8 +18780,8 @@ packages:
     dev: false
     optional: true
 
-  /spawn-command@0.0.2-1:
-    resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==}
+  /spawn-command@0.0.2:
+    resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==}
     dev: true
 
   /spdx-correct@3.1.1:
@@ -18953,18 +18935,19 @@ packages:
     resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
     dev: false
 
-  /start-server-and-test@1.14.0:
-    resolution: {integrity: sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw==}
+  /start-server-and-test@2.0.0:
+    resolution: {integrity: sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ==}
     engines: {node: '>=6'}
     hasBin: true
     dependencies:
+      arg: 5.0.2
       bluebird: 3.7.2
       check-more-types: 2.24.0
-      debug: 4.3.2
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 5.1.1
       lazy-ass: 1.6.0
       ps-tree: 1.2.0
-      wait-on: 6.0.0(debug@4.3.2)
+      wait-on: 7.0.1(debug@4.3.4)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -18992,8 +18975,8 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
-  /std-env@3.3.2:
-    resolution: {integrity: sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==}
+  /std-env@3.3.3:
+    resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==}
     dev: true
 
   /stop-iteration-iterator@1.0.0:
@@ -19039,8 +19022,8 @@ packages:
       - react-dom
     dev: true
 
-  /storybook-dark-mode@3.0.0(react-dom@18.2.0)(react@17.0.2):
-    resolution: {integrity: sha512-aeAvqP/mmdccEiCsvx6aw3M0i7mZSiXROsrAsEQN8vl1lAg3FZN+y3Xu/f+ye59wLMRuKJC/JBp7E3/H7vLBRQ==}
+  /storybook-dark-mode@3.0.1(react-dom@18.2.0)(react@17.0.2):
+    resolution: {integrity: sha512-3V6XBhkUq63BF6KzyDBbfV5/8sYtF4UtVccH1tK+Lrd4p0tF8k7yHOvVDhFL9hexnKXcLEnbC+42YDTPvjpK+A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -19051,22 +19034,22 @@ packages:
         optional: true
     dependencies:
       '@storybook/addons': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/api': 7.0.7(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/components': 7.0.21(react-dom@18.2.0)(react@17.0.2)
-      '@storybook/core-events': 7.0.21
+      '@storybook/api': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/components': 7.1.1(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/core-events': 7.1.1
       '@storybook/global': 5.0.0
-      '@storybook/theming': 7.0.21(react-dom@18.2.0)(react@17.0.2)
+      '@storybook/theming': 7.1.1(react-dom@18.2.0)(react@17.0.2)
       fast-deep-equal: 3.1.3
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
     dev: true
 
-  /storybook@7.0.21:
-    resolution: {integrity: sha512-NjHn7g4BXoJ5qisMkGQmSdjnXrlEETqmirQpi/NgrwfMV2gE7BO2KmPgxGh1jT0M04y788OSZhffOdKbuvDFMQ==}
+  /storybook@7.1.1:
+    resolution: {integrity: sha512-5/FIgiD574uwwDGtyyMuqXSOw4kzpEiPbMy1jMWmc8lI2g6vynwbyWqqXmVqtKpJa1vVCM4+KjFqZCmyXFJiZQ==}
     hasBin: true
     dependencies:
-      '@storybook/cli': 7.0.21
+      '@storybook/cli': 7.1.1
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -19141,15 +19124,6 @@ packages:
       strip-ansi: 3.0.1
     dev: true
 
-  /string-width@3.1.0:
-    resolution: {integrity: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==}
-    engines: {node: '>=6'}
-    dependencies:
-      emoji-regex: 7.0.3
-      is-fullwidth-code-point: 2.0.0
-      strip-ansi: 5.2.0
-    dev: true
-
   /string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
@@ -19174,19 +19148,27 @@ packages:
       es-abstract: 1.21.1
     dev: false
 
+  /string.prototype.trim@1.2.7:
+    resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+
   /string.prototype.trimend@1.0.6:
     resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
 
   /string.prototype.trimstart@1.0.6:
     resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
 
   /string_decoder@0.10.31:
     resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
@@ -19209,13 +19191,6 @@ packages:
       ansi-regex: 2.1.1
     dev: true
 
-  /strip-ansi@5.2.0:
-    resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==}
-    engines: {node: '>=6'}
-    dependencies:
-      ansi-regex: 4.1.1
-    dev: true
-
   /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
@@ -19268,10 +19243,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /strip-literal@1.0.0:
-    resolution: {integrity: sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ==}
+  /strip-literal@1.0.1:
+    resolution: {integrity: sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==}
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.10.0
     dev: true
 
   /strnum@1.0.5:
@@ -19298,7 +19273,7 @@ packages:
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 2.7.1
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /style-loader@3.3.3(webpack@5.75.0):
@@ -19307,7 +19282,7 @@ packages:
     peerDependencies:
       webpack: ^5.0.0
     dependencies:
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /style-mod@4.0.0:
@@ -19347,14 +19322,6 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
-    dev: true
-
-  /supports-color@6.1.0:
-    resolution: {integrity: sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      has-flag: 3.0.0
-    dev: true
 
   /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
@@ -19413,7 +19380,7 @@ packages:
     engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
       '@pkgr/utils': 2.3.1
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: true
 
   /syslog-client@1.1.1:
@@ -19544,7 +19511,7 @@ packages:
       unique-string: 2.0.0
     dev: true
 
-  /terser-webpack-plugin@5.3.6(esbuild@0.17.18)(webpack@5.75.0):
+  /terser-webpack-plugin@5.3.6(esbuild@0.18.17)(webpack@5.75.0):
     resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -19560,13 +19527,13 @@ packages:
       uglify-js:
         optional: true
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      esbuild: 0.17.18
+      '@jridgewell/trace-mapping': 0.3.18
+      esbuild: 0.18.17
       jest-worker: 27.5.1
       schema-utils: 3.1.1
       serialize-javascript: 6.0.1
       terser: 5.16.1
-      webpack: 5.75.0(esbuild@0.17.18)
+      webpack: 5.75.0(esbuild@0.18.17)
     dev: true
 
   /terser@5.16.1:
@@ -19575,7 +19542,7 @@ packages:
     hasBin: true
     dependencies:
       '@jridgewell/source-map': 0.3.2
-      acorn: 8.8.1
+      acorn: 8.10.0
       commander: 2.20.3
       source-map-support: 0.5.21
     dev: true
@@ -19649,24 +19616,24 @@ packages:
     resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
     dev: true
 
-  /tinybench@2.3.1:
-    resolution: {integrity: sha512-hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA==}
+  /tinybench@2.5.0:
+    resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==}
     dev: true
 
-  /tinypool@0.3.1:
-    resolution: {integrity: sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ==}
+  /tinypool@0.6.0:
+    resolution: {integrity: sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==}
     engines: {node: '>=14.0.0'}
     dev: true
 
-  /tinyspy@1.0.2:
-    resolution: {integrity: sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q==}
+  /tinyspy@2.1.1:
+    resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==}
     engines: {node: '>=14.0.0'}
     dev: true
 
   /title-case@3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /tlds@1.231.0:
     resolution: {integrity: sha512-L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw==}
@@ -19752,6 +19719,10 @@ packages:
       through2: 2.0.5
     dev: true
 
+  /tocbot@4.21.0:
+    resolution: {integrity: sha512-vXk8htr8mIl3hc2s2mDkaPTBfqmqZA2o0x7eXbxUibdrpEIPdpM0L9hH/RvEvlgSM+ZTgS34sGipk5+VrLJCLA==}
+    dev: true
+
   /toggle-selection@1.0.6:
     resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
     dev: false
@@ -19818,21 +19789,30 @@ packages:
     resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
     dev: false
 
+  /ts-api-utils@1.0.1(typescript@5.1.6):
+    resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==}
+    engines: {node: '>=16.13.0'}
+    peerDependencies:
+      typescript: '>=4.2.0'
+    dependencies:
+      typescript: 5.1.6
+    dev: true
+
   /ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
     dev: true
 
-  /ts-essentials@7.0.3(typescript@5.1.3):
+  /ts-essentials@7.0.3(typescript@5.1.6):
     resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
     peerDependencies:
       typescript: '>=3.7.0'
     dependencies:
-      typescript: 5.1.3
+      typescript: 5.1.6
     dev: true
 
-  /ts-jest@29.1.0(@babel/core@7.21.8)(jest@29.5.0)(typescript@5.1.3):
-    resolution: {integrity: sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==}
+  /ts-jest@29.1.1(@babel/core@7.22.9)(jest@29.6.2)(typescript@5.1.6):
+    resolution: {integrity: sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -19852,16 +19832,16 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.21.8
+      '@babel/core': 7.22.9
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      jest: 29.5.0
+      jest: 29.6.2
       jest-util: 29.5.0
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.5.4
-      typescript: 5.1.3
+      typescript: 5.1.6
       yargs-parser: 21.1.1
     dev: true
 
@@ -19869,8 +19849,8 @@ packages:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
 
-  /tsc-alias@1.8.2:
-    resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
+  /tsc-alias@1.8.7:
+    resolution: {integrity: sha512-59Q/zUQa3miTf99mLbSqaW0hi1jt4WoG8Uhe5hSZJHQpSoFW9eEwvW7jlKMHXWvT+zrzy3SN9PE/YBhQ+WVydA==}
     hasBin: true
     dependencies:
       chokidar: 3.5.2
@@ -19881,8 +19861,8 @@ packages:
       plimit-lit: 1.4.1
     dev: true
 
-  /tsc-watch@6.0.0(typescript@5.1.3):
-    resolution: {integrity: sha512-zgpju+/z5z29/kK5V28Nz16CMkX2voFOUxkTlCim/R25hxzbyUqu2NfTnmJBQfESBSPbEQUGqDdB9A8opAcB4A==}
+  /tsc-watch@6.0.4(typescript@5.1.6):
+    resolution: {integrity: sha512-cHvbvhjO86w2aGlaHgSCeQRl+Aqw6X6XN4sQMPZKF88GoP30O+oTuh5lRIJr5pgFWrRpF1AgXnJJ2DoFEIPHyg==}
     engines: {node: '>=12.12.0'}
     hasBin: true
     peerDependencies:
@@ -19892,20 +19872,20 @@ packages:
       node-cleanup: 2.1.2
       ps-tree: 1.2.0
       string-argv: 0.3.1
-      typescript: 5.1.3
+      typescript: 5.1.6
     dev: true
 
-  /tsconfig-paths@3.14.1:
-    resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
+  /tsconfig-paths@3.14.2:
+    resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==}
     dependencies:
       '@types/json5': 0.0.29
       json5: 1.0.2
-      minimist: 1.2.7
+      minimist: 1.2.8
       strip-bom: 3.0.0
     dev: true
 
-  /tsconfig-paths@4.1.2:
-    resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==}
+  /tsconfig-paths@4.2.0:
+    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
     engines: {node: '>=6'}
     dependencies:
       json5: 2.2.3
@@ -19913,86 +19893,87 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /tslib@2.5.0:
-    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
+  /tslib@2.6.1:
+    resolution: {integrity: sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==}
 
   /tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
     engines: {node: '>=0.6.x'}
     dev: false
 
-  /tsutils@3.21.0(typescript@5.1.3):
+  /tsutils@3.21.0(typescript@5.1.6):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
-      tslib: 2.5.0
-      typescript: 5.1.3
+      tslib: 2.6.1
+      typescript: 5.1.6
     dev: true
 
   /tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
       safe-buffer: 5.2.1
+    dev: true
 
   /tunnel@0.0.6:
     resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==}
     engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
     dev: false
 
-  /turbo-darwin-64@1.8.8:
-    resolution: {integrity: sha512-18cSeIm7aeEvIxGyq7PVoFyEnPpWDM/0CpZvXKHpQ6qMTkfNt517qVqUTAwsIYqNS8xazcKAqkNbvU1V49n65Q==}
+  /turbo-darwin-64@1.10.12:
+    resolution: {integrity: sha512-vmDfGVPl5/aFenAbOj3eOx3ePNcWVUyZwYr7taRl0ZBbmv2TzjRiFotO4vrKCiTVnbqjQqAFQWY2ugbqCI1kOQ==}
     cpu: [x64]
     os: [darwin]
     dev: true
     optional: true
 
-  /turbo-darwin-arm64@1.8.8:
-    resolution: {integrity: sha512-ruGRI9nHxojIGLQv1TPgN7ud4HO4V8mFBwSgO6oDoZTNuk5ybWybItGR+yu6fni5vJoyMHXOYA2srnxvOc7hjQ==}
+  /turbo-darwin-arm64@1.10.12:
+    resolution: {integrity: sha512-3JliEESLNX2s7g54SOBqqkqJ7UhcOGkS0ywMr5SNuvF6kWVTbuUq7uBU/sVbGq8RwvK1ONlhPvJne5MUqBCTCQ==}
     cpu: [arm64]
     os: [darwin]
     dev: true
     optional: true
 
-  /turbo-linux-64@1.8.8:
-    resolution: {integrity: sha512-N/GkHTHeIQogXB1/6ZWfxHx+ubYeb8Jlq3b/3jnU4zLucpZzTQ8XkXIAfJG/TL3Q7ON7xQ8yGOyGLhHL7MpFRg==}
+  /turbo-linux-64@1.10.12:
+    resolution: {integrity: sha512-siYhgeX0DidIfHSgCR95b8xPee9enKSOjCzx7EjTLmPqPaCiVebRYvbOIYdQWRqiaKh9yfhUtFmtMOMScUf1gg==}
     cpu: [x64]
     os: [linux]
     dev: true
     optional: true
 
-  /turbo-linux-arm64@1.8.8:
-    resolution: {integrity: sha512-hKqLbBHgUkYf2Ww8uBL9UYdBFQ5677a7QXdsFhONXoACbDUPvpK4BKlz3NN7G4NZ+g9dGju+OJJjQP0VXRHb5w==}
+  /turbo-linux-arm64@1.10.12:
+    resolution: {integrity: sha512-K/ZhvD9l4SslclaMkTiIrnfcACgos79YcAo4kwc8bnMQaKuUeRpM15sxLpZp3xDjDg8EY93vsKyjaOhdFG2UbA==}
     cpu: [arm64]
     os: [linux]
     dev: true
     optional: true
 
-  /turbo-windows-64@1.8.8:
-    resolution: {integrity: sha512-2ndjDJyzkNslXxLt+PQuU21AHJWc8f6MnLypXy3KsN4EyX/uKKGZS0QJWz27PeHg0JS75PVvhfFV+L9t9i+Yyg==}
+  /turbo-windows-64@1.10.12:
+    resolution: {integrity: sha512-7FSgSwvktWDNOqV65l9AbZwcoueAILeE4L7JvjauNASAjjbuzXGCEq5uN8AQU3U5BOFj4TdXrVmO2dX+lLu8Zg==}
     cpu: [x64]
     os: [win32]
     dev: true
     optional: true
 
-  /turbo-windows-arm64@1.8.8:
-    resolution: {integrity: sha512-xCA3oxgmW9OMqpI34AAmKfOVsfDljhD5YBwgs0ZDsn5h3kCHhC4x9W5dDk1oyQ4F5EXSH3xVym5/xl1J6WRpUg==}
+  /turbo-windows-arm64@1.10.12:
+    resolution: {integrity: sha512-gCNXF52dwom1HLY9ry/cneBPOKTBHhzpqhMylcyvJP0vp9zeMQQkt6yjYv+6QdnmELC92CtKNp2FsNZo+z0pyw==}
     cpu: [arm64]
     os: [win32]
     dev: true
     optional: true
 
-  /turbo@1.8.8:
-    resolution: {integrity: sha512-qYJ5NjoTX+591/x09KgsDOPVDUJfU9GoS+6jszQQlLp1AHrf1wRFA3Yps8U+/HTG03q0M4qouOfOLtRQP4QypA==}
+  /turbo@1.10.12:
+    resolution: {integrity: sha512-WM3+jTfQWnB9W208pmP4oeehZcC6JQNlydb/ZHMRrhmQa+htGhWLCzd6Q9rLe0MwZLPpSPFV2/bN5egCLyoKjQ==}
     hasBin: true
     optionalDependencies:
-      turbo-darwin-64: 1.8.8
-      turbo-darwin-arm64: 1.8.8
-      turbo-linux-64: 1.8.8
-      turbo-linux-arm64: 1.8.8
-      turbo-windows-64: 1.8.8
-      turbo-windows-arm64: 1.8.8
+      turbo-darwin-64: 1.10.12
+      turbo-darwin-arm64: 1.10.12
+      turbo-linux-64: 1.10.12
+      turbo-linux-arm64: 1.10.12
+      turbo-windows-64: 1.10.12
+      turbo-windows-arm64: 1.10.12
     dev: true
 
   /tweetnacl@0.14.5:
@@ -20045,6 +20026,11 @@ packages:
     engines: {node: '>=12.20'}
     dev: true
 
+  /type-fest@3.13.1:
+    resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==}
+    engines: {node: '>=14.16'}
+    dev: true
+
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -20060,6 +20046,33 @@ packages:
     resolution: {integrity: sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==}
     dev: true
 
+  /typed-array-buffer@1.0.0:
+    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      is-typed-array: 1.1.10
+
+  /typed-array-byte-length@1.0.0:
+    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      has-proto: 1.0.1
+      is-typed-array: 1.1.10
+
+  /typed-array-byte-offset@1.0.0:
+    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      has-proto: 1.0.1
+      is-typed-array: 1.1.10
+
   /typed-array-length@1.0.4:
     resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
@@ -20156,7 +20169,7 @@ packages:
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
       sqlite3: 5.1.6
-      tslib: 2.5.0
+      tslib: 2.6.1
       uuid: 9.0.0
       xml2js: 0.5.0
       yargs: 17.6.2
@@ -20164,8 +20177,8 @@ packages:
       - supports-color
     dev: false
 
-  /typescript@5.1.3:
-    resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==}
+  /typescript@5.1.6:
+    resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -20173,8 +20186,8 @@ packages:
     resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==}
     dev: false
 
-  /ufo@1.0.1:
-    resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
+  /ufo@1.1.2:
+    resolution: {integrity: sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==}
     dev: true
 
   /uglify-js@3.17.4:
@@ -20245,10 +20258,6 @@ packages:
       extend-shallow: 2.0.1
     dev: false
 
-  /unfetch@4.2.0:
-    resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==}
-    dev: true
-
   /unicode-canonical-property-names-ecmascript@2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
     engines: {node: '>=4'}
@@ -20344,19 +20353,19 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
-  /unplugin@0.10.2:
-    resolution: {integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==}
+  /unplugin@1.0.1:
+    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.10.0
       chokidar: 3.5.2
       webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.4.6
+      webpack-virtual-modules: 0.5.0
     dev: true
 
-  /unplugin@1.0.1:
-    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
+  /unplugin@1.4.0:
+    resolution: {integrity: sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==}
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.10.0
       chokidar: 3.5.2
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -20375,13 +20384,13 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /update-browserslist-db@1.0.10(browserslist@4.21.4):
-    resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
+  /update-browserslist-db@1.0.11(browserslist@4.21.9):
+    resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
     dependencies:
-      browserslist: 4.21.4
+      browserslist: 4.21.9
       escalade: 3.1.1
       picocolors: 1.0.0
     dev: true
@@ -20389,12 +20398,12 @@ packages:
   /upper-case-first@2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
 
   /upper-case@2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.1
     dev: false
 
   /uri-js@4.4.1:
@@ -20494,7 +20503,7 @@ packages:
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
       is-typed-array: 1.1.10
-      which-typed-array: 1.1.9
+      which-typed-array: 1.1.11
 
   /utility@0.1.11:
     resolution: {integrity: sha512-epFsJ71+/yC7MKMX7CM9azP31QBIQhywkiBUj74i/T3Y2TXtEor26QBkat7lGamrrNTr5CBI1imd/8F0Bmqw4g==}
@@ -20545,8 +20554,8 @@ packages:
     resolution: {integrity: sha512-MWJc6yChnqeUasBFJ3Enu8IGPcQgRMSTrAEtT1MsHBEx+QjwvNTaY8o+8V9DgVt1MVhQSl3MC55hsaWLJmpRMw==}
     dev: false
 
-  /v8-to-istanbul@9.0.1:
-    resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
+  /v8-to-istanbul@9.1.0:
+    resolution: {integrity: sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==}
     engines: {node: '>=10.12.0'}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.17
@@ -20588,6 +20597,7 @@ packages:
       assert-plus: 1.0.0
       core-util-is: 1.0.2
       extsprintf: 1.3.0
+    dev: true
 
   /vinyl-fs@3.0.3:
     resolution: {integrity: sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==}
@@ -20637,22 +20647,21 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-node@0.28.5(@types/node@18.16.16):
-    resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
-    engines: {node: '>=v14.16.0'}
+  /vite-node@0.33.0(@types/node@18.16.16):
+    resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==}
+    engines: {node: '>=v14.18.0'}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4(supports-color@8.1.1)
-      mlly: 1.1.0
-      pathe: 1.1.0
+      mlly: 1.4.0
+      pathe: 1.1.1
       picocolors: 1.0.0
-      source-map: 0.6.1
-      source-map-support: 0.5.21
-      vite: 4.0.4(@types/node@18.16.16)
+      vite: 4.4.7(@types/node@18.16.16)
     transitivePeerDependencies:
       - '@types/node'
       - less
+      - lightningcss
       - sass
       - stylus
       - sugarss
@@ -20660,13 +20669,14 @@ packages:
       - terser
     dev: true
 
-  /vite@4.0.4(@types/node@18.16.16):
-    resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
+  /vite@4.4.7(@types/node@18.16.16):
+    resolution: {integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
       '@types/node': '>= 14'
       less: '*'
+      lightningcss: ^1.21.0
       sass: '*'
       stylus: '*'
       sugarss: '*'
@@ -20676,6 +20686,8 @@ packages:
         optional: true
       less:
         optional: true
+      lightningcss:
+        optional: true
       sass:
         optional: true
       stylus:
@@ -20686,21 +20698,21 @@ packages:
         optional: true
     dependencies:
       '@types/node': 18.16.16
-      esbuild: 0.16.17
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.10.0
+      esbuild: 0.18.17
+      postcss: 8.4.27
+      rollup: 3.26.3
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vite@4.0.4(less@4.1.3)(sass@1.63.4):
-    resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
+  /vite@4.4.7(less@4.1.3)(sass@1.64.1):
+    resolution: {integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
       '@types/node': '>= 14'
       less: '*'
+      lightningcss: ^1.21.0
       sass: '*'
       stylus: '*'
       sugarss: '*'
@@ -20710,6 +20722,8 @@ packages:
         optional: true
       less:
         optional: true
+      lightningcss:
+        optional: true
       sass:
         optional: true
       stylus:
@@ -20719,19 +20733,18 @@ packages:
       terser:
         optional: true
     dependencies:
-      esbuild: 0.16.17
+      esbuild: 0.18.17
       less: 4.1.3
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.10.0
-      sass: 1.63.4
+      postcss: 8.4.27
+      rollup: 3.26.3
+      sass: 1.64.1
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vitest@0.28.5:
-    resolution: {integrity: sha512-pyCQ+wcAOX7mKMcBNkzDwEHRGqQvHUl0XnoHR+3Pb1hytAHISgSxv9h0gUiSiYtISXUU3rMrKiKzFYDrI6ZIHA==}
-    engines: {node: '>=v14.16.0'}
+  /vitest@0.33.0:
+    resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==}
+    engines: {node: '>=v14.18.0'}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
@@ -20739,6 +20752,9 @@ packages:
       '@vitest/ui': '*'
       happy-dom: '*'
       jsdom: '*'
+      playwright: '*'
+      safaridriver: '*'
+      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
@@ -20750,33 +20766,40 @@ packages:
         optional: true
       jsdom:
         optional: true
+      playwright:
+        optional: true
+      safaridriver:
+        optional: true
+      webdriverio:
+        optional: true
     dependencies:
-      '@types/chai': 4.3.4
+      '@types/chai': 4.3.5
       '@types/chai-subset': 1.3.3
       '@types/node': 18.16.16
-      '@vitest/expect': 0.28.5
-      '@vitest/runner': 0.28.5
-      '@vitest/spy': 0.28.5
-      '@vitest/utils': 0.28.5
-      acorn: 8.8.1
+      '@vitest/expect': 0.33.0
+      '@vitest/runner': 0.33.0
+      '@vitest/snapshot': 0.33.0
+      '@vitest/spy': 0.33.0
+      '@vitest/utils': 0.33.0
+      acorn: 8.10.0
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.7
       debug: 4.3.4(supports-color@8.1.1)
-      local-pkg: 0.4.2
-      pathe: 1.1.0
+      local-pkg: 0.4.3
+      magic-string: 0.30.1
+      pathe: 1.1.1
       picocolors: 1.0.0
-      source-map: 0.6.1
-      std-env: 3.3.2
-      strip-literal: 1.0.0
-      tinybench: 2.3.1
-      tinypool: 0.3.1
-      tinyspy: 1.0.2
-      vite: 4.0.4(@types/node@18.16.16)
-      vite-node: 0.28.5(@types/node@18.16.16)
+      std-env: 3.3.3
+      strip-literal: 1.0.1
+      tinybench: 2.5.0
+      tinypool: 0.6.0
+      vite: 4.4.7(@types/node@18.16.16)
+      vite-node: 0.33.0(@types/node@18.16.16)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
+      - lightningcss
       - sass
       - stylus
       - sugarss
@@ -20817,29 +20840,14 @@ packages:
     resolution: {integrity: sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==}
     dev: true
 
-  /vue-component-type-helpers@1.8.6:
-    resolution: {integrity: sha512-vKWeoKVEV51ZzoB8+UY0apMXiifbPQxWlcZlvQRDVdiOHmEkCBClWeIGbqQ8cCR9P4j+oCyLW87sraZFMz/qnA==}
+  /vue-component-type-helpers@1.8.8:
+    resolution: {integrity: sha512-Ohv9HQY92nSbpReC6WhY0X4YkOszHzwUHaaN/lev5tHQLM1AEw+LrLeB2bIGIyKGDU7ZVrncXcv/oBny4rjbYg==}
     dev: true
 
-  /vue-demi@0.13.11(vue@3.3.4):
-    resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    peerDependencies:
-      '@vue/composition-api': ^1.0.0-rc.1
-      vue: ^3.0.0-0 || ^2.6.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-    dependencies:
-      vue: 3.3.4
-
   /vue-demi@0.14.5(vue@3.3.4):
     resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
     engines: {node: '>=12'}
     hasBin: true
-    requiresBuild: true
     peerDependencies:
       '@vue/composition-api': ^1.0.0-rc.1
       vue: ^3.0.0-0 || ^2.6.0
@@ -20848,12 +20856,11 @@ packages:
         optional: true
     dependencies:
       vue: 3.3.4
-    dev: false
 
   /vue-docgen-api@4.56.4(vue@3.3.4):
     resolution: {integrity: sha512-Z59qNUYZNHMZL0QITNbqobGKJgmqyOs4OiAdzr1Ug7ys1gkFBGewiuwPURTsoM2zi4GWZWy2eW4B5FevwT7gpA==}
     dependencies:
-      '@babel/parser': 7.21.8
+      '@babel/parser': 7.22.7
       '@babel/types': 7.21.5
       '@vue/compiler-dom': 3.3.4
       '@vue/compiler-sfc': 3.3.4
@@ -20868,14 +20875,14 @@ packages:
       - vue
     dev: true
 
-  /vue-eslint-parser@9.3.0(eslint@8.39.0):
-    resolution: {integrity: sha512-48IxT9d0+wArT1+3wNIy0tascRoywqSUe2E1YalIC1L8jsUGe5aJQItWfRok7DVFGz3UYvzEI7n5wiTXsCMAcQ==}
+  /vue-eslint-parser@9.3.1(eslint@8.45.0):
+    resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
-      eslint: 8.39.0
+      eslint: 8.45.0
       eslint-scope: 7.2.0
       eslint-visitor-keys: 3.4.0
       espree: 9.5.1
@@ -20932,15 +20939,16 @@ packages:
       he: 1.2.0
     dev: true
 
-  /vue-tsc@1.0.24(typescript@5.1.3):
-    resolution: {integrity: sha512-mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg==}
+  /vue-tsc@1.8.8(typescript@5.1.6):
+    resolution: {integrity: sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==}
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
-      '@volar/vue-language-core': 1.0.24
-      '@volar/vue-typescript': 1.0.24
-      typescript: 5.1.3
+      '@vue/language-core': 1.8.8(typescript@5.1.6)
+      '@vue/typescript': 1.8.8(typescript@5.1.6)
+      semver: 7.5.4
+      typescript: 5.1.6
     dev: true
 
   /vue3-touch-events@4.1.3:
@@ -20974,16 +20982,16 @@ packages:
       xml-name-validator: 4.0.0
     dev: true
 
-  /wait-on@6.0.0(debug@4.3.2):
-    resolution: {integrity: sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==}
-    engines: {node: '>=10.0.0'}
+  /wait-on@7.0.1(debug@4.3.4):
+    resolution: {integrity: sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==}
+    engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      axios: 0.21.4(debug@4.3.2)
+      axios: 0.27.2(debug@4.3.4)
       joi: 17.7.0
       lodash: 4.17.21
-      minimist: 1.2.7
-      rxjs: 7.5.7
+      minimist: 1.2.8
+      rxjs: 7.8.1
     transitivePeerDependencies:
       - debug
     dev: true
@@ -21025,15 +21033,11 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /webpack-virtual-modules@0.4.6:
-    resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==}
-    dev: true
-
   /webpack-virtual-modules@0.5.0:
     resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
     dev: true
 
-  /webpack@5.75.0(esbuild@0.17.18):
+  /webpack@5.75.0(esbuild@0.18.17):
     resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
     engines: {node: '>=10.13.0'}
     hasBin: true
@@ -21048,9 +21052,9 @@ packages:
       '@webassemblyjs/ast': 1.11.1
       '@webassemblyjs/wasm-edit': 1.11.1
       '@webassemblyjs/wasm-parser': 1.11.1
-      acorn: 8.8.1
-      acorn-import-assertions: 1.8.0(acorn@8.8.1)
-      browserslist: 4.21.4
+      acorn: 8.10.0
+      acorn-import-assertions: 1.8.0(acorn@8.10.0)
+      browserslist: 4.21.9
       chrome-trace-event: 1.0.3
       enhanced-resolve: 5.13.0
       es-module-lexer: 0.9.3
@@ -21064,7 +21068,7 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.1.1
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6(esbuild@0.17.18)(webpack@5.75.0)
+      terser-webpack-plugin: 5.3.6(esbuild@0.18.17)(webpack@5.75.0)
       watchpack: 2.4.0
       webpack-sources: 3.2.3
     transitivePeerDependencies:
@@ -21123,6 +21127,16 @@ packages:
     resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
     dev: true
 
+  /which-typed-array@1.1.11:
+    resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+
   /which-typed-array@1.1.9:
     resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
     engines: {node: '>= 0.4'}
@@ -21204,8 +21218,8 @@ packages:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@babel/parser': 7.21.8
-      '@babel/types': 7.21.5
+      '@babel/parser': 7.22.7
+      '@babel/types': 7.22.5
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
     dev: true
@@ -21225,15 +21239,6 @@ packages:
       strip-ansi: 3.0.1
     dev: true
 
-  /wrap-ansi@5.1.0:
-    resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==}
-    engines: {node: '>=6'}
-    dependencies:
-      ansi-styles: 3.2.1
-      string-width: 3.1.0
-      strip-ansi: 5.2.0
-    dev: true
-
   /wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
@@ -21250,6 +21255,15 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
+  /wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-styles: 6.2.1
+      string-width: 5.1.2
+      strip-ansi: 7.0.1
+    dev: true
+
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
@@ -21424,13 +21438,6 @@ packages:
       glob: 7.2.3
     dev: false
 
-  /yargs-parser@13.1.2:
-    resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==}
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-    dev: true
-
   /yargs-parser@18.1.3:
     resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
     engines: {node: '>=6'}
@@ -21442,6 +21449,7 @@ packages:
   /yargs-parser@20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}
+    dev: false
 
   /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
@@ -21454,21 +21462,6 @@ packages:
       object.assign: 4.1.4
     dev: true
 
-  /yargs@13.3.2:
-    resolution: {integrity: sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==}
-    dependencies:
-      cliui: 5.0.0
-      find-up: 3.0.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 3.1.0
-      which-module: 2.0.0
-      y18n: 4.0.3
-      yargs-parser: 13.1.2
-    dev: true
-
   /yargs@15.4.1:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
     engines: {node: '>=8'}
@@ -21497,6 +21490,7 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 20.2.9
+    dev: false
 
   /yargs@17.1.1:
     resolution: {integrity: sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==}
@@ -21535,6 +21529,20 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
+    dev: false
+
+  /yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+    dev: true
 
   /yargs@7.1.2:
     resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}
@@ -21574,7 +21582,7 @@ packages:
     resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.22.6
       '@types/lodash': 4.14.195
       lodash: 4.17.21
       lodash-es: 4.17.21

From ee8e7d4e4184dbe52f457bb4354e9821f9f805ac 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, 28 Jul 2023 15:01:52 +0200
Subject: [PATCH 081/116] fix(TheHive Node): Treat  `ApiKey` as a secret
 (#6786)

---
 packages/nodes-base/credentials/TheHiveApi.credentials.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nodes-base/credentials/TheHiveApi.credentials.ts b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
index 033b11d9cc205..6766f6da786d3 100644
--- a/packages/nodes-base/credentials/TheHiveApi.credentials.ts
+++ b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
@@ -17,6 +17,7 @@ export class TheHiveApi implements ICredentialType {
 			displayName: 'API Key',
 			name: 'ApiKey',
 			type: 'string',
+			typeOptions: { password: true },
 			default: '',
 		},
 		{

From 5140bcdff1b32bea618a8a678f1365e7718e49a2 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Fri, 28 Jul 2023 16:46:26 +0200
Subject: [PATCH 082/116] test(editor): Prevent node view unload by default in
 e2e run (#6787)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 cypress/e2e/14-data-transformation-expressions.cy.ts | 5 -----
 cypress/e2e/14-mapping.cy.ts                         | 5 -----
 cypress/e2e/16-webhook-node.cy.ts                    | 5 -----
 cypress/e2e/25-stickies.cy.ts                        | 5 -----
 cypress/pages/workflow.ts                            | 6 +++++-
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index fc303c603bc47..829820b8e56dd 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -6,11 +6,6 @@ const ndv = new NDV();
 describe('Data transformation expressions', () => {
 	beforeEach(() => {
 		wf.actions.visit();
-
-		cy.window().then((win) => {
-			// @ts-ignore
-			win.preventNodeViewBeforeUnload = true;
-		});
 	});
 
 	it('$json + native string methods', () => {
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index fa9bdd78a22a3..02ffef9613998 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -12,11 +12,6 @@ const ndv = new NDV();
 describe('Data mapping', () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
-
-		cy.window().then((win) => {
-			// @ts-ignore
-			win.preventNodeViewBeforeUnload = true;
-		});
 	});
 
 	it('maps expressions from table header', () => {
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 80a649a9523a9..3b96f744a5e66 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -79,11 +79,6 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 describe('Webhook Trigger node', async () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
-
-		cy.window().then((win) => {
-			// @ts-ignore
-			win.preventNodeViewBeforeUnload = true;
-		});
 	});
 
 	it('should listen for a GET request', () => {
diff --git a/cypress/e2e/25-stickies.cy.ts b/cypress/e2e/25-stickies.cy.ts
index d0e219575fa62..ac94f882dd055 100644
--- a/cypress/e2e/25-stickies.cy.ts
+++ b/cypress/e2e/25-stickies.cy.ts
@@ -23,11 +23,6 @@ function checkStickiesStyle(
 describe('Canvas Actions', () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
-
-		cy.window().then((win) => {
-			// @ts-ignore
-			win.preventNodeViewBeforeUnload = true;
-		});
 	});
 
 	it('adds sticky to canvas with default text and position', () => {
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index afe2a2081a9f3..7333db5c864c2 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -115,9 +115,13 @@ export class WorkflowPage extends BasePage {
 		editorTabButton: () => cy.getByTestId('radio-button-workflow'),
 	};
 	actions = {
-		visit: () => {
+		visit: (preventNodeViewUnload = true) => {
 			cy.visit(this.url);
 			cy.waitForLoad();
+			cy.window().then((win) => {
+				// @ts-ignore
+				win.preventNodeViewBeforeUnload = preventNodeViewUnload;
+			});
 		},
 		addInitialNodeToCanvas: (nodeDisplayName: string, { keepNdvOpen } = { keepNdvOpen: false }) => {
 			this.getters.canvasPlusButton().click();

From 5b81126f719942c657b32c12fd30c837736ba857 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Fri, 28 Jul 2023 16:59:06 +0200
Subject: [PATCH 083/116] fix(editor): Resolve vue 3 related console-warnings
 (#6779)

* fix(editor): Resolve vue 3 related console-warnings

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Use span as component wrapper instead of div

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Wrap popover component in span

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/N8nPopover/Popover.vue     | 14 ++++----
 .../src/components/NodeExecuteButton.vue      | 36 ++++++++++---------
 .../src/components/WarningTooltip.vue         | 14 ++++----
 .../src/plugins/i18n/locales/en.json          |  2 +-
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/packages/design-system/src/components/N8nPopover/Popover.vue b/packages/design-system/src/components/N8nPopover/Popover.vue
index 352eb6053c151..c853e7ab801e0 100644
--- a/packages/design-system/src/components/N8nPopover/Popover.vue
+++ b/packages/design-system/src/components/N8nPopover/Popover.vue
@@ -14,10 +14,12 @@ export default defineComponent({
 </script>
 
 <template>
-	<el-popover v-bind="{ ...$props, ...$attrs }">
-		<template #reference>
-			<slot name="reference" />
-		</template>
-		<slot />
-	</el-popover>
+	<span>
+		<el-popover v-bind="{ ...$props, ...$attrs }">
+			<template #reference>
+				<slot name="reference" />
+			</template>
+			<slot />
+		</el-popover>
+	</span>
 </template>
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index 9aa382044d056..62ad18cc14f22 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -1,21 +1,23 @@
 <template>
-	<n8n-tooltip placement="bottom" :disabled="!disabledHint">
-		<template #content>
-			<div>{{ disabledHint }}</div>
-		</template>
-		<div>
-			<n8n-button
-				v-bind="$attrs"
-				:loading="nodeRunning && !isListeningForEvents && !isListeningForWorkflowEvents"
-				:disabled="disabled || !!disabledHint"
-				:label="buttonLabel"
-				:type="type"
-				:size="size"
-				:transparentBackground="transparent"
-				@click="onClick"
-			/>
-		</div>
-	</n8n-tooltip>
+	<span>
+		<n8n-tooltip placement="bottom" :disabled="!disabledHint">
+			<template #content>
+				<div>{{ disabledHint }}</div>
+			</template>
+			<div>
+				<n8n-button
+					v-bind="$attrs"
+					:loading="nodeRunning && !isListeningForEvents && !isListeningForWorkflowEvents"
+					:disabled="disabled || !!disabledHint"
+					:label="buttonLabel"
+					:type="type"
+					:size="size"
+					:transparentBackground="transparent"
+					@click="onClick"
+				/>
+			</div>
+		</n8n-tooltip>
+	</span>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/WarningTooltip.vue b/packages/editor-ui/src/components/WarningTooltip.vue
index e314fc8775411..a6e71980572cf 100644
--- a/packages/editor-ui/src/components/WarningTooltip.vue
+++ b/packages/editor-ui/src/components/WarningTooltip.vue
@@ -1,10 +1,12 @@
 <template>
-	<n8n-tooltip content=" " placement="top">
-		<template #content>
-			<slot />
-		</template>
-		<font-awesome-icon :class="$style['icon']" icon="exclamation-triangle"></font-awesome-icon>
-	</n8n-tooltip>
+	<span>
+		<n8n-tooltip content=" " placement="top">
+			<template #content>
+				<slot />
+			</template>
+			<font-awesome-icon :class="$style['icon']" icon="exclamation-triangle"></font-awesome-icon>
+		</n8n-tooltip>
+	</span>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 53a07d7819732..e085c3e6245bb 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -749,7 +749,7 @@
 	"node.waitingForYouToCreateAnEventIn": "Waiting for you to create an event in {nodeType}",
 	"node.discovery.pinData.canvas": "You can pin this output instead of waiting for a test event. Open node to do so.",
 	"node.discovery.pinData.ndv": "You can pin this output instead of waiting for a test event.",
-	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node<br />or drag to connect",
+	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node \n or drag to connect",
 	"nodeCreator.actionsPlaceholderNode.scheduleTrigger": "On a Schedule",
 	"nodeCreator.actionsPlaceholderNode.webhook": "On a Webhook call",
 	"nodeCreator.actionsCategory.actions": "Actions",

From bf2262c81a01b37f0d6dadd27db8c0f1e784ecf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 28 Jul 2023 17:57:25 +0200
Subject: [PATCH 084/116] fix(editor): Vue3 - Fix modal positioning and
 multi-select tag sizing (#6783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ Updating modals positioning within the overlay
* 💄 Implemented multi-select variant with small tabs
* ✔️ Removing password link clicks while modal is open in e2e tests
* Set generous timeout for $paramter resolve
Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---------
Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
Co-authored-by: Oleg Ivaniv <me@olegivaniv.com>
---
 cypress/e2e/11-inline-expression-editor.cy.ts        |  5 +++--
 cypress/e2e/18-user-management.cy.ts                 |  3 +++
 cypress/pages/settings-personal.ts                   |  1 -
 .../src/components/N8nFormInput/FormInput.vue        | 12 ++++++++++++
 .../src/components/N8nFormInputs/FormInputs.vue      |  6 ++++++
 .../editor-ui/src/components/NodeDetailsView.vue     |  6 ++----
 .../src/components/PersonalizationModal.vue          |  1 +
 packages/editor-ui/src/n8n-theme.scss                |  5 +++++
 8 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index 702dd2eac9876..e1fbb08f365cb 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -51,7 +51,7 @@ describe('Inline expression editor', () => {
 	it('should resolve array resolvables', () => {
 		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]');
+		WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]', { timeout: 20000 });
 		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Array: \[1,2,3\]\]$/);
 
 		WorkflowPage.getters.inlineExpressionEditorInput().clear();
@@ -65,7 +65,8 @@ describe('Inline expression editor', () => {
 	it('should resolve $parameter[]', () => {
 		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('$parameter["operation"]');
+		// Resolving $parameter is slow, especially on CI runner
+		WorkflowPage.getters.inlineExpressionEditorInput().type('$parameter["operation"]', { timeout: 35000 });
 		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^get$/);
 	});
 });
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index cbc7a165f15f3..8c714eaa6c77e 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -88,6 +88,7 @@ describe('User Management', { disableAutoLogin: true }, () => {
 
 	it(`shouldn't allow user to set weak password`, () => {
 		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+		personalSettingsPage.getters.changePasswordLink().click();
 		for (let weakPass of updatedPersonalData.invalidPasswords) {
 			personalSettingsPage.actions.tryToSetWeakPassword(INSTANCE_OWNER.password, weakPass);
 		}
@@ -95,6 +96,7 @@ describe('User Management', { disableAutoLogin: true }, () => {
 
 	it(`shouldn't allow user to change password if old password is wrong`, () => {
 		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+		personalSettingsPage.getters.changePasswordLink().click();
 		personalSettingsPage.actions.updatePassword('iCannotRemember', updatedPersonalData.newPassword);
 		workflowPage.getters
 			.errorToast()
@@ -104,6 +106,7 @@ describe('User Management', { disableAutoLogin: true }, () => {
 
 	it(`should change current user password`, () => {
 		personalSettingsPage.actions.loginAndVisit(INSTANCE_OWNER.email, INSTANCE_OWNER.password);
+		personalSettingsPage.getters.changePasswordLink().click();
 		personalSettingsPage.actions.updatePassword(
 			INSTANCE_OWNER.password,
 			updatedPersonalData.newPassword,
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index 0b129a29bc81b..554455ef73420 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -25,7 +25,6 @@ export class PersonalSettingsPage extends BasePage {
 			this.getters.saveSettingsButton().realClick();
 		},
 		updatePassword: (oldPassword: string, newPassword: string) => {
-			this.getters.changePasswordLink().realClick();
 			changePasswordModal.getters.modalContainer().should('be.visible');
 			changePasswordModal.getters.currentPasswordInput().type('{selectall}').type(oldPassword);
 			changePasswordModal.getters.newPasswordInput().type('{selectall}').type(newPassword);
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 9e0b40972cbc4..19701c13d0e46 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -33,6 +33,7 @@
 		<div :class="showErrors ? $style.errorInput : ''" @keydown.stop @keydown.enter="onEnter">
 			<slot v-if="hasDefaultSlot" />
 			<n8n-select
+				:class="{ [$style.multiSelectSmallTags]: tagSize === 'small' }"
 				v-else-if="type === 'select' || type === 'multi-select'"
 				:modelValue="modelValue"
 				:placeholder="placeholder"
@@ -50,6 +51,7 @@
 					:key="option.value"
 					:value="option.value"
 					:label="option.label"
+					size="small"
 				/>
 			</n8n-select>
 			<n8n-input
@@ -127,6 +129,7 @@ export interface Props {
 	inactiveLabel?: string;
 	inactiveColor?: string;
 	teleported?: boolean;
+	tagSize?: 'small' | 'medium';
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -136,6 +139,7 @@ const props = withDefaults(defineProps<Props>(), {
 	showRequiredAsterisk: true,
 	validateOnBlur: true,
 	teleported: true,
+	tagSize: 'small',
 });
 
 const emit = defineEmits<{
@@ -268,4 +272,12 @@ defineExpose({ inputRef });
 .errorInput {
 	--input-border-color: var(--color-danger);
 }
+
+.multiSelectSmallTags {
+	:global(.el-tag) {
+		height: 24px;
+		padding: 0 8px;
+		line-height: 22px;
+	}
+}
 </style>
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 8351959667de1..2f41b5900843f 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -26,6 +26,7 @@
 						:data-test-id="input.name"
 						:showValidationWarnings="showValidationWarnings"
 						:teleported="teleported"
+						:tagSize="tagSize"
 						@update:modelValue="(value) => onUpdateModelValue(input.name, value)"
 						@validate="(value) => onValidate(input.name, value)"
 						@enter="onSubmit"
@@ -73,6 +74,11 @@ export default defineComponent({
 			type: Boolean,
 			default: true,
 		},
+		tagSize: {
+			type: String,
+			default: 'small',
+			validator: (value: string): boolean => ['small', 'medium'].includes(value),
+		},
 	},
 	data() {
 		return {
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 011fd42042407..16712d8dd8074 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -694,12 +694,10 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.el-overlay-dialog {
-	padding-top: var(--spacing-2xs);
-}
-
 .ndv-wrapper {
 	overflow: visible;
+	padding-top: var(--spacing-2xs);
+	margin-top: 0;
 }
 
 .data-display-wrapper {
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 272d6f0161b1c..c47e40b3b728e 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -19,6 +19,7 @@
 					:columnView="true"
 					:eventBus="formBus"
 					:teleported="teleported"
+					tagSize="small"
 					@submit="onSubmit"
 				/>
 			</div>
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index dd8262cebd084..956b226fb2645 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -9,10 +9,15 @@
 	font-weight: 400;
 }
 
+.el-overlay-dialog {
+	justify-content: unset;
+}
+
 .el-dialog {
 	border: var(--border-base);
 	box-shadow: 0px 6px 16px rgb(68 28 23 / 6%);
 	border-radius: 8px;
+	margin-top: 15vh;
 
 	@media (max-height: 1050px) {
 		margin: 4em auto !important;

From c5e3c547a31d074ee5ba9b424a0632707b9eb227 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, 28 Jul 2023 18:28:17 +0200
Subject: [PATCH 085/116] ci: Fix linting issues (no-changelog) (#6788)

* ci: Fix linting (no-changelog)

* lintfix for nodes-base as well
---
 package.json                                  |  3 +-
 packages/cli/.eslintrc.js                     |  9 ++-
 packages/cli/src/ActiveWorkflowRunner.ts      |  7 +-
 packages/cli/src/CredentialsHelper.ts         |  2 +-
 packages/cli/src/CredentialsOverwrites.ts     |  4 +-
 packages/cli/src/TestWebhooks.ts              |  5 +-
 packages/cli/src/WaitingWebhooks.ts           |  5 +-
 packages/cli/src/commands/execute.ts          |  6 +-
 .../src/controllers/translation.controller.ts |  5 +-
 .../AbstractEventMessage.ts                   |  2 +-
 .../MessageEventBusDestination.ee.ts          | 11 ++-
 .../MessageEventBusDestinationSentry.ee.ts    | 10 ++-
 .../MessageEventBusDestinationSyslog.ee.ts    | 10 ++-
 packages/cli/src/telemetry/index.ts           | 14 +++-
 .../cli/src/workflows/workflows.controller.ts |  3 +-
 .../src/workflows/workflows.services.ee.ts    |  5 +-
 .../cli/test/integration/shared/testDb.ts     |  2 +-
 packages/core/src/BinaryDataManager/index.ts  |  2 +-
 packages/core/src/UserSettings.ts             |  2 +-
 packages/design-system/.eslintrc.js           |  6 +-
 packages/editor-ui/.eslintrc.js               | 74 +++++++++----------
 packages/editor-ui/package.json               |  2 +-
 packages/nodes-base/.eslintrc.js              | 36 +++++----
 .../nodes-base/nodes/Amqp/AmqpTrigger.node.ts |  9 ++-
 .../nodes/Aws/S3/V2/AwsS3V2.node.ts           |  4 +-
 .../EmailReadImap/v1/EmailReadImapV1.node.ts  | 15 ++--
 .../EmailReadImap/v2/EmailReadImapV2.node.ts  | 31 ++++----
 .../nodes/FileMaker/GenericFunctions.ts       | 13 ++--
 .../nodes/ItemLists/V1/ItemListsV1.node.ts    |  2 +-
 .../nodes/ItemLists/V2/ItemListsV2.node.ts    |  2 +-
 .../itemList/removeDuplicates.operation.ts    |  2 +-
 .../nodes/Npm/PackageDescription.ts           |  2 +-
 .../nodes-base/nodes/Rundeck/Rundeck.node.ts  |  1 -
 packages/nodes-base/nodes/SeaTable/types.ts   | 10 +--
 .../nodes/TheHive/QueryFunctions.ts           |  1 -
 packages/nodes-base/nodes/Webhook/error.ts    |  5 +-
 .../nodes/WooCommerce/GenericFunctions.ts     |  6 +-
 packages/workflow/.eslintrc.js                |  8 +-
 packages/workflow/src/Interfaces.ts           |  7 +-
 pnpm-lock.yaml                                | 15 ++--
 40 files changed, 204 insertions(+), 154 deletions(-)

diff --git a/package.json b/package.json
index 97ee59687d284..2f94b38c11c5d 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "nock": "^13.3.2",
     "nodemon": "^3.0.1",
     "p-limit": "^3.1.0",
-    "prettier": "*",
+    "prettier": "^3.0.0",
     "rimraf": "^5.0.1",
     "run-script-os": "^1.0.7",
     "start-server-and-test": "^2.0.0",
@@ -73,7 +73,6 @@
       "@types/node": "^18.16.16",
       "chokidar": "3.5.2",
       "jsonwebtoken": "9.0.0",
-      "prettier": "^3.0.0",
       "semver": "^7.5.4",
       "tough-cookie": "^4.1.3",
       "tslib": "^2.6.1",
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index 1b194182669fb..694ed381d8952 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -18,7 +18,14 @@ module.exports = {
 		// TODO: Remove this
 		'import/no-cycle': 'warn',
 		'import/order': 'off',
-		'import/extensions': 'off',
+		'import/extensions': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
+		'@typescript-eslint/no-explicit-any': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/ban-types': 'warn',
+		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
+		'@typescript-eslint/no-unsafe-declaration-merging': 'warn',
 	},
 };
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 051ffcd5a7770..daae8a28f848d 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -58,13 +58,16 @@ import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { WebhookEntity } from '@db/entities/WebhookEntity';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { createErrorExecution } from '@/GenericHelpers';
-import { WORKFLOW_REACTIVATE_INITIAL_TIMEOUT, WORKFLOW_REACTIVATE_MAX_TIMEOUT } from '@/constants';
+import {
+	STARTING_NODES,
+	WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
+	WORKFLOW_REACTIVATE_MAX_TIMEOUT,
+} from '@/constants';
 import { NodeTypes } from '@/NodeTypes';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExternalHooks } from '@/ExternalHooks';
 import { whereClause } from './UserManagement/UserManagementHelper';
 import { WorkflowsService } from './workflows/workflows.services';
-import { STARTING_NODES } from './constants';
 import { webhookNotFoundErrorMessage } from './utils';
 import { In } from 'typeorm';
 import { WebhookRepository } from '@db/repositories';
diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts
index 03cbf74b68e2b..1f541b0f4dbdd 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -172,7 +172,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 			(property) => property.type === 'hidden' && property?.typeOptions?.expirable === true,
 		);
 
-		if (expirableProperty === undefined || expirableProperty.name === undefined) {
+		if (expirableProperty?.name === undefined) {
 			return undefined;
 		}
 
diff --git a/packages/cli/src/CredentialsOverwrites.ts b/packages/cli/src/CredentialsOverwrites.ts
index c3a5702df113f..81b86c3651fc0 100644
--- a/packages/cli/src/CredentialsOverwrites.ts
+++ b/packages/cli/src/CredentialsOverwrites.ts
@@ -1,6 +1,6 @@
 import config from '@/config';
-import type { ICredentialDataDecryptedObject, ICredentialTypes } from 'n8n-workflow';
-import { deepCopy, LoggerProxy as Logger, jsonParse } from 'n8n-workflow';
+import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+import { deepCopy, LoggerProxy as Logger, jsonParse, ICredentialTypes } from 'n8n-workflow';
 import type { ICredentialsOverwrite } from '@/Interfaces';
 
 class CredentialsOverwritesClass {
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index c9a36e9f2e77c..7acbefc59150a 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -35,7 +35,10 @@ export class TestWebhooks {
 		};
 	} = {};
 
-	constructor(private activeWebhooks: ActiveWebhooks, private push: Push) {
+	constructor(
+		private activeWebhooks: ActiveWebhooks,
+		private push: Push,
+	) {
 		activeWebhooks.testWebhooks = true;
 	}
 
diff --git a/packages/cli/src/WaitingWebhooks.ts b/packages/cli/src/WaitingWebhooks.ts
index 7d66fda525f34..aa70f71ac2cc5 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/WaitingWebhooks.ts
@@ -16,7 +16,10 @@ import { ExecutionRepository } from '@db/repositories';
 
 @Service()
 export class WaitingWebhooks {
-	constructor(private nodeTypes: NodeTypes, private executionRepository: ExecutionRepository) {}
+	constructor(
+		private nodeTypes: NodeTypes,
+		private executionRepository: ExecutionRepository,
+	) {}
 
 	async executeWebhook(
 		httpMethod: WebhookHttpMethod,
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index fbccee762cd89..c708e664decbe 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -70,11 +70,7 @@ export class Execute extends BaseCommand {
 
 			// Do a basic check if the data in the file looks right
 			// TODO: Later check with the help of TypeScript data if it is valid or not
-			if (
-				workflowData === null ||
-				workflowData.nodes === undefined ||
-				workflowData.connections === undefined
-			) {
+			if (workflowData?.nodes === undefined || workflowData.connections === undefined) {
 				this.logger.info(`The file "${flags.file}" does not contain valid workflow data.`);
 				return;
 			}
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
index 6d36d650d2e2c..8238e73ebdaf2 100644
--- a/packages/cli/src/controllers/translation.controller.ts
+++ b/packages/cli/src/controllers/translation.controller.ts
@@ -17,7 +17,10 @@ export declare namespace TranslationRequest {
 @Authorized()
 @RestController('/')
 export class TranslationController {
-	constructor(private config: Config, private credentialTypes: ICredentialTypes) {}
+	constructor(
+		private config: Config,
+		private credentialTypes: ICredentialTypes,
+	) {}
 
 	@Get('/credential-translation')
 	async getCredentialTranslation(req: TranslationRequest.Credential) {
diff --git a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
index f71b03a413755..7d4fbff4adcae 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
@@ -3,7 +3,7 @@ import { DateTime } from 'luxon';
 import type { EventMessageTypeNames, JsonObject } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import type { AbstractEventPayload } from './AbstractEventPayload';
-import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
+import { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
 import type { EventNamesTypes } from '.';
 
 function modifyUnderscoredKeys(
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
index 0a5117b00b73e..373958e7dbd31 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
@@ -1,12 +1,17 @@
 import { v4 as uuid } from 'uuid';
-import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow';
-import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import type { INodeCredentials } from 'n8n-workflow';
+import {
+	LoggerProxy,
+	MessageEventBusDestinationTypeNames,
+	MessageEventBusDestinationOptions,
+} from 'n8n-workflow';
 import * as Db from '@/Db';
 import type { AbstractEventMessage } from '../EventMessageClasses/AbstractEventMessage';
 import type { EventMessageTypes } from '../EventMessageClasses';
 import type { DeleteResult, InsertResult } from 'typeorm';
 import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
-import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
+import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export abstract class MessageEventBusDestination implements MessageEventBusDestinationOptions {
 	// Since you can't have static abstract functions - this just serves as a reminder that you need to implement these. Please.
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
index ab1c4ca379516..a9f5c0fee04a9 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
@@ -3,15 +3,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import * as Sentry from '@sentry/node';
-import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
-import type {
-	MessageEventBusDestinationOptions,
+import {
+	LoggerProxy,
+	MessageEventBusDestinationTypeNames,
 	MessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
+import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
 import { N8N_VERSION } from '@/constants';
-import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
+import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationSentryOptions = (
 	candidate: unknown,
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
index 13d6a1636c5ed..f5f4981667b74 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
@@ -2,15 +2,17 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import syslog from 'syslog-client';
-import type {
-	MessageEventBusDestinationOptions,
+import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
+import {
+	LoggerProxy,
+	MessageEventBusDestinationTypeNames,
 	MessageEventBusDestinationSyslogOptions,
 } from 'n8n-workflow';
-import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
-import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
+import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationSyslogOptions = (
 	candidate: unknown,
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 02a01ed6915e1..244c421c36e13 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -40,7 +40,10 @@ export class Telemetry {
 
 	private executionCountsBuffer: IExecutionsBuffer = {};
 
-	constructor(private postHog: PostHogClient, private license: License) {}
+	constructor(
+		private postHog: PostHogClient,
+		private license: License,
+	) {}
 
 	setInstanceId(instanceId: string) {
 		this.instanceId = instanceId;
@@ -70,9 +73,12 @@ export class Telemetry {
 	}
 
 	private startPulse() {
-		this.pulseIntervalReference = setInterval(async () => {
-			void this.pulse();
-		}, 6 * 60 * 60 * 1000); // every 6 hours
+		this.pulseIntervalReference = setInterval(
+			async () => {
+				void this.pulse();
+			},
+			6 * 60 * 60 * 1000,
+		); // every 6 hours
 	}
 
 	private async pulse(): Promise<unknown> {
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 0191cf28cd155..c723fe7ba4937 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -169,8 +169,7 @@ workflowsController.get(
 
 		// Do a very basic check if it is really a n8n-workflow-json
 		if (
-			workflowData === undefined ||
-			workflowData.nodes === undefined ||
+			workflowData?.nodes === undefined ||
 			!Array.isArray(workflowData.nodes) ||
 			workflowData.connections === undefined ||
 			typeof workflowData.connections !== 'object' ||
diff --git a/packages/cli/src/workflows/workflows.services.ee.ts b/packages/cli/src/workflows/workflows.services.ee.ts
index 97b8df7e9cb35..44ddaa9e1ce86 100644
--- a/packages/cli/src/workflows/workflows.services.ee.ts
+++ b/packages/cli/src/workflows/workflows.services.ee.ts
@@ -90,9 +90,8 @@ export class EEWorkflowsService extends WorkflowsService {
 	}
 
 	static addOwnerId(workflow: WorkflowForList, workflowOwnerRole: Role): void {
-		const ownerId = workflow.shared?.find(
-			({ roleId }) => String(roleId) === workflowOwnerRole.id,
-		)?.userId;
+		const ownerId = workflow.shared?.find(({ roleId }) => String(roleId) === workflowOwnerRole.id)
+			?.userId;
 		workflow.ownedBy = ownerId ? { id: ownerId } : null;
 		delete workflow.shared;
 	}
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index 55a042d28263d..ea2d0d4403872 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -577,7 +577,7 @@ export const getBootstrapDBOptions = (type: TestDBType) =>
 		name: type,
 		database: type,
 		...baseOptions(type),
-	} as const);
+	}) as const;
 
 const getDBOptions = (type: TestDBType, name: string) => ({
 	type,
diff --git a/packages/core/src/BinaryDataManager/index.ts b/packages/core/src/BinaryDataManager/index.ts
index 56b9f1550a86c..46d0f446f85a9 100644
--- a/packages/core/src/BinaryDataManager/index.ts
+++ b/packages/core/src/BinaryDataManager/index.ts
@@ -185,7 +185,7 @@ export class BinaryDataManager {
 	}
 
 	async duplicateBinaryData(
-		inputData: Array<INodeExecutionData[] | null> | unknown,
+		inputData: Array<INodeExecutionData[] | null>,
 		executionId: string,
 	): Promise<INodeExecutionData[][]> {
 		if (inputData && this.managers[this.binaryDataMode]) {
diff --git a/packages/core/src/UserSettings.ts b/packages/core/src/UserSettings.ts
index cef8db649b18a..748c087bbd6b9 100644
--- a/packages/core/src/UserSettings.ts
+++ b/packages/core/src/UserSettings.ts
@@ -77,7 +77,7 @@ export async function getEncryptionKey(): Promise<string> {
 
 	const userSettings = await getUserSettings();
 
-	if (userSettings === undefined || userSettings.encryptionKey === undefined) {
+	if (userSettings?.encryptionKey === undefined) {
 		throw new Error(RESPONSE_ERROR_MESSAGES.NO_ENCRYPTION_KEY);
 	}
 
diff --git a/packages/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index fbf2795ffe585..a14832cc551a3 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -12,13 +12,13 @@ module.exports = {
 		'n8n-local-rules/dangerously-use-html-string-missing': 'off',
 
 		// TODO: Remove these
-		'import/no-default-export': 'off',
+		'import/no-default-export': 'warn',
 		'import/order': 'off',
 		'@typescript-eslint/no-unsafe-argument': 'warn',
 		'@typescript-eslint/no-unsafe-return': 'warn',
 		'@typescript-eslint/no-unsafe-member-access': 'warn',
-		'@typescript-eslint/prefer-optional-chain': 'off',
-		'@typescript-eslint/prefer-nullish-coalescing': 'off',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
 	},
 
 	overrides: [
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index 94174db5c4636..d35df662f4c6f 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -10,45 +10,45 @@ module.exports = {
 
 	rules: {
 		// TODO: Remove these
-		'id-denylist': 'off',
-		'import/extensions': 'off',
-		'import/no-default-export': 'off',
-		'import/no-extraneous-dependencies': 'off',
+		'id-denylist': 'warn',
+		'import/extensions': 'warn',
+		'import/no-default-export': 'warn',
+		'import/no-extraneous-dependencies': 'warn',
 		'import/order': 'off',
 		'import/no-cycle': 'warn',
-		'import/no-duplicates': 'off',
-		indent: 'off',
-		'@typescript-eslint/ban-types': 'off',
-		'@typescript-eslint/dot-notation': 'off',
-		'@typescript-eslint/lines-between-class-members': 'off',
-		'@typescript-eslint/member-delimiter-style': 'off',
-		'@typescript-eslint/naming-convention': 'off',
-		'@typescript-eslint/no-empty-interface': 'off',
-		'@typescript-eslint/no-for-in-array': 'off',
-		'@typescript-eslint/no-loop-func': 'off',
-		'@typescript-eslint/no-non-null-assertion': 'off',
-		'@typescript-eslint/no-shadow': 'off',
-		'@typescript-eslint/no-this-alias': 'off',
-		'@typescript-eslint/no-unnecessary-boolean-literal-compare': 'off',
-		'@typescript-eslint/no-unnecessary-type-assertion': 'off',
-		'@typescript-eslint/no-unsafe-argument': 'off',
-		'@typescript-eslint/no-unsafe-assignment': 'off',
-		'@typescript-eslint/no-unsafe-call': 'off',
-		'@typescript-eslint/no-unsafe-member-access': 'off',
-		'@typescript-eslint/no-unsafe-return': 'off',
-		'@typescript-eslint/no-unused-expressions': 'off',
-		'@typescript-eslint/no-unused-vars': 'off',
-		'@typescript-eslint/no-use-before-define': 'off',
-		'@typescript-eslint/no-var-requires': 'off',
-		'@typescript-eslint/prefer-nullish-coalescing': 'off',
-		'@typescript-eslint/prefer-optional-chain': 'off',
-		'@typescript-eslint/restrict-plus-operands': 'off',
-		'@typescript-eslint/restrict-template-expressions': 'off',
-		'@typescript-eslint/unbound-method': 'off',
+		'import/no-duplicates': 'warn',
+		indent: 'warn',
+		'@typescript-eslint/ban-types': 'warn',
+		'@typescript-eslint/dot-notation': 'warn',
+		'@typescript-eslint/lines-between-class-members': 'warn',
+		'@typescript-eslint/member-delimiter-style': 'warn',
+		'@typescript-eslint/naming-convention': 'warn',
+		'@typescript-eslint/no-empty-interface': 'warn',
+		'@typescript-eslint/no-for-in-array': 'warn',
+		'@typescript-eslint/no-loop-func': 'warn',
+		'@typescript-eslint/no-non-null-assertion': 'warn',
+		'@typescript-eslint/no-shadow': 'warn',
+		'@typescript-eslint/no-this-alias': 'warn',
+		'@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
+		'@typescript-eslint/no-unnecessary-type-assertion': 'warn',
+		'@typescript-eslint/no-unsafe-argument': 'warn',
+		'@typescript-eslint/no-unsafe-assignment': 'warn',
+		'@typescript-eslint/no-unsafe-call': 'warn',
+		'@typescript-eslint/no-unsafe-member-access': 'warn',
+		'@typescript-eslint/no-unsafe-return': 'warn',
+		'@typescript-eslint/no-unused-expressions': 'warn',
+		'@typescript-eslint/no-unused-vars': 'warn',
+		'@typescript-eslint/no-use-before-define': 'warn',
+		'@typescript-eslint/no-var-requires': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/restrict-plus-operands': 'warn',
+		'@typescript-eslint/restrict-template-expressions': 'warn',
+		'@typescript-eslint/unbound-method': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
-		'@typescript-eslint/no-redundant-type-constituents': 'off',
-		'@typescript-eslint/no-base-to-string': 'off',
-		'@typescript-eslint/no-explicit-any': 'off',
-		'@typescript-eslint/no-unsafe-enum-comparison': 'off',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-explicit-any': 'warn',
+		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
 	},
 };
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index cfa12225a01a5..19031838c2108 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -65,7 +65,7 @@
     "n8n-workflow": "workspace:*",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.1.6",
-    "prettier": "*",
+    "prettier": "^3.0.0",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
     "uuid": "^8.3.2",
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index bdb2bee4aa0d7..47760b17a0541 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -12,25 +12,31 @@ module.exports = {
 
 	rules: {
 		// TODO: remove all the following rules
-		eqeqeq: 'off',
-		'id-denylist': 'off',
-		'import/extensions': 'off',
-		'import/order': 'off',
-		'prefer-spread': 'off',
-		'import/no-extraneous-dependencies': 'off',
+		eqeqeq: 'warn',
+		'id-denylist': 'warn',
+		'import/extensions': 'warn',
+		'import/order': 'warn',
+		'prefer-spread': 'warn',
+		'import/no-extraneous-dependencies': 'warn',
 
 		'@typescript-eslint/naming-convention': ['error', { selector: 'memberLike', format: null }],
-		'@typescript-eslint/no-explicit-any': 'off', //812 warnings, better to fix in separate PR
-		'@typescript-eslint/no-non-null-assertion': 'off', //665 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-assignment': 'off', //7084 problems, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-call': 'off', //541 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-member-access': 'off', //4591 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-return': 'off', //438 errors, better to fix in separate PR
+		'@typescript-eslint/no-explicit-any': 'warn', //812 warnings, better to fix in separate PR
+		'@typescript-eslint/no-non-null-assertion': 'warn', //665 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-assignment': 'warn', //7084 problems, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-call': 'warn', //541 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-member-access': 'warn', //4591 errors, better to fix in separate PR
+		'@typescript-eslint/no-unsafe-return': 'warn', //438 errors, better to fix in separate PR
 		'@typescript-eslint/no-unused-expressions': ['error', { allowTernary: true }],
-		'@typescript-eslint/restrict-template-expressions': 'off', //1152 errors, better to fix in separate PR
-		'@typescript-eslint/unbound-method': 'off',
+		'@typescript-eslint/restrict-template-expressions': 'warn', //1152 errors, better to fix in separate PR
+		'@typescript-eslint/unbound-method': 'warn',
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
-		'@typescript-eslint/prefer-nullish-coalescing': 'off',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/no-unused-vars': 'warn',
+		'@typescript-eslint/no-unsafe-argument': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
+		'@typescript-eslint/restrict-plus-operands': 'warn',
 	},
 
 	overrides: [
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index d69fa908b6064..d8c2d9c30639f 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -198,9 +198,12 @@ export class AmqpTrigger implements INodeType {
 			this.emit([this.helpers.returnJsonArray([data as any])]);
 
 			if (!context.receiver?.has_credit()) {
-				setTimeout(() => {
-					context.receiver?.add_credit(pullMessagesNumber);
-				}, (options.sleepTime as number) || 10);
+				setTimeout(
+					() => {
+						context.receiver?.add_credit(pullMessagesNumber);
+					},
+					(options.sleepTime as number) || 10,
+				);
 			}
 		});
 
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index 6c09d2a900b77..2473fc973a708 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -572,7 +572,9 @@ export class AwsS3V2 implements INodeType {
 						const servicePath = bucketName.includes('.') ? 's3' : `${bucketName}.s3`;
 						const basePath = bucketName.includes('.') ? `/${bucketName}` : '';
 
-						const destination = `${basePath}/${destinationParts.slice(2, destinationParts.length).join('/')}`;
+						const destination = `${basePath}/${destinationParts
+							.slice(2, destinationParts.length)
+							.join('/')}`;
 
 						responseData = await awsApiRequestREST.call(this, servicePath, 'GET', basePath, '', {
 							location: '',
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 004edde494f67..be149e125e940 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -619,12 +619,15 @@ export class EmailReadImapV1 implements INodeType {
 		let reconnectionInterval: NodeJS.Timeout | undefined;
 
 		if (options.forceReconnect !== undefined) {
-			reconnectionInterval = setInterval(async () => {
-				this.logger.verbose('Forcing reconnection of IMAP node.');
-				connection.end();
-				connection = await establishConnection();
-				await connection.openBox(mailbox);
-			}, (options.forceReconnect as number) * 1000 * 60);
+			reconnectionInterval = setInterval(
+				async () => {
+					this.logger.verbose('Forcing reconnection of IMAP node.');
+					connection.end();
+					connection = await establishConnection();
+					await connection.openBox(mailbox);
+				},
+				(options.forceReconnect as number) * 1000 * 60,
+			);
 		}
 
 		// When workflow and so node gets set to inactive close the connectoin
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 29677d10a7f2d..fc0bed17019a5 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -628,20 +628,23 @@ export class EmailReadImapV2 implements INodeType {
 		let reconnectionInterval: NodeJS.Timeout | undefined;
 
 		if (options.forceReconnect !== undefined) {
-			reconnectionInterval = setInterval(async () => {
-				this.logger.verbose('Forcing reconnect to IMAP server');
-				try {
-					isCurrentlyReconnecting = true;
-					if (connection.closeBox) await connection.closeBox(false);
-					connection.end();
-					connection = await establishConnection();
-					await connection.openBox(mailbox);
-				} catch (error) {
-					this.logger.error(error as string);
-				} finally {
-					isCurrentlyReconnecting = false;
-				}
-			}, (options.forceReconnect as number) * 1000 * 60);
+			reconnectionInterval = setInterval(
+				async () => {
+					this.logger.verbose('Forcing reconnect to IMAP server');
+					try {
+						isCurrentlyReconnecting = true;
+						if (connection.closeBox) await connection.closeBox(false);
+						connection.end();
+						connection = await establishConnection();
+						await connection.openBox(mailbox);
+					} catch (error) {
+						this.logger.error(error as string);
+					} finally {
+						isCurrentlyReconnecting = false;
+					}
+				},
+				(options.forceReconnect as number) * 1000 * 60,
+			);
 		}
 
 		// When workflow and so node gets set to inactive close the connectoin
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index 2b689ce8f782c..f8e8a855f67f7 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -76,12 +76,11 @@ export async function getToken(
 
 		return response.response.token;
 	} catch (error) {
-		let message
-		if ( error.statusCode === 502 ) {
-			message = 'The server is not responding. Is the DataAPI enabled?'
-		}
-		else if (error.error ) {
-			message = error.error.messages[0].code + ' - ' + error.error.messages[0].message
+		let message;
+		if (error.statusCode === 502) {
+			message = 'The server is not responding. Is the DataAPI enabled?';
+		} else if (error.error) {
+			message = error.error.messages[0].code + ' - ' + error.error.messages[0].message;
 		} else {
 			message = error.message;
 		}
@@ -267,7 +266,7 @@ export async function logout(
 	};
 
 	const response = await this.helpers.request(requestOptions);
-	return response
+	return response;
 }
 
 export function parseSort(this: IExecuteFunctions, i: number): object | null {
diff --git a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
index 762d720d72fe2..1684b71642785 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -1167,7 +1167,7 @@ return 0;`,
 						({
 							json: { ...item.json, __INDEX: index },
 							pairedItem: { item: index },
-						} as INodeExecutionData),
+						}) as INodeExecutionData,
 				);
 				//sort items using the compare keys
 				newItems.sort((a, b) => {
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
index d8f36ebcef79b..d2d952218f768 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -1207,7 +1207,7 @@ return 0;`,
 						({
 							json: { ...item.json, __INDEX: index },
 							pairedItem: { item: index },
-						} as INodeExecutionData),
+						}) as INodeExecutionData,
 				);
 				//sort items using the compare keys
 				newItems.sort((a, b) => {
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
index c4f6d708c9bd0..c526ec84251fc 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
@@ -162,7 +162,7 @@ export async function execute(
 			({
 				json: { ...item.json, __INDEX: index },
 				pairedItem: { item: index },
-			} as INodeExecutionData),
+			}) as INodeExecutionData,
 	);
 	//sort items using the compare keys
 	newItems.sort((a, b) => {
diff --git a/packages/nodes-base/nodes/Npm/PackageDescription.ts b/packages/nodes-base/nodes/Npm/PackageDescription.ts
index 4f88f96cfd6ab..75ebf7ed75567 100644
--- a/packages/nodes-base/nodes/Npm/PackageDescription.ts
+++ b/packages/nodes-base/nodes/Npm/PackageDescription.ts
@@ -92,7 +92,7 @@ export const packageOperations: INodeProperties[] = [
 								return items.flatMap(({ json }) =>
 									(json.objects as Array<{ package: PackageJson }>).map(
 										({ package: { name, version, description } }) =>
-											({ json: { name, version, description } } as INodeExecutionData),
+											({ json: { name, version, description } }) as INodeExecutionData,
 									),
 								);
 							},
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 1f9d76c53c9c8..439c9501d4a2c 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -131,7 +131,6 @@ export class Rundeck implements INodeType {
 				},
 				default: '',
 				placeholder: 'Add Filters',
-				required: false,
 				description: 'Filter Rundeck nodes by name',
 			},
 
diff --git a/packages/nodes-base/nodes/SeaTable/types.ts b/packages/nodes-base/nodes/SeaTable/types.ts
index 765be76513666..cc8ee249fefad 100644
--- a/packages/nodes-base/nodes/SeaTable/types.ts
+++ b/packages/nodes-base/nodes/SeaTable/types.ts
@@ -56,16 +56,12 @@ export type TEndpointVariableName = 'access_token' | 'dtable_uuid' | 'server';
 
 // Template Literal Types requires-ts-4.1.5 -- deferred
 export type TMethod = 'GET' | 'POST';
-type TDeferredEndpoint = string;
-type TDeferredEndpointExpr = string;
 type TEndpoint =
 	| '/api/v2.1/dtable/app-access-token/'
-	| '/dtable-server/api/v1/dtables/{{dtable_uuid}}/rows/'
-	| TDeferredEndpoint;
-export type TEndpointExpr = TEndpoint | TDeferredEndpointExpr;
+	| '/dtable-server/api/v1/dtables/{{dtable_uuid}}/rows/';
+export type TEndpointExpr = TEndpoint;
 export type TEndpointResolvedExpr =
-	| TEndpoint
-	| string; /* deferred: but already in use for header values, e.g. authentication */
+	TEndpoint; /* deferred: but already in use for header values, e.g. authentication */
 
 export type TDateTimeFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ' /* moment.js */;
 
diff --git a/packages/nodes-base/nodes/TheHive/QueryFunctions.ts b/packages/nodes-base/nodes/TheHive/QueryFunctions.ts
index 7bb5a4f604aed..40b74d8865904 100644
--- a/packages/nodes-base/nodes/TheHive/QueryFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/QueryFunctions.ts
@@ -14,7 +14,6 @@ export declare type queryIndexSignature =
 	| '_id'
 	| '_between'
 	| '_parent'
-	| '_parent'
 	| '_child'
 	| '_type'
 	| '_string'
diff --git a/packages/nodes-base/nodes/Webhook/error.ts b/packages/nodes-base/nodes/Webhook/error.ts
index d9397a93e0f24..35001d67e4b85 100644
--- a/packages/nodes-base/nodes/Webhook/error.ts
+++ b/packages/nodes-base/nodes/Webhook/error.ts
@@ -1,5 +1,8 @@
 export class WebhookAuthorizationError extends Error {
-	constructor(readonly responseCode: number, message?: string) {
+	constructor(
+		readonly responseCode: number,
+		message?: string,
+	) {
 		if (message === undefined) {
 			message = 'Authorization problem!';
 			if (responseCode === 401) {
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index 36f63f62eabac..db0f7626cd047 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -87,9 +87,7 @@ export function getAutomaticSecret(credentials: ICredentialDataDecryptedObject)
 	return createHash('md5').update(data).digest('hex');
 }
 
-export function setMetadata(
-	data: IShoppingLine[] | IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[],
-) {
+export function setMetadata(data: IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[]) {
 	for (let i = 0; i < data.length; i++) {
 		//@ts-ignore\
 		if (data[i].metadataUi?.metadataValues) {
@@ -105,7 +103,7 @@ export function setMetadata(
 }
 
 export function toSnakeCase(
-	data: IShoppingLine[] | IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[] | IDataObject,
+	data: IShoppingLine[] | IFeeLine[] | ILineItem[] | ICouponLine[] | IDataObject,
 ) {
 	if (!Array.isArray(data)) {
 		data = [data];
diff --git a/packages/workflow/.eslintrc.js b/packages/workflow/.eslintrc.js
index ed914e6f9621d..79997056e7b81 100644
--- a/packages/workflow/.eslintrc.js
+++ b/packages/workflow/.eslintrc.js
@@ -9,6 +9,12 @@ module.exports = {
 	...sharedOptions(__dirname),
 
 	rules: {
-		'import/order': 'off', // TODO: remove this
+		// TODO: remove these
+		'import/order': 'off',
+		'@typescript-eslint/no-base-to-string': 'warn',
+		'@typescript-eslint/no-explicit-any': 'warn',
+		'@typescript-eslint/no-redundant-type-constituents': 'warn',
+		'@typescript-eslint/prefer-nullish-coalescing': 'warn',
+		'@typescript-eslint/prefer-optional-chain': 'warn',
 	},
 };
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index b17af48c165d4..58d691a85adfd 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1199,9 +1199,10 @@ export interface INodePropertyValueExtractorRegex extends INodePropertyValueExtr
 }
 
 export interface INodePropertyValueExtractorFunction {
-	(this: IExecuteSingleFunctions, value: string | NodeParameterValue):
-		| Promise<string | NodeParameterValue>
-		| (string | NodeParameterValue);
+	(
+		this: IExecuteSingleFunctions,
+		value: string | NodeParameterValue,
+	): Promise<string | NodeParameterValue> | (string | NodeParameterValue);
 }
 
 export type INodePropertyValueExtractor = INodePropertyValueExtractorRegex;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e06fe46bddefa..bb2a32e3faf4d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,7 +11,6 @@ overrides:
   '@types/node': ^18.16.16
   chokidar: 3.5.2
   jsonwebtoken: 9.0.0
-  prettier: ^3.0.0
   semver: ^7.5.4
   tough-cookie: ^4.1.3
   tslib: ^2.6.1
@@ -4945,7 +4944,7 @@ packages:
       less-loader: 11.1.3(less@4.1.3)(webpack@5.75.0)
       postcss: 8.4.27
       postcss-loader: 7.3.3(postcss@8.4.27)(webpack@5.75.0)
-      prettier: 3.0.0
+      prettier: 2.8.8
       react: 17.0.2
       react-dom: 18.2.0(react@17.0.2)
       resolve-url-loader: 5.0.0
@@ -5259,7 +5258,7 @@ packages:
       jscodeshift: 0.14.0(@babel/preset-env@7.22.9)
       leven: 3.1.0
       ora: 5.4.1
-      prettier: 3.0.0
+      prettier: 2.8.8
       prompts: 2.4.2
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
@@ -5310,7 +5309,7 @@ packages:
       globby: 11.1.0
       jscodeshift: 0.14.0(@babel/preset-env@7.22.9)
       lodash: 4.17.21
-      prettier: 3.0.0
+      prettier: 2.8.8
       recast: 0.23.3
     transitivePeerDependencies:
       - supports-color
@@ -10886,7 +10885,7 @@ packages:
       indefinite: 2.4.1
       pascal-case: 3.1.2
       pluralize: 8.0.0
-      prettier: 3.0.0
+      prettier: 2.8.8
       sentence-case: 3.0.4
       title-case: 3.0.3
     transitivePeerDependencies:
@@ -17114,6 +17113,12 @@ packages:
       fast-diff: 1.2.0
     dev: true
 
+  /prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    dev: true
+
   /prettier@3.0.0:
     resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==}
     engines: {node: '>=14'}

From 48c914f59d389f3629bb3b4c36ad825e3c7d0457 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Fri, 28 Jul 2023 18:31:57 +0200
Subject: [PATCH 086/116] fix(editor): Fix code node highlight error (#6791)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index efc2ad12e6fe2..c06be7410160d 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -225,7 +225,7 @@ export default defineComponent({
 
 			if (lineNumber === 'final') {
 				this.editor.dispatch({
-					selection: { anchor: this.content.length },
+					selection: { anchor: (this.modelValue ?? this.content).length },
 				});
 				return;
 			}

From 707d5a2340fcc13adea362704c8949a70ce89d5a Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 31 Jul 2023 11:26:38 +0300
Subject: [PATCH 087/116] feat(core): Credentials for popular SecOps services,
 Part 1 (#6775)

---
 .../credentials/AlienVaultApi.credentials.ts  |  41 ++++++
 .../Auth0ManagementApi.credentials.ts         |  85 +++++++++++
 .../nodes-base/credentials/Aws.credentials.ts |   2 +-
 .../credentials/CarbonBlackApi.credentials.ts |  45 ++++++
 .../credentials/CiscoMerakiApi.credentials.ts |  36 +++++
 .../CiscoSecureEndpointApi.credentials.ts     | 115 +++++++++++++++
 .../CiscoUmbrellaApi.credentials.ts           |  80 ++++++++++
 .../CiscoWebexOAuth2Api.credentials.ts        |   2 +
 .../CrowdStrikeOAuth2Api.credentials.ts       |  82 +++++++++++
 .../credentials/F5BigIpApi.credentials.ts     |  37 +++++
 .../credentials/FortiGateApi.credentials.ts   |  29 ++++
 .../credentials/GoogleApi.credentials.ts      |   2 +-
 .../GoogleOAuth2Api.credentials.ts            |   2 +-
 .../HybridAnalysisApi.credentials.ts          |  29 ++++
 .../credentials/ImpervaWafApi.credentials.ts  |  37 +++++
 .../credentials/KibanaApi.credentials.ts      |  60 ++++++++
 .../MicrosoftEntraOAuth2Api.credentials.ts    |  23 +++
 .../MicrosoftOAuth2Api.credentials.ts         |   2 +-
 .../credentials/MistApi.credentials.ts        |  60 ++++++++
 .../credentials/OktaApi.credentials.ts        |  49 +++++++
 .../credentials/OpenCTIApi.credentials.ts     |  29 ++++
 .../credentials/QRadarApi.credentials.ts      |  31 ++++
 .../credentials/QualysApi.credentials.ts      |  56 +++++++
 .../RecordedFutureApi.credentials.ts          |  38 +++++
 .../credentials/SekoiaApi.credentials.ts      |  31 ++++
 .../credentials/ShufflerApi.credentials.ts    |  44 ++++++
 .../credentials/TrellixEpoApi.credentials.ts  |  37 +++++
 .../credentials/VirusTotalApi.credentials.ts  |  41 ++++++
 .../credentials/ZscalerZiaApi.credentials.ts  | 137 ++++++++++++++++++
 .../credentials/{ => icons}/AWS.svg           |   0
 .../credentials/icons/AlienVault.png          | Bin 0 -> 2705 bytes
 .../nodes-base/credentials/icons/Auth0.svg    |   3 +
 .../nodes-base/credentials/icons/Azure.svg    |  27 ++++
 .../nodes-base/credentials/icons/Cisco.svg    |  35 +++++
 .../credentials/icons/CrowdStrike.svg         |   1 +
 packages/nodes-base/credentials/icons/F5.svg  |  11 ++
 .../nodes-base/credentials/icons/Fortinet.svg |   7 +
 .../credentials/{ => icons}/Google.svg        |   0
 .../nodes-base/credentials/icons/Hybrid.png   | Bin 0 -> 22622 bytes
 packages/nodes-base/credentials/icons/IBM.svg |  54 +++++++
 .../nodes-base/credentials/icons/Imperva.svg  |  51 +++++++
 .../nodes-base/credentials/icons/Kibana.svg   |   9 ++
 .../credentials/{ => icons}/Microsoft.svg     |   0
 .../nodes-base/credentials/icons/Mist.svg     | 111 ++++++++++++++
 .../nodes-base/credentials/icons/Okta.svg     |   7 +
 .../nodes-base/credentials/icons/OpenCTI.png  | Bin 0 -> 25426 bytes
 .../nodes-base/credentials/icons/Qualys.svg   |   9 ++
 .../credentials/icons/RecordedFuture.svg      |  42 ++++++
 .../nodes-base/credentials/icons/Sekoia.svg   |  44 ++++++
 .../nodes-base/credentials/icons/Shuffler.svg |   5 +
 .../nodes-base/credentials/icons/Trellix.svg  |   1 +
 .../credentials/icons/VirusTotal.svg          |   4 +
 .../nodes-base/credentials/icons/Wazuh.png    | Bin 0 -> 3494 bytes
 .../nodes-base/credentials/icons/Zscaler.svg  |   9 ++
 .../nodes-base/credentials/icons/vmware.svg   |  12 ++
 packages/nodes-base/package.json              |  24 +++
 56 files changed, 1724 insertions(+), 4 deletions(-)
 create mode 100644 packages/nodes-base/credentials/AlienVaultApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/credentials/F5BigIpApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/FortiGateApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/KibanaApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/credentials/MistApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/OktaApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/OpenCTIApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/QRadarApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/QualysApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/SekoiaApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/ShufflerApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/VirusTotalApi.credentials.ts
 create mode 100644 packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
 rename packages/nodes-base/credentials/{ => icons}/AWS.svg (100%)
 create mode 100644 packages/nodes-base/credentials/icons/AlienVault.png
 create mode 100644 packages/nodes-base/credentials/icons/Auth0.svg
 create mode 100644 packages/nodes-base/credentials/icons/Azure.svg
 create mode 100644 packages/nodes-base/credentials/icons/Cisco.svg
 create mode 100644 packages/nodes-base/credentials/icons/CrowdStrike.svg
 create mode 100644 packages/nodes-base/credentials/icons/F5.svg
 create mode 100644 packages/nodes-base/credentials/icons/Fortinet.svg
 rename packages/nodes-base/credentials/{ => icons}/Google.svg (100%)
 create mode 100644 packages/nodes-base/credentials/icons/Hybrid.png
 create mode 100644 packages/nodes-base/credentials/icons/IBM.svg
 create mode 100644 packages/nodes-base/credentials/icons/Imperva.svg
 create mode 100644 packages/nodes-base/credentials/icons/Kibana.svg
 rename packages/nodes-base/credentials/{ => icons}/Microsoft.svg (100%)
 create mode 100644 packages/nodes-base/credentials/icons/Mist.svg
 create mode 100644 packages/nodes-base/credentials/icons/Okta.svg
 create mode 100644 packages/nodes-base/credentials/icons/OpenCTI.png
 create mode 100644 packages/nodes-base/credentials/icons/Qualys.svg
 create mode 100644 packages/nodes-base/credentials/icons/RecordedFuture.svg
 create mode 100644 packages/nodes-base/credentials/icons/Sekoia.svg
 create mode 100644 packages/nodes-base/credentials/icons/Shuffler.svg
 create mode 100644 packages/nodes-base/credentials/icons/Trellix.svg
 create mode 100644 packages/nodes-base/credentials/icons/VirusTotal.svg
 create mode 100644 packages/nodes-base/credentials/icons/Wazuh.png
 create mode 100644 packages/nodes-base/credentials/icons/Zscaler.svg
 create mode 100644 packages/nodes-base/credentials/icons/vmware.svg

diff --git a/packages/nodes-base/credentials/AlienVaultApi.credentials.ts b/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
new file mode 100644
index 0000000000000..90c8d32774137
--- /dev/null
+++ b/packages/nodes-base/credentials/AlienVaultApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class AlienVaultApi implements ICredentialType {
+	name = 'alienVaultApi';
+
+	displayName = 'AlienVault API';
+
+	icon = 'file:icons/AlienVault.png';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'OTX Key',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-OTX-API-KEY': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://otx.alienvault.com',
+			url: '/api/v1/user/me',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts b/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
new file mode 100644
index 0000000000000..705c5c5f5ed72
--- /dev/null
+++ b/packages/nodes-base/credentials/Auth0ManagementApi.credentials.ts
@@ -0,0 +1,85 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class Auth0ManagementApi implements ICredentialType {
+	name = 'auth0ManagementApi';
+
+	displayName = 'Auth0 Management API';
+
+	icon = 'file:icons/Auth0.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Session Token',
+			name: 'sessionToken',
+			type: 'hidden',
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Auth0 Domain',
+			name: 'domain',
+			type: 'string',
+			required: true,
+			default: 'your-domain.eu.auth0.com',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			required: true,
+			default: '',
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const { access_token } = (await this.helpers.httpRequest({
+			method: 'POST',
+			url: `https://${credentials.domain}/oauth/token`,
+			body: {
+				client_id: credentials.clientId,
+				client_secret: credentials.clientSecret,
+				audience: `https://${credentials.domain}/api/v2/`,
+				grant_type: 'client_credentials',
+			},
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		})) as { access_token: string };
+		return { sessionToken: access_token };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.sessionToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://{{$credentials.domain}}',
+			url: '/api/v2/clients',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index b7e8067d11cef..73638b762f676 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -134,7 +134,7 @@ export class Aws implements ICredentialType {
 
 	documentationUrl = 'aws';
 
-	icon = 'file:AWS.svg';
+	icon = 'file:icons/AWS.svg';
 
 	properties: INodeProperties[] = [
 		{
diff --git a/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts b/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
new file mode 100644
index 0000000000000..8994375e8aafc
--- /dev/null
+++ b/packages/nodes-base/credentials/CarbonBlackApi.credentials.ts
@@ -0,0 +1,45 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class CarbonBlackApi implements ICredentialType {
+	name = 'carbonBlackApi';
+
+	displayName = 'Carbon Black API';
+
+	icon = 'file:icons/vmware.svg';
+
+	documentationUrl = 'carbonblack';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'apiUrl',
+			type: 'string',
+			placeholder: 'https://defense.conferdeploy.net/',
+			default: '',
+		},
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-Auth-Token': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: '={{$credentials.apiUrl}}',
+	// 		url: 'integrationServices/v3/auditlogs',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts b/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
new file mode 100644
index 0000000000000..570dd43c68ebb
--- /dev/null
+++ b/packages/nodes-base/credentials/CiscoMerakiApi.credentials.ts
@@ -0,0 +1,36 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class CiscoMerakiApi implements ICredentialType {
+	name = 'ciscoMerakiApi';
+
+	displayName = 'Cisco Meraki API';
+
+	icon = 'file:icons/Cisco.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-Cisco-Meraki-API-Key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: 'https://api.meraki.com/api/v1',
+	// 		url: '/organizations',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
new file mode 100644
index 0000000000000..e0400097db57e
--- /dev/null
+++ b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
@@ -0,0 +1,115 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestOptions,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import axios from 'axios';
+
+export class CiscoSecureEndpointApi implements ICredentialType {
+	name = 'ciscoSecureEndpointApi';
+
+	displayName = 'Cisco Secure Endpoint (AMP) API';
+
+	icon = 'file:icons/Cisco.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'Asia Pacific, Japan, and China',
+					value: 'apjc.amp',
+				},
+				{
+					name: 'Europe',
+					value: 'eu.amp',
+				},
+				{
+					name: 'North America',
+					value: 'amp',
+				},
+			],
+			default: 'amp',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			required: true,
+		},
+	];
+
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		requestOptions: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		const clientId = credentials.clientId as string;
+		const clientSecret = credentials.clientSecret as string;
+		const region = credentials.region as string;
+
+		const secureXToken = await axios({
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+			},
+			auth: {
+				username: clientId,
+				password: clientSecret,
+			},
+			method: 'POST',
+			data: new URLSearchParams({
+				grant_type: 'client_credentials',
+			}).toString(),
+			url: `https://visibility.${region}.cisco.com/iroh/oauth2/token`,
+		});
+
+		const secureEndpointToken = await axios({
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+				Authorization: `Bearer ${secureXToken.data.access_token}`,
+			},
+			method: 'POST',
+			data: new URLSearchParams({
+				grant_type: 'client_credentials',
+			}).toString(),
+			url: `https://api.${region}.cisco.com/v3/access_tokens`,
+		});
+
+		const requestOptionsWithAuth: IHttpRequestOptions = {
+			...requestOptions,
+			headers: {
+				...requestOptions.headers,
+				Authorization: `Bearer ${secureEndpointToken.data.access_token}`,
+			},
+		};
+
+		return requestOptionsWithAuth;
+	}
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://api.{{$credentials.region}}.cisco.com',
+			url: '/v3/organizations',
+			qs: {
+				size: 10,
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts b/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
new file mode 100644
index 0000000000000..9c70defa03702
--- /dev/null
+++ b/packages/nodes-base/credentials/CiscoUmbrellaApi.credentials.ts
@@ -0,0 +1,80 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class CiscoUmbrellaApi implements ICredentialType {
+	name = 'ciscoUmbrellaApi';
+
+	displayName = 'Cisco Umbrella API';
+
+	icon = 'file:icons/Cisco.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Session Token',
+			name: 'sessionToken',
+			type: 'hidden',
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			// eslint-disable-next-line n8n-nodes-base/cred-class-field-unobscured-sensitive-input
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Secret',
+			name: 'secret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			required: true,
+			default: '',
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const url = 'https://api.umbrella.com';
+		const { access_token } = (await this.helpers.httpRequest({
+			method: 'POST',
+			url: `${
+				url.endsWith('/') ? url.slice(0, -1) : url
+			}/auth/v2/token?grant_type=client_credentials`,
+			auth: {
+				username: credentials.apiKey as string,
+				password: credentials.secret as string,
+			},
+			headers: {
+				'Content-Type': 'x-www-form-urlencoded',
+			},
+		})) as { access_token: string };
+		return { sessionToken: access_token };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.sessionToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.umbrella.com',
+			url: '/users',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts b/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts
index aa2b9ed6c5afa..3784f7f6aa063 100644
--- a/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoWebexOAuth2Api.credentials.ts
@@ -9,6 +9,8 @@ export class CiscoWebexOAuth2Api implements ICredentialType {
 
 	documentationUrl = 'ciscowebex';
 
+	icon = 'file:icons/Cisco.svg';
+
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Grant Type',
diff --git a/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts b/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..69786820a3e08
--- /dev/null
+++ b/packages/nodes-base/credentials/CrowdStrikeOAuth2Api.credentials.ts
@@ -0,0 +1,82 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class CrowdStrikeOAuth2Api implements ICredentialType {
+	name = 'crowdStrikeOAuth2Api';
+
+	displayName = 'CrowdStrike OAuth2 API';
+
+	icon = 'file:icons/CrowdStrike.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Session Token',
+			name: 'sessionToken',
+			type: 'hidden',
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client ID',
+			name: 'clientId',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Client Secret',
+			name: 'clientSecret',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			required: true,
+			default: '',
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const url = credentials.url as string;
+		const { access_token } = (await this.helpers.httpRequest({
+			method: 'POST',
+			url: `${url.endsWith('/') ? url.slice(0, -1) : url}/oauth2/token?client_id=${
+				credentials.clientId
+			}&client_secret=${credentials.clientSecret}`,
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+		})) as { access_token: string };
+		return { sessionToken: access_token };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.sessionToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials?.url}}',
+			url: 'user-management/queries/users/v1',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/F5BigIpApi.credentials.ts b/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
new file mode 100644
index 0000000000000..34ff08afd03a2
--- /dev/null
+++ b/packages/nodes-base/credentials/F5BigIpApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class F5BigIpApi implements ICredentialType {
+	name = 'f5BigIpApi';
+
+	displayName = 'F5 Big-IP API';
+
+	icon = 'file:icons/F5.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/FortiGateApi.credentials.ts b/packages/nodes-base/credentials/FortiGateApi.credentials.ts
new file mode 100644
index 0000000000000..3ed7d6d67cecf
--- /dev/null
+++ b/packages/nodes-base/credentials/FortiGateApi.credentials.ts
@@ -0,0 +1,29 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class FortiGateApi implements ICredentialType {
+	name = 'fortiGateApi';
+
+	displayName = 'Fortinet FortiGate API';
+
+	icon = 'file:icons/Fortinet.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			qs: {
+				access_token: '={{$credentials.accessToken}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/GoogleApi.credentials.ts b/packages/nodes-base/credentials/GoogleApi.credentials.ts
index 2ecf1ec67c73e..90db20c9df9bb 100644
--- a/packages/nodes-base/credentials/GoogleApi.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleApi.credentials.ts
@@ -20,7 +20,7 @@ export class GoogleApi implements ICredentialType {
 
 	documentationUrl = 'google/service-account';
 
-	icon = 'file:Google.svg';
+	icon = 'file:icons/Google.svg';
 
 	properties: INodeProperties[] = [
 		{
diff --git a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
index a99877e331d0e..821bf6e770ab3 100644
--- a/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleOAuth2Api.credentials.ts
@@ -9,7 +9,7 @@ export class GoogleOAuth2Api implements ICredentialType {
 
 	documentationUrl = 'google/oauth-generic';
 
-	icon = 'file:Google.svg';
+	icon = 'file:icons/Google.svg';
 
 	properties: INodeProperties[] = [
 		{
diff --git a/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts b/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
new file mode 100644
index 0000000000000..da2029602d928
--- /dev/null
+++ b/packages/nodes-base/credentials/HybridAnalysisApi.credentials.ts
@@ -0,0 +1,29 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class HybridAnalysisApi implements ICredentialType {
+	name = 'hybridAnalysisApi';
+
+	displayName = 'Hybrid Analysis API';
+
+	icon = 'file:icons/Hybrid.png';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'api-key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts b/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
new file mode 100644
index 0000000000000..51e4396a6d180
--- /dev/null
+++ b/packages/nodes-base/credentials/ImpervaWafApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class ImpervaWafApi implements ICredentialType {
+	name = 'impervaWafApi';
+
+	displayName = 'Imperva WAF API';
+
+	icon = 'file:icons/Imperva.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API ID',
+			name: 'apiID',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-API-Id': '={{$credentials.apiID}}',
+				'x-API-Key': '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/KibanaApi.credentials.ts b/packages/nodes-base/credentials/KibanaApi.credentials.ts
new file mode 100644
index 0000000000000..8839b274f7ec6
--- /dev/null
+++ b/packages/nodes-base/credentials/KibanaApi.credentials.ts
@@ -0,0 +1,60 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class KibanaApi implements ICredentialType {
+	name = 'kibanaApi';
+
+	displayName = 'Kibana API';
+
+	icon = 'file:icons/Kibana.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'http://localhost:5601',
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'kbn-xsrf': true,
+			},
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}',
+			url: '/api/features',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..018179e9e1866
--- /dev/null
+++ b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
@@ -0,0 +1,23 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class MicrosoftEntraOAuth2Api implements ICredentialType {
+	name = 'microsoftEntraOAuth2Api';
+
+	displayName = 'Microsoft Entra ID (Azure Active Directory) API';
+
+	extends = ['microsoftOAuth2Api'];
+
+	icon = 'file:icons/Azure.svg';
+
+	documentationUrl = 'microsoft';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default:
+				'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
index 1dcdf116d9684..58425dbe3946d 100644
--- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts
@@ -5,7 +5,7 @@ export class MicrosoftOAuth2Api implements ICredentialType {
 
 	extends = ['oAuth2Api'];
 
-	icon = 'file:Microsoft.svg';
+	icon = 'file:icons/Microsoft.svg';
 
 	displayName = 'Microsoft OAuth2 API';
 
diff --git a/packages/nodes-base/credentials/MistApi.credentials.ts b/packages/nodes-base/credentials/MistApi.credentials.ts
new file mode 100644
index 0000000000000..af3db226d0376
--- /dev/null
+++ b/packages/nodes-base/credentials/MistApi.credentials.ts
@@ -0,0 +1,60 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class MistApi implements ICredentialType {
+	name = 'mistApi';
+
+	displayName = 'Mist API';
+
+	icon = 'file:icons/Mist.svg';
+
+	documentationUrl = 'mist';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Token',
+			name: 'token',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: [
+				{
+					name: 'Europe',
+					value: 'eu',
+				},
+				{
+					name: 'Global',
+					value: 'global',
+				},
+			],
+			default: 'eu',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Token {{$credentials.token}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '=https://api{{$credentials.region === "eu" ? ".eu" : ""}}.mist.com',
+			url: '/api/v1/self',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/OktaApi.credentials.ts b/packages/nodes-base/credentials/OktaApi.credentials.ts
new file mode 100644
index 0000000000000..0f826d6d8a1c0
--- /dev/null
+++ b/packages/nodes-base/credentials/OktaApi.credentials.ts
@@ -0,0 +1,49 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class OktaApi implements ICredentialType {
+	name = 'oktaApi';
+
+	displayName = 'Okta API';
+
+	icon = 'file:icons/Okta.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			type: 'string',
+			required: true,
+			default: '',
+			placeholder: 'https://dev-123456.okta.com',
+		},
+		{
+			displayName: 'SSWS Access Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=SSWS {{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}',
+			url: '/api/v1/api-tokens',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/OpenCTIApi.credentials.ts b/packages/nodes-base/credentials/OpenCTIApi.credentials.ts
new file mode 100644
index 0000000000000..661d30a9535b9
--- /dev/null
+++ b/packages/nodes-base/credentials/OpenCTIApi.credentials.ts
@@ -0,0 +1,29 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class OpenCTIApi implements ICredentialType {
+	name = 'openCtiApi';
+
+	displayName = 'OpenCTI API';
+
+	icon = 'file:icons/OpenCTI.png';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/QRadarApi.credentials.ts b/packages/nodes-base/credentials/QRadarApi.credentials.ts
new file mode 100644
index 0000000000000..5301f8116c67c
--- /dev/null
+++ b/packages/nodes-base/credentials/QRadarApi.credentials.ts
@@ -0,0 +1,31 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class QRadarApi implements ICredentialType {
+	name = 'qRadarApi';
+
+	displayName = 'QRadar API';
+
+	icon = 'file:icons/IBM.svg';
+
+	documentationUrl = 'qradar';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				SEC: '={{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/QualysApi.credentials.ts b/packages/nodes-base/credentials/QualysApi.credentials.ts
new file mode 100644
index 0000000000000..001a1d4dd5033
--- /dev/null
+++ b/packages/nodes-base/credentials/QualysApi.credentials.ts
@@ -0,0 +1,56 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class QualysApi implements ICredentialType {
+	name = 'qualysApi';
+
+	displayName = 'Qualys API';
+
+	icon = 'file:icons/Qualys.svg';
+
+	documentationUrl = 'qualys';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Requested With',
+			name: 'requestedWith',
+			type: 'string',
+			default: 'n8n application',
+			description: 'User description, like a user agent',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-Requested-With': '={{$credentials.requestedWith}}',
+			},
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: 'https://qualysapi.qualys.com',
+	// 		url: '/api/2.0/fo/asset/host/?action=list',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts b/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
new file mode 100644
index 0000000000000..bca6c952acfa3
--- /dev/null
+++ b/packages/nodes-base/credentials/RecordedFutureApi.credentials.ts
@@ -0,0 +1,38 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class RecordedFutureApi implements ICredentialType {
+	name = 'recordedFutureApi';
+
+	displayName = 'Recorded Future API';
+
+	documentationUrl = 'recordedfuture';
+
+	icon = 'file:icons/RecordedFuture.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Access Token',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'X-RFToken': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	// test: ICredentialTestRequest = {
+	// 	request: {
+	// 		baseURL: 'https://api.recordedfuture.com/v2',
+	// 		url: '/alert/search?limit=1',
+	// 	},
+	// };
+}
diff --git a/packages/nodes-base/credentials/SekoiaApi.credentials.ts b/packages/nodes-base/credentials/SekoiaApi.credentials.ts
new file mode 100644
index 0000000000000..33b8fb3beaf08
--- /dev/null
+++ b/packages/nodes-base/credentials/SekoiaApi.credentials.ts
@@ -0,0 +1,31 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class SekoiaApi implements ICredentialType {
+	name = 'sekoiaApi';
+
+	displayName = 'Sekoia API';
+
+	icon = 'file:icons/Sekoia.svg';
+
+	documentationUrl = 'sekoia';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/ShufflerApi.credentials.ts b/packages/nodes-base/credentials/ShufflerApi.credentials.ts
new file mode 100644
index 0000000000000..0c4014ee522dd
--- /dev/null
+++ b/packages/nodes-base/credentials/ShufflerApi.credentials.ts
@@ -0,0 +1,44 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class ShufflerApi implements ICredentialType {
+	name = 'shufflerApi';
+
+	displayName = 'Shuffler API';
+
+	icon = 'file:icons/Shuffler.svg';
+
+	documentationUrl = 'shuffler';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://shuffler.io/api',
+			url: '/v1/users/getusers',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts b/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
new file mode 100644
index 0000000000000..4048bca44a8f7
--- /dev/null
+++ b/packages/nodes-base/credentials/TrellixEpoApi.credentials.ts
@@ -0,0 +1,37 @@
+import type { IAuthenticateGeneric, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class TrellixEpoApi implements ICredentialType {
+	name = 'trellixEpoApi';
+
+	displayName = 'Trellix (McAfee) ePolicy Orchestrator API';
+
+	icon = 'file:icons/Trellix.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/VirusTotalApi.credentials.ts b/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
new file mode 100644
index 0000000000000..5c42221f3d348
--- /dev/null
+++ b/packages/nodes-base/credentials/VirusTotalApi.credentials.ts
@@ -0,0 +1,41 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class VirusTotalApi implements ICredentialType {
+	name = 'virusTotalApi';
+
+	displayName = 'Virus Total API';
+
+	icon = 'file:icons/VirusTotal.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Token',
+			name: 'accessToken',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-apikey': '={{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://www.virustotal.com/api/v3',
+			url: '/popular_threat_categories',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts b/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
new file mode 100644
index 0000000000000..5fa2efed269df
--- /dev/null
+++ b/packages/nodes-base/credentials/ZscalerZiaApi.credentials.ts
@@ -0,0 +1,137 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestHelper,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class ZscalerZiaApi implements ICredentialType {
+	name = 'zscalerZiaApi';
+
+	displayName = 'Zscaler ZIA API';
+
+	documentationUrl = 'zscaler';
+
+	icon = 'file:icons/Zscaler.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Cookie',
+			name: 'cookie',
+			type: 'hidden',
+			typeOptions: {
+				expirable: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Base URL',
+			name: 'baseUrl',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. zsapi.zscalerthree.net',
+			required: true,
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Api Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+			required: true,
+		},
+	];
+
+	async preAuthentication(this: IHttpRequestHelper, credentials: ICredentialDataDecryptedObject) {
+		const { baseUrl, username, password, apiKey } = credentials;
+
+		const url = (baseUrl as string).endsWith('/')
+			? (baseUrl as string).slice(0, -1)
+			: (baseUrl as string);
+
+		const now = Date.now().toString();
+
+		const obfuscate = (key: string, timestamp: string) => {
+			const high = timestamp.substring(timestamp.length - 6);
+			let low = (parseInt(high) >> 1).toString();
+
+			let obfuscatedApiKey = '';
+			while (low.length < 6) {
+				low = '0' + low;
+			}
+
+			for (let i = 0; i < high.length; i++) {
+				obfuscatedApiKey += key.charAt(parseInt(high.charAt(i)));
+			}
+			for (let j = 0; j < low.length; j++) {
+				obfuscatedApiKey += key.charAt(parseInt(low.charAt(j)) + 2);
+			}
+
+			return obfuscatedApiKey;
+		};
+
+		const response = await this.helpers.httpRequest({
+			method: 'POST',
+			baseURL: `https://${url}`,
+			url: '/api/v1/authenticatedSession',
+			headers: {
+				'Content-Type': 'application/json',
+				'Cache-Control': 'no-cache',
+			},
+			body: {
+				apiKey: obfuscate(apiKey as string, now),
+				username,
+				password,
+				timestamp: now,
+			},
+			returnFullResponse: true,
+		});
+
+		const headers = response.headers;
+
+		const cookie = (headers['set-cookie'] as string[])
+			?.find((entrt) => entrt.includes('JSESSIONID'))
+			?.split(';')
+			?.find((entry) => entry.includes('JSESSIONID'));
+
+		if (!cookie) {
+			throw new Error('No cookie returned. Please check your credentials.');
+		}
+
+		return { cookie };
+	}
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Cookie: '={{$credentials.cookie}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			url: '=https://{{$credentials.baseUrl}}/api/v1/authSettings/exemptedUrls',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/AWS.svg b/packages/nodes-base/credentials/icons/AWS.svg
similarity index 100%
rename from packages/nodes-base/credentials/AWS.svg
rename to packages/nodes-base/credentials/icons/AWS.svg
diff --git a/packages/nodes-base/credentials/icons/AlienVault.png b/packages/nodes-base/credentials/icons/AlienVault.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3982d6bf2ed7aecdae0eacca26d7eb5909637fa
GIT binary patch
literal 2705
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
LNkvXXu0mjfLnaEo

literal 0
HcmV?d00001

diff --git a/packages/nodes-base/credentials/icons/Auth0.svg b/packages/nodes-base/credentials/icons/Auth0.svg
new file mode 100644
index 0000000000000..cf8aa7062e66d
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Auth0.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <path d="M29.307 9.932l-3.146-9.932h-20.365l-3.104 9.932c-1.802 5.75 0.042 12.271 5.089 16.021l8.229 6.047 8.208-6.068c5.005-3.75 6.911-10.25 5.089-16.021l-8.214 6.104 3.12 9.938-8.208-6.13-8.208 6.104 3.141-9.911-8.25-6.063 10.177-0.063 3.146-9.891 3.141 9.87z"/>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Azure.svg b/packages/nodes-base/credentials/icons/Azure.svg
new file mode 100644
index 0000000000000..e24e2189cedee
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Azure.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="242px" viewBox="0 0 256 242" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <title>Azure</title>
+    <defs>
+        <linearGradient x1="58.9717389%" y1="7.4114724%" x2="37.1905196%" y2="103.76182%" id="Azure-linearGradient-1">
+            <stop stop-color="#114A8B" offset="0%"></stop>
+            <stop stop-color="#0669BC" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="59.7188447%" y1="52.3127289%" x2="52.6914332%" y2="54.8636556%" id="Azure-linearGradient-2">
+            <stop stop-color="#000000" stop-opacity="0.3" offset="0%"></stop>
+            <stop stop-color="#000000" stop-opacity="0.2" offset="7.1%"></stop>
+            <stop stop-color="#000000" stop-opacity="0.1" offset="32.1%"></stop>
+            <stop stop-color="#000000" stop-opacity="0.05" offset="62.3%"></stop>
+            <stop stop-color="#000000" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="37.2789399%" y1="4.60005789%" x2="62.4733904%" y2="99.9794963%" id="Azure-linearGradient-3">
+            <stop stop-color="#3CCBF4" offset="0%"></stop>
+            <stop stop-color="#2892DF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g>
+				<path d="M85.3432536,0.00290931225 L161.095926,0.00290931225 L82.4572158,233.000999 C80.7999506,237.910266 76.1963409,241.216897 71.0148908,241.216897 L12.0605874,241.216897 C8.17631708,241.216897 4.52963465,239.346777 2.26398956,236.191716 C-0.00165554136,233.036655 -0.608845705,228.983428 0.632808896,225.302959 L73.8980192,8.2188071 C75.5546242,3.30737742 80.1599649,0 85.3432536,0 L85.3432536,0.00290931225 Z" fill="url(#Azure-linearGradient-1)"></path>
+				<path d="M195.422901,156.282432 L75.2973984,156.282432 C73.0119231,156.279908 70.9577304,157.676287 70.1192383,159.802395 C69.2807461,161.928503 69.8287946,164.351151 71.5007459,165.909349 L148.690618,237.955558 C150.937998,240.051977 153.897138,241.216897 156.970521,241.216897 L224.990241,241.216897 L195.422901,156.282432 Z" fill="#0078D4"></path>
+				<path d="M85.3432536,0.00282026831 C80.0982223,-0.017218565 75.4499031,3.37677358 73.8718354,8.37881927 L0.722997576,225.105126 C-0.602635687,228.800183 -0.0443562611,232.909431 2.21904685,236.116884 C4.48244996,239.324337 8.16695154,241.227505 12.0925898,241.216941 L72.5684635,241.216941 C77.154039,240.397586 80.9441027,237.174364 82.4892183,232.779891 L97.0765099,189.788984 L149.182292,238.389046 C151.365814,240.195147 154.104928,241.193803 156.938519,241.216941 L224.705129,241.216941 L194.983595,156.282435 L108.341367,156.3028 L161.369401,0.00282026831 L85.3432536,0.00282026831 Z" fill="url(#Azure-linearGradient-2)"></path>
+				<path d="M182.098251,8.20716985 C180.443985,3.30365177 175.845517,0.00290931225 170.670472,0.00290931225 L86.2451404,0.00290931225 C91.4198966,0.00290931225 96.0178956,3.30421162 97.6729189,8.20716985 L170.941039,225.30005 C172.18363,228.981191 171.576996,233.035501 169.311351,236.191716 C167.045705,239.34793 163.398467,241.219806 159.51326,241.219806 L243.941501,241.219806 C247.826196,241.219806 251.472566,239.346605 253.737531,236.190534 C256.002496,233.034464 256.608798,228.980705 255.366371,225.30005 L182.098251,8.20716985 Z" fill="url(#Azure-linearGradient-3)"></path>
+		</g>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Cisco.svg b/packages/nodes-base/credentials/icons/Cisco.svg
new file mode 100644
index 0000000000000..b1f6ae27b1e50
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Cisco.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="216"
+   height="114"
+   fill="#049fd9"
+   id="svg24">
+  <path
+     d="m 106.48,76.238 c -0.282,-0.077 -4.621,-1.196 -9.232,-1.196 -8.73,0 -13.986,4.714 -13.986,11.734 0,6.214 4.397,9.313 9.674,10.98 0.585,0.193 1.447,0.463 2.021,0.653 2.349,0.739 4.224,1.837 4.224,3.739 0,2.127 -2.167,3.504 -6.878,3.504 -4.14,0 -8.109,-1.184 -8.945,-1.395 v 8.637 c 0.466,0.099 5.183,1.025 10.222,1.025 7.248,0 15.539,-3.167 15.539,-12.595 0,-4.573 -2.8,-8.783 -8.947,-10.737 L 97.559,89.755 C 96,89.263 93.217,88.466 93.217,86.181 c 0,-1.805 2.062,-3.076 5.859,-3.076 3.276,0 7.263,1.101 7.404,1.145 z m 80.041,18.243 c 0,5.461 -4.183,9.879 -9.796,9.879 -5.619,0 -9.791,-4.418 -9.791,-9.879 0,-5.45 4.172,-9.87 9.791,-9.87 5.613,0 9.796,4.42 9.796,9.87 m -9.796,-19.427 c -11.544,0 -19.823,8.707 -19.823,19.427 0,10.737 8.279,19.438 19.823,19.438 11.543,0 19.834,-8.701 19.834,-19.438 0,-10.72 -8.291,-19.427 -19.834,-19.427 M 70.561,113.251 H 61.089 V 75.719 h 9.472"
+     id="path10" />
+  <path
+     d="m 48.07,76.399 c -0.89,-0.264 -4.18,-1.345 -8.636,-1.345 -11.526,0 -19.987,8.218 -19.987,19.427 0,12.093 9.34,19.438 19.987,19.438 4.23,0 7.459,-1.002 8.636,-1.336 v -10.075 c -0.407,0.226 -3.503,1.992 -7.957,1.992 -6.31,0 -10.38,-4.441 -10.38,-10.019 0,-5.748 4.246,-10.011 10.38,-10.011 4.53,0 7.576,1.805 7.957,2.004"
+     id="path12" />
+  <use
+     xlink:href="#path12"
+     transform="translate(98.86)"
+     id="use14" />
+  <g
+     id="g22">
+    <path
+       d="m 61.061,4.759 c 0,-2.587 -2.113,-4.685 -4.703,-4.685 -2.589,0 -4.702,2.098 -4.702,4.685 v 49.84 c 0,2.602 2.113,4.699 4.702,4.699 2.59,0 4.703,-2.097 4.703,-4.699 z M 35.232,22.451 c 0,-2.586 -2.112,-4.687 -4.702,-4.687 -2.59,0 -4.702,2.101 -4.702,4.687 v 22.785 c 0,2.601 2.112,4.699 4.702,4.699 2.59,0 4.702,-2.098 4.702,-4.699 z M 9.404,35.383 C 9.404,32.796 7.292,30.699 4.702,30.699 2.115,30.699 0,32.796 0,35.383 v 9.853 c 0,2.601 2.115,4.699 4.702,4.699 2.59,0 4.702,-2.098 4.702,-4.699"
+       id="path16" />
+    <use
+       xlink:href="#path16"
+       transform="matrix(-1,0,0,1,112.717,0)"
+       id="use18" />
+  </g>
+  <use
+     xlink:href="#g22"
+     transform="matrix(-1,0,0,1,216,0)"
+     id="use20" />
+</svg>
diff --git a/packages/nodes-base/credentials/icons/CrowdStrike.svg b/packages/nodes-base/credentials/icons/CrowdStrike.svg
new file mode 100644
index 0000000000000..1b2195a2244f9
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/CrowdStrike.svg
@@ -0,0 +1 @@
+<svg height="1675" viewBox="-.3 3.8 900.3 599.8" width="2500" xmlns="http://www.w3.org/2000/svg"><g fill="#da1b1b"><path d="m59 5.5c0 1.7 12.6 27.2 14.1 28.5.3.3 1.6 2.3 2.9 4.5s3.5 5.1 4.7 6.5c1.3 1.4 2.3 2.8 2.3 3.1s.9 1.7 2.1 3c1.1 1.3 4.4 5.1 7.2 8.4 12.9 15 31.5 32.4 51.2 47.8.6.4 2.1 1.6 3.4 2.7s2.7 2 3 2 1.8 1 3.1 2.2c3.6 3.2 7.2 5.7 26.1 18.3 17.5 11.6 17.8 11.9 24.9 16.1 2.5 1.5 5.1 3.4 5.8 4.1s1.8 1.3 2.3 1.3c.7 0 10.8 5.7 15.9 9 .8.6 2.6 1.6 4 2.2 3.6 1.8 23.6 13.9 29.5 17.9 17 11.4 38.5 30.9 45 40.6 2.7 4.1 4.5 5.4 4.5 3.2 0-1.3-4.1-8.8-5.7-10.7-.7-.7-1.3-1.8-1.3-2.3 0-1.1-6-10.9-7.8-12.8-.7-.8-2.1-2.6-3-4-2.7-4.1-6-7.8-16.2-18.1-12.3-12.2-13.7-13.3-31-26.2-8-5.9-14.9-11.1-15.5-11.6-.5-.4-2.8-1.9-5-3.2s-4.2-2.7-4.5-3-2.3-1.7-4.5-3-8.5-5.3-14-8.9c-11.1-7.3-13-8.5-16.2-10.2-1.3-.7-2.3-1.6-2.3-2.1 0-.4-.5-.8-1-.8-.6 0-3-1.4-5.3-3.1-3.9-2.8-15.9-11.3-20-14.1-1.1-.7-2.8-2.1-3.9-3.1-1.2-.9-2.4-1.7-2.7-1.7s-1.7-1-3.1-2.3c-1.4-1.2-5.3-4.4-8.7-7s-6.8-5.3-7.5-6-3.8-3.2-6.8-5.6c-12.9-10.1-56.9-52.3-61.3-58.8-1.9-2.8-4.7-4.5-4.7-2.8z"/><path d="m152.8 23.6c-.8.8.3 4.4 1.3 4.4.5 0 .9.5.9 1.2 0 1.5 7.2 15.9 8.8 17.6.6.7 1.2 1.7 1.2 2.2 0 1.3 8.6 13.7 12.8 18.4 10 11.2 28.2 28.1 35.2 32.7 1.4.9 3.9 2.9 5.5 4.3 1.7 1.5 4.8 3.9 7 5.4s4.9 3.5 5.9 4.4c1.1 1 3.8 3 6 4.5 2.3 1.6 5 3.6 6 4.5 1.1 1 3.8 3 6 4.5 2.3 1.5 4.3 3 4.6 3.3s3.7 3 7.5 6c3.9 3 7.5 5.9 8.1 6.5.6.5 4.6 4.1 8.9 8 14.6 13.1 25.8 25.3 32.6 35.5 6.6 10 9.2 14.4 15.1 25.8 3.1 6.2 7.7 14.4 10 18.3 2.4 3.9 5.4 8.9 6.7 11.2s3 4.8 3.8 5.5c.7.7 1.3 1.8 1.3 2.3s.5 1.5 1 2.2c.6.7 5.3 7.7 10.6 15.7 16.9 25.6 40.1 46 62.9 55.1 10.8 4.3 33.4 6 63 4.7 20.6-.8 44.2-.2 48.3 1.3 1.3.5 4.2.9 6.5.9 2.3.1 6 .7 8.2 1.5s4.9 1.5 6 1.5 3.3.7 4.9 1.5c1.5.8 3.5 1.5 4.3 1.5 1.6 0 7.1 2.4 19.8 8.6 18.3 9.1 33.1 19.9 48.7 35.6 10.4 10.5 10.8 10.8 11.4 8.2.8-3.1-.2-13.7-1.5-16.1-.5-1-2-4.1-3.3-6.8-2.5-5.6-7.2-12.3-14.2-20.4-2.7-3.3-4.6-6.5-4.6-7.9 0-4.1-3.9-10.5-8.5-13.9-5.8-4.3-23.6-13.3-26.3-13.3-.5 0-2.3-.7-3.8-1.5-1.6-.8-3.7-1.5-4.7-1.5-.9 0-2.5-.4-3.5-.9-.9-.5-5.1-1.9-9.2-3.1-13.7-4.1-22.5-7.2-25.6-9.1-3.3-2-6.4-7.2-6.4-10.7 0-2.6 3.8-14.4 5-15.6.6-.6 1-1.7 1-2.5 0-.9.6-2.8 1.4-4.3.8-1.4 1.9-5.8 2.6-9.7 3.3-19.4-7.2-31.8-41-48.7-4.5-2.2-12.7-5.9-16.5-7.5-1.1-.4-4.1-1.7-6.7-2.8-2.6-1.2-5.4-2.1-6.2-2.1s-1.8-.5-2.1-1c-.3-.6-1.3-1-2.2-1-.8 0-2.9-.6-4.6-1.4-1.8-.8-10.4-3.8-19.2-6.6-8.8-2.9-16.7-5.6-17.6-6-.9-.5-3.4-1.2-5.5-1.6-2.2-.3-4.3-1-4.9-1.4-.5-.4-2.6-1.1-4.5-1.4-1.9-.4-4.4-1.1-5.5-1.6-1.1-.4-4-1.3-6.5-2-2.5-.6-6.3-1.6-8.5-2.1-2.2-.6-4.9-1.5-6-1.9-1.1-.5-3.6-1.2-5.5-1.6-1.9-.3-4.1-1-5-1.4-.8-.4-4.9-1.8-9-3s-8.2-2.5-9-2.9c-.9-.5-3.1-1.2-5-1.6s-3.9-1-4.5-1.4c-.5-.4-4.4-1.8-8.5-3.1-4.1-1.2-7.9-2.6-8.5-3-.5-.4-3.9-1.7-7.5-3s-6.9-2.7-7.4-3.2c-.6-.4-1.6-.8-2.4-.8-2 0-11.4-4.3-35.2-15.9-16.7-8.2-32.1-16.6-35.5-19.3-.5-.4-4.6-3.1-9-6s-8.4-5.6-9-6c-.5-.4-5.2-3.9-10.4-7.8-18.1-13.5-44.4-38.8-55.5-53.5-2.1-2.8-3.9-5.1-4-5.3-.2-.1-.5.1-.8.4zm447.2 303c10.2 3.4 13.5 6 15.9 12.1 2.4 5.9-1.6 7.3-6.5 2.2-1.6-1.7-4.5-4-6.4-5.2s-4.1-2.7-4.8-3.4-1.9-1.3-2.7-1.3c-1.3 0-2.5-2.1-2.5-4.6 0-1.8 1.4-1.8 7 .2zm-519-240c0 1.1 8.5 17.9 10 19.7.6.7 2.7 3.4 4.7 6.2 7.3 9.8 18.7 21.5 33.9 34.5 3.8 3.3 14.2 11.1 17.5 13.2 1.4.9 3.2 2.3 4 3 .8.8 3.2 2.5 5.4 3.8s4.2 2.7 4.5 3c.6.8 30.1 18.3 39.5 23.5 7.4 4.2 15.4 8.2 43.5 21.9 16.5 8.1 19.6 9.7 31.7 17 9.1 5.5 23.7 16.9 31 24.2 4.1 4.1 7.6 7.4 7.8 7.4.3 0-.1-1.1-.7-2.5s-1.5-2.5-2-2.5c-.4 0-.8-.6-.8-1.3 0-.8-.9-2.5-2-3.8s-2.3-2.9-2.7-3.4c-7.3-9.6-13.3-15.4-31.7-31-2.5-2.2-19-13.4-26.7-18.2-6.1-3.9-18.4-10.8-30.9-17.5-3-1.7-5.9-3.4-6.5-3.8-.9-.7-5.2-3-19.5-10.8-9-4.8-31.8-18.9-35.5-21.9-.5-.5-2.8-2-5-3.3s-4.4-2.8-5-3.2c-.5-.4-5.9-4.4-12-8.9-6-4.5-11.2-8.5-11.5-8.8-.3-.4-2.7-2.4-5.5-4.5-5.6-4.2-12.8-10.8-26.2-24-5.1-5-9.3-8.6-9.3-8zm113.6 179.1c-1 1 15.8 16.6 26.9 24.9 5.5 4.1 10.5 7.8 11 8.2 2.6 2 11.6 7.2 12.4 7.2.5 0 1.6.6 2.3 1.2.7.7 2.9 2 4.8 3 13.3 6.3 19 8.8 20.4 8.8.8 0 1.7.4 2 .8.8 1.3 32.3 11.2 35.8 11.2 1 0 2.6.4 3.6 1 .9.5 3.7 1.4 6.2 1.9 8.7 1.9 13.5 3.1 15.5 4 1.1.5 5.4 1.9 9.5 3.2s7.9 2.6 8.5 3.1c.5.4 1.5.8 2.3.8s2.8.6 4.5 1.4c16.4 7.1 20.8 8.8 21.4 8.3.3-.4-.7-1.7-2.3-2.9-2.5-2-6.9-5.9-16.4-14.8-1.5-1.4-4.2-3.8-6-5.4-5-4.3-26-19.9-30.5-22.6-2.2-1.3-4.2-2.7-4.5-3-.3-.4-1.2-1-2-1.4s-4.2-2.2-7.5-4.1c-6.2-3.6-18.9-9.9-26-12.9-2.2-.9-4.7-2.1-5.5-2.5-.9-.5-3-1.2-4.8-1.5-1.7-.4-3.4-1.2-3.7-1.7-.4-.5-1.6-.9-2.8-.9-2.2.1-2.2.1-.2 1.2 1.1.6 2.2 1.4 2.5 1.8.3.3 2.5 1.8 5 3.3 5.3 3.1 15 11.7 15 13.3 0 .6-.7 1.7-1.5 2.4-1.2 1-4.1.9-14.5-.4-7.2-.9-14.1-2.1-15.3-2.6-1.2-.4-4.7-1.6-7.7-2.5-15.6-4.7-47-22.1-56.1-31-.9-.8-1.9-1.2-2.3-.8z"/><path d="m365.5 317.3c18.7 17.2 66.6 66.1 69.6 70.9 1.2 1.8-.2 3.8-2.5 3.8-1.1-.1-3.9-.9-6.1-2s-4.3-1.9-4.7-2c-1.3 0-11.2-6.3-13.8-8.7-3-2.8-4.6-3-2.8-.4 2.9 4.2 17.4 18.5 26.5 26.3 4.1 3.5 15 11 18.7 12.8 6 3 6.6 3.5 6.6 5.4 0 1.7-.5 1.8-5.5 1.2-3-.3-5.5-.3-5.5.2 0 .7 5.9 3.6 13 6.3 5.2 2.1 19.7 1.8 23.8-.4 1.8-1 4.3-1.7 5.4-1.5 2.2.3 2.4.6 5.5 7.3 3.8 8.2 12.6 19.5 15.1 19.5.5 0 1.5.6 2.1 1.4 1.2 1.4 14.9 5.1 15.7 4.3.3-.3-1.6-2.1-4.1-4.1-7-5.3-10.4-10.3-10.5-15.2 0-5.3 2.2-9.6 6.8-13.2 6.7-5.1 10.8-6.5 20.6-6.6 8 0 9.6.2 13.1 2.4 2.2 1.3 4.6 3.1 5.3 4 1.9 2.3 5.2 9.9 5.2 12.1 0 3.4 1.9 2 2.6-1.9 1.4-7.6 1-15.8-.9-18-2.7-3-10-4.9-21.2-5.7-19.1-1.2-28.8-4.4-37.4-12.2-8.9-8-8.5-8.9 4.2-9.5 9-.5 16.7-2.1 23.2-4.8 1.1-.5 4.3-1.9 7-3 2.8-1.2 8.6-3.9 13-6 16.8-8 27.1-10.4 44.3-10.4 12.5 0 15.8-.7 11.2-2.1-1.1-.3-2-1.1-2-1.6s-.4-.9-.9-.9c-.8 0-9.4-5.2-12.7-7.7-1.5-1.2-7.1-4.2-14.9-8-3.8-1.9-7.8-3.9-8.7-4.4-1-.5-2.2-.9-2.7-.9s-2.2-.5-3.8-1.2c-4.1-1.7-10.8-3.6-18.8-5.5-10.2-2.4-48.5-2.3-65.5 0-25.3 3.5-29.7 3.9-41.5 3.4-12.1-.5-16.5-1.3-28.5-4.9-7.3-2.2-8.6-2.7-15.1-5.7-2.5-1.1-4.9-2.1-5.2-2.1-.4 0-3.6-1.8-7.2-4s-6.8-4-7-4c-.5 0-8.9-5.7-14.1-9.7-6.8-5.1-4.3-1.7 5.1 7zm-336.1 206.6c-5.8 1.5-12.9 5.5-17.6 9.9-4.5 4.2-9.8 13.2-9.8 16.6 0 .8-.4 1.8-1 2.1-1.2.8-1.3 19.2-.1 19.9.4.3 1.1 2.1 1.4 4 1.5 9.1 13.7 21.7 24.2 24.9 6.1 1.9 21 2.3 22 .7.3-.5 1.5-1 2.6-1 4 0 15.9-7.3 15.9-9.7 0-2-1.9-1.6-5.4 1-1.7 1.3-4.7 3.1-6.6 4-4 1.9-15.8 4.7-17.4 4.2-.6-.2-3.6-.9-6.7-1.5-13.8-2.7-24.7-14.9-26.9-30-2.2-15.6 3.8-29.8 15.8-37.4 4.5-2.8 13.7-5.6 18.5-5.6 5.3 0 15.6 2.9 19.9 5.6 3.9 2.5 6.8 3.1 6.8 1.4 0-1.3-7-5.7-12.2-7.5-5.1-1.8-19-2.8-23.4-1.6zm177.1-.3c-12.9 3.4-22.8 10.9-27.9 21.4-.9 1.9-2.3 6.7-3.2 10.6-1.3 6.4-1.3 8 .1 14.5.9 4.1 2.5 9.4 3.7 11.8 4 8.2 16.9 19.1 22.8 19.1 1 0 2.2.4 2.5 1 .8 1.3 17.2 1.3 18 0 .3-.6 1.5-1 2.6-1 6 0 19.7-11.4 23.3-19.3 4.6-10 5.5-20.1 2.7-30.5-1.4-5.1-2.5-7.3-7.1-13.2-5.1-6.6-5.5-6.9-18.3-13.2-2.1-1-16.3-1.9-19.2-1.2zm16.3 4c10.7 3.1 18.7 10.1 23.8 20.9 1.5 3.1 1.9 6.2 1.9 14.5 0 9.5-.3 11.1-2.8 16.1-3.2 6.4-10.5 14.2-15.8 16.9-2 1.1-6.5 2.6-10.1 3.4-5.8 1.3-7.1 1.3-12.4 0-3.2-.8-7.4-2.2-9.3-3.1-5.3-2.4-13.4-11.1-16.6-17.8-2.6-5.4-2.9-7-2.9-16 0-9.4.2-10.3 3.3-16 1.8-3.3 4.3-7.1 5.4-8.3 4.1-4.4 11.3-9.1 15.6-10.1 2.3-.5 4.5-1.2 4.8-1.5 1.2-1.2 9.6-.6 15.1 1zm277.6-2.3c-2.8 1.4-6 3.7-7.2 5.3s-2.6 3.4-3.1 4c-1.5 1.8-2.3 9.1-1.6 13.5.8 4.7 6.6 11.2 12.5 14.1 1.9.9 7 3.3 11.3 5.3s8.6 4.4 9.5 5.3c2.9 2.9 5.2 7 5.2 9.2 0 1.9-2.2 6.2-4.5 8.6-1.9 2-7.8 4.4-10.9 4.4-5.2 0-15.6-4.4-17.7-7.4-1.1-1.4-3.4-.1-5.8 3.2l-2.1 3 4.9 3.1c2.7 1.6 6.5 3.3 8.5 3.7 2 .3 3.9 1 4.2 1.5.7 1.2 15.1 1.2 15.9 0 .3-.5 1.8-1.2 3.4-1.6 5.3-1.2 11.4-8.3 12.6-14.9 2-10.3-2.9-18.3-14.3-23.6-15-7.1-17.2-8.3-20.6-11.6-4-3.9-4.4-6.4-2-11.2 2.3-4.7 6.9-7.5 13.1-8 4.5-.4 6.3 0 11.9 2.8 3.6 1.7 6.7 3 6.8 2.8.2-.1 1.1-1.7 1.9-3.4 1.5-2.9 1.5-3.3-.1-4.6-4.1-3.5-8.9-5-17.7-5.5-8-.4-9.6-.1-14.1 2zm-399.6-.6c-1.7.4-1.8 3.1-1.8 38.4 0 35.2.1 38 1.7 37.7 1.5-.3 1.6-1.9 1.4-16-.2-14.8-.1-15.7 1.8-16.7 2.1-1.2 18.5-1.4 21.3-.3.9.4 2.9 2.9 4.4 5.7 3.4 6.2 9.5 17.6 12.5 23.2 2.2 4.2 5.9 6 5.9 2.8 0-.8-.4-1.5-.9-1.5s-1.4-1.2-2-2.8c-.6-1.5-3.1-6.3-5.6-10.7s-5-9.2-5.6-10.8c-.6-1.5-1.5-2.7-2-2.7s-.9-1.1-.9-2.5c0-1.8.7-2.8 2.4-3.5 7.3-2.7 12-10.5 12-20 0-5.3-.5-7.3-2.6-10.5-3.4-5.4-5.9-7.5-10.5-8.8-3.9-1.1-28.4-1.9-31.5-1zm34.4 6.6c6 4.6 8.2 11.3 6.2 18.9-1.5 6-6.4 11.4-11.7 12.9-4.8 1.4-25 1.2-26.5-.3-1.7-1.7-1.7-31.9 0-33.6.8-.8 5.5-1.2 14.4-1.2h13.2zm184.9-3.2c-1.1 2.2-2.2 5.4-2.6 7.2-.3 1.8-1 4.1-1.5 5.2-.4 1.1-1.3 4-2 6.5-.6 2.5-1.7 6.7-2.5 9.5-3.1 11-4.7 17.2-5.7 21.5-.5 2.5-1.4 4.9-1.9 5.4-.5.6-.9 2-.9 3.2 0 1.3-.5 3.5-1.1 5.1l-1.1 2.8-2.4-2.8c-1.3-1.5-2.4-4-2.4-5.5s-.5-4.3-1.1-6.2-1.7-6-2.4-9c-.8-3-2.1-8.2-3-11.5-1.6-6-3.5-13.5-5.9-23-.7-2.8-1.6-5.8-1.9-6.8-.4-.9-.9-2.4-1.2-3.2-.7-2.4-2.5-1.7-2.5.9 0 1.3.9 5.2 2 8.6s2 7.1 2 8.1c0 1.1.4 2.7 1 3.7.5.9 1.4 3.9 2 6.7 2.6 11.2 3.5 15 4.1 16 .4.5.9 2.8 1.3 5s1.1 5.3 1.6 7c.6 1.6 2 6.5 3.2 10.7 1.6 5.7 2.6 7.8 3.8 7.8 2.5 0 4.7-3 5.5-7.5.4-2.2 1-4.5 1.5-5 .4-.6 1.2-3 1.8-5.5s1.7-7 2.6-10c.8-3 2-7.5 2.6-10s1.5-5.2 1.9-6c.5-.9 1.2-3.6 1.6-6s1.1-5.1 1.6-6c.4-.8 1.1-3.6 1.4-6.2.7-5.3 1.6-6.4 4.2-4.9 1.1.6 2.2 3.2 2.9 7.3 1.3 7.1 3.2 14.3 4.4 17.3.5 1.1 1.4 4 2 6.5s1.8 7 2.6 10c.9 3 2 7.3 2.5 9.5s1.4 4.9 1.9 6c.6 1.1 1.3 3.8 1.8 6 .7 3.5 1.2 4 3.8 4.3 2.8.3 3 0 4.1-4.5.6-2.6 1.9-7.4 2.7-10.5.9-3.2 2.3-8.3 3.1-11.3 1.5-5.4 2.9-10.6 6.1-22.3.8-3.1 2-7.7 2.5-10.2s1.4-5.2 1.9-6.1c1.5-2.8 2.3-10.9 1.1-10.9-1.7 0-4.2 7.1-7.2 21-.6 2.5-1.4 5.4-1.9 6.5s-1.3 4-1.9 6.5c-.5 2.5-1.7 7-2.5 10s-2.1 8-2.9 11c-2.2 8.5-4.1 13.5-5.1 13.5s-3.2-5.5-5.3-13.5c-.8-3-2-7.8-2.8-10.5-.7-2.8-1.9-7-2.5-9.5s-1.5-5.4-2-6.5c-.8-2-2.3-7.5-4.2-15.5-.6-2.5-1.4-5-1.8-5.5-.4-.6-1.1-2.4-1.4-4.2-1.1-4.8-3.3-4.9-5.5-.2zm81.2-3.4-2.3.4v76.1l19.3-.4c17.7-.4 19.5-.6 23.7-2.7 4.7-2.5 15-12.3 15-14.4 0-.7.8-2.6 1.7-4.2 1.4-2.4 1.7-5.6 1.7-16 .1-15.2-1.2-19.2-9.1-27.6-5.5-5.9-10.4-8.5-19.3-10.5-6-1.3-25.3-1.7-30.7-.7zm35.2 5.2c12.7 4.5 21.5 18 21.5 33.1s-8.2 28.3-20.7 33.3c-6 2.4-29.6 3.7-33.1 1.8-2.2-1.2-2.2-1.3-2.2-34.4 0-24.6.3-33.6 1.2-34.5.8-.8 5.5-1.2 14.5-1.2 10.6 0 14.5.4 18.8 1.9zm118.3-2.9c-.2 1.6 0 3.4.6 4s6.2 1 13.2 1c10.2 0 12.3.3 12.8 1.6.3.9.6 16.4.6 34.5v33l4.6-.3 4.6-.3-.1-33c-.1-18.2.2-33.5.7-34.2.5-.8 4.9-1.3 13.7-1.5l13-.3v-7l-31.6-.3-31.7-.2zm88 34.7c-.2 24.4.1 38.1.7 38.5s2.7.8 4.8.8h3.7v-13.6c0-7.4.5-14.4 1-15.5.9-1.6 2.2-1.9 9-1.9h7.9l2.6 3.7c1.4 2.1 2.5 4.3 2.5 4.9 0 .7.3 1.4.8 1.6.4.1 2.6 4.1 5 8.8 6 11.9 6.1 12 11.6 12 2.5 0 4.6-.4 4.6-1 0-.5-1.4-3.3-3.1-6.2s-3.4-6-3.9-6.8-2.5-4.6-4.5-8.5c-2-3.8-4.1-7.3-4.7-7.6-1.2-.8-.1-4.9 1.3-4.9.5 0 2.6-1.6 4.8-3.5 4.1-3.7 7.1-10.7 7.1-16.6 0-4.9-3.2-12.7-6.5-15.8-5.4-5-10.3-6.1-28.3-6.1h-16.2zm34-28c4.8 2.8 7.2 7.2 7.2 13.3 0 6.4-2.5 10.8-7.8 13.6-4.6 2.5-21.7 2.8-23.2.4-1.1-1.6-1.3-23.1-.4-26.8.6-2.1 1.1-2.2 10.9-2.2 7.9 0 11 .4 13.3 1.7zm49.9-9c-.4.3-.7 17.7-.7 38.5v37.8h10v-77h-4.3c-2.4 0-4.7.3-5 .7zm44.3-.2v75.5c0 1 4.9 1.4 7.2.5 1-.4 1.2-3.9 1-16.6-.2-11.4 0-16.4.9-17.5 1.2-1.5 10.5-2 12.5-.6 1.3.9 10.4 15.9 10.4 17.2 0 .5.6 1.5 1.3 2.2.8.7 2 2.5 2.8 4 .8 1.4 2.5 4.7 3.8 7.2 2.4 4.5 2.6 4.6 7.2 4.6 5.2 0 6.7-1.1 4.5-3.2-.7-.8-1.7-2.4-2-3.6-.4-1.2-1.1-2.2-1.6-2.2-.4 0-1.3-1.2-1.9-2.8-.7-1.5-1.7-3.6-2.4-4.7s-3.4-5.8-6.2-10.3c-8.7-14.4-8.5-12-1.9-23 3.2-5.3 6.1-9.9 6.6-10 .4-.2.8-.9.8-1.5s2-4.1 4.5-7.8 4.5-7 4.5-7.3-2.1-.6-4.8-.6c-3.5 0-5.2.5-6.5 2-.9 1.1-1.7 2.3-1.7 2.6 0 1.1-7.3 12.9-8.2 13.2-.4.2-.8.9-.8 1.5 0 .7-1.8 4-4 7.4l-3.9 6.3h-5.5c-9.1 0-8.6.9-8.6-17.1v-15.9h-4c-2.2 0-4 .2-4 .5zm81 38v38.5h48v-7h-18.3c-12.9 0-18.7-.4-19.5-1.2s-1.2-5-1.2-12.4c0-14.9-.4-14.5 15.3-14.3 11.5.1 12.1 0 12.9-2 1.7-4.6.5-5.1-13.3-5.1-11.7 0-12.9-.2-13.9-1.9-1.2-2.3-1.4-22-.2-23.8.6-.9 5.6-1.3 17.2-1.5l16.5-.3.3-3.8.3-3.7h-44.1z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/F5.svg b/packages/nodes-base/credentials/icons/F5.svg
new file mode 100644
index 0000000000000..46c1a095da7f2
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/F5.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" viewBox="0 0 1000 1000">
+  <defs><style>.svg-red{fill:#e4002b}.svg-white{fill:#fff}</style></defs>
+  <title>F5 Logo</title>
+  <g id="F5Logo">
+    <path class="svg-red" d="M940.4 894.5a30.9 30.9 0 0 1 9.4 23 32.4 32.4 0 0 1-55.4 23 32 32 0 0 1-9.4-23 32.5 32.5 0 0 1 32.4-32.6 30.9 30.9 0 0 1 23 9.6Zm3.8-3.7a36.6 36.6 0 0 0-26.8-11 37.7 37.7 0 1 0 26.8 64.3 37.7 37.7 0 0 0 0-53.4ZM923 915.7a18.8 18.8 0 0 1-7 .9h-6.5v-15h6.3c4 0 7 .5 8.7 1.5s2.8 3.1 2.8 6a6.4 6.4 0 0 1-4.3 6.5Zm-20.8 22.2h7.3v-16.2h5.8c3.8 0 6.6.4 8.1 1.3 2.6 1.6 3.9 4.7 3.9 9.5v3.3l.1 1.3a3 3 0 0 1 .1.5c0 .2.1.3.2.3h6.8l-.2-.4a4.4 4.4 0 0 1-.4-2.1v-6.1a11.5 11.5 0 0 0-2.4-6.5c-1.5-2.2-3.9-3.5-7.1-4.1a17 17 0 0 0 6-2c2.7-1.8 4-4.6 4-8.2 0-5.2-2-8.7-6.4-10.5-2.4-1-6.1-1.5-11.3-1.5h-14.5Z"/>
+    <path class="svg-white" d="M958.6 620.3c2.7-53.3-7.2-110.8-53.6-162.8-47.7-51.4-128.2-95-293.7-105.2 8.6-26.8 16.1-51.4 24-76.5 99 3.5 187.1 10.6 262 20.3 6-26.8 9.2-53 15.3-78.4q-11.4-16.7-24.2-32.4c-35.6-4.2-71.2-13-109.4-18a1995.1 1995.1 0 0 0-164.4-14.1 85384 85384 0 0 0-130.1 390.5C730.7 565 825.5 631.4 820 725c-5 50.6-51.1 96.5-112 102-72.2 4.9-105.3-24.4-127-56.4a9594.8 9594.8 0 0 1-58.7-89c-5.5-9.2-12.8-3.2-19.4 3.2a9738 9738 0 0 1-43.9 42.3c-9.4 8.2-7.3 15.3-4 22.2a8042 8042 0 0 0 39.6 91.8c21.5 13.2 122.9 31.2 198.7 25.6A336.7 336.7 0 0 0 862 802.5c52.5-40.7 90.7-95.5 96.6-182.2Z"/>
+    <path class="svg-white" d="M97.3 796.3q14.2 19.3 30.2 37.1a2114 2114 0 0 0 302 29.2l-1-34.5c-67.9-3.8-99.1-14.2-104.5-27.6-4.6-10.7-5.4-26.7-6.3-42.4a5198.9 5198.9 0 0 1-5-330.5c38-.7 75.8-1 115.5-1.5 19.2-8.7 37.3-17.4 56.5-26l.1-39.3c-58.8.2-114.6 1.2-170.6 2.8 1.6-47.7 3.5-91.6 6.3-134.5 2-28.2 21.5-48.8 41.6-50.4 32.3-1.3 61.2 11.6 89.3 24 15.4 7.5 30.7 15 46.5 23 7.6 2 16.6 3.8 22-2.7 9.4-11.2 18.3-21.5 27.5-32.3 5-7.4 2.9-11.6.8-14.3a2834 2834 0 0 0-58.2-44.6c-11.8-8-30.5-9.7-49-9.7-7.3 0-14.6.2-21.5.4-18.9 1-43 4-82.4 13.7-88.8 23.9-195.4 85.8-206.7 187a1982 1982 0 0 0-3.7 49.9c-25.1 2-48 3.9-69.5 6a1557 1557 0 0 0-3.5 57.6c21.8-1.3 44.6-2.5 70-3.6-3.8 106.2-.3 212.1 9.7 310.3 1.7 14.9 3.3 29.7 1.4 39.2-1.6 9.1-16.3 13.9-37.5 13.7Z"/>
+    <path class="svg-red" d="M912.7 217.7c-6.2 25.3-9.4 51.6-15.3 78.4-75-9.7-163-16.8-262-20.3-8 25-15.5 49.7-24 76.5 165.5 10.2 246 53.8 293.7 105.2 46.4 52 56.2 109.5 53.5 162.8-6 86.7-44.1 141.5-96.6 182.1-53 40-117.3 59.8-168.7 64.2-75.7 5.6-177-12.4-198.6-25.6a7418 7418 0 0 1-39.6-91.8c-3.3-6.9-5.4-14 4-22.2a9738 9738 0 0 0 43.9-42.3c6.6-6.4 13.9-12.4 19.4-3.2 20.4 31.4 39.5 60.3 58.6 89 21.7 32 54.8 61.3 127.2 56.4 60.7-5.4 107-51.4 111.9-102 5.3-93.6-89.4-160-335.7-181.3C531.7 401 577.8 263 614.6 153.3c58.5 2.7 112.6 7.5 164.4 14.2 38.2 4.8 73.8 13.7 109.4 17.8A500 500 0 0 0 0 500a497.6 497.6 0 0 0 97.3 296.3c21.2.2 35.9-4.6 37.5-13.7 1.9-9.6.3-24.3-1.4-39.2-10-98.2-13.5-204.1-9.8-310.3a4430 4430 0 0 0-70 3.6c1-19.7 2-38.3 3.6-57.6 21.6-2.1 44.4-4 69.5-6 1-17 2.2-33.3 3.7-49.8C141.7 222 248.3 160 337.1 136.2a435.4 435.4 0 0 1 82.4-13.6c6.9-.3 14.2-.5 21.6-.5 18.4 0 37 1.7 48.9 9.7 19.2 14.4 38 28.7 58.2 44.6 2 2.7 4.2 7-.8 14.3L520 223c-5.4 6.5-14.4 4.8-22 2.8-15.8-8.1-31-15.6-46.5-23-28-12.5-57-25.4-89.3-24-20.1 1.5-39.6 22.1-41.6 50.3-2.8 42.9-4.7 86.8-6.3 134.5 56-1.6 111.8-2.6 170.7-2.9l-.1 39.4c-19.2 8.6-37.3 17.3-56.6 26-39.7.5-77.5.8-115.5 1.5a5178 5178 0 0 0 5 330.5c1 15.7 1.8 31.7 6.3 42.3 5.4 13.5 36.6 23.8 104.6 27.7l1 34.4a2112.6 2112.6 0 0 1-302-29A500 500 0 0 0 1000 500a497.6 497.6 0 0 0-87.3-282.4Z"/>
+    <path class="svg-red" d="M127.5 833.4Z" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/Fortinet.svg b/packages/nodes-base/credentials/icons/Fortinet.svg
new file mode 100644
index 0000000000000..6224b4c6bb459
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Fortinet.svg
@@ -0,0 +1,7 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1537 1101" width="1537" height="1101">
+	<title>fortinet-logo-svg</title>
+	<style>
+		.s0 { fill: #ee3124 } 
+	</style>
+	<path id="Layer" fill-rule="evenodd" class="s0" d="m0.2 408.6h434.5v285.8h-434.5zm554.7-406.3h426.8v285.8h-426.8zm0 811h426.8v285.8h-426.8zm545.4-404.7h436v285.8h-436zm-665.6-406.3v287.3h-434.5v-32.4c17-129.8 87.8-231.8 178.7-254.9zm1.6 811v285.8h-268.1c-86.3-27.8-152.5-126.7-167.9-250.3v-35.5zm1100-526.8h-436v-285.8h257.3c90.9 24.7 161.8 126.7 178.7 254.9zm-436 814.1v-285.7h436v35.5c-16.9 123.6-83.2 220.9-167.9 250.2z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/Google.svg b/packages/nodes-base/credentials/icons/Google.svg
similarity index 100%
rename from packages/nodes-base/credentials/Google.svg
rename to packages/nodes-base/credentials/icons/Google.svg
diff --git a/packages/nodes-base/credentials/icons/Hybrid.png b/packages/nodes-base/credentials/icons/Hybrid.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7d4695e4b7af86722d3861715c71416ac8fe3b3
GIT binary patch
literal 22622
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
RcJ2TG002ovPDHLkV1n0G!f^lq

literal 0
HcmV?d00001

diff --git a/packages/nodes-base/credentials/icons/IBM.svg b/packages/nodes-base/credentials/icons/IBM.svg
new file mode 100644
index 0000000000000..f8574f6286022
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/IBM.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1000px" height="401.149px" viewBox="0 0 1000 401.149" enable-background="new 0 0 1000 401.149" xml:space="preserve">
+<g>
+	<g>
+		<polygon id="Rectangle-path" fill="#1F70C1" points="0,373.217 194.433,373.217 194.433,401.05 0,401.05 		"/>
+		<polygon id="Rectangle-path_1_" fill="#1F70C1" points="0,319.83 194.433,319.83 194.433,347.761 0,347.761 		"/>
+		<polygon id="Rectangle-path_2_" fill="#1F70C1" points="55.468,266.541 138.867,266.541 138.867,294.473 55.468,294.473 		"/>
+		<polygon id="Rectangle-path_3_" fill="#1F70C1" points="55.468,213.253 138.867,213.253 138.867,241.185 55.468,241.185 		"/>
+		<polygon id="Rectangle-path_4_" fill="#1F70C1" points="55.468,159.964 138.867,159.964 138.867,187.896 55.468,187.896 		"/>
+		<polygon id="Rectangle-path_5_" fill="#1F70C1" points="55.468,106.577 138.867,106.577 138.867,134.509 55.468,134.509 		"/>
+		<rect id="Rectangle-path_6_" y="53.288" fill="#1F70C1" width="194.433" height="27.932"/>
+		<rect id="Rectangle-path_7_" fill="#1F70C1" width="194.433" height="27.932"/>
+	</g>
+	<g>
+		<path id="Shape_16_" fill="#1F70C1" d="M222.167,347.761h299.029c5.051-8.617,8.815-18.027,11.094-27.932H222.167V347.761z"/>
+		<path id="Shape_17_" fill="#1F70C1" d="M497.92,213.253H277.734v27.932h243.463C514.857,230.487,507.032,221.078,497.92,213.253z"
+			/>
+		<path id="Shape_18_" fill="#1F70C1" d="M277.734,159.964v27.932H497.92c9.311-7.825,17.135-17.235,23.277-27.932H277.734z"/>
+		<path id="Shape_19_" fill="#1F70C1" d="M521.197,53.288H222.167V81.22H532.29C529.715,71.315,525.951,61.906,521.197,53.288z"/>
+		<path id="Shape_20_" fill="#1F70C1" d="M429.279,0H222.167v27.932h278.526C482.072,10.697,456.815,0,429.279,0z"/>
+		<rect id="Rectangle-path_8_" x="277.734" y="106.577" fill="#1F70C1" width="83.3" height="27.932"/>
+		<path id="Shape_21_" fill="#1F70C1" d="M444.433,134.509h87.163c2.476-8.914,3.764-18.324,3.764-27.932h-90.927L444.433,134.509
+			L444.433,134.509z"/>
+		<polygon id="Rectangle-path_9_" fill="#1F70C1" points="277.734,266.541 361.034,266.541 361.034,294.473 277.734,294.473 		"/>
+		<path id="Shape_22_" fill="#1F70C1" d="M444.433,266.541v27.932h90.927c0-9.608-1.288-19.017-3.764-27.932H444.433z"/>
+		<path id="Shape_23_" fill="#1F70C1" d="M222.167,400.852l207.112,0.297c27.734,0,52.793-10.697,71.513-27.932H222.167V400.852z"/>
+	</g>
+	<g>
+		<polygon id="Rectangle-path_10_" fill="#1F70C1" points="555.567,373.217 694.433,373.217 694.433,401.05 555.567,401.05 		"/>
+		<polygon id="Rectangle-path_11_" fill="#1F70C1" points="555.567,319.83 694.433,319.83 694.433,347.761 555.567,347.761 		"/>
+		<polygon id="Rectangle-path_12_" fill="#1F70C1" points="611.034,266.541 694.433,266.541 694.433,294.473 611.034,294.473 		"/>
+		<polygon id="Rectangle-path_13_" fill="#1F70C1" points="611.034,213.253 694.433,213.253 694.433,241.185 611.034,241.185 		"/>
+		<polygon id="Shape_24_" fill="#1F70C1" points="733.063,53.288 555.567,53.288 555.567,81.22 742.67,81.22 		"/>
+		<polygon id="Shape_25_" fill="#1F70C1" points="714.639,0 555.567,0 555.567,27.932 724.247,27.932 		"/>
+		<polygon id="Rectangle-path_14_" fill="#1F70C1" points="861.034,373.217 1000,373.217 1000,401.05 861.034,401.05 		"/>
+		<polygon id="Rectangle-path_15_" fill="#1F70C1" points="861.034,319.83 1000,319.83 1000,347.761 861.034,347.761 		"/>
+		<polygon id="Rectangle-path_16_" fill="#1F70C1" points="861.034,266.541 944.433,266.541 944.433,294.473 861.034,294.473 		"/>
+		<polygon id="Rectangle-path_17_" fill="#1F70C1" points="861.034,213.253 944.433,213.253 944.433,241.185 861.034,241.185 		"/>
+		<polygon id="Shape_26_" fill="#1F70C1" points="861.034,187.896 944.433,187.896 944.433,159.964 861.034,159.964 
+			861.034,159.964 785.559,159.964 777.734,182.548 769.909,159.964 694.433,159.964 694.433,159.964 611.034,159.964 
+			611.034,187.896 694.433,187.896 694.433,162.242 703.249,187.896 852.219,187.896 861.034,162.242 		"/>
+		<polygon id="Shape_27_" fill="#1F70C1" points="944.433,106.577 803.982,106.577 794.374,134.509 944.433,134.509 		"/>
+		<polygon id="Shape_28_" fill="#1F70C1" points="840.927,0 831.319,27.932 1000,27.932 1000,0 		"/>
+		<polygon id="Shape_29_" fill="#1F70C1" points="777.734,400.852 787.341,373.217 768.126,373.217 		"/>
+		<polygon id="Shape_30_" fill="#1F70C1" points="759.311,347.761 796.157,347.761 806.062,319.83 749.505,319.83 		"/>
+		<polygon id="Shape_31_" fill="#1F70C1" points="740.59,294.473 814.877,294.473 824.683,266.541 730.784,266.541 		"/>
+		<polygon id="Shape_32_" fill="#1F70C1" points="721.969,241.185 833.597,241.185 843.106,213.253 712.361,213.253 		"/>
+		<polygon id="Shape_33_" fill="#1F70C1" points="611.034,134.509 761.093,134.509 751.486,106.577 611.034,106.577 		"/>
+		<polygon id="Shape_34_" fill="#1F70C1" points="812.896,81.22 1000,81.22 1000,53.288 822.405,53.288 		"/>
+	</g>
+</g>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Imperva.svg b/packages/nodes-base/credentials/icons/Imperva.svg
new file mode 100644
index 0000000000000..73f19ccaf6ba0
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Imperva.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0"
+   y="0"
+   viewBox="0 0 499.99999 500.00001"
+   xml:space="preserve"
+   sodipodi:docname="Imperva.svg"
+   width="500"
+   height="500"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs7" /><sodipodi:namedview
+     id="namedview5"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.4340829"
+     inkscape:cx="240.22322"
+     inkscape:cy="231.15819"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g972" /><g
+     id="g972"
+     transform="matrix(12.458909,0,0,12.458909,53.149238,131.60215)"><g
+       id="g2429"
+       transform="matrix(1.1703821,0,0,1.1703821,-3.1165512,2.2431085)"><path
+         style="fill:#235ae6;fill-opacity:1"
+         d="m 26.462714,0.80306724 c 3.4,0 5.5,2.39999996 5.5,6.19999996 V 17.903067 h -4.6 V 8.0030672 c 0,-1.8 -0.8,-3 -2.4,-3 -1.2,0 -2.3,0.8 -2.6,2.2 V 18.003067 h -4.7 V 8.1030672 c 0,-1.8 -0.8,-3 -2.4,-3 -1.2,0 -2.3,0.8 -2.6,2.2 V 18.103067 H 8.0627141 V 1.1030672 h 4.5999999 v 1.4 c 0.8,-1 2.4,-1.79999996 4.2,-1.79999996 2,0 3.6,0.89999996 4.5,2.09999996 1.1,-1.1 2.7,-1.99999996 5.1,-1.99999996 z"
+         id="path944"
+         sodipodi:nodetypes="ssccsscccssccccccscs" /><path
+         style="fill:#235ae6;fill-opacity:1"
+         d="M 4.9627141,17.903067 H 0.36271409 V 1.1030672 H 4.9627141 Z"
+         id="path942"
+         sodipodi:nodetypes="ccccc" /><path
+         style="fill:#000000;fill-opacity:1"
+         d="M 4.9627141,-5.6969328 H 0.36271409 v 4.6 H 4.9627141 Z"
+         id="path2"
+         sodipodi:nodetypes="ccccc" /></g></g></svg>
diff --git a/packages/nodes-base/credentials/icons/Kibana.svg b/packages/nodes-base/credentials/icons/Kibana.svg
new file mode 100644
index 0000000000000..a81cff70d0e4f
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Kibana.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="328px" viewBox="0 0 256 328" version="1.1" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid">
+    <title>Kibana</title>
+    <g>
+        <polygon fill="#F04E98" points="256 0 -4.7684239e-17 0 2.20275616e-13 294.78912"></polygon>
+        <path d="M2.27373675e-13,122.88 L2.27373675e-13,294.78912 L122.19392,154.08128 C85.8624,134.27712 44.288,122.88 2.27373675e-13,122.88" fill="#343741"></path>
+        <path d="M148.589568,170.540032 L23.200768,314.944512 L12.131328,327.683072 L250.866688,327.683072 C237.769728,263.130112 200.301568,207.496192 148.589568,170.540032" fill="#00BFB3"></path>
+    </g>
+</svg>
diff --git a/packages/nodes-base/credentials/Microsoft.svg b/packages/nodes-base/credentials/icons/Microsoft.svg
similarity index 100%
rename from packages/nodes-base/credentials/Microsoft.svg
rename to packages/nodes-base/credentials/icons/Microsoft.svg
diff --git a/packages/nodes-base/credentials/icons/Mist.svg b/packages/nodes-base/credentials/icons/Mist.svg
new file mode 100644
index 0000000000000..a0b9fcbe897f1
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Mist.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="490"
+   height="490"
+   viewBox="0 0 129.64583 129.64583"
+   version="1.1"
+   id="svg5"
+   xml:space="preserve"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="mist.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.0419012"
+     inkscape:cx="405.98859"
+     inkscape:cy="259.14165"
+     inkscape:window-width="1920"
+     inkscape:window-height="1007"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs2" /><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"><g
+       id="g2105"
+       transform="matrix(1.7489635,0,0,1.7489635,-162.276,-145.04238)"><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1634"
+         width="11.222793"
+         height="11.133011"
+         x="115.57233"
+         y="122.46314"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-5"
+         width="11.222793"
+         height="11.133011"
+         x="133.7308"
+         y="122.46314"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-35"
+         width="11.222793"
+         height="11.133011"
+         x="151.05879"
+         y="122.46314"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-62"
+         width="11.222793"
+         height="11.133011"
+         x="151.05879"
+         y="106.03299"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-9"
+         width="11.222793"
+         height="11.133011"
+         x="133.7308"
+         y="106.03299"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-2"
+         width="11.222793"
+         height="11.133011"
+         x="151.05879"
+         y="89.961891"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1916"
+         width="11.222793"
+         height="11.133011"
+         x="97.413849"
+         y="138.8933"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-3"
+         width="11.222793"
+         height="11.133011"
+         x="115.57233"
+         y="138.8933"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-6"
+         width="11.222793"
+         height="11.133011"
+         x="133.7308"
+         y="138.8933"
+         ry="1.2569518" /><rect
+         style="fill:#1963ae;fill-opacity:1;stroke-width:0.264583"
+         id="rect1895-7"
+         width="11.222793"
+         height="11.133011"
+         x="151.05879"
+         y="138.8933"
+         ry="1.2569518" /></g></g></svg>
diff --git a/packages/nodes-base/credentials/icons/Okta.svg b/packages/nodes-base/credentials/icons/Okta.svg
new file mode 100644
index 0000000000000..0653992a71688
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Okta.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid">
+    <title>okta</title>
+    <g>
+        <path d="M140.84428,1.77777778 L135.578481,66.6311111 C133.0879,66.3466667 130.59732,66.2044444 128.03558,66.2044444 C124.833405,66.2044444 121.702389,66.4177778 118.642533,66.9155556 L115.653837,35.4844444 C115.582677,34.4888889 116.365431,33.6355556 117.361663,33.6355556 L122.698621,33.6355556 L120.136881,1.84888889 C120.065722,0.853333333 120.848476,0 121.773549,0 L139.207612,0 C140.203845,0 140.986598,0.853333333 140.84428,1.84888889 L140.84428,1.84888889 L140.84428,1.77777778 Z M96.8677434,4.97777778 C96.5831056,4.05333333 95.5868734,3.48444444 94.6618006,3.84 L78.2951286,9.81333333 C77.3700558,10.1688889 76.9430991,11.2355556 77.3700558,12.0888889 L90.6768718,41.1022222 L85.6245513,42.9511111 C84.6994785,43.3066667 84.2725218,44.3733333 84.6994785,45.2266667 L98.2909322,73.7422222 C103.200934,71.04 108.537892,68.9777778 114.159488,67.6977778 L96.9389028,4.97777778 L96.8677434,4.97777778 Z M56.7338171,23.04 L94.3771628,76.0888889 C89.6094801,79.2177778 85.268754,82.9155556 81.568463,87.1822222 L59.0109193,64.9955556 C58.2993249,64.2844444 58.3704843,63.1466667 59.0820788,62.5066667 L63.2093265,59.0933333 L40.7941017,36.4088889 C40.0825073,35.6977778 40.1536667,34.56 40.9364206,33.92 L54.2432366,22.7555556 C55.0259905,22.1155556 56.0933821,22.2577778 56.6626577,23.04 L56.7338171,23.04 Z M25.1390241,53.76 C24.3562702,53.1911111 23.2177191,53.4755556 22.719603,54.3288889 L14.0381509,69.4044444 C13.5400348,70.2577778 13.895832,71.3244444 14.7497453,71.7511111 L43.6404795,85.4044444 L40.9364206,90.0266667 C40.4383045,90.88 40.7941017,92.0177778 41.7191745,92.3733333 L70.4675897,105.528889 C72.5312136,100.195556 75.3064319,95.2177778 78.7220852,90.7377778 L25.1390241,53.76 Z M3.86235042,94.72 C4.00466931,93.7244444 5.00090152,93.1555556 5.92597429,93.3688889 L68.902082,109.795556 C67.2654148,115.128889 66.340342,120.746667 66.1980231,126.577778 L34.6743896,124.017778 C33.6781573,123.946667 32.9665629,123.022222 33.1800412,122.026667 L34.105114,116.764444 L2.29684266,113.777778 C1.30061044,113.706667 0.660175451,112.782222 0.802494339,111.786667 L3.79119098,94.6488889 L3.79119098,94.6488889 L3.86235042,94.72 Z M1.51408878,137.244444 C0.517856564,137.315556 -0.12257843,138.24 0.0197404578,139.235556 L3.07959654,156.373333 C3.22191543,157.368889 4.21814764,157.937778 5.14322041,157.724444 L36.026419,149.688889 L36.9514918,154.951111 C37.0938106,155.946667 38.0900429,156.515556 39.0151156,156.302222 L69.4713575,147.911111 C67.6923714,142.648889 66.5538203,137.031111 66.2691826,131.271111 L1.44292933,137.244444 L1.51408878,137.244444 Z M11.6187298,182.328889 C11.1206137,181.475556 11.4764109,180.408889 12.3303242,179.982222 L71.1080247,152.106667 C73.3139675,157.368889 76.3026641,162.275556 79.8606363,166.684444 L54.1009177,185.031111 C53.3181638,185.6 52.1796127,185.386667 51.6814966,184.533333 L48.9774377,179.84 L22.719603,197.973333 C21.9368491,198.542222 20.798298,198.257778 20.3001819,197.404444 L11.5475703,182.328889 L11.6187298,182.328889 Z M82.849333,170.097778 L37.0938106,216.391111 C36.3822162,217.102222 36.4533756,218.24 37.2361295,218.88 L50.6141049,230.044444 C51.3968588,230.684444 52.4642505,230.542222 53.033526,229.76 L71.5349814,203.733333 L75.6622291,207.217778 C76.444983,207.857778 77.5835341,207.715556 78.1528097,206.862222 L96.0849895,180.835556 C91.2461473,177.848889 86.7631024,174.222222 82.9204924,170.097778 L82.849333,170.097778 Z M73.8120836,244.408889 C72.8870108,244.053333 72.4600542,242.986667 72.8870108,242.133333 L99.9987589,182.968889 C104.97992,185.528889 110.388038,187.448889 116.009634,188.515556 L108.039776,219.093333 C107.826298,220.017778 106.758906,220.586667 105.833833,220.231111 L100.781513,218.382222 L92.313539,249.173333 C92.0289012,250.097778 91.032669,250.666667 90.1075962,250.311111 L73.7409242,244.337778 L73.7409242,244.337778 L73.8120836,244.408889 Z M120.492679,189.297778 L115.22688,254.151111 C115.15572,255.146667 115.938474,256 116.863547,256 L134.297611,256 C135.293843,256 136.076597,255.146667 135.934278,254.151111 L133.372538,222.364444 L138.709496,222.364444 C139.705728,222.364444 140.488482,221.511111 140.417323,220.515556 L137.428626,189.084444 C134.36877,189.582222 131.237755,189.795556 128.03558,189.795556 C125.47384,189.795556 122.983259,189.653333 120.492679,189.297778 L120.492679,189.297778 Z M183.255308,13.7244444 C183.682265,12.8 183.255308,11.8044444 182.330235,11.4488889 L165.963563,5.47555556 C165.03849,5.12 164.042258,5.68888889 163.75762,6.61333333 L155.289647,37.4044444 L150.237326,35.5555556 C149.312253,35.2 148.316021,35.7688889 148.031383,36.6933333 L140.061526,67.2711111 C145.754281,68.4088889 151.091239,70.3288889 156.072401,72.8177778 L183.255308,13.7244444 L183.255308,13.7244444 Z M218.977349,39.5377778 L173.221826,85.8311111 C169.379217,81.7066667 164.967331,78.08 160.057329,75.0933333 L177.989509,49.0666667 C178.558785,48.2844444 179.697336,48.0711111 180.48009,48.7111111 L184.607337,52.1955556 L203.108793,26.1688889 C203.678068,25.3866667 204.81662,25.2444444 205.528214,25.8844444 L218.906189,37.0488889 C219.688943,37.6888889 219.688943,38.8266667 219.048508,39.5377778 L218.977349,39.5377778 Z M243.740835,75.9466667 C244.665908,75.52 244.950546,74.4533333 244.45243,73.6 L235.699818,58.5244444 C235.201702,57.6711111 234.063151,57.4577778 233.280397,57.9555556 L207.022562,76.0888889 L204.318503,71.4666667 C203.820387,70.6133333 202.681836,70.3288889 201.899082,70.9688889 L176.139364,89.3155556 C179.697336,93.7244444 182.614873,98.6311111 184.891975,103.893333 L243.669676,76.0177778 L243.740835,75.9466667 Z M252.991563,99.5555556 L255.98026,116.693333 C256.122578,117.688889 255.482143,118.542222 254.485911,118.684444 L189.659658,124.728889 C189.37502,118.897778 188.236469,113.351111 186.457483,108.088889 L216.913725,99.6977778 C217.838798,99.4133333 218.83503,100.053333 218.977349,101.048889 L219.902422,106.311111 L250.78562,98.2755556 C251.710693,98.0622222 252.706925,98.6311111 252.849244,99.6266667 L252.849244,99.6266667 L252.991563,99.5555556 Z M250.074026,162.488889 C250.999098,162.702222 251.995331,162.133333 252.13765,161.137778 L255.126346,144 C255.268665,143.004444 254.62823,142.151111 253.631998,142.008889 L221.823727,139.022222 L222.748799,133.76 C222.891118,132.764444 222.250683,131.911111 221.254451,131.768889 L189.730817,129.208889 C189.588499,135.04 188.663426,140.657778 187.026759,145.991111 L250.002866,162.417778 L250.002866,162.417778 L250.074026,162.488889 Z M233.280397,201.6 C232.782281,202.453333 231.64373,202.666667 230.860976,202.168889 L177.277915,165.191111 C180.693568,160.711111 183.468786,155.733333 185.53241,150.4 L214.280826,163.555556 C215.205898,163.982222 215.561696,165.048889 215.063579,165.902222 L212.359521,170.524444 L241.250255,184.177778 C242.104168,184.604444 242.459965,185.671111 241.961849,186.524444 L233.280397,201.6 L233.280397,201.6 L233.280397,201.6 Z M161.622837,179.768889 L199.266183,232.817778 C199.835458,233.6 200.97401,233.742222 201.685604,233.102222 L214.99242,221.937778 C215.775174,221.297778 215.775174,220.16 215.134739,219.448889 L192.719514,196.764444 L196.846762,193.351111 C197.629516,192.711111 197.629516,191.573333 196.917921,190.862222 L174.360378,168.675556 C170.588927,172.942222 166.31936,176.711111 161.551678,179.768889 L161.551678,179.768889 L161.622837,179.768889 Z M161.26704,252.017778 C160.341967,252.373333 159.345735,251.804444 159.061097,250.88 L141.840512,188.16 C147.462108,186.88 152.799066,184.817778 157.709068,182.115556 L171.300522,210.631111 C171.727478,211.555556 171.300522,212.622222 170.375449,212.906667 L165.323128,214.755556 L178.629944,243.768889 C179.056901,244.693333 178.629944,245.688889 177.704871,246.044444 L161.338199,252.017778 L161.338199,252.017778 L161.26704,252.017778 Z" fill="#000000"></path>
+    </g>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/OpenCTI.png b/packages/nodes-base/credentials/icons/OpenCTI.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a85e2ff10d86e5e2e7b36de5d669674d5d4924b
GIT binary patch
literal 25426
zcmeFYbySqmyFW^I4Goe*cc*j?NJyvDFm#8cluFmo($bxhii}7Ih=i21l%%vY+!w!b
zzGvOvT6djw@BQx#YnVOz-TU+I{q*y^dt#nysp8{M;~*g+;j2NEbdivd)gRti7(h=D
z2RS<MF$ObMvr|*!M8X2T03(snkdT3vI`9wqKiVkBs7R<le<biG2HFo}9^TZ*=zl-s
zf%c<+w$p$%`#;B^0Br$e6eN7$GZ%OZ0&P;@vkG`SM*ZVnAA$D63+wM61ZX`V|Lap#
zP4g*(Ag=&FuaGb>pI=Z&l3z?xP>ex9P*PYzQcwsOja>L&D|$dmwN}UgP+mDIDn3<H
zRAlh*a<_AIfgvIJ=e~eTLq5yV^jVs*aFSs@j+V5o(0YD|>RDsJuJHOP*Sj4nukEO@
z5=J#oPf~MSf)H*)TJv0AUk@_0PlQB96l}^A97myQZ<XUQ2X6iS4m{5Zu%?GKnk84m
z%I57P-w-u-km>lp4rBCz(nNgah8m{m9@1K#V;!FH_BY>*-bw^cedr4dgV5MVI+E0r
zXuHp0{Ccs9#Wl!zByp6bM!_7i-nn}8=vUFOd_I+c(6+=XR->^Cv^2qFa5B0)y11%L
zFNA-$aVQ|J*|4r@Q~DD3bHIy$m|fv0crOY$qx`D~PSK~436!;x9OM)43J#A5J40g3
zaXLg1Uj&kHgum3$-w=lQIg_!neJJrj*$Vc|O#;cyqEm|uT*^Gp?Z+kx#Hc&X=+?!w
zlToX0dA9``Yr{7;Zxe<Qwl5%K<m3HFd&Z$8WXz6qV1KG9QFu?jWpWni{Cn*b`O8zI
z%10|JM3g+bf3ip4zn=@bKG$gOrcasoY8I<Jrvzls-%;P#$5>NC66)^CYi;Xp1LO5~
z^>|<yl9a5!hc(n0=EGnEvv+ip1|Pid1~WL?N`s9=H2F0>6k!gIkU%e(UZ9pfG|(9;
zVGEX(!IAQp1OQxNKGqEWt}brglK#@*zqpb>`=Of;%<y-JkFzw`7?2}HcP|)&Ft0E#
zKaaA%<8wi<3=V^om#v+ou9C_>A%JhvU<V%`4@o{gKR-WSKOtUsFMB=#2?+^4enCD#
zK^|ZPk9UBZkF`IKn>W(~#6K{UVBSzKM-LxIcQ=LyOluo=Ums~O7`V>xul2clXlni&
z-p%`;Q~>C~=Wp%7C&0_k=jzJ$pEJCDl%E42|6I`jafY{kfCr3E7v}Bm>ji}=KZm*b
zF#RWlE%e{>J$$`f{%*$>$_I0SxdKDIfx8O)w_84F+`nf$kig#2)#L9hfY|?Sq>rQB
ze-Z1yt?l8;-|hV8LV)T2#{F-j|F!qOgMm?+nvzQHP~V5;sVPZ=AMP({>kf6amHgYZ
zhC#&y1O=fyP;pUF9$^V#Q633lF>4+Hm=H`1YHKShYy<lbC^a{4A8R)#>;Vb@=XC^d
ztOX?a#cf5!cwn|7c09tuVm3TBVs_R%Fi{~9F+l-4YXL!<|A5f;as;H(+T}l2^#ElH
zK=Jd7+lT`Hc&tV304QsiFpq?&ggB3&tth_@KU73aOjP(Ulr2<J#of!*8epfRtF=9h
z&%@3B?}Z0~OUgf0lLia&^8Z)QQx|I=J79t|Si{lH*Z;pR=sUW?^n9!zs3{;S!7nT#
zAS5axBp@OtD*9i83}Ig0fFwR({<WQduRO3t64(qtSnCHl1pxl`1ACEF^nzLYxO?fl
zySqq(|7~^ueOVJwCtGVDYb9$R7y$ZjJFNdNJIuuoSmu8${{c?Z-PX}A;Qwj#gYqy)
z0pkIdLma(<`v?5(`iDm8!94%*?H^xV9RI2k1H)gXkhF&WV+-Ea&tbNI*9l<#;}X=t
z+RYvYSdV{->%aOP{|}-dBmffuga*cAZ7s;pBP=8##v>tNEye>Cln{YQNI)gTtOfr&
zy0^QXkDs*{Ox_-#BS0%aJpXzq2KK*<;`r~Q{TyHqTmT5h!!O1oDE2RciTsmbeE-}q
z--FHg*N&z5{%<sq`a9r1j0`aEAANxF0&F4Qzm4HPY4%`t{(pS^lNbL#-T{FA-<$l8
z==;Cq`d@PWk0|gz8vMV~^}po$A5q|cH28m|>;E%y;rv%R1#<(UAU_~k3b!oB1`;g{
zn<uJDNcRtag<a*TKo7PD#Kap3376#Ijf|9?3#4jDm_BNn%9y_}A7KknS*lZQBOx&$
zsVT|p`_Jv=`L&ZyT@J{;Z~Ihg1X9wMQ^pLUN?6o!88?86QHwamt8riUIZQhgB?_?i
zXHi1;q@B1)pniL<Pm$9>kE7Wk20I%Wi?_E&`CJqq%%9JB`5j!!j7r5U<OvDcj|QJh
zyI+1ReEa|6rQ=jGv~4G3a=@@6Q)m(DOHIA}$vsR~vh@vNaM|uT8jaO~)*(%s6;-)U
zS&ZgxOX=IU;V^FGvfY?5rOLN&#|83HGj<&x+B$<3;OxiyA%*hV#jNW13F`g75?wdJ
zF5Nld+NZ)!MU!I{w!(e<{j`D9B05eE4nFZlXQU25_t+LCJ?hDs@I$*opA?+L;HXfr
zTRHiF8RLLV-X}a=8z}kDIjaAjb29Fzkj*Y4EG(&ndKjILp_xWaogT@u6HTBdRZvl`
zPf{AGQfgf(x!Oa4K#{I}7|Mywv6`-VgL0v+U0v9TE8|V)X}C*|ouCdLtcR1nP5gP~
z$nY9gQ^^`k&W}#1aCG?wy%2Nk842tX+6m2h1Z&D?RZmb?_|!OJgXN0GPwn6NS=*#v
za0N@brtg#Bar+%i&X5H5njsD6U8KroF}b*Xg3^zSn}~y1PJ(CSRqES*%Eh?F=(Eb*
zmJiGM`1*O{yC=3&?ROS|oWcN2k_Q8GP-F*frMu#csSFUm1F0W+Q>3VlKHs8V<mAH-
zKAabO+;U2j0n<Cl1<EGx2}W$Y2EreO|J)g61J<|XgfneKzJVcUDNXw@hR%czH5hxZ
zduZ-A@(pB^r~y3NlrJd^!1{n9Xwc137ruWQz_4$!Ae1)aGRgS-mkV3e%pH#pDGyIX
zg5RmvpC4Fp?Uw`G(79v|AYVaxL~(SaQfM+dr!G$H`NW|Hc`6V`cqo}62q_ck7lycN
z1~g~*Y_IlJqn!4tGviwxKoqnTQi{Vv(U}KTRsyAikS6Pom#=p@#sNqZ=8l(hPV}l_
zi7zWr+8(z`$d580p&DKuyf{k(<e`ElWr4~cYqlo+K30M+)9%N@-4w+(mHE;8#-UL6
zm%B4tj@y)Ts+Bqf%o4;N*cIN!=~4E6dpd3HszU>31;}@J!8qJ{`vk&Pq+^6x#pMbl
zr7D*xCD<Qmd}>?uOZ|PT-MD|ltBMeEE0n&$*ivD;-N+i~Wj0jL@|d|LzsXN2RhG*Y
zlccVHf^gUr`euLod{Nse&=zVCl>gNlVX|`{imvhbtQ<MXit5~Vyi!Jyq!f^lW9GpF
zWHD6Km${jo2;BLZ=0f*QO6(tuJG0p0cr)F|{uu43{;0!SoYGLyDK4#tHNn@PuCx|1
zzxnn#t}k`HYO5^q^VE3QZfMExwdaM{N3P_Y9z(mHx3`V)Y^OVBBXbjah2w(|udt>a
z6?6%{f(WCwo&FmS<{xyOsAeceOs;11s3DQN2T{98J!iW^KC#Y5Crpjy7BA+CCfVs1
zqDqj+*agumkTj^jCrF@HrS8o(y_d{D5(=wqzf(ed5@gL7zacP7`1Fpk&a$`}`9WMl
zoR1}~+|LS>t5eE#bH$)*onppW*CGwH{Oq6R_psx220{=&+V2!r4iKT?+r}#Pyy-R1
zM!J)p)+L$*vH<G8^?^Bn@^Fo)d}-6%?k;8+$saUxfFF;hg(kSOp{;)L7H6w8QMPLB
ziTS+*Gm!|k!<Mb#+)i-KE{C(;U$Sbcr=W(%g%y&4>rvSNk=>ckpU!B6fF_w?`}?tJ
zQi*7y`md5pLOm%D6@9sp-TKcgF=X_nH$P}yiPThY{^IEZ14hJ0Yas$nD`G`@rNSNC
z%eNsuGd$DtHb2^U-$6;_*Hf#UR|VB<Da`@ohv=&_xfmai78bE@!_8K&2%%IwfocyM
zF`r)74nM$@s>K!`XdIzZF0iJ062^fbHNV$k&X%UBoR$DlQuh?$M@&!SzDHI?4edLV
zUg2EP<X+1m)(lWp=%QLtf47$nNQ#zn%8Rh&DDg9~L{}M-tDX!vY6c2D5(O&7+SMb5
z(qL7Tc_uI07HsLjJjwn_C`a8rc}j#&8@Q?zd&9+T?9;NS>O>L19bi#P7bMH+x28P0
z=<Fr_y^SN)Hr*t{7kKU1?btI11iA4gs0nDI;2(*vrH$bsJ}ieA9+-9aGKbjwZ2gd{
z?3&Hmu=3LhK+DG^Y6hjlnb-yK*$u)rvnLmr@=b#yQcp)rR8S`fZ|K|a_<QRma5#K#
ztb5FS!e}QO@h&JURYNH*=rcefvrVjAzPYUGfHBT{$?O~seQE6Ynp9(<#_V3zZ&x5a
zB9!k?Y=xvHK`TYLTS+&>0_`{29pNnX1z7{v;Gf(|)d+JlaL9tU!M9CX$jo2>V}7V6
z$L0JsSyhZ~vA31<N*V*(*WZ?XxgQM-NVf=Y^l2?uuJ{<Ir0T&TUA8G*eU`HoiNC^r
zdEC+=5)tx<aEQ~>6p0+^DbH|8nZC0EqtSbev1phuxxhKCwRoLn987o{24F+?S0z#O
zmq^1Lcc;d5PiTW2q+xI9s_%~Z>kg0(^kQ?BhmEgz9AjJBL{fxhF^*gb7(2p<cBq-A
zL>`4*d)%_kOWpT8|F+!~DKMi`@TNSo65wu2+x`;O(Mz&6Id60sDvM#Gm(_3AH0`p<
zhGd)5TFw|#<ZiJt1cZ*Fn&Z_FZ-yplN)sD*0!CidFVSAWC1o&WbVl!4b(8K|uFUJA
zJ+B;#0QNLK_Y6rUY%9_G@VJw=Vz#ey=YoznxI=*@&=N<=u=kHJ!IKl(6<XNOJF26B
z{4k#+n&d;8`uap^_|~mun(e|5r`?aNE>URk2Om&_?(Fq~8NG~Mf8%HBne(6#i6I$#
zY3s)p$lUNtIl7rpbbplXEpd_~S5^|z6wl0xHLn#f^HAXiLS5Q->EL=dY;)<p*xV7?
zuo)DWZIK5=7Mec4YxR2a4q=T)<nMh<sVftI;9sB~f;`0PfX$FgyhkJdH85oJUd#2n
z5W>3V%a6U5jBd7C|2lvPJSM4KVK3vJc^gP%36ykNt0npPrA(17Q&tjiBBg?smq=Gw
zxYyqFvZ=Ig`*AhVeTy|ct(^)!GsCsatTfv53w<UctR9}1te?GFGssDe$^Df!N4r@d
z<u1jiQyphk!Q?pw5<#6T#Y{K$4Bv?1q@bM@)hOd!Mmf_)<a?x~)Dq?+zwsx0My@(e
zX-nBP3MgpuoTjWZB4kTe+E7+77`d*SaCQDs6eMEmd*c^HWBtm;U3l=Qp2zKIxN7*X
zaQpC$st7jhp0CYd`xAo|IrDCu!I=dLkQiOrZ$4}&Td7ekAQltFB3VzlaiS+iYYec~
zsY(jI1+?E?Au5M(7Eof2SvwR>3&>)AORR*p-$A2)Z?IJln#89{c}GWFg-#{)+d(+T
zGNQBk#wfAtsAmplSW6)!rTHic#D!uhReIc}NZpFHYQq;a7q#GoMg(iv+t!O~)*C4U
z2oh`Ymm4PYduc21p>T!((-BomJjV`Zu@(rndvZYA+t(OL&xH>tE{l?1L`%M_oUUIi
zOTr++Hoe(6u4H~Mv4SK4a`D5|ThtFdJA9-4jt0>$=*EX^Ey@{@AH8eD1i#6T?R72e
z{;T~P;d&?`A(haaPbB%uZ{DNpEM5{G(wm2(f!P}g8*0Iczp<sD*<=!NFT&<MZs*gg
zR|I<7B=EQ2rp8CK$IoXs2S|HJ*L8EO&eN2elcL6X=;$+z`z?|`cyMgbV8m!QB~yR~
zW*vH+0W$m+6wsD1W!PfhGrB|_hH{|~Z;R6Zt)UIcZQDNy4Z|Y6H*x(gt8i2648Cnx
zrQ0=FMVVHrgtP14*^ccWyu^m95X6|v#_kd-1qWdiIeg?w*~?>AX)1d49W&T`Sv9+)
zE6u;2de}kV*5qsJW0#3rw}<d8f~n!-TWAg;bBIw9_i52ivVZEFVB7PTQjKUQHWkIn
za9z~8dtndkj3aBXQJO}$jXFyX2zJK5^(-dN7}&<dZ1*f-8P1q~PK5okbK%o=vZI48
zY;L*Wpd)uZqi-hWO4TSyy9bfNbl3S!(eG2^n*v%S1IIY2eqC9jih&oY*-+wahJGwC
zARf~%bo$<os2LhQ1QUHWsSNZMhM6chi(x{OaK%%)g5EQhPOh%^sjcFcC>A|u-=nqp
zURE5r$PeImuFA=-Ncp~FH~N$ciP<Q@D(R3IY;By)w+$+D1_Cf+Jl;Pqw^6w3pFEj6
z#hGu6B}0anBG5Kwf*u|1zR22IjO)9kIy5Tj+cQ?OpHNEK@?&|kQ`mao;QVb9#frF2
zmMW_-|NaCC>S|Wfmx=pB#?Q9YD;Cg#ULe@@MXP+oE9X7H)r3jRJxf-3YZ18{`tpME
z-Xujmg-jwR34HgFE}H(2V2L`b+Nmn>(7FC-H|b14(&=bN<>x>6#JyDchqtwguXj{|
zU=c#xg_U)f%k^8txw?6lP_3rb^M&IH4jpm41El60u=GswNqsfZC4>qn^4E+3(Jvvq
z_RTqx7!5_x65NHj3*U0Ev`_Yw#I8>8&bKs#-}+To`jaB?ZZ8luFvnywICCq9N4jmZ
zi!j!@THqplRyd}DU5GP|La=K_I-;{L3p{US5Z@4t(I3~IGtW1I5W1?)lULa0_aYl*
z#)Orad>G#q%!Am$`nqr+UxG86PW8p9aOSr^S2qzWuU;dWq6i{BYyy9?MO6T&9K8Zp
zFCjz$*u))3ioR1ahCMWSn&f~9bZfK7P#@X8iNRbD_23o3<5Ay!HaoeV`tmo>Twu)H
zQ?_et%d)yU@}gKgopyERxw0xL7`<fizY{=~JwRW0UY@)c89UVm#I|teNMd$yZUh+_
zqc3*t`SjB4E^^T7RRA-kPurYV>!wRTUm6#b*Jwb>^xFIV-8Ts5q-gXvTfb=w8JqAG
zTFPC}r?uGE05h3E71l;|IFTc+9UHgfzV+j};#jkIj&aG%69~s0<BHZ_NmZn|VhUx0
zXe?thVKW}L)Fl`%#FTn_3QrS0+9Am|V_xaJEsX=zN|F{wuAb!*CCDX&!Xs1njw+5>
z&<xV!Q}F5;dQe3%x<BenLD-~?HbPKFJ&QjFj$wa*e6PRyA%{U`qzispoc*dhlCUv;
z19|jE<-|-Gu()r^85~!wjEUO_AM<-`!_$5`^qW|uQaETSA&(3@H+G%-8}c3g4eGG*
zQ<Nv(IQ-}{_w+?VKL{)FB$KQZzQ`X2M|&sMpZZn;#BR2>di)BmcuYo7UHkK->fNF7
z3R`ryCsB$KrJo#Q-;hLHCQ|0g6+OpsAnpb6Hh#YTH@i45TyCYRS9Chq>)mp}FF(VB
zr`(iAp~1pq<<Gk7oBljxwy%^ZCphcYbx@dU%}(W`W!>pZMs}wm>5!CJ%676rliWz9
z7E9zM!>Pw=W;qGb5!VGCx4v+>v5!O2jkQf5U)n^1R~f`3kh<m`(1Iy&v6k$7^N30W
zj9jS-jF92AWS)Ckj$Y(qh69cWd-V@cl!;nToQy_s>xtag6&13PyEE1H%jAP^&1De~
zKL%Ivh?Rx9hUCAJAAlAg%yesCl&m6jh(R3Pfv?tNL0?JO{nWJ}wHISYoKo%nO|6%x
zJ3^3-H@vh1&mVopGU7roPMLs`9wIe+M#y}buLN+GlkV+~i=c^n12o6mh9O}(x36QU
z=bEdoTOe6ELKt<bRbV@J1da%44?%9nuN=uo4}Lib{bkeDBuw=<cJ&Fl{G2jc?U78p
zt<w)+T|OM#Y_E`9st|R|GX$$lret5Ah2oZo25YzYF7f`ngdnq3LKDFUM*0Dz<@z&g
z2*^q%@@PN-!=2hu9Q898BVgPh#0e19Ub*?jvbnT$N}W25>;seo6tPN*P-o@bWz|>Q
zDR{bgD!RF*-*fx9@<s;89KXf$|G7mQZgWAgz;pQFR=oM-p~|4dt*C2?vdyqrB@Uk{
z-$P8?_^)tsuYD&@-sH9-ue&Ebq)@iSAfA$LMf0BG%<$x%ko~2%;<!>D&aF9fFO=d;
zg@$k3--2AHLzt_1Jb3UxEBZuNQM)FKm1uWg+(nb@Wfc=1`<1KVWVx^RVV4NObh=bD
z>rJB4JmqNpH>fmGyYx}(E{O`9{!VHtKR&#dyka6#Gcgb4C8i8ixjp1|Kfiny%C%C?
zSa*3%WEND-RSN?gy&4n04&Z;BP4fGsKTeg^7#S{ECX3dSc-~SZBlViO_By7%6F<QC
z-G3Iv@bPP2a!QYDG<Bt=5C&rpEqV$0i-;Y%Z75YLsTu*sZ$^I)80hdk?AJ|oHIK~$
zIMmRih<nUk2LPWZJ92eB35;msUG6zsMy6BoB2S%ua}!GzyD8$7^IoFJ=_AD;YiBvB
zfcwidgOExuQ8q@?WT-;?<!Bg(JaikSWf7o>dO{4^UTPkv-0gAE@gyb#=i_T6dz2H8
z+qUp~6h91bm`BNvc%?eFm8)|`=~^+Bod#{DfQ<s{9dU;B%Vi`ZOsQXGb?wm)GM(Vp
z<I)wxJDfTs|F(T-LwLgOEoKVR3oH-Zx_dki(1ffV5O@r;9H*@c<yI#eg>!k{`i60l
z!l&T5-)xO7w<V1G_mHO7KcNwl0#W%GI||=x#-Xc7l&MRU5d*j|o$34nFNOu$lK%Xu
zUqk#Tai|yL+f>p)mzNcw{hHQ6v&QE^R^3mCN*QJjUMqFJf53>QN^~U$v;#huLH=3+
zXXg>_Bp+WxgDSV?Z6GpcC2GmyUQn#m0hdnBe9REOXD!Z$c;&#C^l?5e+^{N5x{IWg
zMlSOAOt8Xd#E!R|&S^+|Xwq+074!2GUYBGSB%&v(Tv=;>KC|pOtJe*WUALz4Ziu%B
zy%8nB?#T^%m(7E|G$6=}Yo+-IscwHLGQAa`cX%ih7}V$9eS&_)^JT;CPrVZ-b7u4G
z9E+EcZ*JV~udrpXx+E^VD&3B|nCN;+nX}Ho{zPv@YlYJM9uwee$K1|z@6C<8a%iXu
z1*jWvdX1t-c4H)_ReJF^McdWeOim#k?W|MT5keX3W<`d`nbm8qB}_lf+V4n}oSPVr
zel*2nhGBZ#-bE+1v`p>i3%HDjR+?^;J8KdcWVmNW0>)jpuq934X?Ko(xOJ3F$3?>9
zx*wM^>CNJ%u6pP4JB?AS!OLcqs7huhuIBfOD~8-_Bfa*TbD9g73sJlGTGD=`Qgy9k
z@*Z4j5^_NL;!yL71@gHj?`3{_g?%86N7s;v%e>+yO39P8-*Oln=TC@l;jfOn!su78
zaFffR_o#I0UnhKSIZM)i>wr|VadIgtp1t0^r=OUt83t-WDjZ{^8SKD}U8BZ#*^^oI
zRcl`6-E4>6%ts$6Qkt{$nL7;Zy>8vHzn%>+NoJ-Jr5~1kk;oyY4Sl(F_sMR>lzXiU
zX=aILTg0L?vpzA<ISpe3lJJ}|e%Q84<i60XpO|}%(6~Pk!3!zxe;hWGjFVQ<$h3m;
z9bWjg-sASA$L%<y+VRtp9kxV<p#<apDdf65-IF%BMdw2u2t+gg)xK$oEjrqLOk{=@
z+eS+7lxkwZxhZfPlObfJHjEw|n5tI9=Fu)m4LH`pq2sRR3emQ@P^JkK(Zu!N?;GQV
zQ1iW6k%zS&oKEk{(X<w_vb)P;Ii(Ik$8VSx@@c*9iYV$q44(=WA*~Z71R$g((xYOF
z*xl|J=1$od*oQ_OdAGO=Cb5|9t2!@Lv_@MoIsNROqEg}jW%n)-b(n#Apr&~IH`}f=
z@bW8{(e7Ts-~ED#{eqoLi#YU(>-`xdADnF)E98UAgBY)p);w=v?RPBgcOK^V1CXS{
zcF3{F$}EwA>OIQ`_jAn^P9U#yQ2KlgY3nXTj&O^PH@O)S(KYo?j^(9Kyr33S)(=x*
zk)mIOum4$Q<sStcTyR_qb9I<3xTDJYP(*hIsGIPbKO~35+U(Ul>`r<=!JG0}LQ$}V
zB-jn{MfhAc{i}7_Zyd!EcUa<-!&yX!9~8qaiDc}L7vyw&0i#G=-S-$$e^3Y!F)06I
z{_D<9>z736V(-C(Aaz4LVMF{tvRh;h7#3;-hHrg~)egUHh}TBRW8n#Qk7?NWNIKkJ
zn?g~y1jqqiqAM>@`6a}HAM2(=Un<1z4tjTSvfT(xjFy4M-)Qu=wF4=rh;P{LIdaG=
zrKlNsQv?0R=Um21sDj4*@4}dWJQ|$ZBRlS#v7(|dxSE?HFIA~L3eHO1$v&xhT>d)k
z>A2kxN;aX?t7sFN_+9s+U{^J>T-?TZ=Z5$MP{F1$<lU8K$z<cCKdm_TD;ATaG{_(9
zfW_;E_-2D8n6jc-8g*&^S@ez{!#n-*St~msJ(a2P4-q(ekd1HRCDfa^D|+b>-b@(+
z#b_m$$cLEbvb8nC_+)VUir>{iJ$@b(hg?&`Y*=cBjE-{GuRr`AMsPS0;G}<a03<Cf
z@VbjX^=ygR%Jn&N#WylzKR4V0!df@JnDWQqYyoOelK7*Ud$h{F5WK8p<40JGaZ(cy
zSHKT<&JF!e;n%rCZ^s%orcP%5j@X90Y~uGvZ9thy0OEl$ta$HqWn!$?`mt}lNp+sb
zb1LhbRj+|poPoHJIpFq*m1B*o8|>QTrT)7cvLiFr*D5PRSRX&_hlRe9I+x~#4%D?;
z0Sm0b{}5Gzjb0TySZ@90hTQ29uJBaZoHJ}5bj9dOk%(@Gdf$J>hD4A09o7Ar5$j+A
z(a&W|Vj03l<6x8<+TjbcFF}j+a5LOksUrPucO&x#!1+yMP{VVF6jAwRX#m^#=3K1q
z<>pvjqc0J<C#j>B5&YD?AwCEt`CBKV6e4HuostwN`+A*A>(iND_=}fyp+p`*Uz}y}
zZuoW1fp{H1A-#d7vYS97jmLn0=Y&;ewnEGFhYBH6O>rV^Sh44=b9gzNVUU@7ZTLBs
zeO41)lEJSG6eDB`8>*BB`dsEV6gN2^k(aA>+-n2R0zLudM|O#{>@i!I35MH`Y+gj9
zrKpgvKmNK6e*1I10i7L(o-<iFbvAcY3@|K&N_|G85m}sQ*k9%pOJVOE#X9AT4<T5G
z1^Z-3<U?25Ki9*o5Nlh4!|!k5t=QSYFZ(m72E7&OE;8Cq13i%)q}IxSLdFD6S$F7d
zqtthSQXN9M*J7WN*F0>@xMnC|2c5t`M`$Z&;RC2Sdz7(H%_+xR?PIfw(&Lk8xgPRm
zmccIgWJTdBoh51zluB$j{cizq&Cbd(i=^5MZ+Yi)KlvX~H^pP*8FT{02qnw(qud(`
z$}rf%BaRn?XMV`P<&V{0nqDzA;A!(|18SZ3x$1@zG=%k9Ay!Dxq#iS)k!Cn64ki^3
zqbcOBpoItbzln{1d_C<+efWZ#i9|g7<~?%<=#ZUXeC16j=5vG~`R-JQpbx())O8KJ
zB!UI+xj{+0;18Vf4{sB_J#JqBk=MxNuWLr0N0Ohf3ecsnZ(0|zf;>_d=qhjPaQq34
ztf`E)H!665Tqnla6u&q5*S$?b0pQ;Obqv2nCOL9^j*;?#UYvATT!J-4N)zrzloE_F
zUO&nFkkgR3cV~jr!PcoQNndTd=#-Noe!Wo=bULdRIa%QqmGp72_#~LpjO?QeiciPP
z_h>gr!~Rd|mAcNRjd8!&cBO%PY`FUh7%RoB$4DycKi1J6S12;~@*4CCTk&W=LDlsO
z(RA_MEJCqG?IviSx}(ZCO17wci08Bu7sG$LwoX{Gdl{2#q8xxF;;gOemD1|EWvm!@
zER(j;^iCvFaL(Q%dOB%SZQYrz3~F94m`VnEMVCPV0AVokI?+lnv)ZLeOUun%<49x}
zpNDZ#jqD!E!D$r1wltjOQYg$d*<z{1Ilw7{i#QZ-IE!@mOI<gk2UCL|++IUbKZj0D
z1K$FO;`{x+G_n<4`wNU2x!%$tXVc8%rQPh$+Ih3?cGXy{^BeHB2w@so=2@hTZhSx8
zW7hMjzdFhSJr?M=gD7!?_`~g`P-tRc!aM2JF}h49HZ{t^<b=qHibVr@;mZ=O+r1t!
z*bud~Kh|2m--|DI%`{2j2Gvbntb4(9?lFe_#o%1+ci5!mNcwV;g87lK4<$woKzOtM
zrIEnVl^<hJQ3~Aw!vaOi%jM)#d)>zDrqP?4Unuj$;77%(iiya$-p+CC_Kf4F%TOwJ
zHZSy<1MC|dY>Zm$W)LU|Fx%u^DGzb4V)Ex?q)&fpAQKqv)Z;8P2eWp>u1IzArle>Y
zC|t=lr>CrCgw-6d@$*b4EeoV2wfHpiZdu(#@w#Yj%h$rUfqM0}fV>~2Le)*YjjHZz
z-J50dk+qOEC0gHPy<VN&+|!s2f)h!mUkaaEWZQqqrLiQa#NlWGImEpXNNH;qA76>y
zJ$RkQR9AWa?HYo+7&8|O6tzKo63-Ra+Y*)6Ka0AY{IY{dTWrp5_UbO`$&5&E2YVEu
zeK9Dd6e*73i(;M_<-+_bA2<RSO5?OGB}l|g0OCM0o7V~(3=WP<v;*vTbP|no7-+~z
z3V+r)JxLgu&LbU~la#jC50oDdyHu<6x@8V8Stdm(ls-ve4VGCUdT6>b)=d_eXfyHp
zb(sfF7*}>u-YIz83OM0*g<=+DBTFIKHpXLgH32m2RZU^5%5;BX_5HcbG0ma&iphZJ
zlhowBt7{JD=a`5>q=Uq|wV(sxh7Y2OCq5PbIt!p=07VwPe~0Zp|9gxyhU3wcxm3)%
z&OD={%M0{FZ^L@V4${Gq8~Ti&y9Tv@{K!PyQ0ey1<oz+@6RyfU5gicCd7^}6#>7M3
z&#+JNip(3`j<Ci?CrQ{>ld)z<7%zWWVN_WnW3v471t%_o%;}@4jjQAQQLsLfqbw~)
z#WI>X*4N!C&5uBg+p8Au3uMD=h$NF2429_JsO@8oBPJ{iFWsD~@13pMre4&Pa`ydF
ztomUaDAYlu0_#L7E)zTXlT|c-#EmJV$oZ`9x;5Nr8_O$*InRFWxlAJ(=%kBu_~L23
z8z39w*iB*$LMcQcH`FqB7#`u!oYC|!yekw;hJY}$+Hp>ePd6W@ghPKQNYcAqFW7q~
z{>DeA-jTGO`w?AqK4RRD%5vXh9?Cu;dTz9T)6!zle`(xb9_ahPR;}b0VFh5{?w|?J
zo<ABZ=ZMdVuHQ7Xup+tQp1UirD9=ZoT$h>X78H%HuFSiKeSC6!YMNdCw$8~{miQbj
z&*fe#{LSkY8g{R^GlA>6X~$S3d?%i9)M@dMU9K_?#!ceRbVVPW$ggNvX~B=}t<?%~
zj*jxMPZ_e3xsfy%C%)1dYaX!tJf5pI!@;|+dJ}M4J=e*xtdsG_9?{g2p|y79hpO6k
zDeufO_=Hp~q}ZDg5Ev!40pw_`T6{dt)wB)-OQNeq4nHy;h89K>kxnkyXl3oEh>LLX
zn<}EN_ud8^qS-&brX}orbll1aBx*+<_J`KKa9oX(!fJ0GSy-R+JK^_`$T)iacgaO0
z>rW9VcSv|V$L}b@NNDDB;SAU{s5eMD!zO$g0=Q%PnRe3%&dAUyVyEjx^K_f;nT)$%
zKZi%YPw!Ctx-tW&OGULZemM`jCIT&&{-rUNc09*`DDIn@Ock0tS)^93<5Oh_=U_K+
z)iB14C7~l(kX+a`C*38AUer{>U5y=1rAHnZha++HrvLG9#{%~Y-PT<~eK&Y9oH;Z(
zdw(GOS7ZE}!1M?1VJWAqCEs)+BY&(9Ko};vhP+|Gz9GF}N<n?|Rgx1CAwMPTQ(a^R
zl}R(e_F?OLgD7~Sk#f!WV%Uu5{u=(S!bI-7DK>+nLs5<J6XL<j_cTY!7=`4&y<JYS
zURm5ZG2b8gL8@oh$IVx2M|NkOZv?5GKmVa$%Vc3x$F^||pLC#4NTa&LZ6_Yisxo?h
zso-b57tGv|I9I2M4M~X$FJOVBn1N+l>>o1^rqN7wpe$zNmf&*T@w_wmQ6BpPwMs22
zN#}gjwu_!cBjpj}iy#ZtUgd8X{Wesx<II(S>-ASV7B69XOLaKOffyxGqw~AfK~O=6
zuO*$Ye$={hH*DLFoLZ(a<#CPar`k*xI>}hJWp8$-O`@PH(S3Zg%y#Q}|GHyeLD!AP
zLy2{Fk>q{%^jQ=;Zjg}D&K_h%nH&1nV*Ei)*#=dU3n62<pZ&sUiLqzf?~;gQ*AX_)
z>9=Y2PTf#%$v4zmju2;-S<uN}BOkidc$zT{Fe|%xkp{@B^tAB{7MlWOMo<we$=c1O
zbL8D*Yd7ZcXwBbBS~{|UhoMt7fc3HP(m)Mj2=M7r#PfU)%{g-CC|#@`$sT4fYGPIW
z>QJ@}w*J%_p6P?!DYp3os(|`Ea{Blvn)>5*x<ww2X?4vH9^-z^<?L4`2figmn}x~R
zB6zc+sb{ROv|9acNx{aAWMGRUP)1|E#b7$&ezAEF^AGyU9)D40wL3bs--)RVK|im`
zD{60!!oO*jQl9#{u{`lI5S}hEzOS}>p3@NTTE<;InqqEtzv05{Yp2Z({ng5hU6?lI
zu9%kCv#QUmPEURtz6fvq@Cyj<cG7DA?pzEuitu@{m2C9zGDdPBl}oe+=zV4GNB}Q;
zkmum6)L`=%By%D#gv=-fWd{J`_eP}RYAIlT$`XN5EW5j9J|IdD1V>MZLaiuWs-u4o
zCja8=5zHUwG66CjYz6o_$58A7%R0Xq_%gsVWnBU>3~Ft8%04#6^US9XT8HCgisNz$
z6Iu>>Z+)-mo)x-eP2t~n<8jZl`rQI_^;OqV&&eUK3D+#O1=4fG!WflBNCSAlbxLe6
zhLi~}rS-<+!>KUN$Wf<^v_czvolBPjAk@U+AOKS1<}fzedGlu`%Zmt02g|T_O3F7i
zZ86Xs(|H{r4a<vXzGm2&v{v(CJwzQ4U30cQxVmPN2vzMBv_Q7Qud;LNcB=Av-Qbw|
zIa!9k9;gR2?hL>Ts)HH94UfnTqEB-oBUy*Elv0Y}b4&D*G&Z6h70?{MUPwx};wh!k
zDNL=enVQvgDIrN^a^h)DEKon-E^0dQXWgY;__lnH1fTPxFE%OzFup0Lj4~CqST~UJ
z)6U1M(tSMx4z#F68~4XTg77Cr$+lXU2}LRotBa6^tABRs_yUIp<|VdK2vyB<f>7^)
zjSd3)3drdmQKk-k-6#2`#_yxWTk34~85uP<45_l#RO<#b@!7_aQ5*1JLYPr94Wi1B
zt7)JKC8%o-@pF`SGb}UH<Mf`qaeI=rQw&2C6E~W2;MpaquXp0?aXsPfCn-E}oC~aN
z5;}~tFyxCjHRsnF(~lBMYGhGg8K6~R{L$@tEet$0uVYDBK=VhTq_xh{v*A+nx%G^e
z_1bMU+h2NeyeD8y1t_4gVP;vQ=*V#=Y5#!c-sPsCXx_9^TbY7Di^4L4#M{T#RI)C$
zS~}ZL&$)^o({5{%pi?joZc%_+_VvK=A{pSTa|Z{9B8^C9F-#h(TddDF`XCJ&<^aKW
zmRD_`zS;r8v|eS%Tj*99*;$5?qwQ*&sWv?8??fWPgI;l^6<vl54||L>ERH*TQL;~O
z#$`n_@ABN`#BfD!h1<&X728hSq~Sd(JRdiX5kanA3H<1f1ct5V^<ss?>N`<++i%}d
zUzd}D#)ahFd%E_F=W~K3$4|S1&y;6gldey21oH4S{Fr3@69}c+4IQ7H?hK|I+?MK^
zWi_s1`Q3sbh$b~j3;RlG^)g!Ml&Pg<W^9W{GD%P-WiKkaIr2=cENnNtyH74z1QM{O
zO#7^clPw^gmL;a`t~LmY?0xK|^400*XMAV(H{QJ&<*zzK21HMy`A)O}c5@LgE|EDZ
z7&`66zpERQNT;4F;s({BKacnLh-tnxYsVWI)B%D2c7khvnz$0aM0zw@mQDJy`&;9+
z8NMn_%GqzAYPMLkPy)?4p_yNxpT)f(9N%gGygC}V?F3MJI##3d{#M$<<<;8^q;lXW
znrzwrpVxh}_087?aEq799h_c{4s~Tl>OK_ogSK7sK&|#Wdt1#!K_UtPMn3P+OuIYl
z?%7ne2|!JSr!DgXe((Bt{=fiIE>c2{y;dTMWX!@$cJ)twVzf+(y~-dsK+TQTpIE5k
zOjZ~zh306ZQYi(xDa3s2H&w#aS1h)P7EFxP5D_p<`#cRGq0ET4UIwn`c;1qbs*&FZ
z2V^yQ@+^@rI@W0^zghSQv9fgobguBG#TvUAIG{)oz7NOAl~BUHB7G?&OxAn#`8(Cp
z39n|_306_kqD*9;C)1mn8QS*O4)W2N@O~p5HLuW;7z2-Yh<9hs{vlDngWKhKMy4v+
zdGMT)nXm1E6QYwE)4NpTJvaEojNNz_!k>Iwd|7v0D<pWy_lQ4J=G7&*cYrqZ6?~sv
z5)9(U`-hmCJiS&i$CFK>`QUjw0{S$681YWRc$#Mfv)HL1f0->$9))JOn268=b;Yh}
zi4nB;=sWHFO<wkHcViJXn^tu(-L^pqh_)C?xdzot8@I^r@FZgKa6n7ZKwb=g!elOs
zxv(?4`52_;B}{y?#dRqI=`qT3Z$V70ODsJ0yQY{VUy|$ORr!>N=mM14iFJ3M<mi1t
zRgF8UnrM=cjud*<n;J2s1omA|hNBW1tu2=%!{-Lrz)+c=#GUi27z3i(NgjkVVEob^
zn}_3{O6F;c;h5pKdgxmn+@pcsrdvzKR`LhJLYM||%bp|49;hD38J;6f`Mwm&S*Td`
z$UkDu!npaD8%H*ycM)>$IK)^@gQ5(BQE7;))1J*R4duZj;_^YNJ25csDRP*w6zDT0
zl<7lZ26(W+tQ(^wjgM0cqaPkIE|fhxU^YZfFCyrrBJ^0p;+stVq|>=YhI{>K0~tMd
zBWk9i-(=s!t6scS0uS5&1LbGwZd`M6MRj-*TCf(nMYJ{75(VgN>J7usMzZmj62p%l
zsbz5KbPB|ev!$N(m@*ovyz8&`aXIOV?p~NjHcA06I;-V3(u<{NmpjyGj+^6aws1J*
z;JS#`!t<8htiEeMDlHfpdUYw9{7KLP2_cB%%ur^QKD^4jl8WUgi^X9XESY-7o0#$$
z(8^S3jvwQ;bUBz)S;xalW7^TEuV28Wt6)E#&@fSnDyrz4)maZl3oBt#`~E$t&X1Vb
z`S3s|U6(5plKt(NwrM9nXCQWZ$NGnE8S!N_TghFpZ>>`5y)_j*8gp4a?feJ)Bk6pC
zVA`KlkxZB6A*{R4C}Dzt!FxJ?wI6;T$3KZI&`#00)B2v=SPVnU^YPkRda0K>>n;zo
zdEAU4w|vS6OG1wkPNhmI^^$83z|F_DGmOdy_RG1(J{#bJj?Huwse_zN9~jN_(TT35
zL3Jt~vz|W(971>&UEt#fi%~YwE<lMwrI&2&kXn7AiQZFoox4A~DUyAOQa>z%P=rW0
z30F@F`b<7%Ra&%}0-5{X@GE&f=FZnqP3v=LQg`*@)f`{y*mT-zW*&`LGALNDYG+D4
z`;+7_$fMUXhsnX^r}pZn3a1}p5%7SPN;-?|&p1P4R4DQE$zi1H$%WZVfdj89(z!(-
z*=mjC>S8O`q)gWDsS{Cv;Mm&}EoCo8n9b}cuZ1*Av?gOG_{cN<Cbl^V<u?$_-UH7V
znUT#{_=9n*K#K!Dl!q1IuMOwEW~7;6PCws*@OHt}1v>n%57jTS+2=p?QufbErJhZ5
z95;7`(<`-4YYd1M|5;tiH>jpN=68Ndh8t+q()t2FHb0uE?*y>fMy$K9Ew+Gj;I#8J
z^&wCHFq`t4r_V(O?R<=IEB?hOGu&|TakC3SiE$by-d|ori(VPaGNdLDFA&@M4C`_K
z9V8{dSjicC_v#GMvA?8<Z1JP>x=kXLG4Iuj@U<`#;0~s&yHimHcZMx<eB!Mgw7OlS
zrH1dd7H0r!^_Va9ERfXO5_psf=1{cuEZOXm+ifNX3C6@G#grE+k(BoM^oV6RDa%@=
zf@L2mU#$8Lh%U$b*ORYex=;-7>PmGyk*2S=98US|2>4uU9*yMeqs(wUArp6xUY^T+
z1UZ6CiDKZkxU;^%wrOb$EF)`Do61jFT<wGMHb;=PXq8Db?Wl;OsBbKm2dE1ww&Vd3
zh3dP7PFa<k7A+=D$!b+((<)sJDwAPnGrzUP@kIx~nllc&l3L584hF&ltpGPP-#CIB
z?it;#JV|}LOGNusD9(So2jg}poZk74i&`-Z1R5|V&@j`Jsb?Lsa*$ImEwVA2Hdpfq
ze03zt8YnV+9yT(4Q5iw=WOpL?owa6M8?3E+<{fEKS%(YqLiS*wdv$CH`zr}rN1Rq{
z-Rfu27hShJKy@9c?A;oAcflZ}((!ZpEuE1np0fgx0%a%#zSEf8^8`Ks?I}|}Q=of?
zxdLX}Mr39y9F0X3TjEZQQ~q(RvIM-<)h_Ncrg1;z86ZV!ABtn@`Yss`y{+n?IXs~5
zZUF>sY<zJ>SAuGUF7Dh?<^=8;h~DMt1;p~q(V@mMK}O*eX_m>jpE2(YG~7|=D>?4F
zi-Age`Cf%_q`YT^q^Jxiz2!sNJ{5|$Ccs378%IXqru+8bZ!<r4jP6%8rsr9UUSEEM
z=FFqYqUST4ntn+{{6cKJsj+YE=+BHj?6K;iY)yR@&g=}2k7s9Rk8Ao~lpAx*v<mW;
zu6)_O|KuX2RZSrHQkJzn^t9Z#zvOxJwjJ};-EH)_LEPzj0C(!yU1iO0_E!NyDS^Js
z<2cwmVV1~RK<YND;yp<qVL@-DxOg6vFdMdYnTp@b^t?ExDUZTM;7|tm?MKMOr{z{w
zb9gApp$#*Kz|3+OlG+hYJ;T1Gk(fO$?R>Dl36d-_xoTD$qf@*#;CyFvI2~!`&39(Y
zUY=shl0{G0y3(GZo;(NaU7<Ofw_<#%!p>Fo*cO&-taUt#TzN(tU^OZSfm2omgMpZ>
zC+@dIKO^~#)qTe21t2ENZ52a`u61&nALTl43!-u+TV|9raB1dmGNCzLQ!iBDEvA^j
zsSfyHprKNa`S00HO-TAcDTG;gkMJk|ikH$f&mLtEh$pm_YvrBs5_H&j=?#6;Ld-D?
z)}`DRuzxe(zk~HM2B^-&S!tG~i~J~_YNZmaf4zUZv3Gu~`{$T?_Ufg|w8@x)0Wzc<
zX$dtSH{0Up?B+OR@%kAe0?S(*>nMCFWiXJ6B@2|np95HVtXcd@#(Tk{jYp#NK95~>
zp0{iHG1Ik_8cALkXNc%j8REo2DV;t)m&7DUI*hoLT)mzAZc3XHY3*&s&&FpzyFgwA
z1hG=17(&X0Gr{HIA-HDQTkwz6!&x9Nx@G0LZ@-J9IdBq{(+24EcD8grE{oC5OJR$@
zayXmU;U`a+`uViQuz1y4Gi`7!k+OeFJLgND*GiOug2~FP-DE!fVwwnQ0Og4qNo52(
zI+<>*X=)Q0{i$!_;*wLvkW{CGY&s5UM%r<rtCqf5rEB;MnD~|sBG!MewC_=|d7_Wd
ze;=*8s+vtW-@+QiBy+PxV?%Y|^JkzIt>{J%59$NmFrDJ;JtxOF@AZ%!XmRTZ5+>dH
zk$li_uBra}924<XWBOXNSF}+RxB=kDgAn5o9K%`iPc1tiWrl3KWXa8{yRxsHJYBp$
zKy%(#9yo~(o?l~#TQsjaJ)`z4(SBx1Kxp<yX?u1v_-sN+o^0ZE{gkJrqQDgY{#pwq
z-R@!XFS2BxtRz8`1GIDxTA15`BAQ3NLIl`aC*dM|8C?qqt#v>LyUNTw8-lAkDLct~
z#l|~i@#Ca?oZmrpd{I%gX)5Y%1N{ANHOT@`kh>HTg=AJU$`VEQS+kuAOC=3lunl$x
zrVYH0{qbDMf#SOq;b6BE(<+U7iAB6BaNA7Kfpf>s`HKcGim&P(FI;2$tDH}<iZDA_
zQR0MkG6=N$`BlgofC$`x3I0KzvHv2?K_ZMnz9gjfkF~dJY{zXCBx>H)4f%!_ux&=G
zbUM-7-b(DngkTL2OQ<iNM`;zKEdT0@7XS$oAii3<JT$HH#XOx%pSr)KJz<+FFwaBR
zod#^;QZ!QEO0?n&yuHE@ISYcu+m9F*2E9rrUB=2RA2^Lx!i+L>^0-L9m%nHFP(gl?
zDKP0osCq1V&JbAp2hG>=;Bo7lB!A1#VUIwLo!MC#vk8f=`H?ES)VD0v@0hW}Q9QsI
zp5?9VPoglGSy%|VhaqQiRFOWGNlGaZ2kedORk|M<UifXE))yrcuj0iln&?z_JyUw(
z775K+n`}J~C}OE~k0T{C2Q+tH^+P=$AjC*&&pcyTcc)`{L>||@TC<^C!!5e(648nD
zm&k^jj*EZ25Q3*v6}HZUSE?!NmfZ@n`lKh~>E{!Upzno(<V1Wm;hbW8N;j|k`kq$5
zcs%iIlfMYPNw=nA>LU<6ipKd{CRGMWLO=ne4xaI3)9W4))g~=b=R=G<6-BK}PQz1}
z7xWFzc%SiACPO3M^(LrhRAZU6I9YAgY~~(0>KV9t+va`mgTzi17=-SzFU#Xk*zUFY
z)C}q4ZK8&v)_LrGarF&i*oeMoFgMu|Lu^5&4AT|UW=J%P$zU4=@vs{+l8rgWVQ0{f
zx{A>=N@8?E;>!>Wac0gRD_7p|=>q3DT<!`-UYgLACr|w3blr;#Az#tIq0j-!;MjZc
zmY^NU@pevV^~DG(ugc9U&q?5b(hdKL<8YWFV1_&6Qf;MEo{c?Tg*1m-8>`fr(@8(G
zw%j=BT}zeZXE-8F){4UyFn=$eGTL0x!7B2(ab%eb_tc`O^b4Ls%Eo<lFVB_I>>tsp
z$-I4#Nbxr4w{u|=nkAr<s6asA-h0_4&?_+oandsy_|dD^bfGT+w`C#TVCv0uBVtzN
z)~2~ro1v#(={)&z(gH3^0`x)!bVCL@uyNn$xd5b{mIlT!AS&zOa)QP@bHoQa7)HB8
zl>)rFsxl>8ymLv$bjn1Xv*sU_cSu!G%Kas;pqp5*dW%Sq7mv9lp@J!BoDbpG6lO3P
z0#uJ*U0|w`@EmnLB4!K)9<b8^;tm3JXZpeAMhum{)7Gd4VlCzm1_F8JYsc{;O~~+j
z%x90FSmmwVoY}w+lZN(xR&yQVN@G{*@QUbsOR~;ALk(sFju}Nhhg70tE4=}tS6N+b
zA>nnuX9;O~bO6*n3a{C-(6`_(f`lJX_kfP~j1uK$#NP_c%egIOQ_p@QhhT7fx-@5f
znbti+C3(l)m|uqjzn#xJyuz$@TOKAzZ$0a89NAE!7{R~e!lv(4YVRw08{OgG(>MY`
z9Durp*u`o6xl+$U0B7<@=_b)a;U=@2F%bU}8{#xg)mK5vA$ThuFEX!!TUc#PMEo=^
zmZe6zLrODke}&%pQxP|82ST7W%af7Ct9X-H&X~vc*@kwd076ifHyHT#I*&`Fkc;Sk
zV^GQ6;EJ#}^pe6Lat^daAQ0kSq#86#R^D%`vyAsHZ4FJIQ%8%{w79B}ok;tgbTs;-
zipK1n>K7!$UANx7=#R<8>9;eRLzQ;DI-3MrQR?FTEpr$-v<hHNOK{p?H`6bErMk<R
ziLHxgLoFaO&1jTRJqayE-`62sxZ&05XL>mA81{8jFH>-y&O9w-H7a~7qwMX=nMugV
zQ{I~QB-|3f@r5u4()_&YDFH42S_6{Y&N-FtJ)mf^{(=WB1lUa|`W=ofmXTt<%GJg~
z=3wA2<Zh%Ta~4dY_?(ggNxShD53HjL)@4Pft6^fY`B=SlgtV69&?xZaPlElJy-t?E
ze{0@Vi~1@w&pwARL+CJv=JH)Ij6Si##59kKM*8Qkd1>m;QnZO*%J(%+RZQE!Lkb5<
zngl=&k{A9Y`CVZJ=+|zzSy&s*Ja+|q$XM;2J!E5Qo!1tKAI`c$@E+I6+E7uX?dt3A
z83N4Zh-O!Ki<TL;OWm@3=U@8vph)VmmRsRyiqx>Pp0Gi=LsjH>f!Gw`ebq*p#`OEg
zsb>l^i$Jb3)Hs3}j!MLGT;ceL4f!734RBnw;E>RI4(CmeqU!#8G=Cg__SCa}@ZBN}
zwR2C$kYrM9J?Q9HlXB^`d47q;>2Ffj;Gk}FN{Ql_&P|jKgO8;dRr>0#QHkglz=52n
zDMq#1!s@x_p2`}S#5`<1>>hahGC(q%M9g7$`>{YFLi(Dd_7POJCGVW5VC$EIkF6$w
z{w`x8ZyKRB73>*XLDlI2u-dYL24CQrxMZt@cw}D(FF*R0Ssquz%kJDyxUr(a<P0Lq
zgp#e7n!OU$Dl`|rdinh<nVgix`WW2CH9N3*RlsAV=H1VnclWO_kqC*jEl(PaBkN<D
zyh%1<m<!&M5$X(~<l*As$*0w3#bfDy*qYr;iS`zw<cL{FI()`4zhp#?eGyFZ`8@EY
z7Zo1YxbBXm()QKV(4wajUa@o%Y|r4gp6<~$fjZw&tzhQ{Ygk4$>B!XEkb!;_;K+Xa
z8u;5H4NyHXG~<7NwxnQ2cF1s80Hk9=kq2kOB}t>oEH`dAKKOg|Bx(w$GEcJEpG14b
zw!X+Al5sWGBux#aU&#RC8S&IJ6_x+1k?a0vt8L>UHnm6X6{Kd3Ql%6jQmayXD_ZqX
zp;qkBR*V{<c6mgoy{Ro#qxNcR7PV^6TCMS(=RbJ!Th1pr=X~ySpZor<>w*+0ee?4t
z+kg5h&n=PthB=^5pWSShH6)d${0`ooRH?Ek>r*&jbDz_1%r<R1w$q#4vm<gtCJkhU
z%TGI=mz!21WWC*3tb@yzRL0uNvl3tJ8pV`F@4Bj;>R5HZF!FhJErn%x=|^|z?Wct=
zwPtKfFbb-Oj06}>S!eWN0E|mUoC}j*O$WD5S&bA)X)lwNEDZj8ok<(q>?oDo<KtvJ
zqHs%qEoUjT%<kl+Q_;83@6|)^8Ix8JOu47d4x%UxI&p0o<%XvF$P!NfER4%$ku$DL
ztX+XGHz08CAG{=63b`-;IQ%Yk*G7w#Wh=gb_-yOje*gC$8Mh0$^|mIy-eK#stD*-q
z6<EP8z>+JK1nOth<1y*d;2gk_PzPS^aO|nCN|lUI`hlPR!oU+>6FF%?o2)g{F*=(B
zm%-wc=nc90QUHu=lRZz?Rj2?qpT@bH3*|qD*<8yI2j_`yIkR~=N^kGES<@JQ{n{&3
z44ZIb{B^16k!wJ>Qt7{V5kr8q0W?A#KrSzNW?NatDpe&4%blIN+XX5*ILG6p*ao;7
z;<Ch_2R6S-s9_T?`f03hl<APpKo_(5_c5*CO`-Mb!1`3T94SB`zt*bFnu{jv{*Dg#
zhQL<s#>)QwJ5N>oS1om2Ie-Oo4Q{>3m3s`&EOH6I5`5DL(BEZ=6v)ITd^rAjm(xJ8
zSGs8biG6wpiFyKhikyfoLdSZr@6thVE%&m47@qO{5i{Kte<N6iD$TA|a8qR$<Nh>#
zpW;-)I<u`bE>c-mROng-7ilT!O)Mx;H!iSBPIj7cH0+ksF`HraRi1|SDu!u*q<Wux
zobOtmecqkfzm=^xa-_H<rpml=i-jC6SU=-mLgk%;4yBEr=hyjd<v|<3j_{um1H>O~
zxADk-qg_cqzvrFo{X(u@(nY-)_$M%e<%P=8G|&xj^1r?SECT(4UWaJPupo+oGt|4Z
zj_&HAYe5eSB^}m|&v<?m&%QpuB8vlkqeKeU6zgYZnGLc(ilJ1Qv4PMS*V|Q(sqon*
zNuCi~{AAl)6Rt`E73DEnX|sW)JLU}a@8zAiyg5;gfS}w{7obE|*l?6)l+--^MkwdN
zoR|Si%lON6#)|@MJzA&qzb_d(mhZs^KH0pgYi#^cJ#<d8_w&iIe)p3Grz|b;U2W9m
zJ(#QW1G;=EiqLQu6X(4n>F36P(8YSNwd%xG!?h87lcQY&DLK<gDc7Ay2<%ZO$rAXJ
zX#B_RRErB^08G%wUla6GnmV{{z9yr`7m*z6cwfx}Gtf!SQU<%_^ecQa^HE-9=Udq%
zi0<%;-n)KI+i|>!nKtjz#NSYxjuE0UkaWcUOl#*xNin0+saoT7O+$DNEkDA7(>oqn
zPeB8yfds>yHxDz1m^#*rWgDgK$ajH|%%3|p@~>A)D4w_dX^Ej-X}mg3^l1u}jr&fz
z9pMsJY0|!411q-Uq78TzKp;FI^i{;(GAQChFs5DHANZmj{M}6(cMS<tSrCN?_yLXq
z%ag{+D<VIm{Zm#2VJSI!GvCD>ThFTIQ-Su$HUKA9MCjJAQ&;iwO<;jA*0p(`%~(M+
zvhA)6Q?5L>L!46<zt7>bdFtZPX*B`II)HFn<h}xS{Qi)gw`cSpg#$|_+T6;DJ!X-B
zj>Jbi()hvPrTf`e2(OAev%04Q+DdD=y_Y#^nm_O1C3Il6H8(ZQ4_IB3z%rE+c%mdk
zf9gcg-`@l@56Du;{jI6B3SH}%qElZ5q*9ov=vMuYr<CR6oc4|o<(PoK^SRa=fMeay
zX4b>0J1Q)FF;+cvG_W!~sg3IlBi&~7Y8=6|gwFzMz}=;gV*oIHV7#y5$hDNvPM;J_
z%Y0T`=W+TEnNfljZw|P}kyGm3FjFRUwP5>(>W%H26Nv-i$pBxkj9dHH&eBl{&LbWL
z+o|+(pNJ1Ix<x2?_Kcw7lJdaB?uYpTNTv8SQKy=0{T?O4?zIA4ELbl*9|*y=kOJjg
zHU~()a2Uz5H@uZ1xMR*v?%j=jqpq<9i6t&H?U@u(i?80Sg`as}IRaHb<A{<+6*^_D
z%DnmcM}>re#VFwgBip5LtbzFi%u*Saft2Y%$kGR8IAwK6O`J~wS-rdQ>y{*y0)0P6
zdLC)1StacW>PovHp&+rl4QO-nL}!}flY4gynSPN3r3QVzZIJTQzS9`XQ0f`?IUYzH
zY{=y#-v@vn6I1!lsxI$2z~a=nKZooThkgxBAI&$?9*>)s_$Q(+j<h0-Q%IbdBNXFu
z(I(*)DcZl+9<C_F!p@O;uVK1&@E3s_sTImy<=gd>9lR$jl4}oZt+XP*j?{^%vg#+`
zcn?0~6Iv^`rfZI6EWZP%Q!|&0E8hK@Je$V-=5iu1(sOvtwY6Y~h$|TX%}oY=4?0gO
ziFMQqrIX-#YYM;g0?WmFG`kq$+LFWx$4_{Cp{cT^rCt%k`R@Fwfl14qQvf_FnG+L9
zK1Kr36cYDHs<u#O$Ho`BwYC1?006ZkFzfUxUcZGBt|^LR6C%>Y!y#MY)=r{*wV29g
zAwj^l4$;&VeowMowr5MqV|604*nd<fIG(oV<M0Ff*+A2W$<yDx);P&qa3$pJ1IYBS
zP`2SZU%W@VMGqtc5UsAcmWz@Tv-_HWaKlWydp(hbXeXPz`lwft!+ccLlq8br+gZ`&
zL{?IK+%uJi4Pbogyl)H&rE3mv#e3}9e7BF;@`MGorQw?pz-*N9HB}phO&<(2Na4$V
zi1j$;db_{upm|^E!T2q|9Gipu9aj@m_<G3cKR2HZO?gmo@>a|Lr4-KD=y;j&8R+1i
z<nmy}Ao&b@nj}ST_*j-f1yBs6OGnQ$i^{6$_90_4XS<PSGS{hnffy-OQ~%K52e?*N
z>Xj6EzW5Bt0^Fp!`9G7GlS9Ci%1bD#FOaR}%w&GuQ5WIN>J@9XsIXWKfSXb`Iy1>(
z9igM{CECTjqM?EBc#({r<H`r5NnUx>cc}-UKEBMO)_Y53$;aUb#L=5kwxrv?rq)W?
z)co5Lt#(?XD+=#(qkwm`kE;SriV6z%vJQ_0zG`uLHYJ#j*zhhFeE`A_t`ws%%k6<2
zos!2_Oh=>gm>u5P>}m3~s)s`h48VDy|5O@VmdTVf@Of0$Du0@Y6a}D)0cY~c&10>3
zi5}xz5RkTKe-505b47bE9{ZJ#`)Je?)S}YR)EYautPA_J_6YxhwXN*SsXCzYn@X?M
z5}%TkBLE)EFpvU)Lvc1@J;uL;>gV=0l<Zkt($j(&_wO<KN1k2-2@DiR)__N1(Fp^S
zJzB6c@InUf8mfwNAihkH7E^9D)vc-g<A|N*8g}5k{^of>v+iIB0xT|b4_-kln7=7c
zN?+ilUv*P9R)KAnr%`<=;Y3iEH*mDBR3e<RKLtVwx;6}lRDS<&t!pgHTV@p5yE_(M
z_cTBtb<KHI=>zAY8^poPIzlgy=os&jYX75V%N)!h{LRVh3F)|jS5xRfy*4N1u0|Kn
z63l<m5JFikVYNkHMZT}6{RFWj4@>-L)6F}q8xB#2vku%rxW&qu(YjJ0??35M{VhZg
zy=anF{dkGt7u3jglx0{T+g_e}icVc_x-yDZ|4X_ElU%011k#H7ORwjdsds%6(Cd{L
z`F_POj3aY};ey!p9yVF}Hb9RZNn0f}ULlAJ7(UsAVA)i!=+OK-#-it%KpCueG<UAR
zQp4V+^2xZabCAq&KI_vTYZxa0q;=>c<RYn9f!fW(35%Y)m!kf3JNa?0$Iy@-b+OwQ
z(8U~Jw<s$esddUi_bPTI!1_L)jnWX6UG#A+B|Cm|5M?Gr@%Sh#W1V)6>%AI3^?uje
zAq=I-)l>6p;}Y@{@=eX`&=RMtFp0-Fo~XJ_Uaq4r_9W`NC4X>0CWGE_EiwKz!acbc
zR7t`5sz?D>rkN6ANLT$d0njSeYJyRdAHOo}6Vu@@D26-bL^nQ~v$z!Zd5hkTcP1Rd
z!3+Sb{bTDBm_RX18!)Wtpwz24a3?QV36iH8&9?>=Eu3zBGy`-Wp@GUo_L3oLx(*Rk
ztoY^D!|y9Hi7QtEh%<f=9AHS^8MqZ`UBewBnNA1Ez}Y)Dj=a2R@A9P8<bKkJq(R^W
z@z>cEnz-^1`<Rewdx~~@zqYT|(F4b)TERHPHs3DAFv%!aawb%T+@9IfbHBlYBLE08
z`IVq>s;qsvbWhH0XnD4$*2G*+iK)iKV+Qlt9Y};f-+q`ykKAP-MU-Mka?n^ysdkvI
zW?Fi@$-aIGv58x+ia3Q_lmV7olLm&JKT(2c9O9;oz2MNN`EQ<u4N#R?_EwU+4?Xg6
zM5@JM;4!sy>W<Ut;wr)Lcgl#Im?D0W1GQli`tko}_VCrxr10AYKZAAVSVl}#i?~C@
ziOz*<H+GagF{Y>#@C+XHK+v3t2ClzFh*uUp5`PT7!Yt{@Zi6<Sc{^yPS<p-o*;d8J
zfc30JU?#CUapeQ?xr-Ff5@5OA!Jff=NzE-td7@lY@e2<OQdVJP+``BGS)u_Mu^5Sg
z@^T=mc7sy1cI|3Id65s`e9*0Kf&LXG5FFz3nqqO%qG#bai-Vyqp#}y#cVR+>-@}Ns
z^ZVnJL9R`Mv6~&2CQOiXp2T7hZjST-E~<@FUL-ZZ&EU((2E66^N&<q23@SmH037z9
zQEjD=2%<-^@4o_|>p(W-l>AD&Ds)-HOElH%edvUOu^Fjlye4yg6eJ+yx$gU;SBCBg
zwXRJS(FV{YI1P{~TDCiUnC9AAsRooK4~f%6Uke?>4wp=*#A`|a2Zw98iiLUJfT8N4
zRKwrfTOjG3($BxbId#>u4o8@LfqG>RE!>9Q5Rtz+ZedeNkHtj<w|YV>$7WmM&RB4X
zm!@I?Yk63q;oY5!^AH03w43dKyyePu@gZ&}@@s^Tp{h}bF>tL6NhOfo1LiNuU9(u}
zW$S+qEGa<=q)%1C+L;@NtA{q&G;vX+VS<)n5Z7F1#J~CT{{VG?p%lRk`z-BW&4{sp
z>lPtYj=RzYA`=b-icnKrFtxGH9|Q8F6*gidb@GZFEO<5WlKpvX4babtTbOAPSr^&}
zEXOQ*XYOrmUKX3VG(^=!NnlI2m9@ujRhDAIOghc2XtHBn=KfvaF-WmZl2jspfn<Lw
z_;c?UdT|oisWbNFkF^g~!t$;*BnX5fIY4nNXN)MLpw|ligrNM@PAc6c_u{)}oM?ZA
ze(Dy`2kOJSMekZnm`VfMP;&$sNdWN@t~NBfIFvQ&M~VPLI`-=aYe*J1E$#+NA@v|L
z^f8c2u3;6t!QB_D$3@<yo(YJvZgC@z$meJ;K<U&rpgCJvvRe@J-SKBZKbUPi?xCns
z58^|${_8lRuNa23{yxKOBb`te*#_8vh1gTu(y}FcFi@~^w_(~w);?|vkUCk@O0o~-
z9iB-#rG`oXf2=dQ_e-L4!y2!5#oH)fwkHSpc^z#pZzPq_f%lzC11#@I9>J}BswLh_
zH8YASP^mZy!d!ir=*pmf1$CY$=}4}mu$hQoL8(jlUHrTvzKkMjs6I1N_wK^pj0^dI
zJ<ID)mhV5(t!UYr%SPvPsK`HCQ`tkG{2e}@KjlptdF44s-c%h;rp(?LU(_0E_%^<o
zy>YsK<+yuC<E>PmV7F#7S-OV8U<vul=yp}xNShZ6I_^9j?R}7GL<+{*Rv2+YYD@GH
z*@#2_k;yY$`lKr*J-!gGP#K^gPz@H2eO-r^-bSJo#;#q}ZkN4*=fG1X<qz2k=xkDV
zy42eAN&|MUC`1*9*7iQp*1T<`JcnFLh}ztu2R;6RGtg<pr#P{!#asyS+5Swpdgp3!
z;zdjA&6;#yA!_qmoGNn`CM(!AA6npDlWj<-G%cxru7rYDCsuemA`B^a$wVKwdAq`w
z&<?Vehp}Vj(1My8Rq)i8YL2h#<ZG<78~yBT&Xh@}FKI{3qCEF+TOQUi0Y7T)48GAA
zlIW>UHYmkD&L$<=t0+`?HD;4|>_B-tQgZqUtCHdi1~<}}*FK_EptBH0T(-F+LBh?}
zpeQ~<H3^Aku8Lddx069skRbmX7dQ3VR^|Yj#==}rOA|?gQ5{wwiX{m4fm!5N&*Vnd
z1<4#`nV=s1&H5PRrtrXZA;U>`ZMWthhZ|&fXr_#SF#SS6vFaOLuq~+W@q50ROBdP$
zlb{btCC~!dS7>lj{N01FtBa@AiDv$NoTs2?AU%vNu@rXv?+@p`PvZPRl4EvGd}D7M
z1Ku0;syT>M{kz#=%UVEZk@|~yhpO<<)2z?BThprT5>s%<_(bcX(<UXVmdAq9oien<
zqL+w7^CZ>#Af&$#Gz>p;5SeS7-!T<K3%p#EBcP8CZtmY0>umV=5SOi+@;Hko+b_l3
z6Wk7wdpj?v*G%cv%7QicX-@LKiAPM~%jh+=Dt)Vd>b4v+TLBM$ClC0-RFd$w6w)^h
z+o<*e$Cc&;KW_$G(3Oekot$`O=QX|J2fZNgS<~CniCNt{n*QC;{3DA^`_>K3!FB0j
za<m7z`Z)_;esz{;i0AvIfR8!*Ml8N@Pbdf*qdt-((nf*Bvx-b>xWBYqaTwM5Es$xH
zn!-!3eT%f<P?)IC^$UZzZ%NylvLILWf`Dfww``Aq+RbW&oC+(FQeuKIO02+93=&OR
z{o|Q*VcRa)PRy#ukDDh3$+{ANhYxx$I+ORoiJB^c4SZU>q#Kb(*f`t?JAV`h#vgP1
z^gHxn(&uUY-(~H&U-&)mD1vG+FKP(ADAb0Ocb&@_*`lBWI|`Y6m3%)%rdo+)BvE8b
z^#Bibx!vh5#<w{rM6;kss}AM|>9tYbib0Bt3{GHf!E}c8HzzdnkRLhBz#`<p@e;uS
zL0I6=XjrP@q}T7Ak0hrc7l+(iQFv&9*%A-M-20K+GGHCWM{&n116!vUj_ms}_!OPQ
zHSO~_4>@Du8aurs{_qjZX}FMOO>eSr43f(rofjs!VCcYXOkOk-tnI#YPB-;1)%_HP
z#iuN5q<g@Ad|`q$)k!aQ((vVR1iW^w_-^of!)q@e`cQdy70r&~Kq;e0P!FZY+fz59
z!oftlMYw}RRgC2HVmNT^r)hw|O|`Fpmz_F?In^1TOSB7HS#E>W$kasi{8UiDjlb(g
si=zD02Id%o^-_a(h}i${!y|tUI)_gl5cvILfNq!|gtj59LenAQe=aXng8%>k

literal 0
HcmV?d00001

diff --git a/packages/nodes-base/credentials/icons/Qualys.svg b/packages/nodes-base/credentials/icons/Qualys.svg
new file mode 100644
index 0000000000000..cccb850db6805
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Qualys.svg
@@ -0,0 +1,9 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1271 1512" width="1271" height="1512">
+	<title>qualys-svg</title>
+	<style>
+		.s0 { fill: #ed2e26 } 
+		.s1 { fill: #ffffff } 
+	</style>
+	<path id="Layer" class="s0" d="m634.9 0c413.6 0 621.5 221.1 621.5 221.1 0 0 23.8 163.7 8.6 493.3-22.9 497.9-629.9 796.9-630 797 0 0-607-299.1-629.9-797-15.2-329.6 8.6-493.3 8.6-493.3 0 0 207.7-221.1 621.2-221.1z"/>
+	<path id="Layer" class="s1" d="m556 997.1c100.4 52.7 250.3 91.2 408.6 111.6-26.3 39.2-96.6 106.2-137.7 128.9-189.5-31.1-356-96.7-469.9-195-121.7-105.2-186.1-242.4-186.1-396.9-0.4-123.3 48.3-241.6 135.4-329 87.1-87.3 205.4-136.4 328.7-136.4 123.4 0 241.7 49.1 328.8 136.4 87 87.4 135.7 205.7 135.3 329 0 34.2-3.9 68.2-11.6 101.5-7.8 33.3-19.3 65.6-34.4 96.2-15.1 30.7-33.6 59.5-55.3 85.9-21.6 26.5-46.2 50.4-73.3 71.2-74.2-6.8-151.8-27.8-187-47.9 90.6-57.8 208.2-170.2 208.2-306.9 0-40.8-8.1-81.1-23.7-118.8-15.7-37.6-38.6-71.8-67.4-100.6-28.8-28.9-63.1-51.7-100.7-67.4-37.7-15.6-78.1-23.6-118.9-23.7-171.1 0-310.4 143.2-310.4 319.3 0 146.8 77.9 262.1 231.4 342.6z"/>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/RecordedFuture.svg b/packages/nodes-base/credentials/icons/RecordedFuture.svg
new file mode 100644
index 0000000000000..65e5c7606498c
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/RecordedFuture.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="500"
+   height="500"
+   viewBox="0 0 132.29166 132.29167"
+   version="1.1"
+   id="svg5"
+   xml:space="preserve"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="RecordedFuture.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="1.0582793"
+     inkscape:cx="154.49607"
+     inkscape:cy="295.76312"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer2" /><defs
+     id="defs2" /><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"><path
+       id="path232"
+       style="fill:#000000;fill-opacity:1;stroke-width:0.556055"
+       d="m 66.134978,8.3391846 c -3.958286,-1.547e-4 -7.198432,3.7746914 -7.167,7.1407194 0.09844,10.542557 1.81e-4,17.701735 0.09711,26.402771 0.03749,3.365674 3.208018,7.140255 7.165859,7.14072 3.958288,1.54e-4 7.164845,-3.774559 7.167011,-7.14072 0.0067,-10.652222 -0.15297,-16.586224 -0.09594,-26.402771 0.0199,-3.366116 -3.208721,-7.1408741 -7.167007,-7.1407194 z M 40.106906,23.262633 c -3.958286,-1.55e-4 -7.198432,3.774693 -7.167,7.14072 0.09844,10.542557 1.81e-4,62.783923 0.09711,71.484957 0.03749,3.3657 3.208017,7.14026 7.165858,7.14072 3.958288,1.6e-4 7.164837,-3.77453 7.167003,-7.14072 0.0067,-10.65222 -0.152992,-61.668411 -0.09596,-71.484957 0.0199,-3.366116 -3.208714,-7.140875 -7.167,-7.14072 z m 52.055,0 c -3.95777,5.75e-4 -7.198437,3.775024 -7.167003,7.14072 0.09837,10.542557 2.44e-4,62.783923 0.09704,71.484957 0.03758,3.3657 3.208017,7.14026 7.165853,7.14072 3.958301,1.6e-4 7.164832,-3.77453 7.167003,-7.14072 0.0065,-10.65222 -0.152974,-61.668411 -0.09594,-71.484957 0.01986,-3.365784 -3.208083,-7.140145 -7.165853,-7.14072 z M 14.127955,57.05742 a 9.0884303,9.0884303 0 0 0 -9.0884065,9.088413 9.0884303,9.0884303 0 0 0 9.0884065,9.088413 9.0884303,9.0884303 0 0 0 9.088407,-9.088413 9.0884303,9.0884303 0 0 0 -9.088407,-9.088413 z m 52.055002,0 a 9.0884303,9.0884303 0 0 0 -9.088407,9.088413 9.0884303,9.0884303 0 0 0 9.088407,9.088413 9.0884303,9.0884303 0 0 0 9.088398,-9.088413 9.0884303,9.0884303 0 0 0 -9.088398,-9.088413 z m 51.980753,0 a 9.0884303,9.0884303 0 0 0 -9.08842,9.088413 9.0884303,9.0884303 0 0 0 9.08842,9.088413 9.0884303,9.0884303 0 0 0 9.08841,-9.088413 9.0884303,9.0884303 0 0 0 -9.08841,-9.088413 z M 66.134978,83.268271 c -3.958286,-1.54e-4 -7.198432,3.774714 -7.167,7.14072 0.09844,10.542559 1.81e-4,17.701739 0.09711,26.402769 0.03749,3.3657 3.208018,7.14026 7.165859,7.14072 3.958288,1.6e-4 7.164845,-3.77454 7.167011,-7.14072 0.0067,-10.65222 -0.15297,-16.58623 -0.09594,-26.402769 0.0199,-3.366094 -3.208721,-7.140874 -7.167007,-7.14072 z" /></g></svg>
diff --git a/packages/nodes-base/credentials/icons/Sekoia.svg b/packages/nodes-base/credentials/icons/Sekoia.svg
new file mode 100644
index 0000000000000..5e5776aba1ef7
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Sekoia.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="500"
+   height="500"
+   viewBox="0 0 500 500"
+   fill="none"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="sekoiaio.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.89972337"
+     inkscape:cx="723"
+     inkscape:cy="210.62029"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M 250.05513,25.000028 C 205.55238,24.989116 162.04525,38.175916 125.03725,62.892616 88.028912,87.609314 59.181557,122.74565 42.143432,163.8581 c -17.038237,41.112 -21.50235,86.35388 -12.8268,130.00388 8.675438,43.64887 30.100275,83.74499 61.56495,115.21799 31.464668,31.47188 71.556298,52.9065 115.202918,61.59263 43.64775,8.68612 88.89075,4.23337 130.00725,-12.79463 41.1165,-17.028 76.25925,-45.86625 100.98563,-82.86862 C 461.80263,338.00698 475,294.50323 475,250.00048 474.9415,190.3541 451.22538,133.16585 409.05475,90.984876 366.883,48.803454 309.7015,25.072928 250.05513,25.000028 Z m 0,408.670192 c -36.33975,0 -71.86275,-10.77637 -102.078,-30.96787 C 117.76255,382.51197 94.214392,353.81548 80.310292,320.24098 66.406195,286.66648 62.770645,249.7226 69.864107,214.08148 76.957682,178.44035 94.461662,145.70398 120.1615,120.01201 145.861,94.319826 178.603,76.826079 214.24638,69.743304 c 35.64225,-7.082888 72.585,-3.436763 106.155,10.477462 33.57112,13.91411 62.262,37.471274 82.44337,67.691584 20.18138,30.22088 30.9465,65.74838 30.93525,102.08813 -0.0146,48.73162 -19.37137,95.46637 -53.82112,129.93524 -34.44863,34.47 -81.171,53.856 -129.90375,53.89988 z m -11.3805,-268.73999 c 16.44412,-10.98788 35.77837,-16.8525 55.557,-16.8525 26.52187,0 51.957,10.53562 70.71075,29.28937 18.75262,18.75375 29.28937,44.18888 29.28937,70.71075 0,19.7775 -5.86575,39.11175 -16.85362,55.557 -10.98788,16.44413 -26.60513,29.26238 -44.8785,36.83025 -18.27225,7.569 -38.37938,9.549 -57.77775,5.69138 -19.39725,-3.85875 -37.21613,-13.383 -51.201,-27.36788 -13.98488,-13.986 -23.51025,-31.80375 -27.36788,-51.20212 -3.85875,-19.39838 -1.87762,-39.50438 5.69025,-57.77775 7.569,-18.27225 20.38613,-33.8895 36.83138,-44.8785 z m 22.977,131.90625 c 9.6435,6.444 20.98125,9.88312 32.58,9.88312 15.5475,-0.0146 30.456,-6.19762 41.4495,-17.19225 10.99462,-10.99462 17.17762,-25.902 17.19225,-41.4495 0,-11.59875 -3.44025,-22.9365 -9.88313,-32.58 -6.444,-9.6435 -15.60262,-17.15962 -26.31825,-21.59775 -10.7145,-4.43925 -22.50562,-5.60025 -33.88162,-3.33787 -11.37488,2.2635 -21.82388,7.848 -30.02513,16.04925 -8.20125,8.20125 -13.78575,18.65025 -16.04812,30.02625 -2.2635,11.37487 -1.1025,23.166 3.33675,33.88162 4.43812,10.7145 11.95425,19.87313 21.59775,26.31713 z M 128.8465,167.30848 h 44.2305 v 163.46137 h -44.2305 z"
+     fill="#0a083b"
+     id="path2"
+     sodipodi:nodetypes="ccccccsccccccsccccccccccscscccccccsccccccsccsccccc"
+     style="stroke-width:1.125" />
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Shuffler.svg b/packages/nodes-base/credentials/icons/Shuffler.svg
new file mode 100644
index 0000000000000..1024dd6a8d58e
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Shuffler.svg
@@ -0,0 +1,5 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 0L-1.48522e-08 13.3913L4.40052 13.3913L4.40052 4.46465L22 4.46465L22 2.44001e-08L0 0Z" fill="#FF8444"/>
+<path d="M17.5995 8.60864L17.5995 17.5353L-9.90052e-09 17.5353L-1.48522e-08 22L22 22L22 8.60864L17.5995 8.60864Z" fill="#FF8444"/>
+<path d="M13.3915 8.60864L8.60889 8.60864L8.60889 13.3913L13.3915 13.3913L13.3915 8.60864Z" fill="#FF8444"/>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Trellix.svg b/packages/nodes-base/credentials/icons/Trellix.svg
new file mode 100644
index 0000000000000..e7be58a818949
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Trellix.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="c" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 260.12 218.23"><defs><style>.f{fill:url(#e);}</style><linearGradient id="e" x1="0" y1="107.61" x2="260.12" y2="107.61" gradientUnits="userSpaceOnUse"><stop offset=".07" stop-color="#3600ff"/><stop offset=".12" stop-color="#2e17ff"/><stop offset=".25" stop-color="#1a54ff"/><stop offset=".36" stop-color="#0c7fff"/><stop offset=".45" stop-color="#039aff"/><stop offset=".5" stop-color="#00a5ff"/><stop offset="1" stop-color="#00d300"/></linearGradient></defs><g id="d"><path class="f" d="M91.97,215.22H0S168.15,0,168.15,0h91.97L91.97,215.22Z"/></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/VirusTotal.svg b/packages/nodes-base/credentials/icons/VirusTotal.svg
new file mode 100644
index 0000000000000..3449afe23d969
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/VirusTotal.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="165.097 116 268.436 236.784" xmlns="http://www.w3.org/2000/svg">
+  <path d="M 208.338 254.089 L 86.453 372.481 L 354.889 372.481 L 354.889 135.697 L 86.453 135.697 L 208.338 254.089 Z M 330.345 348.803 L 143.208 348.803 L 243.618 253.498 L 145.908 159.377 L 330.345 159.377 L 330.345 348.803 Z" fill="#3b61ff" style="" transform="matrix(1, 0, 0, 1, 78.643982, -19.696911)"/>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/Wazuh.png b/packages/nodes-base/credentials/icons/Wazuh.png
new file mode 100644
index 0000000000000000000000000000000000000000..1254166bab570fc9c3e1ee29a9332f3253b4d167
GIT binary patch
literal 3494
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
KL504{%l`mY9k!_e

literal 0
HcmV?d00001

diff --git a/packages/nodes-base/credentials/icons/Zscaler.svg b/packages/nodes-base/credentials/icons/Zscaler.svg
new file mode 100644
index 0000000000000..cb38a9bc04358
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Zscaler.svg
@@ -0,0 +1,9 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1570 974" width="1570" height="974">
+	<title>logo (34)-svg</title>
+	<style>
+		.s0 { fill: #236bf5 } 
+	</style>
+	<g id="nav">
+		<path id="Layer" fill-rule="evenodd" class="s0" d="m1566.1 496.2c25.3 155.6-109.7 243.2-246.6 253.3-87.1 179.3-394.3 300.2-660 169.8-113.2 17.2-176.3-11.3-224.4-65.6 96.9-125.3 391.6-350.7 751.6-234.1 192.4 62 242.3-84 193.9-138.7-181.4-206-591-20.6-605.5-5.1 160.8-246.4 736.2-315.4 791 20.4zm-551.3-283c0.9 0-130.9-47-315 32.6q-2.8-1-5.5-2.1-2.8-1.1-5.5-2.2-2.8-1.2-5.5-2.5-2.7-1.3-5.3-2.6c177.2-117.7 332.4-167.7 465.4-148.3-80.6-92.4-466.9-160.5-688.3 61.5-273.6-53.9-465.2 178.1-454.3 390 10.9 211.8 242.1 344.1 373.8 308q1.1-0.1 2.3-0.2 1.2 0 2.4 0 1.2 0 2.3 0 1.2 0.1 2.4 0.2c29.4-139.9 148.2-465.7 630.8-634.4z"/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/credentials/icons/vmware.svg b/packages/nodes-base/credentials/icons/vmware.svg
new file mode 100644
index 0000000000000..2996b461a108a
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/vmware.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" id="icon" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+      }
+    </style>
+  </defs>
+  <path d="M32,16.77V13.8372c0-2.4818-2.4817-3.8355-4.5123-3.8355a6.7446,6.7446,0,0,0-3.8354,1.5793,5.066,5.066,0,0,0-3.61-1.5793,5.9389,5.9389,0,0,0-3.8354,1.5793,3.8172,3.8172,0,0,0-3.3842-1.5793A3.4913,3.4913,0,0,0,9.482,11.8232L6.5058,18.575,3.2011,11.0011a1.67,1.67,0,0,0-2.1883-.8656h0A1.67,1.67,0,0,0,.1536,12.37L4.25,21.2824s.6769,1.5793,2.0305,1.5793a1.9088,1.9088,0,0,0,2.0306-1.1281c.3124-.4687,2.6809-5.45,4.1078-8.4692a.5679.5679,0,0,1,1.0812.2437v7.4868a1.8462,1.8462,0,0,0,1.6848,1.8629,1.8051,1.8051,0,0,0,1.9251-1.801V14.8524a1.9177,1.9177,0,0,1,3.8354,0v6.2044a1.8049,1.8049,0,0,0,3.61,0V14.8524a1.9177,1.9177,0,0,1,3.8354,0v6.2044a1.8049,1.8049,0,0,0,3.61,0Z"/>
+  <rect id="_Transparent_Rectangle_" data-name="&lt;Transparent Rectangle&gt;" class="cls-1" width="32" height="32"/>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index b1f75df8a9b62..71985ce85461a 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -41,10 +41,12 @@
       "dist/credentials/AirtableApi.credentials.js",
       "dist/credentials/AirtableOAuth2Api.credentials.js",
       "dist/credentials/AirtableTokenApi.credentials.js",
+      "dist/credentials/AlienVaultApi.credentials.js",
       "dist/credentials/Amqp.credentials.js",
       "dist/credentials/ApiTemplateIoApi.credentials.js",
       "dist/credentials/AsanaApi.credentials.js",
       "dist/credentials/AsanaOAuth2Api.credentials.js",
+      "dist/credentials/Auth0ManagementApi.credentials.js",
       "dist/credentials/AutomizyApi.credentials.js",
       "dist/credentials/AutopilotApi.credentials.js",
       "dist/credentials/Aws.credentials.js",
@@ -61,9 +63,13 @@
       "dist/credentials/BubbleApi.credentials.js",
       "dist/credentials/CalApi.credentials.js",
       "dist/credentials/CalendlyApi.credentials.js",
+      "dist/credentials/CarbonBlackApi.credentials.js",
       "dist/credentials/ChargebeeApi.credentials.js",
       "dist/credentials/CircleCiApi.credentials.js",
+      "dist/credentials/CiscoMerakiApi.credentials.js",
+      "dist/credentials/CiscoSecureEndpointApi.credentials.js",
       "dist/credentials/CiscoWebexOAuth2Api.credentials.js",
+      "dist/credentials/CiscoUmbrellaApi.credentials.js",
       "dist/credentials/CitrixAdcApi.credentials.js",
       "dist/credentials/CloudflareApi.credentials.js",
       "dist/credentials/ClearbitApi.credentials.js",
@@ -77,6 +83,7 @@
       "dist/credentials/CopperApi.credentials.js",
       "dist/credentials/CortexApi.credentials.js",
       "dist/credentials/CrateDb.credentials.js",
+      "dist/credentials/CrowdStrikeOAuth2Api.credentials.js",
       "dist/credentials/CrowdDevApi.credentials.js",
       "dist/credentials/CustomerIoApi.credentials.js",
       "dist/credentials/DeepLApi.credentials.js",
@@ -96,6 +103,7 @@
       "dist/credentials/ERPNextApi.credentials.js",
       "dist/credentials/EventbriteApi.credentials.js",
       "dist/credentials/EventbriteOAuth2Api.credentials.js",
+      "dist/credentials/F5BigIpApi.credentials.js",
       "dist/credentials/FacebookGraphApi.credentials.js",
       "dist/credentials/FacebookGraphAppApi.credentials.js",
       "dist/credentials/FigmaApi.credentials.js",
@@ -104,6 +112,7 @@
       "dist/credentials/FormIoApi.credentials.js",
       "dist/credentials/FormstackApi.credentials.js",
       "dist/credentials/FormstackOAuth2Api.credentials.js",
+      "dist/credentials/FortiGateApi.credentials.js",
       "dist/credentials/FreshdeskApi.credentials.js",
       "dist/credentials/FreshserviceApi.credentials.js",
       "dist/credentials/FreshworksCrmApi.credentials.js",
@@ -161,7 +170,9 @@
       "dist/credentials/HubspotOAuth2Api.credentials.js",
       "dist/credentials/HumanticAiApi.credentials.js",
       "dist/credentials/HunterApi.credentials.js",
+      "dist/credentials/HybridAnalysisApi.credentials.js",
       "dist/credentials/Imap.credentials.js",
+      "dist/credentials/ImpervaWafApi.credentials.js",
       "dist/credentials/IntercomApi.credentials.js",
       "dist/credentials/InvoiceNinjaApi.credentials.js",
       "dist/credentials/IterableApi.credentials.js",
@@ -171,6 +182,7 @@
       "dist/credentials/JotFormApi.credentials.js",
       "dist/credentials/Kafka.credentials.js",
       "dist/credentials/KeapOAuth2Api.credentials.js",
+      "dist/credentials/KibanaApi.credentials.js",
       "dist/credentials/KitemakerApi.credentials.js",
       "dist/credentials/KoBoToolboxApi.credentials.js",
       "dist/credentials/Ldap.credentials.js",
@@ -200,6 +212,7 @@
       "dist/credentials/MessageBirdApi.credentials.js",
       "dist/credentials/MetabaseApi.credentials.js",
       "dist/credentials/MicrosoftDynamicsOAuth2Api.credentials.js",
+      "dist/credentials/MicrosoftEntraOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftGraphSecurityOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftOAuth2Api.credentials.js",
@@ -211,6 +224,7 @@
       "dist/credentials/MindeeInvoiceApi.credentials.js",
       "dist/credentials/MindeeReceiptApi.credentials.js",
       "dist/credentials/MispApi.credentials.js",
+      "dist/credentials/MistApi.credentials.js",
       "dist/credentials/MoceanApi.credentials.js",
       "dist/credentials/MondayComApi.credentials.js",
       "dist/credentials/MondayComOAuth2Api.credentials.js",
@@ -232,9 +246,11 @@
       "dist/credentials/OAuth1Api.credentials.js",
       "dist/credentials/OAuth2Api.credentials.js",
       "dist/credentials/OdooApi.credentials.js",
+      "dist/credentials/OktaApi.credentials.js",
       "dist/credentials/OneSimpleApi.credentials.js",
       "dist/credentials/OnfleetApi.credentials.js",
       "dist/credentials/OpenAiApi.credentials.js",
+      "dist/credentials/OpenCTIApi.credentials.js",
       "dist/credentials/OpenWeatherMapApi.credentials.js",
       "dist/credentials/OrbitApi.credentials.js",
       "dist/credentials/OuraApi.credentials.js",
@@ -255,11 +271,14 @@
       "dist/credentials/PushbulletOAuth2Api.credentials.js",
       "dist/credentials/PushcutApi.credentials.js",
       "dist/credentials/PushoverApi.credentials.js",
+      "dist/credentials/QRadarApi.credentials.js",
+      "dist/credentials/QualysApi.credentials.js",
       "dist/credentials/QuestDb.credentials.js",
       "dist/credentials/QuickBaseApi.credentials.js",
       "dist/credentials/QuickBooksOAuth2Api.credentials.js",
       "dist/credentials/RabbitMQ.credentials.js",
       "dist/credentials/RaindropOAuth2Api.credentials.js",
+      "dist/credentials/RecordedFutureApi.credentials.js",
       "dist/credentials/RedditOAuth2Api.credentials.js",
       "dist/credentials/Redis.credentials.js",
       "dist/credentials/RocketchatApi.credentials.js",
@@ -271,6 +290,7 @@
       "dist/credentials/SeaTableApi.credentials.js",
       "dist/credentials/SecurityScorecardApi.credentials.js",
       "dist/credentials/SegmentApi.credentials.js",
+      "dist/credentials/SekoiaApi.credentials.js",
       "dist/credentials/SendGridApi.credentials.js",
       "dist/credentials/BrevoApi.credentials.js",
       "dist/credentials/SendyApi.credentials.js",
@@ -292,6 +312,7 @@
       "dist/credentials/SplunkApi.credentials.js",
       "dist/credentials/SpontitApi.credentials.js",
       "dist/credentials/SpotifyOAuth2Api.credentials.js",
+      "dist/credentials/ShufflerApi.credentials.js",
       "dist/credentials/SshPassword.credentials.js",
       "dist/credentials/SshPrivateKey.credentials.js",
       "dist/credentials/StackbyApi.credentials.js",
@@ -314,6 +335,7 @@
       "dist/credentials/TogglApi.credentials.js",
       "dist/credentials/TotpApi.credentials.js",
       "dist/credentials/TravisCiApi.credentials.js",
+      "dist/credentials/TrellixEpoApi.credentials.js",
       "dist/credentials/TrelloApi.credentials.js",
       "dist/credentials/TwakeCloudApi.credentials.js",
       "dist/credentials/TwakeServerApi.credentials.js",
@@ -329,6 +351,7 @@
       "dist/credentials/UptimeRobotApi.credentials.js",
       "dist/credentials/UrlScanIoApi.credentials.js",
       "dist/credentials/VeroApi.credentials.js",
+      "dist/credentials/VirusTotalApi.credentials.js",
       "dist/credentials/VonageApi.credentials.js",
       "dist/credentials/VenafiTlsProtectCloudApi.credentials.js",
       "dist/credentials/VenafiTlsProtectDatacenterApi.credentials.js",
@@ -351,6 +374,7 @@
       "dist/credentials/ZohoOAuth2Api.credentials.js",
       "dist/credentials/ZoomApi.credentials.js",
       "dist/credentials/ZoomOAuth2Api.credentials.js",
+      "dist/credentials/ZscalerZiaApi.credentials.js",
       "dist/credentials/ZulipApi.credentials.js"
     ],
     "nodes": [

From fadb10ac3e1bc9dbc42be39972629345f5a6f3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 31 Jul 2023 11:00:48 +0200
Subject: [PATCH 088/116] refactor: Clear unused ESLint directives from BE
 packages (no-changelog) (#6798)

---
 packages/@n8n/client-oauth2/package.json      |  4 ++--
 .../@n8n/client-oauth2/src/ClientOAuth2.ts    |  3 +--
 .../client-oauth2/src/ClientOAuth2Token.ts    |  2 --
 packages/@n8n/client-oauth2/src/CodeFlow.ts   |  1 -
 packages/@n8n/client-oauth2/src/utils.ts      |  3 ---
 packages/cli/package.json                     |  4 ++--
 packages/cli/src/AbstractServer.ts            |  1 -
 packages/cli/src/ActiveExecutions.ts          | 13 ++++-------
 packages/cli/src/ActiveWebhooks.ts            | 11 ++++-----
 packages/cli/src/ActiveWorkflowRunner.ts      | 23 ++++++-------------
 packages/cli/src/CommunityNodes/helpers.ts    |  4 ----
 .../cli/src/CommunityNodes/packageModel.ts    |  2 +-
 packages/cli/src/CredentialsHelper.ts         | 10 +++-----
 packages/cli/src/CurlConverterHelper.ts       |  1 -
 packages/cli/src/Db.ts                        |  5 +---
 packages/cli/src/ExternalHooks.ts             |  8 ++-----
 packages/cli/src/GenericHelpers.ts            | 11 ++-------
 packages/cli/src/InternalHooks.ts             |  3 ---
 packages/cli/src/Ldap/LdapService.ee.ts       |  1 -
 packages/cli/src/Logger.ts                    |  8 +------
 .../credentials/credentials.service.ts        |  3 ---
 packages/cli/src/Queue.ts                     |  1 -
 packages/cli/src/ReloadNodesAndCredentials.ts |  1 -
 packages/cli/src/ResponseHelper.ts            |  7 +++---
 packages/cli/src/Server.ts                    |  5 ++--
 packages/cli/src/TestWebhooks.ts              | 14 ++++-------
 .../UserManagement/UserManagementHelper.ts    |  3 ---
 packages/cli/src/WaitTracker.ts               |  8 +------
 packages/cli/src/WaitingWebhooks.ts           |  5 +---
 packages/cli/src/WebhookHelpers.ts            | 15 +++++-------
 packages/cli/src/WorkflowCredentials.ts       |  8 ++-----
 .../cli/src/WorkflowExecuteAdditionalData.ts  | 16 ++++---------
 packages/cli/src/WorkflowHelpers.ts           | 10 ++++----
 packages/cli/src/WorkflowRunner.ts            | 13 ++++-------
 packages/cli/src/WorkflowRunnerProcess.ts     | 16 ++++---------
 packages/cli/src/auth/jwt.ts                  |  2 --
 packages/cli/src/commands/executeBatch.ts     |  3 +--
 .../cli/src/commands/export/credentials.ts    |  1 -
 packages/cli/src/commands/export/workflow.ts  |  1 -
 packages/cli/src/commands/import/workflow.ts  |  3 ---
 packages/cli/src/commands/start.ts            |  8 +++----
 packages/cli/src/commands/update/workflow.ts  |  3 ---
 packages/cli/src/commands/webhook.ts          |  2 +-
 packages/cli/src/commands/worker.ts           |  5 ++--
 packages/cli/src/config/schema.ts             |  2 --
 packages/cli/src/constants.ts                 |  3 ---
 .../credentials/credentials.controller.ee.ts  |  1 -
 .../src/credentials/credentials.controller.ts |  2 --
 .../src/credentials/credentials.service.ee.ts |  1 -
 .../src/credentials/credentials.service.ts    |  5 +---
 .../src/credentials/oauth2Credential.api.ts   |  1 -
 packages/cli/src/curlconverter.d.ts           |  2 --
 ...1630451444017-UpdateWorkflowCredentials.ts |  1 -
 .../mysqldb/1658932910559-AddNodeIds.ts       |  1 -
 ...690000000001-MigrateIntegerKeysToString.ts |  1 -
 ...1630419189837-UpdateWorkflowCredentials.ts |  1 -
 .../postgresdb/1658932090381-AddNodeIds.ts    |  3 +--
 ...690000000000-MigrateIntegerKeysToString.ts |  1 -
 ...1630330987096-UpdateWorkflowCredentials.ts |  2 +-
 .../sqlite/1658930531669-AddNodeIds.ts        |  2 +-
 .../src/databases/utils/migrationHelpers.ts   |  1 -
 .../cli/src/decorators/registerController.ts  |  1 -
 .../variables/variables.service.ee.ts         |  2 +-
 .../MessageEventBusDestinationSentry.ee.ts    |  3 +--
 .../MessageEventBusDestinationSyslog.ee.ts    |  2 --
 .../MessageEventBusDestinationWebhook.ee.ts   | 15 +++++++-----
 .../MessageEventBusLogWriter.ts               |  3 +--
 .../MessageEventBusLogWriterWorker.ts         |  1 -
 .../cli/src/eventbus/eventBus.controller.ts   |  3 ---
 .../cli/src/executions/executions.service.ts  |  3 ---
 .../cli/src/license/license.controller.ts     |  2 --
 packages/cli/src/services/cache.service.ts    |  1 -
 packages/cli/src/sso/saml/saml.service.ee.ts  |  1 -
 packages/cli/src/telemetry/index.ts           |  3 ---
 .../cli/src/workflows/workflows.controller.ts |  2 --
 .../cli/test/integration/shared/testDb.ts     |  1 -
 packages/core/package.json                    |  4 ++--
 packages/core/src/ActiveWorkflows.ts          | 21 ++++++-----------
 packages/core/src/Constants.ts                |  1 -
 packages/core/src/Credentials.ts              |  2 --
 packages/core/src/ExtractValue.ts             |  1 -
 packages/core/src/LoadNodeDetails.ts          |  1 -
 packages/core/src/NodeExecuteFunctions.ts     |  9 +++-----
 packages/core/src/UserSettings.ts             |  5 +---
 packages/core/src/WorkflowExecute.ts          | 21 +++++------------
 packages/node-dev/commands/build.ts           |  5 ++--
 packages/node-dev/commands/new.ts             |  7 +++---
 packages/node-dev/package.json                |  4 ++--
 packages/node-dev/src/Build.ts                |  7 +++---
 packages/workflow/package.json                |  4 ++--
 packages/workflow/src/AugmentObject.ts        |  1 -
 packages/workflow/src/Constants.ts            |  1 -
 packages/workflow/src/Expression.ts           |  6 ++---
 .../src/Extensions/ArrayExtensions.ts         |  4 +---
 .../workflow/src/Extensions/DateExtensions.ts |  3 +--
 .../src/Extensions/ExpressionExtension.ts     | 11 +--------
 .../src/Extensions/ObjectExtensions.ts        |  2 +-
 .../src/Extensions/StringExtensions.ts        |  2 --
 packages/workflow/src/Interfaces.ts           |  2 +-
 packages/workflow/src/LoggerProxy.ts          |  1 -
 packages/workflow/src/NodeErrors.ts           | 12 +++-------
 packages/workflow/src/NodeHelpers.ts          | 16 ++++---------
 packages/workflow/src/ObservableObject.ts     | 10 +++-----
 packages/workflow/src/RoutingNode.ts          | 17 +++++---------
 packages/workflow/src/TelemetryHelpers.ts     |  2 +-
 packages/workflow/src/Workflow.ts             | 15 +++---------
 packages/workflow/src/WorkflowDataProxy.ts    | 18 +++++----------
 packages/workflow/src/WorkflowHooks.ts        |  6 ++---
 packages/workflow/src/utils.ts                |  8 +------
 packages/workflow/test/Helpers.ts             |  2 --
 110 files changed, 160 insertions(+), 415 deletions(-)

diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index 6dba1df39898f..d9257d62acaf6 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -7,8 +7,8 @@
     "typecheck": "tsc",
     "build": "tsc -p tsconfig.build.json",
     "format": "prettier --write . --ignore-path ../../../.prettierignore",
-    "lint": "eslint --quiet .",
-    "lintfix": "eslint . --fix",
+    "lint": "eslint . --quiet --report-unused-disable-directives",
+    "lintfix": "eslint . --fix --report-unused-disable-directives",
     "watch": "tsc -p tsconfig.build.json --watch",
     "test": "jest",
     "test:dev": "jest --watch"
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
index 1fb6304e36765..87178255e99a8 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as qs from 'querystring';
 import { Agent } from 'https';
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
index fe2e71deaecc3..9b696dff22b62 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/naming-convention */
 import type { ClientOAuth2, ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
 import { auth, expects, getRequestOptions } from './utils';
diff --git a/packages/@n8n/client-oauth2/src/CodeFlow.ts b/packages/@n8n/client-oauth2/src/CodeFlow.ts
index 20679188a879e..3fda119a003b2 100644
--- a/packages/@n8n/client-oauth2/src/CodeFlow.ts
+++ b/packages/@n8n/client-oauth2/src/CodeFlow.ts
@@ -69,7 +69,6 @@ export class CodeFlow {
 		}
 
 		if (!url.search?.substring(1)) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			throw new TypeError(`Unable to process uri: ${urlString}`);
 		}
 
diff --git a/packages/@n8n/client-oauth2/src/utils.ts b/packages/@n8n/client-oauth2/src/utils.ts
index 3b3bd88d975bf..550c1dcf994a3 100644
--- a/packages/@n8n/client-oauth2/src/utils.ts
+++ b/packages/@n8n/client-oauth2/src/utils.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
 import { ERROR_RESPONSES } from './constants';
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 93192fe7d4eeb..f343968eccdda 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -26,8 +26,8 @@
     "dev": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon\"",
     "dev:worker": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon worker\"",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
-    "lintfix": "eslint . --fix",
+    "lint": "eslint . --quiet --report-unused-disable-directives",
+    "lintfix": "eslint . --fix --report-unused-disable-directives",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "oclif-dev manifest",
     "start": "run-script-os",
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index b9dabaa95128e..9b82e230e9aad 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -95,7 +95,6 @@ export abstract class AbstractServer {
 
 		// Make sure that each request has the "parsedUrl" parameter
 		app.use((req, res, next) => {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			req.parsedUrl = parseUrl(req)!;
 			req.rawBody = emptyBuffer;
 			next();
diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
index 2cccb4fb6c2a5..9c1c79c692f71 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -1,7 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
 import { Container, Service } from 'typedi';
 import type {
 	IDeferredPromise,
@@ -94,7 +92,7 @@ export class ActiveExecutions {
 	 * Attaches an execution
 	 *
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+
 	attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>) {
 		if (this.activeExecutions[executionId] === undefined) {
 			throw new Error(
@@ -123,7 +121,6 @@ export class ActiveExecutions {
 			return;
 		}
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		this.activeExecutions[executionId].responsePromise?.resolve(response);
 	}
 
@@ -137,7 +134,7 @@ export class ActiveExecutions {
 		}
 
 		// Resolve all the waiting promises
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const promise of this.activeExecutions[executionId].postExecutePromises) {
 			promise.resolve(fullRunData);
 		}
@@ -176,7 +173,6 @@ export class ActiveExecutions {
 			this.activeExecutions[executionId].workflowExecution!.cancel();
 		}
 
-		// eslint-disable-next-line consistent-return
 		return this.getPostExecutePromise(executionId);
 	}
 
@@ -196,7 +192,6 @@ export class ActiveExecutions {
 
 		this.activeExecutions[executionId].postExecutePromises.push(waitPromise);
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
 		return waitPromise.promise();
 	}
 
@@ -208,7 +203,7 @@ export class ActiveExecutions {
 		const returnData: IExecutionsCurrentSummary[] = [];
 
 		let data;
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const id of Object.keys(this.activeExecutions)) {
 			data = this.activeExecutions[id];
 			returnData.push({
diff --git a/packages/cli/src/ActiveWebhooks.ts b/packages/cli/src/ActiveWebhooks.ts
index 8e3dcda62ddca..27489eaddd41d 100644
--- a/packages/cli/src/ActiveWebhooks.ts
+++ b/packages/cli/src/ActiveWebhooks.ts
@@ -35,7 +35,6 @@ export class ActiveWebhooks {
 			throw new Error('Webhooks can only be added for saved workflows as an id is needed!');
 		}
 		if (webhookData.path.endsWith('/')) {
-			// eslint-disable-next-line no-param-reassign
 			webhookData.path = webhookData.path.slice(0, -1);
 		}
 
@@ -139,7 +138,7 @@ export class ActiveWebhooks {
 
 		Object.keys(this.webhookUrls)
 			.filter((key) => key.includes(path))
-			// eslint-disable-next-line array-callback-return
+
 			.map((key) => {
 				methods.push(key.split('|')[0]);
 			});
@@ -164,7 +163,7 @@ export class ActiveWebhooks {
 		if (webhookId) {
 			if (path.startsWith(webhookId)) {
 				const cutFromIndex = path.indexOf('/') + 1;
-				// eslint-disable-next-line no-param-reassign
+
 				path = path.slice(cutFromIndex);
 			}
 			return `${httpMethod}|${webhookId}|${path.split('/').length}`;
@@ -177,7 +176,6 @@ export class ActiveWebhooks {
 	 *
 	 */
 	async removeWorkflow(workflow: Workflow): Promise<boolean> {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		const workflowId = workflow.id!.toString();
 
 		if (this.workflowWebhooks[workflowId] === undefined) {
@@ -190,9 +188,8 @@ export class ActiveWebhooks {
 		const mode = 'internal';
 
 		// Go through all the registered webhooks of the workflow and remove them
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const webhookData of webhooks) {
-			// eslint-disable-next-line no-await-in-loop
 			await workflow.runWebhookMethod(
 				'delete',
 				webhookData,
@@ -218,7 +215,7 @@ export class ActiveWebhooks {
 	 */
 	async removeAll(workflows: Workflow[]): Promise<void> {
 		const removePromises = [];
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const workflow of workflows) {
 			removePromises.push(this.removeWorkflow(workflow));
 		}
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index daae8a28f848d..429228e90fda7 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -1,8 +1,5 @@
 /* eslint-disable prefer-spread */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
+
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
@@ -94,7 +91,6 @@ export class ActiveWorkflowRunner {
 		private webhookRepository: WebhookRepository,
 	) {}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async init() {
 		// Get the active workflows from database
 
@@ -141,7 +137,7 @@ export class ActiveWorkflowRunner {
 					Logger.info(
 						'     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue',
 					);
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+
 					Logger.info(`               ${error.message}`);
 					Logger.error(
 						`Issue on initial workflow activation try "${workflowData.name}" (startup)`,
@@ -257,7 +253,7 @@ export class ActiveWorkflowRunner {
 			}
 
 			// @ts-ignore
-			// eslint-disable-next-line no-param-reassign
+
 			path = webhook.webhookPath;
 			// extracting params from path
 			// @ts-ignore
@@ -323,7 +319,7 @@ export class ActiveWorkflowRunner {
 				undefined,
 				req,
 				res,
-				// eslint-disable-next-line consistent-return
+
 				(error: Error | null, data: object) => {
 					if (error !== null) {
 						return reject(error);
@@ -445,7 +441,6 @@ export class ActiveWorkflowRunner {
 			}
 
 			try {
-				// eslint-disable-next-line no-await-in-loop
 				// TODO: this should happen in a transaction, that way we don't need to manually remove this in `catch`
 				await this.webhookRepository.insert(webhook);
 				const webhookExists = await workflow.runWebhookMethod(
@@ -478,7 +473,7 @@ export class ActiveWorkflowRunner {
 					// This means that further initializations will always fail
 					// when inserting to database. This is why we ignore this error
 					// as it's expected to happen.
-					// eslint-disable-next-line no-continue
+
 					continue;
 				}
 
@@ -487,7 +482,6 @@ export class ActiveWorkflowRunner {
 				} catch (error) {
 					ErrorReporter.error(error);
 					Logger.error(
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error.message}"`,
 					);
 				}
@@ -566,7 +560,7 @@ export class ActiveWorkflowRunner {
 	 * Runs the given workflow
 	 *
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+
 	async runWorkflow(
 		workflowData: IWorkflowDb,
 		node: INode,
@@ -634,7 +628,6 @@ export class ActiveWorkflowRunner {
 				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
 				donePromise?: IDeferredPromise<IRun | undefined>,
 			): void => {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				Logger.debug(`Received event to trigger execution for workflow "${workflow.name}"`);
 				void WorkflowHelpers.saveStaticData(workflow);
 				const executePromise = this.runWorkflow(
@@ -691,10 +684,9 @@ export class ActiveWorkflowRunner {
 				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
 				donePromise?: IDeferredPromise<IRun | undefined>,
 			): void => {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				Logger.debug(`Received trigger for workflow "${workflow.name}"`);
 				void WorkflowHelpers.saveStaticData(workflow);
-				// eslint-disable-next-line id-denylist
+
 				const executePromise = this.runWorkflow(
 					workflowData,
 					node,
@@ -983,7 +975,6 @@ export class ActiveWorkflowRunner {
 		} catch (error) {
 			ErrorReporter.error(error);
 			Logger.error(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
 			);
 		}
diff --git a/packages/cli/src/CommunityNodes/helpers.ts b/packages/cli/src/CommunityNodes/helpers.ts
index 328a3f6a32732..11a3eb9fb18c5 100644
--- a/packages/cli/src/CommunityNodes/helpers.ts
+++ b/packages/cli/src/CommunityNodes/helpers.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/naming-convention */
 import { promisify } from 'util';
 import { exec } from 'child_process';
 import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
@@ -152,8 +150,6 @@ export function matchMissingPackages(
 		try {
 			const parsedPackageData = parseNpmPackageName(missingPackageName);
 			return parsedPackageData.packageName;
-
-			// eslint-disable-next-line no-empty
 		} catch {}
 		return undefined;
 	});
diff --git a/packages/cli/src/CommunityNodes/packageModel.ts b/packages/cli/src/CommunityNodes/packageModel.ts
index 522dbc8dbc1e1..46197655c8775 100644
--- a/packages/cli/src/CommunityNodes/packageModel.ts
+++ b/packages/cli/src/CommunityNodes/packageModel.ts
@@ -63,7 +63,7 @@ export async function persistInstalledPackageData(
 
 			return promises;
 		});
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 		return installedPackage!;
 	} catch (error) {
 		LoggerProxy.error('Failed to save installed packages and nodes', {
diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts
index 1f541b0f4dbdd..4b85896525ecf 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-restricted-syntax */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
@@ -110,7 +109,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		if (credentialType.authenticate) {
 			if (typeof credentialType.authenticate === 'function') {
 				// Special authentication function is defined
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+
 				return credentialType.authenticate(credentials, requestOptions as IHttpRequestOptions);
 			}
 
@@ -411,7 +410,6 @@ export class CredentialsHelper extends ICredentialsHelper {
 					decryptedData,
 				) as ICredentialDataDecryptedObject;
 			} catch (e) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				e.message += ' [Error resolving credentials]';
 				throw e;
 			}
@@ -552,7 +550,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		if (typeof credentialTestFunction === 'function') {
 			// The credentials get tested via a function that is defined on the node
 			const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions();
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+
 			return credentialTestFunction.call(credentialTestFunctions, credentialsDecrypted);
 		}
 
@@ -687,9 +685,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 					return {
 						status: 'Error',
 						message:
-							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 							errorResponseData.statusMessage ||
-							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 							`Received HTTP status code: ${errorResponseData.statusCode}`,
 					};
 				}
diff --git a/packages/cli/src/CurlConverterHelper.ts b/packages/cli/src/CurlConverterHelper.ts
index 04ee444f252fc..3f6be3ba98e4f 100644
--- a/packages/cli/src/CurlConverterHelper.ts
+++ b/packages/cli/src/CurlConverterHelper.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import curlconverter from 'curlconverter';
 import get from 'lodash/get';
 import type { IDataObject } from 'n8n-workflow';
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index cd27c7e737b5e..bc83c12b464a8 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -1,8 +1,5 @@
-/* eslint-disable import/no-mutable-exports */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable no-case-declarations */
-/* eslint-disable @typescript-eslint/naming-convention */
+
 import { Container } from 'typedi';
 import type { DataSourceOptions as ConnectionOptions, EntityManager, LoggerOptions } from 'typeorm';
 import { DataSource as Connection } from 'typeorm';
diff --git a/packages/cli/src/ExternalHooks.ts b/packages/cli/src/ExternalHooks.ts
index 56743062797b9..315131284b01a 100644
--- a/packages/cli/src/ExternalHooks.ts
+++ b/packages/cli/src/ExternalHooks.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable import/no-dynamic-require */
-/* eslint-disable no-restricted-syntax */
+
 import { Service } from 'typedi';
 import * as Db from '@/Db';
 import type {
@@ -51,13 +50,11 @@ export class ExternalHooks implements IExternalHooksClass {
 						delete require.cache[require.resolve(hookFilePath)];
 					}
 
-					// eslint-disable-next-line import/no-dynamic-require
-					// eslint-disable-next-line global-require
 					const hookFile = require(hookFilePath) as IExternalHooksFileData;
 					this.loadHooks(hookFile);
 				} catch (error) {
 					throw new Error(
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 						`Problem loading external hook file "${hookFilePath}": ${error.message}`,
 						{ cause: error as Error },
 					);
@@ -96,7 +93,6 @@ export class ExternalHooks implements IExternalHooksClass {
 		}
 
 		for (const externalHookFunction of this.externalHooks[hookName]) {
-			// eslint-disable-next-line no-await-in-loop, @typescript-eslint/await-thenable
 			await externalHookFunction.apply(externalHookFunctions, hookParameters);
 		}
 	}
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 56d6c9ce97b6c..1860f5052a9ca 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -1,9 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import type express from 'express';
 import type {
 	ExecutionError,
@@ -56,7 +50,7 @@ export function getSessionId(req: express.Request): string | undefined {
  * - If the name already exists more than once with suffixes, it looks for the max suffix
  * and returns the requested name with max suffix + 1.
  */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+
 export async function generateUniqueName(
 	requestedName: string,
 	entityType: 'workflow' | 'credentials',
@@ -85,7 +79,6 @@ export async function generateUniqueName(
 
 		const suffix = Number(parts[1]);
 
-		// eslint-disable-next-line no-restricted-globals
 		if (!isNaN(suffix) && Math.ceil(suffix) > acc) {
 			acc = Math.ceil(suffix);
 		}
@@ -129,7 +122,7 @@ export async function validateEntity(
  * @returns
  * @memberof ActiveWorkflowRunner
  */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+
 export async function createErrorExecution(
 	error: ExecutionError,
 	node: INode,
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 8fe2bc42f5191..7cb5e4e065fb0 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import { Service } from 'typedi';
 import { snakeCase } from 'change-case';
 import { BinaryDataManager } from 'n8n-core';
diff --git a/packages/cli/src/Ldap/LdapService.ee.ts b/packages/cli/src/Ldap/LdapService.ee.ts
index 63394a4145fe4..216af1da33b61 100644
--- a/packages/cli/src/Ldap/LdapService.ee.ts
+++ b/packages/cli/src/Ldap/LdapService.ee.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 import type { Entry as LdapUser, ClientOptions } from 'ldapts';
 import { Client } from 'ldapts';
 import type { LdapConfig } from './types';
diff --git a/packages/cli/src/Logger.ts b/packages/cli/src/Logger.ts
index bbfc2213fab3a..2a113cb8cc892 100644
--- a/packages/cli/src/Logger.ts
+++ b/packages/cli/src/Logger.ts
@@ -1,7 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
 
 import { inspect } from 'util';
 import winston from 'winston';
@@ -24,7 +21,6 @@ export class Logger implements ILogger {
 			.map((output) => output.trim());
 
 		this.logger = winston.createLogger({
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			level,
 			silent: level === 'silent',
 		});
@@ -36,9 +32,8 @@ export class Logger implements ILogger {
 					winston.format.metadata(),
 					winston.format.timestamp(),
 					winston.format.colorize({ all: true }),
-					// eslint-disable-next-line @typescript-eslint/no-shadow
+
 					winston.format.printf(({ level, message, timestamp, metadata }) => {
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 						return `${timestamp} | ${level.padEnd(18)} | ${message}${
 							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							Object.keys(metadata).length ? ` ${JSON.stringify(inspect(metadata))}` : ''
@@ -118,7 +113,6 @@ export class Logger implements ILogger {
 
 let activeLoggerInstance: Logger | undefined;
 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function getLogger() {
 	if (activeLoggerInstance === undefined) {
 		activeLoggerInstance = new Logger();
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
index e207ac55bc7bf..41460ccb7cf72 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
@@ -46,7 +46,6 @@ export async function createCredential(
 	} else {
 		// Add the added date for node access permissions
 		newCredential.nodesAccess.forEach((nodeAccess) => {
-			// eslint-disable-next-line no-param-reassign
 			nodeAccess.date = new Date();
 		});
 	}
@@ -115,7 +114,6 @@ export function sanitizeCredentials(
 	const credentialsList = argIsArray ? credentials : [credentials];
 
 	const sanitizedCredentials = credentialsList.map((credential) => {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		const { data, nodesAccess, shared, ...rest } = credential;
 		return rest;
 	});
@@ -191,7 +189,6 @@ export function toJsonSchema(properties: INodeProperties[]): IDataObject {
 			let dependantValue: string | number | boolean = '';
 
 			if (displayOptionsValues && Array.isArray(displayOptionsValues) && displayOptionsValues[0]) {
-				// eslint-disable-next-line prefer-destructuring
 				dependantValue = displayOptionsValues[0];
 			}
 
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index c1af79b7e0e86..ecf862a1d0797 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -83,7 +83,6 @@ export class Queue {
 
 		this.jobQueue.on('global:progress', (jobId, progress: WebhookResponse) => {
 			this.activeExecutions.resolveResponsePromise(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				progress.executionId,
 				WebhookHelpers.decodeWebhookResponse(progress.response),
 			);
diff --git a/packages/cli/src/ReloadNodesAndCredentials.ts b/packages/cli/src/ReloadNodesAndCredentials.ts
index 8bb28f450b54a..3867cc0ed609c 100644
--- a/packages/cli/src/ReloadNodesAndCredentials.ts
+++ b/packages/cli/src/ReloadNodesAndCredentials.ts
@@ -10,7 +10,6 @@ export const reloadNodesAndCredentials = async (
 	nodeTypes: NodeTypes,
 	push: Push,
 ) => {
-	// eslint-disable-next-line import/no-extraneous-dependencies
 	const { default: debounce } = await import('lodash/debounce');
 	// eslint-disable-next-line import/no-extraneous-dependencies
 	const { watch } = await import('chokidar');
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index 312990f6834e5..c759fd5bcd256 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-console */
+
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 import type { Request, Response } from 'express';
 import { parse, stringify } from 'flatted';
 import picocolors from 'picocolors';
@@ -216,7 +215,7 @@ export function flattenExecutionData(fullExecutionData: IExecutionDb): IExecutio
 		stoppedAt: fullExecutionData.stoppedAt,
 		finished: fullExecutionData.finished ? fullExecutionData.finished : false,
 		workflowId: fullExecutionData.workflowId,
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 		workflowData: fullExecutionData.workflowData!,
 		status: fullExecutionData.status,
 	};
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 855d48dde6f87..06874b6a1aa2b 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -2,9 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
 /* eslint-disable prefer-const */
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
+
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-var-requires */
+
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unused-vars */
@@ -937,7 +937,6 @@ export class Server extends AbstractServer {
 
 				await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
 
-				// eslint-disable-next-line new-cap
 				const oauth = new clientOAuth1(oAuthOptions);
 
 				const options: RequestOptions = {
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index 7acbefc59150a..b9fb05837db31 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -1,6 +1,3 @@
-/* eslint-disable consistent-return */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-param-reassign */
 import type express from 'express';
 import { Service } from 'typedi';
 
@@ -69,7 +66,7 @@ export class TestWebhooks {
 		if (webhookData === undefined) {
 			const pathElements = path.split('/');
 			const webhookId = pathElements.shift();
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 			webhookData = activeWebhooks.get(httpMethod, pathElements.join('/'), webhookId);
 			if (webhookData === undefined) {
 				// The requested webhook is not registered
@@ -117,7 +114,6 @@ export class TestWebhooks {
 			throw new ResponseHelper.NotFoundError('Could not find node to process webhook.');
 		}
 
-		// eslint-disable-next-line no-async-promise-executor
 		return new Promise(async (resolve, reject) => {
 			try {
 				const executionMode = 'manual';
@@ -211,7 +207,7 @@ export class TestWebhooks {
 
 		let key: string;
 		const activatedKey: string[] = [];
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const webhookData of webhooks) {
 			key = `${activeWebhooks.getWebhookKey(
 				webhookData.httpMethod,
@@ -230,11 +226,10 @@ export class TestWebhooks {
 			};
 
 			try {
-				// eslint-disable-next-line no-await-in-loop
 				await activeWebhooks.add(workflow, webhookData, mode, activation);
 			} catch (error) {
 				activatedKey.forEach((deleteKey) => delete testWebhookData[deleteKey]);
-				// eslint-disable-next-line no-await-in-loop
+
 				await activeWebhooks.removeWorkflow(workflow);
 				throw error;
 			}
@@ -250,12 +245,11 @@ export class TestWebhooks {
 	cancelTestWebhook(workflowId: string): boolean {
 		let foundWebhook = false;
 		const { activeWebhooks, push, testWebhookData } = this;
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const webhookKey of Object.keys(testWebhookData)) {
 			const { sessionId, timeout, workflow, workflowData } = testWebhookData[webhookKey];
 
 			if (workflowData.id !== workflowId) {
-				// eslint-disable-next-line no-continue
 				continue;
 			}
 
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
index 6b23f1207ce6d..db65a7b13aece 100644
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { In } from 'typeorm';
 import { compare, genSaltSync, hash } from 'bcryptjs';
 import { Container } from 'typedi';
@@ -196,7 +194,6 @@ export function rightDiff<T1, T2>(
 ): T2[] {
 	// create map { itemKey => true } for fast lookup for diff
 	const keyMap = arr1.reduce<{ [key: string]: true }>((map, item) => {
-		// eslint-disable-next-line no-param-reassign
 		map[keyExtractor1(item)] = true;
 		return map;
 	}, {});
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 8af5074828f7b..3711c4a74d341 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -1,8 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import {
 	ErrorReporterProxy as ErrorReporter,
 	LoggerProxy as Logger,
@@ -46,7 +41,6 @@ export class WaitTracker {
 		void this.getWaitingExecutions();
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async getWaitingExecutions() {
 		Logger.debug('Wait tracker querying database for waiting executions');
 		// Find all the executions which should be triggered in the next 70 seconds
@@ -82,7 +76,7 @@ export class WaitTracker {
 		);
 
 		// Add timers for each waiting execution that they get started at the correct time
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const execution of executions) {
 			const executionId = execution.id;
 			if (this.waitingExecutions[executionId] === undefined) {
diff --git a/packages/cli/src/WaitingWebhooks.ts b/packages/cli/src/WaitingWebhooks.ts
index aa70f71ac2cc5..09789279acfab 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/WaitingWebhooks.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable no-param-reassign */
 import type { INode, WebhookHttpMethod } from 'n8n-workflow';
 import { NodeHelpers, Workflow, LoggerProxy as Logger } from 'n8n-workflow';
 import { Service } from 'typedi';
@@ -145,7 +142,7 @@ export class WaitingWebhooks {
 				fullExecutionData.id,
 				req,
 				res,
-				// eslint-disable-next-line consistent-return
+
 				(error: Error | null, data: object) => {
 					if (error !== null) {
 						return reject(error);
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index c286d12a9ecc6..e17377a1a1eb0 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -1,18 +1,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable no-param-reassign */
+
 /* eslint-disable @typescript-eslint/prefer-optional-chain */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable id-denylist */
 /* eslint-disable prefer-spread */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-restricted-syntax */
+
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable prefer-destructuring */
+
 import type express from 'express';
 import get from 'lodash/get';
 import stream from 'stream';
@@ -92,7 +90,7 @@ export function getWorkflowWebhooks(
 		if (parentNodes !== undefined && !parentNodes.includes(node.name)) {
 			// If parentNodes are given check only them if they have webhooks
 			// and no other ones
-			// eslint-disable-next-line no-continue
+
 			continue;
 		}
 		returnData.push.apply(
@@ -325,7 +323,7 @@ export async function executeWebhook(
 				}
 			} else {
 				// Send default response
-				// eslint-disable-next-line no-lonely-if
+
 				if (!didSendResponse) {
 					responseCallback(null, {
 						data: {
@@ -685,7 +683,6 @@ export async function executeWebhook(
 				throw new ResponseHelper.InternalServerError(e.message);
 			});
 
-		// eslint-disable-next-line consistent-return
 		return executionId;
 	} catch (e) {
 		if (!didSendResponse) {
diff --git a/packages/cli/src/WorkflowCredentials.ts b/packages/cli/src/WorkflowCredentials.ts
index 94d31f49a4ed9..cb0fc4c4b71c6 100644
--- a/packages/cli/src/WorkflowCredentials.ts
+++ b/packages/cli/src/WorkflowCredentials.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-prototype-builtins */
 import type { INode, IWorkflowCredentials } from 'n8n-workflow';
 import * as Db from '@/Db';
 
@@ -11,14 +10,12 @@ export async function WorkflowCredentials(nodes: INode[]): Promise<IWorkflowCred
 	let type;
 	let nodeCredentials;
 	let foundCredentials;
-	// eslint-disable-next-line no-restricted-syntax
+
 	for (node of nodes) {
 		if (node.disabled === true || !node.credentials) {
-			// eslint-disable-next-line no-continue
 			continue;
 		}
 
-		// eslint-disable-next-line no-restricted-syntax
 		for (type of Object.keys(node.credentials)) {
 			if (!returnCredentials[type]) {
 				returnCredentials[type] = {};
@@ -32,7 +29,6 @@ export async function WorkflowCredentials(nodes: INode[]): Promise<IWorkflowCred
 			}
 
 			if (!returnCredentials[type][nodeCredentials.id]) {
-				// eslint-disable-next-line no-await-in-loop
 				foundCredentials = await Db.collections.Credentials.findOneBy({
 					id: nodeCredentials.id,
 					type,
@@ -42,7 +38,7 @@ export async function WorkflowCredentials(nodes: INode[]): Promise<IWorkflowCred
 						`Could not find credentials for type "${type}" with ID "${nodeCredentials.id}".`,
 					);
 				}
-				// eslint-disable-next-line prefer-destructuring
+
 				returnCredentials[type][nodeCredentials.id] = foundCredentials;
 			}
 		}
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 448a8dc3fafad..2541f0a450374 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -1,19 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/await-thenable */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/prefer-optional-chain */
+
 /* eslint-disable id-denylist */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable func-names */
+
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { BinaryDataManager, UserSettings, WorkflowExecute } from 'n8n-core';
 
@@ -200,7 +194,7 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 		date.setHours(date.getHours() - maxAge);
 
 		// date reformatting needed - see https://github.com/typeorm/typeorm/issues/2286
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
 		const utcDate = DateUtils.mixedDateToUtcDatetimeString(date);
 
 		const toPrune: Array<FindOptionsWhere<IExecutionFlattedDb>> = [
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index f71f026e30f6a..4692f5cdb3a02 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -96,7 +96,6 @@ export async function executeErrorWorkflow(
 		if (workflowData === null) {
 			// The error workflow could not be found
 			Logger.error(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find error workflow "${workflowId}"`,
 				{ workflowId },
 			);
@@ -142,7 +141,6 @@ export async function executeErrorWorkflow(
 
 		if (workflowStartNode === undefined) {
 			Logger.error(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				`Calling Error Workflow for "${workflowErrorData.workflow.id}". Could not find "${ERROR_TRIGGER_TYPE}" in workflow "${workflowId}"`,
 			);
 			return;
@@ -191,7 +189,7 @@ export async function executeErrorWorkflow(
 	} catch (error) {
 		ErrorReporter.error(error);
 		Logger.error(
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			`Calling Error Workflow for "${workflowErrorData.workflow.id}": "${error.message}"`,
 			{ workflowId: workflowErrorData.workflow.id },
 		);
@@ -207,13 +205,13 @@ export async function saveStaticData(workflow: Workflow): Promise<void> {
 		if (isWorkflowIdValid(workflow.id)) {
 			// Workflow is saved so update in database
 			try {
-				// eslint-disable-next-line @typescript-eslint/no-use-before-define, @typescript-eslint/no-non-null-assertion
+				// eslint-disable-next-line @typescript-eslint/no-use-before-define
 				await saveStaticDataById(workflow.id!, workflow.staticData);
 				workflow.staticData.__dataChanged = false;
 			} catch (error) {
 				ErrorReporter.error(error);
 				Logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 					`There was a problem saving the workflow with id "${workflow.id}" to save changed staticData: "${error.message}"`,
 					{ workflowId: workflow.id },
 				);
@@ -273,7 +271,7 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 
 	// for loop to run DB fetches sequential and use cache to keep pressure off DB
 	// trade-off: longer response time for less DB queries
-	/* eslint-disable no-await-in-loop */
+
 	for (const node of nodes) {
 		if (!node.credentials || node.disabled) {
 			continue;
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 8a22a27b3dc96..4eb966d1ce8fa 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -1,15 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
+
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/prefer-optional-chain */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/no-unused-vars */
+
 import type { IProcessMessage } from 'n8n-core';
 import { WorkflowExecute } from 'n8n-core';
 
@@ -808,7 +803,7 @@ export class WorkflowRunner {
 				// They will display as unknown to the user
 				// Instead of pending forever as executing when it
 				// actually isn't anymore.
-				// eslint-disable-next-line @typescript-eslint/await-thenable, no-await-in-loop
+
 				this.activeExecutions.remove(executionId);
 			}
 
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 24f0a2c3a2ef5..e5566876c256e 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable consistent-return */
+
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/unbound-method */
 import 'source-map-support/register';
@@ -76,7 +76,6 @@ class WorkflowRunnerProcess {
 		[key: string]: IWorkflowExecuteProcess;
 	} = {};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	static async stopProcess() {
 		setTimeout(() => {
 			// Attempt a graceful shutdown, giving executions 30 seconds to finish
@@ -90,7 +89,6 @@ class WorkflowRunnerProcess {
 
 		await initErrorHandling();
 
-		// eslint-disable-next-line no-multi-assign
 		const logger = (this.logger = getLogger());
 		LoggerProxy.init(logger);
 
@@ -193,12 +191,10 @@ class WorkflowRunnerProcess {
 			}
 
 			try {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				await sendToParentProcess('sendMessageToUI', { source, message });
 			} catch (error) {
 				ErrorReporter.error(error);
 				this.logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
 					`There was a problem sending UI data to parent process: "${error.message}"`,
 				);
 			}
@@ -328,7 +324,7 @@ class WorkflowRunnerProcess {
 	 * Sends hook data to the parent process that it executes them
 	 *
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async sendHookToParentProcess(hook: string, parameters: any[]) {
 		try {
 			await sendToParentProcess('processHook', {
@@ -377,7 +373,7 @@ class WorkflowRunnerProcess {
 		};
 
 		const preExecuteFunctions = WorkflowExecuteAdditionalData.hookFunctionsPreExecute();
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const key of Object.keys(preExecuteFunctions)) {
 			if (hookFunctions[key] === undefined) {
 				hookFunctions[key] = [];
@@ -444,7 +440,6 @@ process.on('message', async (message: IProcessMessage) => {
 			if (workflowRunner.workflowExecute !== undefined) {
 				const executionIds = Object.keys(workflowRunner.childExecutions);
 
-				// eslint-disable-next-line no-restricted-syntax
 				for (const executionId of executionIds) {
 					const childWorkflowExecute = workflowRunner.childExecutions[executionId];
 					runData = childWorkflowExecute.workflowExecute.getFullRunData(
@@ -456,7 +451,7 @@ process.on('message', async (message: IProcessMessage) => {
 							: new WorkflowOperationError('Workflow-Execution has been canceled!');
 
 					// If there is any data send it to parent process, if execution timedout add the error
-					// eslint-disable-next-line no-await-in-loop
+
 					await childWorkflowExecute.workflowExecute.processSuccessExecution(
 						workflowRunner.childExecutions[executionId].startedAt,
 						childWorkflowExecute.workflow,
@@ -507,7 +502,6 @@ process.on('message', async (message: IProcessMessage) => {
 			// Stop process
 			process.exit();
 		} else if (message.type === 'executionId') {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			workflowRunner.executionIdCallback(message.data.executionId);
 		}
 	} catch (error) {
diff --git a/packages/cli/src/auth/jwt.ts b/packages/cli/src/auth/jwt.ts
index 3c80c1d865a51..53f3b7f276257 100644
--- a/packages/cli/src/auth/jwt.ts
+++ b/packages/cli/src/auth/jwt.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-
 import jwt from 'jsonwebtoken';
 import type { Response } from 'express';
 import { createHash } from 'crypto';
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index cc2470c7410aa..000a7b01528c0 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -518,7 +518,7 @@ export class ExecuteBatch extends BaseCommand {
 	setOutput(key: string, value: any) {
 		// Temporary hack until we move to the new action.
 		const output = process.env.GITHUB_OUTPUT;
-		// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+
 		fs.appendFileSync(output as unknown as fs.PathOrFileDescriptor, `${key}=${value}${os.EOL}`);
 	}
 
@@ -667,7 +667,6 @@ export class ExecuteBatch extends BaseCommand {
 
 					const resultError = data.data.resultData.error;
 					if (resultError) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 						executionResult.error =
 							resultError.hasOwnProperty('description') && resultError.description !== null
 								? resultError.description
diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index 7d8734f13aa96..c47c75346f7e1 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -134,7 +134,6 @@ export class ExportCredentialsCommand extends BaseCommand {
 			for (i = 0; i < credentials.length; i++) {
 				fileContents = JSON.stringify(credentials[i], null, flags.pretty ? 2 : undefined);
 				const filename = `${
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/restrict-plus-operands
 					(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
 					credentials[i].id
 				}.json`;
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 69f795e5bc998..873b69b80c172 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -119,7 +119,6 @@ export class ExportWorkflowsCommand extends BaseCommand {
 			for (i = 0; i < workflows.length; i++) {
 				fileContents = JSON.stringify(workflows[i], null, flags.pretty ? 2 : undefined);
 				const filename = `${
-					// eslint-disable-next-line @typescript-eslint/restrict-plus-operands, @typescript-eslint/no-non-null-assertion
 					(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
 					workflows[i].id
 				}.json`;
diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index b2b1969328274..4f85151ab31a5 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -126,7 +126,6 @@ export class ImportWorkflowsCommand extends BaseCommand {
 							this.transformCredentials(node, credentials);
 
 							if (!node.id) {
-								// eslint-disable-next-line no-param-reassign
 								node.id = uuid();
 							}
 						});
@@ -168,7 +167,6 @@ export class ImportWorkflowsCommand extends BaseCommand {
 					workflow.nodes.forEach((node: INode) => {
 						this.transformCredentials(node, credentials);
 						if (!node.id) {
-							// eslint-disable-next-line no-param-reassign
 							node.id = uuid();
 						}
 						if (!node.credentials?.id) {
@@ -274,7 +272,6 @@ export class ImportWorkflowsCommand extends BaseCommand {
 						nodeCredentials.id = matchingCredentials[0].id;
 					}
 
-					// eslint-disable-next-line no-param-reassign
 					node.credentials[type] = nodeCredentials;
 				}
 			}
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 95d56062bdd65..84afe4770c5ea 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -123,12 +123,12 @@ export class Start extends BaseCommand {
 			while (executingWorkflows.length !== 0) {
 				if (count++ % 4 === 0) {
 					console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
-					// eslint-disable-next-line array-callback-return
+
 					executingWorkflows.map((execution) => {
 						console.log(` - Execution ID ${execution.id}, workflow ID: ${execution.workflowId}`);
 					});
 				}
-				// eslint-disable-next-line no-await-in-loop
+
 				await sleep(500);
 				executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 			}
@@ -259,7 +259,7 @@ export class Start extends BaseCommand {
 					LoggerProxy.info('Attempting to reinstall missing packages', { missingPackages });
 					try {
 						// Optimistic approach - stop if any installation fails
-						// eslint-disable-next-line no-restricted-syntax
+
 						for (const missingPackage of missingPackages) {
 							await this.loadNodesAndCredentials.installNpmModule(
 								missingPackage.packageName,
@@ -360,7 +360,7 @@ export class Start extends BaseCommand {
 					void this.stopProcess();
 				} else {
 					// When anything else got pressed, record it and send it on enter into the child process
-					// eslint-disable-next-line no-lonely-if
+
 					if (key.charCodeAt(0) === 13) {
 						// send to child process and print in terminal
 						process.stdout.write('\n');
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index a13721ce66a09..b293e266e3390 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
 import { flags } from '@oclif/command';
 import type { FindOptionsWhere } from 'typeorm';
 import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index a06ed770a9227..57af6db6c9b96 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -46,7 +46,7 @@ export class Webhook extends BaseCommand {
 						`Waiting for ${executingWorkflows.length} active executions to finish...`,
 					);
 				}
-				// eslint-disable-next-line no-await-in-loop
+
 				await sleep(500);
 				executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 			}
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index e50fa29118692..bae186b574c14 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -78,7 +78,7 @@ export class Worker extends BaseCommand {
 						} active executions to finish... (wait ${waitLeft} more seconds)`,
 					);
 				}
-				// eslint-disable-next-line no-await-in-loop
+
 				await sleep(500);
 			}
 		} catch (error) {
@@ -238,7 +238,6 @@ export class Worker extends BaseCommand {
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(Worker);
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
 
 		const queue = Container.get(Queue);
@@ -309,7 +308,7 @@ export class Worker extends BaseCommand {
 
 			app.get(
 				'/healthz',
-				// eslint-disable-next-line consistent-return
+
 				async (req: express.Request, res: express.Response) => {
 					LoggerProxy.debug('Health check started!');
 
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index f1e477495f259..c2a52aba2bbf8 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import path from 'path';
 import convict from 'convict';
 import { UserSettings } from 'n8n-core';
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 4eb63e67a21e0..699d0def3ba26 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/naming-convention */
 import { readFileSync } from 'fs';
 import { resolve, join, dirname } from 'path';
 import type { n8n } from 'n8n-core';
diff --git a/packages/cli/src/credentials/credentials.controller.ee.ts b/packages/cli/src/credentials/credentials.controller.ee.ts
index 409fb2c057857..371f7f873c421 100644
--- a/packages/cli/src/credentials/credentials.controller.ee.ts
+++ b/packages/cli/src/credentials/credentials.controller.ee.ts
@@ -36,7 +36,6 @@ EECredentialsController.get(
 				relations: ['shared', 'shared.role', 'shared.user'],
 			});
 
-			// eslint-disable-next-line @typescript-eslint/unbound-method
 			return allCredentials.map((credential: CredentialsEntity & CredentialWithSharings) =>
 				EECredentials.addOwnerAndSharings(credential),
 			);
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index ffa7cf96818a4..0ebc4c8decee2 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import express from 'express';
 import type { INodeCredentialTestResult } from 'n8n-workflow';
 import { deepCopy, LoggerProxy } from 'n8n-workflow';
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index 2defaaaea9158..29e2630604cb6 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { DeleteResult, EntityManager, FindOptionsWhere } from 'typeorm';
 import { In, Not } from 'typeorm';
 import * as Db from '@/Db';
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index e00820a9587a1..50d445ec0d3d6 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax */
 import { Credentials, UserSettings } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
@@ -111,7 +110,6 @@ export class CredentialsService {
 	static async prepareCreateData(
 		data: CredentialRequest.CredentialProperties,
 	): Promise<CredentialsEntity> {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		const { id, ...rest } = data;
 
 		// This saves us a merge but requires some type casting. These
@@ -327,7 +325,6 @@ export class CredentialsService {
 	private static unredactRestoreValues(unmerged: any, replacement: any) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		for (const [key, value] of Object.entries(unmerged)) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			if (value === CREDENTIAL_BLANKING_VALUE || value === CREDENTIAL_EMPTY_VALUE) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 				unmerged[key] = replacement[key];
@@ -340,7 +337,7 @@ export class CredentialsService {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				replacement[key] !== null
 			) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				this.unredactRestoreValues(value, replacement[key]);
 			}
 		}
diff --git a/packages/cli/src/credentials/oauth2Credential.api.ts b/packages/cli/src/credentials/oauth2Credential.api.ts
index b6a9573ba6837..bcb3892ddf455 100644
--- a/packages/cli/src/credentials/oauth2Credential.api.ts
+++ b/packages/cli/src/credentials/oauth2Credential.api.ts
@@ -317,7 +317,6 @@ oauth2CredentialController.get(
 				decryptedDataOriginal.oauthTokenData = oauthToken.data;
 			}
 
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 			unset(decryptedDataOriginal, 'csrfSecret');
 
 			const credentials = new Credentials(
diff --git a/packages/cli/src/curlconverter.d.ts b/packages/cli/src/curlconverter.d.ts
index f55cf6c9683b4..8808f9b5c7ee3 100644
--- a/packages/cli/src/curlconverter.d.ts
+++ b/packages/cli/src/curlconverter.d.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable import/no-default-export */
 declare module 'curlconverter' {
 	export function toJsonString(data: string): string;
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts
index 083dc58ae5700..78f1767622398 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1630451444017-UpdateWorkflowCredentials.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
diff --git a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts
index 9900e96ca5a17..11134d6a3f2b7 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1658932910559-AddNodeIds.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable n8n-local-rules/no-uncaught-json-parse */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
index 1e3a7062b18c6..4a9f71fda8f4a 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
@@ -11,7 +11,6 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 		if (databaseType === 'mariadb') {
 			collation = COLLATION_57;
 		} else {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const dbVersionQuery = (await queryRunner.query('SELECT @@version')) as  // eslint-disable-next-line @typescript-eslint/naming-convention
 				| Array<{ '@@version': string }>
 				| undefined;
diff --git a/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts
index 7a871a921be00..513679bece8b1 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1630419189837-UpdateWorkflowCredentials.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
diff --git a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts
index 493c69dce0e77..08c340b1f6ff0 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1658932090381-AddNodeIds.ts
@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable n8n-local-rules/no-uncaught-json-parse */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import type { MigrationContext, ReversibleMigration } from '@db/types';
diff --git a/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts
index 4b6adf28af0f2..e06bcfb334aee 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1690000000000-MigrateIntegerKeysToString.ts
@@ -1,4 +1,3 @@
-/* eslint-disable n8n-local-rules/no-unneeded-backticks */
 import type { MigrationContext, IrreversibleMigration } from '@db/types';
 
 export class MigrateIntegerKeysToString1690000000000 implements IrreversibleMigration {
diff --git a/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts b/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts
index 57d7712c94c1e..12872b9a5f64e 100644
--- a/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1630330987096-UpdateWorkflowCredentials.ts
@@ -1,5 +1,5 @@
 /* eslint-disable n8n-local-rules/no-uncaught-json-parse */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
diff --git a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts
index 6fe635848aca3..c6a2a785e907f 100644
--- a/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1658930531669-AddNodeIds.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
+
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable n8n-local-rules/no-uncaught-json-parse */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
diff --git a/packages/cli/src/databases/utils/migrationHelpers.ts b/packages/cli/src/databases/utils/migrationHelpers.ts
index bbb626395ca75..92ecac3a05d1c 100644
--- a/packages/cli/src/databases/utils/migrationHelpers.ts
+++ b/packages/cli/src/databases/utils/migrationHelpers.ts
@@ -165,7 +165,6 @@ export async function runInBatches(
 	let batchedQuery: string;
 	let batchedQueryResults: unknown[];
 
-	// eslint-disable-next-line no-param-reassign
 	if (query.trim().endsWith(';')) query = query.trim().slice(0, -1);
 
 	do {
diff --git a/packages/cli/src/decorators/registerController.ts b/packages/cli/src/decorators/registerController.ts
index 54ff6bbbbcfd6..80e5ff7235b0e 100644
--- a/packages/cli/src/decorators/registerController.ts
+++ b/packages/cli/src/decorators/registerController.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 import { Router } from 'express';
 import type { Application, Request, Response, RequestHandler } from 'express';
 import type { Config } from '@/config';
diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts
index 429c656de33eb..60ab1232e9cb4 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments/variables/variables.service.ee.ts
@@ -42,7 +42,7 @@ export class EEVariablesService extends VariablesService {
 	static async update(id: string, variable: Omit<Variables, 'id'>): Promise<Variables> {
 		this.validateVariable(variable);
 		await collections.Variables.update(id, variable);
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 		return (await this.get(id))!;
 	}
 }
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
index a9f5c0fee04a9..6693c79218f0a 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import * as Sentry from '@sentry/node';
 import {
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
index f5f4981667b74..e2115c3bcbe16 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import syslog from 'syslog-client';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
index 8eb9e0a75a944..2a97f4471d09c 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
@@ -1,16 +1,18 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
+
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import axios from 'axios';
 import type { AxiosRequestConfig, Method } from 'axios';
-import { jsonParse, LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
+import {
+	jsonParse,
+	LoggerProxy,
+	MessageEventBusDestinationTypeNames,
+	MessageEventBusDestinationWebhookOptions,
+} from 'n8n-workflow';
 import type {
 	MessageEventBusDestinationOptions,
-	MessageEventBusDestinationWebhookOptions,
 	MessageEventBusDestinationWebhookParameterItem,
 	MessageEventBusDestinationWebhookParameterOptions,
 } from 'n8n-workflow';
@@ -20,7 +22,8 @@ import { Agent as HTTPSAgent } from 'https';
 import config from '@/config';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
-import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
+import { MessageEventBus } from '../MessageEventBus/MessageEventBus';
+import type { MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationWebhookOptions = (
 	candidate: unknown,
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
index efc0de1e21757..80837609a98ba 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+
 import { isEventMessageOptions } from '../EventMessageClasses/AbstractEventMessage';
 import { UserSettings } from 'n8n-core';
 import path, { parse } from 'path';
@@ -219,7 +219,6 @@ export class MessageEventBusLogWriter {
 						}
 					} catch (error) {
 						LoggerProxy.error(
-							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 							`Error reading line messages from file: ${logFileName}, line: ${line}, ${error.message}}`,
 						);
 					}
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
index 2672a3b98784f..06d95a3bb2d83 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
@@ -90,7 +90,6 @@ if (!isMainThread) {
 					clearInterval(fileStatTimer);
 					break;
 				case 'initialize':
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 					const settings: MessageEventBusLogWriterOptions = {
 						logFullBasePath: (data as MessageEventBusLogWriterOptions).logFullBasePath ?? '',
 						keepNumberOfFiles: (data as MessageEventBusLogWriterOptions).keepNumberOfFiles ?? 10,
diff --git a/packages/cli/src/eventbus/eventBus.controller.ts b/packages/cli/src/eventbus/eventBus.controller.ts
index 7c9ce21ccc5ee..123f9c33ad952 100644
--- a/packages/cli/src/eventbus/eventBus.controller.ts
+++ b/packages/cli/src/eventbus/eventBus.controller.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import express from 'express';
 import { isEventMessageOptions } from './EventMessageClasses/AbstractEventMessage';
@@ -202,7 +200,6 @@ export class EventBusController {
 					break;
 				default:
 					throw new BadRequestError(
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 						`Body is missing ${req.body.__type} options or type ${req.body.__type} is unknown`,
 					);
 			}
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index ac934f09bda0a..73f4a73e10826 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import type { IWorkflowBase, JsonObject, ExecutionStatus } from 'n8n-workflow';
 import { LoggerProxy, jsonParse, Workflow } from 'n8n-workflow';
diff --git a/packages/cli/src/license/license.controller.ts b/packages/cli/src/license/license.controller.ts
index 46106f7bfb93c..6d4eb70577231 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-param-reassign */
-
 import express from 'express';
 import { LoggerProxy } from 'n8n-workflow';
 
diff --git a/packages/cli/src/services/cache.service.ts b/packages/cli/src/services/cache.service.ts
index 64d203106c0a9..1b10f20b4f0a3 100644
--- a/packages/cli/src/services/cache.service.ts
+++ b/packages/cli/src/services/cache.service.ts
@@ -22,7 +22,6 @@ export class CacheService {
 			backend === 'redis' ||
 			(backend === 'auto' && config.getEnv('executions.mode') === 'queue')
 		) {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { redisInsStore } = await import('cache-manager-ioredis-yet');
 
 			// #region TEMPORARY Redis Client Code
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index 5e1c2847a7f5c..ebc68b2864b6a 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -313,7 +313,6 @@ export class SamlService {
 			}
 		} catch (error) {
 			throw new BadRequestError(
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 				`Error fetching SAML Metadata from ${this._samlPreferences.metadataUrl}: ${error}`,
 			);
 		}
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 244c421c36e13..7e78ca996a5b5 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { PostHogClient } from '@/posthog';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
@@ -148,7 +146,6 @@ export class Telemetry {
 					first: execTime,
 				};
 			} else {
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 				this.executionCountsBuffer[workflowId][key]!.count++;
 			}
 
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index c723fe7ba4937..ead52e3063d8a 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-param-reassign */
-
 import express from 'express';
 import { v4 as uuid } from 'uuid';
 import { LoggerProxy } from 'n8n-workflow';
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index ea2d0d4403872..5972fe59626f7 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -219,7 +219,6 @@ export async function createManyUsers(
 	amount: number,
 	attributes: Partial<User> = {},
 ): Promise<User[]> {
-	// eslint-disable-next-line prefer-const
 	let { email, password, firstName, lastName, globalRole, ...rest } = attributes;
 	if (!globalRole) {
 		globalRole = await getGlobalMemberRole();
diff --git a/packages/core/package.json b/packages/core/package.json
index 3e06b6382e1e4..96f90c1154fda 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -24,8 +24,8 @@
     "build": "tsc -p tsconfig.build.json",
     "dev": "pnpm watch",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
-    "lintfix": "eslint . --fix",
+    "lint": "eslint . --quiet --report-unused-disable-directives",
+    "lintfix": "eslint . --fix --report-unused-disable-directives",
     "watch": "tsc -p tsconfig.build.json --watch",
     "test": "jest"
   },
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index 31715c9e58f70..66eb1a06611f5 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -1,7 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-continue */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
+
 import { CronJob } from 'cron';
 
 import type {
@@ -31,7 +29,6 @@ export class ActiveWorkflows {
 	 * @param {string} id The id of the workflow to check
 	 */
 	isActive(id: string): boolean {
-		// eslint-disable-next-line no-prototype-builtins
 		return this.workflowData.hasOwnProperty(id);
 	}
 
@@ -84,13 +81,12 @@ export class ActiveWorkflows {
 				);
 				if (triggerResponse !== undefined) {
 					// If a response was given save it
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 					this.workflowData[id].triggerResponses!.push(triggerResponse);
 				}
 			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 				throw new WorkflowActivationError(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 					`There was a problem activating the workflow: "${error.message}"`,
 					{ cause: error as Error, node: triggerNode },
 				);
@@ -102,7 +98,6 @@ export class ActiveWorkflows {
 			this.workflowData[id].pollResponses = [];
 			for (const pollNode of pollNodes) {
 				try {
-					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 					this.workflowData[id].pollResponses!.push(
 						await this.activatePolling(
 							pollNode,
@@ -114,9 +109,8 @@ export class ActiveWorkflows {
 						),
 					);
 				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 					throw new WorkflowActivationError(
-						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 						`There was a problem activating the workflow: "${error.message}"`,
 						{ cause: error as Error, node: pollNode },
 					);
@@ -147,7 +141,6 @@ export class ActiveWorkflows {
 		const cronTimes = (pollTimes.item || []).map(toCronExpression);
 		// The trigger function to execute when the cron-time got reached
 		const executeTrigger = async (testingTrigger = false) => {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			Logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
 				workflowName: workflow.name,
 				workflowId: workflow.id,
@@ -177,7 +170,7 @@ export class ActiveWorkflows {
 
 		// Start the cron-jobs
 		const cronJobs: CronJob[] = [];
-		// eslint-disable-next-line @typescript-eslint/no-shadow
+
 		for (const cronTime of cronTimes) {
 			const cronTimeParts = cronTime.split(' ');
 			if (cronTimeParts.length > 0 && cronTimeParts[0].includes('*')) {
@@ -221,7 +214,7 @@ export class ActiveWorkflows {
 						await triggerResponse.closeFunction();
 					} catch (error) {
 						Logger.error(
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 							`There was a problem deactivating trigger of workflow "${id}": "${error.message}"`,
 							{
 								workflowId: id,
@@ -239,7 +232,7 @@ export class ActiveWorkflows {
 						await pollResponse.closeFunction();
 					} catch (error) {
 						Logger.error(
-							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 							`There was a problem deactivating polling trigger of workflow "${id}": "${error.message}"`,
 							{
 								workflowId: id,
diff --git a/packages/core/src/Constants.ts b/packages/core/src/Constants.ts
index 72894e6eaa5b3..84cb1f5ba2c80 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 export const CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
 export const DOWNLOADED_NODES_SUBDIRECTORY = 'nodes';
 export const ENCRYPTION_KEY_ENV_OVERWRITE = 'N8N_ENCRYPTION_KEY';
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/Credentials.ts
index 577f7fd700d06..7837fbcabbc85 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/Credentials.ts
@@ -12,7 +12,6 @@ export class Credentials extends ICredentials {
 	 * Returns if the given nodeType has access to data
 	 */
 	hasNodeAccess(nodeType: string): boolean {
-		// eslint-disable-next-line no-restricted-syntax
 		for (const accessData of this.nodesAccess) {
 			if (accessData.nodeType === nodeType) {
 				return true;
@@ -81,7 +80,6 @@ export class Credentials extends ICredentials {
 			throw new Error('No data was set.');
 		}
 
-		// eslint-disable-next-line no-prototype-builtins
 		if (!fullData.hasOwnProperty(key)) {
 			throw new Error(`No data for key "${key}" exists.`);
 		}
diff --git a/packages/core/src/ExtractValue.ts b/packages/core/src/ExtractValue.ts
index dcfadf4e2f986..749fa12ce8943 100644
--- a/packages/core/src/ExtractValue.ts
+++ b/packages/core/src/ExtractValue.ts
@@ -30,7 +30,6 @@ function findPropertyFromParameterName(
 		);
 	};
 
-	// eslint-disable-next-line no-restricted-syntax
 	for (const p of paramParts) {
 		const param = p.split('[')[0];
 		if (!property) {
diff --git a/packages/core/src/LoadNodeDetails.ts b/packages/core/src/LoadNodeDetails.ts
index 582183b987e63..12b807c7cc6e3 100644
--- a/packages/core/src/LoadNodeDetails.ts
+++ b/packages/core/src/LoadNodeDetails.ts
@@ -76,7 +76,6 @@ export abstract class LoadNodeDetails {
 	}
 
 	protected getTempNode() {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		return this.workflow.getNode(TEMP_NODE_NAME)!;
 	}
 }
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index aefb5d5003c4d..f4ea6a3fab39a 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -3,15 +3,14 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable new-cap */
+
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable no-param-reassign */
+
 import type {
 	GenericValue,
 	IAdditionalCredentialOptions,
@@ -2143,7 +2142,6 @@ export function getWebhookDescription(
 		return undefined;
 	}
 
-	// eslint-disable-next-line no-restricted-syntax
 	for (const webhookDescription of nodeType.description.webhooks) {
 		if (webhookDescription.name === name) {
 			return webhookDescription;
@@ -2561,7 +2559,6 @@ export function getExecuteFunctions(
 						additionalData.sendMessageToUI(node.name, args);
 					}
 				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					Logger.warn(`There was a problem sending message to UI: ${error.message}`);
 				}
 			},
diff --git a/packages/core/src/UserSettings.ts b/packages/core/src/UserSettings.ts
index 748c087bbd6b9..ee947c3061b64 100644
--- a/packages/core/src/UserSettings.ts
+++ b/packages/core/src/UserSettings.ts
@@ -1,6 +1,5 @@
-/* eslint-disable no-param-reassign */
 /* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
+
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import fs from 'fs';
 import path from 'path';
@@ -58,7 +57,6 @@ export async function prepareUserSettings(): Promise<IUserSettings> {
 
 	userSettings.instanceId = await generateInstanceId(userSettings.encryptionKey);
 
-	// eslint-disable-next-line no-console
 	console.log(`UserSettings were generated and saved to: ${settingsPath}`);
 
 	return writeUserSettings(userSettings, settingsPath);
@@ -202,7 +200,6 @@ export async function getUserSettings(
 	const settingsFile = await fsReadFile(settingsPath, 'utf8');
 
 	try {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		settingsCache = JSON.parse(settingsFile);
 	} catch (error) {
 		throw new Error(
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 6fe48381159df..47258f615f30f 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -1,13 +1,8 @@
 /* eslint-disable @typescript-eslint/prefer-optional-chain */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-labels */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-continue */
-/* eslint-disable no-prototype-builtins */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-param-reassign */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 import PCancelable from 'p-cancelable';
 
@@ -308,7 +303,6 @@ export class WorkflowExecute {
 			return;
 		}
 
-		// eslint-disable-next-line consistent-return
 		return this.additionalData.hooks.executeHookFunctions(hookName, parameters);
 	}
 
@@ -828,7 +822,7 @@ export class WorkflowExecute {
 					};
 
 					// Set the incoming data of the node that it can be saved correctly
-					// eslint-disable-next-line prefer-destructuring
+
 					executionData = this.runExecutionData.executionData!.nodeExecutionStack[0];
 					this.runExecutionData.resultData = {
 						runData: {
@@ -1033,7 +1027,7 @@ export class WorkflowExecute {
 
 								if (runNodeData.closeFunction) {
 									// Explanation why we do this can be found in n8n-workflow/Workflow.ts -> runNode
-									// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+
 									closeFunction = runNodeData.closeFunction();
 								}
 							}
@@ -1531,7 +1525,7 @@ export class WorkflowExecute {
 
 					// Check if static data changed
 					let newStaticData: IDataObject | undefined;
-					// eslint-disable-next-line no-underscore-dangle
+
 					if (workflow.staticData.__dataChanged === true) {
 						// Static data of workflow changed
 						newStaticData = workflow.staticData;
@@ -1539,7 +1533,6 @@ export class WorkflowExecute {
 					await this.executeHook('workflowExecuteAfter', [fullRunData, newStaticData]).catch(
 						// eslint-disable-next-line @typescript-eslint/no-shadow
 						(error) => {
-							// eslint-disable-next-line no-console
 							console.error('There was a problem running hook "workflowExecuteAfter"', error);
 						},
 					);
@@ -1549,7 +1542,6 @@ export class WorkflowExecute {
 							await closeFunction;
 						} catch (errorClose) {
 							Logger.error(
-								// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions
 								`There was a problem deactivating trigger of workflow "${workflow.id}": "${errorClose.message}"`,
 								{
 									workflowId: workflow.id,
@@ -1600,7 +1592,7 @@ export class WorkflowExecute {
 
 		// Check if static data changed
 		let newStaticData: IDataObject | undefined;
-		// eslint-disable-next-line no-underscore-dangle
+
 		if (workflow.staticData.__dataChanged === true) {
 			// Static data of workflow changed
 			newStaticData = workflow.staticData;
@@ -1612,7 +1604,6 @@ export class WorkflowExecute {
 				await closeFunction;
 			} catch (error) {
 				Logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					`There was a problem deactivating trigger of workflow "${workflow.id}": "${error.message}"`,
 					{
 						workflowId: workflow.id,
diff --git a/packages/node-dev/commands/build.ts b/packages/node-dev/commands/build.ts
index 8c9f10020dcc1..abca4e9205d23 100644
--- a/packages/node-dev/commands/build.ts
+++ b/packages/node-dev/commands/build.ts
@@ -25,7 +25,6 @@ export class Build extends Command {
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(Build);
@@ -47,10 +46,10 @@ export class Build extends Command {
 
 			this.log(`The nodes got built and saved into the following folder:\n${outputDirectory}`);
 		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			this.log(`\nGOT ERROR: "${error.message}"`);
 			this.log('====================================');
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
 			this.log(error.stack);
 		}
 	}
diff --git a/packages/node-dev/commands/new.ts b/packages/node-dev/commands/new.ts
index e83cf86e522a5..222c163522dc7 100644
--- a/packages/node-dev/commands/new.ts
+++ b/packages/node-dev/commands/new.ts
@@ -20,7 +20,6 @@ export class New extends Command {
 
 	static examples = ['$ n8n-node-dev new'];
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
 		try {
 			this.log('\nCreate new credentials/node');
@@ -105,7 +104,7 @@ export class New extends Command {
 			// node file
 			const destinationFilePath = join(
 				process.cwd(),
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				`${changeCase.pascalCase(nodeName)}.${typeAnswers.type.toLowerCase()}.ts`,
 			);
 
@@ -152,10 +151,10 @@ export class New extends Command {
 
 			this.log(`Node got created: ${destinationFilePath}`);
 		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			this.log(`\nGOT ERROR: "${error.message}"`);
 			this.log('====================================');
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			this.log(error.stack);
 		}
 	}
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 514ec7a02712d..0f4ba5cee98fe 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -24,8 +24,8 @@
     "build": "tsc --noEmit",
     "build-node-dev": "tsc",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
-    "lintfix": "eslint . --fix",
+    "lint": "eslint . --quiet --report-unused-disable-directives",
+    "lintfix": "eslint . --fix --report-unused-disable-directives",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "echo \"Building project...\" && rm -rf dist && tsc -b && oclif-dev manifest",
     "watch": "tsc --watch"
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index 096d4b6c06b4b..b463bd195977d 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -15,19 +15,19 @@ import type { IBuildOptions } from './Interfaces';
  * directory:
  * https://github.com/Microsoft/TypeScript/issues/25430
  */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+
 export async function createCustomTsconfig() {
 	// Get path to simple tsconfig file which should be used for build
 	const tsconfigPath = join(dirname(require.resolve('n8n-node-dev/src')), 'tsconfig-build.json');
 
 	// Read the tsconfig file
 	const tsConfigString = await readFile(tsconfigPath, { encoding: 'utf8' });
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
 	const tsConfig = jsonParse<{ include: string[] }>(tsConfigString);
 
 	// Set absolute include paths
 	const newIncludeFiles = [];
-	// eslint-disable-next-line no-restricted-syntax
+
 	for (const includeFile of tsConfig.include) {
 		newIncludeFiles.push(join(process.cwd(), includeFile));
 	}
@@ -101,7 +101,6 @@ export async function buildFiles({
 		let errorMessage = error.message;
 
 		if (error.stdout !== undefined) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			errorMessage = `${errorMessage}\nGot following output:\n${error.stdout}`;
 		}
 
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index de8fb5d9114ff..170d1d4a5da36 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -29,8 +29,8 @@
     "typecheck": "tsc",
     "build": "tsc -p tsconfig.build.json",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
-    "lint": "eslint --quiet .",
-    "lintfix": "eslint . --fix",
+    "lint": "eslint . --quiet --report-unused-disable-directives",
+    "lintfix": "eslint . --fix --report-unused-disable-directives",
     "watch": "tsc -p tsconfig.build.json --watch",
     "test": "jest",
     "test:dev": "jest --watch"
diff --git a/packages/workflow/src/AugmentObject.ts b/packages/workflow/src/AugmentObject.ts
index 2b35fb4d74de2..dd4e868f85bcb 100644
--- a/packages/workflow/src/AugmentObject.ts
+++ b/packages/workflow/src/AugmentObject.ts
@@ -88,7 +88,6 @@ export function augmentObject<T extends object>(data: T): T {
 				return newData[key];
 			}
 
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const value = Reflect.get(target, key, receiver);
 
 			if (typeof value !== 'object' || value === null) return value;
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index c81cfd9e7cc56..661b9d014a32d 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 export const BINARY_ENCODING = 'base64';
 export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
 
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index 22e1d8c87313d..a99040b000589 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -52,7 +52,7 @@ const AsyncFunction = (async () => {}).constructor as FunctionConstructor;
 
 const fnConstructors = {
 	sync: Function.prototype.constructor,
-	// eslint-disable-next-line @typescript-eslint/ban-types
+
 	async: AsyncFunction.prototype.constructor,
 	mock: () => {
 		throw new ExpressionError('Arbitrary code execution detected');
@@ -130,7 +130,7 @@ export class Expression {
 		// Is an expression
 
 		// Remove the equal sign
-		// eslint-disable-next-line no-param-reassign
+
 		parameterValue = parameterValue.substr(1);
 
 		// Generate a data proxy which allows to query workflow data
@@ -573,7 +573,7 @@ export class Expression {
 
 		// Data is an object
 		const returnData: INodeParameters = {};
-		// eslint-disable-next-line no-restricted-syntax
+
 		for (const [key, value] of Object.entries(parameterValue)) {
 			returnData[key] = resolveParameterValue(
 				value as NodeParameterValueType,
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index 06383a6c82890..8c33fd98c4cea 100644
--- a/packages/workflow/src/Extensions/ArrayExtensions.ts
+++ b/packages/workflow/src/Extensions/ArrayExtensions.ts
@@ -182,7 +182,7 @@ function chunk(value: unknown[], extraArgs: number[]) {
 	const chunks: unknown[][] = [];
 	for (let i = 0; i < value.length; i += chunkSize) {
 		// I have no clue why eslint thinks 2 numbers could be anything but that but here we are
-		// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+
 		chunks.push(value.slice(i, i + chunkSize));
 	}
 	return chunks;
@@ -275,7 +275,6 @@ function union(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	}
 	const newArr: unknown[] = Array.from(value);
 	for (const v of others) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		if (newArr.findIndex((w) => deepEqual(w, v, { strict: true })) === -1) {
 			newArr.push(v);
 		}
@@ -313,7 +312,6 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 		}
 	}
 	for (const v of others) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		if (value.findIndex((w) => deepEqual(w, v, { strict: true })) !== -1) {
 			newArr.push(v);
 		}
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index 5ad709654ad68..6389e9fcb2c0b 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -1,6 +1,5 @@
 import { ExpressionExtensionError } from './../ExpressionError';
-/* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
+
 import { DateTime } from 'luxon';
 import type {
 	DateTimeUnit,
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 6600f8e8ead68..809d7a488682d 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -88,7 +88,6 @@ export const hasNativeMethod = (method: string): boolean => {
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function parseWithEsprimaNext(source: string, options?: any): any {
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 	const ast = esprimaParse(source, {
 		loc: true,
 		locations: true,
@@ -451,7 +450,6 @@ interface FoundFunction {
 	function: Function;
 }
 
-// eslint-disable-next-line @typescript-eslint/ban-types
 function findExtendedFunction(input: unknown, functionName: string): FoundFunction | undefined {
 	// eslint-disable-next-line @typescript-eslint/ban-types
 	let foundFunction: Function | undefined;
@@ -479,12 +477,7 @@ function findExtendedFunction(input: unknown, functionName: string): FoundFuncti
 		const inputAny: any = input;
 		// This is likely a builtin we're implementing for another type
 		// (e.g. toLocaleString). We'll return that instead
-		if (
-			inputAny &&
-			functionName &&
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			typeof inputAny[functionName] === 'function'
-		) {
+		if (inputAny && functionName && typeof inputAny[functionName] === 'function') {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			return { type: 'native', function: inputAny[functionName] };
 		}
@@ -508,7 +501,6 @@ function findExtendedFunction(input: unknown, functionName: string): FoundFuncti
  * ```
  */
 export function extend(input: unknown, functionName: string, args: unknown[]) {
-	// eslint-disable-next-line @typescript-eslint/ban-types
 	const foundFunction = findExtendedFunction(input, functionName);
 
 	// No type specific or generic function found. Check to see if
@@ -522,7 +514,6 @@ export function extend(input: unknown, functionName: string, args: unknown[]) {
 		}
 
 		if (haveFunction.length > 1) {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			const lastType = `"${haveFunction.pop()!.typeName}"`;
 			const typeNames = `${haveFunction.map((v) => `"${v.typeName}"`).join(', ')}, and ${lastType}`;
 			throw new ExpressionExtensionError(
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index e1556d6e693aa..7274d4808c3a3 100644
--- a/packages/workflow/src/Extensions/ObjectExtensions.ts
+++ b/packages/workflow/src/Extensions/ObjectExtensions.ts
@@ -64,7 +64,7 @@ export function compact(value: object): object {
 		if (val !== null && val !== undefined && val !== 'nil' && val !== '') {
 			if (typeof val === 'object') {
 				if (Object.keys(val as object).length === 0) continue;
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
 				newObj[key] = compact(val);
 			} else {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index 00343a05fd01c..69a9cae1bdea4 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/unbound-method */
 // import { createHash } from 'crypto';
 import { titleCase } from 'title-case';
 import * as ExpressionError from '../ExpressionError';
@@ -295,7 +294,6 @@ function toSentenceCase(value: string) {
 		const charIndex = current.search(CHAR_TEST_REGEXP);
 		current =
 			current.slice(0, charIndex) +
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			current[charIndex]!.toLocaleUpperCase() +
 			current.slice(charIndex + 1).toLocaleLowerCase();
 		const puncIndex = current.search(PUNC_TEST_REGEXP);
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 58d691a85adfd..d7a3644756847 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-// eslint-disable-next-line max-classes-per-file
+
 import type * as express from 'express';
 import type FormData from 'form-data';
 import type { IncomingHttpHeaders } from 'http';
diff --git a/packages/workflow/src/LoggerProxy.ts b/packages/workflow/src/LoggerProxy.ts
index 57cf6419c96b6..24df176fff8e0 100644
--- a/packages/workflow/src/LoggerProxy.ts
+++ b/packages/workflow/src/LoggerProxy.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import type { ILogger, LogTypes } from './Interfaces';
 
 let logger: ILogger | undefined;
diff --git a/packages/workflow/src/NodeErrors.ts b/packages/workflow/src/NodeErrors.ts
index 451e9db5dcd98..77fd2f7bfb966 100644
--- a/packages/workflow/src/NodeErrors.ts
+++ b/packages/workflow/src/NodeErrors.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable no-param-reassign */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-// eslint-disable-next-line max-classes-per-file
+
 import { parseString } from 'xml2js';
 import { removeCircularRefs, isTraversableObject } from './utils';
 import type { IDataObject, INode, IStatusCodeMessages, JsonObject } from './Interfaces';
@@ -146,7 +143,6 @@ export abstract class NodeError extends ExecutionBaseError {
 		potentialKeys: string[],
 		traversalKeys: string[] = [],
 	): string | null {
-		// eslint-disable-next-line no-restricted-syntax
 		for (const key of potentialKeys) {
 			const value = jsonError[key];
 			if (value) {
@@ -178,7 +174,6 @@ export abstract class NodeError extends ExecutionBaseError {
 			}
 		}
 
-		// eslint-disable-next-line no-restricted-syntax
 		for (const key of traversalKeys) {
 			const value = jsonError[key];
 			if (isTraversableObject(value)) {
@@ -356,14 +351,13 @@ export class NodeApiError extends NodeError {
 	}
 
 	private setDescriptionFromXml(xml: string) {
-		// eslint-disable-next-line @typescript-eslint/naming-convention
 		parseString(xml, { explicitArray: false }, (_, result) => {
 			if (!result) return;
 
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			const topLevelKey = Object.keys(result)[0];
 			this.description = this.findProperty(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				result[topLevelKey],
 				ERROR_MESSAGE_PROPERTIES,
 				['Error'].concat(ERROR_NESTING_PROPERTIES),
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 8e658c0e43dbe..f13c9a1f6621c 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1,17 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
+
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-continue */
+
 /* eslint-disable prefer-spread */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 
@@ -415,7 +411,6 @@ export function getContext(
 	}
 
 	if (runExecutionData.executionData.contextData[key] === undefined) {
-		// eslint-disable-next-line no-param-reassign
 		runExecutionData.executionData.contextData[key] = {};
 	}
 
@@ -1258,7 +1253,6 @@ export const tryToParseObject = (value: unknown): object => {
 		return value;
 	}
 	try {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const o = JSON.parse(String(value));
 		if (typeof o !== 'object' || Array.isArray(o)) {
 			throw new Error(`The value "${String(value)}" is not a valid object.`);
@@ -1318,7 +1312,7 @@ export const validateResourceMapperParameter = (
 		const key = `${nodeProperties.name}.${field.id}`;
 		const fieldErrors: string[] = [];
 		if (field.required && !skipRequiredCheck) {
-			if (value.value === null || fieldValue === null || fieldValue === undefined) {
+			if (value.value === null || fieldValue === undefined) {
 				const error = `${fieldWordSingular} "${field.id}" is required`;
 				fieldErrors.push(error);
 			}
diff --git a/packages/workflow/src/ObservableObject.ts b/packages/workflow/src/ObservableObject.ts
index d5d0c8f422912..c9c2b7e9b301a 100644
--- a/packages/workflow/src/ObservableObject.ts
+++ b/packages/workflow/src/ObservableObject.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-underscore-dangle */
+
 import type { IDataObject, IObservableObject } from './Interfaces';
 
 interface IObservableOptions {
@@ -14,14 +13,13 @@ export function create(
 	option?: IObservableOptions,
 	depth?: number,
 ): IDataObject {
-	// eslint-disable-next-line no-param-reassign, @typescript-eslint/prefer-nullish-coalescing
+	// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 	depth = depth || 0;
 
 	// Make all the children of target also observable
-	// eslint-disable-next-line no-restricted-syntax
+
 	for (const key in target) {
 		if (typeof target[key] === 'object' && target[key] !== null) {
-			// eslint-disable-next-line no-param-reassign
 			target[key] = create(
 				target[key] as IDataObject,
 				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -37,7 +35,6 @@ export function create(
 		writable: true,
 	});
 	return new Proxy(target, {
-		// eslint-disable-next-line @typescript-eslint/no-shadow
 		deleteProperty(target, name) {
 			if (parent === undefined) {
 				// If no parent is given mark current data as changed
@@ -65,7 +62,6 @@ export function create(
 					typeof value === 'object' &&
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 					Object.keys(value).length === 0
-					// eslint-disable-next-line no-empty
 				) {
 				} else {
 					(target as IObservableObject).__dataChanged = true;
diff --git a/packages/workflow/src/RoutingNode.ts b/packages/workflow/src/RoutingNode.ts
index c79a318f536c0..4253a0d19aeaf 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/workflow/src/RoutingNode.ts
@@ -1,14 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-continue */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
+
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
@@ -359,7 +355,6 @@ export class RoutingNode {
 		if (action.type === 'setKeyValue') {
 			const returnData: INodeExecutionData[] = [];
 
-			// eslint-disable-next-line @typescript-eslint/no-loop-func
 			inputData.forEach((item) => {
 				const returnItem: IDataObject = {};
 				for (const key of Object.keys(action.properties)) {
@@ -454,7 +449,7 @@ export class RoutingNode {
 			}
 		} else {
 			// No postReceive functionality got defined so simply add data as it is
-			// eslint-disable-next-line no-lonely-if
+
 			if (Array.isArray(responseData.body)) {
 				returnData = responseData.body.map((json) => {
 					return {
@@ -814,7 +809,7 @@ export class RoutingNode {
 
 					if (nodeProperties.routing.send.type === 'body') {
 						// Send in "body"
-						// eslint-disable-next-line no-lonely-if
+
 						if (nodeProperties.routing.send.propertyInDotNotation === false) {
 							// eslint-disable-next-line @typescript-eslint/no-explicit-any
 							(returnData.options.body as Record<string, any>)![propertyName] = value;
@@ -823,7 +818,7 @@ export class RoutingNode {
 						}
 					} else {
 						// Send in "query"
-						// eslint-disable-next-line no-lonely-if
+
 						if (nodeProperties.routing.send.propertyInDotNotation === false) {
 							returnData.options.qs![propertyName] = value;
 						} else {
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 69231a167ef1e..29c1c28761ed0 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -161,7 +161,7 @@ export function generateNodesGraph(
 				nodeItem.src_instance_id = options.sourceInstanceId;
 			}
 
-			if (node.id && options?.nodeIdMap && options.nodeIdMap[node.id]) {
+			if (node.id && options?.nodeIdMap?.[node.id]) {
 				nodeItem.src_node_id = options.nodeIdMap[node.id];
 			}
 
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index 981717df1d8db..02c104d2dbee8 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -1,18 +1,11 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
+
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-for-in-array */
-/* eslint-disable no-prototype-builtins */
+
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable no-continue */
-/* eslint-disable no-restricted-syntax */
 
 import type {
 	IConnections,
@@ -214,7 +207,6 @@ export class Workflow {
 				continue;
 			}
 
-			// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
 			if (ignoreNodeTypes !== undefined && ignoreNodeTypes.includes(node.type)) {
 				continue;
 			}
@@ -482,7 +474,6 @@ export class Workflow {
 		const returnData: any = {};
 
 		for (const parameterName of Object.keys(parameterValue || {})) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			returnData[parameterName] = this.renameNodeInParameterValue(
 				parameterValue![parameterName as keyof typeof parameterValue],
 				currentName,
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index 68559fda2be84..2a044cfc91ed8 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -1,11 +1,8 @@
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-param-reassign */
+
 /* eslint-disable @typescript-eslint/no-this-alias */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable no-prototype-builtins */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { DateTime, Duration, Interval, Settings } from 'luxon';
 import * as jmespath from 'jmespath';
@@ -163,7 +160,7 @@ export class WorkflowDataProxy {
 				},
 				get(target, name, receiver) {
 					if (name === 'isProxy') return true;
-					// eslint-disable-next-line no-param-reassign
+
 					name = name.toString();
 					const contextData = NodeHelpers.getContext(that.runExecutionData!, 'node', node);
 
@@ -183,7 +180,7 @@ export class WorkflowDataProxy {
 				ownKeys(target) {
 					return Reflect.ownKeys(target);
 				},
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 				get(target, name, receiver) {
 					if (name === 'isProxy') return true;
 					name = name.toString();
@@ -326,7 +323,7 @@ export class WorkflowDataProxy {
 
 			const taskData = that.runExecutionData.resultData.runData[nodeName][runIndex].data!;
 
-			if (taskData.main === null || !taskData.main.length || taskData.main[0] === null) {
+			if (!taskData.main?.length || taskData.main[0] === null) {
 				// throw new Error(`No data found for item-index: "${itemIndex}"`);
 				throw new ExpressionError('No data found from "main" input.', {
 					runIndex: that.runIndex,
@@ -425,7 +422,7 @@ export class WorkflowDataProxy {
 								for (const propertyName in binaryData) {
 									if (propertyName === 'data') {
 										// Skip the data property
-										// eslint-disable-next-line no-continue
+
 										continue;
 									}
 									(returnData[keyName] as IDataObject)[propertyName] = binaryData[propertyName];
@@ -440,10 +437,7 @@ export class WorkflowDataProxy {
 						// Get node parameter data
 						return that.nodeParameterGetter(nodeName);
 					} else if (name === 'runIndex') {
-						if (
-							that.runExecutionData === null ||
-							!that.runExecutionData.resultData.runData[nodeName]
-						) {
+						if (!that.runExecutionData?.resultData.runData[nodeName]) {
 							return -1;
 						}
 						return that.runExecutionData.resultData.runData[nodeName].length - 1;
diff --git a/packages/workflow/src/WorkflowHooks.ts b/packages/workflow/src/WorkflowHooks.ts
index 3462719bc2f84..1f5ad85a96184 100644
--- a/packages/workflow/src/WorkflowHooks.ts
+++ b/packages/workflow/src/WorkflowHooks.ts
@@ -25,7 +25,7 @@ export class WorkflowHooks {
 		workflowData: IWorkflowBase,
 		optionalParameters?: IWorkflowHooksOptionalParameters,
 	) {
-		// eslint-disable-next-line no-param-reassign, @typescript-eslint/prefer-nullish-coalescing
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 		optionalParameters = optionalParameters || {};
 
 		this.hookFunctions = hookFunctions;
@@ -37,12 +37,10 @@ export class WorkflowHooks {
 		this.retryOf = optionalParameters.retryOf ?? undefined;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	async executeHookFunctions(hookName: string, parameters: any[]) {
 		if (this.hookFunctions[hookName] !== undefined && Array.isArray(this.hookFunctions[hookName])) {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion, no-restricted-syntax
 			for (const hookFunction of this.hookFunctions[hookName]!) {
-				// eslint-disable-next-line no-await-in-loop
 				await hookFunction.apply(this, parameters);
 			}
 		}
diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index 03e1f57472a5a..62eed4250f461 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -131,13 +131,7 @@ export function assert<T>(condition: T, msg?: string): asserts condition {
 }
 
 export const isTraversableObject = (value: any): value is JsonObject => {
-	return (
-		value &&
-		typeof value === 'object' &&
-		!Array.isArray(value) &&
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		!!Object.keys(value).length
-	);
+	return value && typeof value === 'object' && !Array.isArray(value) && !!Object.keys(value).length;
 };
 
 export const removeCircularRefs = (obj: JsonObject, seen = new Set()) => {
diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts
index 5409248d0615c..ad2b8c64b723e 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -79,7 +79,6 @@ export class Credentials extends ICredentials {
 			throw new Error('No data was set.');
 		}
 
-		// eslint-disable-next-line no-prototype-builtins
 		if (!fullData.hasOwnProperty(key)) {
 			throw new Error(`No data for key "${key}" exists.`);
 		}
@@ -327,7 +326,6 @@ export function getExecuteFunctions(
 						additionalData.sendMessageToUI(node.name, args);
 					}
 				} catch (error) {
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					console.error(`There was a problem sending message to UI: ${error.message}`);
 				}
 			},

From 9cf6c25df0d67ea6c0121105b1a8b3531e5cea7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 31 Jul 2023 11:37:09 +0200
Subject: [PATCH 089/116] refactor(core): Cache workflow ownership (#6738)

* refactor: Set up ownership service

* refactor: Specify cache keys and values

* refactor: Replace util with service calls

* test: Mock service in tests

* refactor: Use dependency injection

* test: Write tests

* refactor: Apply feedback from Omar and Micha

* test: Fix tests

* test: Fix missing spot

* refactor: Return user entity from cache

* refactor: More dependency injection!
---
 .../src/UserManagement/PermissionChecker.ts   |  8 ++-
 .../UserManagement/UserManagementHelper.ts    | 11 ---
 packages/cli/src/WaitTracker.ts               | 10 ++-
 packages/cli/src/WaitingWebhooks.ts           |  7 +-
 packages/cli/src/WebhookHelpers.ts            |  4 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  | 14 ++--
 packages/cli/src/commands/worker.ts           |  4 +-
 packages/cli/src/services/cache.service.ts    |  4 ++
 packages/cli/src/services/events.service.ts   | 13 ++--
 .../cli/src/services/ownership.service.ts     | 36 ++++++++++
 .../cli/test/unit/PermissionChecker.test.ts   | 20 +++---
 .../test/unit/services/events.service.test.ts | 11 ++-
 .../unit/services/ownership.service.test.ts   | 68 +++++++++++++++++++
 13 files changed, 166 insertions(+), 44 deletions(-)
 create mode 100644 packages/cli/src/services/ownership.service.ts
 create mode 100644 packages/cli/test/unit/services/ownership.service.test.ts

diff --git a/packages/cli/src/UserManagement/PermissionChecker.ts b/packages/cli/src/UserManagement/PermissionChecker.ts
index b8b851419aec0..8ea5080ea0224 100644
--- a/packages/cli/src/UserManagement/PermissionChecker.ts
+++ b/packages/cli/src/UserManagement/PermissionChecker.ts
@@ -9,9 +9,11 @@ import { In } from 'typeorm';
 import * as Db from '@/Db';
 import config from '@/config';
 import type { SharedCredentials } from '@db/entities/SharedCredentials';
-import { getRoleId, getWorkflowOwner, isSharingEnabled } from './UserManagementHelper';
+import { getRoleId, isSharingEnabled } from './UserManagementHelper';
 import { WorkflowsService } from '@/workflows/workflows.services';
 import { UserService } from '@/user/user.service';
+import { OwnershipService } from '@/services/ownership.service';
+import Container from 'typedi';
 
 export class PermissionChecker {
 	/**
@@ -101,7 +103,9 @@ export class PermissionChecker {
 			policy = 'workflowsFromSameOwner';
 		}
 
-		const subworkflowOwner = await getWorkflowOwner(subworkflow.id);
+		const subworkflowOwner = await Container.get(OwnershipService).getWorkflowOwnerCached(
+			subworkflow.id,
+		);
 
 		const errorToThrow = new SubworkflowOperationError(
 			`Target workflow ID ${subworkflow.id ?? ''} may not be called`,
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
index db65a7b13aece..fa80d8f2ffcac 100644
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -14,17 +14,6 @@ import { License } from '@/License';
 import { getWebhookBaseUrl } from '@/WebhookHelpers';
 import type { PostHogClient } from '@/posthog';
 
-export async function getWorkflowOwner(workflowId: string): Promise<User> {
-	const workflowOwnerRole = await Container.get(RoleRepository).findWorkflowOwnerRole();
-
-	const sharedWorkflow = await Db.collections.SharedWorkflow.findOneOrFail({
-		where: { workflowId, roleId: workflowOwnerRole?.id ?? undefined },
-		relations: ['user', 'user.globalRole'],
-	});
-
-	return sharedWorkflow.user;
-}
-
 export function isEmailSetUp(): boolean {
 	const smtp = config.getEnv('userManagement.emails.mode') === 'smtp';
 	const host = !!config.getEnv('userManagement.emails.smtp.host');
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 3711c4a74d341..a16f27d6237a2 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -16,10 +16,10 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
 import { WorkflowRunner } from '@/WorkflowRunner';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { recoverExecutionDataFromEventLogMessages } from './eventbus/MessageEventBus/recoverEvents';
 import { ExecutionRepository } from '@db/repositories';
 import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
+import { OwnershipService } from './services/ownership.service';
 
 @Service()
 export class WaitTracker {
@@ -32,7 +32,10 @@ export class WaitTracker {
 
 	mainTimer: NodeJS.Timeout;
 
-	constructor(private executionRepository: ExecutionRepository) {
+	constructor(
+		private executionRepository: ExecutionRepository,
+		private ownershipService: OwnershipService,
+	) {
 		// Poll every 60 seconds a list of upcoming executions
 		this.mainTimer = setInterval(() => {
 			void this.getWaitingExecutions();
@@ -180,7 +183,8 @@ export class WaitTracker {
 			if (!fullExecutionData.workflowData.id) {
 				throw new Error('Only saved workflows can be resumed.');
 			}
-			const user = await getWorkflowOwner(fullExecutionData.workflowData.id);
+			const workflowId = fullExecutionData.workflowData.id;
+			const user = await this.ownershipService.getWorkflowOwnerCached(workflowId);
 
 			const data: IWorkflowExecutionDataProcess = {
 				executionMode: fullExecutionData.mode,
diff --git a/packages/cli/src/WaitingWebhooks.ts b/packages/cli/src/WaitingWebhooks.ts
index 09789279acfab..f7857aa5470b5 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/WaitingWebhooks.ts
@@ -8,14 +8,15 @@ import * as WebhookHelpers from '@/WebhookHelpers';
 import { NodeTypes } from '@/NodeTypes';
 import type { IExecutionResponse, IResponseCallbackData, IWorkflowDb } from '@/Interfaces';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { ExecutionRepository } from '@db/repositories';
+import { OwnershipService } from './services/ownership.service';
 
 @Service()
 export class WaitingWebhooks {
 	constructor(
 		private nodeTypes: NodeTypes,
 		private executionRepository: ExecutionRepository,
+		private ownershipService: OwnershipService,
 	) {}
 
 	async executeWebhook(
@@ -83,7 +84,7 @@ export class WaitingWebhooks {
 		const { workflowData } = fullExecutionData;
 
 		const workflow = new Workflow({
-			id: workflowData.id!.toString(),
+			id: workflowData.id!,
 			name: workflowData.name,
 			nodes: workflowData.nodes,
 			connections: workflowData.connections,
@@ -95,7 +96,7 @@ export class WaitingWebhooks {
 
 		let workflowOwner;
 		try {
-			workflowOwner = await getWorkflowOwner(workflowData.id!.toString());
+			workflowOwner = await this.ownershipService.getWorkflowOwnerCached(workflowData.id!);
 		} catch (error) {
 			throw new ResponseHelper.NotFoundError('Could not find workflow');
 		}
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index e17377a1a1eb0..0184ad7835482 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -58,8 +58,8 @@ import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData'
 import { ActiveExecutions } from '@/ActiveExecutions';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { EventsService } from '@/services/events.service';
+import { OwnershipService } from './services/ownership.service';
 
 const pipeline = promisify(stream.pipeline);
 
@@ -175,7 +175,7 @@ export async function executeWebhook(
 		user = (workflowData as WorkflowEntity).shared[0].user;
 	} else {
 		try {
-			user = await getWorkflowOwner(workflowData.id);
+			user = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowData.id);
 		} catch (error) {
 			throw new ResponseHelper.NotFoundError('Cannot find workflow');
 		}
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 2541f0a450374..4c8dacf76b7ba 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -58,7 +58,6 @@ import { NodeTypes } from '@/NodeTypes';
 import { Push } from '@/push';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
 import { WorkflowsService } from './workflows/workflows.services';
@@ -66,6 +65,7 @@ import { InternalHooks } from '@/InternalHooks';
 import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
 import { ExecutionRepository } from '@db/repositories';
 import { EventsService } from '@/services/events.service';
+import { OwnershipService } from './services/ownership.service';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
@@ -146,7 +146,9 @@ export function executeErrorWorkflow(
 				// make sure there are no possible security gaps
 				return;
 			}
-			getWorkflowOwner(workflowId)
+
+			Container.get(OwnershipService)
+				.getWorkflowOwnerCached(workflowId)
 				.then((user) => {
 					void WorkflowHelpers.executeErrorWorkflow(errorWorkflow, workflowErrorData, user);
 				})
@@ -169,9 +171,11 @@ export function executeErrorWorkflow(
 			workflowData.nodes.some((node) => node.type === ERROR_TRIGGER_TYPE)
 		) {
 			Logger.verbose('Start internal error workflow', { executionId, workflowId });
-			void getWorkflowOwner(workflowId).then((user) => {
-				void WorkflowHelpers.executeErrorWorkflow(workflowId, workflowErrorData, user);
-			});
+			void Container.get(OwnershipService)
+				.getWorkflowOwnerCached(workflowId)
+				.then((user) => {
+					void WorkflowHelpers.executeErrorWorkflow(workflowId, workflowErrorData, user);
+				});
 		}
 	}
 }
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index bae186b574c14..d7efec8c0c79d 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -18,11 +18,11 @@ import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import config from '@/config';
 import type { Job, JobId, JobQueue, JobResponse, WebhookResponse } from '@/Queue';
 import { Queue } from '@/Queue';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { N8N_VERSION } from '@/constants';
 import { BaseCommand } from './BaseCommand';
 import { ExecutionRepository } from '@db/repositories';
+import { OwnershipService } from '@/services/ownership.service';
 
 export class Worker extends BaseCommand {
 	static description = '\nStarts a n8n worker';
@@ -112,7 +112,7 @@ export class Worker extends BaseCommand {
 			`Start job: ${job.id} (Workflow ID: ${workflowId} | Execution: ${executionId})`,
 		);
 
-		const workflowOwner = await getWorkflowOwner(workflowId);
+		const workflowOwner = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowId);
 
 		let { staticData } = fullExecutionData.workflowData;
 		if (loadStaticData) {
diff --git a/packages/cli/src/services/cache.service.ts b/packages/cli/src/services/cache.service.ts
index 1b10f20b4f0a3..b13a1c2dde73b 100644
--- a/packages/cli/src/services/cache.service.ts
+++ b/packages/cli/src/services/cache.service.ts
@@ -9,6 +9,10 @@ import { LoggerProxy, jsonStringify } from 'n8n-workflow';
 
 @Service()
 export class CacheService {
+	/**
+	 * Keys and values:
+	 * - `'cache:workflow-owner:${workflowId}'`: `User`
+	 */
 	private cache: RedisCache | MemoryCache | undefined;
 
 	async init() {
diff --git a/packages/cli/src/services/events.service.ts b/packages/cli/src/services/events.service.ts
index ec288fa23bb21..0b800a0d4b318 100644
--- a/packages/cli/src/services/events.service.ts
+++ b/packages/cli/src/services/events.service.ts
@@ -1,15 +1,18 @@
 import { EventEmitter } from 'events';
-import { Service } from 'typedi';
+import Container, { Service } from 'typedi';
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
 import { StatisticsNames } from '@db/entities/WorkflowStatistics';
 import { WorkflowStatisticsRepository } from '@db/repositories';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { UserService } from '@/user/user.service';
+import { OwnershipService } from './ownership.service';
 
 @Service()
 export class EventsService extends EventEmitter {
-	constructor(private repository: WorkflowStatisticsRepository) {
+	constructor(
+		private repository: WorkflowStatisticsRepository,
+		private ownershipService: OwnershipService,
+	) {
 		super({ captureRejections: true });
 		if ('SKIP_STATISTICS_EVENTS' in process.env) return;
 
@@ -41,7 +44,7 @@ export class EventsService extends EventEmitter {
 			const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId);
 
 			if (name === 'production_success' && upsertResult === 'insert') {
-				const owner = await getWorkflowOwner(workflowId);
+				const owner = await Container.get(OwnershipService).getWorkflowOwnerCached(workflowId);
 				const metrics = {
 					user_id: owner.id,
 					workflow_id: workflowId,
@@ -72,7 +75,7 @@ export class EventsService extends EventEmitter {
 		if (insertResult === 'failed') return;
 
 		// Compile the metrics since this was a new data loaded event
-		const owner = await getWorkflowOwner(workflowId);
+		const owner = await this.ownershipService.getWorkflowOwnerCached(workflowId);
 
 		let metrics = {
 			user_id: owner.id,
diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts
new file mode 100644
index 0000000000000..ec01bcca01881
--- /dev/null
+++ b/packages/cli/src/services/ownership.service.ts
@@ -0,0 +1,36 @@
+import { Service } from 'typedi';
+import { CacheService } from './cache.service';
+import { RoleRepository, SharedWorkflowRepository, UserRepository } from '@/databases/repositories';
+import type { User } from '@/databases/entities/User';
+
+@Service()
+export class OwnershipService {
+	constructor(
+		private cacheService: CacheService,
+		private userRepository: UserRepository,
+		private roleRepository: RoleRepository,
+		private sharedWorkflowRepository: SharedWorkflowRepository,
+	) {}
+
+	/**
+	 * Retrieve the user who owns the workflow. Note that workflow ownership is **immutable**.
+	 */
+	async getWorkflowOwnerCached(workflowId: string) {
+		const cachedValue = await this.cacheService.get<User>(`cache:workflow-owner:${workflowId}`);
+
+		if (cachedValue) return this.userRepository.create(cachedValue);
+
+		const workflowOwnerRole = await this.roleRepository.findWorkflowOwnerRole();
+
+		if (!workflowOwnerRole) throw new Error('Failed to find workflow owner role');
+
+		const sharedWorkflow = await this.sharedWorkflowRepository.findOneOrFail({
+			where: { workflowId, roleId: workflowOwnerRole.id },
+			relations: ['user', 'user.globalRole'],
+		});
+
+		void this.cacheService.set(`cache:workflow-owner:${workflowId}`, sharedWorkflow.user);
+
+		return sharedWorkflow.user;
+	}
+}
diff --git a/packages/cli/test/unit/PermissionChecker.test.ts b/packages/cli/test/unit/PermissionChecker.test.ts
index be12573b1deae..c3d4341ea9df0 100644
--- a/packages/cli/test/unit/PermissionChecker.test.ts
+++ b/packages/cli/test/unit/PermissionChecker.test.ts
@@ -23,6 +23,7 @@ import * as testDb from '../integration/shared/testDb';
 import { mockNodeTypesData } from './Helpers';
 import type { SaveCredentialFunction } from '../integration/shared/types';
 import { mockInstance } from '../integration/shared/utils/';
+import { OwnershipService } from '@/services/ownership.service';
 
 let mockNodeTypes: INodeTypes;
 let credentialOwnerRole: Role;
@@ -221,6 +222,7 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 	const userId = uuid();
 	const fakeUser = new User();
 	fakeUser.id = userId;
+	const ownershipService = mockInstance(OwnershipService);
 
 	const ownerMockRole = new Role();
 	ownerMockRole.name = 'owner';
@@ -234,9 +236,11 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 
 	test('sets default policy from environment when subworkflow has none', async () => {
 		config.set('workflows.callerPolicyDefaultOption', 'none');
-		jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockImplementation(async (workflowId) => {
-			return fakeUser;
-		});
+		jest
+			.spyOn(ownershipService, 'getWorkflowOwnerCached')
+			.mockImplementation(async (workflowId) => {
+				return fakeUser;
+			});
 		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
 
 		const subworkflow = new Workflow({
@@ -253,7 +257,7 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 
 	test('if sharing is disabled, ensures that workflows are owner by same user', async () => {
 		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
+			.spyOn(ownershipService, 'getWorkflowOwnerCached')
 			.mockImplementation(async (workflowId) => fakeUser);
 		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(false);
 		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
@@ -287,7 +291,7 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 	test('list of ids must include the parent workflow id', async () => {
 		const invalidParentWorkflowId = uuid();
 		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
+			.spyOn(ownershipService, 'getWorkflowOwnerCached')
 			.mockImplementation(async (workflowId) => fakeUser);
 		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
 		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
@@ -313,7 +317,7 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 
 	test('sameOwner passes when both workflows are owned by the same user', async () => {
 		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
+			.spyOn(ownershipService, 'getWorkflowOwnerCached')
 			.mockImplementation(async (workflowId) => fakeUser);
 		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(false);
 		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
@@ -336,7 +340,7 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 	test('workflowsFromAList works when the list contains the parent id', async () => {
 		const workflowId = uuid();
 		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
+			.spyOn(ownershipService, 'getWorkflowOwnerCached')
 			.mockImplementation(async (workflowId) => fakeUser);
 		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
 		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
@@ -362,7 +366,7 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 
 	test('should not throw when workflow policy is set to any', async () => {
 		jest
-			.spyOn(UserManagementHelper, 'getWorkflowOwner')
+			.spyOn(ownershipService, 'getWorkflowOwnerCached')
 			.mockImplementation(async (workflowId) => fakeUser);
 		jest.spyOn(UserManagementHelper, 'isSharingEnabled').mockReturnValue(true);
 		jest.spyOn(UserService, 'get').mockImplementation(async () => fakeUser);
diff --git a/packages/cli/test/unit/services/events.service.test.ts b/packages/cli/test/unit/services/events.service.test.ts
index 027e180cebf7d..cc640295575d8 100644
--- a/packages/cli/test/unit/services/events.service.test.ts
+++ b/packages/cli/test/unit/services/events.service.test.ts
@@ -15,13 +15,15 @@ import type { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
 import { WorkflowStatisticsRepository } from '@db/repositories';
 import { EventsService } from '@/services/events.service';
 import { UserService } from '@/user/user.service';
-import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { OwnershipService } from '@/services/ownership.service';
+import { mockInstance } from '../../integration/shared/utils';
 
 jest.mock('@/UserManagement/UserManagementHelper', () => ({ getWorkflowOwner: jest.fn() }));
 
 describe('EventsService', () => {
 	const dbType = config.getEnv('database.type');
 	const fakeUser = mock<User>({ id: 'abcde-fghij' });
+	const ownershipService = mockInstance(OwnershipService);
 
 	const entityManager = mock<EntityManager>();
 	const dataSource = mock<DataSource>({
@@ -36,10 +38,13 @@ describe('EventsService', () => {
 	LoggerProxy.init(mock<ILogger>());
 	config.set('diagnostics.enabled', true);
 	config.set('deployment.type', 'n8n-testing');
-	mocked(getWorkflowOwner).mockResolvedValue(fakeUser);
+	mocked(ownershipService.getWorkflowOwnerCached).mockResolvedValue(fakeUser);
 	const updateUserSettingsMock = jest.spyOn(UserService, 'updateUserSettings').mockImplementation();
 
-	const eventsService = new EventsService(new WorkflowStatisticsRepository(dataSource));
+	const eventsService = new EventsService(
+		new WorkflowStatisticsRepository(dataSource),
+		ownershipService,
+	);
 
 	const onFirstProductionWorkflowSuccess = jest.fn();
 	const onFirstWorkflowDataLoad = jest.fn();
diff --git a/packages/cli/test/unit/services/ownership.service.test.ts b/packages/cli/test/unit/services/ownership.service.test.ts
new file mode 100644
index 0000000000000..9de9169123a5d
--- /dev/null
+++ b/packages/cli/test/unit/services/ownership.service.test.ts
@@ -0,0 +1,68 @@
+import { OwnershipService } from '@/services/ownership.service';
+import { RoleRepository, SharedWorkflowRepository, UserRepository } from '@/databases/repositories';
+import { mockInstance } from '../../integration/shared/utils';
+import { Role } from '@/databases/entities/Role';
+import { randomInteger } from '../../integration/shared/random';
+import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
+import { CacheService } from '@/services/cache.service';
+import { User } from '@/databases/entities/User';
+
+const wfOwnerRole = () =>
+	Object.assign(new Role(), {
+		scope: 'workflow',
+		name: 'owner',
+		id: randomInteger(),
+	});
+
+describe('OwnershipService', () => {
+	const cacheService = mockInstance(CacheService);
+	const roleRepository = mockInstance(RoleRepository);
+	const userRepository = mockInstance(UserRepository);
+	const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
+
+	const ownershipService = new OwnershipService(
+		cacheService,
+		userRepository,
+		roleRepository,
+		sharedWorkflowRepository,
+	);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getWorkflowOwner()', () => {
+		test('should retrieve a workflow owner', async () => {
+			roleRepository.findWorkflowOwnerRole.mockResolvedValueOnce(wfOwnerRole());
+
+			const mockOwner = new User();
+			const mockNonOwner = new User();
+
+			const sharedWorkflow = Object.assign(new SharedWorkflow(), {
+				role: new Role(),
+				user: mockOwner,
+			});
+
+			sharedWorkflowRepository.findOneOrFail.mockResolvedValueOnce(sharedWorkflow);
+
+			const returnedOwner = await ownershipService.getWorkflowOwnerCached('some-workflow-id');
+
+			expect(returnedOwner).toBe(mockOwner);
+			expect(returnedOwner).not.toBe(mockNonOwner);
+		});
+
+		test('should throw if no workflow owner role found', async () => {
+			roleRepository.findWorkflowOwnerRole.mockRejectedValueOnce(new Error());
+
+			await expect(ownershipService.getWorkflowOwnerCached('some-workflow-id')).rejects.toThrow();
+		});
+
+		test('should throw if no workflow owner found', async () => {
+			roleRepository.findWorkflowOwnerRole.mockResolvedValueOnce(wfOwnerRole());
+
+			sharedWorkflowRepository.findOneOrFail.mockRejectedValue(new Error());
+
+			await expect(ownershipService.getWorkflowOwnerCached('some-workflow-id')).rejects.toThrow();
+		});
+	});
+});

From 5308f31094bb32b0e58b3d8b944c6378170f9055 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Mon, 31 Jul 2023 12:41:30 +0300
Subject: [PATCH 090/116] fix(editor): Prevent text edit dialog from re-opening
 in same tick (#6781)

* fix: prevent reopenning textedit dialog in same tick

* fix: add same logic for code edit dialog

* fix: remove stop modifier

* fix: blur input field when closing modal, removing default element-plus behaviour
---
 .../src/components/ParameterInput.vue          | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 39bb67a18dff6..2209b06fda086 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -486,6 +486,7 @@ export default defineComponent({
 			remoteParameterOptionsLoading: false,
 			remoteParameterOptionsLoadingIssues: null as string | null,
 			textEditDialogVisible: false,
+			editDialogClosing: false,
 			tempValue: '', //  el-date-picker and el-input does not seem to work without v-model so add one
 			CUSTOM_API_CALL_KEY,
 			activeCredentialType: '',
@@ -922,6 +923,11 @@ export default defineComponent({
 		},
 		closeCodeEditDialog() {
 			this.codeEditDialogVisible = false;
+
+			this.editDialogClosing = true;
+			void this.$nextTick(() => {
+				this.editDialogClosing = false;
+			});
 		},
 		closeExpressionEditDialog() {
 			this.expressionEditDialogVisible = false;
@@ -945,8 +951,18 @@ export default defineComponent({
 		},
 		closeTextEditDialog() {
 			this.textEditDialogVisible = false;
+
+			this.editDialogClosing = true;
+			void this.$nextTick(() => {
+				this.$refs.inputField?.blur?.();
+				this.editDialogClosing = false;
+			});
 		},
 		displayEditDialog() {
+			if (this.editDialogClosing) {
+				return;
+			}
+
 			if (this.editorType) {
 				this.codeEditDialogVisible = true;
 			} else {
@@ -975,7 +991,7 @@ export default defineComponent({
 		onResourceLocatorDrop(data: string) {
 			this.$emit('drop', data);
 		},
-		async setFocus() {
+		async setFocus(event: MouseEvent) {
 			if (['json'].includes(this.parameter.type) && this.getArgument('alwaysOpenEditWindow')) {
 				this.displayEditDialog();
 				return;

From 85484dadd354cc6913ca7ddaa3af7be5551dce53 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 31 Jul 2023 11:55:22 +0200
Subject: [PATCH 091/116] test(editor): Do not chain invoke calls after
 assertions in 24-ndv-paired-item e2e spec (no-changelog) (#6800)

* test(editor): Do not chaing invoke calls after assertions in 24-ndv-paired-item e2e spec

* Do not chaing realHover after assertion

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

* Remove .only

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>

---------

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 cypress/e2e/24-ndv-paired-item.cy.ts | 80 +++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index a2bb52772344c..9829a22d222e4 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -31,6 +31,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('exist')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
@@ -88,9 +91,13 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1000')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
-		ndv.getters.inputTableRow(1).realHover();
+
+			ndv.getters.inputTableRow(1).realHover();
 		cy.wait(50);
 		ndv.getters.outputHoveringItem().should('have.text', '1000');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
@@ -102,6 +109,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1111')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 		ndv.getters.inputTableRow(1).realHover();
@@ -139,31 +149,49 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1111')
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
-		ndv.getters.outputTableRow(1).should('have.text', '1111').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '1111');
+		ndv.getters.outputTableRow(1).realHover();
+
+
+		ndv.getters.outputTableRow(3).should('have.text', '4444');
+		ndv.getters.outputTableRow(3).realHover();
 
-		ndv.getters.outputTableRow(3).should('have.text', '4444').realHover();
 		ndv.getters
 			.inputTableRow(3)
 			.should('have.text', '4444')
+		ndv.getters
+			.inputTableRow(3)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
 		ndv.actions.changeOutputRunSelector('2 of 2 (6 items)');
 		cy.wait(50);
 
-		ndv.getters.inputTableRow(1).should('have.text', '1000').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1000');
+		ndv.getters.inputTableRow(1).realHover();
+
+		ndv.getters
+			.outputTableRow(1)
+			.should('have.text', '1000')
 		ndv.getters
 			.outputTableRow(1)
 			.should('have.text', '1000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(3).should('have.text', '2000').realHover();
+		ndv.getters.outputTableRow(3).should('have.text', '2000');
+		ndv.getters.outputTableRow(3).realHover();
+
 		ndv.getters
 			.inputTableRow(3)
 			.should('have.text', '2000')
+
+		ndv.getters
+			.inputTableRow(3)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 	});
@@ -190,6 +218,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1111')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 		ndv.getters.inputTableRow(1).realHover();
@@ -201,6 +232,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1000')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 		ndv.getters.outputTableRow(1).should('have.text', '1000');
@@ -212,8 +246,12 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '6666')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
+
 		ndv.getters.outputHoveringItem().should('not.exist');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
@@ -224,6 +262,7 @@ describe('NDV', () => {
 			.inputTableRow(1)
 			.should('have.text', "This is an item, but it's empty.")
 			.realHover();
+
 		ndv.getters.outputHoveringItem().should('have.length', 6);
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 	});
@@ -240,17 +279,27 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.switchOutputBranch('False Branch (2 items)');
-		ndv.getters.outputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '8888');
+		ndv.getters.outputTableRow(1).realHover();
+
 		ndv.getters
 			.inputTableRow(5)
 			.should('have.text', '8888')
+
+		ndv.getters
+			.inputTableRow(5)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(2).should('have.text', '9999').realHover();
+		ndv.getters.outputTableRow(2).should('have.text', '9999');
+		ndv.getters.outputTableRow(2).realHover();
+
 		ndv.getters
 			.inputTableRow(6)
 			.should('have.text', '9999')
+
+		ndv.getters
+			.inputTableRow(6)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
@@ -260,20 +309,27 @@ describe('NDV', () => {
 
 		ndv.actions.switchInputBranch('True Branch');
 		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
-		ndv.getters.outputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '8888')
+		ndv.getters.outputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.inputHoveringItem().should('not.exist');
 
-		ndv.getters.inputTableRow(1).should('have.text', '1111').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1111')
+		ndv.getters.inputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.outputHoveringItem().should('not.exist');
 
 		ndv.actions.switchInputBranch('False Branch');
-		ndv.getters.inputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '8888');
+		ndv.getters.inputTableRow(1).realHover();
 
 		ndv.actions.changeOutputRunSelector('2 of 2 (4 items)');
-		ndv.getters.outputTableRow(1).should('have.text', '1111').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '1111');
+		ndv.getters.outputTableRow(1).realHover();
 
 		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
-		ndv.getters.inputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '8888');
+		ndv.getters.inputTableRow(1).realHover();
 		ndv.getters.outputHoveringItem().should('have.text', '8888');
 		// todo there's a bug here need to fix ADO-534
 		// ndv.getters.outputHoveringItem().should('not.exist');

From ea95e0621e1d3c50b1224b55f26070089b5a7ab4 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Mon, 31 Jul 2023 11:25:34 +0100
Subject: [PATCH 092/116] fix(Todoist Node): Fix issue with section id being
 ignored (#6799)

---
 packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
index fbe65589c8343..cc25cfb5aa146 100644
--- a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
@@ -148,6 +148,9 @@ export class GetAllHandler implements OperationHandler {
 		if (filters.projectId) {
 			qs.project_id = filters.projectId as string;
 		}
+		if (filters.sectionId) {
+			qs.section_id = filters.sectionId as string;
+		}
 		if (filters.labelId) {
 			qs.label = filters.labelId as string;
 		}

From df3251726ef48c0bcbabce7ea88b7a00b8a93c9b Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Mon, 31 Jul 2023 12:32:08 +0200
Subject: [PATCH 093/116] test(editor): Add canvas actions E2E tests (#6723)
 (#6790)

* test(editor): Add canvas actions E2E tests (#6723)

* test(editor): Add canvas actions E2E tests

* test(editor): Open category items in node creator when category dropped on canvas

* test(editor): Have new position counted only once in drag

* test(editor): rename test

(cherry picked from commit 052d82b2208c1b2e6f62c6004822c6278c15278b)

* test: fix drag positioning
---
 cypress/e2e/12-canvas-actions.cy.ts           | 36 +++++++++++++++++++
 cypress/pages/workflow.ts                     |  3 ++
 cypress/support/commands.ts                   | 32 +++++++++++------
 cypress/support/index.ts                      |  2 +-
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |  4 +++
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index a4eaebc7be5a4..c536d0c69d69f 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -77,6 +77,42 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 	});
 
+	it('should add a connected node dragging from node creator', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		cy.get('.plus-endpoint').should('be.visible').click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
+		cy.drag(
+			WorkflowPage.getters.nodeCreatorNodeItems().first(),
+			[100, 100],
+			{
+				realMouse: true,
+				abs: true
+			}
+		);
+		cy.get('body').type('{esc}');
+		WorkflowPage.getters.canvasNodes().should('have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+	});
+
+	it('should open a category when trying to drag and drop it on the canvas', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		cy.get('.plus-endpoint').should('be.visible').click();
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.getters.nodeCreatorSearchBar().type(CODE_NODE_NAME);
+		cy.drag(
+			WorkflowPage.getters.nodeCreatorActionItems().first(),
+			[100, 100],
+			{
+				realMouse: true,
+				abs: true
+			}
+		);
+		WorkflowPage.getters.nodeCreatorCategoryItems().its('length').should('be.gt', 0);
+		WorkflowPage.getters.canvasNodes().should('have.length', 1);
+		WorkflowPage.getters.nodeConnections().should('have.length', 0);
+	});
+
 	it('should add disconnected node if nothing is selected', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		// Deselect nodes
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 7333db5c864c2..c6b624d0da4bf 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -100,6 +100,9 @@ export class WorkflowPage extends BasePage {
 		nodeCredentialsCreateOption: () => cy.getByTestId('node-credentials-select-item-new'),
 		nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'),
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
+		nodeCreatorNodeItems: () => cy.getByTestId('node-creator-node-item'),
+		nodeCreatorActionItems: () => cy.getByTestId('node-creator-action-item'),
+		nodeCreatorCategoryItems: () => cy.getByTestId('node-creator-category-item'),
 		ndvParameters: () => cy.getByTestId('parameter-item'),
 		nodeCredentialsLabel: () => cy.getByTestId('credentials-label'),
 		getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 1a1925b6a4697..9bf24ace8a1fb 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -103,19 +103,31 @@ Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) =>
 Cypress.Commands.add('drag', (selector, pos, options) => {
 	const index = options?.index || 0;
 	const [xDiff, yDiff] = pos;
-	const element = cy.get(selector).eq(index);
+	const element = typeof selector === 'string' ? cy.get(selector).eq(index) : selector;
 	element.should('exist');
 
-	const originalLocation = Cypress.$(selector)[index].getBoundingClientRect();
-
-	element.trigger('mousedown', { force: true });
-	element.trigger('mousemove', {
-		which: 1,
-		pageX: options?.abs ? xDiff : originalLocation.right + xDiff,
-		pageY: options?.abs ? yDiff : originalLocation.top + yDiff,
-		force: true,
+	element.then(([$el]) => {
+		const originalLocation = $el.getBoundingClientRect();
+		const newPosition = {
+			x: options?.abs ? xDiff : originalLocation.right + xDiff,
+			y: options?.abs ? yDiff : originalLocation.top + yDiff,
+		}
+
+		if(options?.realMouse) {
+			element.realMouseDown();
+			element.realMouseMove(newPosition.x, newPosition.y);
+			element.realMouseUp();
+		} else {
+			element.trigger('mousedown', {force: true});
+			element.trigger('mousemove', {
+				which: 1,
+				pageX: newPosition.x,
+				pageY: newPosition.y,
+				force: true,
+			});
+			element.trigger('mouseup', {force: true});
+		}
 	});
-	element.trigger('mouseup', { force: true });
 });
 
 Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 196a14d9ec083..f1602b3e06989 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -31,7 +31,7 @@ declare global {
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
-			drag(selector: string, target: [number, number], options?: {abs?: true, index?: number}): void;
+			drag(selector: string | Cypress.Chainable<JQuery<HTMLElement>>, target: [number, number], options?: {abs?: boolean, index?: number, realMouse?: boolean}): void;
 			draganddrop(draggableSelector: string, droppableSelector: string): void;
 		}
 	}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 9e871ad35d0bd..849c647380ef9 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -9,6 +9,7 @@
 		:title="displayName"
 		:show-action-arrow="showActionArrow"
 		:is-trigger="isTrigger"
+		:data-test-id="dataTestId"
 	>
 		<template #icon>
 			<node-icon :nodeType="nodeType" />
@@ -77,6 +78,9 @@ const description = computed<string>(() => {
 	}) as string;
 });
 const showActionArrow = computed(() => hasActions.value);
+const dataTestId = computed(() =>
+	hasActions.value ? 'node-creator-action-item' : 'node-creator-node-item',
+);
 
 const hasActions = computed(() => {
 	return nodeActions.value.length > 1;

From a9a2c9e492a1cba03c21ddb6c6a3244eb0e51f09 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, 31 Jul 2023 12:35:42 +0200
Subject: [PATCH 094/116] fix(core): Add missing primary key on the
 `execution_data` table on postgres (#6797)

---
 .../1690787606731-AddMissingPrimaryKeyOnExecutionData.ts | 9 +++++++++
 .../cli/src/databases/migrations/postgresdb/index.ts     | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts

diff --git a/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts b/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts
new file mode 100644
index 0000000000000..dbf0d1346fade
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1690787606731-AddMissingPrimaryKeyOnExecutionData.ts
@@ -0,0 +1,9 @@
+import type { IrreversibleMigration, MigrationContext } from '@/databases/types';
+
+export class AddMissingPrimaryKeyOnExecutionData1690787606731 implements IrreversibleMigration {
+	async up({ queryRunner, tablePrefix }: MigrationContext) {
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}execution_data" ADD PRIMARY KEY("executionId");`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 53066755a9a21..511b165a8a1dc 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -40,6 +40,7 @@ import { MigrateIntegerKeysToString1690000000000 } from './1690000000000-Migrate
 import { SeparateExecutionData1690000000020 } from './1690000000020-SeparateExecutionData';
 import { RemoveSkipOwnerSetup1681134145997 } from './1681134145997-RemoveSkipOwnerSetup';
 import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
+import { AddMissingPrimaryKeyOnExecutionData1690787606731 } from './1690787606731-AddMissingPrimaryKeyOnExecutionData';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -83,4 +84,5 @@ export const postgresMigrations: Migration[] = [
 	SeparateExecutionData1690000000020,
 	RemoveSkipOwnerSetup1681134145997,
 	RemoveResetPasswordColumns1690000000030,
+	AddMissingPrimaryKeyOnExecutionData1690787606731,
 ];

From a16b8fcbf288f0769225d6baa5369ce9fdc84a70 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Thu, 3 Aug 2023 14:00:18 +0200
Subject: [PATCH 095/116] fix: Review fixes

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/CodeNodeEditor/AskAI.vue   |  72 ++++++---
 .../CodeNodeEditor/CodeNodeEditor.vue         |  26 +---
 .../src/plugins/i18n/locales/en.json          | 146 ++++++++----------
 3 files changed, 120 insertions(+), 124 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 10a76c9e3d63f..3261774c7579b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,15 +1,22 @@
 <script setup lang="ts">
 import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { ref, defineEmits, computed } from 'vue';
-import { useDataSchema, useI18n } from '@/composables';
+import { useDataSchema, useI18n, useMessage, useToast } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
 import { useNDVStore, usePostHog, useRootStore } from '@/stores';
 import CircleLoader from './CircleLoader.vue';
 import { ASK_AI_EXPERIMENT } from '@/constants';
+import { executionDataToJson } from '@/utils';
+import type { BaseTextKey } from '@/plugins/i18n';
 
 const emit = defineEmits<{
 	submit: (code: string) => void;
+	replaceCode: (code: string) => void;
 }>();
+const props = defineProps<{
+	hasChanges: boolean;
+}>();
+
 const { getWorkflowSchema, getSchemaForExecutionData } = useDataSchema();
 const { i18n } = useI18n();
 const maxLength = 600;
@@ -23,32 +30,56 @@ const prompt = ref('');
 
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
 const loadingString = computed(() =>
-	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}`),
+	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}` as BaseTextKey),
 );
 async function onSubmit() {
-	startLoading();
+	const { getRestApiContext } = useRootStore();
+	const { ndvInputData } = useNDVStore();
+	const { showMessage, showError } = useToast();
+	const { alert } = useMessage();
 	const schema = getWorkflowSchema();
 
+	if (props.hasChanges) {
+		const confirmModal = await alert(i18n.baseText('codeNodeEditor.askAi.areYouSureToReplace'), {
+			title: i18n.baseText('codeNodeEditor.askAi.replaceCurrentCode'),
+			confirmButtonText: i18n.baseText('codeNodeEditor.askAi.generateCodeAndReplace'),
+			showClose: true,
+			showCancelButton: true,
+		});
+
+		if (confirmModal === 'cancel') {
+			return;
+		}
+	}
+	startLoading();
 	try {
-		const { ndvInputData } = useNDVStore();
+		const inputSchema = getSchemaForExecutionData(executionDataToJson(ndvInputData));
 		const version = useRootStore().versionCli;
 		const model =
 			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
 				? 'gpt-4'
 				: 'gpt-3.5-turbo-16k';
 
-		const { getRestApiContext } = useRootStore();
 		const { code } = await generateCodeForPrompt(getRestApiContext, {
 			question: prompt.value,
-			context: { schema },
+			context: { schema, inputSchema },
 			model,
 			n8nVersion: version,
 		});
 
 		stopLoading();
 		emit('replaceCode', { code });
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
+		});
 	} catch (error) {
 		console.log('Failed to generate code', error);
+		showError(
+			error,
+			i18n.baseText('codeNodeEditor.askAi.generationFailed'),
+			i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
+		);
 		stopLoading();
 	}
 }
@@ -115,24 +146,17 @@ function stopLoading() {
 					:class="$style.counter"
 					v-text="`${prompt.length} / ${maxLength}`"
 				/>
-				<n8n-tooltip placement="bottom">
-					<template #content>
-						<div>
-							{{ $locale.baseText('settings.communityNodes.upToDate.tooltip') }}
-						</div>
-					</template>
-					<span :class="$style.help"
-						><n8n-icon icon="question-circle" color="text-light" size="large" />{{
-							$locale.baseText('codeNodeEditor.askAi.help')
-						}}
-					</span>
-				</n8n-tooltip>
+				<a href="https://docs.n8n.io/api" target="_blank" :class="$style.help">
+					<n8n-icon icon="question-circle" color="text-light" size="large" />{{
+						$locale.baseText('codeNodeEditor.askAi.help')
+					}}
+				</a>
 			</div>
 			<N8nInput
 				v-model="prompt"
 				:class="$style.input"
 				type="textarea"
-				:rows="7"
+				:rows="6"
 				:maxlength="maxLength"
 				:placeholder="$locale.baseText('codeNodeEditor.askAi.placeholder')"
 			/>
@@ -146,7 +170,7 @@ function stopLoading() {
 			</div>
 			<n8n-tooltip :disabled="hasExecutionData" v-else>
 				<div>
-					<N8nButton :disabled="!hasExecutionData || !prompt" @click="onSubmit">{{
+					<N8nButton :disabled="!hasExecutionData || !prompt" @click="onSubmit" size="small">{{
 						$locale.baseText('codeNodeEditor.askAi.generateCode')
 					}}</N8nButton>
 				</div>
@@ -179,7 +203,10 @@ function stopLoading() {
 	border: 0 !important;
 }
 .input textarea {
+	font-size: var(--font-size-2xs);
 	padding-bottom: var(--spacing-2xl);
+	font-family: var(--font-family);
+	resize: none;
 }
 .intro {
 	font-weight: var(--font-weight-bold);
@@ -200,6 +227,7 @@ function stopLoading() {
 .help {
 	text-decoration: underline;
 	margin-left: auto;
+	color: #909399;
 }
 .meta {
 	display: flex;
@@ -207,7 +235,7 @@ function stopLoading() {
 	position: absolute;
 	bottom: var(--spacing-2xs);
 	left: var(--spacing-xs);
-	right: var(--spacing-m);
+	right: var(--spacing-xs);
 	z-index: 1;
 
 	* {
@@ -222,6 +250,6 @@ function stopLoading() {
 	padding: var(--spacing-2xs) var(--spacing-xs);
 	display: flex;
 	justify-content: flex-end;
-	border-top: 1px solid var(--color-foreground-dark);
+	border-top: 1px solid var(--border-color-base);
 }
 </style>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index c06be7410160d..effbed34b9edb 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -15,7 +15,7 @@
 				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
 			</el-tab-pane>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
-				<AskAI @replaceCode="onReplaceCode" />
+				<AskAI @replaceCode="onReplaceCode" :has-changes="initialValue !== content" />
 			</el-tab-pane>
 		</el-tabs>
 		<!-- If AskAi not enabled, there's no point in rendering tabs -->
@@ -142,24 +142,6 @@ export default defineComponent({
 	},
 	methods: {
 		async onReplaceCode({ code, mode }: { code: string; mode: CodeExecutionMode }) {
-			const hasChanges = this.initialValue !== this.content;
-
-			if (hasChanges) {
-				const confirmModal = await this.alert(
-					this.$locale.baseText('codeNodeEditor.askAi.areYouSureToReplace'),
-					{
-						title: this.$locale.baseText('codeNodeEditor.askAi.replaceCurrentCode'),
-						confirmButtonText: this.$locale.baseText('codeNodeEditor.askAi.generateCodeAndReplace'),
-						showClose: true,
-					},
-				);
-
-				if (confirmModal === 'cancel') {
-					this.activeTab = 'code';
-					return;
-				}
-			}
-
 			this.workflowsStore.updateNodeProperties({
 				name: this.ndvStore.activeNode.name,
 				properties: { parameters: { mode } },
@@ -350,15 +332,17 @@ export default defineComponent({
 		border-radius: 0px var(--border-radius-base) var(--border-radius-base);
 	}
 	:global(.el-tabs__header) {
-		border-bottom: 0;
+		border-bottom: 0 !important;
 	}
 	:global(.el-tabs__nav) {
 		padding: 0;
 	}
 	:global(.el-tabs__item) {
-		padding: var(--spacing-5xs) var(--spacing-2xs);
+		padding: var(--spacing-5xs) var(--spacing-2xs) !important;
 		height: auto;
 		line-height: var(--font-line-height-xloose);
+		font-weight: var(--font-weight-regular);
+		font-size: var(--font-size-2xs);
 
 		&:not([aria-selected='true']) {
 			background-color: var(--color-background-base);
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index e085c3e6245bb..2fb38938635eb 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1,33 +1,21 @@
 {
-	"_reusableBaseText": {
-		"cancel": "Cancel",
-		"codeNodeEditor": {
-			"linter": {
-				"useJson": "Access the properties of an item under `.json`, e.g. `item.json`"
-			},
-			"completer": {
-				"all": "Get all items",
-				"first": "Get the first item",
-				"last": "Get the last item",
-				"itemMatching": "Get the item matching a specified input item. Pass the input item index"
-			}
-		},
-		"name": "Name",
-		"save": "Save",
-		"dismiss": "Dismiss",
-		"unlimited": "Unlimited",
-		"activate": "Activate",
-		"error": "Error"
-	},
-	"_reusableDynamicText": {
-		"readMore": "Read more",
-		"learnMore": "Learn more",
-		"moreInfo": "More info",
-		"oauth2": {
-			"clientId": "Client ID",
-			"clientSecret": "Client Secret"
-		}
-	},
+	"_reusableBaseText.cancel": "Cancel",
+	"_reusableBaseText.codeNodeEditor.linter.useJson": "Access the properties of an item under `.json`, e.g. `item.json`",
+	"_reusableBaseText.codeNodeEditor.completer.all": "Get all items",
+	"_reusableBaseText.codeNodeEditor.completer.first": "Get the first item",
+	"_reusableBaseText.codeNodeEditor.completer.last": "Get the last item",
+	"_reusableBaseText.codeNodeEditor.completer.itemMatching": "Get the item matching a specified input item. Pass the input item index",
+	"_reusableBaseText.name": "Name",
+	"_reusableBaseText.save": "Save",
+	"_reusableBaseText.dismiss": "Dismiss",
+	"_reusableDynamicText.readMore": "Read more",
+	"_reusableDynamicText.learnMore": "Learn more",
+	"_reusableDynamicText.moreInfo": "More info",
+	"_reusableDynamicText.oauth2.clientId": "Client ID",
+	"_reusableDynamicText.oauth2.clientSecret": "Client Secret",
+	"_reusableBaseText.unlimited": "Unlimited",
+	"_reusableBaseText.activate": "Activate",
+	"_reusableBaseText.error": "Error",
 	"generic.any": "Any",
 	"generic.cancel": "Cancel",
 	"generic.confirm": "Confirm",
@@ -288,7 +276,7 @@
 	"codeNodeEditor.askAi.intro": "Hey AI, generate JavaScript code that...",
 	"codeNodeEditor.askAi.help": "Help",
 	"codeNodeEditor.askAi.generateCode": "Generate Code",
-	"codeNodeEditor.askAi.noInputData": "No input data yet. Please execute the input node first",
+	"codeNodeEditor.askAi.noInputData": "You can generate code once this node has incoming input data (from a node earlier in your workflow)",
 	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
 	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",
 	"codeNodeEditor.askAi.areYouSureToReplace": "Are you sure you want to generate new code? Your current code will be replaced.",
@@ -300,6 +288,11 @@
 	"codeNodeEditor.askAi.loadingPhrase5": "Checking on Stack Overflow…",
 	"codeNodeEditor.askAi.loadingPhrase6": "Crunching data, AI-style…",
 	"codeNodeEditor.askAi.loadingPhrase7": "Stand by, AI magic at work…",
+	"codeNodeEditor.askAi.generationCompleted": "✨ Code generation completed",
+	"codeNodeEditor.askAi.generationFailed": "Code generation failed",
+	"codeNodeEditor.askAi.generationFailedUnknown": "Code generation failed due to an unknown reason. Try again in a few minutes.",
+	"codeNodeEditor.askAi.generationFailedDown": "We're sorry, our AI service is currently unavailable. Please try again later. If the problem persists, contact support.",
+	"codeNodeEditor.askAi.generationFailedRate": "We've hit our rate limit with our AI partner (too many requests). Please wait a minute before trying again.",
 	"codeNodeEditor.tabs.askAi": "✨ Ask AI",
 	"codeNodeEditor.tabs.code": "Code",
 	"collectionParameter.choose": "Choose...",
@@ -428,9 +421,9 @@
 	"dataMapping.dragFromPreviousHint": "Map data from previous nodes to <b>{name}</b> by first clicking this button",
 	"dataMapping.success.title": "You just mapped some data!",
 	"dataMapping.success.moreInfo": "Check out our <a href=\"https://docs.n8n.io/data/data-mapping\" target=\"_blank\">docs</a> for more details on mapping data in n8n",
-	"dataMapping.tableHint": "<img src='/static/data-mapping-gif.gif'/><br/> Drag a column onto <b>{name}</b> to map it",
-	"dataMapping.jsonHint": "<img src='/static/json-mapping-gif.gif'/><br/> Drag a JSON key onto <b>{name}</b> to map data",
-	"dataMapping.schemaHint": "<img src='/static/schema-mapping-gif.gif'/><br/> Drag a datapill onto <b>{name}</b> to map data",
+	"dataMapping.tableHint": "<img src='/static/data-mapping-gif.gif'/> Drag a column onto <b>{name}</b> to map it",
+	"dataMapping.jsonHint": "<img src='/static/json-mapping-gif.gif'/> Drag a JSON key onto <b>{name}</b> to map data",
+	"dataMapping.schemaHint": "<img src='/static/schema-mapping-gif.gif'/> Drag a datapill onto <b>{name}</b> to map data",
 	"dataMapping.tableView.tableColumnsExceeded": "Some columns are hidden",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip": "Your data has more than {columnLimit} columns so some are hidden. Switch to {link} to see all data.",
 	"dataMapping.tableView.tableColumnsExceeded.tooltip.link": "JSON view",
@@ -571,8 +564,8 @@
 	"executionsFilter.customData.inputTooltip.link": "View plans",
 	"executionsFilter.customData.docsTooltip": "Filter executions by data that you have explicitly saved in them (by calling $execution.customData.set(key, value)). {link}",
 	"executionsFilter.customData.docsTooltip.link": "More info",
-	"expressionEdit.anythingInside": "Anything inside ",
-	"expressionEdit.isJavaScript": " is JavaScript.",
+	"expressionEdit.anythingInside": "Anything inside",
+	"expressionEdit.isJavaScript": "is JavaScript.",
 	"expressionEdit.learnMore": "Learn more",
 	"expressionEdit.editExpression": "Edit Expression",
 	"expressionEdit.expression": "Expression",
@@ -583,6 +576,10 @@
 	"expressionModalInput.undefined": "[undefined]",
 	"expressionModalInput.null": "null",
 	"fakeDoor.settings.environments.name": "Environments",
+	"fakeDoor.settings.environments.infoText": "Environments allow you to use different settings and credentials in a workflow when you're building it vs when it's running in production",
+	"fakeDoor.settings.environments.actionBox.title": "We’re working on environments (as a paid feature)",
+	"fakeDoor.settings.environments.actionBox.title.cloud": "We’re working on this",
+	"fakeDoor.settings.environments.actionBox.description": "If you'd like to be the first to hear when it's ready, join the list.",
 	"fakeDoor.settings.sso.name": "Single Sign-On",
 	"fakeDoor.settings.sso.actionBox.title": "We’re working on this (as a paid feature)",
 	"fakeDoor.settings.sso.actionBox.title.cloud": "We’re working on this",
@@ -614,12 +611,8 @@
 	"genericHelpers.minShort": "m",
 	"genericHelpers.sec": "sec",
 	"genericHelpers.secShort": "s",
-	"readOnly.showMessage.executions.message": "Executions are read-only. Make changes from the <b>Workflow</b> tab.",
-	"readOnly.showMessage.executions.title": "Cannot edit execution",
-	"readOnlyEnv.showMessage.executions.message": "Executions are read-only.",
-	"readOnlyEnv.showMessage.executions.title": "Cannot edit execution",
-	"readOnlyEnv.showMessage.workflows.message": "Workflows are read-only in protected instances.",
-	"readOnlyEnv.showMessage.workflows.title": "Cannot edit workflow",
+	"genericHelpers.showMessage.message": "Executions are read-only. Make changes from the <b>Workflow</b> tab.",
+	"genericHelpers.showMessage.title": "Cannot edit execution",
 	"mainSidebar.aboutN8n": "About n8n",
 	"mainSidebar.confirmMessage.workflowDelete.cancelButtonText": "",
 	"mainSidebar.confirmMessage.workflowDelete.confirmButtonText": "Yes, delete",
@@ -749,7 +742,7 @@
 	"node.waitingForYouToCreateAnEventIn": "Waiting for you to create an event in {nodeType}",
 	"node.discovery.pinData.canvas": "You can pin this output instead of waiting for a test event. Open node to do so.",
 	"node.discovery.pinData.ndv": "You can pin this output instead of waiting for a test event.",
-	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node \n or drag to connect",
+	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node<br />or drag to connect",
 	"nodeCreator.actionsPlaceholderNode.scheduleTrigger": "On a Schedule",
 	"nodeCreator.actionsPlaceholderNode.webhook": "On a Webhook call",
 	"nodeCreator.actionsCategory.actions": "Actions",
@@ -944,8 +937,8 @@
 	"openWorkflow.workflowImportError": "Could not import workflow",
 	"openWorkflow.workflowNotFoundError": "Could not find workflow",
 	"parameterInput.expressionResult": "e.g. {result}",
-	"parameterInput.anythingInside": "Anything inside ",
-	"parameterInput.isJavaScript": " is JavaScript.",
+	"parameterInput.anythingInside": "Anything inside",
+	"parameterInput.isJavaScript": "is JavaScript.",
 	"parameterInput.learnMore": "Learn more",
 	"parameterInput.resultForItem": "Result for Item",
 	"parameterInput.emptyString": "[empty]",
@@ -1181,7 +1174,7 @@
 	"settings.communityNodes.installModal.description": "Find community nodes to add on the npm public registry.",
 	"settings.communityNodes.browseButton.label": "Browse",
 	"settings.communityNodes.installModal.packageName.label": "npm Package Name",
-	"settings.communityNodes.installModal.packageName.tooltip": "<img src='/static/community_package_tooltip_img.png'/><p>This is the title of the package on <a href='{npmURL}'>npmjs.com</a></p><p>Install a specific version by adding it after {'@'}, e.g. <code>package-name{'@'}0.15.0</code></p>",
+	"settings.communityNodes.installModal.packageName.tooltip": "<img src='/static/community_package_tooltip_img.png'/><p>This is the title of the package on <a href='{npmURL}'>npmjs.com</a></p><p>Install a specific version by adding it after @, e.g. <code>package-name@0.15.0</code></p>",
 	"settings.communityNodes.installModal.packageName.placeholder": "e.g. n8n-nodes-chatwork",
 	"settings.communityNodes.installModal.checkbox.label": "I understand the risks of installing unverified code from a public source.",
 	"settings.communityNodes.installModal.installButton.label": "Install",
@@ -1273,7 +1266,7 @@
 	"settings.log-streaming": "Log Streaming",
 	"settings.log-streaming.heading": "Log Streaming",
 	"settings.log-streaming.add": "Add new destination",
-	"settings.log-streaming.actionBox.title": "Available on the Enterprise plan",
+	"settings.log-streaming.actionBox.title": "Available on Enterprise plan",
 	"settings.log-streaming.actionBox.description": "Log Streaming is available as a paid feature. Learn more about it.",
 	"settings.log-streaming.actionBox.button": "See plans",
 	"settings.log-streaming.infoText": "Send logs to external endpoints of your choice. You can also write logs to a file or the console using environment variables. <a href=\"https://docs.n8n.io/log-streaming/\" target=\"_blank\">More info</a>",
@@ -1308,7 +1301,7 @@
 	"settings.log-streaming.addDestination": "Add new destination",
 	"settings.log-streaming.destinations": "Log destinations",
 	"settings.api.trial.upgradePlan.title": "Upgrade to use API",
-	"settings.api.trial.upgradePlan.description": "To prevent abuse, we limit API access to your workspace during your trial. If this is hindering your evaluation of n8n, please contact <a href=\"mailto:support{'@'}n8n.io\">support{'@'}n8n.io</a>",
+	"settings.api.trial.upgradePlan.description": "To prevent abuse, we limit API access to your workspace during your trial. If this is hindering your evaluation of n8n, please contact <a href=\"mailto:support@n8n.io\">support@n8n.io</a>",
 	"settings.api.trial.upgradePlan.cta": "Upgrade plan",
 	"settings.api.create.description": "Control n8n programmatically using the <a href=\"https://docs.n8n.io/api\" target=\"_blank\">n8n API</a>",
 	"settings.api.create.button": "Create an API Key",
@@ -1351,8 +1344,8 @@
 	"settings.usageAndPlan.license.activation.success.message": "Your {name} {type} has been successfully activated.",
 	"settings.usageAndPlan.desktop.title": "Upgrade to n8n Cloud for the full experience",
 	"settings.usageAndPlan.desktop.description": "Cloud plans allow you to collaborate with teammates. Plus you don’t need to leave this app open all the time for your workflows to run.",
-	"settings.sourceControl.title": "Environments",
-	"settings.sourceControl.actionBox.title": "Available on the Enterprise plan",
+	"settings.sourceControl.title": "Source Control",
+	"settings.sourceControl.actionBox.title": "Available on Enterprise plan",
 	"settings.sourceControl.actionBox.description": "Use multiple instances for different environments (dev, prod, etc.), deploying between them via a Git repository.",
 	"settings.sourceControl.actionBox.description.link": "More info",
 	"settings.sourceControl.actionBox.buttonText": "See plans",
@@ -1360,13 +1353,13 @@
 	"settings.sourceControl.description.link": "More info",
 	"settings.sourceControl.gitConfig": "Git configuration",
 	"settings.sourceControl.repoUrl": "Git repository URL (SSH)",
-	"settings.sourceControl.repoUrlPlaceholder": "e.g. git{'@'}github.com:my-team/my-repository",
+	"settings.sourceControl.repoUrlPlaceholder": "e.g. git@github.com:my-team/my-repository",
 	"settings.sourceControl.repoUrlInvalid": "The Git repository URL is not valid",
 	"settings.sourceControl.authorName": "Commit author  name",
 	"settings.sourceControl.authorEmail": "Commit author  email",
 	"settings.sourceControl.authorEmailInvalid": "The provided email is not correct",
 	"settings.sourceControl.sshKey": "SSH Key",
-	"settings.sourceControl.sshKeyDescription": "Paste the SSH key in your git repository/account settings. {link}",
+	"settings.sourceControl.sshKeyDescription": "Paste the SSH key in your git repository settings. {link}.",
 	"settings.sourceControl.sshKeyDescriptionLink": "More info",
 	"settings.sourceControl.refreshSshKey": "Refresh Key",
 	"settings.sourceControl.refreshSshKey.successful.title": "SSH Key refreshed successfully",
@@ -1377,8 +1370,9 @@
 	"settings.sourceControl.button.save": "Save settings",
 	"settings.sourceControl.instanceSettings": "Instance settings",
 	"settings.sourceControl.branches": "Branch connected to this n8n instance",
-	"settings.sourceControl.protected": "{bold}: prevent editing workflows (recommended for production environments).",
-	"settings.sourceControl.protected.bold": "Protected instance",
+	"settings.sourceControl.readonly": "{bold}: prevent editing workflows (recommended for production environments). {link}",
+	"settings.sourceControl.readonly.bold": "Read-only instance",
+	"settings.sourceControl.readonly.link": "Learn more.",
 	"settings.sourceControl.color": "Color",
 	"settings.sourceControl.switchBranch.title": "Switch to {branch} branch",
 	"settings.sourceControl.switchBranch.description": "Please confirm you want to switch the current n8n instance to the branch: {branch}",
@@ -1389,30 +1383,26 @@
 	"settings.sourceControl.button.push": "Push",
 	"settings.sourceControl.button.pull": "Pull",
 	"settings.sourceControl.modals.push.title": "Commit and push changes",
-	"settings.sourceControl.modals.push.description": "Workflows you push will overwrite any existing versions in the repository. ",
-	"settings.sourceControl.modals.push.description.learnMore": "More info",
+	"settings.sourceControl.modals.push.description": "Select the files you want to stage in your commit and add a commit message. ",
+	"settings.sourceControl.modals.push.description.workflows": "Since you are on the Workflows page, the modified workflow files have been pre-selected for you.",
+	"settings.sourceControl.modals.push.description.workflow": "Since you are currently editing a Workflow, the modified workflow file has been pre-selected for you.",
+	"settings.sourceControl.modals.push.description.credentials": "Since you are on the Credentials page, the modified credential files have been pre-selected for you.",
+	"settings.sourceControl.modals.push.description.learnMore": "Learn more",
+	"settings.sourceControl.modals.push.description.learnMore.url": "https://docs.n8n.io/source-control/using/",
 	"settings.sourceControl.modals.push.filesToCommit": "Files to commit",
-	"settings.sourceControl.modals.push.workflowsToCommit": "Select workflows",
+	"settings.sourceControl.modals.push.workflowsToCommit": "Workflows to commit",
 	"settings.sourceControl.modals.push.everythingIsUpToDate": "Everything is up to date",
-	"settings.sourceControl.modals.push.noWorkflowChanges": "No workflow changes to push. Only modified credentials, variables, and tags will be pushed. {link}",
-	"settings.sourceControl.modals.push.noWorkflowChanges.moreInfo": "More info",
+	"settings.sourceControl.modals.push.overrideVersionInGit": "This will override the version in Git",
 	"settings.sourceControl.modals.push.commitMessage": "Commit message",
 	"settings.sourceControl.modals.push.commitMessage.placeholder": "e.g. My commit",
 	"settings.sourceControl.modals.push.buttons.cancel": "Cancel",
 	"settings.sourceControl.modals.push.buttons.save": "Commit and Push",
 	"settings.sourceControl.modals.push.success.title": "Pushed successfully",
 	"settings.sourceControl.modals.push.success.description": "The files you selected were committed and pushed to the remote repository",
-	"settings.sourceControl.status.modified": "Modified",
-	"settings.sourceControl.status.deleted": "Deleted",
-	"settings.sourceControl.status.created": "New",
-	"settings.sourceControl.pull.oneLastStep.title": "One last step",
-	"settings.sourceControl.pull.oneLastStep.description": "You have new creds/vars. Fill them out to make sure your workflows function properly",
 	"settings.sourceControl.pull.success.title": "Pulled successfully",
-	"settings.sourceControl.pull.upToDate.title": "Up to date",
-	"settings.sourceControl.pull.upToDate.description": "No workflow changes to pull from Git",
-	"settings.sourceControl.modals.pull.title": "Pull changes",
-	"settings.sourceControl.modals.pull.description": "These workflows will be updated, and any local changes to them will be overridden. To keep the local version, push it before pulling.",
-	"settings.sourceControl.modals.pull.description.learnMore": "More info",
+	"settings.sourceControl.pull.success.description": "Make sure you fill out the details of any new credentials or variables",
+	"settings.sourceControl.modals.pull.title": "Override local changes?",
+	"settings.sourceControl.modals.pull.description": "Some remote changes are going to override some of your local changes. Are you sure you want to continue?",
 	"settings.sourceControl.modals.pull.buttons.cancel": "@:_reusableBaseText.cancel",
 	"settings.sourceControl.modals.pull.buttons.save": "Pull and override",
 	"settings.sourceControl.modals.disconnect.title": "Disconnect Git repository",
@@ -1423,7 +1413,6 @@
 	"settings.sourceControl.modals.refreshSshKey.message": "This will delete the current SSH key and create a new one. You will not be able to authenticate with the current key anymore.",
 	"settings.sourceControl.modals.refreshSshKey.cancel": "Cancel",
 	"settings.sourceControl.modals.refreshSshKey.confirm": "Refresh key",
-	"settings.sourceControl.loading.connecting": "Connecting",
 	"settings.sourceControl.toast.connected.title": "Git repository connected",
 	"settings.sourceControl.toast.connected.message": "Select the branch to complete the configuration",
 	"settings.sourceControl.toast.connected.error": "Error connecting to Git",
@@ -1431,21 +1420,18 @@
 	"settings.sourceControl.toast.disconnected.message": "You can no longer sync your instance with the remote repository",
 	"settings.sourceControl.toast.disconnected.error": "Error disconnecting from Git",
 	"settings.sourceControl.loading.pull": "Pulling from remote",
-	"settings.sourceControl.loading.checkingForChanges": "Checking for changes",
 	"settings.sourceControl.loading.push": "Pushing to remote",
 	"settings.sourceControl.lastUpdated": "Last updated {date} at {time}",
 	"settings.sourceControl.saved.title": "Settings successfully saved",
 	"settings.sourceControl.refreshBranches.tooltip": "Reload branches list",
 	"settings.sourceControl.refreshBranches.success": "Branches successfully refreshed",
 	"settings.sourceControl.refreshBranches.error": "Error refreshing branches",
-	"settings.sourceControl.docs.url": "https://docs.n8n.io/source-control-environments/",
-	"settings.sourceControl.docs.setup.url": "https://docs.n8n.io/source-control-environments/setup/",
-	"settings.sourceControl.docs.setup.ssh.url": "https://docs.n8n.io/source-control-environments/setup/#step-3-set-up-a-deploy-key",
-	"settings.sourceControl.docs.using.url": "https://docs.n8n.io/source-control-environments/using/",
-	"settings.sourceControl.docs.using.pushPull.url": "https://docs.n8n.io/source-control-environments/using/push-pull",
+	"settings.sourceControl.docs.url": "https://docs.n8n.io/source-control/",
+	"settings.sourceControl.docs.setup.url": "https://docs.n8n.io/source-control/setup/",
+	"settings.sourceControl.docs.using.url": "https://docs.n8n.io/source-control/using/",
 	"showMessage.cancel": "@:_reusableBaseText.cancel",
 	"settings.auditLogs.title": "Audit Logs",
-	"settings.auditLogs.actionBox.title": "Available on the Enterprise plan",
+	"settings.auditLogs.actionBox.title": "Available on Enterprise plan",
 	"settings.auditLogs.actionBox.description": "Upgrade to see the audit logs of your n8n instance.",
 	"settings.auditLogs.actionBox.buttonText": "See plans",
 	"showMessage.ok": "OK",
@@ -1766,8 +1752,6 @@
 	"variables.empty.heading.userNotSetup": "Set up a variable",
 	"variables.empty.description": "Variables can be used to store data that can be referenced easily across multiple workflows.",
 	"variables.empty.button": "Add first variable",
-	"variables.empty.notAllowedToCreate.heading": "{name}, start using variables",
-	"variables.empty.notAllowedToCreate.description": "Ask your n8n instance owner to create the variables you need. Once configured, you can utilize them in your workflows using the syntax $vars.MY_VAR.",
 	"variables.noResults": "No variables found",
 	"variables.sort.nameAsc": "Sort by name (A-Z)",
 	"variables.sort.nameDesc": "Sort by name (Z-A)",
@@ -1817,7 +1801,7 @@
 	"contextual.workflows.sharing.unavailable.button.cloud": "Upgrade now",
 	"contextual.workflows.sharing.unavailable.button.desktop": "View plans",
 
-	"contextual.variables.unavailable.title": "Available on the Enterprise plan",
+	"contextual.variables.unavailable.title": "Available on Enterprise plan",
 	"contextual.variables.unavailable.title.cloud": "Available on Pro plan",
 	"contextual.variables.unavailable.title.desktop": "Upgrade to n8n Cloud to collaborate",
 	"contextual.variables.unavailable.description": "Variables can be used to store and access data across workflows. Reference them in n8n using the prefix <code>$vars</code> (e.g. <code>$vars.myVariable</code>). Variables are immutable and cannot be modified within your workflows.<br/><a href=\"https://docs.n8n.io/environments/variables/\" target=\"_blank\">Learn more in the docs.</a>",
@@ -1868,7 +1852,7 @@
 	"settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "Yes, disable it",
 	"settings.ldap.confirmMessage.beforeSaveForm.headline": "Are you sure you want to disable LDAP login?",
 	"settings.ldap.confirmMessage.beforeSaveForm.message": "If you do so, all LDAP users will be converted to email users.",
-	"settings.ldap.disabled.title": "Available on the Enterprise plan",
+	"settings.ldap.disabled.title": "Available on Enterprise plan",
 	"settings.ldap.disabled.description": "LDAP is available as a paid feature. Learn more about it.",
 	"settings.ldap.disabled.buttonText": "See plans",
 	"settings.ldap.toast.sync.success": "Synchronization succeeded",
@@ -1952,7 +1936,7 @@
 	"settings.sso.settings.save.activate.test": "Test settings",
 	"settings.sso.settings.save.error": "Error saving SAML SSO configuration",
 	"settings.sso.settings.footer.hint": "Don't forget to activate SAML SSO once you've saved the settings.",
-	"settings.sso.actionBox.title": "Available on the Enterprise plan",
+	"settings.sso.actionBox.title": "Available on Enterprise plan",
 	"settings.sso.actionBox.description": "Use Single Sign On to consolidate authentication into a single platform to improve security and agility.",
 	"settings.sso.actionBox.buttonText": "See plans",
 	"sso.login.divider": "or",

From 88b4a088104cbd6f545ac8da720844c3de2f3fc7 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Thu, 3 Aug 2023 14:13:21 +0200
Subject: [PATCH 096/116] fix: Fin locales

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue   | 2 +-
 .../src/components/CodeNodeEditor/CodeNodeEditor.vue         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 3261774c7579b..e6ca5f36a6007 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -18,7 +18,7 @@ const props = defineProps<{
 }>();
 
 const { getWorkflowSchema, getSchemaForExecutionData } = useDataSchema();
-const { i18n } = useI18n();
+const i18n = useI18n();
 const maxLength = 600;
 const loadingDurationMs = 10000;
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index effbed34b9edb..142ae521a1288 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -15,7 +15,7 @@
 				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
 			</el-tab-pane>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
-				<AskAI @replaceCode="onReplaceCode" :has-changes="initialValue !== content" />
+				<AskAI @replaceCode="onReplaceCode" :has-changes="hasChanges" />
 			</el-tab-pane>
 		</el-tabs>
 		<!-- If AskAi not enabled, there's no point in rendering tabs -->
@@ -113,6 +113,9 @@ export default defineComponent({
 	},
 	computed: {
 		...mapStores(useRootStore, usePostHog),
+		hasChanges():boolean {
+			return this.modelValue !== this.content;
+		},
 		content(): string {
 			if (!this.editor) return '';
 

From 1ea7e460a64e20ca6458bceaa0c0c269ea85cfc7 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 7 Aug 2023 09:55:12 +0200
Subject: [PATCH 097/116] Fix merging errors

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/cli/src/GenericHelpers.ts            | 24 -------------------
 packages/cli/src/Server.ts                    |  1 -
 packages/cli/src/config/schema.ts             |  9 +++++++
 packages/design-system/src/utils.scss         | 15 ------------
 packages/editor-ui/src/App.vue                |  1 -
 packages/editor-ui/src/n8n-theme.scss         |  4 ----
 .../src/stores/logStreaming.store.ts          |  2 --
 .../nodes/Aws/S3/V2/AwsS3V2.node.ts           |  6 +++--
 8 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 1860f5052a9ca..0034ebea90074 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -192,28 +192,4 @@ export async function createErrorExecution(
 	await Container.get(ExecutionRepository).createNewExecution(fullExecutionData);
 }
 
-export function getRedisClusterNodes(): Array<{ host: string; port: number }> {
-	const clusterNodePairs = config
-		.getEnv('queue.bull.redis.clusterNodes')
-		.split(',')
-		.filter((e) => e);
-	return clusterNodePairs.map((pair) => {
-		const [host, port] = pair.split(':');
-		return { host, port: parseInt(port) };
-	});
-}
-
-export function getRedisPrefix(): string {
-	let prefix = config.getEnv('queue.bull.prefix');
-	if (prefix && getRedisClusterNodes().length > 0) {
-		if (!prefix.startsWith('{')) {
-			prefix = '{' + prefix;
-		}
-		if (!prefix.endsWith('}')) {
-			prefix += '}';
-		}
-	}
-	return prefix;
-}
-
 export const DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 1eeee98ee2138..7d318386706a3 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -498,7 +498,6 @@ export class Server extends AbstractServer {
 				jwtService,
 				roleService: Container.get(RoleService),
 			}),
-
 			Container.get(SamlController),
 			Container.get(SourceControlController),
 			Container.get(WorkflowStatisticsController),
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 685a09a4daa5c..4d1302432e952 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1175,4 +1175,13 @@ export const schema = {
 			},
 		},
 	},
+
+	ai: {
+		enabled: {
+			doc: 'Whether AI features are enabled',
+			format: Boolean,
+			default: false,
+			env: 'N8N_AI_ENABLED',
+		},
+	},
 };
diff --git a/packages/design-system/src/utils.scss b/packages/design-system/src/utils.scss
index 7a951fe126cac..f81567d968656 100644
--- a/packages/design-system/src/utils.scss
+++ b/packages/design-system/src/utils.scss
@@ -5,18 +5,3 @@
 @function saturation($h, $s, $l, $saturation) {
 	@return hsl(var(#{$h}), calc(var(#{$s}) + #{$saturation}), var(#{$l}));
 }
-
-@function joinVarName($list) {
-  $name: '--' + 'el';
-  @each $item in $list {
-    @if $item != '' {
-      $name: $name + '-' + $item;
-    }
-  }
-  @return $name;
-}
-
-// getCssVarName('button', 'text-color') => '--el-button-text-color'
-@function getCssVarName($args...) {
-  @return joinVarName($args);
-}
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index b857479a3fbd1..e8b4ea949fbd0 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -269,7 +269,6 @@ export default defineComponent({
 
 		this.loading = false;
 
-		this.logHiringBanner();
 		this.trackPage();
 		void this.externalHooks.run('app.mount');
 
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index 956b226fb2645..facafb98cb7c7 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -9,10 +9,6 @@
 	font-weight: 400;
 }
 
-.el-overlay-dialog {
-	justify-content: unset;
-}
-
 .el-dialog {
 	border: var(--border-base);
 	box-shadow: 0px 6px 16px rgb(68 28 23 / 6%);
diff --git a/packages/editor-ui/src/stores/logStreaming.store.ts b/packages/editor-ui/src/stores/logStreaming.store.ts
index 205ed8aa34a7b..f246d237b8000 100644
--- a/packages/editor-ui/src/stores/logStreaming.store.ts
+++ b/packages/editor-ui/src/stores/logStreaming.store.ts
@@ -161,8 +161,6 @@ export const useLogStreamingStore = defineStore('logStreaming', {
 			delete this.items[id];
 		},
 		clearDestinationItemTrees() {
-			console.log('clearing destinations');
-
 			this.items = {} as DestinationSettingsStore;
 		},
 		setSelectionAndBuildItems(destination: MessageEventBusDestinationOptions) {
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index 31bf570bacf06..81e2dec0c0da1 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -1,8 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import { createHash } from 'crypto';
-import type { Readable } from 'stream';
 import { paramCase, snakeCase } from 'change-case';
 
+import { createHash } from 'crypto';
+
 import { Builder } from 'xml2js';
 
 import type {
@@ -22,6 +22,7 @@ import { folderFields, folderOperations } from './FolderDescription';
 import { fileFields, fileOperations } from './FileDescription';
 
 import { awsApiRequestREST, awsApiRequestRESTAllItems } from './GenericFunctions';
+import type { Readable } from 'stream';
 
 // Minimum size 5MB for multipart upload in S3
 const UPLOAD_CHUNK_SIZE = 5120 * 1024;
@@ -282,6 +283,7 @@ export class AwsS3V2 implements INodeType {
 							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
+
 						returnData.push(...executionData);
 					}
 				}

From e18ae98d88c73778ed57adbcc2b29f663da50d96 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 7 Aug 2023 12:01:09 +0200
Subject: [PATCH 098/116] Map erros based on statusCode

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/CodeNodeEditor/AskAI.vue   | 30 ++++++++++++-----
 .../CodeNodeEditor/CodeNodeEditor.vue         | 33 +++++--------------
 .../src/components/ExecutionFilter.vue        |  1 +
 .../ResourceLocatorDropdown.vue               |  1 -
 4 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index e6ca5f36a6007..df3cb918ae443 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
-import { ref, defineEmits, computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useDataSchema, useI18n, useMessage, useToast } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
 import { useNDVStore, usePostHog, useRootStore } from '@/stores';
@@ -32,6 +32,17 @@ const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).lengt
 const loadingString = computed(() =>
 	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}` as BaseTextKey),
 );
+
+function getErrorMessageByStatusCode(statusCode: number) {
+	const errorMessages: Record<number, string> = {
+		400: i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
+		429: i18n.baseText('codeNodeEditor.askAi.generationFailedRate'),
+		500: i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
+	};
+
+	return errorMessages[statusCode] || i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown');
+}
+
 async function onSubmit() {
 	const { getRestApiContext } = useRootStore();
 	const { ndvInputData } = useNDVStore();
@@ -68,18 +79,17 @@ async function onSubmit() {
 		});
 
 		stopLoading();
-		emit('replaceCode', { code });
+		emit('replaceCode', code);
 		showMessage({
 			type: 'success',
 			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
 		});
 	} catch (error) {
-		console.log('Failed to generate code', error);
-		showError(
-			error,
-			i18n.baseText('codeNodeEditor.askAi.generationFailed'),
-			i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
-		);
+		showMessage({
+			type: 'error',
+			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
+			message: getErrorMessageByStatusCode(error.httpStatusCode),
+		});
 		stopLoading();
 	}
 }
@@ -185,7 +195,9 @@ function stopLoading() {
 <style scoped>
 .text-fade-in-out-enter-active,
 .text-fade-in-out-leave-active {
-	transition: opacity 0.5s ease-in-out, transform 0.5s ease-in-out;
+	transition:
+		opacity 0.5s ease-in-out,
+		transform 0.5s ease-in-out;
 }
 .text-fade-in-out-enter,
 .text-fade-in-out-leave-to {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 142ae521a1288..4949454b7db00 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -113,7 +113,7 @@ export default defineComponent({
 	},
 	computed: {
 		...mapStores(useRootStore, usePostHog),
-		hasChanges():boolean {
+		hasChanges(): boolean {
 			return this.modelValue !== this.content;
 		},
 		content(): string {
@@ -144,24 +144,17 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		async onReplaceCode({ code, mode }: { code: string; mode: CodeExecutionMode }) {
-			this.workflowsStore.updateNodeProperties({
-				name: this.ndvStore.activeNode.name,
-				properties: { parameters: { mode } },
-			});
-
+		async onReplaceCode(code: string) {
+			console.log('🚀 ~ file: CodeNodeEditor.vue:148 ~ onReplaceCode ~ code:', code);
 			this.editor?.dispatch({
-				changes: { from: 0, to: this.content.length, insert: code },
+				changes: { from: 0, to: (this.modelValue ?? this.content).length, insert: code },
 			});
 
 			this.initialValue = this.content;
 			this.activeTab = 'code';
-			this.formatCode();
-		},
-		switchMode(mode: string) {
-			this.workflowsStore.updateNodeProperties({
-				name: this.ndvStore.activeNode.name,
-				properties: { parameters: { mode } },
+			prettier.format(this.content, {
+				parser: 'babel',
+				plugins: [jsParser],
 			});
 		},
 		onMouseOver(event: MouseEvent) {
@@ -223,16 +216,6 @@ export default defineComponent({
 				selection: { anchor: line.from },
 			});
 		},
-		formatCode() {
-			const formattedCode = prettier.format(this.content, {
-				parser: 'babel',
-				plugins: [jsParser],
-			});
-
-			this.editor?.dispatch({
-				changes: { from: 0, to: this.content.length, insert: formattedCode },
-			});
-		},
 		trackCompletion(viewUpdate: ViewUpdate) {
 			const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
 
@@ -316,7 +299,7 @@ export default defineComponent({
 		extensions.push(this.languageCompartment.of(languageSupport), ...otherExtensions);
 
 		const state = EditorState.create({
-			doc: this.modelValue || this.placeholder,
+			doc: this.modelValue ?? this.placeholder,
 			extensions,
 		});
 
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
index 494f92715114d..01cab2fdc5612 100644
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ b/packages/editor-ui/src/components/ExecutionFilter.vue
@@ -65,6 +65,7 @@ const vModel = reactive(
 				},
 				set(value) {
 					// TODO: find out what exactly is typechecker complaining about
+
 					// @ts-ignore
 					filter[key] = value;
 					emit('filterChanged', filter);
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index a7e8fc63d6ec2..97035b91447f9 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -1,6 +1,5 @@
 <template>
 	<n8n-popover
-		:teleported="false"
 		placement="bottom"
 		:teleported="false"
 		:width="width"

From 4fe3fabd62836888019cb1d5a17a35ca811be427 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 7 Aug 2023 13:28:14 +0200
Subject: [PATCH 099/116] Fix code replacing

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../CodeNodeEditor/CodeNodeEditor.vue         | 54 +++++++++++--------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 4949454b7db00..98c1e260957b9 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -5,12 +5,7 @@
 		@mouseout="onMouseOut"
 		ref="codeNodeEditorContainer"
 	>
-		<el-tabs
-			type="card"
-			ref="tabs"
-			v-model="activeTab"
-			v-if="aiEnabled && language === 'javaScript'"
-		>
+		<el-tabs type="card" ref="tabs" v-model="activeTab" v-if="aiEnabled">
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code">
 				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
 			</el-tab-pane>
@@ -89,7 +84,7 @@ export default defineComponent({
 			isEditorFocused: false,
 			tabs: ['code', 'ask-ai'],
 			activeTab: 'code',
-			initialValue: this.value,
+			hasChanges: false,
 		};
 	},
 	watch: {
@@ -110,12 +105,19 @@ export default defineComponent({
 				effects: this.languageCompartment.reconfigure(languageSupport),
 			});
 		},
+		aiEnabled: {
+			immediate: true,
+			async handler(isEnabled) {
+				if (isEnabled && !this.modelValue) {
+					this.$emit('update:modelValue', this.placeholder);
+				}
+				await this.$nextTick();
+				this.hasChanges = this.modelValue !== this.placeholder;
+			},
+		},
 	},
 	computed: {
 		...mapStores(useRootStore, usePostHog),
-		hasChanges(): boolean {
-			return this.modelValue !== this.content;
-		},
 		content(): string {
 			if (!this.editor) return '';
 
@@ -126,7 +128,11 @@ export default defineComponent({
 				ASK_AI_EXPERIMENT.name,
 				ASK_AI_EXPERIMENT.control,
 			);
-			return !isAiExperimentDisabled && this.settingsStore.settings.ai.enabled === true;
+			return (
+				!isAiExperimentDisabled &&
+				this.settingsStore.settings.ai.enabled === true &&
+				this.language === 'javaScript'
+			);
 		},
 		placeholder(): string {
 			return CODE_PLACEHOLDERS[this.language]?.[this.mode] ?? '';
@@ -145,17 +151,17 @@ export default defineComponent({
 	},
 	methods: {
 		async onReplaceCode(code: string) {
-			console.log('🚀 ~ file: CodeNodeEditor.vue:148 ~ onReplaceCode ~ code:', code);
+			prettier.format(code, {
+				parser: 'babel',
+				plugins: [jsParser],
+			});
+
 			this.editor?.dispatch({
-				changes: { from: 0, to: (this.modelValue ?? this.content).length, insert: code },
+				changes: { from: 0, to: (this.modelValue || '').length, insert: code },
 			});
 
-			this.initialValue = this.content;
 			this.activeTab = 'code';
-			prettier.format(this.content, {
-				parser: 'babel',
-				plugins: [jsParser],
-			});
+			this.hasChanges = false;
 		},
 		onMouseOver(event: MouseEvent) {
 			const fromElement = event.relatedTarget as HTMLElement;
@@ -256,11 +262,6 @@ export default defineComponent({
 	mounted() {
 		if (!this.isReadOnly) codeNodeEditorEventBus.on('error-line-number', this.highlightLine);
 
-		// empty on first load, default param value
-		if (!this.modelValue) {
-			this.$emit('update:modelValue', this.placeholder);
-		}
-
 		const { isReadOnly, language } = this;
 		const extensions: Extension[] = [
 			...readOnlyEditorExtensions,
@@ -285,12 +286,14 @@ export default defineComponent({
 						this.isEditorFocused = false;
 					},
 				}),
+
 				EditorView.updateListener.of((viewUpdate) => {
 					if (!viewUpdate.docChanged) return;
 
 					this.trackCompletion(viewUpdate);
 
 					this.$emit('update:modelValue', this.editor?.state.doc.toString());
+					this.hasChanges = true;
 				}),
 			);
 		}
@@ -307,6 +310,11 @@ export default defineComponent({
 			parent: this.$refs.codeNodeEditor as HTMLDivElement,
 			state,
 		});
+
+		// empty on first load, default param value
+		if (!this.modelValue) {
+			this.$emit('update:modelValue', this.placeholder);
+		}
 	},
 });
 </script>

From e8d6cfd34a3be296224568308c10229156e1f6fe Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 7 Aug 2023 14:13:25 +0200
Subject: [PATCH 100/116] Fix code formatting

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/CodeNodeEditor/CodeNodeEditor.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 98c1e260957b9..f542bcbfa3d57 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -151,13 +151,13 @@ export default defineComponent({
 	},
 	methods: {
 		async onReplaceCode(code: string) {
-			prettier.format(code, {
+			const formattedCode = prettier.format(code, {
 				parser: 'babel',
 				plugins: [jsParser],
 			});
 
 			this.editor?.dispatch({
-				changes: { from: 0, to: (this.modelValue || '').length, insert: code },
+				changes: { from: 0, to: (this.modelValue || '').length, insert: formattedCode },
 			});
 
 			this.activeTab = 'code';

From 8ca6ba4ef1409605fece16eb4b769123e6fe776b Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 8 Aug 2023 15:20:39 +0200
Subject: [PATCH 101/116] Address review points

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/editor-ui/src/api/ai.ts              | 19 +++++--
 .../src/components/CodeNodeEditor/AskAI.vue   | 50 ++++++++++++++---
 .../src/components/CodeNodeEditor/linter.ts   | 53 ++++---------------
 .../src/plugins/i18n/locales/en.json          |  5 +-
 .../editor-ui/src/plugins/telemetry/index.ts  | 26 ++++++---
 5 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index b0ef718c06070..e9fe620aa8400 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -1,6 +1,12 @@
-import type { IRestApiContext } from '@/Interface';
+import type { IRestApiContext, Schema } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
+import type { IDataObject } from 'n8n-workflow';
+
+type Usage = {
+	prompt_tokens: number;
+	completion_tokens: number;
+	total_tokens: number;
+};
 
 export async function generateCodeForPrompt(
 	ctx: IRestApiContext,
@@ -9,8 +15,13 @@ export async function generateCodeForPrompt(
 		context,
 		model,
 		n8nVersion,
-	}: { question: string; context: { schema: IDataObject }; model: string; n8nVersion: string },
-): Promise<{ code: string; mode: CodeExecutionMode }> {
+	}: {
+		question: string;
+		context: { schema: IDataObject; inputSchema: Schema };
+		model: string;
+		n8nVersion: string;
+	},
+): Promise<{ code: string; usage: Usage }> {
 	return makeRestApiRequest(ctx, 'POST', '/ask-ai', {
 		question,
 		context,
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index df3cb918ae443..07c1ea97a53d3 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { ref, computed } from 'vue';
-import { useDataSchema, useI18n, useMessage, useToast } from '@/composables';
+import { useDataSchema, useI18n, useMessage, useToast, useTelemetry } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
 import { useNDVStore, usePostHog, useRootStore } from '@/stores';
 import CircleLoader from './CircleLoader.vue';
@@ -20,6 +20,7 @@ const props = defineProps<{
 const { getWorkflowSchema, getSchemaForExecutionData } = useDataSchema();
 const i18n = useI18n();
 const maxLength = 600;
+const minLength = 15;
 const loadingDurationMs = 10000;
 
 const loadingPhraseIndex = ref(0);
@@ -28,6 +29,7 @@ const loaderProgress = ref(0);
 const isLoading = ref(false);
 const prompt = ref('');
 
+const isSubmitEnabled = computed(() => prompt.value.length >= minLength && hasExecutionData.value);
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
 const loadingString = computed(() =>
 	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}` as BaseTextKey),
@@ -36,6 +38,7 @@ const loadingString = computed(() =>
 function getErrorMessageByStatusCode(statusCode: number) {
 	const errorMessages: Record<number, string> = {
 		400: i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
+		413: i18n.baseText('codeNodeEditor.askAi.generationFailedTooLarge'),
 		429: i18n.baseText('codeNodeEditor.askAi.generationFailedRate'),
 		500: i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown'),
 	};
@@ -50,6 +53,10 @@ async function onSubmit() {
 	const { alert } = useMessage();
 	const schema = getWorkflowSchema();
 
+	useTelemetry().trackAskAI('ask.generationClicked', {
+		prompt: prompt.value,
+	});
+
 	if (props.hasChanges) {
 		const confirmModal = await alert(i18n.baseText('codeNodeEditor.askAi.areYouSureToReplace'), {
 			title: i18n.baseText('codeNodeEditor.askAi.replaceCurrentCode'),
@@ -71,7 +78,7 @@ async function onSubmit() {
 				? 'gpt-4'
 				: 'gpt-3.5-turbo-16k';
 
-		const { code } = await generateCodeForPrompt(getRestApiContext, {
+		const { code, usage } = await generateCodeForPrompt(getRestApiContext, {
 			question: prompt.value,
 			context: { schema, inputSchema },
 			model,
@@ -84,12 +91,26 @@ async function onSubmit() {
 			type: 'success',
 			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
 		});
+		useTelemetry().trackAskAI('askAi.generationFinished', {
+			prompt: prompt.value,
+			code,
+			tokensCount: usage.total_tokens,
+			hasErrors: false,
+			error: '',
+		});
 	} catch (error) {
 		showMessage({
 			type: 'error',
 			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
 			message: getErrorMessageByStatusCode(error.httpStatusCode),
 		});
+		useTelemetry().trackAskAI('askAi.generationFinished', {
+			prompt: prompt.value,
+			code: '',
+			tokensCount: 0,
+			hasErrors: true,
+			error: error.httpStatusCode,
+		});
 		stopLoading();
 	}
 }
@@ -156,7 +177,7 @@ function stopLoading() {
 					:class="$style.counter"
 					v-text="`${prompt.length} / ${maxLength}`"
 				/>
-				<a href="https://docs.n8n.io/api" target="_blank" :class="$style.help">
+				<a href="https://docs.n8n.io/code-examples/ai-code" target="_blank" :class="$style.help">
 					<n8n-icon icon="question-circle" color="text-light" size="large" />{{
 						$locale.baseText('codeNodeEditor.askAi.help')
 					}}
@@ -178,14 +199,29 @@ function stopLoading() {
 				</transition>
 				<CircleLoader :radius="8" :progress="loaderProgress" :stroke-width="3" />
 			</div>
-			<n8n-tooltip :disabled="hasExecutionData" v-else>
+			<n8n-tooltip :disabled="isSubmitEnabled" v-else>
 				<div>
-					<N8nButton :disabled="!hasExecutionData || !prompt" @click="onSubmit" size="small">{{
+					<N8nButton :disabled="!isSubmitEnabled" @click="onSubmit" size="small">{{
 						$locale.baseText('codeNodeEditor.askAi.generateCode')
 					}}</N8nButton>
 				</div>
-				<template #content v-if="!hasExecutionData">
-					<span v-text="$locale.baseText('codeNodeEditor.askAi.noInputData')" />
+				<template #content>
+					<span
+						v-if="!hasExecutionData"
+						v-text="$locale.baseText('codeNodeEditor.askAi.noInputData')"
+					/>
+					<span
+						v-else-if="prompt.length === 0"
+						v-text="$locale.baseText('codeNodeEditor.askAi.noPrompt')"
+					/>
+					<span
+						v-else-if="prompt.length < minLength"
+						v-text="
+							$locale.baseText('codeNodeEditor.askAi.promptTooShort', {
+								interpolate: { minLength: minLength.toString() },
+							})
+						"
+					/>
 				</template>
 			</n8n-tooltip>
 		</div>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index 68ca950d1c267..85343e3615593 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -7,8 +7,11 @@ import * as esprima from 'esprima-next';
 import type { Node } from 'estree';
 import type { CodeNodeEditorLanguage } from 'n8n-workflow';
 
-import { DEFAULT_LINTER_DELAY_IN_MS, DEFAULT_LINTER_SEVERITY } from './constants';
-import { OFFSET_FOR_SCRIPT_WRAPPER } from './constants';
+import {
+	DEFAULT_LINTER_DELAY_IN_MS,
+	DEFAULT_LINTER_SEVERITY,
+	OFFSET_FOR_SCRIPT_WRAPPER,
+} from './constants';
 import { walk } from './utils';
 import type { RangeNode } from './types';
 
@@ -148,7 +151,7 @@ export const linterExtension = defineComponent({
 
 				const isUnavailableInputItemAccess = (node: Node) =>
 					node.type === 'MemberExpression' &&
-					node.computed === false &&
+					!node.computed &&
 					node.object.type === 'Identifier' &&
 					node.object.name === '$input' &&
 					node.property.type === 'Identifier' &&
@@ -174,44 +177,6 @@ export const linterExtension = defineComponent({
 				});
 			}
 
-			/**
-			 * Lint for `item` (legacy var from Function Item node) unavailable
-			 * in `runOnceForAllItems` mode, unless user-defined `item`.
-			 *
-			 * item -> $input.all()
-			 */
-			if (this.mode === 'runOnceForAllItems' && !/(let|const|var) item (=|of)/.test(script)) {
-				type TargetNode = RangeNode & { object: RangeNode & { name: string } };
-
-				const isUnavailableLegacyItems = (node: Node) =>
-					node.type === 'Identifier' && node.name === 'item';
-
-				walk<TargetNode>(ast, isUnavailableLegacyItems).forEach((node) => {
-					const [start, end] = this.getRange(node);
-
-					lintings.push({
-						from: start,
-						to: end,
-						severity: DEFAULT_LINTER_SEVERITY,
-						message: this.$locale.baseText('codeNodeEditor.linter.allItems.unavailableItem'),
-						actions: [
-							{
-								name: 'Fix',
-								apply(view, from, to) {
-									// prevent second insertion of unknown origin
-									if (view.state.doc.toString().slice(from, to).includes('$input.all()')) {
-										return;
-									}
-
-									view.dispatch({ changes: { from: start, to: end } });
-									view.dispatch({ changes: { from, insert: '$input.all()' } });
-								},
-							},
-						],
-					});
-				});
-			}
-
 			/**
 			 * Lint for `items` (legacy var from Function node) unavailable
 			 * in `runOnceForEachItem` mode, unless user-defined `items`.
@@ -265,7 +230,7 @@ export const linterExtension = defineComponent({
 
 				const isUnavailableMethodinEachItem = (node: Node) =>
 					node.type === 'MemberExpression' &&
-					node.computed === false &&
+					!node.computed &&
 					node.object.type === 'Identifier' &&
 					node.object.name === '$input' &&
 					node.property.type === 'Identifier' &&
@@ -332,7 +297,7 @@ export const linterExtension = defineComponent({
 				const inputFirstOrLastCalledWithArg = (node: Node) =>
 					node.type === 'CallExpression' &&
 					node.callee.type === 'MemberExpression' &&
-					node.callee.computed === false &&
+					!node.callee.computed &&
 					node.callee.object.type === 'Identifier' &&
 					node.callee.object.name === '$input' &&
 					node.callee.property.type === 'Identifier' &&
@@ -427,7 +392,7 @@ export const linterExtension = defineComponent({
 					node.left.declarations[0].id.type === 'Identifier' &&
 					node.right.type === 'CallExpression' &&
 					node.right.callee.type === 'MemberExpression' &&
-					node.right.callee.computed === false &&
+					!node.right.callee.computed &&
 					node.right.callee.object.type === 'Identifier' &&
 					node.right.callee.object.name.startsWith('$'); // n8n var, e.g $input
 
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 20fb6d705dfec..c974ca9d5d40d 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -284,11 +284,13 @@
 	"codeNodeEditor.linter.eachItem.unavailableItems": "Legacy `items` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.eachItem.unavailableMethod": "Method `$input.{method}()` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.bothModes.syntaxError": "Syntax error",
-	"codeNodeEditor.askAi.placeholder": "Tell AI what you want the code to achieve. You can also reference input data such as firstName or user.email",
+	"codeNodeEditor.askAi.placeholder": "Tell AI what you want the code to achieve. You can reference input data fields using dot notation (e.g. user.email)",
 	"codeNodeEditor.askAi.intro": "Hey AI, generate JavaScript code that...",
 	"codeNodeEditor.askAi.help": "Help",
 	"codeNodeEditor.askAi.generateCode": "Generate Code",
 	"codeNodeEditor.askAi.noInputData": "You can generate code once this node has incoming input data (from a node earlier in your workflow)",
+	"codeNodeEditor.askAi.noPrompt": "First enter a prompt above before generating code",
+	"codeNodeEditor.askAi.promptTooShort": "Enter a minimum of {minLength} characters before attempting to generate code",
 	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
 	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",
 	"codeNodeEditor.askAi.areYouSureToReplace": "Are you sure you want to generate new code? Your current code will be replaced.",
@@ -305,6 +307,7 @@
 	"codeNodeEditor.askAi.generationFailedUnknown": "Code generation failed due to an unknown reason. Try again in a few minutes.",
 	"codeNodeEditor.askAi.generationFailedDown": "We're sorry, our AI service is currently unavailable. Please try again later. If the problem persists, contact support.",
 	"codeNodeEditor.askAi.generationFailedRate": "We've hit our rate limit with our AI partner (too many requests). Please wait a minute before trying again.",
+	"codeNodeEditor.askAi.generationFailedTooLarge": "Your workflow data is too large for AI to process. Simplify the data being sent into the Code node and retry.",
 	"codeNodeEditor.tabs.askAi": "✨ Ask AI",
 	"codeNodeEditor.tabs.code": "Code",
 	"collectionParameter.choose": "Choose...",
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 295ea7a0061dd..f3603a178c935 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -11,6 +11,7 @@ import { SLACK_NODE_TYPE } from '@/constants';
 
 export class Telemetry {
 	private pageEventQueue: Array<{ route: RouteLocation }>;
+
 	private previousPath: string;
 
 	private get rudderStack() {
@@ -100,17 +101,12 @@ export class Telemetry {
 
 			const pageName = route.name;
 			let properties: { [key: string]: string } = {};
-			if (
-				route.meta &&
-				route.meta.telemetry &&
-				typeof route.meta.telemetry.getProperties === 'function'
-			) {
+			if (route.meta?.telemetry && typeof route.meta.telemetry.getProperties === 'function') {
 				properties = route.meta.telemetry.getProperties(route);
 			}
 
-			const category =
-				(route.meta && route.meta.telemetry && route.meta.telemetry.pageCategory) || 'Editor';
-			this.rudderStack.page(category, pageName!, properties);
+			const category = route.meta?.telemetry?.pageCategory || 'Editor';
+			this.rudderStack.page(category, pageName, properties);
 		} else {
 			this.pageEventQueue.push({
 				route,
@@ -126,6 +122,20 @@ export class Telemetry {
 		});
 	}
 
+	trackAskAI(event: string, properties: IDataObject = {}) {
+		if (this.rudderStack) {
+			properties.session_id = useRootStore().sessionId;
+			switch (event) {
+				case 'askAi.generationFinished':
+					this.track('Ai code generation finished', properties);
+				case 'ask.generationClicked':
+					this.track('User clicked on generate code button', properties);
+				default:
+					break;
+			}
+		}
+	}
+
 	trackNodesPanel(event: string, properties: IDataObject = {}) {
 		if (this.rudderStack) {
 			properties.nodes_panel_session_id = this.userNodesPanelSession.sessionId;

From af1b403ac68fcda8a110f185de63939cdebe6935 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 8 Aug 2023 16:16:07 +0200
Subject: [PATCH 102/116] Optionally access total_tokens

---
 packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 07c1ea97a53d3..61faca654a64c 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -94,7 +94,7 @@ async function onSubmit() {
 		useTelemetry().trackAskAI('askAi.generationFinished', {
 			prompt: prompt.value,
 			code,
-			tokensCount: usage.total_tokens,
+			tokensCount: usage?.total_tokens,
 			hasErrors: false,
 			error: '',
 		});

From d480095b86c53f123218cb5ec312716767da0ee0 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Wed, 9 Aug 2023 11:53:50 +0200
Subject: [PATCH 103/116] Clean-up Ask AI modal

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../editor-ui/src/components/AskAiModal.vue   | 52 -------------------
 packages/editor-ui/src/components/Modals.vue  |  8 ---
 packages/editor-ui/src/constants.ts           |  2 -
 packages/editor-ui/src/stores/ui.store.ts     |  7 +--
 4 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 packages/editor-ui/src/components/AskAiModal.vue

diff --git a/packages/editor-ui/src/components/AskAiModal.vue b/packages/editor-ui/src/components/AskAiModal.vue
deleted file mode 100644
index 5a606964e462e..0000000000000
--- a/packages/editor-ui/src/components/AskAiModal.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-	<Modal
-		width="460px"
-		:center="true"
-		:eventBus="modalBus"
-		:name="ASK_AI_MODAL_KEY"
-		:title="$locale.baseText('askAi.dialog.title')"
-	>
-		<template #content>
-			<n8n-text v-html="$locale.baseText('askAi.dialog.body')"></n8n-text>
-		</template>
-
-		<template #footer>
-			<n8n-link :to="ASK_AI_WAITLIST_URL">
-				<n8n-button
-					float="right"
-					:label="$locale.baseText('askAi.dialog.signup')"
-					@click="onAskAiWaitlistClick"
-				/>
-			</n8n-link>
-		</template>
-	</Modal>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import Modal from './Modal.vue';
-import { ASK_AI_MODAL_KEY, ASK_AI_WAITLIST_URL } from '../constants';
-import { createEventBus } from 'n8n-design-system/utils';
-
-export default defineComponent({
-	name: 'AskAI',
-	components: {
-		Modal,
-	},
-	data() {
-		return {
-			ASK_AI_WAITLIST_URL,
-			ASK_AI_MODAL_KEY,
-			modalBus: createEventBus(),
-		};
-	},
-	methods: {
-		onAskAiWaitlistClick() {
-			this.$telemetry.track('User clicked join waitlist', { source: 'ask-ai-code' });
-			this.modalBus.emit('close');
-		},
-	},
-});
-</script>
-
-<style module lang="scss"></style>
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index f5476463eebfb..d39a3c2c9c91f 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -15,10 +15,6 @@
 			<AboutModal />
 		</ModalRoot>
 
-		<ModalRoot :name="ASK_AI_MODAL_KEY">
-			<AskAiModal />
-		</ModalRoot>
-
 		<ModalRoot :name="CREDENTIAL_SELECT_MODAL_KEY">
 			<CredentialsSelectModal />
 		</ModalRoot>
@@ -145,13 +141,11 @@ import {
 	WORKFLOW_SHARE_MODAL_KEY,
 	IMPORT_CURL_MODAL_KEY,
 	LOG_STREAM_MODAL_KEY,
-	ASK_AI_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
 	SOURCE_CONTROL_PULL_MODAL_KEY,
 } from '@/constants';
 
 import AboutModal from './AboutModal.vue';
-import AskAiModal from './AskAiModal.vue';
 import CommunityPackageManageConfirmModal from './CommunityPackageManageConfirmModal.vue';
 import CommunityPackageInstallModal from './CommunityPackageInstallModal.vue';
 import ChangePasswordModal from './ChangePasswordModal.vue';
@@ -179,7 +173,6 @@ export default defineComponent({
 	name: 'Modals',
 	components: {
 		AboutModal,
-		AskAiModal,
 		ActivationModal,
 		CommunityPackageInstallModal,
 		CommunityPackageManageConfirmModal,
@@ -210,7 +203,6 @@ export default defineComponent({
 		CREDENTIAL_EDIT_MODAL_KEY,
 		CREDENTIAL_SELECT_MODAL_KEY,
 		ABOUT_MODAL_KEY,
-		ASK_AI_MODAL_KEY,
 		CHANGE_PASSWORD_MODAL_KEY,
 		DELETE_USER_MODAL_KEY,
 		DUPLICATE_MODAL_KEY,
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index fea151db89dd4..9a3292d16c1f3 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -26,7 +26,6 @@ export const MAX_TAG_NAME_LENGTH = 24;
 
 // modals
 export const ABOUT_MODAL_KEY = 'about';
-export const ASK_AI_MODAL_KEY = 'askAi';
 export const CHANGE_PASSWORD_MODAL_KEY = 'changePassword';
 export const CREDENTIAL_EDIT_MODAL_KEY = 'editCredential';
 export const CREDENTIAL_SELECT_MODAL_KEY = 'selectCredential';
@@ -179,7 +178,6 @@ export const FLOWS_CONTROL_SUBCATEGORY = 'Flow';
 export const HELPERS_SUBCATEGORY = 'Helpers';
 
 export const REQUEST_NODE_FORM_URL = 'https://n8n-community.typeform.com/to/K1fBVTZ3';
-export const ASK_AI_WAITLIST_URL = 'https://n8n-community.typeform.com/to/odKU4oDR';
 
 // General
 export const INSTANCE_ID_HEADER = 'n8n-instance-id';
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 5cba16cc1e445..bf1724d637b55 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -5,7 +5,6 @@ import {
 } from '@/api/workflow-webhooks';
 import {
 	ABOUT_MODAL_KEY,
-	ASK_AI_MODAL_KEY,
 	CHANGE_PASSWORD_MODAL_KEY,
 	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
@@ -43,6 +42,8 @@ import type {
 	UIState,
 	UTMCampaign,
 	XYPosition,
+	Modals,
+	NewCredentialsModal,
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import { useRootStore } from './n8nRoot.store';
@@ -52,7 +53,6 @@ import { useSettingsStore } from './settings.store';
 import { useCloudPlanStore } from './cloudPlan.store';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { i18n as locale } from '@/plugins/i18n';
-import type { Modals, NewCredentialsModal } from '@/Interface';
 import { useTelemetryStore } from '@/stores/telemetry.store';
 import { getStyleTokenValue } from '@/utils/htmlUtils';
 import { dismissBannerPermanently } from '@/api/ui';
@@ -66,9 +66,6 @@ export const useUIStore = defineStore(STORES.UI, {
 			[ABOUT_MODAL_KEY]: {
 				open: false,
 			},
-			[ASK_AI_MODAL_KEY]: {
-				open: false,
-			},
 			[CHANGE_PASSWORD_MODAL_KEY]: {
 				open: false,
 			},

From f7b30ee008e08a7186b7411daa9df075a9b1145d Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Wed, 9 Aug 2023 11:56:26 +0200
Subject: [PATCH 104/116] Store prompt in sessionStorage

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/CodeNodeEditor/AskAI.vue   | 24 +++++++++++++++++--
 .../CodeNodeEditor/CodeNodeEditor.vue         | 12 ++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 61faca654a64c..79425f2aba023 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useDataSchema, useI18n, useMessage, useToast, useTelemetry } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
 import { useNDVStore, usePostHog, useRootStore } from '@/stores';
@@ -8,6 +8,8 @@ import CircleLoader from './CircleLoader.vue';
 import { ASK_AI_EXPERIMENT } from '@/constants';
 import { executionDataToJson } from '@/utils';
 import type { BaseTextKey } from '@/plugins/i18n';
+import { snakeCase } from 'lodash-es';
+import { useSessionStorage } from '@vueuse/core';
 
 const emit = defineEmits<{
 	submit: (code: string) => void;
@@ -49,7 +51,7 @@ function getErrorMessageByStatusCode(statusCode: number) {
 async function onSubmit() {
 	const { getRestApiContext } = useRootStore();
 	const { ndvInputData } = useNDVStore();
-	const { showMessage, showError } = useToast();
+	const { showMessage } = useToast();
 	const { alert } = useMessage();
 	const schema = getWorkflowSchema();
 
@@ -69,6 +71,7 @@ async function onSubmit() {
 			return;
 		}
 	}
+
 	startLoading();
 	try {
 		const inputSchema = getSchemaForExecutionData(executionDataToJson(ndvInputData));
@@ -165,6 +168,22 @@ function stopLoading() {
 		isLoading.value = false;
 	}, 200);
 }
+
+function getSessionStoragePrompt() {
+	const codeNodeName = (useNDVStore().activeNode?.name as string) ?? '';
+	const hashedCode = snakeCase(codeNodeName);
+
+	return useSessionStorage(`ask_ai_prompt__${hashedCode}`, '');
+}
+
+function onPromptInput(inputValue: string) {
+	getSessionStoragePrompt().value = inputValue;
+}
+
+onMounted(() => {
+	// Restore prompt from session storage(with empty string fallback)
+	prompt.value = getSessionStoragePrompt().value;
+});
 </script>
 
 <template>
@@ -185,6 +204,7 @@ function stopLoading() {
 			</div>
 			<N8nInput
 				v-model="prompt"
+				@input="onPromptInput"
 				:class="$style.input"
 				type="textarea"
 				:rows="6"
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index f542bcbfa3d57..fa07d00c8a6c0 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -10,7 +10,8 @@
 				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
 			</el-tab-pane>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
-				<AskAI @replaceCode="onReplaceCode" :has-changes="hasChanges" />
+				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
+				<AskAI @replaceCode="onReplaceCode" :has-changes="hasChanges" :key="activeTab" />
 			</el-tab-pane>
 		</el-tabs>
 		<!-- If AskAi not enabled, there's no point in rendering tabs -->
@@ -36,7 +37,7 @@ import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import { CODE_EXECUTION_MODES, CODE_LANGUAGES } from 'n8n-workflow';
 
 import { workflowHelpers } from '@/mixins/workflowHelpers'; // for json field completions
-import { ASK_AI_EXPERIMENT, ASK_AI_MODAL_KEY, CODE_NODE_TYPE } from '@/constants';
+import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
 import { useRootStore, usePostHog } from '@/stores';
 
@@ -130,7 +131,7 @@ export default defineComponent({
 			);
 			return (
 				!isAiExperimentDisabled &&
-				this.settingsStore.settings.ai.enabled === true &&
+				this.settingsStore.settings.ai.enabled &&
 				this.language === 'javaScript'
 			);
 		},
@@ -175,11 +176,6 @@ export default defineComponent({
 
 			if (!ref?.contains(fromElement)) this.isEditorHovered = false;
 		},
-		onAskAiButtonClick() {
-			this.$telemetry.track('User clicked ask ai button', { source: 'code' });
-
-			this.uiStore.openModal(ASK_AI_MODAL_KEY);
-		},
 		reloadLinter() {
 			if (!this.editor) return;
 

From c728b3335fda4fe30e1c3842974e6cd0ecd09811 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Wed, 9 Aug 2023 14:24:16 +0200
Subject: [PATCH 105/116] Improve schema generation, only get parent nodes

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/editor-ui/src/api/ai.ts              |  5 +-
 .../src/components/CodeNodeEditor/AskAI.vue   | 57 ++++++++++--
 .../src/composables/useDataSchema.ts          | 90 ++++++++++++-------
 3 files changed, 114 insertions(+), 38 deletions(-)

diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index e9fe620aa8400..95ace358fbdfe 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -17,7 +17,10 @@ export async function generateCodeForPrompt(
 		n8nVersion,
 	}: {
 		question: string;
-		context: { schema: IDataObject; inputSchema: Schema };
+		context: {
+			schema: Array<{ nodeName: string; schema: Schema }>;
+			inputSchema: { nodeName: string; schema: Schema };
+		};
 		model: string;
 		n8nVersion: string;
 	},
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 79425f2aba023..438c793624711 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -3,13 +3,15 @@ import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { ref, computed, onMounted } from 'vue';
 import { useDataSchema, useI18n, useMessage, useToast, useTelemetry } from '@/composables';
 import { generateCodeForPrompt } from '@/api/ai';
-import { useNDVStore, usePostHog, useRootStore } from '@/stores';
+import { useNDVStore, usePostHog, useRootStore, useWorkflowsStore } from '@/stores';
 import CircleLoader from './CircleLoader.vue';
 import { ASK_AI_EXPERIMENT } from '@/constants';
-import { executionDataToJson } from '@/utils';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { snakeCase } from 'lodash-es';
 import { useSessionStorage } from '@vueuse/core';
+import { executionDataToJson } from '@/utils';
+import type { INodeExecutionData } from 'n8n-workflow';
+import type { INodeUi, Schema } from '@/Interface';
 
 const emit = defineEmits<{
 	submit: (code: string) => void;
@@ -19,7 +21,7 @@ const props = defineProps<{
 	hasChanges: boolean;
 }>();
 
-const { getWorkflowSchema, getSchemaForExecutionData } = useDataSchema();
+const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
 const i18n = useI18n();
 const maxLength = 600;
 const minLength = 15;
@@ -30,6 +32,7 @@ const loaderProgress = ref(0);
 
 const isLoading = ref(false);
 const prompt = ref('');
+const parentNodes = ref<INodeUi[]>([]);
 
 const isSubmitEnabled = computed(() => prompt.value.length >= minLength && hasExecutionData.value);
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
@@ -48,12 +51,51 @@ function getErrorMessageByStatusCode(statusCode: number) {
 	return errorMessages[statusCode] || i18n.baseText('codeNodeEditor.askAi.generationFailedUnknown');
 }
 
+function getParentNodes() {
+	const activeNode = useNDVStore().activeNode;
+	const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
+	const workflow = getCurrentWorkflow();
+
+	if (!activeNode || !workflow) return [];
+
+	return workflow
+		.getParentNodesByDepth(activeNode?.name)
+		.filter(({ name }, i, nodes) => {
+			return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;
+		})
+		.map((n) => getNodeByName(n.name))
+		.filter((n) => n !== null) as INodeUi[];
+}
+
+function getSchemas() {
+	const parentNodesNames = parentNodes.value.map((node) => node?.name);
+	const parentNodesSchemas: Array<{ nodeName: string; schema: Schema }> = parentNodes.value
+		.map((node) => {
+			const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
+
+			return {
+				nodeName: node?.name || '',
+				schema: getSchemaForExecutionData(executionDataToJson(inputData), true),
+			};
+		})
+		.filter((node) => node.schema?.value.length > 0);
+
+	const inputSchema = parentNodesSchemas.shift();
+
+	return {
+		parentNodesNames,
+		inputSchema,
+		parentNodesSchemas,
+	};
+}
+
 async function onSubmit() {
 	const { getRestApiContext } = useRootStore();
-	const { ndvInputData } = useNDVStore();
+	const { activeNode } = useNDVStore();
 	const { showMessage } = useToast();
 	const { alert } = useMessage();
-	const schema = getWorkflowSchema();
+	if (!activeNode) return;
+	const schemas = getSchemas();
 
 	useTelemetry().trackAskAI('ask.generationClicked', {
 		prompt: prompt.value,
@@ -74,7 +116,6 @@ async function onSubmit() {
 
 	startLoading();
 	try {
-		const inputSchema = getSchemaForExecutionData(executionDataToJson(ndvInputData));
 		const version = useRootStore().versionCli;
 		const model =
 			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
@@ -83,7 +124,8 @@ async function onSubmit() {
 
 		const { code, usage } = await generateCodeForPrompt(getRestApiContext, {
 			question: prompt.value,
-			context: { schema, inputSchema },
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			context: { schema: schemas.parentNodesSchemas, inputSchema: schemas.inputSchema! },
 			model,
 			n8nVersion: version,
 		});
@@ -183,6 +225,7 @@ function onPromptInput(inputValue: string) {
 onMounted(() => {
 	// Restore prompt from session storage(with empty string fallback)
 	prompt.value = getSessionStoragePrompt().value;
+	parentNodes.value = getParentNodes();
 });
 </script>
 
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index e40980e334603..adbb710a9cde6 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -1,9 +1,9 @@
-import type { Optional, Primitives, Schema } from '@/Interface';
-import { isObjectEmpty, type IDataObject } from 'n8n-workflow';
+import type { Optional, Primitives, Schema, INodeUi, INodeExecutionData } from '@/Interface';
+import type { ITaskDataConnections, type IDataObject } from 'n8n-workflow';
 import { merge } from 'lodash-es';
 import { generatePath } from '@/utils/mappingUtils';
 import { isObj } from '@/utils/typeGuards';
-import { useWorkflowsStore, useNDVStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores';
 
 export function useDataSchema() {
 	function getSchema(
@@ -44,7 +44,7 @@ export function useDataSchema() {
 			default:
 				schema = {
 					type: typeof input,
-					value: excludeValues ? '__REDACTED__' : String(input),
+					value: excludeValues ? '' : String(input),
 					path,
 				};
 		}
@@ -58,43 +58,73 @@ export function useDataSchema() {
 		return getSchema(merge({}, head, ...tail, head), undefined, excludeValues);
 	}
 
-	function getWorkflowSchema() {
-		const { activeNode } = useNDVStore();
-		const { allNodes } = useWorkflowsStore();
+	// Returns the data of the main input
+	function getMainInputData(
+		connectionsData: ITaskDataConnections,
+		outputIndex: number,
+	): INodeExecutionData[] {
+		if (
+			!connectionsData?.hasOwnProperty('main') ||
+			connectionsData.main === undefined ||
+			connectionsData.main.length < outputIndex ||
+			connectionsData.main[outputIndex] === null
+		) {
+			return [];
+		}
+		return connectionsData.main[outputIndex] as INodeExecutionData[];
+	}
 
-		const schemas = allNodes.reduce((acc: IDataObject, curr) => {
-			const { name } = curr;
-			const nodeRunData = useWorkflowsStore().getWorkflowResultDataByNodeName(name)?.[0];
+	function getNodeInputData(
+		node: INodeUi | null,
+		runIndex = 0,
+		outputIndex = 0,
+	): INodeExecutionData[] {
+		const { getWorkflowExecution } = useWorkflowsStore();
+		if (node === null) {
+			return [];
+		}
 
-			if (name === activeNode?.name) return acc;
+		if (getWorkflowExecution === null) {
+			return [];
+		}
+		const executionData = getWorkflowExecution.data;
+		if (!executionData?.resultData) {
+			// unknown status
+			return [];
+		}
+		const runData = executionData.resultData.runData;
 
-			if (nodeRunData?.executionStatus === 'success' && nodeRunData.data !== undefined) {
-				const outputs = Object.keys(nodeRunData.data);
+		if (!runData?.[node.name]?.[runIndex].data || runData[node.name][runIndex].data === undefined) {
+			return [];
+		}
 
-				// Nodes might have several outputs, we need to get the schema for each input
-				const outputsSchema = outputs.reduce((outputsAcc: IDataObject, inputName) => {
-					const inputRunData = nodeRunData.data?.[inputName]?.[0]
-						?.map((item) => item?.json)
-						?.filter((item) => item !== undefined && !isObjectEmpty(item));
-					if (inputRunData === undefined || inputRunData.length === 0) return outputsAcc;
+		return getMainInputData(runData[node.name][runIndex].data!, outputIndex);
+	}
 
-					outputsAcc[inputName] = getSchemaForExecutionData(inputRunData, true);
-					return outputsAcc;
-				}, {});
+	function getInputDataWithPinned(
+		node: INodeUi | null,
+		runIndex = 0,
+		outputIndex = 0,
+	): INodeExecutionData[] {
+		if (!node) return [];
 
-				if (Object.values(outputsSchema).length > 0) {
-					acc[name] = outputsSchema;
-				}
-			}
+		const { pinDataByNodeName } = useWorkflowsStore();
+		const pinnedData = pinDataByNodeName(node.name);
+		let inputData = getNodeInputData(node, runIndex, outputIndex);
 
-			return acc;
-		}, {});
+		if (pinnedData) {
+			inputData = Array.isArray(pinnedData)
+				? pinnedData.map((json) => ({ json }))
+				: [{ json: pinnedData }];
+		}
 
-		return schemas;
+		return inputData;
 	}
+
 	return {
 		getSchema,
 		getSchemaForExecutionData,
-		getWorkflowSchema,
+		getNodeInputData,
+		getInputDataWithPinned,
 	};
 }

From 0f9ae7b59ab8ec4b756ba0e5dd47c76692817164 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Thu, 10 Aug 2023 22:25:26 +0200
Subject: [PATCH 106/116] Send error messages to telemetry, aske before
 switching tabs

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/N8nTooltip/Tooltip.vue     | 40 +++++++++--------
 .../src/components/CodeNodeEditor/AskAI.vue   | 21 +++++++--
 .../CodeNodeEditor/CodeNodeEditor.vue         | 44 ++++++++++++++++++-
 .../src/plugins/i18n/locales/en.json          |  1 +
 4 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
index a14e6fd482de9..0e11992208a13 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -1,23 +1,25 @@
 <template>
-	<el-tooltip v-bind="{ ...$props, ...$attrs }">
-		<slot />
-		<template #content>
-			<slot name="content">
-				{{ content }}
-			</slot>
-			<div
-				v-if="buttons.length"
-				:class="$style.buttons"
-				:style="{ justifyContent: justifyButtons }"
-			>
-				<n8n-button
-					v-for="button in buttons"
-					:key="button.attrs.label"
-					v-bind="{ ...button.attrs, ...button.listeners }"
-				/>
-			</div>
-		</template>
-	</el-tooltip>
+	<span>
+		<el-tooltip v-bind="{ ...$props, ...$attrs }">
+			<slot />
+			<template #content>
+				<slot name="content">
+					{{ content }}
+				</slot>
+				<div
+					v-if="buttons.length"
+					:class="$style.buttons"
+					:style="{ justifyContent: justifyButtons }"
+				>
+					<n8n-button
+						v-for="button in buttons"
+						:key="button.attrs.label"
+						v-bind="{ ...button.attrs, ...button.listeners }"
+					/>
+				</div>
+			</template>
+		</el-tooltip>
+	</span>
 </template>
 
 <script lang="ts">
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 438c793624711..02e02b879d6b0 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -10,12 +10,14 @@ import type { BaseTextKey } from '@/plugins/i18n';
 import { snakeCase } from 'lodash-es';
 import { useSessionStorage } from '@vueuse/core';
 import { executionDataToJson } from '@/utils';
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { CodeExecutionMode, INodeExecutionData } from 'n8n-workflow';
 import type { INodeUi, Schema } from '@/Interface';
 
 const emit = defineEmits<{
 	submit: (code: string) => void;
 	replaceCode: (code: string) => void;
+	startedLoading: () => void;
+	finishedLoading: () => void;
 }>();
 const props = defineProps<{
 	hasChanges: boolean;
@@ -34,11 +36,18 @@ const isLoading = ref(false);
 const prompt = ref('');
 const parentNodes = ref<INodeUi[]>([]);
 
-const isSubmitEnabled = computed(() => prompt.value.length >= minLength && hasExecutionData.value);
+const isSubmitEnabled = computed(() => {
+	return !isEachItemMode.value && prompt.value.length >= minLength && hasExecutionData.value;
+});
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
 const loadingString = computed(() =>
 	i18n.baseText(`codeNodeEditor.askAi.loadingPhrase${loadingPhraseIndex.value}` as BaseTextKey),
 );
+const isEachItemMode = computed(() => {
+	const mode = useNDVStore().activeNode?.parameters.mode as CodeExecutionMode;
+
+	return mode === 'runOnceForEachItem';
+});
 
 function getErrorMessageByStatusCode(statusCode: number) {
 	const errorMessages: Record<number, string> = {
@@ -154,7 +163,7 @@ async function onSubmit() {
 			code: '',
 			tokensCount: 0,
 			hasErrors: true,
-			error: error.httpStatusCode,
+			error: getErrorMessageByStatusCode(error.httpStatusCode),
 		});
 		stopLoading();
 	}
@@ -198,6 +207,7 @@ function triggerLoaderProgressChange() {
 }
 
 function startLoading() {
+	emit('startedLoading');
 	loaderProgress.value = 0;
 	isLoading.value = true;
 	triggerLoadingPhraseChange();
@@ -206,6 +216,7 @@ function startLoading() {
 
 function stopLoading() {
 	loaderProgress.value = 100;
+	emit('finishedLoading');
 	setTimeout(() => {
 		isLoading.value = false;
 	}, 200);
@@ -277,6 +288,10 @@ onMounted(() => {
 						v-else-if="prompt.length === 0"
 						v-text="$locale.baseText('codeNodeEditor.askAi.noPrompt')"
 					/>
+					<span
+						v-else-if="isEachItemMode"
+						v-text="$locale.baseText('codeNodeEditor.askAi.onlyAllItemsMode')"
+					/>
 					<span
 						v-else-if="prompt.length < minLength"
 						v-text="
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index fa07d00c8a6c0..876b4a46f4fab 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -5,13 +5,25 @@
 		@mouseout="onMouseOut"
 		ref="codeNodeEditorContainer"
 	>
-		<el-tabs type="card" ref="tabs" v-model="activeTab" v-if="aiEnabled">
+		<el-tabs
+			type="card"
+			ref="tabs"
+			v-model="activeTab"
+			v-if="aiEnabled"
+			:before-leave="onBeforeTabLeave"
+		>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code">
 				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
 			</el-tab-pane>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
 				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
-				<AskAI @replaceCode="onReplaceCode" :has-changes="hasChanges" :key="activeTab" />
+				<AskAI
+					@replaceCode="onReplaceCode"
+					:has-changes="hasChanges"
+					:key="activeTab"
+					@started-loading="isLoading = true"
+					@finished-loading="isLoading = false"
+				/>
 			</el-tab-pane>
 		</el-tabs>
 		<!-- If AskAi not enabled, there's no point in rendering tabs -->
@@ -47,6 +59,7 @@ import { linterExtension } from './linter';
 import { completerExtension } from './completer';
 import { codeNodeEditorTheme } from './theme';
 import AskAI from './AskAI.vue';
+import { useMessage } from '@/composables';
 
 export default defineComponent({
 	name: 'code-node-editor',
@@ -76,6 +89,11 @@ export default defineComponent({
 			type: String,
 		},
 	},
+	setup() {
+		return {
+			...useMessage(),
+		};
+	},
 	data() {
 		return {
 			editor: null as EditorView | null,
@@ -86,6 +104,7 @@ export default defineComponent({
 			tabs: ['code', 'ask-ai'],
 			activeTab: 'code',
 			hasChanges: false,
+			isLoading: false,
 		};
 	},
 	watch: {
@@ -151,6 +170,27 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		async onBeforeTabLeave(_activeName, oldActiveName) {
+			if (oldActiveName === 'ask-ai' && this.isLoading) {
+				const confirmModal = await this.alert(
+					this.$locale.baseText('codeNodeEditor.askAi.sureLeaveTab'),
+					{
+						title: this.$locale.baseText('codeNodeEditor.askAi.areYouSure'),
+						confirmButtonText: this.$locale.baseText('codeNodeEditor.askAi.switchTab'),
+						showClose: true,
+						showCancelButton: true,
+					},
+				);
+
+				if (confirmModal === 'confirm') {
+					return true;
+				}
+
+				return false;
+			}
+
+			return true;
+		},
 		async onReplaceCode(code: string) {
 			const formattedCode = prettier.format(code, {
 				parser: 'babel',
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index c974ca9d5d40d..892186dd6bebe 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -290,6 +290,7 @@
 	"codeNodeEditor.askAi.generateCode": "Generate Code",
 	"codeNodeEditor.askAi.noInputData": "You can generate code once this node has incoming input data (from a node earlier in your workflow)",
 	"codeNodeEditor.askAi.noPrompt": "First enter a prompt above before generating code",
+	"codeNodeEditor.askAi.onlyAllItemsMode": "Ask AI generation works only in 'Run Once for All Items' mode",
 	"codeNodeEditor.askAi.promptTooShort": "Enter a minimum of {minLength} characters before attempting to generate code",
 	"codeNodeEditor.askAi.generateCodeAndReplace": "Generate and Replace Code",
 	"codeNodeEditor.askAi.replaceCurrentCode": "Replace current code?",

From ad8477db7e1cecae10e820a2dd3518862975fb44 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Thu, 10 Aug 2023 22:25:33 +0200
Subject: [PATCH 107/116] Add locale

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/editor-ui/src/plugins/i18n/locales/en.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 892186dd6bebe..e1eb6b7cd595d 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -289,6 +289,9 @@
 	"codeNodeEditor.askAi.help": "Help",
 	"codeNodeEditor.askAi.generateCode": "Generate Code",
 	"codeNodeEditor.askAi.noInputData": "You can generate code once this node has incoming input data (from a node earlier in your workflow)",
+	"codeNodeEditor.askAi.sureLeaveTab": "Are you sure you want to switch tab? The code generation will stop",
+	"codeNodeEditor.askAi.areYouSure": "Are you sure?",
+	"codeNodeEditor.askAi.switchTab": "Switch Tab",
 	"codeNodeEditor.askAi.noPrompt": "First enter a prompt above before generating code",
 	"codeNodeEditor.askAi.onlyAllItemsMode": "Ask AI generation works only in 'Run Once for All Items' mode",
 	"codeNodeEditor.askAi.promptTooShort": "Enter a minimum of {minLength} characters before attempting to generate code",

From 2bce33e8f69ba2b795a453ede2e64817aa86f396 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 14 Aug 2023 11:54:05 +0200
Subject: [PATCH 108/116] Post-merge cleanup

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/CodeNodeEditor/AskAI.vue   | 103 +++++++++---------
 .../CodeNodeEditor/CodeNodeEditor.vue         |  14 ++-
 packages/editor-ui/src/constants.ts           |   5 +
 3 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
index 02e02b879d6b0..a2e9e57c88faa 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
@@ -1,33 +1,39 @@
 <script setup lang="ts">
-import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { ref, computed, onMounted } from 'vue';
-import { useDataSchema, useI18n, useMessage, useToast, useTelemetry } from '@/composables';
-import { generateCodeForPrompt } from '@/api/ai';
-import { useNDVStore, usePostHog, useRootStore, useWorkflowsStore } from '@/stores';
-import CircleLoader from './CircleLoader.vue';
-import { ASK_AI_EXPERIMENT } from '@/constants';
-import type { BaseTextKey } from '@/plugins/i18n';
 import { snakeCase } from 'lodash-es';
 import { useSessionStorage } from '@vueuse/core';
-import { executionDataToJson } from '@/utils';
+
+import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import type { CodeExecutionMode, INodeExecutionData } from 'n8n-workflow';
+
+import type { BaseTextKey } from '@/plugins/i18n';
 import type { INodeUi, Schema } from '@/Interface';
+import { generateCodeForPrompt } from '@/api/ai';
+import { useDataSchema, useI18n, useMessage, useToast, useTelemetry } from '@/composables';
+import { useNDVStore, usePostHog, useRootStore, useWorkflowsStore } from '@/stores';
+import { executionDataToJson } from '@/utils';
+import {
+	ASK_AI_EXPERIMENT,
+	ASK_AI_MAX_PROMPT_LENGTH,
+	ASK_AI_MIN_PROMPT_LENGTH,
+	ASK_AI_LOADING_DURATION_MS
+} from '@/constants';
+import CircleLoader from './CircleLoader.vue';
+
 
 const emit = defineEmits<{
-	submit: (code: string) => void;
-	replaceCode: (code: string) => void;
-	startedLoading: () => void;
-	finishedLoading: () => void;
+	(e: 'submit', code: string): void
+	(e: 'replaceCode', code: string): void
+	(e: 'startedLoading'): void
+	(e: 'finishedLoading'): void
 }>();
+
 const props = defineProps<{
 	hasChanges: boolean;
 }>();
 
 const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
 const i18n = useI18n();
-const maxLength = 600;
-const minLength = 15;
-const loadingDurationMs = 10000;
 
 const loadingPhraseIndex = ref(0);
 const loaderProgress = ref(0);
@@ -37,7 +43,7 @@ const prompt = ref('');
 const parentNodes = ref<INodeUi[]>([]);
 
 const isSubmitEnabled = computed(() => {
-	return !isEachItemMode.value && prompt.value.length >= minLength && hasExecutionData.value;
+	return !isEachItemMode.value && prompt.value.length >= ASK_AI_MIN_PROMPT_LENGTH && hasExecutionData.value;
 });
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
 const loadingString = computed(() =>
@@ -133,7 +139,6 @@ async function onSubmit() {
 
 		const { code, usage } = await generateCodeForPrompt(getRestApiContext, {
 			question: prompt.value,
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 			context: { schema: schemas.parentNodesSchemas, inputSchema: schemas.inputSchema! },
 			model,
 			n8nVersion: version,
@@ -168,41 +173,30 @@ async function onSubmit() {
 		stopLoading();
 	}
 }
-
-function triggerLoadingPhraseChange() {
+function triggerLoadingChange() {
+	const loadingPhraseUpdateMs = 2000;
+	const loadingPhrasesCount = 8;
 	let start: number | null = null;
 	let lastPhraseChange = 0;
-
 	const step = (timestamp: number) => {
 		if (!start) start = timestamp;
 
-		if (!lastPhraseChange || timestamp - lastPhraseChange >= 2000) {
-			loadingPhraseIndex.value = Math.floor(Math.random() * 8);
-			lastPhraseChange = timestamp;
+		// Loading phrase change
+		if (!lastPhraseChange || timestamp - lastPhraseChange >= loadingPhraseUpdateMs) {
+				loadingPhraseIndex.value = Math.floor(Math.random() * loadingPhrasesCount);
+				lastPhraseChange = timestamp;
 		}
 
-		if (!isLoading.value) return;
-
-		window.requestAnimationFrame(step);
-	};
-	window.requestAnimationFrame(step);
-}
-
-function triggerLoaderProgressChange() {
-	let start: number | null = null;
-
-	const step = (timestamp: number) => {
-		if (!start) start = timestamp;
+		// Loader progress change
 		const elapsed = timestamp - start;
-
-		loaderProgress.value = Math.min((elapsed / loadingDurationMs) * 100, 100);
+		loaderProgress.value = Math.min((elapsed / ASK_AI_LOADING_DURATION_MS) * 100, 100);
 
 		if (!isLoading.value) return;
-
-		if (loaderProgress.value < 100) {
-			window.requestAnimationFrame(step);
+		if (loaderProgress.value < 100 || lastPhraseChange + loadingPhraseUpdateMs > timestamp) {
+				window.requestAnimationFrame(step);
 		}
 	};
+
 	window.requestAnimationFrame(step);
 }
 
@@ -210,13 +204,14 @@ function startLoading() {
 	emit('startedLoading');
 	loaderProgress.value = 0;
 	isLoading.value = true;
-	triggerLoadingPhraseChange();
-	triggerLoaderProgressChange();
+
+	triggerLoadingChange();
 }
 
 function stopLoading() {
 	loaderProgress.value = 100;
 	emit('finishedLoading');
+
 	setTimeout(() => {
 		isLoading.value = false;
 	}, 200);
@@ -242,17 +237,17 @@ onMounted(() => {
 
 <template>
 	<div>
-		<p :class="$style.intro" v-text="$locale.baseText('codeNodeEditor.askAi.intro')" />
+		<p :class="$style.intro" v-text="i18n.baseText('codeNodeEditor.askAi.intro')" />
 		<div :class="$style.inputContainer">
 			<div :class="$style.meta">
 				<span
 					v-show="prompt.length > 1"
 					:class="$style.counter"
-					v-text="`${prompt.length} / ${maxLength}`"
+					v-text="`${prompt.length} / ${ASK_AI_MAX_PROMPT_LENGTH}`"
 				/>
 				<a href="https://docs.n8n.io/code-examples/ai-code" target="_blank" :class="$style.help">
 					<n8n-icon icon="question-circle" color="text-light" size="large" />{{
-						$locale.baseText('codeNodeEditor.askAi.help')
+						i18n.baseText('codeNodeEditor.askAi.help')
 					}}
 				</a>
 			</div>
@@ -262,8 +257,8 @@ onMounted(() => {
 				:class="$style.input"
 				type="textarea"
 				:rows="6"
-				:maxlength="maxLength"
-				:placeholder="$locale.baseText('codeNodeEditor.askAi.placeholder')"
+				:maxlength="ASK_AI_MAX_PROMPT_LENGTH"
+				:placeholder="i18n.baseText('codeNodeEditor.askAi.placeholder')"
 			/>
 		</div>
 		<div :class="$style.controls">
@@ -276,27 +271,27 @@ onMounted(() => {
 			<n8n-tooltip :disabled="isSubmitEnabled" v-else>
 				<div>
 					<N8nButton :disabled="!isSubmitEnabled" @click="onSubmit" size="small">{{
-						$locale.baseText('codeNodeEditor.askAi.generateCode')
+						i18n.baseText('codeNodeEditor.askAi.generateCode')
 					}}</N8nButton>
 				</div>
 				<template #content>
 					<span
 						v-if="!hasExecutionData"
-						v-text="$locale.baseText('codeNodeEditor.askAi.noInputData')"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
 					/>
 					<span
 						v-else-if="prompt.length === 0"
-						v-text="$locale.baseText('codeNodeEditor.askAi.noPrompt')"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
 					/>
 					<span
 						v-else-if="isEachItemMode"
-						v-text="$locale.baseText('codeNodeEditor.askAi.onlyAllItemsMode')"
+						v-text="i18n.baseText('codeNodeEditor.askAi.onlyAllItemsMode')"
 					/>
 					<span
-						v-else-if="prompt.length < minLength"
+						v-else-if="prompt.length < ASK_AI_MIN_PROMPT_LENGTH"
 						v-text="
-							$locale.baseText('codeNodeEditor.askAi.promptTooShort', {
-								interpolate: { minLength: minLength.toString() },
+							i18n.baseText('codeNodeEditor.askAi.promptTooShort', {
+								interpolate: { minLength: ASK_AI_MIN_PROMPT_LENGTH.toString() },
 							})
 						"
 					/>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 876b4a46f4fab..4308123a2850c 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -144,10 +144,13 @@ export default defineComponent({
 			return this.editor.state.doc.toString();
 		},
 		aiEnabled(): boolean {
-			const isAiExperimentDisabled = this.posthogStore.isVariantEnabled(
-				ASK_AI_EXPERIMENT.name,
-				ASK_AI_EXPERIMENT.control,
-			);
+			// AI is enabled only via Posthog experiment. So if user doesn't have feature flag
+			// we fallback to control which is no-show variant
+			const isAiExperimentDisabled = (
+				this.posthogStore.getVariant(ASK_AI_EXPERIMENT.name) ??
+				ASK_AI_EXPERIMENT.control
+			) === ASK_AI_EXPERIMENT.control;
+
 			return (
 				!isAiExperimentDisabled &&
 				this.settingsStore.settings.ai.enabled &&
@@ -170,7 +173,8 @@ export default defineComponent({
 		},
 	},
 	methods: {
-		async onBeforeTabLeave(_activeName, oldActiveName) {
+		async onBeforeTabLeave(_activeName: string, oldActiveName: string) {
+			// Confirm dialog if leaving ask-ai tab during loading
 			if (oldActiveName === 'ask-ai' && this.isLoading) {
 				const confirmModal = await this.alert(
 					this.$locale.baseText('codeNodeEditor.askAi.sureLeaveTab'),
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 10fdaf2f8c11b..15d95e23925ed 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -572,3 +572,8 @@ export const CLOUD_TRIAL_CHECK_INTERVAL = 5000;
 
 // A path that does not exist so that nothing is selected by default
 export const nonExistingJsonPath = '_!^&*';
+
+// Ask AI
+export const ASK_AI_MAX_PROMPT_LENGTH = 600;
+export const ASK_AI_MIN_PROMPT_LENGTH = 15;
+export const ASK_AI_LOADING_DURATION_MS = 12000;

From c7b7cc96e0ea6aa773fcc5ec27acfca5d9501397 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 14 Aug 2023 11:59:35 +0200
Subject: [PATCH 109/116] Move Ask AI into separate folder

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/components/CodeNodeEditor/{ => AskAI}/AskAI.vue   | 2 ++
 .../CodeNodeEditor/{ => AskAI}/CircleLoader.vue           | 8 ++++----
 .../src/components/CodeNodeEditor/CodeNodeEditor.vue      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename packages/editor-ui/src/components/CodeNodeEditor/{ => AskAI}/AskAI.vue (99%)
 rename packages/editor-ui/src/components/CodeNodeEditor/{ => AskAI}/CircleLoader.vue (91%)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
similarity index 99%
rename from packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
rename to packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index a2e9e57c88faa..54e96a50632d4 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -150,6 +150,7 @@ async function onSubmit() {
 			type: 'success',
 			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
 		});
+
 		useTelemetry().trackAskAI('askAi.generationFinished', {
 			prompt: prompt.value,
 			code,
@@ -163,6 +164,7 @@ async function onSubmit() {
 			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
 			message: getErrorMessageByStatusCode(error.httpStatusCode),
 		});
+
 		useTelemetry().trackAskAI('askAi.generationFinished', {
 			prompt: prompt.value,
 			code: '',
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue
similarity index 91%
rename from packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue
rename to packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue
index 33c2524d5ad14..a9231c2852b04 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CircleLoader.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue
@@ -2,7 +2,7 @@
 	<div class="progress-circle">
 		<svg class="progress-ring" :width="diameter" :height="diameter">
 			<circle
-				class="progress-ring-circle"
+				:class="$style.progressRingCircle"
 				:stroke-width="strokeWidth"
 				stroke="#DCDFE6"
 				fill="transparent"
@@ -10,7 +10,7 @@
 				v-bind="{ cx, cy }"
 			/>
 			<circle
-				class="progress-ring-circle"
+				:class="$style.progressRingCircle"
 				stroke="#5C4EC2"
 				:stroke-width="strokeWidth"
 				fill="transparent"
@@ -54,8 +54,8 @@ const style = computed(() => ({
 }));
 </script>
 
-<style scoped>
-.progress-ring-circle {
+<style module>
+.progressRingCircle {
 	transition: stroke-dashoffset 0.35s linear;
 	transform: rotate(-90deg);
 	transform-origin: 50% 50%;
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 4308123a2850c..8ef5cbfda0c9f 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -58,7 +58,7 @@ import { CODE_PLACEHOLDERS } from './constants';
 import { linterExtension } from './linter';
 import { completerExtension } from './completer';
 import { codeNodeEditorTheme } from './theme';
-import AskAI from './AskAI.vue';
+import AskAI from './AskAI/AskAI.vue';
 import { useMessage } from '@/composables';
 
 export default defineComponent({

From 7b021b50adfd126b6036ad5bc55aa741a1f12d4e Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 14 Aug 2023 12:34:37 +0200
Subject: [PATCH 110/116] Lint fix

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../components/CodeNodeEditor/AskAI/AskAI.vue | 23 +++++++++++--------
 .../CodeNodeEditor/CodeNodeEditor.vue         | 11 ++++-----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index 54e96a50632d4..cb36a82d169b1 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -16,16 +16,15 @@ import {
 	ASK_AI_EXPERIMENT,
 	ASK_AI_MAX_PROMPT_LENGTH,
 	ASK_AI_MIN_PROMPT_LENGTH,
-	ASK_AI_LOADING_DURATION_MS
+	ASK_AI_LOADING_DURATION_MS,
 } from '@/constants';
 import CircleLoader from './CircleLoader.vue';
 
-
 const emit = defineEmits<{
-	(e: 'submit', code: string): void
-	(e: 'replaceCode', code: string): void
-	(e: 'startedLoading'): void
-	(e: 'finishedLoading'): void
+	(e: 'submit', code: string): void;
+	(e: 'replaceCode', code: string): void;
+	(e: 'startedLoading'): void;
+	(e: 'finishedLoading'): void;
 }>();
 
 const props = defineProps<{
@@ -43,7 +42,11 @@ const prompt = ref('');
 const parentNodes = ref<INodeUi[]>([]);
 
 const isSubmitEnabled = computed(() => {
-	return !isEachItemMode.value && prompt.value.length >= ASK_AI_MIN_PROMPT_LENGTH && hasExecutionData.value;
+	return (
+		!isEachItemMode.value &&
+		prompt.value.length >= ASK_AI_MIN_PROMPT_LENGTH &&
+		hasExecutionData.value
+	);
 });
 const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
 const loadingString = computed(() =>
@@ -185,8 +188,8 @@ function triggerLoadingChange() {
 
 		// Loading phrase change
 		if (!lastPhraseChange || timestamp - lastPhraseChange >= loadingPhraseUpdateMs) {
-				loadingPhraseIndex.value = Math.floor(Math.random() * loadingPhrasesCount);
-				lastPhraseChange = timestamp;
+			loadingPhraseIndex.value = Math.floor(Math.random() * loadingPhrasesCount);
+			lastPhraseChange = timestamp;
 		}
 
 		// Loader progress change
@@ -195,7 +198,7 @@ function triggerLoadingChange() {
 
 		if (!isLoading.value) return;
 		if (loaderProgress.value < 100 || lastPhraseChange + loadingPhraseUpdateMs > timestamp) {
-				window.requestAnimationFrame(step);
+			window.requestAnimationFrame(step);
 		}
 	};
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 8ef5cbfda0c9f..c29a2a90e505c 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -12,8 +12,8 @@
 			v-if="aiEnabled"
 			:before-leave="onBeforeTabLeave"
 		>
-			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code">
-				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
+			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code" data-test-id="code-node-tab-code">
+				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" data-test-id="code-node-tab-code" />
 			</el-tab-pane>
 			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
 				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
@@ -146,10 +146,9 @@ export default defineComponent({
 		aiEnabled(): boolean {
 			// AI is enabled only via Posthog experiment. So if user doesn't have feature flag
 			// we fallback to control which is no-show variant
-			const isAiExperimentDisabled = (
-				this.posthogStore.getVariant(ASK_AI_EXPERIMENT.name) ??
-				ASK_AI_EXPERIMENT.control
-			) === ASK_AI_EXPERIMENT.control;
+			const isAiExperimentDisabled =
+				(this.posthogStore.getVariant(ASK_AI_EXPERIMENT.name) ?? ASK_AI_EXPERIMENT.control) ===
+				ASK_AI_EXPERIMENT.control;
 
 			return (
 				!isAiExperimentDisabled &&

From 24d2cf323067b47bb4da1ff1a814f971afb468a6 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Mon, 14 Aug 2023 12:35:09 +0200
Subject: [PATCH 111/116] Constants lint fix

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 packages/editor-ui/src/constants.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 15d95e23925ed..21de8402ca795 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -537,10 +537,7 @@ export const ASK_AI_EXPERIMENT = {
 	gpt4: 'gpt4',
 };
 
-export const EXPERIMENTS_TO_TRACK = [
-	TEMPLATES_EXPERIMENT.name,
-	ASK_AI_EXPERIMENT.name,
-];
+export const EXPERIMENTS_TO_TRACK = [TEMPLATES_EXPERIMENT.name, ASK_AI_EXPERIMENT.name];
 
 export const NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND = [FILTER_NODE_TYPE];
 

From 4531622092844ddfa79f0ce75b2fd82941f6303e Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 15 Aug 2023 12:02:32 +0200
Subject: [PATCH 112/116] Add Ask AI e2e tests and fix linting issues

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 cypress/e2e/6-code-node.cy.ts                 | 134 ++++++++++++++++++
 cypress/pages/ndv.ts                          |   2 +-
 packages/cli/src/config/index.ts              |   1 +
 .../components/CodeNodeEditor/AskAI/AskAI.vue |  55 ++++---
 .../CodeNodeEditor/CodeNodeEditor.vue         |  14 +-
 5 files changed, 180 insertions(+), 26 deletions(-)

diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 4a987dd6cdce6..6575e0aa98b1d 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -30,4 +30,138 @@ describe('Code node', () => {
 
 		WorkflowPage.getters.successToast().contains('Node executed successfully');
 	});
+
+	it('should execute the placeholder in each-item mode successfully', () => {
+		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+		WorkflowPage.actions.addNodeToCanvas('Code');
+		WorkflowPage.actions.openNode('Code');
+		ndv.getters.parameterInput('mode').click();
+		ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
+
+		ndv.actions.execute();
+
+		WorkflowPage.getters.successToast().contains('Node executed successfully');
+	});
+
+	describe('Ask AI', () => {
+		it('tab should not exist if control or no feature flag', () => {
+			cy.window().then((win) => {
+				// cy.clearAllLocalStorage();
+				win.featureFlags.override('011_ask_AI', 'control');
+				WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+				WorkflowPage.actions.addNodeToCanvas('Code');
+				WorkflowPage.actions.openNode('Code');
+
+				cy.getByTestId('code-node-tab-ai').should('not.exist');
+
+				ndv.actions.close();
+				win.featureFlags.override('011_ask_AI', undefined);
+				WorkflowPage.actions.openNode('Code');
+				cy.getByTestId('code-node-tab-ai').should('not.exist');
+			})
+		})
+
+		describe('Enabled', () => {
+			beforeEach(() => {
+				cy.window().then((win) => {
+					win.featureFlags.override('011_ask_AI', 'gpt3');
+					WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+					WorkflowPage.actions.addNodeToCanvas('Code');
+					WorkflowPage.actions.openNode('Code');
+				})
+			})
+
+			it('tab should exist if model selected and be selectable', () => {
+					cy.getByTestId('code-node-tab-ai').should('exist');
+					cy.get('#tab-ask-ai').click();
+					cy.contains('Hey AI, generate JavaScript').should('exist');
+			})
+
+			it('generate code button should have correct state & tooltips', () => {
+				cy.getByTestId('code-node-tab-ai').should('exist');
+				cy.get('#tab-ask-ai').click();
+
+
+				cy.getByTestId('ask-ai-cta').should('be.disabled');
+				cy.getByTestId('ask-ai-cta').realHover();
+				cy.getByTestId('ask-ai-cta-tooltip-no-input-data').should('exist');
+				ndv.actions.executePrevious();
+				cy.getByTestId('ask-ai-cta').realHover();
+				cy.getByTestId('ask-ai-cta-tooltip-no-prompt').should('exist');
+				cy.getByTestId('ask-ai-prompt-input')
+					// Type random 14 character string
+					.type([...Array(14)].map(() => (Math.random() * 36 | 0).toString(36)).join(''))
+
+				cy.getByTestId('ask-ai-cta').realHover();
+				cy.getByTestId('ask-ai-cta-tooltip-prompt-too-short').should('exist');
+
+				cy.getByTestId('ask-ai-prompt-input')
+					.clear()
+					// Type random 15 character string
+					.type([...Array(15)].map(() => (Math.random() * 36 | 0).toString(36)).join(''))
+				cy.getByTestId('ask-ai-cta').should('be.enabled');
+
+				cy.getByTestId('ask-ai-prompt-counter').should('contain.text', '15 / 600');
+			})
+
+			it('should send correct schema and replace code', () => {
+				const prompt = [...Array(20)].map(() => (Math.random() * 36 | 0).toString(36)).join('');
+				cy.get('#tab-ask-ai').click();
+				ndv.actions.executePrevious();
+
+				cy.getByTestId('ask-ai-prompt-input').type(prompt)
+
+				cy.intercept('POST', '/rest/ask-ai', {
+					statusCode: 200,
+					body: {
+						data: {
+							code: 'console.log("Hello World")',
+							usage: {
+								prompt_tokens: 15,
+								completion_tokens: 15,
+								total_tokens: 30
+							}
+						},
+					}
+				}).as('ask-ai');
+				cy.getByTestId('ask-ai-cta').click();
+				cy.wait('@ask-ai')
+					.its('request.body')
+					.should('deep.include', {
+						question: prompt,
+						model: "gpt-3.5-turbo-16k",
+						context: { schema: [] }
+					});
+
+				cy.contains('Code generation completed').should('be.visible')
+				cy.getByTestId('code-node-tab-code').should('contain.text', 'console.log("Hello World")');
+				cy.get('#tab-code').should('have.class', 'is-active');
+			})
+
+			it('should show error based on status code', () => {
+					const prompt = [...Array(20)].map(() => (Math.random() * 36 | 0).toString(36)).join('');
+					cy.get('#tab-ask-ai').click();
+					ndv.actions.executePrevious();
+
+					cy.getByTestId('ask-ai-prompt-input').type(prompt)
+
+					const handledCodes = [
+						{ code: 400, message: 'Code generation failed due to an unknown reason' },
+						{ code: 413, message: 'Your workflow data is too large for AI to process' },
+						{ code: 429, message: 'We\'ve hit our rate limit with our AI partner' },
+						{ code: 500, message: 'Code generation failed due to an unknown reason' },
+					]
+
+					handledCodes.forEach(({ code, message }) => {
+						cy.intercept('POST', '/rest/ask-ai', {
+							statusCode: code,
+							status: code,
+						}).as('ask-ai');
+
+						cy.getByTestId('ask-ai-cta').click();
+						cy.contains(message).should('be.visible')
+					})
+			})
+		})
+	});
 });
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index bde403a0fe626..301de78cfe5a3 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -114,7 +114,7 @@ export class NDV extends BasePage {
 			cy.get('body').type('{enter}');
 		},
 		executePrevious: () => {
-			this.getters.executePrevious().click();
+			this.getters.executePrevious().click({ force: true });
 		},
 		mapDataFromHeader: (col: number, parameterName: string) => {
 			const draggable = `[data-test-id="ndv-input-panel"] [data-test-id="ndv-data-container"] table th:nth-child(${col})`;
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 351b31d853cdc..2c2890412f50e 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -18,6 +18,7 @@ if (inE2ETests) {
 		N8N_PUBLIC_API_DISABLED: 'true',
 		EXTERNAL_FRONTEND_HOOKS_URLS: '',
 		N8N_PERSONALIZATION_ENABLED: 'false',
+		N8N_AI_ENABLED: 'true',
 	};
 } else if (inTest) {
 	const testsDir = join(tmpdir(), 'n8n-tests/');
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index cb36a82d169b1..f07206cd95829 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -107,6 +107,23 @@ function getSchemas() {
 	};
 }
 
+function startLoading() {
+	emit('startedLoading');
+	loaderProgress.value = 0;
+	isLoading.value = true;
+
+	triggerLoadingChange();
+}
+
+function stopLoading() {
+	loaderProgress.value = 100;
+	emit('finishedLoading');
+
+	setTimeout(() => {
+		isLoading.value = false;
+	}, 200);
+}
+
 async function onSubmit() {
 	const { getRestApiContext } = useRootStore();
 	const { activeNode } = useNDVStore();
@@ -165,7 +182,7 @@ async function onSubmit() {
 		showMessage({
 			type: 'error',
 			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
-			message: getErrorMessageByStatusCode(error.httpStatusCode),
+			message: getErrorMessageByStatusCode(error.httpStatusCode || error?.response.status),
 		});
 
 		useTelemetry().trackAskAI('askAi.generationFinished', {
@@ -173,7 +190,7 @@ async function onSubmit() {
 			code: '',
 			tokensCount: 0,
 			hasErrors: true,
-			error: getErrorMessageByStatusCode(error.httpStatusCode),
+			error: getErrorMessageByStatusCode(error.httpStatusCode || error?.response.status),
 		});
 		stopLoading();
 	}
@@ -205,23 +222,6 @@ function triggerLoadingChange() {
 	window.requestAnimationFrame(step);
 }
 
-function startLoading() {
-	emit('startedLoading');
-	loaderProgress.value = 0;
-	isLoading.value = true;
-
-	triggerLoadingChange();
-}
-
-function stopLoading() {
-	loaderProgress.value = 100;
-	emit('finishedLoading');
-
-	setTimeout(() => {
-		isLoading.value = false;
-	}, 200);
-}
-
 function getSessionStoragePrompt() {
 	const codeNodeName = (useNDVStore().activeNode?.name as string) ?? '';
 	const hashedCode = snakeCase(codeNodeName);
@@ -249,6 +249,7 @@ onMounted(() => {
 					v-show="prompt.length > 1"
 					:class="$style.counter"
 					v-text="`${prompt.length} / ${ASK_AI_MAX_PROMPT_LENGTH}`"
+					data-test-id="ask-ai-prompt-counter"
 				/>
 				<a href="https://docs.n8n.io/code-examples/ai-code" target="_blank" :class="$style.help">
 					<n8n-icon icon="question-circle" color="text-light" size="large" />{{
@@ -264,6 +265,7 @@ onMounted(() => {
 				:rows="6"
 				:maxlength="ASK_AI_MAX_PROMPT_LENGTH"
 				:placeholder="i18n.baseText('codeNodeEditor.askAi.placeholder')"
+				data-test-id="ask-ai-prompt-input"
 			/>
 		</div>
 		<div :class="$style.controls">
@@ -275,25 +277,34 @@ onMounted(() => {
 			</div>
 			<n8n-tooltip :disabled="isSubmitEnabled" v-else>
 				<div>
-					<N8nButton :disabled="!isSubmitEnabled" @click="onSubmit" size="small">{{
-						i18n.baseText('codeNodeEditor.askAi.generateCode')
-					}}</N8nButton>
+					<N8nButton
+						:disabled="!isSubmitEnabled"
+						@click="onSubmit"
+						size="small"
+						data-test-id="ask-ai-cta"
+					>
+						{{ i18n.baseText('codeNodeEditor.askAi.generateCode') }}
+					</N8nButton>
 				</div>
 				<template #content>
 					<span
 						v-if="!hasExecutionData"
 						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
+						data-test-id="ask-ai-cta-tooltip-no-input-data"
 					/>
 					<span
 						v-else-if="prompt.length === 0"
 						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
+						data-test-id="ask-ai-cta-tooltip-no-prompt"
 					/>
 					<span
 						v-else-if="isEachItemMode"
 						v-text="i18n.baseText('codeNodeEditor.askAi.onlyAllItemsMode')"
+						data-test-id="ask-ai-cta-tooltip-only-all-items-mode"
 					/>
 					<span
 						v-else-if="prompt.length < ASK_AI_MIN_PROMPT_LENGTH"
+						data-test-id="ask-ai-cta-tooltip-prompt-too-short"
 						v-text="
 							i18n.baseText('codeNodeEditor.askAi.promptTooShort', {
 								interpolate: { minLength: ASK_AI_MIN_PROMPT_LENGTH.toString() },
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index c29a2a90e505c..ec829a0343e3b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -12,10 +12,18 @@
 			v-if="aiEnabled"
 			:before-leave="onBeforeTabLeave"
 		>
-			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.code')" name="code" data-test-id="code-node-tab-code">
-				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" data-test-id="code-node-tab-code" />
+			<el-tab-pane
+				:label="$locale.baseText('codeNodeEditor.tabs.code')"
+				name="code"
+				data-test-id="code-node-tab-code"
+			>
+				<div ref="codeNodeEditor" class="code-node-editor-input ph-no-capture code-editor-tabs" />
 			</el-tab-pane>
-			<el-tab-pane :label="$locale.baseText('codeNodeEditor.tabs.askAi')" name="ask-ai">
+			<el-tab-pane
+				:label="$locale.baseText('codeNodeEditor.tabs.askAi')"
+				name="ask-ai"
+				data-test-id="code-node-tab-ai"
+			>
 				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
 				<AskAI
 					@replaceCode="onReplaceCode"

From b50a92d0a54503b6299e8ed551cbfbf717a0d7f8 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 15 Aug 2023 18:32:00 +0200
Subject: [PATCH 113/116] Move CircleLoader to design-lib

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../N8nCircleLoader/CircleLoader.stories.ts   | 50 +++++++++++++++
 .../N8nCircleLoader/CircleLoader.vue          | 63 +++++++++++++++++++
 .../__tests__/CircleLoader.spec.ts            | 15 +++++
 .../__snapshots__/CircleLoader.spec.ts.snap   |  8 +++
 .../src/components/N8nCircleLoader/index.ts   |  3 +
 5 files changed, 139 insertions(+)
 create mode 100644 packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
 create mode 100644 packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue
 create mode 100644 packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
 create mode 100644 packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap
 create mode 100644 packages/design-system/src/components/N8nCircleLoader/index.ts

diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
new file mode 100644
index 0000000000000..a9f11a3165579
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
@@ -0,0 +1,50 @@
+import N8nCircleLoader from './CircleLoader.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Atoms/CircleLoader',
+	component: N8nCircleLoader,
+	argTypes: {
+		radius: {
+			control: {
+				type: 'number',
+			},
+		},
+		progress: {
+			control: {
+				type: 'number',
+			},
+		},
+		strokeWidth: {
+			control: {
+				type: 'number',
+			},
+		},
+	},
+};
+
+interface Args {
+	radius: number;
+	progress: number;
+	strokeWidth: number;
+}
+
+const template: StoryFn<Args> = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		N8nCircleLoader,
+	},
+	template: `
+		<div>
+			<n8n-circle-loader v-bind="args" />
+		</div>
+	`,
+});
+
+export const defaultCircleLoader = template.bind({});
+defaultCircleLoader.args = {
+	radius: 20,
+	progress: 42,
+	strokeWidth: 10,
+};
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue
new file mode 100644
index 0000000000000..a9231c2852b04
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue
@@ -0,0 +1,63 @@
+<template>
+	<div class="progress-circle">
+		<svg class="progress-ring" :width="diameter" :height="diameter">
+			<circle
+				:class="$style.progressRingCircle"
+				:stroke-width="strokeWidth"
+				stroke="#DCDFE6"
+				fill="transparent"
+				:r="radius"
+				v-bind="{ cx, cy }"
+			/>
+			<circle
+				:class="$style.progressRingCircle"
+				stroke="#5C4EC2"
+				:stroke-width="strokeWidth"
+				fill="transparent"
+				:r="radius"
+				v-bind="{ cx, cy, style }"
+			/>
+		</svg>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+const props = defineProps({
+	radius: {
+		type: Number,
+		required: true,
+	},
+	progress: {
+		type: Number,
+		required: true,
+	},
+	strokeWidth: {
+		type: Number,
+		default: 4,
+	},
+});
+
+// for SVG viewbox and stroke array
+const diameter = computed(() => 2 * (props.radius + props.strokeWidth));
+const circumference = computed(() => 2 * Math.PI * props.radius);
+
+const strokeDashoffset = computed(
+	() => circumference.value - (props.progress / 100) * circumference.value,
+);
+
+const cx = computed(() => props.radius + props.strokeWidth);
+const cy = computed(() => props.radius + props.strokeWidth);
+const style = computed(() => ({
+	strokeDasharray: `${circumference.value}`,
+	strokeDashoffset: `${strokeDashoffset.value}`,
+}));
+</script>
+
+<style module>
+.progressRingCircle {
+	transition: stroke-dashoffset 0.35s linear;
+	transform: rotate(-90deg);
+	transform-origin: 50% 50%;
+}
+</style>
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts b/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
new file mode 100644
index 0000000000000..a05b4c219af86
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
@@ -0,0 +1,15 @@
+import { render } from '@testing-library/vue';
+import N8NCircleLoader from '../CircleLoader.vue';
+
+describe('N8NCircleLoader', () => {
+	it('should render correctly', () => {
+		const wrapper = render(N8NCircleLoader, {
+			props: {
+				radius: 20,
+				progress: 42,
+				strokeWidth: 10,
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap b/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap
new file mode 100644
index 0000000000000..1f208ed67dfe9
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap
@@ -0,0 +1,8 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`N8NCircleLoader > should render correctly 1`] = `
+"<div class=\\"progress-circle\\"><svg class=\\"progress-ring\\" width=\\"60\\" height=\\"60\\">
+    <circle class=\\"progressRingCircle\\" stroke-width=\\"10\\" stroke=\\"#DCDFE6\\" fill=\\"transparent\\" r=\\"20\\" cx=\\"30\\" cy=\\"30\\"></circle>
+    <circle class=\\"progressRingCircle\\" stroke=\\"#5C4EC2\\" stroke-width=\\"10\\" fill=\\"transparent\\" r=\\"20\\" cx=\\"30\\" cy=\\"30\\" style=\\"stroke-dasharray: 125.66370614359172; stroke-dashoffset: 72.8849495632832;\\"></circle>
+  </svg></div>"
+`;
diff --git a/packages/design-system/src/components/N8nCircleLoader/index.ts b/packages/design-system/src/components/N8nCircleLoader/index.ts
new file mode 100644
index 0000000000000..fcd1764c53831
--- /dev/null
+++ b/packages/design-system/src/components/N8nCircleLoader/index.ts
@@ -0,0 +1,3 @@
+import N8nCircleLoader from './CircleLoader.vue';
+
+export default N8nCircleLoader;

From 6adc5d9ba3c67a088b721e49be0b2fc7ffa1f968 Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 15 Aug 2023 18:32:26 +0200
Subject: [PATCH 114/116] Replace circle-lodaer and move el-tabs styles to n8n
 theme

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../design-system/src/components/index.ts     |  1 +
 packages/design-system/src/plugin.ts          |  2 ++
 .../components/CodeNodeEditor/AskAI/AskAI.vue |  4 ++--
 packages/editor-ui/src/n8n-theme.scss         | 23 +++++++++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index 888149da2cf0b..9e9cbd616e245 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -9,6 +9,7 @@ export { default as N8nButton } from './N8nButton';
 export { default as N8nCallout } from './N8nCallout';
 export { default as N8nCard } from './N8nCard';
 export { default as N8nCheckbox } from './N8nCheckbox';
+export { default as N8nCircleLoader } from './N8nCircleLoader';
 export { default as N8nColorPicker } from './N8nColorPicker';
 export { default as N8nDatatable } from './N8nDatatable';
 export { default as N8nFormBox } from './N8nFormBox';
diff --git a/packages/design-system/src/plugin.ts b/packages/design-system/src/plugin.ts
index 1ad81241cc441..2f0bea9017f56 100644
--- a/packages/design-system/src/plugin.ts
+++ b/packages/design-system/src/plugin.ts
@@ -12,6 +12,7 @@ import {
 	N8nCallout,
 	N8nCard,
 	N8nCheckbox,
+	N8nCircleLoader,
 	N8nColorPicker,
 	N8nDatatable,
 	N8nFormBox,
@@ -66,6 +67,7 @@ export const N8nPlugin: Plugin<{}> = {
 		app.component('n8n-callout', N8nCallout);
 		app.component('n8n-card', N8nCard);
 		app.component('n8n-checkbox', N8nCheckbox);
+		app.component('n8n-circle-loader', N8nCircleLoader);
 		app.component('n8n-color-picker', N8nColorPicker);
 		app.component('n8n-datatable', N8nDatatable);
 		app.component('n8n-form-box', N8nFormBox);
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index f07206cd95829..1333234c2ad26 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -18,7 +18,6 @@ import {
 	ASK_AI_MIN_PROMPT_LENGTH,
 	ASK_AI_LOADING_DURATION_MS,
 } from '@/constants';
-import CircleLoader from './CircleLoader.vue';
 
 const emit = defineEmits<{
 	(e: 'submit', code: string): void;
@@ -150,6 +149,7 @@ async function onSubmit() {
 	}
 
 	startLoading();
+
 	try {
 		const version = useRootStore().versionCli;
 		const model =
@@ -273,7 +273,7 @@ onMounted(() => {
 				<transition name="text-fade-in-out" mode="out-in">
 					<div v-text="loadingString" :key="loadingPhraseIndex" />
 				</transition>
-				<CircleLoader :radius="8" :progress="loaderProgress" :stroke-width="3" />
+				<n8n-circle-loader :radius="8" :progress="90" :stroke-width="3" />
 			</div>
 			<n8n-tooltip :disabled="isSubmitEnabled" v-else>
 				<div>
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index 1e5e13c22507d..15111847e017a 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -128,6 +128,29 @@
 	font-weight: bold;
 }
 
+.el-tabs__content {
+	border: 1px solid var(--color-foreground-base);
+	border-radius: 0px var(--border-radius-base) var(--border-radius-base);
+}
+.el-tabs__header {
+	border-bottom: 0 !important;
+}
+.el-tabs__nav {
+	padding: 0;
+}
+.el-tabs__item {
+	padding: var(--spacing-5xs) var(--spacing-2xs) !important;
+	height: auto;
+	line-height: var(--font-line-height-xloose);
+	font-weight: var(--font-weight-regular);
+	font-size: var(--font-size-2xs);
+
+	&:not([aria-selected='true']) {
+		background-color: var(--color-background-base);
+		border-bottom: 1px solid var(--color-foreground-base) !important;
+	}
+}
+
 // Loading Indicator
 .el-loading-mask {
 	background-color: var(--color-foreground-xlight);

From 59fdf9857add90ffba80512c56a895a7bb17ff2d Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 15 Aug 2023 20:01:01 +0200
Subject: [PATCH 115/116] Fix placeholder & e2e tests

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 cypress/e2e/6-code-node.cy.ts                 | 63 ++++++++--------
 .../components/CodeNodeEditor/AskAI/AskAI.vue |  2 +-
 .../CodeNodeEditor/CodeNodeEditor.vue         | 74 +++++++------------
 packages/editor-ui/src/n8n-theme.scss         |  1 +
 4 files changed, 59 insertions(+), 81 deletions(-)

diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 6575e0aa98b1d..0ed9ba5089b6b 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -5,48 +5,43 @@ const WorkflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
 describe('Code node', () => {
-	beforeEach(() => {
-		WorkflowPage.actions.visit();
-	});
-
-	it('should execute the placeholder in all-items mode successfully', () => {
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Code');
-		WorkflowPage.actions.openNode('Code');
+	describe('Code editor', () => {
+		beforeEach(() => {
+			WorkflowPage.actions.visit();
+			WorkflowPage.actions.addInitialNodeToCanvas('Manual');
+			WorkflowPage.actions.addNodeToCanvas('Code', true, true);
+		});
 
-		ndv.actions.execute();
+		it('should show correct placeholders switching modes', () => {
+			cy.contains("// Loop over input items and add a new field").should('be.visible');
 
-		WorkflowPage.getters.successToast().contains('Node executed successfully');
-	});
+			ndv.getters.parameterInput('mode').click();
+			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
 
-	it('should execute the placeholder in each-item mode successfully', () => {
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Code');
-		WorkflowPage.actions.openNode('Code');
-		ndv.getters.parameterInput('mode').click();
-		ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
+			cy.contains("// Add a new field called 'myNewField'").should('be.visible');
 
-		ndv.actions.execute();
+			ndv.getters.parameterInput('mode').click();
+			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for All Items');
+			cy.contains("// Loop over input items and add a new field").should('be.visible');
+		})
 
-		WorkflowPage.getters.successToast().contains('Node executed successfully');
-	});
+		it('should execute the placeholder successfully in both modes', () => {
+			ndv.actions.execute();
 
-	it('should execute the placeholder in each-item mode successfully', () => {
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-		WorkflowPage.actions.addNodeToCanvas('Code');
-		WorkflowPage.actions.openNode('Code');
-		ndv.getters.parameterInput('mode').click();
-		ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
+			WorkflowPage.getters.successToast().contains('Node executed successfully');
+			ndv.getters.parameterInput('mode').click();
+			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
 
-		ndv.actions.execute();
+			ndv.actions.execute();
 
-		WorkflowPage.getters.successToast().contains('Node executed successfully');
-	});
+			WorkflowPage.getters.successToast().contains('Node executed successfully');
+		});
+	})
 
 	describe('Ask AI', () => {
-		it('tab should not exist if control or no feature flag', () => {
+		it('tab should display based on experiment', () => {
+			WorkflowPage.actions.visit();
 			cy.window().then((win) => {
-				// cy.clearAllLocalStorage();
 				win.featureFlags.override('011_ask_AI', 'control');
 				WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 				WorkflowPage.actions.addNodeToCanvas('Code');
@@ -63,15 +58,15 @@ describe('Code node', () => {
 
 		describe('Enabled', () => {
 			beforeEach(() => {
+				WorkflowPage.actions.visit();
 				cy.window().then((win) => {
 					win.featureFlags.override('011_ask_AI', 'gpt3');
 					WorkflowPage.actions.addInitialNodeToCanvas('Manual');
-					WorkflowPage.actions.addNodeToCanvas('Code');
-					WorkflowPage.actions.openNode('Code');
+					WorkflowPage.actions.addNodeToCanvas('Code', true, true);
 				})
 			})
 
-			it('tab should exist if model selected and be selectable', () => {
+			it('tab should exist if experiment selected and be selectable', () => {
 					cy.getByTestId('code-node-tab-ai').should('exist');
 					cy.get('#tab-ask-ai').click();
 					cy.contains('Hey AI, generate JavaScript').should('exist');
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index 1333234c2ad26..9a4876b33bd6c 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -273,7 +273,7 @@ onMounted(() => {
 				<transition name="text-fade-in-out" mode="out-in">
 					<div v-text="loadingString" :key="loadingPhraseIndex" />
 				</transition>
-				<n8n-circle-loader :radius="8" :progress="90" :stroke-width="3" />
+				<n8n-circle-loader :radius="8" :progress="loaderProgress" :stroke-width="3" />
 			</div>
 			<n8n-tooltip :disabled="isSubmitEnabled" v-else>
 				<div>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index ec829a0343e3b..c1551a9787558 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -29,8 +29,8 @@
 					@replaceCode="onReplaceCode"
 					:has-changes="hasChanges"
 					:key="activeTab"
-					@started-loading="isLoading = true"
-					@finished-loading="isLoading = false"
+					@started-loading="isLoadingAIResponse = true"
+					@finished-loading="isLoadingAIResponse = false"
 				/>
 			</el-tab-pane>
 		</el-tabs>
@@ -112,19 +112,23 @@ export default defineComponent({
 			tabs: ['code', 'ask-ai'],
 			activeTab: 'code',
 			hasChanges: false,
-			isLoading: false,
+			isLoadingAIResponse: false,
 		};
 	},
 	watch: {
 		mode(newMode, previousMode: CodeExecutionMode) {
 			this.reloadLinter();
 
-			if (this.content.trim() === CODE_PLACEHOLDERS[this.language]?.[previousMode]) {
+			if (
+				this.getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[this.language]?.[previousMode]
+			) {
 				this.refreshPlaceholder();
 			}
 		},
 		language(newLanguage, previousLanguage: CodeNodeEditorLanguage) {
-			if (this.content.trim() === CODE_PLACEHOLDERS[previousLanguage]?.[this.mode]) {
+			if (
+				this.getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[previousLanguage]?.[this.mode]
+			) {
 				this.refreshPlaceholder();
 			}
 
@@ -146,20 +150,13 @@ export default defineComponent({
 	},
 	computed: {
 		...mapStores(useRootStore, usePostHog),
-		content(): string {
-			if (!this.editor) return '';
-
-			return this.editor.state.doc.toString();
-		},
 		aiEnabled(): boolean {
-			// AI is enabled only via Posthog experiment. So if user doesn't have feature flag
-			// we fallback to control which is no-show variant
-			const isAiExperimentDisabled =
-				(this.posthogStore.getVariant(ASK_AI_EXPERIMENT.name) ?? ASK_AI_EXPERIMENT.control) ===
-				ASK_AI_EXPERIMENT.control;
+			const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
+				(this.posthogStore.getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
+			);
 
 			return (
-				!isAiExperimentDisabled &&
+				isAiExperimentEnabled &&
 				this.settingsStore.settings.ai.enabled &&
 				this.language === 'javaScript'
 			);
@@ -180,9 +177,12 @@ export default defineComponent({
 		},
 	},
 	methods: {
+		getCurrentEditorContent() {
+			return this.editor?.state.doc.toString() ?? '';
+		},
 		async onBeforeTabLeave(_activeName: string, oldActiveName: string) {
 			// Confirm dialog if leaving ask-ai tab during loading
-			if (oldActiveName === 'ask-ai' && this.isLoading) {
+			if (oldActiveName === 'ask-ai' && this.isLoadingAIResponse) {
 				const confirmModal = await this.alert(
 					this.$locale.baseText('codeNodeEditor.askAi.sureLeaveTab'),
 					{
@@ -209,7 +209,7 @@ export default defineComponent({
 			});
 
 			this.editor?.dispatch({
-				changes: { from: 0, to: (this.modelValue || '').length, insert: formattedCode },
+				changes: { from: 0, to: this.getCurrentEditorContent().length, insert: formattedCode },
 			});
 
 			this.activeTab = 'code';
@@ -241,7 +241,7 @@ export default defineComponent({
 			if (!this.editor) return;
 
 			this.editor.dispatch({
-				changes: { from: 0, to: this.content.length, insert: this.placeholder },
+				changes: { from: 0, to: this.editor.state.doc.length, insert: this.placeholder },
 			});
 		},
 		line(lineNumber: number): Line | null {
@@ -256,7 +256,7 @@ export default defineComponent({
 
 			if (lineNumber === 'final') {
 				this.editor.dispatch({
-					selection: { anchor: (this.modelValue ?? this.content).length },
+					selection: { anchor: this.getCurrentEditorContent().length },
 				});
 				return;
 			}
@@ -277,7 +277,7 @@ export default defineComponent({
 			try {
 				// @ts-ignore - undocumented fields
 				const { fromA, toB } = viewUpdate?.changedRanges[0];
-				const full = this.content.slice(fromA, toB);
+				const full = this.getCurrentEditorContent().slice(fromA, toB);
 				const lastDotIndex = full.lastIndexOf('.');
 
 				let context = null;
@@ -360,40 +360,22 @@ export default defineComponent({
 
 		// empty on first load, default param value
 		if (!this.modelValue) {
+			this.refreshPlaceholder();
 			this.$emit('update:modelValue', this.placeholder);
 		}
 	},
 });
 </script>
 
-<style lang="scss" module>
-:global(.el-tabs) {
-	:global(.el-tabs__content) {
-		border: 1px solid var(--color-foreground-base);
-		border-radius: 0px var(--border-radius-base) var(--border-radius-base);
-	}
-	:global(.el-tabs__header) {
-		border-bottom: 0 !important;
-	}
-	:global(.el-tabs__nav) {
-		padding: 0;
-	}
-	:global(.el-tabs__item) {
-		padding: var(--spacing-5xs) var(--spacing-2xs) !important;
-		height: auto;
-		line-height: var(--font-line-height-xloose);
-		font-weight: var(--font-weight-regular);
-		font-size: var(--font-size-2xs);
-
-		&:not([aria-selected='true']) {
-			background-color: var(--color-background-base);
-			border-bottom: 1px solid var(--color-foreground-base) !important;
-		}
-	}
-	:global(.code-editor-tabs .cm-editor) {
+<style scoped lang="scss">
+:deep(.el-tabs) {
+	.code-editor-tabs .cm-editor {
 		border: 0;
 	}
 }
+</style>
+
+<style lang="scss" module>
 .code-node-editor-container {
 	position: relative;
 
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/editor-ui/src/n8n-theme.scss
index 15111847e017a..e944fb58f855d 100644
--- a/packages/editor-ui/src/n8n-theme.scss
+++ b/packages/editor-ui/src/n8n-theme.scss
@@ -137,6 +137,7 @@
 }
 .el-tabs__nav {
 	padding: 0;
+	overflow: hidden;
 }
 .el-tabs__item {
 	padding: var(--spacing-5xs) var(--spacing-2xs) !important;

From 0170368ab2555e9109d93d9fad2356017b04253e Mon Sep 17 00:00:00 2001
From: Oleg Ivaniv <me@olegivaniv.com>
Date: Tue, 15 Aug 2023 20:54:38 +0200
Subject: [PATCH 116/116] Remove old CircleLoader

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../CodeNodeEditor/AskAI/CircleLoader.vue     | 63 -------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue
deleted file mode 100644
index a9231c2852b04..0000000000000
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/CircleLoader.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-	<div class="progress-circle">
-		<svg class="progress-ring" :width="diameter" :height="diameter">
-			<circle
-				:class="$style.progressRingCircle"
-				:stroke-width="strokeWidth"
-				stroke="#DCDFE6"
-				fill="transparent"
-				:r="radius"
-				v-bind="{ cx, cy }"
-			/>
-			<circle
-				:class="$style.progressRingCircle"
-				stroke="#5C4EC2"
-				:stroke-width="strokeWidth"
-				fill="transparent"
-				:r="radius"
-				v-bind="{ cx, cy, style }"
-			/>
-		</svg>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue';
-const props = defineProps({
-	radius: {
-		type: Number,
-		required: true,
-	},
-	progress: {
-		type: Number,
-		required: true,
-	},
-	strokeWidth: {
-		type: Number,
-		default: 4,
-	},
-});
-
-// for SVG viewbox and stroke array
-const diameter = computed(() => 2 * (props.radius + props.strokeWidth));
-const circumference = computed(() => 2 * Math.PI * props.radius);
-
-const strokeDashoffset = computed(
-	() => circumference.value - (props.progress / 100) * circumference.value,
-);
-
-const cx = computed(() => props.radius + props.strokeWidth);
-const cy = computed(() => props.radius + props.strokeWidth);
-const style = computed(() => ({
-	strokeDasharray: `${circumference.value}`,
-	strokeDashoffset: `${strokeDashoffset.value}`,
-}));
-</script>
-
-<style module>
-.progressRingCircle {
-	transition: stroke-dashoffset 0.35s linear;
-	transform: rotate(-90deg);
-	transform-origin: 50% 50%;
-}
-</style>