From 3d990eb55591211cb36fe2b75b2eafe3ef2b4530 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Tue, 7 Jan 2025 12:52:44 +0100
Subject: [PATCH 01/30] feat(editor): Add workflow evaluation run views
 (no-changelog) (#12258)

---
 .../test-runner/test-runner.service.ee.ts     |  12 +-
 .../src/components/N8nSelect/Select.vue       |   5 +
 .../editor-ui/src/api/testDefinition.ee.ts    | 174 ++++-
 .../src/components/MainHeader/MainHeader.vue  |  55 +-
 .../editor-ui/src/components/TagsDropdown.vue |  31 +-
 .../EditDefinition/EvaluationHeader.vue       |  15 +-
 .../EditDefinition/EvaluationStep.vue         |  40 +-
 .../EditDefinition/MetricsInput.vue           |  28 +-
 .../EditDefinition/NodesPinning.vue           | 194 ++++++
 .../EditDefinition/TagsInput.vue              |  45 +-
 .../ListDefinition/TestItem.vue               |  34 +-
 .../ListDefinition/TestsList.vue              |   2 +-
 .../TestDefinition/ListRuns/MetricsChart.vue  | 108 +++
 .../TestDefinition/ListRuns/TestRunsTable.vue | 119 ++++
 .../composables/useMetricsChart.ts            | 145 ++++
 .../composables/useTestDefinitionForm.ts      | 198 +++---
 .../TestDefinition/shared/TableCell.vue       |  74 ++
 .../shared/TestDefinitionTable.vue            |  95 +++
 .../TestDefinition/tests/MetricsInput.test.ts | 101 ++-
 .../tests/useMetricsChart.test.ts             | 127 ++++
 .../tests/useTestDefinitionForm.test.ts       | 237 +++++--
 .../src/components/TestDefinition/types.ts    |  22 +
 .../src/components/WorkflowTagsDropdown.vue   |   2 +-
 .../src/components/canvas/Canvas.vue          |  10 +-
 .../canvas/elements/nodes/CanvasNode.vue      |  30 +-
 packages/editor-ui/src/constants.ts           |   4 +
 .../src/plugins/i18n/locales/en.json          |  40 +-
 packages/editor-ui/src/router.ts              |  28 +
 .../editor-ui/src/stores/executions.store.ts  |   1 +
 .../stores/testDefinition.store.ee.test.ts    | 635 +++++++++++++-----
 .../src/stores/testDefinition.store.ee.ts     | 214 +++++-
 packages/editor-ui/src/stores/ui.store.ts     |  12 +-
 packages/editor-ui/src/stores/ui.utils.ts     |  10 +-
 packages/editor-ui/src/types/canvas.ts        |   1 +
 .../TestDefinition/TestDefinitionEditView.vue | 288 ++++++--
 .../TestDefinition/TestDefinitionListView.vue |  96 ++-
 .../TestDefinitionRunDetailView.vue           | 292 ++++++++
 .../TestDefinitionRunsListView.vue            | 129 ++++
 .../tests/TestDefinitionEditView.test.ts      | 296 +++++---
 .../tests/TestDefinitionListView.test.ts      | 174 +++++
 .../tests/TestDefinitionRunDetailView.test.ts | 267 ++++++++
 41 files changed, 3811 insertions(+), 579 deletions(-)
 create mode 100644 packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
 create mode 100644 packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
 create mode 100644 packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
 create mode 100644 packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
 create mode 100644 packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
 create mode 100644 packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue
 create mode 100644 packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
 create mode 100644 packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
 create mode 100644 packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
 create mode 100644 packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
 create mode 100644 packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts

diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
index 926bc29b70..c1e6e33942 100644
--- a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
@@ -134,6 +134,7 @@ export class TestRunnerService {
 		evaluationWorkflow: WorkflowEntity,
 		expectedData: IRunData,
 		actualData: IRunData,
+		testRunId?: string,
 	) {
 		// Prepare the evaluation wf input data.
 		// Provide both the expected data and the actual data
@@ -146,7 +147,13 @@ export class TestRunnerService {
 
 		// Prepare the data to run the evaluation workflow
 		const data = await getRunData(evaluationWorkflow, [evaluationInputData]);
-
+		// FIXME: This is a hack to add the testRunId to the evaluation workflow execution data
+		// So that we can fetch all execution runs for a test run
+		if (testRunId && data.executionData) {
+			data.executionData.resultData.metadata = {
+				testRunId,
+			};
+		}
 		data.executionMode = 'evaluation';
 
 		// Trigger the evaluation workflow
@@ -264,10 +271,9 @@ export class TestRunnerService {
 				evaluationWorkflow,
 				originalRunData,
 				testCaseRunData,
+				testRun.id,
 			);
 			assert(evalExecution);
-
-			// Extract the output of the last node executed in the evaluation workflow
 			metrics.addResults(this.extractEvaluationResult(evalExecution));
 		}
 
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 7cb4fafcc9..80a065d429 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -31,6 +31,10 @@ const props = defineProps({
 	multiple: {
 		type: Boolean,
 	},
+	multipleLimit: {
+		type: Number,
+		default: 0,
+	},
 	filterMethod: {
 		type: Function,
 	},
@@ -120,6 +124,7 @@ defineExpose({
 		<ElSelect
 			v-bind="{ ...$props, ...listeners }"
 			ref="innerSelect"
+			:multiple-limit="props.multipleLimit"
 			:model-value="props.modelValue ?? undefined"
 			:size="computedSize"
 			:popper-class="props.popperClass"
diff --git a/packages/editor-ui/src/api/testDefinition.ee.ts b/packages/editor-ui/src/api/testDefinition.ee.ts
index b6fbf78471..c515b7a783 100644
--- a/packages/editor-ui/src/api/testDefinition.ee.ts
+++ b/packages/editor-ui/src/api/testDefinition.ee.ts
@@ -1,5 +1,6 @@
 import type { IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils/apiUtils';
+import { makeRestApiRequest, request } from '@/utils/apiUtils';
+
 export interface TestDefinitionRecord {
 	id: string;
 	name: string;
@@ -9,7 +10,10 @@ export interface TestDefinitionRecord {
 	description?: string | null;
 	updatedAt?: string;
 	createdAt?: string;
+	annotationTag?: string | null;
+	mockedNodes?: Array<{ name: string }>;
 }
+
 interface CreateTestDefinitionParams {
 	name: string;
 	workflowId: string;
@@ -21,31 +25,63 @@ export interface UpdateTestDefinitionParams {
 	evaluationWorkflowId?: string | null;
 	annotationTagId?: string | null;
 	description?: string | null;
+	mockedNodes?: Array<{ name: string }>;
 }
+
 export interface UpdateTestResponse {
 	createdAt: string;
 	updatedAt: string;
 	id: string;
 	name: string;
 	workflowId: string;
-	description: string | null;
-	annotationTag: string | null;
-	evaluationWorkflowId: string | null;
-	annotationTagId: string | null;
+	description?: string | null;
+	annotationTag?: string | null;
+	evaluationWorkflowId?: string | null;
+	annotationTagId?: string | null;
+}
+
+export interface TestRunRecord {
+	id: string;
+	testDefinitionId: string;
+	status: 'new' | 'running' | 'completed' | 'error';
+	metrics?: Record<string, number>;
+	createdAt: string;
+	updatedAt: string;
+	runAt: string;
+	completedAt: string;
+}
+
+interface GetTestRunParams {
+	testDefinitionId: string;
+	runId: string;
+}
+
+interface DeleteTestRunParams {
+	testDefinitionId: string;
+	runId: string;
 }
 
 const endpoint = '/evaluation/test-definitions';
+const getMetricsEndpoint = (testDefinitionId: string, metricId?: string) =>
+	`${endpoint}/${testDefinitionId}/metrics${metricId ? `/${metricId}` : ''}`;
 
-export async function getTestDefinitions(context: IRestApiContext) {
+export async function getTestDefinitions(
+	context: IRestApiContext,
+	params?: { workflowId?: string },
+) {
+	let url = endpoint;
+	if (params?.workflowId) {
+		url += `?filter=${JSON.stringify({ workflowId: params.workflowId })}`;
+	}
 	return await makeRestApiRequest<{ count: number; testDefinitions: TestDefinitionRecord[] }>(
 		context,
 		'GET',
-		endpoint,
+		url,
 	);
 }
 
 export async function getTestDefinition(context: IRestApiContext, id: string) {
-	return await makeRestApiRequest<{ id: string }>(context, 'GET', `${endpoint}/${id}`);
+	return await makeRestApiRequest<TestDefinitionRecord>(context, 'GET', `${endpoint}/${id}`);
 }
 
 export async function createTestDefinition(
@@ -71,3 +107,125 @@ export async function updateTestDefinition(
 export async function deleteTestDefinition(context: IRestApiContext, id: string) {
 	return await makeRestApiRequest<{ success: boolean }>(context, 'DELETE', `${endpoint}/${id}`);
 }
+
+// Metrics
+export interface TestMetricRecord {
+	id: string;
+	name: string;
+	testDefinitionId: string;
+	createdAt?: string;
+	updatedAt?: string;
+}
+
+export interface CreateTestMetricParams {
+	testDefinitionId: string;
+	name: string;
+}
+
+export interface UpdateTestMetricParams {
+	name: string;
+	id: string;
+	testDefinitionId: string;
+}
+
+export interface DeleteTestMetricParams {
+	testDefinitionId: string;
+	id: string;
+}
+
+export const getTestMetrics = async (context: IRestApiContext, testDefinitionId: string) => {
+	return await makeRestApiRequest<TestMetricRecord[]>(
+		context,
+		'GET',
+		getMetricsEndpoint(testDefinitionId),
+	);
+};
+
+export const getTestMetric = async (
+	context: IRestApiContext,
+	testDefinitionId: string,
+	id: string,
+) => {
+	return await makeRestApiRequest<TestMetricRecord>(
+		context,
+		'GET',
+		getMetricsEndpoint(testDefinitionId, id),
+	);
+};
+
+export const createTestMetric = async (
+	context: IRestApiContext,
+	params: CreateTestMetricParams,
+) => {
+	return await makeRestApiRequest<TestMetricRecord>(
+		context,
+		'POST',
+		getMetricsEndpoint(params.testDefinitionId),
+		{ name: params.name },
+	);
+};
+
+export const updateTestMetric = async (
+	context: IRestApiContext,
+	params: UpdateTestMetricParams,
+) => {
+	return await makeRestApiRequest<TestMetricRecord>(
+		context,
+		'PATCH',
+		getMetricsEndpoint(params.testDefinitionId, params.id),
+		{ name: params.name },
+	);
+};
+
+export const deleteTestMetric = async (
+	context: IRestApiContext,
+	params: DeleteTestMetricParams,
+) => {
+	return await makeRestApiRequest(
+		context,
+		'DELETE',
+		getMetricsEndpoint(params.testDefinitionId, params.id),
+	);
+};
+
+const getRunsEndpoint = (testDefinitionId: string, runId?: string) =>
+	`${endpoint}/${testDefinitionId}/runs${runId ? `/${runId}` : ''}`;
+
+// Get all test runs for a test definition
+export const getTestRuns = async (context: IRestApiContext, testDefinitionId: string) => {
+	return await makeRestApiRequest<TestRunRecord[]>(
+		context,
+		'GET',
+		getRunsEndpoint(testDefinitionId),
+	);
+};
+
+// Get specific test run
+export const getTestRun = async (context: IRestApiContext, params: GetTestRunParams) => {
+	return await makeRestApiRequest<TestRunRecord>(
+		context,
+		'GET',
+		getRunsEndpoint(params.testDefinitionId, params.runId),
+	);
+};
+
+// Start a new test run
+export const startTestRun = async (context: IRestApiContext, testDefinitionId: string) => {
+	const response = await request({
+		method: 'POST',
+		baseURL: context.baseUrl,
+		endpoint: `${endpoint}/${testDefinitionId}/run`,
+		headers: { 'push-ref': context.pushRef },
+	});
+	// CLI is returning the response without wrapping it in `data` key
+	return response as { success: boolean };
+};
+
+// Delete a test run
+export const deleteTestRun = async (context: IRestApiContext, params: DeleteTestRunParams) => {
+	return await makeRestApiRequest<{ success: boolean }>(
+		context,
+		'DELETE',
+		getRunsEndpoint(params.testDefinitionId, params.runId),
+	);
+};
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index 1a595312c9..7db2b3a478 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -43,6 +43,25 @@ const executionToReturnTo = ref('');
 const dirtyState = ref(false);
 const githubButtonHidden = useLocalStorage(LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON, false);
 
+// Track the routes that are used for the tabs
+// This is used to determine which tab to show when the route changes
+// TODO: It might be easier to manage this in the router config, by passing meta information to the routes
+// This would allow us to specify it just once on the root route, and then have the tabs be determined for children
+const testDefinitionRoutes: VIEWS[] = [
+	VIEWS.TEST_DEFINITION,
+	VIEWS.TEST_DEFINITION_EDIT,
+	VIEWS.TEST_DEFINITION_RUNS,
+	VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+	VIEWS.TEST_DEFINITION_RUNS_COMPARE,
+];
+
+const workflowRoutes: VIEWS[] = [VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW, VIEWS.EXECUTION_DEBUG];
+
+const executionRoutes: VIEWS[] = [
+	VIEWS.EXECUTION_HOME,
+	VIEWS.WORKFLOW_EXECUTIONS,
+	VIEWS.EXECUTION_PREVIEW,
+];
 const tabBarItems = computed(() => {
 	const items = [
 		{ value: MAIN_HEADER_TABS.WORKFLOW, label: locale.baseText('generic.editor') },
@@ -92,24 +111,30 @@ onMounted(async () => {
 	syncTabsWithRoute(route);
 });
 
+function isViewRoute(name: unknown): name is VIEWS {
+	return (
+		typeof name === 'string' &&
+		[testDefinitionRoutes, workflowRoutes, executionRoutes].flat().includes(name as VIEWS)
+	);
+}
+
 function syncTabsWithRoute(to: RouteLocation, from?: RouteLocation): void {
-	if (to.matched.some((record) => record.name === VIEWS.TEST_DEFINITION)) {
-		activeHeaderTab.value = MAIN_HEADER_TABS.TEST_DEFINITION;
-	}
-	if (
-		to.name === VIEWS.EXECUTION_HOME ||
-		to.name === VIEWS.WORKFLOW_EXECUTIONS ||
-		to.name === VIEWS.EXECUTION_PREVIEW
-	) {
-		activeHeaderTab.value = MAIN_HEADER_TABS.EXECUTIONS;
-	} else if (
-		to.name === VIEWS.WORKFLOW ||
-		to.name === VIEWS.NEW_WORKFLOW ||
-		to.name === VIEWS.EXECUTION_DEBUG
-	) {
-		activeHeaderTab.value = MAIN_HEADER_TABS.WORKFLOW;
+	// Map route types to their corresponding tab in the header
+	const routeTabMapping = [
+		{ routes: testDefinitionRoutes, tab: MAIN_HEADER_TABS.TEST_DEFINITION },
+		{ routes: executionRoutes, tab: MAIN_HEADER_TABS.EXECUTIONS },
+		{ routes: workflowRoutes, tab: MAIN_HEADER_TABS.WORKFLOW },
+	];
+
+	// Update the active tab based on the current route
+	if (to.name && isViewRoute(to.name)) {
+		const matchingTab = routeTabMapping.find(({ routes }) => routes.includes(to.name as VIEWS));
+		if (matchingTab) {
+			activeHeaderTab.value = matchingTab.tab;
+		}
 	}
 
+	// Store the current workflow ID, but only if it's not a new workflow
 	if (to.params.name !== 'new' && typeof to.params.name === 'string') {
 		workflowToReturnTo.value = to.params.name;
 	}
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 67799b1657..0a1b342b5c 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -16,7 +16,10 @@ interface TagsDropdownProps {
 	allTags: ITag[];
 	isLoading: boolean;
 	tagsById: Record<string, ITag>;
+	createEnabled?: boolean;
+	manageEnabled?: boolean;
 	createTag?: (name: string) => Promise<ITag>;
+	multipleLimit?: number;
 }
 
 const i18n = useI18n();
@@ -27,6 +30,10 @@ const props = withDefaults(defineProps<TagsDropdownProps>(), {
 	placeholder: '',
 	modelValue: () => [],
 	eventBus: null,
+	createEnabled: true,
+	manageEnabled: true,
+	createTag: undefined,
+	multipleLimit: 0,
 });
 
 const emit = defineEmits<{
@@ -59,6 +66,17 @@ const appliedTags = computed<string[]>(() => {
 	return props.modelValue.filter((id: string) => props.tagsById[id]);
 });
 
+const containerClasses = computed(() => {
+	return { 'tags-container': true, focused: focused.value };
+});
+
+const dropdownClasses = computed(() => ({
+	'tags-dropdown': true,
+	[`tags-dropdown-${dropdownId}`]: true,
+	'tags-dropdown-create-enabled': props.createEnabled,
+	'tags-dropdown-manage-enabled': props.manageEnabled,
+}));
+
 watch(
 	() => props.allTags,
 	() => {
@@ -189,7 +207,7 @@ onClickOutside(
 </script>
 
 <template>
-	<div ref="container" :class="{ 'tags-container': true, focused }" @keydown.stop>
+	<div ref="container" :class="containerClasses" @keydown.stop>
 		<N8nSelect
 			ref="selectRef"
 			:teleported="true"
@@ -199,16 +217,17 @@ onClickOutside(
 			:filter-method="filterOptions"
 			filterable
 			multiple
+			:multiple-limit="props.multipleLimit"
 			:reserve-keyword="false"
 			loading-text="..."
-			:popper-class="['tags-dropdown', 'tags-dropdown-' + dropdownId].join(' ')"
+			:popper-class="dropdownClasses"
 			data-test-id="tags-dropdown"
 			@update:model-value="onTagsUpdated"
 			@visible-change="onVisibleChange"
 			@remove-tag="onRemoveTag"
 		>
 			<N8nOption
-				v-if="options.length === 0 && filter"
+				v-if="createEnabled && options.length === 0 && filter"
 				:key="CREATE_KEY"
 				ref="createRef"
 				:value="CREATE_KEY"
@@ -220,7 +239,7 @@ onClickOutside(
 				</span>
 			</N8nOption>
 			<N8nOption v-else-if="options.length === 0" value="message" disabled>
-				<span>{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
+				<span v-if="createEnabled">{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
 				<span v-if="allTags.length > 0">{{
 					i18n.baseText('tagsDropdown.noMatchingTagsExist')
 				}}</span>
@@ -237,7 +256,7 @@ onClickOutside(
 				data-test-id="tag"
 			/>
 
-			<N8nOption :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
+			<N8nOption v-if="manageEnabled" :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
 				<font-awesome-icon icon="cog" />
 				<span>{{ i18n.baseText('tagsDropdown.manageTags') }}</span>
 			</N8nOption>
@@ -313,7 +332,7 @@ onClickOutside(
 			}
 		}
 
-		&:after {
+		.tags-dropdown-manage-enabled &:after {
 			content: ' ';
 			display: block;
 			min-height: $--item-height;
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
index 3f21e6a399..58b8e7dc0f 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
@@ -1,18 +1,15 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
+import type { EditableField } from '../types';
 
 export interface EvaluationHeaderProps {
-	modelValue: {
-		value: string;
-		isEditing: boolean;
-		tempValue: string;
-	};
-	startEditing: (field: string) => void;
-	saveChanges: (field: string) => void;
-	handleKeydown: (e: KeyboardEvent, field: string) => void;
+	modelValue: EditableField<string>;
+	startEditing: (field: 'name') => void;
+	saveChanges: (field: 'name') => void;
+	handleKeydown: (e: KeyboardEvent, field: 'name') => void;
 }
 
-defineEmits<{ 'update:modelValue': [value: EvaluationHeaderProps['modelValue']] }>();
+defineEmits<{ 'update:modelValue': [value: EditableField<string>] }>();
 defineProps<EvaluationHeaderProps>();
 
 const locale = useI18n();
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
index f942613a35..8ba5c4b657 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
@@ -2,12 +2,14 @@
 import { useI18n } from '@/composables/useI18n';
 import { ElCollapseTransition } from 'element-plus';
 import { ref, nextTick } from 'vue';
+import N8nTooltip from 'n8n-design-system/components/N8nTooltip';
 
 interface EvaluationStep {
 	title: string;
 	warning?: boolean;
 	small?: boolean;
 	expanded?: boolean;
+	tooltip?: string;
 }
 
 const props = withDefaults(defineProps<EvaluationStep>(), {
@@ -15,12 +17,14 @@ const props = withDefaults(defineProps<EvaluationStep>(), {
 	warning: false,
 	small: false,
 	expanded: true,
+	tooltip: '',
 });
 
 const locale = useI18n();
 const isExpanded = ref(props.expanded);
 const contentRef = ref<HTMLElement | null>(null);
 const containerRef = ref<HTMLElement | null>(null);
+const isTooltipVisible = ref(false);
 
 const toggleExpand = async () => {
 	isExpanded.value = !isExpanded.value;
@@ -31,11 +35,32 @@ const toggleExpand = async () => {
 		}
 	}
 };
+
+const showTooltip = () => {
+	isTooltipVisible.value = true;
+};
+
+const hideTooltip = () => {
+	isTooltipVisible.value = false;
+};
 </script>
 
 <template>
-	<div ref="containerRef" :class="[$style.evaluationStep, small && $style.small]">
-		<div :class="$style.content">
+	<div
+		ref="containerRef"
+		:class="[$style.evaluationStep, small && $style.small]"
+		data-test-id="evaluation-step"
+	>
+		<N8nTooltip :disabled="!tooltip" placement="right" :offset="25" :visible="isTooltipVisible">
+			<template #content>
+				{{ tooltip }}
+			</template>
+			<!-- This empty div is needed to ensure the tooltip trigger area spans the full width of the step.
+			     Without it, the tooltip would only show when hovering over the content div, which is narrower.
+			     The contentPlaceholder creates an invisible full-width area that can trigger the tooltip. -->
+			<div :class="$style.contentPlaceholder"></div>
+		</N8nTooltip>
+		<div :class="$style.content" @mouseenter="showTooltip" @mouseleave="hideTooltip">
 			<div :class="$style.header">
 				<div :class="[$style.icon, warning && $style.warning]">
 					<slot name="icon" />
@@ -47,6 +72,7 @@ const toggleExpand = async () => {
 					:class="$style.collapseButton"
 					:aria-expanded="isExpanded"
 					:aria-controls="'content-' + title.replace(/\s+/g, '-')"
+					data-test-id="evaluation-step-collapse-button"
 					@click="toggleExpand"
 				>
 					{{
@@ -59,7 +85,7 @@ const toggleExpand = async () => {
 			</div>
 			<ElCollapseTransition v-if="$slots.cardContent">
 				<div v-show="isExpanded" :class="$style.cardContentWrapper">
-					<div ref="contentRef" :class="$style.cardContent">
+					<div ref="contentRef" :class="$style.cardContent" data-test-id="evaluation-step-content">
 						<slot name="cardContent" />
 					</div>
 				</div>
@@ -85,6 +111,14 @@ const toggleExpand = async () => {
 		width: 80%;
 	}
 }
+.contentPlaceholder {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: -1;
+}
 .icon {
 	display: flex;
 	align-items: center;
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
index e899c8be2d..0597ac9c58 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
@@ -1,22 +1,30 @@
 <script setup lang="ts">
+import type { TestMetricRecord } from '@/api/testDefinition.ee';
 import { useI18n } from '@/composables/useI18n';
 
 export interface MetricsInputProps {
-	modelValue: string[];
+	modelValue: Array<Partial<TestMetricRecord>>;
 }
 const props = defineProps<MetricsInputProps>();
-const emit = defineEmits<{ 'update:modelValue': [value: MetricsInputProps['modelValue']] }>();
+const emit = defineEmits<{
+	'update:modelValue': [value: MetricsInputProps['modelValue']];
+	deleteMetric: [metric: Partial<TestMetricRecord>];
+}>();
 const locale = useI18n();
 
 function addNewMetric() {
-	emit('update:modelValue', [...props.modelValue, '']);
+	emit('update:modelValue', [...props.modelValue, { name: '' }]);
 }
 
-function updateMetric(index: number, value: string) {
+function updateMetric(index: number, name: string) {
 	const newMetrics = [...props.modelValue];
-	newMetrics[index] = value;
+	newMetrics[index].name = name;
 	emit('update:modelValue', newMetrics);
 }
+
+function onDeleteMetric(metric: Partial<TestMetricRecord>) {
+	emit('deleteMetric', metric);
+}
 </script>
 
 <template>
@@ -27,14 +35,15 @@ function updateMetric(index: number, value: string) {
 			:class="$style.metricField"
 		>
 			<div :class="$style.metricsContainer">
-				<div v-for="(metric, index) in modelValue" :key="index">
+				<div v-for="(metric, index) in modelValue" :key="index" :class="$style.metricItem">
 					<N8nInput
 						:ref="`metric_${index}`"
 						data-test-id="evaluation-metric-item"
-						:model-value="metric"
+						:model-value="metric.name"
 						:placeholder="locale.baseText('testDefinition.edit.metricsPlaceholder')"
 						@update:model-value="(value: string) => updateMetric(index, value)"
 					/>
+					<n8n-icon-button icon="trash" type="text" @click="onDeleteMetric(metric)" />
 				</div>
 				<n8n-button
 					type="tertiary"
@@ -54,6 +63,11 @@ function updateMetric(index: number, value: string) {
 	gap: var(--spacing-xs);
 }
 
+.metricItem {
+	display: flex;
+	align-items: center;
+}
+
 .metricField {
 	width: 100%;
 	margin-top: var(--spacing-xs);
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
new file mode 100644
index 0000000000..c33180c312
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
@@ -0,0 +1,194 @@
+<script setup lang="ts">
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { computed, onMounted, ref, useCssModule } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useCanvasOperations } from '@/composables/useCanvasOperations';
+import { useCanvasMapping } from '@/composables/useCanvasMapping';
+import { createEventBus, N8nTooltip } from 'n8n-design-system';
+import type { CanvasConnectionPort, CanvasEventBusEvents, CanvasNodeData } from '@/types';
+import { useVueFlow } from '@vue-flow/core';
+import { useI18n } from '@/composables/useI18n';
+
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const route = useRoute();
+const router = useRouter();
+const locale = useI18n();
+
+const { resetWorkspace, initializeWorkspace } = useCanvasOperations({ router });
+
+const eventBus = createEventBus<CanvasEventBusEvents>();
+const style = useCssModule();
+const uuid = crypto.randomUUID();
+const props = defineProps<{
+	modelValue: Array<{ name: string }>;
+}>();
+
+const emit = defineEmits<{
+	'update:modelValue': [value: Array<{ name: string }>];
+}>();
+
+const isLoading = ref(true);
+
+const workflowId = computed(() => route.params.name as string);
+const testId = computed(() => route.params.testId as string);
+const workflow = computed(() => workflowsStore.getWorkflowById(workflowId.value));
+const workflowObject = computed(() => workflowsStore.getCurrentWorkflow(true));
+const canvasId = computed(() => `${uuid}-${testId.value}`);
+
+const { onNodesInitialized, fitView, zoomTo } = useVueFlow({ id: canvasId.value });
+const nodes = computed(() => {
+	return workflow.value.nodes ?? [];
+});
+const connections = computed(() => workflow.value.connections);
+
+const { nodes: mappedNodes, connections: mappedConnections } = useCanvasMapping({
+	nodes,
+	connections,
+	workflowObject,
+});
+async function loadData() {
+	workflowsStore.resetState();
+	resetWorkspace();
+	const loadingPromise = Promise.all([
+		nodeTypesStore.getNodeTypes(),
+		workflowsStore.fetchWorkflow(workflowId.value),
+	]);
+	await loadingPromise;
+	initializeWorkspace(workflow.value);
+	disableAllNodes();
+}
+function getNodeNameById(id: string) {
+	return mappedNodes.value.find((node) => node.id === id)?.data?.name;
+}
+function updateNodeClasses(nodeIds: string[], isPinned: boolean) {
+	eventBus.emit('nodes:action', {
+		ids: nodeIds,
+		action: 'update:node:class',
+		payload: {
+			className: style.pinnedNode,
+			add: isPinned,
+		},
+	});
+	eventBus.emit('nodes:action', {
+		ids: nodeIds,
+		action: 'update:node:class',
+		payload: {
+			className: style.notPinnedNode,
+			add: !isPinned,
+		},
+	});
+}
+function disableAllNodes() {
+	const ids = mappedNodes.value.map((node) => node.id);
+	updateNodeClasses(ids, false);
+
+	const pinnedNodes = props.modelValue
+		.map((node) => {
+			const matchedNode = mappedNodes.value.find(
+				(mappedNode) => mappedNode?.data?.name === node.name,
+			);
+			return matchedNode?.id ?? null;
+		})
+		.filter((n) => n !== null);
+
+	if (pinnedNodes.length > 0) {
+		updateNodeClasses(pinnedNodes, true);
+	}
+}
+function onPinButtonClick(data: CanvasNodeData) {
+	const nodeName = getNodeNameById(data.id);
+	if (!nodeName) return;
+
+	const isPinned = props.modelValue.some((node) => node.name === nodeName);
+	const updatedNodes = isPinned
+		? props.modelValue.filter((node) => node.name !== nodeName)
+		: [...props.modelValue, { name: nodeName }];
+
+	emit('update:modelValue', updatedNodes);
+	updateNodeClasses([data.id], !isPinned);
+}
+function isPinButtonVisible(outputs: CanvasConnectionPort[]) {
+	return outputs.length === 1;
+}
+
+onNodesInitialized(async () => {
+	await fitView();
+	isLoading.value = false;
+	await zoomTo(0.7, { duration: 400 });
+});
+onMounted(loadData);
+</script>
+
+<template>
+	<div :class="$style.container">
+		<N8nSpinner v-if="isLoading" size="xlarge" type="dots" :class="$style.spinner" />
+		<Canvas
+			:id="canvasId"
+			:loading="isLoading"
+			:class="{ [$style.canvas]: true }"
+			:nodes="mappedNodes"
+			:connections="mappedConnections"
+			:show-bug-reporting-button="false"
+			:read-only="true"
+			:event-bus="eventBus"
+		>
+			<template #nodeToolbar="{ data, outputs }">
+				<div :class="$style.pinButtonContainer">
+					<N8nTooltip v-if="isPinButtonVisible(outputs)" placement="left">
+						<template #content>
+							{{ locale.baseText('testDefinition.edit.nodesPinning.pinButtonTooltip') }}
+						</template>
+						<n8n-icon-button
+							type="tertiary"
+							size="large"
+							icon="thumbtack"
+							:class="$style.pinButton"
+							@click="onPinButtonClick(data)"
+						/>
+					</N8nTooltip>
+				</div>
+			</template>
+		</Canvas>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	width: 100vw;
+	height: 100%;
+}
+.pinButtonContainer {
+	position: absolute;
+	right: 0;
+	display: flex;
+	justify-content: flex-end;
+	bottom: 100%;
+}
+
+.pinButton {
+	cursor: pointer;
+	color: var(--canvas-node--border-color);
+	border: none;
+}
+.notPinnedNode,
+.pinnedNode {
+	:global(.n8n-node-icon) > div {
+		filter: contrast(40%) brightness(1.5) grayscale(100%);
+	}
+}
+.pinnedNode {
+	--canvas-node--border-color: hsla(247, 49%, 55%, 1);
+
+	:global(.n8n-node-icon) > div {
+		filter: contrast(40%) brightness(1.5) grayscale(100%);
+	}
+}
+.spinner {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
index 91e4df6261..9bd4a77ce0 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
@@ -3,40 +3,48 @@ import { useI18n } from '@/composables/useI18n';
 import type { ITag } from '@/Interface';
 import { createEventBus } from 'n8n-design-system';
 import { computed } from 'vue';
+import type { EditableField } from '../types';
 
 export interface TagsInputProps {
-	modelValue?: {
-		isEditing: boolean;
-		appliedTagIds: string[];
-	};
+	modelValue: EditableField<string[]>;
 	allTags: ITag[];
 	tagsById: Record<string, ITag>;
 	isLoading: boolean;
-	startEditing: (field: string) => void;
-	saveChanges: (field: string) => void;
-	cancelEditing: (field: string) => void;
+	startEditing: (field: 'tags') => void;
+	saveChanges: (field: 'tags') => void;
+	cancelEditing: (field: 'tags') => void;
+	createTag?: (name: string) => Promise<ITag>;
 }
 
 const props = withDefaults(defineProps<TagsInputProps>(), {
 	modelValue: () => ({
 		isEditing: false,
-		appliedTagIds: [],
+		value: [],
+		tempValue: [],
 	}),
+	createTag: undefined,
 });
 
 const emit = defineEmits<{ 'update:modelValue': [value: TagsInputProps['modelValue']] }>();
 
 const locale = useI18n();
 const tagsEventBus = createEventBus();
+
+/**
+ * Compute the tag name by ID
+ */
 const getTagName = computed(() => (tagId: string) => {
 	return props.tagsById[tagId]?.name ?? '';
 });
 
+/**
+ * Update the tempValue of the tags when the dropdown changes.
+ * This does not finalize the changes; that happens on blur or hitting enter.
+ */
 function updateTags(tags: string[]) {
-	const newTags = tags[0] ? [tags[0]] : [];
 	emit('update:modelValue', {
 		...props.modelValue,
-		appliedTagIds: newTags,
+		tempValue: tags,
 	});
 }
 </script>
@@ -48,12 +56,13 @@ function updateTags(tags: string[]) {
 			:bold="false"
 			size="small"
 		>
+			<!-- Read-only view -->
 			<div v-if="!modelValue.isEditing" :class="$style.tagsRead" @click="startEditing('tags')">
-				<n8n-text v-if="modelValue.appliedTagIds.length === 0" size="small">
+				<n8n-text v-if="modelValue.value.length === 0" size="small">
 					{{ locale.baseText('testDefinition.edit.selectTag') }}
 				</n8n-text>
 				<n8n-tag
-					v-for="tagId in modelValue.appliedTagIds"
+					v-for="tagId in modelValue.value"
 					:key="tagId"
 					:text="getTagName(tagId)"
 					data-test-id="evaluation-tag-field"
@@ -66,24 +75,26 @@ function updateTags(tags: string[]) {
 					transparent
 				/>
 			</div>
+
+			<!-- Editing view -->
 			<TagsDropdown
 				v-else
-				:model-value="modelValue.appliedTagIds"
+				:model-value="modelValue.tempValue"
 				:placeholder="locale.baseText('executionAnnotationView.chooseOrCreateATag')"
-				:create-enabled="false"
+				:create-enabled="modelValue.tempValue.length === 0"
 				:all-tags="allTags"
 				:is-loading="isLoading"
 				:tags-by-id="tagsById"
 				data-test-id="workflow-tags-dropdown"
 				:event-bus="tagsEventBus"
+				:create-tag="createTag"
+				:manage-enabled="false"
+				:multiple-limit="1"
 				@update:model-value="updateTags"
 				@esc="cancelEditing('tags')"
 				@blur="saveChanges('tags')"
 			/>
 		</n8n-input-label>
-		<n8n-text size="small" color="text-light">{{
-			locale.baseText('testDefinition.edit.tagsHelpText')
-		}}</n8n-text>
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
index 350c48f663..a4e5a4d4ac 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { TestListItem } from '@/components/TestDefinition/types';
+import TimeAgo from '@/components/TimeAgo.vue';
 import { useI18n } from '@/composables/useI18n';
 import n8nIconButton from 'n8n-design-system/components/N8nIconButton';
 
@@ -20,21 +21,25 @@ const emit = defineEmits<{
 const actions = [
 	{
 		icon: 'play',
+		id: 'run',
 		event: () => emit('run-test', props.test.id),
 		tooltip: locale.baseText('testDefinition.runTest'),
 	},
 	{
 		icon: 'list',
+		id: 'view',
 		event: () => emit('view-details', props.test.id),
 		tooltip: locale.baseText('testDefinition.viewDetails'),
 	},
 	{
 		icon: 'pen',
+		id: 'edit',
 		event: () => emit('edit-test', props.test.id),
 		tooltip: locale.baseText('testDefinition.editTest'),
 	},
 	{
 		icon: 'trash',
+		id: 'delete',
 		event: () => emit('delete-test', props.test.id),
 		tooltip: locale.baseText('testDefinition.deleteTest'),
 	},
@@ -42,20 +47,27 @@ const actions = [
 </script>
 
 <template>
-	<div :class="$style.testItem" @click="$emit('view-details', test.id)">
+	<div
+		:class="$style.testItem"
+		:data-test-id="`test-item-${test.id}`"
+		@click="$emit('view-details', test.id)"
+	>
 		<div :class="$style.testInfo">
 			<div :class="$style.testName">
 				{{ test.name }}
-				<n8n-tag v-if="test.tagName" :text="test.tagName" />
 			</div>
 			<div :class="$style.testCases">
-				{{ locale.baseText('testDefinition.list.testCases', { adjustToNumber: test.testCases }) }}
-				<n8n-loading v-if="!test.execution.lastRun" :loading="true" :rows="1" />
-				<span v-else>{{
-					locale.baseText('testDefinition.list.lastRun', {
-						interpolate: { lastRun: test.execution.lastRun },
-					})
-				}}</span>
+				<n8n-text size="small">
+					{{ locale.baseText('testDefinition.list.testRuns', { adjustToNumber: test.testCases }) }}
+				</n8n-text>
+				<template v-if="test.execution.status === 'running'">
+					{{ locale.baseText('testDefinition.list.running') }}
+					<n8n-spinner />
+				</template>
+				<span v-else-if="test.execution.lastRun">
+					{{ locale.baseText('testDefinition.list.lastRun') }}
+					<TimeAgo :date="test.execution.lastRun" />
+				</span>
 			</div>
 		</div>
 
@@ -68,7 +80,7 @@ const actions = [
 				}}
 			</div>
 			<div v-for="(value, key) in test.execution.metrics" :key="key" :class="$style.metric">
-				{{ key }}: {{ value ?? '-' }}
+				{{ key }}: {{ value.toFixed(2) ?? '-' }}
 			</div>
 		</div>
 
@@ -80,6 +92,7 @@ const actions = [
 				<component
 					:is="n8nIconButton"
 					:icon="action.icon"
+					:data-test-id="`${action.id}-test-button-${test.id}`"
 					type="tertiary"
 					size="mini"
 					@click.stop="action.event"
@@ -115,7 +128,6 @@ const actions = [
 	align-items: center;
 	gap: var(--spacing-2xs);
 	font-weight: var(--font-weight-bold);
-	margin-bottom: var(--spacing-4xs);
 	font-size: var(--font-size-s);
 }
 
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
index e5e169dbe0..d744b1a31b 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
@@ -12,7 +12,7 @@ const locale = useI18n();
 </script>
 
 <template>
-	<div :class="$style.testsList">
+	<div :class="$style.testsList" data-test-id="test-definition-list">
 		<div :class="$style.testsHeader">
 			<n8n-button
 				:label="locale.baseText('testDefinition.list.createNew')"
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue b/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
new file mode 100644
index 0000000000..cd2e58f8de
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import { computed, watchEffect } from 'vue';
+import { Line } from 'vue-chartjs';
+import { useMetricsChart } from '../composables/useMetricsChart';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import { useI18n } from '@/composables/useI18n';
+import type { AppliedThemeOption } from '@/Interface';
+
+const emit = defineEmits<{
+	'update:selectedMetric': [value: string];
+}>();
+
+const props = defineProps<{
+	selectedMetric: string;
+	runs: TestRunRecord[];
+	theme?: AppliedThemeOption;
+}>();
+
+const locale = useI18n();
+const metricsChart = useMetricsChart(props.theme);
+
+const availableMetrics = computed(() => {
+	return props.runs.reduce((acc, run) => {
+		const metricKeys = Object.keys(run.metrics ?? {});
+		return [...new Set([...acc, ...metricKeys])];
+	}, [] as string[]);
+});
+
+const chartData = computed(() => metricsChart.generateChartData(props.runs, props.selectedMetric));
+
+const chartOptions = computed(() =>
+	metricsChart.generateChartOptions({
+		metric: props.selectedMetric,
+		xTitle: locale.baseText('testDefinition.listRuns.runDate'),
+	}),
+);
+
+watchEffect(() => {
+	if (props.runs.length > 0 && !props.selectedMetric) {
+		emit('update:selectedMetric', availableMetrics.value[0]);
+	}
+});
+</script>
+
+<template>
+	<div v-if="availableMetrics.length > 0" :class="$style.metricsChartContainer">
+		<div :class="$style.chartHeader">
+			<N8nText>{{ locale.baseText('testDefinition.listRuns.metricsOverTime') }}</N8nText>
+			<N8nSelect
+				:model-value="selectedMetric"
+				:class="$style.metricSelect"
+				placeholder="Select metric"
+				@update:model-value="emit('update:selectedMetric', $event)"
+			>
+				<N8nOption
+					v-for="metric in availableMetrics"
+					:key="metric"
+					:label="metric"
+					:value="metric"
+				/>
+			</N8nSelect>
+		</div>
+		<div :class="$style.chartWrapper">
+			<Line
+				v-if="availableMetrics.length > 0"
+				:key="selectedMetric"
+				:data="chartData"
+				:options="chartOptions"
+				:class="$style.metricsChart"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.metricsChartContainer {
+	margin: var(--spacing-m) 0;
+	background: var(--color-background-xlight);
+	border-radius: var(--border-radius-large);
+	box-shadow: var(--box-shadow-base);
+
+	.chartHeader {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: var(--spacing-m);
+		padding: var(--spacing-s);
+		border-bottom: 1px solid var(--color-foreground-base);
+	}
+
+	.chartTitle {
+		font-size: var(--font-size-l);
+		font-weight: var(--font-weight-bold);
+		color: var(--color-text-base);
+	}
+
+	.metricSelect {
+		max-width: 15rem;
+	}
+
+	.chartWrapper {
+		position: relative;
+		height: 400px;
+		width: 100%;
+		padding: var(--spacing-s);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue b/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
new file mode 100644
index 0000000000..7fb1b19139
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import { computed, ref } from 'vue';
+import type { TestDefinitionTableColumn } from '../shared/TestDefinitionTable.vue';
+import TestDefinitionTable from '../shared/TestDefinitionTable.vue';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+
+const emit = defineEmits<{
+	getRunDetail: [run: TestRunRecord];
+	selectionChange: [runs: TestRunRecord[]];
+	deleteRuns: [runs: TestRunRecord[]];
+}>();
+
+const props = defineProps<{
+	runs: TestRunRecord[];
+	selectable?: boolean;
+}>();
+
+const locale = useI18n();
+const navigateToRunDetail = (run: TestRunRecord) => emit('getRunDetail', run);
+const selectedRows = ref<TestRunRecord[]>([]);
+
+const metrics = computed(() => {
+	return props.runs.reduce((acc, run) => {
+		const metricKeys = Object.keys(run.metrics ?? {});
+		return [...new Set([...acc, ...metricKeys])];
+	}, [] as string[]);
+});
+
+const columns = computed((): Array<TestDefinitionTableColumn<TestRunRecord>> => {
+	return [
+		{
+			prop: 'runNumber',
+			label: locale.baseText('testDefinition.listRuns.runNumber'),
+			width: 200,
+			route: (row: TestRunRecord) => ({
+				name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+				params: { testId: row.testDefinitionId, runId: row.id },
+			}),
+			formatter: (row: TestRunRecord) => `${row.id}`,
+		},
+		{
+			prop: 'status',
+			label: locale.baseText('testDefinition.listRuns.status'),
+			filters: [
+				{ text: locale.baseText('testDefinition.listRuns.status.new'), value: 'new' },
+				{ text: locale.baseText('testDefinition.listRuns.status.running'), value: 'running' },
+				{ text: locale.baseText('testDefinition.listRuns.status.completed'), value: 'completed' },
+				{ text: locale.baseText('testDefinition.listRuns.status.error'), value: 'error' },
+			],
+			filterMethod: (value: string, row: TestRunRecord) => row.status === value,
+		},
+		{
+			prop: 'date',
+			label: locale.baseText('testDefinition.listRuns.runDate'),
+			sortable: true,
+			formatter: (row: TestRunRecord) => convertToDisplayDate(new Date(row.runAt).getTime()),
+		},
+
+		...metrics.value.map((metric) => ({
+			prop: `metrics.${metric}`,
+			label: metric,
+			sortable: true,
+			formatter: (row: TestRunRecord) => `${row.metrics?.[metric]?.toFixed(2) ?? '-'}`,
+		})),
+	];
+});
+
+function onSelectionChange(runs: TestRunRecord[]) {
+	selectedRows.value = runs;
+	emit('selectionChange', runs);
+}
+
+function deleteRuns() {
+	emit('deleteRuns', selectedRows.value);
+}
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div :class="$style.footer">
+			<n8n-button
+				v-show="selectedRows.length > 0"
+				type="danger"
+				:class="$style.activator"
+				:size="'medium'"
+				:icon="'trash'"
+				data-test-id="delete-runs-button"
+				@click="deleteRuns"
+			>
+				{{
+					locale.baseText('testDefinition.listRuns.deleteRuns', {
+						adjustToNumber: selectedRows.length,
+					})
+				}}
+			</n8n-button>
+		</div>
+		<TestDefinitionTable
+			:data="runs"
+			:columns="columns"
+			selectable
+			@row-click="navigateToRunDetail"
+			@selection-change="onSelectionChange"
+		/>
+		<N8nText :class="$style.runsTableTotal">{{
+			locale.baseText('testDefinition.edit.pastRuns.total', { adjustToNumber: runs.length })
+		}}</N8nText>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts b/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
new file mode 100644
index 0000000000..9a792cc8fc
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
@@ -0,0 +1,145 @@
+import type { ChartData, ChartOptions } from 'chart.js';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import dateFormat from 'dateformat';
+import type { AppliedThemeOption } from '@/Interface';
+
+const THEME_COLORS = {
+	light: {
+		primary: 'rgb(255, 110, 92)',
+		text: {
+			primary: 'rgb(68, 68, 68)',
+			secondary: 'rgb(102, 102, 102)',
+		},
+		background: 'rgb(255, 255, 255)',
+		grid: 'rgba(68, 68, 68, 0.1)',
+	},
+	dark: {
+		primary: 'rgb(255, 110, 92)',
+		text: {
+			primary: 'rgb(255, 255, 255)',
+			secondary: 'rgba(255, 255, 255, 0.7)',
+		},
+		background: 'rgb(32, 32, 32)',
+		grid: 'rgba(255, 255, 255, 0.1)',
+	},
+};
+
+export function useMetricsChart(mode: AppliedThemeOption = 'light') {
+	const colors = THEME_COLORS[mode];
+	const toRGBA = (color: string, alpha: number) => {
+		if (color.includes('rgba')) return color;
+		return color.replace('rgb', 'rgba').replace(')', `, ${alpha})`);
+	};
+	function generateChartData(runs: TestRunRecord[], metric: string): ChartData<'line'> {
+		const sortedRuns = [...runs]
+			.sort((a, b) => new Date(a.runAt).getTime() - new Date(b.runAt).getTime())
+			.filter((run) => run.metrics?.[metric]);
+
+		return {
+			labels: sortedRuns.map((run) => {
+				return dateFormat(run.runAt, 'yyyy-mm-dd HH:MM');
+			}),
+			datasets: [
+				{
+					label: metric,
+					data: sortedRuns.map((run) => run.metrics?.[metric] ?? 0),
+					borderColor: colors.primary,
+					backgroundColor: toRGBA(colors.primary, 0.1),
+					borderWidth: 2,
+					pointRadius: 4,
+					pointHoverRadius: 6,
+					pointBackgroundColor: colors.primary,
+					pointBorderColor: colors.primary,
+					pointHoverBackgroundColor: colors.background,
+					pointHoverBorderColor: colors.primary,
+					tension: 0.4,
+					fill: true,
+				},
+			],
+		};
+	}
+
+	function generateChartOptions(params: { metric: string; xTitle: string }): ChartOptions<'line'> {
+		return {
+			responsive: true,
+			maintainAspectRatio: false,
+			devicePixelRatio: 2,
+			interaction: {
+				mode: 'index' as const,
+				intersect: false,
+			},
+			scales: {
+				y: {
+					beginAtZero: true,
+					grid: {
+						color: colors.grid,
+					},
+					ticks: {
+						padding: 8,
+						color: colors.text.primary,
+					},
+					title: {
+						display: true,
+						text: params.metric,
+						padding: 16,
+						color: colors.text.primary,
+					},
+				},
+				x: {
+					grid: {
+						display: false,
+					},
+					ticks: {
+						maxRotation: 45,
+						minRotation: 45,
+						color: colors.text.primary,
+					},
+					title: {
+						display: true,
+						text: params.xTitle,
+						padding: 16,
+						color: colors.text.primary,
+					},
+				},
+			},
+			plugins: {
+				tooltip: {
+					backgroundColor: colors.background,
+					titleColor: colors.text.primary,
+					titleFont: {
+						weight: '600',
+					},
+					bodyColor: colors.text.secondary,
+					bodySpacing: 4,
+					padding: 12,
+					borderColor: toRGBA(colors.primary, 0.2),
+					borderWidth: 1,
+					displayColors: true,
+					callbacks: {
+						title: (tooltipItems) => tooltipItems[0].label,
+						label: (context) => `${params.metric}: ${context.parsed.y.toFixed(2)}`,
+					},
+				},
+				legend: {
+					display: false,
+				},
+			},
+			animation: {
+				duration: 750,
+				easing: 'easeInOutQuart',
+			},
+			transitions: {
+				active: {
+					animation: {
+						duration: 300,
+					},
+				},
+			},
+		};
+	}
+
+	return {
+		generateChartData,
+		generateChartOptions,
+	};
+}
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
index 1a2ccd988a..1b5fee84a0 100644
--- a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
@@ -1,27 +1,10 @@
 import { ref, computed } from 'vue';
-import type { ComponentPublicInstance } from 'vue';
-import type { INodeParameterResourceLocator } from 'n8n-workflow';
+import type { ComponentPublicInstance, ComputedRef } from 'vue';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import type AnnotationTagsDropdownEe from '@/components/AnnotationTagsDropdown.ee.vue';
 import type { N8nInput } from 'n8n-design-system';
 import type { UpdateTestDefinitionParams } from '@/api/testDefinition.ee';
-
-interface EditableField {
-	value: string;
-	isEditing: boolean;
-	tempValue: string;
-}
-
-export interface IEvaluationFormState {
-	name: EditableField;
-	description: string;
-	tags: {
-		isEditing: boolean;
-		appliedTagIds: string[];
-	};
-	evaluationWorkflow: INodeParameterResourceLocator;
-	metrics: string[];
-}
+import type { EditableField, EditableFormState, EvaluationFormState } from '../types';
 
 type FormRefs = {
 	nameInput: ComponentPublicInstance<typeof N8nInput>;
@@ -29,64 +12,75 @@ type FormRefs = {
 };
 
 export function useTestDefinitionForm() {
-	// Stores
 	const evaluationsStore = useTestDefinitionStore();
 
-	// Form state
-	const state = ref<IEvaluationFormState>({
-		description: '',
+	// State initialization
+	const state = ref<EvaluationFormState>({
 		name: {
-			value: `My Test [${new Date().toLocaleString(undefined, { month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' })}]`,
-			isEditing: false,
+			value: `My Test ${evaluationsStore.allTestDefinitions.length + 1}`,
 			tempValue: '',
+			isEditing: false,
 		},
 		tags: {
+			value: [],
+			tempValue: [],
 			isEditing: false,
-			appliedTagIds: [],
 		},
+		description: '',
 		evaluationWorkflow: {
 			mode: 'list',
 			value: '',
 			__rl: true,
 		},
-		metrics: [''],
+		metrics: [],
+		mockedNodes: [],
 	});
 
-	// Loading states
 	const isSaving = ref(false);
 	const fieldsIssues = ref<Array<{ field: string; message: string }>>([]);
-
-	// Field refs
 	const fields = ref<FormRefs>({} as FormRefs);
 
-	// Methods
+	// A computed mapping of editable fields to their states
+	// This ensures TS knows the exact type of each field.
+	const editableFields: ComputedRef<{
+		name: EditableField<string>;
+		tags: EditableField<string[]>;
+	}> = computed(() => ({
+		name: state.value.name,
+		tags: state.value.tags,
+	}));
+
+	/**
+	 * Load test data including metrics.
+	 */
 	const loadTestData = async (testId: string) => {
 		try {
 			await evaluationsStore.fetchAll({ force: true });
 			const testDefinition = evaluationsStore.testDefinitionsById[testId];
 
 			if (testDefinition) {
-				state.value = {
-					description: testDefinition.description ?? '',
-					name: {
-						value: testDefinition.name ?? '',
-						isEditing: false,
-						tempValue: '',
-					},
-					tags: {
-						isEditing: false,
-						appliedTagIds: testDefinition.annotationTagId ? [testDefinition.annotationTagId] : [],
-					},
-					evaluationWorkflow: {
-						mode: 'list',
-						value: testDefinition.evaluationWorkflowId ?? '',
-						__rl: true,
-					},
-					metrics: [''],
+				const metrics = await evaluationsStore.fetchMetrics(testId);
+
+				state.value.description = testDefinition.description ?? '';
+				state.value.name = {
+					value: testDefinition.name ?? '',
+					isEditing: false,
+					tempValue: '',
 				};
+				state.value.tags = {
+					isEditing: false,
+					value: testDefinition.annotationTagId ? [testDefinition.annotationTagId] : [],
+					tempValue: [],
+				};
+				state.value.evaluationWorkflow = {
+					mode: 'list',
+					value: testDefinition.evaluationWorkflowId ?? '',
+					__rl: true,
+				};
+				state.value.metrics = metrics;
+				state.value.mockedNodes = testDefinition.mockedNodes ?? [];
 			}
 		} catch (error) {
-			// TODO: Throw better errors
 			console.error('Failed to load test data', error);
 		}
 	};
@@ -98,22 +92,43 @@ export function useTestDefinitionForm() {
 		fieldsIssues.value = [];
 
 		try {
-			// Prepare parameters for creating a new test
 			const params = {
 				name: state.value.name.value,
 				workflowId,
 				description: state.value.description,
 			};
-
-			const newTest = await evaluationsStore.create(params);
-			return newTest;
-		} catch (error) {
-			throw error;
+			return await evaluationsStore.create(params);
 		} finally {
 			isSaving.value = false;
 		}
 	};
 
+	const deleteMetric = async (metricId: string, testId: string) => {
+		await evaluationsStore.deleteMetric({ id: metricId, testDefinitionId: testId });
+		state.value.metrics = state.value.metrics.filter((metric) => metric.id !== metricId);
+	};
+
+	const updateMetrics = async (testId: string) => {
+		const promises = state.value.metrics.map(async (metric) => {
+			if (!metric.name) return;
+			if (!metric.id) {
+				const createdMetric = await evaluationsStore.createMetric({
+					name: metric.name,
+					testDefinitionId: testId,
+				});
+				metric.id = createdMetric.id;
+			} else {
+				await evaluationsStore.updateMetric({
+					name: metric.name,
+					id: metric.id,
+					testDefinitionId: testId,
+				});
+			}
+		});
+
+		await Promise.all(promises);
+	};
+
 	const updateTest = async (testId: string) => {
 		if (isSaving.value) return;
 
@@ -121,74 +136,93 @@ export function useTestDefinitionForm() {
 		fieldsIssues.value = [];
 
 		try {
-			// Check if the test ID is provided
 			if (!testId) {
 				throw new Error('Test ID is required for updating a test');
 			}
 
-			// Prepare parameters for updating the existing test
 			const params: UpdateTestDefinitionParams = {
 				name: state.value.name.value,
 				description: state.value.description,
 			};
+
 			if (state.value.evaluationWorkflow.value) {
 				params.evaluationWorkflowId = state.value.evaluationWorkflow.value.toString();
 			}
 
-			const annotationTagId = state.value.tags.appliedTagIds[0];
+			const annotationTagId = state.value.tags.value[0];
 			if (annotationTagId) {
 				params.annotationTagId = annotationTagId;
 			}
-			// Update the existing test
+			if (state.value.mockedNodes.length > 0) {
+				params.mockedNodes = state.value.mockedNodes;
+			}
+
 			return await evaluationsStore.update({ ...params, id: testId });
-		} catch (error) {
-			throw error;
 		} finally {
 			isSaving.value = false;
 		}
 	};
 
-	const startEditing = async (field: string) => {
-		if (field === 'name') {
-			state.value.name.tempValue = state.value.name.value;
-			state.value.name.isEditing = true;
-		} else {
-			state.value.tags.isEditing = true;
+	/**
+	 * Start editing an editable field by copying `value` to `tempValue`.
+	 */
+	function startEditing<T extends keyof EditableFormState>(field: T) {
+		const fieldObj = editableFields.value[field];
+		if (fieldObj.isEditing) {
+			// Already editing, do nothing
+			return;
 		}
-	};
 
-	const saveChanges = (field: string) => {
-		if (field === 'name') {
-			state.value.name.value = state.value.name.tempValue;
-			state.value.name.isEditing = false;
+		if (Array.isArray(fieldObj.value)) {
+			fieldObj.tempValue = [...fieldObj.value];
 		} else {
-			state.value.tags.isEditing = false;
+			fieldObj.tempValue = fieldObj.value;
 		}
-	};
+		fieldObj.isEditing = true;
+	}
+	/**
+	 * Save changes by copying `tempValue` back into `value`.
+	 */
+	function saveChanges<T extends keyof EditableFormState>(field: T) {
+		const fieldObj = editableFields.value[field];
+		fieldObj.value = Array.isArray(fieldObj.tempValue)
+			? [...fieldObj.tempValue]
+			: fieldObj.tempValue;
+		fieldObj.isEditing = false;
+	}
 
-	const cancelEditing = (field: string) => {
-		if (field === 'name') {
-			state.value.name.isEditing = false;
-			state.value.name.tempValue = '';
+	/**
+	 * Cancel editing and revert `tempValue` from `value`.
+	 */
+	function cancelEditing<T extends keyof EditableFormState>(field: T) {
+		const fieldObj = editableFields.value[field];
+		if (Array.isArray(fieldObj.value)) {
+			fieldObj.tempValue = [...fieldObj.value];
 		} else {
-			state.value.tags.isEditing = false;
+			fieldObj.tempValue = fieldObj.value;
 		}
-	};
+		fieldObj.isEditing = false;
+	}
 
-	const handleKeydown = (event: KeyboardEvent, field: string) => {
+	/**
+	 * Handle keyboard events during editing.
+	 */
+	function handleKeydown<T extends keyof EditableFormState>(event: KeyboardEvent, field: T) {
 		if (event.key === 'Escape') {
 			cancelEditing(field);
 		} else if (event.key === 'Enter' && !event.shiftKey) {
 			event.preventDefault();
 			saveChanges(field);
 		}
-	};
+	}
 
 	return {
 		state,
 		fields,
 		isSaving: computed(() => isSaving.value),
 		fieldsIssues: computed(() => fieldsIssues.value),
+		deleteMetric,
+		updateMetrics,
 		loadTestData,
 		createTest,
 		updateTest,
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue b/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
new file mode 100644
index 0000000000..208e1d5d0f
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts" generic="T">
+import { useI18n } from '@/composables/useI18n';
+import type { TestDefinitionTableColumn } from './TestDefinitionTable.vue';
+import { useRouter } from 'vue-router';
+
+defineProps<{
+	column: TestDefinitionTableColumn<T>;
+	row: T;
+}>();
+
+defineEmits<{
+	click: [];
+}>();
+
+const locale = useI18n();
+const router = useRouter();
+interface WithStatus {
+	status: string;
+}
+
+function hasStatus(row: unknown): row is WithStatus {
+	return typeof row === 'object' && row !== null && 'status' in row;
+}
+
+const statusThemeMap: Record<string, string> = {
+	new: 'info',
+	running: 'warning',
+	completed: 'success',
+	error: 'danger',
+	success: 'success',
+};
+
+const statusLabelMap: Record<string, string> = {
+	new: locale.baseText('testDefinition.listRuns.status.new'),
+	running: locale.baseText('testDefinition.listRuns.status.running'),
+	completed: locale.baseText('testDefinition.listRuns.status.completed'),
+	error: locale.baseText('testDefinition.listRuns.status.error'),
+	success: locale.baseText('testDefinition.listRuns.status.success'),
+};
+
+function hasProperty(row: unknown, prop: string): row is Record<string, unknown> {
+	return typeof row === 'object' && row !== null && prop in row;
+}
+
+const getCellContent = (column: TestDefinitionTableColumn<T>, row: T) => {
+	if (column.formatter) {
+		return column.formatter(row);
+	}
+	return hasProperty(row, column.prop) ? row[column.prop] : undefined;
+};
+</script>
+
+<template>
+	<div v-if="column.route">
+		<a v-if="column.openInNewTab" :href="router.resolve(column.route(row)).href" target="_blank">
+			{{ getCellContent(column, row) }}
+		</a>
+		<router-link v-else :to="column.route(row)">
+			{{ getCellContent(column, row) }}
+		</router-link>
+	</div>
+
+	<N8nBadge
+		v-else-if="column.prop === 'status' && hasStatus(row)"
+		:theme="statusThemeMap[row.status]"
+		class="mr-4xs"
+	>
+		{{ statusLabelMap[row.status] }}
+	</N8nBadge>
+
+	<div v-else>
+		{{ getCellContent(column, row) }}
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue b/packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue
new file mode 100644
index 0000000000..b67d04b70b
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue
@@ -0,0 +1,95 @@
+<script setup lang="ts" generic="T">
+import type { RouteLocationRaw } from 'vue-router';
+import TableCell from './TableCell.vue';
+import { ElTable, ElTableColumn } from 'element-plus';
+import { ref } from 'vue';
+import type { TableInstance } from 'element-plus';
+
+/**
+ * A reusable table component for displaying test definition data
+ * @template T - The type of data being displayed in the table rows
+ */
+
+/**
+ * Configuration for a table column
+ * @template TRow - The type of data in each table row
+ */
+export type TestDefinitionTableColumn<TRow> = {
+	prop: string;
+	label: string;
+	width?: number;
+	sortable?: boolean;
+	filters?: Array<{ text: string; value: string }>;
+	filterMethod?: (value: string, row: TRow) => boolean;
+	route?: (row: TRow) => RouteLocationRaw;
+	openInNewTab?: boolean;
+	formatter?: (row: TRow) => string;
+};
+
+withDefaults(
+	defineProps<{
+		data: T[];
+		columns: Array<TestDefinitionTableColumn<T>>;
+		showControls?: boolean;
+		defaultSort?: { prop: string; order: 'ascending' | 'descending' };
+		selectable?: boolean;
+		selectableFilter?: (row: T) => boolean;
+	}>(),
+	{
+		defaultSort: () => ({ prop: 'date', order: 'ascending' }),
+		selectable: false,
+		selectableFilter: () => true,
+	},
+);
+
+const tableRef = ref<TableInstance>();
+const selectedRows = ref<T[]>([]);
+
+const emit = defineEmits<{
+	rowClick: [row: T];
+	selectionChange: [rows: T[]];
+}>();
+
+const handleSelectionChange = (rows: T[]) => {
+	selectedRows.value = rows;
+	emit('selectionChange', rows);
+};
+</script>
+
+<template>
+	<ElTable
+		ref="tableRef"
+		:default-sort="defaultSort"
+		:data="data"
+		style="width: 100%"
+		:border="true"
+		max-height="800"
+		resizable
+		@selection-change="handleSelectionChange"
+	>
+		<ElTableColumn
+			v-if="selectable"
+			type="selection"
+			:selectable="selectableFilter"
+			width="55"
+			data-test-id="table-column-select"
+		/>
+		<ElTableColumn
+			v-for="column in columns"
+			:key="column.prop"
+			v-bind="column"
+			style="width: 100%"
+			:resizable="true"
+			data-test-id="table-column"
+		>
+			<template #default="{ row }">
+				<TableCell
+					:column="column"
+					:row="row"
+					@click="$emit('rowClick', row)"
+					data-test-id="table-cell"
+				/>
+			</template>
+		</ElTableColumn>
+	</ElTable>
+</template>
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
index 43b2164521..b9784ca284 100644
--- a/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
+++ b/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
@@ -6,11 +6,11 @@ import userEvent from '@testing-library/user-event';
 const renderComponent = createComponentRenderer(MetricsInput);
 
 describe('MetricsInput', () => {
-	let props: { modelValue: string[] };
+	let props: { modelValue: Array<{ name: string }> };
 
 	beforeEach(() => {
 		props = {
-			modelValue: ['Metric 1', 'Metric 2'],
+			modelValue: [{ name: 'Metric 1' }, { name: 'Metric 2' }],
 		};
 	});
 
@@ -25,14 +25,18 @@ describe('MetricsInput', () => {
 	it('should update a metric when typing in the input', async () => {
 		const { getAllByPlaceholderText, emitted } = renderComponent({
 			props: {
-				modelValue: [''],
+				modelValue: [{ name: '' }],
 			},
 		});
 		const inputs = getAllByPlaceholderText('Enter metric name');
 		await userEvent.type(inputs[0], 'Updated Metric 1');
 
-		expect(emitted('update:modelValue')).toBeTruthy();
-		expect(emitted('update:modelValue')).toEqual('Updated Metric 1'.split('').map((c) => [[c]]));
+		// Every character typed triggers an update event. Let's check the last emission.
+		const allEmits = emitted('update:modelValue');
+		expect(allEmits).toBeTruthy();
+		// The last emission should contain the fully updated name
+		const lastEmission = allEmits[allEmits.length - 1];
+		expect(lastEmission).toEqual([[{ name: 'Updated Metric 1' }]]);
 	});
 
 	it('should render correctly with no initial metrics', () => {
@@ -47,10 +51,89 @@ describe('MetricsInput', () => {
 		const { getByText, emitted } = renderComponent({ props });
 		const addButton = getByText('New metric');
 
-		addButton.click();
-		addButton.click();
-		addButton.click();
+		await userEvent.click(addButton);
+		await userEvent.click(addButton);
+		await userEvent.click(addButton);
 
-		expect(emitted('update:modelValue')).toHaveProperty('length', 3);
+		// Each click adds a new metric
+		const updateEvents = emitted('update:modelValue');
+		expect(updateEvents).toHaveLength(3);
+
+		// Check the structure of one of the emissions
+		// Initial: [{ name: 'Metric 1' }, { name: 'Metric 2' }]
+		// After first click: [{ name: 'Metric 1' }, { name: 'Metric 2' }, { name: '' }]
+		expect(updateEvents[0]).toEqual([[{ name: 'Metric 1' }, { name: 'Metric 2' }, { name: '' }]]);
+	});
+
+	it('should emit "deleteMetric" event when a delete button is clicked', async () => {
+		const { getAllByRole, emitted } = renderComponent({ props });
+
+		// Each metric row has a delete button, identified by "button"
+		const deleteButtons = getAllByRole('button', { name: '' });
+		expect(deleteButtons).toHaveLength(props.modelValue.length);
+
+		// Click on the delete button for the second metric
+		await userEvent.click(deleteButtons[1]);
+
+		expect(emitted('deleteMetric')).toBeTruthy();
+		expect(emitted('deleteMetric')[0]).toEqual([{ name: 'Metric 2' }]);
+	});
+
+	it('should emit multiple update events as the user types and reflect the final name correctly', async () => {
+		const { getAllByPlaceholderText, emitted } = renderComponent({
+			props: {
+				modelValue: [{ name: '' }],
+			},
+		});
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		await userEvent.type(inputs[0], 'ABC');
+
+		const allEmits = emitted('update:modelValue');
+		expect(allEmits).toBeTruthy();
+		// Each character typed should emit a new value
+		expect(allEmits.length).toBe(3);
+		expect(allEmits[2]).toEqual([[{ name: 'ABC' }]]);
+	});
+
+	it('should not break if metrics are empty and still allow adding a new metric', async () => {
+		props.modelValue = [];
+		const { queryAllByRole, getByText, emitted } = renderComponent({ props });
+
+		// No metrics initially
+		const inputs = queryAllByRole('textbox');
+		expect(inputs).toHaveLength(0);
+
+		const addButton = getByText('New metric');
+		await userEvent.click(addButton);
+
+		const updates = emitted('update:modelValue');
+		expect(updates).toBeTruthy();
+		expect(updates[0]).toEqual([[{ name: '' }]]);
+
+		// After adding one metric, we should now have an input
+		const { getAllByPlaceholderText } = renderComponent({
+			props: { modelValue: [{ name: '' }] },
+		});
+		const updatedInputs = getAllByPlaceholderText('Enter metric name');
+		expect(updatedInputs).toHaveLength(1);
+	});
+
+	it('should handle deleting the first metric and still display remaining metrics correctly', async () => {
+		const { getAllByPlaceholderText, getAllByRole, rerender, emitted } = renderComponent({
+			props,
+		});
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		expect(inputs).toHaveLength(2);
+
+		const deleteButtons = getAllByRole('button', { name: '' });
+		await userEvent.click(deleteButtons[0]);
+
+		expect(emitted('deleteMetric')).toBeTruthy();
+		expect(emitted('deleteMetric')[0]).toEqual([{ name: 'Metric 1' }]);
+
+		await rerender({ modelValue: [{ name: 'Metric 2' }] });
+		const updatedInputs = getAllByPlaceholderText('Enter metric name');
+		expect(updatedInputs).toHaveLength(1);
+		expect(updatedInputs[0]).toHaveValue('Metric 2');
 	});
 });
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
new file mode 100644
index 0000000000..924ccecfde
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
@@ -0,0 +1,127 @@
+import { describe, it, expect } from 'vitest';
+import { useMetricsChart } from '../composables/useMetricsChart';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+
+describe('useMetricsChart', () => {
+	const mockRuns: TestRunRecord[] = [
+		{
+			id: '1',
+			testDefinitionId: 'test1',
+			status: 'completed',
+			createdAt: '2025-01-06T10:00:00Z',
+			updatedAt: '2025-01-06T10:00:00Z',
+			completedAt: '2025-01-06T10:00:00Z',
+			runAt: '2025-01-06T10:00:00Z',
+			metrics: { responseTime: 100, successRate: 95 },
+		},
+		{
+			id: '2',
+			testDefinitionId: 'test1',
+			status: 'completed',
+			createdAt: '2025-01-06T10:00:00Z',
+			updatedAt: '2025-01-06T10:00:00Z',
+			completedAt: '2025-01-06T10:00:00Z',
+			runAt: '2025-01-06T10:00:00Z',
+			metrics: { responseTime: 150, successRate: 98 },
+		},
+	] as TestRunRecord[];
+
+	describe('generateChartData', () => {
+		it('should generate correct chart data structure', () => {
+			const { generateChartData } = useMetricsChart('light');
+			const result = generateChartData(mockRuns, 'responseTime');
+
+			expect(result.labels).toHaveLength(2);
+			expect(result.datasets).toHaveLength(1);
+			expect(result.datasets[0].data).toEqual([100, 150]);
+		});
+
+		it('should sort runs by date', () => {
+			const unsortedRuns = [
+				{
+					id: '1',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:05:00Z',
+					updatedAt: '2025-01-06T10:05:00Z',
+					completedAt: '2025-01-06T10:05:00Z',
+					runAt: '2025-01-06T10:05:00Z',
+					metrics: { responseTime: 150 },
+				},
+				{
+					id: '2',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:00:00Z',
+					updatedAt: '2025-01-06T10:00:00Z',
+					completedAt: '2025-01-06T10:00:00Z',
+					runAt: '2025-01-06T10:00:00Z',
+					metrics: { responseTime: 100 },
+				},
+			] as TestRunRecord[];
+
+			const { generateChartData } = useMetricsChart('light');
+			const result = generateChartData(unsortedRuns, 'responseTime');
+
+			expect(result.datasets[0].data).toEqual([100, 150]);
+		});
+
+		it('should filter out runs without specified metric', () => {
+			const runsWithMissingMetrics = [
+				{
+					id: '1',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:00:00Z',
+					updatedAt: '2025-01-06T10:00:00Z',
+					completedAt: '2025-01-06T10:00:00Z',
+					runAt: '2025-01-06T10:00:00Z',
+					metrics: { responseTime: 100 },
+				},
+				{
+					id: '2',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:00:00Z',
+					updatedAt: '2025-01-06T10:00:00Z',
+					completedAt: '2025-01-06T10:00:00Z',
+					runAt: '2025-01-06T10:00:00Z',
+					metrics: {},
+				},
+			] as TestRunRecord[];
+
+			const { generateChartData } = useMetricsChart('light');
+			const result = generateChartData(runsWithMissingMetrics, 'responseTime');
+
+			expect(result.labels).toHaveLength(1);
+			expect(result.datasets[0].data).toEqual([100]);
+		});
+
+		it('should handle dark theme colors', () => {
+			const { generateChartData } = useMetricsChart('dark');
+			const result = generateChartData(mockRuns, 'responseTime');
+
+			expect(result.datasets[0].pointHoverBackgroundColor).toBe('rgb(32, 32, 32)');
+		});
+	});
+
+	describe('generateChartOptions', () => {
+		it('should generate correct chart options structure', () => {
+			const { generateChartOptions } = useMetricsChart('light');
+			const result = generateChartOptions({ metric: 'responseTime', xTitle: 'Time' });
+
+			expect(result.scales?.y?.title?.text).toBe('responseTime');
+			expect(result.scales?.x?.title?.text).toBe('Time');
+			expect(result.responsive).toBe(true);
+			expect(result.maintainAspectRatio).toBe(false);
+		});
+
+		it('should apply correct theme colors', () => {
+			const { generateChartOptions } = useMetricsChart('dark');
+			const result = generateChartOptions({ metric: 'responseTime', xTitle: 'Time' });
+
+			expect(result.scales?.y?.ticks?.color).toBe('rgb(255, 255, 255)');
+			expect(result.plugins?.tooltip?.backgroundColor).toBe('rgb(32, 32, 32)');
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
index 952807d7cc..98d67980d0 100644
--- a/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
+++ b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
@@ -12,18 +12,21 @@ const TEST_DEF_A: TestDefinitionRecord = {
 	evaluationWorkflowId: '456',
 	workflowId: '123',
 	annotationTagId: '789',
+	annotationTag: null,
 };
 const TEST_DEF_B: TestDefinitionRecord = {
 	id: '2',
 	name: 'Test Definition B',
 	workflowId: '123',
 	description: 'Description B',
+	annotationTag: null,
 };
 const TEST_DEF_NEW: TestDefinitionRecord = {
 	id: '3',
 	workflowId: '123',
 	name: 'New Test Definition',
 	description: 'New Description',
+	annotationTag: null,
 };
 
 beforeEach(() => {
@@ -35,44 +38,78 @@ afterEach(() => {
 	vi.clearAllMocks();
 });
 
-describe('useTestDefinitionForm', async () => {
-	it('should initialize with default props', async () => {
+describe('useTestDefinitionForm', () => {
+	it('should initialize with default props', () => {
 		const { state } = useTestDefinitionForm();
 
-		expect(state.value.description).toEqual('');
+		expect(state.value.description).toBe('');
 		expect(state.value.name.value).toContain('My Test');
-		expect(state.value.tags.appliedTagIds).toEqual([]);
-		expect(state.value.metrics).toEqual(['']);
-		expect(state.value.evaluationWorkflow.value).toEqual('');
+		expect(state.value.tags.value).toEqual([]);
+		expect(state.value.metrics).toEqual([]);
+		expect(state.value.evaluationWorkflow.value).toBe('');
 	});
 
 	it('should load test data', async () => {
 		const { loadTestData, state } = useTestDefinitionForm();
-		const fetchSpy = vi.fn();
+		const fetchSpy = vi.spyOn(useTestDefinitionStore(), 'fetchAll');
+		const fetchMetricsSpy = vi.spyOn(useTestDefinitionStore(), 'fetchMetrics').mockResolvedValue([
+			{
+				id: 'metric1',
+				name: 'Metric 1',
+				testDefinitionId: TEST_DEF_A.id,
+			},
+		]);
 		const evaluationsStore = mockedStore(useTestDefinitionStore);
 
-		expect(state.value.description).toEqual('');
-		expect(state.value.name.value).toContain('My Test');
 		evaluationsStore.testDefinitionsById = {
 			[TEST_DEF_A.id]: TEST_DEF_A,
 			[TEST_DEF_B.id]: TEST_DEF_B,
 		};
-		evaluationsStore.fetchAll = fetchSpy;
 
 		await loadTestData(TEST_DEF_A.id);
 		expect(fetchSpy).toBeCalled();
+		expect(fetchMetricsSpy).toBeCalledWith(TEST_DEF_A.id);
 		expect(state.value.name.value).toEqual(TEST_DEF_A.name);
 		expect(state.value.description).toEqual(TEST_DEF_A.description);
-		expect(state.value.tags.appliedTagIds).toEqual([TEST_DEF_A.annotationTagId]);
+		expect(state.value.tags.value).toEqual([TEST_DEF_A.annotationTagId]);
 		expect(state.value.evaluationWorkflow.value).toEqual(TEST_DEF_A.evaluationWorkflowId);
+		expect(state.value.metrics).toEqual([
+			{ id: 'metric1', name: 'Metric 1', testDefinitionId: TEST_DEF_A.id },
+		]);
+	});
+
+	it('should gracefully handle loadTestData when no test definition found', async () => {
+		const { loadTestData, state } = useTestDefinitionForm();
+		const fetchSpy = vi.spyOn(useTestDefinitionStore(), 'fetchAll');
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+
+		evaluationsStore.testDefinitionsById = {};
+
+		await loadTestData('unknown-id');
+		expect(fetchSpy).toBeCalled();
+		// Should remain unchanged since no definition found
+		expect(state.value.description).toBe('');
+		expect(state.value.name.value).toContain('My Test');
+		expect(state.value.tags.value).toEqual([]);
+		expect(state.value.metrics).toEqual([]);
+	});
+
+	it('should handle errors while loading test data', async () => {
+		const { loadTestData } = useTestDefinitionForm();
+		const fetchSpy = vi
+			.spyOn(useTestDefinitionStore(), 'fetchAll')
+			.mockRejectedValue(new Error('Fetch Failed'));
+		const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+		await loadTestData(TEST_DEF_A.id);
+		expect(fetchSpy).toBeCalled();
+		expect(consoleErrorSpy).toBeCalledWith('Failed to load test data', expect.any(Error));
+		consoleErrorSpy.mockRestore();
 	});
 
 	it('should save a new test', async () => {
 		const { createTest, state } = useTestDefinitionForm();
-		const createSpy = vi.fn().mockResolvedValue(TEST_DEF_NEW);
-		const evaluationsStore = mockedStore(useTestDefinitionStore);
-
-		evaluationsStore.create = createSpy;
+		const createSpy = vi.spyOn(useTestDefinitionStore(), 'create').mockResolvedValue(TEST_DEF_NEW);
 
 		state.value.name.value = TEST_DEF_NEW.name;
 		state.value.description = TEST_DEF_NEW.description ?? '';
@@ -86,12 +123,24 @@ describe('useTestDefinitionForm', async () => {
 		expect(newTest).toEqual(TEST_DEF_NEW);
 	});
 
+	it('should handle errors when creating a new test', async () => {
+		const { createTest } = useTestDefinitionForm();
+		const createSpy = vi
+			.spyOn(useTestDefinitionStore(), 'create')
+			.mockRejectedValue(new Error('Create Failed'));
+
+		await expect(createTest('123')).rejects.toThrow('Create Failed');
+		expect(createSpy).toBeCalled();
+	});
+
 	it('should update an existing test', async () => {
 		const { updateTest, state } = useTestDefinitionForm();
-		const updateSpy = vi.fn().mockResolvedValue(TEST_DEF_B);
-		const evaluationsStore = mockedStore(useTestDefinitionStore);
-
-		evaluationsStore.update = updateSpy;
+		const updatedBTest = {
+			...TEST_DEF_B,
+			updatedAt: '2022-01-01T00:00:00.000Z',
+			createdAt: '2022-01-01T00:00:00.000Z',
+		};
+		const updateSpy = vi.spyOn(useTestDefinitionStore(), 'update').mockResolvedValue(updatedBTest);
 
 		state.value.name.value = TEST_DEF_B.name;
 		state.value.description = TEST_DEF_B.description ?? '';
@@ -102,75 +151,183 @@ describe('useTestDefinitionForm', async () => {
 			name: TEST_DEF_B.name,
 			description: TEST_DEF_B.description,
 		});
-		expect(updatedTest).toEqual(TEST_DEF_B);
+		expect(updatedTest).toEqual(updatedBTest);
 	});
 
-	it('should start editing a field', async () => {
+	it('should throw an error if no testId is provided when updating a test', async () => {
+		const { updateTest } = useTestDefinitionForm();
+		await expect(updateTest('')).rejects.toThrow('Test ID is required for updating a test');
+	});
+
+	it('should handle errors when updating a test', async () => {
+		const { updateTest, state } = useTestDefinitionForm();
+		const updateSpy = vi
+			.spyOn(useTestDefinitionStore(), 'update')
+			.mockRejectedValue(new Error('Update Failed'));
+
+		state.value.name.value = 'Test';
+		state.value.description = 'Some description';
+
+		await expect(updateTest(TEST_DEF_A.id)).rejects.toThrow('Update Failed');
+		expect(updateSpy).toBeCalled();
+	});
+
+	it('should delete a metric', async () => {
+		const { state, deleteMetric } = useTestDefinitionForm();
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+		const deleteMetricSpy = vi.spyOn(evaluationsStore, 'deleteMetric');
+
+		state.value.metrics = [
+			{
+				id: 'metric1',
+				name: 'Metric 1',
+				testDefinitionId: '1',
+			},
+			{
+				id: 'metric2',
+				name: 'Metric 2',
+				testDefinitionId: '1',
+			},
+		];
+
+		await deleteMetric('metric1', TEST_DEF_A.id);
+		expect(deleteMetricSpy).toBeCalledWith({ id: 'metric1', testDefinitionId: TEST_DEF_A.id });
+		expect(state.value.metrics).toEqual([
+			{ id: 'metric2', name: 'Metric 2', testDefinitionId: '1' },
+		]);
+	});
+
+	it('should update metrics', async () => {
+		const { state, updateMetrics } = useTestDefinitionForm();
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+		const updateMetricSpy = vi.spyOn(evaluationsStore, 'updateMetric');
+		const createMetricSpy = vi
+			.spyOn(evaluationsStore, 'createMetric')
+			.mockResolvedValue({ id: 'metric_new', name: 'Metric 2', testDefinitionId: TEST_DEF_A.id });
+
+		state.value.metrics = [
+			{
+				id: 'metric1',
+				name: 'Metric 1',
+				testDefinitionId: TEST_DEF_A.id,
+			},
+			{
+				id: '',
+				name: 'Metric 2',
+				testDefinitionId: TEST_DEF_A.id,
+			}, // New metric that needs creation
+		];
+
+		await updateMetrics(TEST_DEF_A.id);
+		expect(createMetricSpy).toHaveBeenCalledWith({
+			name: 'Metric 2',
+			testDefinitionId: TEST_DEF_A.id,
+		});
+		expect(updateMetricSpy).toHaveBeenCalledWith({
+			name: 'Metric 1',
+			id: 'metric1',
+			testDefinitionId: TEST_DEF_A.id,
+		});
+		expect(state.value.metrics).toEqual([
+			{ id: 'metric1', name: 'Metric 1', testDefinitionId: TEST_DEF_A.id },
+			{ id: 'metric_new', name: 'Metric 2', testDefinitionId: TEST_DEF_A.id },
+		]);
+	});
+
+	it('should start editing a field', () => {
 		const { state, startEditing } = useTestDefinitionForm();
 
-		await startEditing('name');
+		startEditing('name');
 		expect(state.value.name.isEditing).toBe(true);
 		expect(state.value.name.tempValue).toBe(state.value.name.value);
 
-		await startEditing('tags');
+		startEditing('tags');
 		expect(state.value.tags.isEditing).toBe(true);
+		expect(state.value.tags.tempValue).toEqual(state.value.tags.value);
 	});
 
-	it('should save changes to a field', async () => {
+	it('should do nothing if startEditing is called while already editing', () => {
+		const { state, startEditing } = useTestDefinitionForm();
+		state.value.name.isEditing = true;
+		state.value.name.tempValue = 'Original Name';
+
+		startEditing('name');
+		// Should remain unchanged because it was already editing
+		expect(state.value.name.isEditing).toBe(true);
+		expect(state.value.name.tempValue).toBe('Original Name');
+	});
+
+	it('should save changes to a field', () => {
 		const { state, startEditing, saveChanges } = useTestDefinitionForm();
 
-		await startEditing('name');
+		// Name
+		startEditing('name');
 		state.value.name.tempValue = 'New Name';
 		saveChanges('name');
 		expect(state.value.name.isEditing).toBe(false);
 		expect(state.value.name.value).toBe('New Name');
 
-		await startEditing('tags');
-		state.value.tags.appliedTagIds = ['123'];
+		// Tags
+		startEditing('tags');
+		state.value.tags.tempValue = ['123'];
 		saveChanges('tags');
 		expect(state.value.tags.isEditing).toBe(false);
-		expect(state.value.tags.appliedTagIds).toEqual(['123']);
+		expect(state.value.tags.value).toEqual(['123']);
 	});
 
-	it('should cancel editing a field', async () => {
+	it('should cancel editing a field', () => {
 		const { state, startEditing, cancelEditing } = useTestDefinitionForm();
 
-		await startEditing('name');
+		const originalName = state.value.name.value;
+		startEditing('name');
 		state.value.name.tempValue = 'New Name';
 		cancelEditing('name');
 		expect(state.value.name.isEditing).toBe(false);
-		expect(state.value.name.tempValue).toBe('');
+		expect(state.value.name.tempValue).toBe(originalName);
 
-		await startEditing('tags');
-		state.value.tags.appliedTagIds = ['123'];
+		const originalTags = [...state.value.tags.value];
+		startEditing('tags');
+		state.value.tags.tempValue = ['123'];
 		cancelEditing('tags');
 		expect(state.value.tags.isEditing).toBe(false);
+		expect(state.value.tags.tempValue).toEqual(originalTags);
 	});
 
-	it('should handle keydown - Escape', async () => {
+	it('should handle keydown - Escape', () => {
 		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
 
-		await startEditing('name');
+		startEditing('name');
 		handleKeydown(new KeyboardEvent('keydown', { key: 'Escape' }), 'name');
 		expect(state.value.name.isEditing).toBe(false);
 
-		await startEditing('tags');
+		startEditing('tags');
 		handleKeydown(new KeyboardEvent('keydown', { key: 'Escape' }), 'tags');
 		expect(state.value.tags.isEditing).toBe(false);
 	});
 
-	it('should handle keydown - Enter', async () => {
+	it('should handle keydown - Enter', () => {
 		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
 
-		await startEditing('name');
+		startEditing('name');
 		state.value.name.tempValue = 'New Name';
 		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter' }), 'name');
 		expect(state.value.name.isEditing).toBe(false);
 		expect(state.value.name.value).toBe('New Name');
 
-		await startEditing('tags');
-		state.value.tags.appliedTagIds = ['123'];
+		startEditing('tags');
+		state.value.tags.tempValue = ['123'];
 		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter' }), 'tags');
 		expect(state.value.tags.isEditing).toBe(false);
+		expect(state.value.tags.value).toEqual(['123']);
+	});
+
+	it('should not save changes when shift+Enter is pressed', () => {
+		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
+
+		startEditing('name');
+		state.value.name.tempValue = 'New Name With Shift';
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter', shiftKey: true }), 'name');
+		expect(state.value.name.isEditing).toBe(true);
+		expect(state.value.name.value).not.toBe('New Name With Shift');
 	});
 });
diff --git a/packages/editor-ui/src/components/TestDefinition/types.ts b/packages/editor-ui/src/components/TestDefinition/types.ts
index 68a9d246a5..968b3a2eec 100644
--- a/packages/editor-ui/src/components/TestDefinition/types.ts
+++ b/packages/editor-ui/src/components/TestDefinition/types.ts
@@ -1,7 +1,29 @@
+import type { TestMetricRecord, TestRunRecord } from '@/api/testDefinition.ee';
+import type { INodeParameterResourceLocator } from 'n8n-workflow';
+
+export interface EditableField<T = string> {
+	value: T;
+	tempValue: T;
+	isEditing: boolean;
+}
+
+export interface EditableFormState {
+	name: EditableField<string>;
+	tags: EditableField<string[]>;
+}
+
+export interface EvaluationFormState extends EditableFormState {
+	description: string;
+	evaluationWorkflow: INodeParameterResourceLocator;
+	metrics: TestMetricRecord[];
+	mockedNodes: Array<{ name: string }>;
+}
+
 export interface TestExecution {
 	lastRun: string | null;
 	errorRate: number | null;
 	metrics: Record<string, number>;
+	status: TestRunRecord['status'];
 }
 
 export interface TestListItem {
diff --git a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue b/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
index 9f8eefa184..553de58fe6 100644
--- a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
+++ b/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
@@ -15,7 +15,7 @@ interface TagsDropdownWrapperProps {
 const props = withDefaults(defineProps<TagsDropdownWrapperProps>(), {
 	placeholder: '',
 	modelValue: () => [],
-	createEnabled: false,
+	createEnabled: true,
 	eventBus: null,
 });
 
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index 5fac0c64e0..729ecd782b 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -80,6 +80,7 @@ const props = withDefaults(
 		executing?: boolean;
 		keyBindings?: boolean;
 		showBugReportingButton?: boolean;
+		loading?: boolean;
 	}>(),
 	{
 		id: 'canvas',
@@ -90,6 +91,7 @@ const props = withDefaults(
 		readOnly: false,
 		executing: false,
 		keyBindings: true,
+		loading: false,
 	},
 );
 
@@ -131,7 +133,7 @@ const isPaneReady = ref(false);
 
 const classes = computed(() => ({
 	[$style.canvas]: true,
-	[$style.ready]: isPaneReady.value,
+	[$style.ready]: !props.loading && isPaneReady.value,
 }));
 
 /**
@@ -695,7 +697,11 @@ provide(CanvasKey, {
 				@update:outputs="onUpdateNodeOutputs"
 				@move="onUpdateNodePosition"
 				@add="onClickNodeAdd"
-			/>
+			>
+				<template v-if="$slots.nodeToolbar" #toolbar="toolbarProps">
+					<slot name="nodeToolbar" v-bind="toolbarProps" />
+				</template>
+			</Node>
 		</template>
 
 		<template #edge-canvas-edge="edgeProps">
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index dd558bbef5..ff42272288 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -39,6 +39,14 @@ type Props = NodeProps<CanvasNodeData> & {
 	hovered?: boolean;
 };
 
+const slots = defineSlots<{
+	toolbar?: (props: {
+		inputs: (typeof mainInputs)['value'];
+		outputs: (typeof mainOutputs)['value'];
+		data: CanvasNodeData;
+	}) => void;
+}>();
+
 const emit = defineEmits<{
 	add: [id: string, handle: string];
 	delete: [id: string];
@@ -62,6 +70,10 @@ const contextMenu = useContextMenu();
 
 const { connectingHandle } = useCanvas();
 
+/*
+  Toolbar slot classes
+*/
+const nodeClasses = ref<string[]>([]);
 const inputs = computed(() => props.data.inputs);
 const outputs = computed(() => props.data.outputs);
 const connections = computed(() => props.data.connections);
@@ -83,6 +95,7 @@ const classes = computed(() => ({
 	[style.showToolbar]: showToolbar.value,
 	hovered: props.hovered,
 	selected: props.selected,
+	...Object.fromEntries([...nodeClasses.value].map((c) => [c, true])),
 }));
 
 /**
@@ -92,7 +105,7 @@ const classes = computed(() => ({
 const canvasNodeEventBus = ref(createEventBus<CanvasNodeEventBusEvents>());
 
 function emitCanvasNodeEvent(event: CanvasEventBusEvents['nodes:action']) {
-	if (event.ids.includes(props.id)) {
+	if (event.ids.includes(props.id) && canvasNodeEventBus.value) {
 		canvasNodeEventBus.value.emit(event.action, event.payload);
 	}
 }
@@ -233,6 +246,12 @@ function onMove(position: XYPosition) {
 	emit('move', props.id, position);
 }
 
+function onUpdateClass({ className, add = true }: CanvasNodeEventBusEvents['update:node:class']) {
+	nodeClasses.value = add
+		? [...new Set([...nodeClasses.value, className])]
+		: nodeClasses.value.filter((c) => c !== className);
+}
+
 /**
  * Provide
  */
@@ -282,10 +301,12 @@ watch(outputs, (newValue, oldValue) => {
 
 onMounted(() => {
 	props.eventBus?.on('nodes:action', emitCanvasNodeEvent);
+	canvasNodeEventBus.value?.on('update:node:class', onUpdateClass);
 });
 
 onBeforeUnmount(() => {
 	props.eventBus?.off('nodes:action', emitCanvasNodeEvent);
+	canvasNodeEventBus.value?.off('update:node:class', onUpdateClass);
 });
 </script>
 
@@ -323,8 +344,13 @@ onBeforeUnmount(() => {
 			/>
 		</template>
 
+		<template v-if="slots.toolbar">
+			<slot name="toolbar" :inputs="mainInputs" :outputs="mainOutputs" :data="data" />
+		</template>
+
 		<CanvasNodeToolbar
-			v-if="nodeTypeDescription"
+			v-else-if="nodeTypeDescription"
+			data-test-id="canvas-node-toolbar"
 			:read-only="readOnly"
 			:class="$style.canvasNodeToolbar"
 			@delete="onDelete"
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 8acec6d7a5..b1d5546183 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -53,6 +53,7 @@ export const WORKFLOW_SETTINGS_MODAL_KEY = 'settings';
 export const WORKFLOW_SHARE_MODAL_KEY = 'workflowShare';
 export const PERSONALIZATION_MODAL_KEY = 'personalization';
 export const CONTACT_PROMPT_MODAL_KEY = 'contactPrompt';
+export const NODE_PINNING_MODAL_KEY = 'nodePinning';
 export const NPS_SURVEY_MODAL_KEY = 'npsSurvey';
 export const WORKFLOW_ACTIVE_MODAL_KEY = 'activation';
 export const COMMUNITY_PACKAGE_INSTALL_MODAL_KEY = 'communityPackageInstall';
@@ -497,6 +498,9 @@ export const enum VIEWS {
 	WORKFLOW_EXECUTIONS = 'WorkflowExecutions',
 	TEST_DEFINITION = 'TestDefinition',
 	TEST_DEFINITION_EDIT = 'TestDefinitionEdit',
+	TEST_DEFINITION_RUNS = 'TestDefinitionRuns',
+	TEST_DEFINITION_RUNS_COMPARE = 'TestDefinitionRunsCompare',
+	TEST_DEFINITION_RUNS_DETAIL = 'TestDefinitionRunsDetail',
 	NEW_TEST_DEFINITION = 'NewTestDefinition',
 	USAGE = 'Usage',
 	LOG_STREAMING_SETTINGS = 'LogStreamingSettingsView',
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 5186b8af9f..ace6ef4c98 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -2787,24 +2787,58 @@
 	"testDefinition.edit.testSaved": "Test saved",
 	"testDefinition.edit.testSaveFailed": "Failed to save test",
 	"testDefinition.edit.description": "Description",
+	"testDefinition.edit.description.tooltip": "Add details about what this test evaluates and what success looks like",
 	"testDefinition.edit.tagName": "Tag name",
 	"testDefinition.edit.step.intro": "When running a test",
-	"testDefinition.edit.step.executions": "Fetch 5 past executions",
+	"testDefinition.edit.step.executions": "Fetch past executions | Fetch {count} past execution | Fetch {count} past executions",
+	"testDefinition.edit.step.executions.tooltip": "Select which tagged executions to use as test cases. Each execution will be replayed to compare performance",
 	"testDefinition.edit.step.nodes": "Mock nodes",
 	"testDefinition.edit.step.mockedNodes": "No nodes mocked | {count} node mocked | {count} nodes mocked",
+	"testDefinition.edit.step.nodes.tooltip": "Replace specific nodes with test data to isolate what you're testing",
 	"testDefinition.edit.step.reRunExecutions": "Re-run executions",
+	"testDefinition.edit.step.reRunExecutions.tooltip": "Each test case will be re-run using the current workflow version",
 	"testDefinition.edit.step.compareExecutions": "Compare each past and new execution",
+	"testDefinition.edit.step.compareExecutions.tooltip": "Select which workflow to use for running the comparison tests",
 	"testDefinition.edit.step.metrics": "Summarise metrics",
+	"testDefinition.edit.step.metrics.tooltip": "Define which output fields to track and compare between test runs",
 	"testDefinition.edit.step.collapse": "Collapse",
 	"testDefinition.edit.step.expand": "Expand",
+	"testDefinition.edit.selectNodes": "Select nodes",
+	"testDefinition.edit.runExecution": "Run execution",
+	"testDefinition.edit.pastRuns": "Past runs",
+	"testDefinition.edit.pastRuns.total": "No runs | {count} run | {count} runs",
+	"testDefinition.edit.nodesPinning.pinButtonTooltip": "Pin execution data of this node during test run",
 	"testDefinition.list.testDeleted": "Test deleted",
 	"testDefinition.list.tests": "Tests",
 	"testDefinition.list.createNew": "Create new test",
 	"testDefinition.list.actionDescription": "Replay past executions to check whether performance has changed",
 	"testDefinition.list.actionButton": "Create Test",
-	"testDefinition.list.testCases": "No test cases | {count} test case | {count} test cases",
-	"testDefinition.list.lastRun": "Ran {lastRun}",
+	"testDefinition.list.testRuns": "No test runs | {count} test run | {count} test runs",
+	"testDefinition.list.lastRun": "Ran",
+	"testDefinition.list.running": "Running",
 	"testDefinition.list.errorRate": "Error rate: {errorRate}",
+	"testDefinition.list.testStartError": "Failed to start test run",
+	"testDefinition.list.testStarted": "Test run started",
+	"testDefinition.list.loadError": "Failed to load tests",
+	"testDefinition.listRuns.status.new": "New",
+	"testDefinition.listRuns.status.running": "Running",
+	"testDefinition.listRuns.status.completed": "Completed",
+	"testDefinition.listRuns.status.error": "Error",
+	"testDefinition.listRuns.status.success": "Success",
+	"testDefinition.listRuns.metricsOverTime": "Metrics over time",
+	"testDefinition.listRuns.status": "Status",
+	"testDefinition.listRuns.runNumber": "Run #",
+	"testDefinition.listRuns.runDate": "Run date",
+	"testDefinition.listRuns.runStatus": "Run status",
+	"testDefinition.listRuns.noRuns": "No test runs",
+	"testDefinition.listRuns.noRuns.description": "Run a test to see the results here",
+	"testDefinition.listRuns.deleteRuns": "No runs to delete | Delete {count} run | Delete {count} runs",
+	"testDefinition.listRuns.noRuns.button": "Run Test",
+	"testDefinition.runDetail.ranAt": "Ran at",
+	"testDefinition.runDetail.testCase": "Test case",
+	"testDefinition.runDetail.testCase.id": "Test case ID",
+	"testDefinition.runDetail.testCase.status": "Test case status",
+	"testDefinition.runDetail.totalCases": "Total cases",
 	"testDefinition.runTest": "Run Test",
 	"testDefinition.notImplemented": "This feature is not implemented yet!",
 	"testDefinition.viewDetails": "View Details",
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 472114a1c9..960a3b6eef 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -18,6 +18,8 @@ import type { RouterMiddleware } from '@/types/router';
 import { initializeAuthenticatedFeatures, initializeCore } from '@/init';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { projectsRoutes } from '@/routes/projects.routes';
+import TestDefinitionRunsListView from './views/TestDefinition/TestDefinitionRunsListView.vue';
+import TestDefinitionRunDetailView from './views/TestDefinition/TestDefinitionRunDetailView.vue';
 
 const ChangePasswordView = async () => await import('./views/ChangePasswordView.vue');
 const ErrorView = async () => await import('./views/ErrorView.vue');
@@ -299,6 +301,32 @@ export const routes: RouteRecordRaw[] = [
 					middleware: ['authenticated'],
 				},
 			},
+			{
+				path: ':testId/runs',
+				name: VIEWS.TEST_DEFINITION_RUNS,
+				components: {
+					default: TestDefinitionRunsListView,
+					header: MainHeader,
+					sidebar: MainSidebar,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: ':testId/runs/:runId',
+				name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+				components: {
+					default: TestDefinitionRunDetailView,
+					header: MainHeader,
+					sidebar: MainSidebar,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
 		],
 	},
 	{
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts
index 54ee47bacc..14711d8198 100644
--- a/packages/editor-ui/src/stores/executions.store.ts
+++ b/packages/editor-ui/src/stores/executions.store.ts
@@ -172,6 +172,7 @@ export const useExecutionsStore = defineStore('executions', () => {
 
 			executionsCount.value = data.count;
 			executionsCountEstimated.value = data.estimated;
+			return data;
 		} catch (e) {
 			throw e;
 		} finally {
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
index 702701a495..47f6307d9b 100644
--- a/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
@@ -2,21 +2,49 @@ import { createPinia, setActivePinia } from 'pinia';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee'; // Adjust the import path as necessary
 import { useRootStore } from '@/stores/root.store';
 import { usePostHog } from '@/stores/posthog.store';
-import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+import type { TestDefinitionRecord, TestRunRecord } from '@/api/testDefinition.ee';
 
-const { createTestDefinition, deleteTestDefinition, getTestDefinitions, updateTestDefinition } =
-	vi.hoisted(() => ({
-		getTestDefinitions: vi.fn(),
-		createTestDefinition: vi.fn(),
-		updateTestDefinition: vi.fn(),
-		deleteTestDefinition: vi.fn(),
-	}));
+const {
+	createTestDefinition,
+	deleteTestDefinition,
+	getTestDefinitions,
+	updateTestDefinition,
+	getTestMetrics,
+	createTestMetric,
+	updateTestMetric,
+	deleteTestMetric,
+	getTestRuns,
+	getTestRun,
+	startTestRun,
+	deleteTestRun,
+} = vi.hoisted(() => ({
+	getTestDefinitions: vi.fn(),
+	createTestDefinition: vi.fn(),
+	updateTestDefinition: vi.fn(),
+	deleteTestDefinition: vi.fn(),
+	getTestMetrics: vi.fn(),
+	createTestMetric: vi.fn(),
+	updateTestMetric: vi.fn(),
+	deleteTestMetric: vi.fn(),
+	getTestRuns: vi.fn(),
+	getTestRun: vi.fn(),
+	startTestRun: vi.fn(),
+	deleteTestRun: vi.fn(),
+}));
 
 vi.mock('@/api/testDefinition.ee', () => ({
 	createTestDefinition,
 	deleteTestDefinition,
 	getTestDefinitions,
 	updateTestDefinition,
+	getTestMetrics,
+	createTestMetric,
+	updateTestMetric,
+	deleteTestMetric,
+	getTestRuns,
+	getTestRun,
+	startTestRun,
+	deleteTestRun,
 }));
 
 vi.mock('@/stores/root.store', () => ({
@@ -44,6 +72,23 @@ const TEST_DEF_NEW: TestDefinitionRecord = {
 	description: 'New Description',
 };
 
+const TEST_METRIC = {
+	id: 'metric1',
+	name: 'Test Metric',
+	testDefinitionId: '1',
+};
+
+const TEST_RUN: TestRunRecord = {
+	id: 'run1',
+	testDefinitionId: '1',
+	status: 'completed',
+	metrics: { metric1: 0.75 },
+	createdAt: '2024-01-01',
+	updatedAt: '2024-01-01',
+	runAt: '2024-01-01',
+	completedAt: '2024-01-01',
+};
+
 describe('testDefinition.store.ee', () => {
 	let store: ReturnType<typeof useTestDefinitionStore>;
 	let rootStoreMock: ReturnType<typeof useRootStore>;
@@ -64,6 +109,11 @@ describe('testDefinition.store.ee', () => {
 		createTestDefinition.mockResolvedValue(TEST_DEF_NEW);
 
 		deleteTestDefinition.mockResolvedValue({ success: true });
+
+		getTestRuns.mockResolvedValue([TEST_RUN]);
+		getTestRun.mockResolvedValue(TEST_RUN);
+		startTestRun.mockResolvedValue({ success: true });
+		deleteTestRun.mockResolvedValue({ success: true });
 	});
 
 	test('Initialization', () => {
@@ -72,193 +122,460 @@ describe('testDefinition.store.ee', () => {
 		expect(store.hasTestDefinitions).toBe(false);
 	});
 
-	test('Fetching Test Definitions', async () => {
-		expect(store.isLoading).toBe(false);
+	describe('Test Definitions', () => {
+		test('Fetching Test Definitions', async () => {
+			expect(store.isLoading).toBe(false);
 
-		const result = await store.fetchAll();
+			const result = await store.fetchAll({ workflowId: '123' });
 
-		expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext);
-		expect(store.testDefinitionsById).toEqual({
-			'1': TEST_DEF_A,
-			'2': TEST_DEF_B,
+			expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext, {
+				workflowId: '123',
+			});
+			expect(store.testDefinitionsById).toEqual({
+				'1': TEST_DEF_A,
+				'2': TEST_DEF_B,
+			});
+			expect(store.isLoading).toBe(false);
+			expect(result).toEqual({
+				count: 2,
+				testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+			});
 		});
-		expect(store.isLoading).toBe(false);
-		expect(result).toEqual({
-			count: 2,
-			testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+
+		test('Fetching Test Definitions with force flag', async () => {
+			expect(store.isLoading).toBe(false);
+
+			const result = await store.fetchAll({ force: true, workflowId: '123' });
+
+			expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext, {
+				workflowId: '123',
+			});
+			expect(store.testDefinitionsById).toEqual({
+				'1': TEST_DEF_A,
+				'2': TEST_DEF_B,
+			});
+			expect(store.isLoading).toBe(false);
+			expect(result).toEqual({
+				count: 2,
+				testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+			});
+		});
+
+		test('Fetching Test Definitions when already fetched', async () => {
+			store.fetchedAll = true;
+
+			const result = await store.fetchAll();
+
+			expect(getTestDefinitions).not.toHaveBeenCalled();
+			expect(store.testDefinitionsById).toEqual({});
+			expect(result).toEqual({
+				count: 0,
+				testDefinitions: [],
+			});
+		});
+
+		test('Upserting Test Definitions - New Definition', () => {
+			const newDefinition = TEST_DEF_NEW;
+
+			store.upsertTestDefinitions([newDefinition]);
+
+			expect(store.testDefinitionsById).toEqual({
+				'3': TEST_DEF_NEW,
+			});
+		});
+
+		test('Upserting Test Definitions - Existing Definition', () => {
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+			};
+
+			const updatedDefinition = {
+				id: '1',
+				name: 'Updated Test Definition A',
+				description: 'Updated Description A',
+				workflowId: '123',
+			};
+
+			store.upsertTestDefinitions([updatedDefinition]);
+
+			expect(store.testDefinitionsById).toEqual({
+				1: updatedDefinition,
+			});
+		});
+
+		test('Creating a Test Definition', async () => {
+			const params = {
+				name: 'New Test Definition',
+				workflowId: 'test-workflow-id',
+				evaluationWorkflowId: 'test-evaluation-workflow-id',
+				description: 'New Description',
+			};
+
+			const result = await store.create(params);
+
+			expect(createTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.testDefinitionsById).toEqual({
+				'3': TEST_DEF_NEW,
+			});
+			expect(result).toEqual(TEST_DEF_NEW);
+		});
+
+		test('Updating a Test Definition', async () => {
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+				'2': TEST_DEF_B,
+			};
+
+			const params = {
+				id: '1',
+				name: 'Updated Test Definition A',
+				description: 'Updated Description A',
+				workflowId: '123',
+			};
+			updateTestDefinition.mockResolvedValue(params);
+
+			const result = await store.update(params);
+
+			expect(updateTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1', {
+				name: 'Updated Test Definition A',
+				description: 'Updated Description A',
+				workflowId: '123',
+			});
+			expect(store.testDefinitionsById).toEqual({
+				'1': params,
+				'2': TEST_DEF_B,
+			});
+			expect(result).toEqual(params);
+		});
+
+		test('Deleting a Test Definition', () => {
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+				'2': TEST_DEF_B,
+			};
+
+			store.deleteTestDefinition('1');
+
+			expect(store.testDefinitionsById).toEqual({
+				'2': TEST_DEF_B,
+			});
+		});
+
+		test('Deleting a Test Definition by ID', async () => {
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+			};
+
+			const result = await store.deleteById('1');
+
+			expect(deleteTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(store.testDefinitionsById).toEqual({});
+			expect(result).toBe(true);
 		});
 	});
 
-	test('Fetching Test Definitions with force flag', async () => {
-		expect(store.isLoading).toBe(false);
+	describe('Metrics', () => {
+		test('Fetching Metrics for a Test Definition', async () => {
+			getTestMetrics.mockResolvedValue([TEST_METRIC]);
 
-		const result = await store.fetchAll({ force: true });
+			const metrics = await store.fetchMetrics('1');
 
-		expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext);
-		expect(store.testDefinitionsById).toEqual({
-			'1': TEST_DEF_A,
-			'2': TEST_DEF_B,
+			expect(getTestMetrics).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(store.metricsById).toEqual({
+				metric1: TEST_METRIC,
+			});
+			expect(metrics).toEqual([TEST_METRIC]);
 		});
-		expect(store.isLoading).toBe(false);
-		expect(result).toEqual({
-			count: 2,
-			testDefinitions: [TEST_DEF_A, TEST_DEF_B],
+
+		test('Creating a Metric', async () => {
+			createTestMetric.mockResolvedValue(TEST_METRIC);
+
+			const params = {
+				name: 'Test Metric',
+				testDefinitionId: '1',
+			};
+
+			const result = await store.createMetric(params);
+
+			expect(createTestMetric).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.metricsById).toEqual({
+				metric1: TEST_METRIC,
+			});
+			expect(result).toEqual(TEST_METRIC);
+		});
+
+		test('Updating a Metric', async () => {
+			const updatedMetric = { ...TEST_METRIC, name: 'Updated Metric' };
+			updateTestMetric.mockResolvedValue(updatedMetric);
+
+			const result = await store.updateMetric(updatedMetric);
+
+			expect(updateTestMetric).toHaveBeenCalledWith(rootStoreMock.restApiContext, updatedMetric);
+			expect(store.metricsById).toEqual({
+				metric1: updatedMetric,
+			});
+			expect(result).toEqual(updatedMetric);
+		});
+
+		test('Deleting a Metric', async () => {
+			store.metricsById = {
+				metric1: TEST_METRIC,
+			};
+
+			const params = { id: 'metric1', testDefinitionId: '1' };
+			deleteTestMetric.mockResolvedValue(undefined);
+
+			await store.deleteMetric(params);
+
+			expect(deleteTestMetric).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.metricsById).toEqual({});
+		});
+
+		test('Getting Metrics by Test ID', () => {
+			const metric1 = { ...TEST_METRIC, id: 'metric1', testDefinitionId: '1' };
+			const metric2 = { ...TEST_METRIC, id: 'metric2', testDefinitionId: '1' };
+			const metric3 = { ...TEST_METRIC, id: 'metric3', testDefinitionId: '2' };
+
+			store.metricsById = {
+				metric1,
+				metric2,
+				metric3,
+			};
+
+			const metricsForTest1 = store.metricsByTestId['1'];
+			expect(metricsForTest1).toEqual([metric1, metric2]);
+
+			const metricsForTest2 = store.metricsByTestId['2'];
+			expect(metricsForTest2).toEqual([metric3]);
 		});
 	});
 
-	test('Fetching Test Definitions when already fetched', async () => {
-		store.fetchedAll = true;
+	describe('Computed Properties', () => {
+		test('hasTestDefinitions', () => {
+			store.testDefinitionsById = {};
 
-		const result = await store.fetchAll();
+			expect(store.hasTestDefinitions).toBe(false);
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+			};
 
-		expect(getTestDefinitions).not.toHaveBeenCalled();
-		expect(store.testDefinitionsById).toEqual({});
-		expect(result).toEqual({
-			count: 0,
-			testDefinitions: [],
+			expect(store.hasTestDefinitions).toBe(true);
+		});
+
+		test('isFeatureEnabled', () => {
+			posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(false);
+
+			expect(store.isFeatureEnabled).toBe(false);
+			posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(true);
+
+			expect(store.isFeatureEnabled).toBe(true);
+		});
+
+		test('allTestDefinitionsByWorkflowId', () => {
+			store.testDefinitionsById = {
+				'1': { ...TEST_DEF_A, workflowId: 'workflow1' },
+				'2': { ...TEST_DEF_B, workflowId: 'workflow1' },
+				'3': { ...TEST_DEF_NEW, workflowId: 'workflow2' },
+			};
+
+			expect(store.allTestDefinitionsByWorkflowId).toEqual({
+				workflow1: [
+					{ ...TEST_DEF_A, workflowId: 'workflow1' },
+					{ ...TEST_DEF_B, workflowId: 'workflow1' },
+				],
+				workflow2: [{ ...TEST_DEF_NEW, workflowId: 'workflow2' }],
+			});
+		});
+
+		test('lastRunByTestId', () => {
+			const olderRun = {
+				...TEST_RUN,
+				id: 'run2',
+				testDefinitionId: '1',
+				updatedAt: '2023-12-31',
+			};
+
+			const newerRun = {
+				...TEST_RUN,
+				id: 'run3',
+				testDefinitionId: '2',
+				updatedAt: '2024-01-02',
+			};
+
+			store.testRunsById = {
+				run1: { ...TEST_RUN, testDefinitionId: '1' },
+				run2: olderRun,
+				run3: newerRun,
+			};
+
+			expect(store.lastRunByTestId).toEqual({
+				'1': TEST_RUN,
+				'2': newerRun,
+			});
+		});
+
+		test('lastRunByTestId with no runs', () => {
+			store.testRunsById = {};
+			expect(store.lastRunByTestId).toEqual({});
 		});
 	});
 
-	test('Upserting Test Definitions - New Definition', () => {
-		const newDefinition = TEST_DEF_NEW;
+	describe('Error Handling', () => {
+		test('create', async () => {
+			createTestDefinition.mockRejectedValue(new Error('Create failed'));
 
-		store.upsertTestDefinitions([newDefinition]);
+			await expect(
+				store.create({ name: 'New Test Definition', workflowId: 'test-workflow-id' }),
+			).rejects.toThrow('Create failed');
+		});
 
-		expect(store.testDefinitionsById).toEqual({
-			'3': TEST_DEF_NEW,
+		test('update', async () => {
+			updateTestDefinition.mockRejectedValue(new Error('Update failed'));
+
+			await expect(store.update({ id: '1', name: 'Updated Test Definition A' })).rejects.toThrow(
+				'Update failed',
+			);
+		});
+
+		test('deleteById', async () => {
+			deleteTestDefinition.mockResolvedValue({ success: false });
+
+			const result = await store.deleteById('1');
+
+			expect(result).toBe(false);
 		});
 	});
 
-	test('Upserting Test Definitions - Existing Definition', () => {
-		store.testDefinitionsById = {
-			'1': TEST_DEF_A,
-		};
+	describe('Test Runs', () => {
+		test('Fetching Test Runs', async () => {
+			const result = await store.fetchTestRuns('1');
 
-		const updatedDefinition = {
-			id: '1',
-			name: 'Updated Test Definition A',
-			description: 'Updated Description A',
-			workflowId: '123',
-		};
+			expect(getTestRuns).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(store.testRunsById).toEqual({
+				run1: TEST_RUN,
+			});
+			expect(result).toEqual([TEST_RUN]);
+		});
 
-		store.upsertTestDefinitions([updatedDefinition]);
+		test('Getting specific Test Run', async () => {
+			const params = { testDefinitionId: '1', runId: 'run1' };
+			const result = await store.getTestRun(params);
 
-		expect(store.testDefinitionsById).toEqual({
-			1: updatedDefinition,
+			expect(getTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.testRunsById).toEqual({
+				run1: TEST_RUN,
+			});
+			expect(result).toEqual(TEST_RUN);
+		});
+
+		test('Starting Test Run', async () => {
+			const result = await store.startTestRun('1');
+
+			expect(startTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(result).toEqual({ success: true });
+		});
+
+		test('Deleting Test Run', async () => {
+			store.testRunsById = { run1: TEST_RUN };
+			const params = { testDefinitionId: '1', runId: 'run1' };
+
+			const result = await store.deleteTestRun(params);
+
+			expect(deleteTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.testRunsById).toEqual({});
+			expect(result).toEqual({ success: true });
+		});
+
+		test('Getting Test Runs by Test ID', () => {
+			store.testRunsById = {
+				run1: TEST_RUN,
+				run2: { ...TEST_RUN, id: 'run2', testDefinitionId: '2' },
+			};
+
+			const runs = store.testRunsByTestId['1'];
+
+			expect(runs).toEqual([TEST_RUN]);
 		});
 	});
 
-	test('Deleting Test Definitions', () => {
-		store.testDefinitionsById = {
-			'1': TEST_DEF_A,
-			'2': TEST_DEF_B,
-		};
-
-		store.deleteTestDefinition('1');
-
-		expect(store.testDefinitionsById).toEqual({
-			'2': TEST_DEF_B,
+	describe('Polling Mechanism', () => {
+		beforeEach(() => {
+			vi.useFakeTimers();
 		});
-	});
 
-	test('Creating a Test Definition', async () => {
-		const params = {
-			name: 'New Test Definition',
-			workflowId: 'test-workflow-id',
-			evaluationWorkflowId: 'test-evaluation-workflow-id',
-			description: 'New Description',
-		};
-
-		const result = await store.create(params);
-
-		expect(createTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
-		expect(store.testDefinitionsById).toEqual({
-			'3': TEST_DEF_NEW,
+		afterEach(() => {
+			vi.useRealTimers();
 		});
-		expect(result).toEqual(TEST_DEF_NEW);
-	});
 
-	test('Updating a Test Definition', async () => {
-		store.testDefinitionsById = {
-			'1': TEST_DEF_A,
-			'2': TEST_DEF_B,
-		};
+		test('should start polling for running test runs', async () => {
+			const runningTestRun = {
+				...TEST_RUN,
+				status: 'running',
+			};
 
-		const params = {
-			id: '1',
-			name: 'Updated Test Definition A',
-			description: 'Updated Description A',
-			workflowId: '123',
-		};
-		updateTestDefinition.mockResolvedValue(params);
+			getTestRuns.mockResolvedValueOnce([runningTestRun]);
 
-		const result = await store.update(params);
+			// First call returns running status
+			getTestRun.mockResolvedValueOnce({
+				...runningTestRun,
+				status: 'running',
+			});
 
-		expect(updateTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1', {
-			name: 'Updated Test Definition A',
-			description: 'Updated Description A',
-			workflowId: '123',
+			// Second call returns completed status
+			getTestRun.mockResolvedValueOnce({
+				...runningTestRun,
+				status: 'completed',
+			});
+
+			await store.fetchTestRuns('1');
+
+			expect(store.testRunsById).toEqual({
+				run1: runningTestRun,
+			});
+
+			// Advance timer to trigger the first poll
+			await vi.advanceTimersByTimeAsync(1000);
+
+			// Verify first poll happened
+			expect(getTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, {
+				testDefinitionId: '1',
+				runId: 'run1',
+			});
+
+			// Advance timer again
+			await vi.advanceTimersByTimeAsync(1000);
+
+			// Verify polling stopped after status changed to completed
+			expect(getTestRun).toHaveBeenCalledTimes(2);
 		});
-		expect(store.testDefinitionsById).toEqual({
-			'1': params,
-			'2': TEST_DEF_B,
+
+		test('should cleanup polling timeouts', async () => {
+			const runningTestRun = {
+				...TEST_RUN,
+				status: 'running',
+			};
+
+			getTestRuns.mockResolvedValueOnce([runningTestRun]);
+			getTestRun.mockResolvedValue({
+				...runningTestRun,
+				status: 'running',
+			});
+
+			await store.fetchTestRuns('1');
+
+			// Wait for the first poll to complete
+			await vi.runOnlyPendingTimersAsync();
+
+			// Clear mock calls from initial setup
+			getTestRun.mockClear();
+
+			store.cleanupPolling();
+
+			// Advance timer
+			await vi.advanceTimersByTimeAsync(1000);
+
+			// Verify no more polling happened after cleanup
+			expect(getTestRun).not.toHaveBeenCalled();
 		});
-		expect(result).toEqual(params);
-	});
-
-	test('Deleting a Test Definition by ID', async () => {
-		store.testDefinitionsById = {
-			'1': TEST_DEF_A,
-		};
-
-		const result = await store.deleteById('1');
-
-		expect(deleteTestDefinition).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
-		expect(store.testDefinitionsById).toEqual({});
-		expect(result).toBe(true);
-	});
-
-	test('Computed Properties - hasTestDefinitions', () => {
-		store.testDefinitionsById = {};
-
-		expect(store.hasTestDefinitions).toBe(false);
-		store.testDefinitionsById = {
-			'1': TEST_DEF_A,
-		};
-
-		expect(store.hasTestDefinitions).toBe(true);
-	});
-
-	test('Computed Properties - isFeatureEnabled', () => {
-		posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(false);
-
-		expect(store.isFeatureEnabled).toBe(false);
-		posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(true);
-
-		expect(store.isFeatureEnabled).toBe(true);
-	});
-
-	test('Error Handling - create', async () => {
-		createTestDefinition.mockRejectedValue(new Error('Create failed'));
-
-		await expect(
-			store.create({ name: 'New Test Definition', workflowId: 'test-workflow-id' }),
-		).rejects.toThrow('Create failed');
-	});
-
-	test('Error Handling - update', async () => {
-		updateTestDefinition.mockRejectedValue(new Error('Update failed'));
-
-		await expect(store.update({ id: '1', name: 'Updated Test Definition A' })).rejects.toThrow(
-			'Update failed',
-		);
-	});
-
-	test('Error Handling - deleteById', async () => {
-		deleteTestDefinition.mockResolvedValue({ success: false });
-
-		const result = await store.deleteById('1');
-
-		expect(result).toBe(false);
 	});
 });
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.ts b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
index 6a9e3fe363..888475ac75 100644
--- a/packages/editor-ui/src/stores/testDefinition.store.ee.ts
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 import { useRootStore } from './root.store';
 import * as testDefinitionsApi from '@/api/testDefinition.ee';
-import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+import type { TestDefinitionRecord, TestRunRecord } from '@/api/testDefinition.ee';
 import { usePostHog } from './posthog.store';
 import { STORES, WORKFLOW_EVALUATION_EXPERIMENT } from '@/constants';
 
@@ -13,6 +13,9 @@ export const useTestDefinitionStore = defineStore(
 		const testDefinitionsById = ref<Record<string, TestDefinitionRecord>>({});
 		const loading = ref(false);
 		const fetchedAll = ref(false);
+		const metricsById = ref<Record<string, testDefinitionsApi.TestMetricRecord>>({});
+		const testRunsById = ref<Record<string, TestRunRecord>>({});
+		const pollingTimeouts = ref<Record<string, NodeJS.Timeout>>({});
 
 		// Store instances
 		const posthogStore = usePostHog();
@@ -25,6 +28,19 @@ export const useTestDefinitionStore = defineStore(
 			);
 		});
 
+		const allTestDefinitionsByWorkflowId = computed(() => {
+			return Object.values(testDefinitionsById.value).reduce(
+				(acc: Record<string, TestDefinitionRecord[]>, test) => {
+					if (!acc[test.workflowId]) {
+						acc[test.workflowId] = [];
+					}
+					acc[test.workflowId].push(test);
+					return acc;
+				},
+				{},
+			);
+		});
+
 		// Enable with `window.featureFlags.override('025_workflow_evaluation', true)`
 		const isFeatureEnabled = computed(() =>
 			posthogStore.isFeatureEnabled(WORKFLOW_EVALUATION_EXPERIMENT),
@@ -34,6 +50,56 @@ export const useTestDefinitionStore = defineStore(
 
 		const hasTestDefinitions = computed(() => Object.keys(testDefinitionsById.value).length > 0);
 
+		const metricsByTestId = computed(() => {
+			return Object.values(metricsById.value).reduce(
+				(acc: Record<string, testDefinitionsApi.TestMetricRecord[]>, metric) => {
+					if (!acc[metric.testDefinitionId]) {
+						acc[metric.testDefinitionId] = [];
+					}
+					acc[metric.testDefinitionId].push(metric);
+					return acc;
+				},
+				{},
+			);
+		});
+
+		const testRunsByTestId = computed(() => {
+			return Object.values(testRunsById.value).reduce(
+				(acc: Record<string, TestRunRecord[]>, run) => {
+					if (!acc[run.testDefinitionId]) {
+						acc[run.testDefinitionId] = [];
+					}
+					acc[run.testDefinitionId].push(run);
+					return acc;
+				},
+				{},
+			);
+		});
+
+		const lastRunByTestId = computed(() => {
+			const grouped = Object.values(testRunsById.value).reduce(
+				(acc: Record<string, TestRunRecord[]>, run) => {
+					if (!acc[run.testDefinitionId]) {
+						acc[run.testDefinitionId] = [];
+					}
+					acc[run.testDefinitionId].push(run);
+					return acc;
+				},
+				{},
+			);
+
+			return Object.entries(grouped).reduce(
+				(acc: Record<string, TestRunRecord | null>, [testId, runs]) => {
+					acc[testId] =
+						runs.sort(
+							(a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
+						)[0] || null;
+					return acc;
+				},
+				{},
+			);
+		});
+
 		// Methods
 		const setAllTestDefinitions = (definitions: TestDefinitionRecord[]) => {
 			testDefinitionsById.value = definitions.reduce(
@@ -69,13 +135,32 @@ export const useTestDefinitionStore = defineStore(
 			testDefinitionsById.value = rest;
 		};
 
+		const fetchRunsForAllTests = async () => {
+			const testDefinitions = Object.values(testDefinitionsById.value);
+			try {
+				await Promise.all(testDefinitions.map(async (testDef) => await fetchTestRuns(testDef.id)));
+			} catch (error) {
+				console.error('Error fetching test runs:', error);
+			}
+		};
+
+		const fetchTestDefinition = async (id: string) => {
+			const testDefinition = await testDefinitionsApi.getTestDefinition(
+				rootStore.restApiContext,
+				id,
+			);
+			testDefinitionsById.value[testDefinition.id] = testDefinition;
+
+			return testDefinition;
+		};
+
 		/**
 		 * Fetches all test definitions from the API.
 		 * @param {boolean} force - If true, fetches the definitions from the API even if they were already fetched before.
 		 */
-		const fetchAll = async (params?: { force?: boolean }) => {
-			const { force = false } = params ?? {};
-			if (!force && fetchedAll.value) {
+		const fetchAll = async (params?: { force?: boolean; workflowId?: string }) => {
+			const { force = false, workflowId } = params ?? {};
+			if (!force && fetchedAll.value && !workflowId) {
 				const testDefinitions = Object.values(testDefinitionsById.value);
 				return {
 					count: testDefinitions.length,
@@ -87,10 +172,13 @@ export const useTestDefinitionStore = defineStore(
 			try {
 				const retrievedDefinitions = await testDefinitionsApi.getTestDefinitions(
 					rootStore.restApiContext,
+					{ workflowId },
 				);
 
 				setAllTestDefinitions(retrievedDefinitions.testDefinitions);
 				fetchedAll.value = true;
+
+				await fetchRunsForAllTests();
 				return retrievedDefinitions;
 			} finally {
 				loading.value = false;
@@ -147,24 +235,142 @@ export const useTestDefinitionStore = defineStore(
 			return result.success;
 		};
 
+		const fetchMetrics = async (testId: string) => {
+			loading.value = true;
+			try {
+				const metrics = await testDefinitionsApi.getTestMetrics(rootStore.restApiContext, testId);
+				metrics.forEach((metric) => {
+					metricsById.value[metric.id] = metric;
+				});
+				return metrics;
+			} finally {
+				loading.value = false;
+			}
+		};
+
+		const createMetric = async (params: {
+			name: string;
+			testDefinitionId: string;
+		}): Promise<testDefinitionsApi.TestMetricRecord> => {
+			const metric = await testDefinitionsApi.createTestMetric(rootStore.restApiContext, params);
+			metricsById.value[metric.id] = metric;
+			return metric;
+		};
+
+		const updateMetric = async (
+			params: testDefinitionsApi.TestMetricRecord,
+		): Promise<testDefinitionsApi.TestMetricRecord> => {
+			const metric = await testDefinitionsApi.updateTestMetric(rootStore.restApiContext, params);
+			metricsById.value[metric.id] = metric;
+			return metric;
+		};
+
+		const deleteMetric = async (
+			params: testDefinitionsApi.DeleteTestMetricParams,
+		): Promise<void> => {
+			await testDefinitionsApi.deleteTestMetric(rootStore.restApiContext, params);
+			const { [params.id]: deleted, ...rest } = metricsById.value;
+			metricsById.value = rest;
+		};
+
+		// Test Runs Methods
+		const fetchTestRuns = async (testDefinitionId: string) => {
+			loading.value = true;
+			try {
+				const runs = await testDefinitionsApi.getTestRuns(
+					rootStore.restApiContext,
+					testDefinitionId,
+				);
+				runs.forEach((run) => {
+					testRunsById.value[run.id] = run;
+					if (['running', 'new'].includes(run.status)) {
+						startPollingTestRun(testDefinitionId, run.id);
+					}
+				});
+				return runs;
+			} finally {
+				loading.value = false;
+			}
+		};
+
+		const getTestRun = async (params: { testDefinitionId: string; runId: string }) => {
+			const run = await testDefinitionsApi.getTestRun(rootStore.restApiContext, params);
+			testRunsById.value[run.id] = run;
+			return run;
+		};
+
+		const startTestRun = async (testDefinitionId: string) => {
+			const result = await testDefinitionsApi.startTestRun(
+				rootStore.restApiContext,
+				testDefinitionId,
+			);
+			return result;
+		};
+
+		const deleteTestRun = async (params: { testDefinitionId: string; runId: string }) => {
+			const result = await testDefinitionsApi.deleteTestRun(rootStore.restApiContext, params);
+			if (result.success) {
+				const { [params.runId]: deleted, ...rest } = testRunsById.value;
+				testRunsById.value = rest;
+			}
+			return result;
+		};
+
+		// TODO: This is a temporary solution to poll for test run status.
+		// We should use a more efficient polling mechanism in the future.
+		const startPollingTestRun = (testDefinitionId: string, runId: string) => {
+			const poll = async () => {
+				const run = await getTestRun({ testDefinitionId, runId });
+				if (['running', 'new'].includes(run.status)) {
+					pollingTimeouts.value[runId] = setTimeout(poll, 1000);
+				} else {
+					delete pollingTimeouts.value[runId];
+				}
+			};
+			void poll();
+		};
+
+		const cleanupPolling = () => {
+			Object.values(pollingTimeouts.value).forEach((timeout) => {
+				clearTimeout(timeout);
+			});
+			pollingTimeouts.value = {};
+		};
+
 		return {
 			// State
 			fetchedAll,
 			testDefinitionsById,
+			testRunsById,
 
 			// Computed
 			allTestDefinitions,
+			allTestDefinitionsByWorkflowId,
 			isLoading,
 			hasTestDefinitions,
 			isFeatureEnabled,
+			metricsById,
+			metricsByTestId,
+			testRunsByTestId,
+			lastRunByTestId,
 
 			// Methods
+			fetchTestDefinition,
 			fetchAll,
 			create,
 			update,
 			deleteById,
 			upsertTestDefinitions,
 			deleteTestDefinition,
+			fetchMetrics,
+			createMetric,
+			updateMetric,
+			deleteMetric,
+			fetchTestRuns,
+			getTestRun,
+			startTestRun,
+			deleteTestRun,
+			cleanupPolling,
 		};
 	},
 	{},
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 9e3c667388..dfab03f8f3 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -16,6 +16,7 @@ import {
 	LOG_STREAM_MODAL_KEY,
 	MFA_SETUP_MODAL_KEY,
 	PERSONALIZATION_MODAL_KEY,
+	NODE_PINNING_MODAL_KEY,
 	STORES,
 	TAGS_MANAGER_MODAL_KEY,
 	ANNOTATION_TAGS_MANAGER_MODAL_KEY,
@@ -45,6 +46,7 @@ import type {
 	NotificationOptions,
 	ModalState,
 	ModalKey,
+	AppliedThemeOption,
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import { useRootStore } from '@/stores/root.store';
@@ -98,6 +100,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				CREDENTIAL_SELECT_MODAL_KEY,
 				DUPLICATE_MODAL_KEY,
 				PERSONALIZATION_MODAL_KEY,
+				NODE_PINNING_MODAL_KEY,
 				INVITE_USER_MODAL_KEY,
 				TAGS_MANAGER_MODAL_KEY,
 				ANNOTATION_TAGS_MANAGER_MODAL_KEY,
@@ -184,8 +187,15 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	const rootStore = useRootStore();
 	const userStore = useUsersStore();
 
+	// Keep track of the preferred theme and update it when the system preference changes
+	const preferredTheme = getPreferredTheme();
+	const preferredSystemTheme = ref<AppliedThemeOption>(preferredTheme.theme);
+	preferredTheme.mediaQuery?.addEventListener('change', () => {
+		preferredSystemTheme.value = getPreferredTheme().theme;
+	});
+
 	const appliedTheme = computed(() => {
-		return theme.value === 'system' ? getPreferredTheme() : theme.value;
+		return theme.value === 'system' ? preferredSystemTheme.value : theme.value;
 	});
 
 	const contextBasedTranslationKeys = computed(() => {
diff --git a/packages/editor-ui/src/stores/ui.utils.ts b/packages/editor-ui/src/stores/ui.utils.ts
index 9245bc549a..19e147f494 100644
--- a/packages/editor-ui/src/stores/ui.utils.ts
+++ b/packages/editor-ui/src/stores/ui.utils.ts
@@ -31,9 +31,11 @@ export function updateTheme(theme: ThemeOption) {
 	}
 }
 
-export function getPreferredTheme(): AppliedThemeOption {
-	const isDarkMode =
-		!!window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)')?.matches;
+export function getPreferredTheme(): { theme: AppliedThemeOption; mediaQuery: MediaQueryList } {
+	const isDarkModeQuery = !!window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)');
 
-	return isDarkMode ? 'dark' : 'light';
+	return {
+		theme: isDarkModeQuery?.matches ? 'dark' : 'light',
+		mediaQuery: isDarkModeQuery,
+	};
 }
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index 0dcbee1dd0..3034232379 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -144,6 +144,7 @@ export interface CanvasInjectionData {
 export type CanvasNodeEventBusEvents = {
 	'update:sticky:color': never;
 	'update:node:active': never;
+	'update:node:class': { className: string; add?: boolean };
 };
 
 export type CanvasEventBusEvents = {
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
index e17c164472..2177ece229 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { computed, onMounted, watch } from 'vue';
+import { computed, onMounted, watch, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { VIEWS } from '@/constants';
+import { NODE_PINNING_MODAL_KEY, VIEWS } from '@/constants';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { useAnnotationTagsStore } from '@/stores/tags.store';
@@ -14,6 +14,12 @@ import EvaluationStep from '@/components/TestDefinition/EditDefinition/Evaluatio
 import TagsInput from '@/components/TestDefinition/EditDefinition/TagsInput.vue';
 import WorkflowSelector from '@/components/TestDefinition/EditDefinition/WorkflowSelector.vue';
 import MetricsInput from '@/components/TestDefinition/EditDefinition/MetricsInput.vue';
+import type { TestMetricRecord, TestRunRecord } from '@/api/testDefinition.ee';
+import Modal from '@/components/Modal.vue';
+import type { ModalState } from '@/Interface';
+import { useUIStore } from '@/stores/ui.store';
+import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 
 const props = defineProps<{
 	testId?: string;
@@ -24,31 +30,50 @@ const route = useRoute();
 const locale = useI18n();
 const { debounce } = useDebounce();
 const toast = useToast();
-const { isLoading, allTags, tagsById, fetchAll } = useAnnotationTagsStore();
-
-const testId = computed(() => props.testId ?? (route.params.testId as string));
-const currentWorkflowId = computed(() => route.params.name as string);
-const buttonLabel = computed(() =>
-	testId.value
-		? locale.baseText('testDefinition.edit.updateTest')
-		: locale.baseText('testDefinition.edit.saveTest'),
-);
-
+const testDefinitionStore = useTestDefinitionStore();
+const tagsStore = useAnnotationTagsStore();
+const uiStore = useUIStore();
 const {
 	state,
 	fieldsIssues,
-	isSaving,
+	cancelEditing,
 	loadTestData,
 	createTest,
 	updateTest,
 	startEditing,
 	saveChanges,
-	cancelEditing,
 	handleKeydown,
+	deleteMetric,
+	updateMetrics,
 } = useTestDefinitionForm();
 
+const isLoading = computed(() => tagsStore.isLoading);
+const allTags = computed(() => tagsStore.allTags);
+const tagsById = computed(() => tagsStore.tagsById);
+const testId = computed(() => props.testId ?? (route.params.testId as string));
+const currentWorkflowId = computed(() => route.params.name as string);
+
+const tagUsageCount = computed(
+	() => tagsStore.tagsById[state.value.tags.value[0]]?.usageCount ?? 0,
+);
+
+const nodePinningModal = ref<ModalState | null>(null);
+const modalContentWidth = ref(0);
+
 onMounted(async () => {
-	await fetchAll();
+	if (!testDefinitionStore.isFeatureEnabled) {
+		toast.showMessage({
+			title: locale.baseText('testDefinition.notImplemented'),
+			type: 'warning',
+		});
+
+		void router.push({
+			name: VIEWS.WORKFLOW,
+			params: { name: router.currentRoute.value.params.name },
+		});
+		return; // Add early return to prevent loading if feature is disabled
+	}
+	void tagsStore.fetchAll({ withUsageCount: true });
 	if (testId.value) {
 		await loadTestData(testId.value);
 	} else {
@@ -64,16 +89,12 @@ async function onSaveTest() {
 		} else {
 			savedTest = await createTest(currentWorkflowId.value);
 		}
-		if (savedTest && route.name === VIEWS.TEST_DEFINITION_EDIT) {
+		if (savedTest && route.name === VIEWS.NEW_TEST_DEFINITION) {
 			await router.replace({
 				name: VIEWS.TEST_DEFINITION_EDIT,
 				params: { testId: savedTest.id },
 			});
 		}
-		toast.showMessage({
-			title: locale.baseText('testDefinition.edit.testSaved'),
-			type: 'success',
-		});
 	} catch (e: unknown) {
 		toast.showError(e, locale.baseText('testDefinition.edit.testSaveFailed'));
 	}
@@ -83,12 +104,69 @@ function hasIssues(key: string) {
 	return fieldsIssues.value.some((issue) => issue.field === key);
 }
 
-watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: true });
+async function onDeleteMetric(deletedMetric: Partial<TestMetricRecord>) {
+	if (deletedMetric.id) {
+		await deleteMetric(deletedMetric.id, testId.value);
+	}
+}
+
+async function handleCreateTag(tagName: string) {
+	try {
+		const newTag = await tagsStore.create(tagName);
+		return newTag;
+	} catch (error) {
+		toast.showError(error, 'Error', error.message);
+		throw error;
+	}
+}
+
+async function openPinningModal() {
+	uiStore.openModal(NODE_PINNING_MODAL_KEY);
+}
+
+async function runTest() {
+	await testDefinitionStore.startTestRun(testId.value);
+	await testDefinitionStore.fetchTestRuns(testId.value);
+}
+
+const runs = computed(() =>
+	Object.values(testDefinitionStore.testRunsById ?? {}).filter(
+		(run) => run.testDefinitionId === testId.value,
+	),
+);
+
+async function onDeleteRuns(runs: TestRunRecord[]) {
+	await Promise.all(
+		runs.map(async (run) => {
+			await testDefinitionStore.deleteTestRun({ testDefinitionId: testId.value, runId: run.id });
+		}),
+	);
+}
+
+// Debounced watchers for auto-saving
+watch(
+	() => state.value.metrics,
+	debounce(async () => await updateMetrics(testId.value), { debounceTime: 400 }),
+	{ deep: true },
+);
+
+watch(
+	() => [
+		state.value.description,
+		state.value.name,
+		state.value.tags,
+		state.value.evaluationWorkflow,
+		state.value.mockedNodes,
+	],
+	debounce(onSaveTest, { debounceTime: 400 }),
+	{ deep: true },
+);
 </script>
 
 <template>
 	<div :class="$style.container">
-		<div :class="$style.content">
+		<div :class="$style.formContent">
+			<!-- Name -->
 			<EvaluationHeader
 				v-model="state.name"
 				:class="{ 'has-issues': hasIssues('name') }"
@@ -96,24 +174,33 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 				:save-changes="saveChanges"
 				:handle-keydown="handleKeydown"
 			/>
-
-			<EvaluationStep
-				:class="$style.step"
-				:title="locale.baseText('testDefinition.edit.description')"
-				:expanded="false"
-			>
-				<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
-				<template #cardContent>
-					<DescriptionInput v-model="state.description" />
-				</template>
-			</EvaluationStep>
-
-			<div :class="$style.panelIntro">{{ locale.baseText('testDefinition.edit.step.intro') }}</div>
-			<BlockArrow :class="$style.introArrow" />
 			<div :class="$style.panelBlock">
+				<!-- Description -->
 				<EvaluationStep
 					:class="$style.step"
-					:title="locale.baseText('testDefinition.edit.step.executions')"
+					:title="locale.baseText('testDefinition.edit.description')"
+					:expanded="false"
+					:tooltip="locale.baseText('testDefinition.edit.description.tooltip')"
+				>
+					<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
+					<template #cardContent>
+						<DescriptionInput v-model="state.description" />
+					</template>
+				</EvaluationStep>
+
+				<div :class="$style.panelIntro">
+					{{ locale.baseText('testDefinition.edit.step.intro') }}
+				</div>
+				<BlockArrow :class="$style.introArrow" />
+				<!-- Select Executions -->
+				<EvaluationStep
+					:class="$style.step"
+					:title="
+						locale.baseText('testDefinition.edit.step.executions', {
+							adjustToNumber: tagUsageCount,
+						})
+					"
+					:tooltip="locale.baseText('testDefinition.edit.step.executions.tooltip')"
 				>
 					<template #icon><font-awesome-icon icon="history" size="lg" /></template>
 					<template #cardContent>
@@ -126,6 +213,7 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 							:start-editing="startEditing"
 							:save-changes="saveChanges"
 							:cancel-editing="cancelEditing"
+							:create-tag="handleCreateTag"
 						/>
 					</template>
 				</EvaluationStep>
@@ -133,29 +221,46 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 					<BlockArrow />
 					<BlockArrow />
 				</div>
+
+				<!-- Mocked Nodes -->
 				<EvaluationStep
 					:class="$style.step"
-					:title="locale.baseText('testDefinition.edit.step.nodes')"
+					:title="
+						locale.baseText('testDefinition.edit.step.mockedNodes', {
+							adjustToNumber: state.mockedNodes?.length ?? 0,
+						})
+					"
 					:small="true"
-					:expanded="false"
+					:expanded="true"
+					:tooltip="locale.baseText('testDefinition.edit.step.nodes.tooltip')"
 				>
 					<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
-					<template #cardContent>{{
-						locale.baseText('testDefinition.edit.step.mockedNodes', { adjustToNumber: 0 })
-					}}</template>
+					<template #cardContent>
+						<n8n-button
+							size="small"
+							data-test-id="select-nodes-button"
+							:label="locale.baseText('testDefinition.edit.selectNodes')"
+							type="tertiary"
+							@click="openPinningModal"
+						/>
+					</template>
 				</EvaluationStep>
 
+				<!-- Re-run Executions -->
 				<EvaluationStep
 					:class="$style.step"
 					:title="locale.baseText('testDefinition.edit.step.reRunExecutions')"
 					:small="true"
+					:tooltip="locale.baseText('testDefinition.edit.step.reRunExecutions.tooltip')"
 				>
 					<template #icon><font-awesome-icon icon="redo" size="lg" /></template>
 				</EvaluationStep>
 
+				<!-- Compare Executions -->
 				<EvaluationStep
 					:class="$style.step"
 					:title="locale.baseText('testDefinition.edit.step.compareExecutions')"
+					:tooltip="locale.baseText('testDefinition.edit.step.compareExecutions.tooltip')"
 				>
 					<template #icon><font-awesome-icon icon="equals" size="lg" /></template>
 					<template #cardContent>
@@ -166,27 +271,69 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 					</template>
 				</EvaluationStep>
 
+				<!-- Metrics -->
 				<EvaluationStep
 					:class="$style.step"
 					:title="locale.baseText('testDefinition.edit.step.metrics')"
+					:tooltip="locale.baseText('testDefinition.edit.step.metrics.tooltip')"
 				>
 					<template #icon><font-awesome-icon icon="chart-bar" size="lg" /></template>
 					<template #cardContent>
-						<MetricsInput v-model="state.metrics" :class="{ 'has-issues': hasIssues('metrics') }" />
+						<MetricsInput
+							v-model="state.metrics"
+							:class="{ 'has-issues': hasIssues('metrics') }"
+							@delete-metric="onDeleteMetric"
+						/>
 					</template>
 				</EvaluationStep>
 			</div>
 
-			<div :class="$style.footer">
-				<n8n-button
-					type="primary"
-					data-test-id="run-test-button"
-					:label="buttonLabel"
-					:loading="isSaving"
-					@click="onSaveTest"
-				/>
-			</div>
+			<n8n-button
+				v-if="state.evaluationWorkflow.value && state.tags.value.length > 0"
+				:class="$style.runTestButton"
+				size="small"
+				data-test-id="run-test-button"
+				:label="locale.baseText('testDefinition.runTest')"
+				type="primary"
+				@click="runTest"
+			/>
+			<n8n-button
+				v-else
+				:class="$style.runTestButton"
+				size="small"
+				data-test-id="run-test-button"
+				:label="'Save Test'"
+				type="primary"
+				@click="onSaveTest"
+			/>
 		</div>
+		<!-- Past Runs Table -->
+		<div v-if="runs.length > 0" :class="$style.runsTable">
+			<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
+				locale.baseText('testDefinition.edit.pastRuns')
+			}}</N8nHeading>
+			<TestRunsTable
+				:runs="runs"
+				:selectable="true"
+				data-test-id="past-runs-table"
+				@delete-runs="onDeleteRuns"
+			/>
+		</div>
+
+		<Modal ref="nodePinningModal" width="80vw" height="85vh" :name="NODE_PINNING_MODAL_KEY">
+			<template #header>
+				<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
+					locale.baseText('testDefinition.edit.selectNodes')
+				}}</N8nHeading>
+			</template>
+			<template #content>
+				<NodesPinning
+					v-model="state.mockedNodes"
+					:width="modalContentWidth"
+					data-test-id="nodes-pinning-modal"
+				/>
+			</template>
+		</Modal>
 	</div>
 </template>
 
@@ -194,22 +341,40 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 .container {
 	width: 100%;
 	height: 100%;
+	overflow: hidden;
 	padding: var(--spacing-s);
 	display: grid;
 	grid-template-columns: minmax(auto, 24rem) 1fr;
 	gap: var(--spacing-2xl);
 }
 
-.content {
-	min-width: 0;
+.formContent {
 	width: 100%;
+	min-width: fit-content;
+	padding-bottom: 10px;
+	overflow: hidden;
+	display: flex;
+	flex-direction: column;
+}
+.runsTableTotal {
+	display: block;
+	margin-bottom: var(--spacing-xs);
+}
+.runsTable {
+	flex-shrink: 1;
+	max-width: 100%;
+	max-height: 80vh;
+	overflow: auto;
+}
+.runsTableHeading {
+	display: block;
+	margin-bottom: var(--spacing-xl);
 }
-
 .panelBlock {
 	max-width: var(--evaluation-edit-panel-width, 24rem);
 	display: grid;
-
-	justify-items: end;
+	overflow-y: auto;
+	min-height: 0;
 }
 .panelIntro {
 	font-size: var(--font-size-m);
@@ -231,7 +396,7 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 	justify-self: center;
 }
 .evaluationArrows {
-	--arrow-height: 11rem;
+	--arrow-height: 13.8rem;
 	display: flex;
 	justify-content: space-between;
 	width: 100%;
@@ -267,4 +432,11 @@ watch(() => state.value, debounce(onSaveTest, { debounceTime: 400 }), { deep: tr
 	justify-items: end;
 	align-items: start;
 }
+.mockedNodesLabel {
+	min-height: 1.5rem;
+	display: block;
+}
+.runTestButton {
+	margin-top: var(--spacing-m);
+}
 </style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
index 33a966b4b7..d32516d4bb 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
@@ -19,17 +19,22 @@ const toast = useToast();
 const locale = useI18n();
 
 const tests = computed<TestListItem[]>(() => {
-	return testDefinitionStore.allTestDefinitions
+	return (
+		testDefinitionStore.allTestDefinitionsByWorkflowId[
+			router.currentRoute.value.params.name as string
+		] ?? []
+	)
 		.filter((test): test is TestDefinitionRecord => test.id !== undefined)
 		.sort((a, b) => new Date(b?.updatedAt ?? '').getTime() - new Date(a?.updatedAt ?? '').getTime())
 		.map((test) => ({
 			id: test.id,
 			name: test.name ?? '',
 			tagName: test.annotationTagId ? getTagName(test.annotationTagId) : '',
-			testCases: 0, // TODO: This should come from the API
+			testCases: testDefinitionStore.testRunsByTestId[test.id]?.length ?? 0,
 			execution: getTestExecution(test.id),
 		}));
 });
+
 const hasTests = computed(() => tests.value.length > 0);
 const allTags = computed(() => tagsStore.allTags);
 
@@ -39,21 +44,25 @@ function getTagName(tagId: string) {
 	return matchingTag?.name ?? '';
 }
 
-// TODO: Replace with actual API call once implemented
-function getTestExecution(_testId: string): TestExecution {
+function getTestExecution(testId: string): TestExecution {
+	const lastRun = testDefinitionStore.lastRunByTestId[testId];
+	if (!lastRun) {
+		return {
+			lastRun: null,
+			errorRate: 0,
+			metrics: {},
+			status: 'new',
+		};
+	}
+
 	const mockExecutions = {
-		lastRun: 'an hour ago',
+		lastRun: lastRun.updatedAt ?? '',
 		errorRate: 0,
-		metrics: { metric1: 0.12, metric2: 0.99, metric3: 0.87 },
+		metrics: lastRun.metrics ?? {},
+		status: lastRun.status ?? 'running',
 	};
 
-	return (
-		mockExecutions || {
-			lastRun: null,
-			errorRate: null,
-			metrics: { metric1: null, metric2: null, metric3: null },
-		}
-	);
+	return mockExecutions;
 }
 
 // Action handlers
@@ -61,20 +70,27 @@ function onCreateTest() {
 	void router.push({ name: VIEWS.NEW_TEST_DEFINITION });
 }
 
-function onRunTest(_testId: string) {
-	// TODO: Implement test run logic
-	toast.showMessage({
-		title: locale.baseText('testDefinition.notImplemented'),
-		type: 'warning',
-	});
+async function onRunTest(testId: string) {
+	try {
+		const result = await testDefinitionStore.startTestRun(testId);
+		if (result.success) {
+			toast.showMessage({
+				title: locale.baseText('testDefinition.list.testStarted'),
+				type: 'success',
+			});
+
+			// Optionally fetch the updated test runs
+			await testDefinitionStore.fetchTestRuns(testId);
+		} else {
+			throw new Error('Test run failed to start');
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('testDefinition.list.testStartError'));
+	}
 }
 
-function onViewDetails(_testId: string) {
-	// TODO: Implement test details view
-	toast.showMessage({
-		title: locale.baseText('testDefinition.notImplemented'),
-		type: 'warning',
-	});
+async function onViewDetails(testId: string) {
+	void router.push({ name: VIEWS.TEST_DEFINITION_RUNS, params: { testId } });
 }
 
 function onEditTest(testId: number) {
@@ -92,12 +108,22 @@ async function onDeleteTest(testId: string) {
 
 // Load initial data
 async function loadInitialData() {
-	isLoading.value = true;
-	try {
-		await tagsStore.fetchAll();
-		await testDefinitionStore.fetchAll();
-	} finally {
-		isLoading.value = false;
+	if (!isLoading.value) {
+		// Add guard to prevent multiple loading states
+		isLoading.value = true;
+		try {
+			await Promise.all([
+				tagsStore.fetchAll(),
+				testDefinitionStore.fetchAll({
+					workflowId: router.currentRoute.value.params.name as string,
+				}),
+			]);
+			isLoading.value = false;
+		} catch (error) {
+			toast.showError(error, locale.baseText('testDefinition.list.loadError'));
+		} finally {
+			isLoading.value = false;
+		}
 	}
 }
 
@@ -112,7 +138,9 @@ onMounted(() => {
 			name: VIEWS.WORKFLOW,
 			params: { name: router.currentRoute.value.params.name },
 		});
+		return; // Add early return to prevent loading if feature is disabled
 	}
+
 	void loadInitialData();
 });
 </script>
@@ -124,7 +152,11 @@ onMounted(() => {
 		</div>
 
 		<template v-else>
-			<EmptyState v-if="!hasTests" @create-test="onCreateTest" />
+			<EmptyState
+				v-if="!hasTests"
+				data-test-id="test-definition-empty-state"
+				@create-test="onCreateTest"
+			/>
 			<TestsList
 				v-else
 				:tests="tests"
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
new file mode 100644
index 0000000000..48c7ca8dc7
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
@@ -0,0 +1,292 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { useRouter } from 'vue-router';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { useI18n } from '@/composables/useI18n';
+import { N8nCard, N8nText } from 'n8n-design-system';
+import TestDefinitionTable from '@/components/TestDefinition/shared/TestDefinitionTable.vue';
+import type { TestDefinitionTableColumn } from '@/components/TestDefinition/shared/TestDefinitionTable.vue';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { get } from 'lodash-es';
+import type { ExecutionSummaryWithScopes } from '@/Interface';
+import { VIEWS } from '@/constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useToast } from '@/composables/useToast';
+
+interface TestCase extends ExecutionSummaryWithScopes {
+	metrics: Record<string, number>;
+}
+
+const router = useRouter();
+const toast = useToast();
+const testDefinitionStore = useTestDefinitionStore();
+const executionsStore = useExecutionsStore();
+const workflowStore = useWorkflowsStore();
+const locale = useI18n();
+
+const isLoading = ref(true);
+const testCases = ref<TestCase[]>([]);
+
+const runId = computed(() => router.currentRoute.value.params.runId as string);
+const testId = computed(() => router.currentRoute.value.params.testId as string);
+
+const run = computed(() => testDefinitionStore.testRunsById[runId.value]);
+const test = computed(() => testDefinitionStore.testDefinitionsById[testId.value]);
+const workflow = computed(
+	() => workflowStore.workflowsById[test.value?.evaluationWorkflowId ?? ''],
+);
+const filteredTestCases = computed(() => {
+	return testCases.value;
+});
+
+const columns = computed(
+	(): Array<TestDefinitionTableColumn<TestCase>> => [
+		{
+			prop: 'id',
+			width: 200,
+			label: locale.baseText('testDefinition.runDetail.testCase'),
+			sortable: true,
+			route: (row: TestCase) => ({
+				name: VIEWS.EXECUTION_PREVIEW,
+				params: { name: row.workflowId, executionId: row.id },
+			}),
+			formatter: (row: TestCase) => `[${row.id}] ${workflow.value?.name}`,
+			openInNewTab: true,
+		},
+		{
+			prop: 'status',
+			label: locale.baseText('testDefinition.listRuns.status'),
+			filters: [
+				{ text: locale.baseText('testDefinition.listRuns.status.new'), value: 'new' },
+				{ text: locale.baseText('testDefinition.listRuns.status.running'), value: 'running' },
+				{ text: locale.baseText('testDefinition.listRuns.status.success'), value: 'success' },
+				{ text: locale.baseText('testDefinition.listRuns.status.error'), value: 'error' },
+			],
+			filterMethod: (value: string, row: TestCase) => row.status === value,
+		},
+		...Object.keys(run.value?.metrics ?? {}).map((metric) => ({
+			prop: `metrics.${metric}`,
+			label: metric,
+			sortable: true,
+			filter: true,
+			formatter: (row: TestCase) => row.metrics[metric]?.toFixed(2) ?? '-',
+		})),
+	],
+);
+
+const metrics = computed(() => run.value?.metrics ?? {});
+
+// Temporary workaround to fetch test cases by manually getting workflow executions
+// TODO: Replace with dedicated API endpoint once available
+const fetchExecutionTestCases = async () => {
+	if (!runId.value || !testId.value) return;
+
+	isLoading.value = true;
+	try {
+		const testRun = await testDefinitionStore.getTestRun({
+			testDefinitionId: testId.value,
+			runId: runId.value,
+		});
+		const testDefinition = await testDefinitionStore.fetchTestDefinition(testId.value);
+
+		// Fetch workflow executions that match this test run
+		const evaluationWorkflowExecutions = await executionsStore.fetchExecutions({
+			workflowId: testDefinition.evaluationWorkflowId ?? '',
+			metadata: [{ key: 'testRunId', value: testRun.id }],
+		});
+
+		// For each execution, fetch full details and extract metrics
+		const executionsData = await Promise.all(
+			evaluationWorkflowExecutions?.results.map(async (execution) => {
+				const executionData = await executionsStore.fetchExecution(execution.id);
+				const lastExecutedNode = executionData?.data?.resultData?.lastNodeExecuted;
+				if (!lastExecutedNode) {
+					throw new Error('Last executed node is required');
+				}
+				const metricsData = get(
+					executionData,
+					[
+						'data',
+						'resultData',
+						'runData',
+						lastExecutedNode,
+						'0',
+						'data',
+						'main',
+						'0',
+						'0',
+						'json',
+					],
+					{},
+				);
+
+				return {
+					...execution,
+					metrics: metricsData,
+				};
+			}),
+		);
+
+		testCases.value = executionsData ?? [];
+	} catch (error) {
+		toast.showError(error, 'Failed to load run details');
+	} finally {
+		isLoading.value = false;
+	}
+};
+
+onMounted(async () => {
+	await fetchExecutionTestCases();
+});
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="test-definition-run-detail">
+		<div :class="$style.header">
+			<button :class="$style.backButton" @click="router.back()">
+				<i class="mr-xs"><font-awesome-icon icon="arrow-left" /></i>
+				<n8n-heading size="large" :bold="true">{{ test?.name }}</n8n-heading>
+				<i class="ml-xs mr-xs"><font-awesome-icon icon="chevron-right" /></i>
+				<n8n-heading size="large" :bold="true"
+					>{{ locale.baseText('testDefinition.listRuns.runNumber') }}{{ run?.id }}</n8n-heading
+				>
+			</button>
+		</div>
+
+		<div :class="$style.cardGrid">
+			<N8nCard :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">
+						{{ locale.baseText('testDefinition.runDetail.totalCases') }}
+					</N8nText>
+					<N8nText size="large">{{ testCases.length }}</N8nText>
+				</div>
+			</N8nCard>
+
+			<N8nCard :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">
+						{{ locale.baseText('testDefinition.runDetail.ranAt') }}
+					</N8nText>
+					<N8nText size="medium">{{
+						convertToDisplayDate(new Date(run?.runAt).getTime())
+					}}</N8nText>
+				</div>
+			</N8nCard>
+
+			<N8nCard :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">
+						{{ locale.baseText('testDefinition.listRuns.status') }}
+					</N8nText>
+					<N8nText size="large" :class="run?.status.toLowerCase()">
+						{{ run?.status }}
+					</N8nText>
+				</div>
+			</N8nCard>
+
+			<N8nCard v-for="(value, key) in metrics" :key="key" :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">{{ key }}</N8nText>
+					<N8nText size="large">{{ value.toFixed(2) }}</N8nText>
+				</div>
+			</N8nCard>
+		</div>
+
+		<N8nCard>
+			<div v-if="isLoading" :class="$style.loading">
+				<n8n-loading :loading="true" :rows="5" />
+			</div>
+			<TestDefinitionTable
+				v-else
+				:data="filteredTestCases"
+				:columns="columns"
+				:default-sort="{ prop: 'id', order: 'descending' }"
+			/>
+		</N8nCard>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	padding: var(--spacing-xl) var(--spacing-l);
+	height: 100%;
+	width: 100%;
+	max-width: var(--content-container-width);
+}
+
+.backButton {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-s);
+	border: none;
+	background: none;
+	cursor: pointer;
+	color: var(--color-text-base);
+}
+
+.header {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-s);
+	margin-bottom: var(--spacing-l);
+
+	.timestamp {
+		color: var(--color-text-base);
+		font-size: var(--font-size-s);
+	}
+}
+
+.summary {
+	margin-bottom: var(--spacing-m);
+
+	.summaryStats {
+		display: flex;
+		gap: var(--spacing-l);
+	}
+}
+.stat {
+	display: flex;
+	flex-direction: column;
+}
+
+.controls {
+	display: flex;
+	gap: var(--spacing-s);
+	margin-bottom: var(--spacing-s);
+}
+
+.downloadButton {
+	margin-bottom: var(--spacing-s);
+}
+
+.loading {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 200px;
+}
+
+.cardGrid {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(6rem, 1fr));
+	gap: var(--spacing-xs);
+	margin-bottom: var(--spacing-m);
+}
+
+:global {
+	.new {
+		color: var(--color-info);
+	}
+	.running {
+		color: var(--color-warning);
+	}
+	.completed {
+		color: var(--color-success);
+	}
+	.error {
+		color: var(--color-danger);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
new file mode 100644
index 0000000000..26609a0855
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
@@ -0,0 +1,129 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
+import { VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+
+const router = useRouter();
+const testDefinitionStore = useTestDefinitionStore();
+const uiStore = useUIStore();
+const locale = useI18n();
+const toast = useToast();
+
+const selectedMetric = ref();
+const isLoading = ref(false);
+
+const appliedTheme = computed(() => uiStore.appliedTheme);
+const testId = computed(() => {
+	return router.currentRoute.value.params.testId as string;
+});
+
+async function loadInitialData() {
+	if (!isLoading.value) {
+		// Add guard to prevent multiple loading states
+		isLoading.value = true;
+		try {
+			await testDefinitionStore.fetchTestDefinition(testId.value);
+			await testDefinitionStore.fetchTestRuns(testId.value);
+			isLoading.value = false;
+		} catch (error) {
+		} finally {
+			isLoading.value = false;
+		}
+	}
+}
+// TODO: We're currently doing the filtering on the FE but there should be an endpoint to get the runs for a test
+const runs = computed(() => {
+	return Object.values(testDefinitionStore.testRunsById ?? {}).filter(
+		(run) => run.testDefinitionId === testId.value,
+	);
+});
+
+const testDefinition = computed(() => {
+	return testDefinitionStore.testDefinitionsById[testId.value];
+});
+
+const getRunDetail = (run: TestRunRecord) => {
+	void router.push({
+		name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+		params: { testId: testId.value, runId: run.id },
+	});
+};
+
+async function runTest() {
+	try {
+		const result = await testDefinitionStore.startTestRun(testId.value);
+		if (result.success) {
+			toast.showMessage({
+				title: locale.baseText('testDefinition.list.testStarted'),
+				type: 'success',
+			});
+
+			// Optionally fetch the updated test runs
+			await testDefinitionStore.fetchTestRuns(testId.value);
+		} else {
+			throw new Error('Test run failed to start');
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('testDefinition.list.testStartError'));
+	}
+}
+
+async function onDeleteRuns(runsToDelete: TestRunRecord[]) {
+	await Promise.all(
+		runsToDelete.map(async (run) => {
+			await testDefinitionStore.deleteTestRun({ testDefinitionId: testId.value, runId: run.id });
+		}),
+	);
+}
+
+onMounted(async () => {
+	await loadInitialData();
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<router-link :to="{ name: VIEWS.TEST_DEFINITION }" :class="$style.backButton">
+			<i class="mr-xs"><font-awesome-icon icon="arrow-left" /></i>
+			<n8n-heading size="large" :bold="true">{{ testDefinition?.name }}</n8n-heading>
+		</router-link>
+		<N8nText :class="$style.description" size="medium">{{ testDefinition?.description }}</N8nText>
+		<template v-if="isLoading">
+			<N8nLoading :rows="5" />
+			<N8nLoading :rows="10" />
+		</template>
+		<template v-else-if="runs.length > 0">
+			<MetricsChart v-model:selectedMetric="selectedMetric" :runs="runs" :theme="appliedTheme" />
+			<TestRunsTable :runs="runs" @get-run-detail="getRunDetail" @delete-runs="onDeleteRuns" />
+		</template>
+		<template v-else>
+			<N8nActionBox
+				:heading="locale.baseText('testDefinition.listRuns.noRuns')"
+				:description="locale.baseText('testDefinition.listRuns.noRuns.description')"
+				:button-text="locale.baseText('testDefinition.listRuns.noRuns.button')"
+				@click:button="runTest"
+			/>
+		</template>
+	</div>
+</template>
+<style module lang="scss">
+.container {
+	padding: var(--spacing-xl) var(--spacing-l);
+	height: 100%;
+	width: 100%;
+	max-width: var(--content-container-width);
+}
+.backButton {
+	color: var(--color-text-base);
+}
+.description {
+	margin-top: var(--spacing-xs);
+	display: block;
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
index 9aeb70679b..2b290701bd 100644
--- a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
@@ -1,3 +1,4 @@
+import type { Mock } from 'vitest';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { createPinia, setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
@@ -8,57 +9,89 @@ import { useToast } from '@/composables/useToast';
 import { useTestDefinitionForm } from '@/components/TestDefinition/composables/useTestDefinitionForm';
 import { useAnnotationTagsStore } from '@/stores/tags.store';
 import { ref, nextTick } from 'vue';
+import { cleanupAppModals, createAppModals, mockedStore } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
 
 vi.mock('vue-router');
 vi.mock('@/composables/useToast');
 vi.mock('@/components/TestDefinition/composables/useTestDefinitionForm');
-vi.mock('@/stores/tags.store');
 vi.mock('@/stores/projects.store');
 
 describe('TestDefinitionEditView', () => {
 	const renderComponent = createComponentRenderer(TestDefinitionEditView);
 
+	let createTestMock: Mock;
+	let updateTestMock: Mock;
+	let loadTestDataMock: Mock;
+	let deleteMetricMock: Mock;
+	let updateMetricsMock: Mock;
+	let showMessageMock: Mock;
+	let showErrorMock: Mock;
+
+	const renderComponentWithFeatureEnabled = ({
+		testRunsById = {},
+	}: { testRunsById?: Record<string, TestRunRecord> } = {}) => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const mockedTestDefinitionStore = mockedStore(useTestDefinitionStore);
+		mockedTestDefinitionStore.isFeatureEnabled = true;
+		mockedTestDefinitionStore.testRunsById = testRunsById;
+		return { ...renderComponent({ pinia }), mockedTestDefinitionStore };
+	};
+
 	beforeEach(() => {
 		setActivePinia(createPinia());
+		createAppModals();
 
+		// Default route mock: no testId
 		vi.mocked(useRoute).mockReturnValue({
 			params: {},
-			path: '/test-path',
-			name: 'test-route',
+			name: VIEWS.NEW_TEST_DEFINITION,
 		} as ReturnType<typeof useRoute>);
 
 		vi.mocked(useRouter).mockReturnValue({
 			push: vi.fn(),
+			replace: vi.fn(),
 			resolve: vi.fn().mockReturnValue({ href: '/test-href' }),
+			currentRoute: { value: { params: {} } },
 		} as unknown as ReturnType<typeof useRouter>);
 
+		createTestMock = vi.fn().mockResolvedValue({ id: 'newTestId' });
+		updateTestMock = vi.fn().mockResolvedValue({});
+		loadTestDataMock = vi.fn();
+		deleteMetricMock = vi.fn();
+		updateMetricsMock = vi.fn();
+		showMessageMock = vi.fn();
+		showErrorMock = vi.fn();
+		// const mockedTestDefinitionStore = mockedStore(useTestDefinitionStore);
+
 		vi.mocked(useToast).mockReturnValue({
-			showMessage: vi.fn(),
-			showError: vi.fn(),
+			showMessage: showMessageMock,
+			showError: showErrorMock,
 		} as unknown as ReturnType<typeof useToast>);
 		vi.mocked(useTestDefinitionForm).mockReturnValue({
 			state: ref({
 				name: { value: '', isEditing: false, tempValue: '' },
 				description: '',
-				tags: { appliedTagIds: [], isEditing: false },
-				evaluationWorkflow: { id: '1', name: 'Test Workflow' },
+				tags: { value: [], tempValue: [], isEditing: false },
+				evaluationWorkflow: { mode: 'list', value: '', __rl: true },
 				metrics: [],
 			}),
 			fieldsIssues: ref([]),
 			isSaving: ref(false),
-			loadTestData: vi.fn(),
-			saveTest: vi.fn(),
+			loadTestData: loadTestDataMock,
+			createTest: createTestMock,
+			updateTest: updateTestMock,
 			startEditing: vi.fn(),
 			saveChanges: vi.fn(),
 			cancelEditing: vi.fn(),
 			handleKeydown: vi.fn(),
+			deleteMetric: deleteMetricMock,
+			updateMetrics: updateMetricsMock,
 		} as unknown as ReturnType<typeof useTestDefinitionForm>);
-		vi.mocked(useAnnotationTagsStore).mockReturnValue({
-			isLoading: ref(false),
-			allTags: ref([]),
-			tagsById: ref({}),
-			fetchAll: vi.fn(),
-		} as unknown as ReturnType<typeof useAnnotationTagsStore>);
 
 		vi.mock('@/stores/projects.store', () => ({
 			useProjectsStore: vi.fn().mockReturnValue({
@@ -71,138 +104,197 @@ describe('TestDefinitionEditView', () => {
 
 	afterEach(() => {
 		vi.clearAllMocks();
+		cleanupAppModals();
 	});
 
 	it('should load test data when testId is provided', async () => {
 		vi.mocked(useRoute).mockReturnValue({
 			params: { testId: '1' },
-			path: '/test-path',
-			name: 'test-route',
+			name: VIEWS.TEST_DEFINITION_EDIT,
 		} as unknown as ReturnType<typeof useRoute>);
-		const loadTestDataMock = vi.fn();
-		vi.mocked(useTestDefinitionForm).mockReturnValue({
-			...vi.mocked(useTestDefinitionForm)(),
-			loadTestData: loadTestDataMock,
-		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+		renderComponentWithFeatureEnabled();
 
-		renderComponent({
-			pinia: createTestingPinia(),
-		});
+		mockedStore(useAnnotationTagsStore).fetchAll.mockResolvedValue([]);
 
-		await nextTick();
 		expect(loadTestDataMock).toHaveBeenCalledWith('1');
 	});
 
 	it('should not load test data when testId is not provided', async () => {
-		const loadTestDataMock = vi.fn();
-		vi.mocked(useTestDefinitionForm).mockReturnValue({
-			...vi.mocked(useTestDefinitionForm)(),
-			loadTestData: loadTestDataMock,
-		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+		// Here route returns no testId
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as unknown as ReturnType<typeof useRoute>);
+		renderComponentWithFeatureEnabled();
 
-		renderComponent({
-			pinia: createTestingPinia(),
-		});
-
-		await nextTick();
 		expect(loadTestDataMock).not.toHaveBeenCalled();
 	});
 
-	it('should save test and show success message on successful save', async () => {
-		const saveTestMock = vi.fn().mockResolvedValue({});
-		const routerPushMock = vi.fn();
-		const routerResolveMock = vi.fn().mockReturnValue({ href: '/test-href' });
-		vi.mocked(useTestDefinitionForm).mockReturnValue({
-			...vi.mocked(useTestDefinitionForm)(),
-			createTest: saveTestMock,
-		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+	it('should create a new test and show success message on save if no testId is present', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as ReturnType<typeof useRoute>);
+		const { getByTestId } = renderComponentWithFeatureEnabled();
 
-		vi.mocked(useRouter).mockReturnValue({
-			push: routerPushMock,
-			resolve: routerResolveMock,
-		} as unknown as ReturnType<typeof useRouter>);
+		mockedStore(useAnnotationTagsStore).fetchAll.mockResolvedValue([]);
 
-		const { getByTestId } = renderComponent({
-			pinia: createTestingPinia(),
-		});
 		await nextTick();
 		const saveButton = getByTestId('run-test-button');
 		saveButton.click();
 		await nextTick();
 
-		expect(saveTestMock).toHaveBeenCalled();
+		expect(createTestMock).toHaveBeenCalled();
 	});
 
-	it('should show error message on failed save', async () => {
-		const saveTestMock = vi.fn().mockRejectedValue(new Error('Save failed'));
-		const showErrorMock = vi.fn();
-		vi.mocked(useTestDefinitionForm).mockReturnValue({
-			...vi.mocked(useTestDefinitionForm)(),
-			createTest: saveTestMock,
-		} as unknown as ReturnType<typeof useTestDefinitionForm>);
-		vi.mocked(useToast).mockReturnValue({ showError: showErrorMock } as unknown as ReturnType<
-			typeof useToast
-		>);
-
-		const { getByTestId } = renderComponent({
-			pinia: createTestingPinia(),
-		});
-		await nextTick();
-		const saveButton = getByTestId('run-test-button');
-		saveButton.click();
-		await nextTick();
-		expect(saveTestMock).toHaveBeenCalled();
-		expect(showErrorMock).toHaveBeenCalled();
-	});
-
-	it('should display "Update Test" button when editing existing test', async () => {
+	it('should update test and show success message on save if testId is present', async () => {
 		vi.mocked(useRoute).mockReturnValue({
 			params: { testId: '1' },
-			path: '/test-path',
-			name: 'test-route',
+			name: VIEWS.TEST_DEFINITION_EDIT,
 		} as unknown as ReturnType<typeof useRoute>);
-		const { getByTestId } = renderComponent({
-			pinia: createTestingPinia(),
-		});
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		const saveButton = getByTestId('run-test-button');
+		saveButton.click();
 		await nextTick();
-		const updateButton = getByTestId('run-test-button');
-		expect(updateButton.textContent).toContain('Update test');
+
+		expect(updateTestMock).toHaveBeenCalledWith('1');
 	});
 
-	it('should display "Run Test" button when creating new test', async () => {
-		const { getByTestId } = renderComponent({
-			pinia: createTestingPinia(),
-		});
-		await nextTick();
+	it('should show error message on failed test creation', async () => {
+		createTestMock.mockRejectedValue(new Error('Save failed'));
+
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
 		const saveButton = getByTestId('run-test-button');
-		expect(saveButton).toBeTruthy();
+		saveButton.click();
+		await nextTick();
+
+		expect(createTestMock).toHaveBeenCalled();
+		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+	});
+
+	it('should display "Save Test" button when editing test without eval workflow and tags', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: { testId: '1' },
+			name: VIEWS.TEST_DEFINITION_EDIT,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		await nextTick();
+		const updateButton = getByTestId('run-test-button');
+		expect(updateButton.textContent?.toLowerCase()).toContain('save');
+	});
+
+	it('should display "Save Test" button when creating new test', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		const saveButton = getByTestId('run-test-button');
+		expect(saveButton.textContent?.toLowerCase()).toContain('save test');
 	});
 
 	it('should apply "has-issues" class to inputs with issues', async () => {
 		vi.mocked(useTestDefinitionForm).mockReturnValue({
 			...vi.mocked(useTestDefinitionForm)(),
-			fieldsIssues: ref([{ field: 'name' }, { field: 'tags' }]),
+			fieldsIssues: ref([
+				{ field: 'name', message: 'Name is required' },
+				{ field: 'tags', message: 'Tag is required' },
+			]),
 		} as unknown as ReturnType<typeof useTestDefinitionForm>);
 
-		const { container } = renderComponent({
-			pinia: createTestingPinia(),
-		});
+		const { container } = renderComponentWithFeatureEnabled();
+
 		await nextTick();
-		expect(container.querySelector('.has-issues')).toBeTruthy();
+		const issueElements = container.querySelectorAll('.has-issues');
+		expect(issueElements.length).toBeGreaterThan(0);
 	});
 
 	it('should fetch all tags on mount', async () => {
-		const fetchAllMock = vi.fn();
-		vi.mocked(useAnnotationTagsStore).mockReturnValue({
-			...vi.mocked(useAnnotationTagsStore)(),
-			fetchAll: fetchAllMock,
-		} as unknown as ReturnType<typeof useAnnotationTagsStore>);
+		renderComponentWithFeatureEnabled();
+		await nextTick();
+		expect(mockedStore(useAnnotationTagsStore).fetchAll).toHaveBeenCalled();
+	});
 
-		renderComponent({
-			pinia: createTestingPinia(),
+	describe('Test Runs functionality', () => {
+		it('should display test runs table when runs exist', async () => {
+			vi.mocked(useRoute).mockReturnValue({
+				params: { testId: '1' },
+				name: VIEWS.TEST_DEFINITION_EDIT,
+			} as unknown as ReturnType<typeof useRoute>);
+
+			const { getByTestId } = renderComponentWithFeatureEnabled({
+				testRunsById: {
+					run1: {
+						id: 'run1',
+						testDefinitionId: '1',
+						status: 'completed',
+						runAt: '2023-01-01',
+						createdAt: '2023-01-01',
+						updatedAt: '2023-01-01',
+						completedAt: '2023-01-01',
+					},
+					run2: {
+						id: 'run2',
+						testDefinitionId: '1',
+						status: 'running',
+						runAt: '2023-01-02',
+						createdAt: '2023-01-02',
+						updatedAt: '2023-01-02',
+						completedAt: '',
+					},
+				},
+			});
+
+			const runsTable = getByTestId('past-runs-table');
+			expect(runsTable).toBeTruthy();
 		});
 
-		await nextTick();
-		expect(fetchAllMock).toHaveBeenCalled();
+		it('should not display test runs table when no runs exist', async () => {
+			const { container } = renderComponentWithFeatureEnabled();
+
+			const runsTable = container.querySelector('[data-test-id="past-runs-table"]');
+			expect(runsTable).toBeFalsy();
+		});
+
+		it('should start a test run when run test button is clicked', async () => {
+			vi.mocked(useTestDefinitionForm).mockReturnValue({
+				...vi.mocked(useTestDefinitionForm)(),
+				state: ref({
+					name: { value: 'Test', isEditing: false, tempValue: '' },
+					description: '',
+					tags: { value: ['tag1'], tempValue: [], isEditing: false },
+					evaluationWorkflow: { mode: 'list', value: 'workflow1', __rl: true },
+					metrics: [],
+					mockedNodes: [],
+				}),
+			} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+			vi.mocked(useRoute).mockReturnValue({
+				params: { testId: '1' },
+				name: VIEWS.TEST_DEFINITION_EDIT,
+			} as unknown as ReturnType<typeof useRoute>);
+
+			const { getByTestId, mockedTestDefinitionStore } = renderComponentWithFeatureEnabled();
+			await nextTick();
+
+			const runButton = getByTestId('run-test-button');
+			runButton.click();
+			await nextTick();
+
+			expect(mockedTestDefinitionStore.startTestRun).toHaveBeenCalledWith('1');
+			expect(mockedTestDefinitionStore.fetchTestRuns).toHaveBeenCalledWith('1');
+		});
 	});
 });
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
new file mode 100644
index 0000000000..bf23b73a9e
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
@@ -0,0 +1,174 @@
+import type { Mock } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import TestDefinitionListView from '@/views/TestDefinition/TestDefinitionListView.vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { nextTick, ref } from 'vue';
+import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
+import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+
+describe('TestDefinitionListView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionListView);
+
+	let showMessageMock: Mock;
+	let showErrorMock: Mock;
+	let startTestRunMock: Mock;
+	let fetchTestRunsMock: Mock;
+	let deleteByIdMock: Mock;
+	let fetchAllMock: Mock;
+
+	const mockTestDefinitions: TestDefinitionRecord[] = [
+		{
+			id: '1',
+			name: 'Test 1',
+			workflowId: 'workflow1',
+			updatedAt: '2023-01-01T00:00:00.000Z',
+			annotationTagId: 'tag1',
+		},
+		{
+			id: '2',
+			name: 'Test 2',
+			workflowId: 'workflow1',
+			updatedAt: '2023-01-02T00:00:00.000Z',
+		},
+		{
+			id: '3',
+			name: 'Test 3',
+			workflowId: 'workflow1',
+			updatedAt: '2023-01-03T00:00:00.000Z',
+		},
+	];
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		vi.mocked(useRoute).mockReturnValue(
+			ref({
+				params: { name: 'workflow1' },
+				name: VIEWS.TEST_DEFINITION,
+			}) as unknown as ReturnType<typeof useRoute>,
+		);
+
+		vi.mocked(useRouter).mockReturnValue({
+			push: vi.fn(),
+			currentRoute: { value: { params: { name: 'workflow1' } } },
+		} as unknown as ReturnType<typeof useRouter>);
+
+		showMessageMock = vi.fn();
+		showErrorMock = vi.fn();
+		startTestRunMock = vi.fn().mockResolvedValue({ success: true });
+		fetchTestRunsMock = vi.fn();
+		deleteByIdMock = vi.fn();
+		fetchAllMock = vi.fn().mockResolvedValue({ testDefinitions: mockTestDefinitions });
+
+		vi.mocked(useToast).mockReturnValue({
+			showMessage: showMessageMock,
+			showError: showErrorMock,
+		} as unknown as ReturnType<typeof useToast>);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	const renderComponentWithFeatureEnabled = async (
+		{ testDefinitions }: { testDefinitions: TestDefinitionRecord[] } = {
+			testDefinitions: mockTestDefinitions,
+		},
+	) => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		// const tagsStore = mockedStore(useAnnotationTagsStore);
+		testDefinitionStore.isFeatureEnabled = true;
+		testDefinitionStore.fetchAll = fetchAllMock;
+		testDefinitionStore.startTestRun = startTestRunMock;
+		testDefinitionStore.fetchTestRuns = fetchTestRunsMock;
+		testDefinitionStore.deleteById = deleteByIdMock;
+		testDefinitionStore.allTestDefinitionsByWorkflowId = { workflow1: testDefinitions };
+
+		const component = renderComponent({ pinia });
+		await waitAllPromises();
+		return { ...component, testDefinitionStore };
+	};
+
+	it('should render empty state when no tests exist', async () => {
+		const { getByTestId } = await renderComponentWithFeatureEnabled({ testDefinitions: [] });
+
+		expect(getByTestId('test-definition-empty-state')).toBeTruthy();
+	});
+
+	it('should render tests list when tests exist', async () => {
+		const { getByTestId } = await renderComponentWithFeatureEnabled();
+
+		expect(getByTestId('test-definition-list')).toBeTruthy();
+	});
+
+	it('should load initial data on mount', async () => {
+		const { testDefinitionStore } = await renderComponentWithFeatureEnabled();
+
+		expect(testDefinitionStore.fetchAll).toHaveBeenCalledWith({
+			workflowId: 'workflow1',
+		});
+		expect(mockedStore(useAnnotationTagsStore).fetchAll).toHaveBeenCalled();
+	});
+
+	it('should start test run and show success message', async () => {
+		const { getByTestId } = await renderComponentWithFeatureEnabled();
+
+		const runButton = getByTestId('run-test-button-1');
+		runButton.click();
+		await nextTick();
+
+		expect(startTestRunMock).toHaveBeenCalledWith('1');
+		expect(fetchTestRunsMock).toHaveBeenCalledWith('1');
+		expect(showMessageMock).toHaveBeenCalledWith({
+			title: expect.any(String),
+			type: 'success',
+		});
+	});
+
+	it('should show error message on failed test run', async () => {
+		const { getByTestId, testDefinitionStore } = await renderComponentWithFeatureEnabled();
+		testDefinitionStore.startTestRun = vi.fn().mockRejectedValue(new Error('Run failed'));
+
+		const runButton = getByTestId('run-test-button-1');
+		runButton.click();
+		await nextTick();
+
+		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+	});
+
+	it('should delete test and show success message', async () => {
+		const { getByTestId, testDefinitionStore } = await renderComponentWithFeatureEnabled();
+
+		const deleteButton = getByTestId('delete-test-button-1');
+		deleteButton.click();
+		await nextTick();
+
+		expect(testDefinitionStore.deleteById).toHaveBeenCalledWith('1');
+		expect(showMessageMock).toHaveBeenCalledWith({
+			title: expect.any(String),
+			type: 'success',
+		});
+	});
+
+	it('should sort tests by updated date in descending order', async () => {
+		const { container } = await renderComponentWithFeatureEnabled();
+
+		const testItems = container.querySelectorAll('[data-test-id^="test-item-"]');
+		expect(testItems[0].getAttribute('data-test-id')).toBe('test-item-3');
+		expect(testItems[1].getAttribute('data-test-id')).toBe('test-item-2');
+		expect(testItems[2].getAttribute('data-test-id')).toBe('test-item-1');
+	});
+});
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
new file mode 100644
index 0000000000..537a5a5e31
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
@@ -0,0 +1,267 @@
+import type { Mock } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import TestDefinitionRunDetailView from '@/views/TestDefinition/TestDefinitionRunDetailView.vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { nextTick, ref } from 'vue';
+import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import type { IWorkflowDb } from '@/Interface';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+
+describe('TestDefinitionRunDetailView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionRunDetailView);
+
+	let showErrorMock: Mock;
+	let getTestRunMock: Mock;
+	let fetchExecutionsMock: Mock;
+	let fetchExecutionMock: Mock;
+
+	const mockTestRun: TestRunRecord = {
+		id: 'run1',
+		status: 'completed',
+		runAt: '2023-01-01T00:00:00.000Z',
+		metrics: {
+			accuracy: 0.95,
+			precision: 0.88,
+		},
+		testDefinitionId: 'test1',
+		createdAt: '2023-01-01T00:00:00.000Z',
+		updatedAt: '2023-01-01T00:00:00.000Z',
+		completedAt: '2023-01-01T00:00:00.000Z',
+	};
+
+	const mockTestDefinition = {
+		id: 'test1',
+		name: 'Test Definition 1',
+		evaluationWorkflowId: 'workflow1',
+		workflowId: 'workflow1',
+	};
+
+	const mockWorkflow = {
+		id: 'workflow1',
+		name: 'Evaluation Workflow',
+	};
+
+	const mockExecutions = {
+		results: [
+			{ id: 'exec1', status: 'success' },
+			{ id: 'exec2', status: 'error' },
+		],
+	};
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		// Mock route with testId and runId
+		vi.mocked(useRoute).mockReturnValue(
+			ref({
+				params: { testId: 'test1', runId: 'run1' },
+				name: VIEWS.TEST_DEFINITION_RUNS,
+			}) as unknown as ReturnType<typeof useRoute>,
+		);
+
+		vi.mocked(useRouter).mockReturnValue({
+			back: vi.fn(),
+			currentRoute: { value: { params: { testId: 'test1', runId: 'run1' } } },
+			resolve: vi.fn().mockResolvedValue({ href: 'test-definition-run-detail' }),
+		} as unknown as ReturnType<typeof useRouter>);
+
+		showErrorMock = vi.fn();
+		getTestRunMock = vi.fn().mockResolvedValue(mockTestRun);
+		fetchExecutionsMock = vi.fn().mockResolvedValue(mockExecutions);
+		fetchExecutionMock = vi.fn().mockResolvedValue({
+			data: {
+				resultData: {
+					lastNodeExecuted: 'Node1',
+					runData: {
+						Node1: [{ data: { main: [[{ json: { accuracy: 0.95 } }]] } }],
+					},
+				},
+			},
+		});
+
+		vi.mocked(useToast).mockReturnValue({
+			showError: showErrorMock,
+		} as unknown as ReturnType<typeof useToast>);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should load run details on mount', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: mockTestRun };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+		testDefinitionStore.getTestRun = getTestRunMock;
+
+		const executionsStore = mockedStore(useExecutionsStore);
+		executionsStore.fetchExecutions = fetchExecutionsMock;
+		executionsStore.fetchExecution = fetchExecutionMock;
+
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.workflowsById = { workflow1: mockWorkflow as IWorkflowDb };
+
+		const { getByTestId } = renderComponent({ pinia });
+		await nextTick();
+
+		expect(getTestRunMock).toHaveBeenCalledWith({
+			testDefinitionId: 'test1',
+			runId: 'run1',
+		});
+		// expect(fetchExecutionsMock).toHaveBeenCalled();
+		expect(getByTestId('test-definition-run-detail')).toBeTruthy();
+	});
+
+	it('should display test run metrics', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: mockTestRun };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+		testDefinitionStore.getTestRun = getTestRunMock;
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		const metricsCards = container.querySelectorAll('.summaryCard');
+		expect(metricsCards.length).toBeGreaterThan(0);
+		expect(container.textContent).toContain('0.95'); // Check for accuracy metric
+	});
+
+	it('should handle errors when loading run details', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.getTestRun = vi.fn().mockRejectedValue(new Error('Failed to load'));
+
+		renderComponent({ pinia });
+		await nextTick();
+
+		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), 'Failed to load run details');
+	});
+
+	it('should navigate back when back button is clicked', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const router = useRouter();
+		const { getByTestId } = renderComponent({ pinia });
+		await nextTick();
+
+		const backButton = getByTestId('test-definition-run-detail').querySelector('.backButton');
+		backButton?.dispatchEvent(new Event('click'));
+
+		expect(router.back).toHaveBeenCalled();
+	});
+
+	// Test loading states
+	it('should show loading state while fetching data', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.getTestRun = vi
+			.fn()
+			.mockImplementation(async () => await new Promise(() => {})); // Never resolves
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		expect(container.querySelector('.loading')).toBeTruthy();
+	});
+
+	// Test metrics display
+	it('should correctly format and display all metrics', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testRunWithMultipleMetrics = {
+			...mockTestRun,
+			metrics: {
+				accuracy: 0.956789,
+				precision: 0.887654,
+				recall: 0.923456,
+				f1_score: 0.901234,
+			},
+		};
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: testRunWithMultipleMetrics };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		// Check if the metrics are displayed correctly with 2 decimal places
+		expect(container.textContent).toContain('0.96');
+		expect(container.textContent).toContain('0.89');
+		expect(container.textContent).toContain('0.92');
+		expect(container.textContent).toContain('0.90');
+	});
+
+	// Test status display
+	it('should display correct status with appropriate styling', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testRunWithStatus: TestRunRecord = {
+			...mockTestRun,
+			status: 'error',
+		};
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: testRunWithStatus };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		const statusElement = container.querySelector('.error');
+		expect(statusElement).toBeTruthy();
+		expect(statusElement?.textContent?.trim()).toBe('error');
+	});
+
+	// Test table data
+	it('should correctly populate the test cases table', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		const executionsStore = mockedStore(useExecutionsStore);
+
+		// Mock all required store methods
+		testDefinitionStore.testRunsById = { run1: mockTestRun };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+		testDefinitionStore.getTestRun = getTestRunMock;
+		// Add this mock for fetchTestDefinition
+		testDefinitionStore.fetchTestDefinition = vi.fn().mockResolvedValue(mockTestDefinition);
+
+		executionsStore.fetchExecutions = fetchExecutionsMock;
+		executionsStore.fetchExecution = fetchExecutionMock;
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		// Wait for all promises to resolve
+		await waitAllPromises();
+
+		const tableRows = container.querySelectorAll('.el-table__row');
+		expect(tableRows.length).toBe(mockExecutions.results.length);
+	});
+});

From adcedd1c2b31c1cbd75d1aab056085151ee6d7f1 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 7 Jan 2025 08:05:05 -0500
Subject: [PATCH 02/30] fix(editor): Free AI credits experiment evaluation
 (no-changelog) (#12481)

---
 .../editor-ui/src/components/FreeAiCreditsCallout.test.ts     | 4 ++--
 packages/editor-ui/src/components/FreeAiCreditsCallout.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
index 667b3e3efd..950169394c 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
@@ -86,7 +86,7 @@ describe('FreeAiCreditsCallout', () => {
 		});
 
 		(usePostHog as any).mockReturnValue({
-			isFeatureEnabled: vi.fn().mockReturnValue(true),
+			getVariant: vi.fn().mockReturnValue('variant'),
 		});
 
 		(useProjectsStore as any).mockReturnValue({
@@ -150,7 +150,7 @@ describe('FreeAiCreditsCallout', () => {
 
 	it('should not be able to claim credits if user it is not in experiment', async () => {
 		(usePostHog as any).mockReturnValue({
-			isFeatureEnabled: vi.fn().mockReturnValue(false),
+			getVariant: vi.fn().mockReturnValue('control'),
 		});
 
 		renderComponent(FreeAiCreditsCallout);
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
index 29f99a0e48..4762b4acee 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
@@ -27,7 +27,7 @@ const showSuccessCallout = ref(false);
 const claimingCredits = ref(false);
 
 const settingsStore = useSettingsStore();
-const postHogStore = usePostHog();
+const posthogStore = usePostHog();
 const credentialsStore = useCredentialsStore();
 const usersStore = useUsersStore();
 const ndvStore = useNDVStore();
@@ -57,7 +57,7 @@ const userCanClaimOpenAiCredits = computed(() => {
 	return (
 		settingsStore.isAiCreditsEnabled &&
 		activeNodeHasOpenAiApiCredential.value &&
-		postHogStore.isFeatureEnabled(AI_CREDITS_EXPERIMENT.name) &&
+		posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant &&
 		!userHasOpenAiCredentialAlready.value &&
 		!userHasClaimedAiCreditsAlready.value
 	);

From 61993c39062bc2b804001d6936f6a974f36adc1d Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 7 Jan 2025 08:42:19 -0500
Subject: [PATCH 03/30] feat: Add telemetry events for free AI credits feature
 (no-changelog) (#12459)

---
 .../__tests__/telemetry-event-relay.test.ts   | 124 ++++++++++++++++++
 .../events/relays/telemetry.event-relay.ts    |  17 ++-
 .../components/FreeAiCreditsCallout.test.ts   |  10 ++
 .../src/components/FreeAiCreditsCallout.vue   |   4 +
 packages/workflow/src/TelemetryHelpers.ts     |  19 +++
 .../workflow/test/TelemetryHelpers.test.ts    |  47 ++++++-
 6 files changed, 219 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index 9b4d8aecd2..c41ea773dd 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -5,7 +5,9 @@ import type { INode, INodesGraphResult } from 'n8n-workflow';
 import { NodeApiError, TelemetryHelpers, type IRun, type IWorkflowBase } from 'n8n-workflow';
 
 import { N8N_VERSION } from '@/constants';
+import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import type { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import type { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -52,6 +54,7 @@ describe('TelemetryEventRelay', () => {
 	const nodeTypes = mock<NodeTypes>();
 	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
 	const projectRelationRepository = mock<ProjectRelationRepository>();
+	const credentialsRepository = mock<CredentialsRepository>();
 	const eventService = new EventService();
 
 	let telemetryEventRelay: TelemetryEventRelay;
@@ -67,6 +70,7 @@ describe('TelemetryEventRelay', () => {
 			nodeTypes,
 			sharedWorkflowRepository,
 			projectRelationRepository,
+			credentialsRepository,
 		);
 
 		await telemetryEventRelay.init();
@@ -90,6 +94,7 @@ describe('TelemetryEventRelay', () => {
 				nodeTypes,
 				sharedWorkflowRepository,
 				projectRelationRepository,
+				credentialsRepository,
 			);
 			// @ts-expect-error Private method
 			const setupListenersSpy = jest.spyOn(telemetryEventRelay, 'setupListeners');
@@ -112,6 +117,7 @@ describe('TelemetryEventRelay', () => {
 				nodeTypes,
 				sharedWorkflowRepository,
 				projectRelationRepository,
+				credentialsRepository,
 			);
 			// @ts-expect-error Private method
 			const setupListenersSpy = jest.spyOn(telemetryEventRelay, 'setupListeners');
@@ -1197,6 +1203,9 @@ describe('TelemetryEventRelay', () => {
 
 		it('should call telemetry.track when manual node execution finished', async () => {
 			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:editor');
+			credentialsRepository.findOneBy.mockResolvedValue(
+				mock<CredentialsEntity>({ type: 'openAiApi', isManaged: false }),
+			);
 
 			const runData = {
 				status: 'error',
@@ -1276,6 +1285,8 @@ describe('TelemetryEventRelay', () => {
 					error_node_id: '1',
 					node_id: '1',
 					node_type: 'n8n-nodes-base.jira',
+					is_managed: false,
+					credential_type: null,
 					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
 				}),
 			);
@@ -1498,5 +1509,118 @@ describe('TelemetryEventRelay', () => {
 				}),
 			);
 		});
+
+		it('should call telemetry.track when manual node execution finished with is_managed and credential_type properties', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:editor');
+			credentialsRepository.findOneBy.mockResolvedValue(
+				mock<CredentialsEntity>({ type: 'openAiApi', isManaged: true }),
+			);
+
+			const runData = {
+				status: 'error',
+				mode: 'manual',
+				data: {
+					executionData: {
+						nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+					},
+					startData: {
+						destinationNode: 'OpenAI',
+						runNodeFilter: ['OpenAI'],
+					},
+					resultData: {
+						runData: {},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'Jira',
+								type: 'n8n-nodes-base.jira',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: 'Error message',
+								description: 'Incorrect API key provided',
+								httpCode: '401',
+								stack: '',
+							},
+							{
+								message: 'Error message',
+								description: 'Error description',
+								level: 'warning',
+								functionality: 'regular',
+							},
+						),
+					},
+				},
+			} as unknown as IRun;
+
+			const nodeGraph: INodesGraphResult = {
+				nodeGraph: { node_types: [], node_connections: [], webhookNodeNames: [] },
+				nameIndices: {
+					Jira: '1',
+					OpenAI: '1',
+				},
+			} as unknown as INodesGraphResult;
+
+			jest.spyOn(TelemetryHelpers, 'generateNodesGraph').mockImplementation(() => nodeGraph);
+
+			jest
+				.spyOn(TelemetryHelpers, 'getNodeTypeForName')
+				.mockImplementation(
+					() => ({ type: 'n8n-nodes-base.jira', version: 1, name: 'Jira' }) as unknown as INode,
+				);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(credentialsRepository.findOneBy).toHaveBeenCalledWith({
+				id: 'nhu-l8E4hX',
+			});
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Manual node exec finished',
+				expect.objectContaining({
+					webhook_domain: null,
+					user_id: 'user123',
+					workflow_id: 'workflow123',
+					status: 'error',
+					executionStatus: 'error',
+					sharing_role: 'sharee',
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					error_node_id: '1',
+					node_id: '1',
+					node_type: 'n8n-nodes-base.jira',
+
+					is_managed: true,
+					credential_type: 'openAiApi',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+				}),
+			);
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflow_id: 'workflow123',
+					success: false,
+					is_manual: true,
+					execution_mode: 'manual',
+					version_cli: N8N_VERSION,
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+					error_node_id: '1',
+				}),
+			);
+		});
 	});
 });
diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
index 221449bbab..d2bc61c733 100644
--- a/packages/cli/src/events/relays/telemetry.event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -9,6 +9,7 @@ import { get as pslGet } from 'psl';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -34,6 +35,7 @@ export class TelemetryEventRelay extends EventRelay {
 		private readonly nodeTypes: NodeTypes,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		private readonly projectRelationRepository: ProjectRelationRepository,
+		private readonly credentialsRepository: CredentialsRepository,
 	) {
 		super(eventService);
 	}
@@ -693,6 +695,8 @@ export class TelemetryEventRelay extends EventRelay {
 					error_node_id: telemetryProperties.error_node_id as string,
 					webhook_domain: null,
 					sharing_role: userRole,
+					credential_type: null,
+					is_managed: false,
 				};
 
 				if (!manualExecEventProperties.node_graph_string) {
@@ -703,7 +707,18 @@ export class TelemetryEventRelay extends EventRelay {
 				}
 
 				if (runData.data.startData?.destinationNode) {
-					const telemetryPayload = {
+					const credentialsData = TelemetryHelpers.extractLastExecutedNodeCredentialData(runData);
+					if (credentialsData) {
+						manualExecEventProperties.credential_type = credentialsData.credentialType;
+						const credential = await this.credentialsRepository.findOneBy({
+							id: credentialsData.credentialId,
+						});
+						if (credential) {
+							manualExecEventProperties.is_managed = credential.isManaged;
+						}
+					}
+
+					const telemetryPayload: ITelemetryTrackProperties = {
 						...manualExecEventProperties,
 						node_type: TelemetryHelpers.getNodeTypeForName(
 							workflow,
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
index 950169394c..23c1495a30 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
@@ -11,11 +11,16 @@ import { useRootStore } from '@/stores/root.store';
 import { useToast } from '@/composables/useToast';
 import { renderComponent } from '@/__tests__/render';
 import { mockedStore } from '@/__tests__/utils';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 vi.mock('@/composables/useToast', () => ({
 	useToast: vi.fn(),
 }));
 
+vi.mock('@/composables/useTelemetry', () => ({
+	useTelemetry: vi.fn(),
+}));
+
 vi.mock('@/stores/settings.store', () => ({
 	useSettingsStore: vi.fn(),
 }));
@@ -100,6 +105,10 @@ describe('FreeAiCreditsCallout', () => {
 		(useToast as any).mockReturnValue({
 			showError: vi.fn(),
 		});
+
+		(useTelemetry as any).mockReturnValue({
+			track: vi.fn(),
+		});
 	});
 
 	it('should shows the claim callout when the user can claim credits', () => {
@@ -120,6 +129,7 @@ describe('FreeAiCreditsCallout', () => {
 		await fireEvent.click(claimButton);
 
 		expect(credentialsStore.claimFreeAiCredits).toHaveBeenCalledWith('test-project-id');
+		expect(useTelemetry().track).toHaveBeenCalledWith('User claimed OpenAI credits');
 		assertUserClaimedCredits();
 	});
 
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
index 4762b4acee..9f2030679c 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { AI_CREDITS_EXPERIMENT } from '@/constants';
 import { useCredentialsStore } from '@/stores/credentials.store';
@@ -32,6 +33,7 @@ const credentialsStore = useCredentialsStore();
 const usersStore = useUsersStore();
 const ndvStore = useNDVStore();
 const projectsStore = useProjectsStore();
+const telemetry = useTelemetry();
 
 const i18n = useI18n();
 const toast = useToast();
@@ -73,6 +75,8 @@ const onClaimCreditsClicked = async () => {
 			usersStore.currentUser.settings.userClaimedAiCredits = true;
 		}
 
+		telemetry.track('User claimed OpenAI credits');
+
 		showSuccessCallout.value = true;
 	} catch (e) {
 		toast.showError(
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 705e07cd46..03d675e0e5 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -26,6 +26,7 @@ import type {
 	IDataObject,
 	IRunData,
 	ITaskData,
+	IRun,
 } from './Interfaces';
 import { getNodeParameters } from './NodeHelpers';
 
@@ -470,3 +471,21 @@ export function generateNodesGraph(
 
 	return { nodeGraph, nameIndices, webhookNodeNames };
 }
+
+export function extractLastExecutedNodeCredentialData(
+	runData: IRun,
+): null | { credentialId: string; credentialType: string } {
+	const nodeCredentials = runData?.data?.executionData?.nodeExecutionStack?.[0]?.node?.credentials;
+
+	if (!nodeCredentials) return null;
+
+	const credentialType = Object.keys(nodeCredentials)[0] ?? null;
+
+	if (!credentialType) return null;
+
+	const { id } = nodeCredentials[credentialType];
+
+	if (!id) return null;
+
+	return { credentialId: id, credentialType };
+}
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index 65ae9f31b2..c2b15864f5 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -3,11 +3,12 @@ import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
 
 import { STICKY_NODE_TYPE } from '@/Constants';
 import { ApplicationError } from '@/errors';
-import type { IRunData } from '@/Interfaces';
+import type { IRun, IRunData } from '@/Interfaces';
 import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
 import * as nodeHelpers from '@/NodeHelpers';
 import {
 	ANONYMIZATION_CHARACTER as CHAR,
+	extractLastExecutedNodeCredentialData,
 	generateNodesGraph,
 	getDomainBase,
 	getDomainPath,
@@ -885,6 +886,50 @@ describe('generateNodesGraph', () => {
 	});
 });
 
+describe('extractLastExecutedNodeCredentialData', () => {
+	const cases: Array<[string, IRun]> = [
+		['no data', mock<IRun>({ data: {} })],
+		['no executionData', mock<IRun>({ data: { executionData: undefined } })],
+		[
+			'no nodeExecutionStack',
+			mock<IRun>({ data: { executionData: { nodeExecutionStack: undefined } } }),
+		],
+		[
+			'no node',
+			mock<IRun>({
+				data: { executionData: { nodeExecutionStack: [{ node: undefined }] } },
+			}),
+		],
+		[
+			'no credentials',
+			mock<IRun>({
+				data: { executionData: { nodeExecutionStack: [{ node: { credentials: undefined } }] } },
+			}),
+		],
+	];
+
+	test.each(cases)(
+		'should return credentialId and credentialsType with null if %s',
+		(_, runData) => {
+			expect(extractLastExecutedNodeCredentialData(runData)).toBeNull();
+		},
+	);
+
+	it('should return correct credentialId and credentialsType when last node executed has credential', () => {
+		const runData = mock<IRun>({
+			data: {
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+			},
+		});
+
+		expect(extractLastExecutedNodeCredentialData(runData)).toMatchObject(
+			expect.objectContaining({ credentialId: 'nhu-l8E4hX', credentialType: 'openAiApi' }),
+		);
+	});
+});
+
 function validUrls(idMaker: typeof alphanumericId | typeof email, char = CHAR) {
 	const firstId = idMaker();
 	const secondId = idMaker();

From 30f9c033db28112e1f97bb55d41b5bfce265cb51 Mon Sep 17 00:00:00 2001
From: Eugene <eugene@n8n.io>
Date: Tue, 7 Jan 2025 15:09:59 +0100
Subject: [PATCH 04/30] feat(Google Vertex Chat Model Node): Add an option to
 specify GCP region (#12300)

---
 cypress/pages/modals/credentials-modal.ts     |   1 +
 .../LmChatGoogleVertex.node.ts                |   2 +
 .../credentials/GoogleApi.credentials.ts      | 220 ++++++++++++++++++
 3 files changed, 223 insertions(+)

diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index b8907386a0..ac8e966bc0 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -61,6 +61,7 @@ export class CredentialsModal extends BasePage {
 			this.getters
 				.credentialInputs()
 				.find('input[type=text], input[type=password]')
+				.filter(':not([readonly])')
 				.each(($el) => {
 					cy.wrap($el).type('test');
 				});
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
index 5ca6091378..ab3320c2ba 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
@@ -131,6 +131,7 @@ export class LmChatGoogleVertex implements INodeType {
 		const credentials = await this.getCredentials('googleApi');
 		const privateKey = formatPrivateKey(credentials.privateKey as string);
 		const email = (credentials.email as string).trim();
+		const region = credentials.region as string;
 
 		const modelName = this.getNodeParameter('modelName', itemIndex) as string;
 
@@ -165,6 +166,7 @@ export class LmChatGoogleVertex implements INodeType {
 						private_key: privateKey,
 					},
 				},
+				location: region,
 				model: modelName,
 				topK: options.topK,
 				topP: options.topP,
diff --git a/packages/nodes-base/credentials/GoogleApi.credentials.ts b/packages/nodes-base/credentials/GoogleApi.credentials.ts
index 38df5ac694..73863c7952 100644
--- a/packages/nodes-base/credentials/GoogleApi.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleApi.credentials.ts
@@ -10,6 +10,214 @@ import type {
 	Icon,
 } from 'n8n-workflow';
 
+const regions = [
+	{
+		name: 'africa-south1',
+		displayName: 'Africa',
+		location: 'Johannesburg',
+	},
+	{
+		name: 'asia-east1',
+		displayName: 'Asia Pacific',
+		location: 'Changhua County',
+	},
+	{
+		name: 'asia-east2',
+		displayName: 'Asia Pacific',
+		location: 'Hong Kong',
+	},
+	{
+		name: 'asia-northeast1',
+		displayName: 'Asia Pacific',
+		location: 'Tokyo',
+	},
+	{
+		name: 'asia-northeast2',
+		displayName: 'Asia Pacific',
+		location: 'Osaka',
+	},
+	{
+		name: 'asia-northeast3',
+		displayName: 'Asia Pacific',
+		location: 'Seoul',
+	},
+	{
+		name: 'asia-south1',
+		displayName: 'Asia Pacific',
+		location: 'Mumbai',
+	},
+	{
+		name: 'asia-south2',
+		displayName: 'Asia Pacific',
+		location: 'Delhi',
+	},
+	{
+		name: 'asia-southeast1',
+		displayName: 'Asia Pacific',
+		location: 'Jurong West',
+	},
+	{
+		name: 'asia-southeast2',
+		displayName: 'Asia Pacific',
+		location: 'Jakarta',
+	},
+	{
+		name: 'australia-southeast1',
+		displayName: 'Asia Pacific',
+		location: 'Sydney',
+	},
+	{
+		name: 'australia-southeast2',
+		displayName: 'Asia Pacific',
+		location: 'Melbourne',
+	},
+	{
+		name: 'europe-central2',
+		displayName: 'Europe',
+		location: 'Warsaw',
+	},
+	{
+		name: 'europe-north1',
+		displayName: 'Europe',
+		location: 'Hamina',
+	},
+	{
+		name: 'europe-southwest1',
+		displayName: 'Europe',
+		location: 'Madrid',
+	},
+	{
+		name: 'europe-west1',
+		displayName: 'Europe',
+		location: 'St. Ghislain',
+	},
+	{
+		name: 'europe-west10',
+		displayName: 'Europe',
+		location: 'Berlin',
+	},
+	{
+		name: 'europe-west12',
+		displayName: 'Europe',
+		location: 'Turin',
+	},
+	{
+		name: 'europe-west2',
+		displayName: 'Europe',
+		location: 'London',
+	},
+	{
+		name: 'europe-west3',
+		displayName: 'Europe',
+		location: 'Frankfurt',
+	},
+	{
+		name: 'europe-west4',
+		displayName: 'Europe',
+		location: 'Eemshaven',
+	},
+	{
+		name: 'europe-west6',
+		displayName: 'Europe',
+		location: 'Zurich',
+	},
+	{
+		name: 'europe-west8',
+		displayName: 'Europe',
+		location: 'Milan',
+	},
+	{
+		name: 'europe-west9',
+		displayName: 'Europe',
+		location: 'Paris',
+	},
+	{
+		name: 'me-central1',
+		displayName: 'Middle East',
+		location: 'Doha',
+	},
+	{
+		name: 'me-central2',
+		displayName: 'Middle East',
+		location: 'Dammam',
+	},
+	{
+		name: 'me-west1',
+		displayName: 'Middle East',
+		location: 'Tel Aviv',
+	},
+	{
+		name: 'northamerica-northeast1',
+		displayName: 'Americas',
+		location: 'Montréal',
+	},
+	{
+		name: 'northamerica-northeast2',
+		displayName: 'Americas',
+		location: 'Toronto',
+	},
+	{
+		name: 'northamerica-south1',
+		displayName: 'Americas',
+		location: 'Queretaro',
+	},
+	{
+		name: 'southamerica-east1',
+		displayName: 'Americas',
+		location: 'Osasco',
+	},
+	{
+		name: 'southamerica-west1',
+		displayName: 'Americas',
+		location: 'Santiago',
+	},
+	{
+		name: 'us-central1',
+		displayName: 'Americas',
+		location: 'Council Bluffs',
+	},
+	{
+		name: 'us-east1',
+		displayName: 'Americas',
+		location: 'Moncks Corner',
+	},
+	{
+		name: 'us-east4',
+		displayName: 'Americas',
+		location: 'Ashburn',
+	},
+	{
+		name: 'us-east5',
+		displayName: 'Americas',
+		location: 'Columbus',
+	},
+	{
+		name: 'us-south1',
+		displayName: 'Americas',
+		location: 'Dallas',
+	},
+	{
+		name: 'us-west1',
+		displayName: 'Americas',
+		location: 'The Dalles',
+	},
+	{
+		name: 'us-west2',
+		displayName: 'Americas',
+		location: 'Los Angeles',
+	},
+	{
+		name: 'us-west3',
+		displayName: 'Americas',
+		location: 'Salt Lake City',
+	},
+	{
+		name: 'us-west4',
+		displayName: 'Americas',
+		location: 'Las Vegas',
+	},
+] as const;
+
 export class GoogleApi implements ICredentialType {
 	name = 'googleApi';
 
@@ -20,6 +228,18 @@ export class GoogleApi implements ICredentialType {
 	icon: Icon = 'file:icons/Google.svg';
 
 	properties: INodeProperties[] = [
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: regions.map((r) => ({
+				name: `${r.displayName} (${r.location}) - ${r.name}`,
+				value: r.name,
+			})),
+			default: 'us-central1',
+			description:
+				'The region where the Google Cloud service is located. This applies only to specific nodes, like the Google Vertex Chat Model',
+		},
 		{
 			displayName: 'Service Account Email',
 			name: 'email',

From c03fe0af38c31278f595cb25b85a0ffc64e1c0fc Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Tue, 7 Jan 2025 15:57:03 +0100
Subject: [PATCH 05/30] feat(Execute Workflow Node): Remove ignoreTypeMismatch
 option (no-changelog) (#12482)

---
 cypress/fixtures/Test_Subworkflow-Inputs.json  |  1 -
 .../utils/validateValueAgainstSchema.ts        |  6 +-----
 .../ResourceMapper/ResourceMapper.vue          | 18 ------------------
 .../editor-ui/src/plugins/i18n/locales/en.json |  2 --
 packages/workflow/src/Interfaces.ts            |  1 -
 5 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/cypress/fixtures/Test_Subworkflow-Inputs.json b/cypress/fixtures/Test_Subworkflow-Inputs.json
index aeb4d601fd..ee2b34513e 100644
--- a/cypress/fixtures/Test_Subworkflow-Inputs.json
+++ b/cypress/fixtures/Test_Subworkflow-Inputs.json
@@ -19,7 +19,6 @@
 					"value": {},
 					"matchingColumns": [],
 					"schema": [],
-					"ignoreTypeMismatchErrors": false,
 					"attemptToConvertTypes": false,
 					"convertFieldsToString": true
 				},
diff --git a/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts b/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
index adac8c3a78..d058c50a52 100644
--- a/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
+++ b/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
@@ -61,11 +61,7 @@ const validateResourceMapperValue = (
 			});
 
 			if (!validationResult.valid) {
-				if (!resourceMapperField.ignoreTypeMismatchErrors) {
-					return { ...validationResult, fieldName: key };
-				} else {
-					paramValues[key] = resolvedValue;
-				}
+				return { ...validationResult, fieldName: key };
 			} else {
 				// If it's valid, set the casted value
 				paramValues[key] = validationResult.newValue;
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 9e4459a8f0..c4ef8d8161 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -63,7 +63,6 @@ const state = reactive({
 		value: {},
 		matchingColumns: [] as string[],
 		schema: [] as ResourceMapperField[],
-		ignoreTypeMismatchErrors: false,
 		attemptToConvertTypes: false,
 		// This should always be true if `showTypeConversionOptions` is provided
 		// It's used to avoid accepting any value as string without casting it
@@ -664,23 +663,6 @@ defineExpose({
 					}
 				"
 			/>
-			<ParameterInputFull
-				:parameter="{
-					name: 'ignoreTypeMismatchErrors',
-					type: 'boolean',
-					displayName: locale.baseText('resourceMapper.ignoreTypeMismatchErrors.displayName'),
-					default: false,
-					description: locale.baseText('resourceMapper.ignoreTypeMismatchErrors.description'),
-				}"
-				:path="props.path + '.ignoreTypeMismatchErrors'"
-				:value="state.paramValue.ignoreTypeMismatchErrors"
-				@update="
-					(x: IUpdateInformation<NodeParameterValueType>) => {
-						state.paramValue.ignoreTypeMismatchErrors = x.value as boolean;
-						emitValueChanged();
-					}
-				"
-			/>
 		</div>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index ace6ef4c98..017390398e 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1600,8 +1600,6 @@
 	"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
 	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
 	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
-	"resourceMapper.ignoreTypeMismatchErrors.displayName": "Ignore type mismatch errors",
-	"resourceMapper.ignoreTypeMismatchErrors.description": "Whether type mismatches should be ignored, rather than returning an Error",
 	"runData.openSubExecution": "Inspect Sub-Execution {id}",
 	"runData.openParentExecution": "Inspect Parent Execution {id}",
 	"runData.emptyItemHint": "This is an item, but it's empty.",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index f6dfb3b977..0a94261cf8 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2710,7 +2710,6 @@ export type ResourceMapperValue = {
 	value: { [key: string]: string | number | boolean | null } | null;
 	matchingColumns: string[];
 	schema: ResourceMapperField[];
-	ignoreTypeMismatchErrors: boolean;
 	attemptToConvertTypes: boolean;
 	convertFieldsToString: boolean;
 };

From ac6b244c71dfd9d92c425d7e51445ff269d7033b Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 7 Jan 2025 10:01:29 -0500
Subject: [PATCH 06/30] fix(editor): Update free AI credits success claim
 callout (no-changelog) (#12480)

---
 .../src/components/FreeAiCreditsCallout.test.ts   | 12 +++++++++++-
 .../src/components/FreeAiCreditsCallout.vue       | 15 ++++++++++-----
 .../editor-ui/src/plugins/i18n/locales/en.json    |  3 ++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
index 23c1495a30..dd459f5110 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
@@ -60,7 +60,17 @@ const assertUserCanClaimCredits = () => {
 };
 
 const assertUserClaimedCredits = () => {
-	expect(screen.getByText('Claimed 100 free OpenAI API credits')).toBeInTheDocument();
+	expect(
+		screen.getByText(
+			'Claimed 100 free OpenAI API credits! Please note these free credits are only for the following models:',
+		),
+	).toBeInTheDocument();
+
+	expect(
+		screen.getByText(
+			'gpt-4o-mini, text-embedding-3-small, dall-e-3, tts-1, whisper-1, and text-moderation-latest',
+		),
+	).toBeInTheDocument();
 };
 
 describe('FreeAiCreditsCallout', () => {
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
index 9f2030679c..922df4cf89 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
@@ -112,11 +112,16 @@ const onClaimCreditsClicked = async () => {
 			</template>
 		</n8n-callout>
 		<n8n-callout v-else-if="showSuccessCallout" theme="success" icon="check-circle">
-			{{
-				i18n.baseText('freeAi.credits.callout.success.title', {
-					interpolate: { credits: settingsStore.aiCreditsQuota },
-				})
-			}}
+			<n8n-text>
+				{{
+					i18n.baseText('freeAi.credits.callout.success.title.part1', {
+						interpolate: { credits: settingsStore.aiCreditsQuota },
+					})
+				}}</n8n-text
+			>&nbsp;
+			<n8n-text :bold="true">
+				{{ i18n.baseText('freeAi.credits.callout.success.title.part2') }}</n8n-text
+			>
 		</n8n-callout>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 017390398e..67dc315aa6 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -2844,7 +2844,8 @@
 	"testDefinition.deleteTest": "Delete Test",
 	"freeAi.credits.callout.claim.title": "Get {credits} free OpenAI API credits",
 	"freeAi.credits.callout.claim.button.label": "Claim credits",
-	"freeAi.credits.callout.success.title": "Claimed {credits} free OpenAI API credits",
+	"freeAi.credits.callout.success.title.part1": "Claimed {credits} free OpenAI API credits! Please note these free credits are only for the following models:",
+	"freeAi.credits.callout.success.title.part2": "gpt-4o-mini, text-embedding-3-small, dall-e-3, tts-1, whisper-1, and text-moderation-latest",
 	"freeAi.credits.credentials.edit": "This is a managed credential and cannot be edited.",
 	"freeAi.credits.showError.claim.title": "Free AI credits",
 	"freeAi.credits.showError.claim.message": "Enable to claim credits"

From f7eb90148958c29dbd6f1486c6e473ec58c6c001 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 7 Jan 2025 17:02:06 +0200
Subject: [PATCH 07/30] test: Update template credentials setup e2e test for
 new canvas (no-changelog) (#12487)

---
 cypress/e2e/34-template-credentials-setup.cy.ts    | 12 +++++++++++-
 cypress/pages/notifications.ts                     |  7 ++++++-
 .../__snapshots__/useCanvasOperations.test.ts.snap | 10 ++++++++--
 .../src/composables/useCanvasOperations.ts         |  6 ++++++
 packages/editor-ui/src/views/NodeView.v2.vue       | 14 ++++++++++++++
 5 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/cypress/e2e/34-template-credentials-setup.cy.ts b/cypress/e2e/34-template-credentials-setup.cy.ts
index 386c83eb0a..8d372acac0 100644
--- a/cypress/e2e/34-template-credentials-setup.cy.ts
+++ b/cypress/e2e/34-template-credentials-setup.cy.ts
@@ -3,6 +3,7 @@ import * as formStep from '../composables/setup-template-form-step';
 import { getSetupWorkflowCredentialsButton } from '../composables/setup-workflow-credentials-button';
 import TestTemplate1 from '../fixtures/Test_Template_1.json';
 import TestTemplate2 from '../fixtures/Test_Template_2.json';
+import { clearNotifications } from '../pages/notifications';
 import {
 	clickUseWorkflowButtonByTitle,
 	visitTemplateCollectionPage,
@@ -111,16 +112,19 @@ describe('Template credentials setup', () => {
 		templateCredentialsSetupPage.fillInDummyCredentialsForAppWithConfirm('X (Formerly Twitter)');
 		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Telegram');
 
+		clearNotifications();
+
 		templateCredentialsSetupPage.finishCredentialSetup();
 
 		workflowPage.getters.canvasNodes().should('have.length', 3);
 
+		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+
 		// Focus the canvas so the copy to clipboard works
 		workflowPage.getters.canvasNodes().eq(0).realClick();
 		workflowPage.actions.hitSelectAll();
 		workflowPage.actions.hitCopy();
 
-		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
 		// Check workflow JSON by copying it to clipboard
 		cy.readClipboard().then((workflowJSON) => {
 			const workflow = JSON.parse(workflowJSON);
@@ -154,6 +158,8 @@ describe('Template credentials setup', () => {
 		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Email (IMAP)');
 		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Nextcloud');
 
+		clearNotifications();
+
 		templateCredentialsSetupPage.finishCredentialSetup();
 
 		workflowPage.getters.canvasNodes().should('have.length', 3);
@@ -176,6 +182,8 @@ describe('Template credentials setup', () => {
 			templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
 			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Shopify');
 
+			clearNotifications();
+
 			templateCredentialsSetupPage.finishCredentialSetup();
 
 			getSetupWorkflowCredentialsButton().should('be.visible');
@@ -192,6 +200,8 @@ describe('Template credentials setup', () => {
 			templateCredentialsSetupPage.fillInDummyCredentialsForAppWithConfirm('X (Formerly Twitter)');
 			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Telegram');
 
+			clearNotifications();
+
 			setupCredsModal.closeModalFromContinueButton();
 			setupCredsModal.getWorkflowCredentialsModal().should('not.exist');
 
diff --git a/cypress/pages/notifications.ts b/cypress/pages/notifications.ts
index 162c536007..af2a51e369 100644
--- a/cypress/pages/notifications.ts
+++ b/cypress/pages/notifications.ts
@@ -13,5 +13,10 @@ export const infoToast = () => cy.get('.el-notification:has(.el-notification--in
  * Actions
  */
 export const clearNotifications = () => {
-	successToast().find('.el-notification__closeBtn').click({ multiple: true });
+	const buttons = successToast().find('.el-notification__closeBtn');
+	buttons.then(($buttons) => {
+		if ($buttons.length) {
+			buttons.click({ multiple: true });
+		}
+	});
 };
diff --git a/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap b/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
index 079a5d2f51..821da444d4 100644
--- a/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
+++ b/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
@@ -29,7 +29,10 @@ exports[`useCanvasOperations > copyNodes > should copy nodes 1`] = `
     }
   ],
   "connections": {},
-  "pinData": {}
+  "pinData": {},
+  "meta": {
+    "instanceId": ""
+  }
 }",
   ],
 ]
@@ -64,7 +67,10 @@ exports[`useCanvasOperations > cutNodes > should copy and delete nodes 1`] = `
     }
   ],
   "connections": {},
-  "pinData": {}
+  "pinData": {},
+  "meta": {
+    "instanceId": ""
+  }
 }",
   ],
 ]
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index 38db98fe01..dacac9cd2c 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -1887,6 +1887,12 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	async function copyNodes(ids: string[]) {
 		const workflowData = deepCopy(getNodesToSave(workflowsStore.getNodesByIds(ids)));
 
+		workflowData.meta = {
+			...workflowData.meta,
+			...workflowsStore.workflow.meta,
+			instanceId: rootStore.instanceId,
+		};
+
 		await clipboard.copy(JSON.stringify(workflowData, null, 2));
 
 		telemetry.track('User copied nodes', {
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 82f0bc29a9..865adf80b0 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -118,6 +118,11 @@ const LazyNodeDetailsView = defineAsyncComponent(
 	async () => await import('@/components/NodeDetailsView.vue'),
 );
 
+const LazySetupWorkflowCredentialsButton = defineAsyncComponent(
+	async () =>
+		await import('@/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue'),
+);
+
 const $style = useCssModule();
 const router = useRouter();
 const route = useRoute();
@@ -1696,6 +1701,9 @@ onBeforeUnmount(() => {
 		@viewport-change="onViewportChange"
 		@drag-and-drop="onDragAndDrop"
 	>
+		<Suspense>
+			<LazySetupWorkflowCredentialsButton :class="$style.setupCredentialsButtonWrapper" />
+		</Suspense>
 		<div v-if="!isCanvasReadOnly" :class="$style.executionButtons">
 			<CanvasRunWorkflowButton
 				v-if="isRunWorkflowButtonVisible"
@@ -1804,6 +1812,12 @@ onBeforeUnmount(() => {
 	}
 }
 
+.setupCredentialsButtonWrapper {
+	position: absolute;
+	left: var(--spacing-s);
+	top: var(--spacing-s);
+}
+
 .readOnlyEnvironmentNotification {
 	position: absolute;
 	bottom: 16px;

From cc008f92397e1f02251098081f402a82528b118a Mon Sep 17 00:00:00 2001
From: Eugene <eugene@n8n.io>
Date: Tue, 7 Jan 2025 16:03:16 +0100
Subject: [PATCH 08/30] feat: Save the number of successful, failed and total
 executions for Test Run (no-changelog) (#12131)

---
 .../cli/src/databases/entities/test-run.ee.ts |  19 ++
 .../1736172058779-AddStatsColumnsToTestRun.ts |  31 +++
 .../src/databases/migrations/mysqldb/index.ts |   2 +
 .../databases/migrations/postgresdb/index.ts  |   2 +
 .../src/databases/migrations/sqlite/index.ts  |   2 +
 .../repositories/test-run.repository.ee.ts    |  18 +-
 .../__tests__/test-runner.service.ee.test.ts  | 199 +++++++++++++++++-
 .../test-runner/test-runner.service.ee.ts     |  89 ++++----
 .../evaluation/test-runs.api.test.ts          |   2 +-
 9 files changed, 323 insertions(+), 41 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts

diff --git a/packages/cli/src/databases/entities/test-run.ee.ts b/packages/cli/src/databases/entities/test-run.ee.ts
index ab5f041f11..39d8e16ddd 100644
--- a/packages/cli/src/databases/entities/test-run.ee.ts
+++ b/packages/cli/src/databases/entities/test-run.ee.ts
@@ -35,4 +35,23 @@ export class TestRun extends WithTimestampsAndStringId {
 
 	@Column(jsonColumnType, { nullable: true })
 	metrics: AggregatedTestRunMetrics;
+
+	/**
+	 * Total number of the test cases, matching the filter condition of the test definition (specified annotationTag)
+	 */
+	@Column('integer', { nullable: true })
+	totalCases: number;
+
+	/**
+	 * Number of test cases that passed (evaluation workflow was executed successfully)
+	 */
+	@Column('integer', { nullable: true })
+	passedCases: number;
+
+	/**
+	 * Number of failed test cases
+	 * (any unexpected exception happened during the execution or evaluation workflow ended with an error)
+	 */
+	@Column('integer', { nullable: true })
+	failedCases: number;
 }
diff --git a/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts b/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts
new file mode 100644
index 0000000000..8d6a5cdc20
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts
@@ -0,0 +1,31 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const columns = ['totalCases', 'passedCases', 'failedCases'] as const;
+
+export class AddStatsColumnsToTestRun1736172058779 implements ReversibleMigration {
+	async up({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('test_run');
+		const columnNames = columns.map((name) => escape.columnName(name));
+
+		// Values can be NULL only if the test run is new, otherwise they must be non-negative integers.
+		// Test run might be cancelled or interrupted by unexpected error at any moment, so values can be either NULL or non-negative integers.
+		for (const name of columnNames) {
+			await runQuery(`ALTER TABLE ${tableName} ADD COLUMN ${name} INT CHECK(
+				CASE
+					WHEN status = 'new' THEN ${name} IS NULL
+					WHEN status in ('cancelled', 'error') THEN ${name} IS NULL OR ${name} >= 0
+					ELSE ${name} >= 0
+				END
+			)`);
+		}
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('test_run');
+		const columnNames = columns.map((name) => escape.columnName(name));
+
+		for (const name of columnNames) {
+			await runQuery(`ALTER TABLE ${tableName} DROP COLUMN ${name}`);
+		}
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 89df273472..b76409c0c1 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -76,6 +76,7 @@ import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-Crea
 import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
 import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
+import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -154,4 +155,5 @@ export const mysqlMigrations: Migration[] = [
 	AddMockedNodesColumnToTestDefinition1733133775640,
 	AddManagedColumnToCredentialsTable1734479635324,
 	AddProjectIcons1729607673469,
+	AddStatsColumnsToTestRun1736172058779,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index d5d72282f4..7cf90bde5b 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -76,6 +76,7 @@ import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-Crea
 import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
 import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
+import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -154,4 +155,5 @@ export const postgresMigrations: Migration[] = [
 	AddMockedNodesColumnToTestDefinition1733133775640,
 	AddManagedColumnToCredentialsTable1734479635324,
 	AddProjectIcons1729607673469,
+	AddStatsColumnsToTestRun1736172058779,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 7fec59baf2..363a6e47c3 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -73,6 +73,7 @@ import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-Crea
 import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
 import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
+import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -148,6 +149,7 @@ const sqliteMigrations: Migration[] = [
 	AddMockedNodesColumnToTestDefinition1733133775640,
 	AddManagedColumnToCredentialsTable1734479635324,
 	AddProjectIcons1729607673469,
+	AddStatsColumnsToTestRun1736172058779,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/test-run.repository.ee.ts b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
index f0f235c551..037844734f 100644
--- a/packages/cli/src/databases/repositories/test-run.repository.ee.ts
+++ b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
@@ -21,14 +21,28 @@ export class TestRunRepository extends Repository<TestRun> {
 		return await this.save(testRun);
 	}
 
-	async markAsRunning(id: string) {
-		return await this.update(id, { status: 'running', runAt: new Date() });
+	async markAsRunning(id: string, totalCases: number) {
+		return await this.update(id, {
+			status: 'running',
+			runAt: new Date(),
+			totalCases,
+			passedCases: 0,
+			failedCases: 0,
+		});
 	}
 
 	async markAsCompleted(id: string, metrics: AggregatedTestRunMetrics) {
 		return await this.update(id, { status: 'completed', completedAt: new Date(), metrics });
 	}
 
+	async incrementPassed(id: string) {
+		return await this.increment({ id }, 'passedCases', 1);
+	}
+
+	async incrementFailed(id: string) {
+		return await this.increment({ id }, 'failedCases', 1);
+	}
+
 	async getMany(testDefinitionId: string, options: ListQuery.Options) {
 		const findManyOptions: FindManyOptions<TestRun> = {
 			where: { testDefinition: { id: testDefinitionId } },
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
index 06b9653374..cc3c3bc33b 100644
--- a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
@@ -2,7 +2,8 @@ import type { SelectQueryBuilder } from '@n8n/typeorm';
 import { stringify } from 'flatted';
 import { readFileSync } from 'fs';
 import { mock, mockDeep } from 'jest-mock-extended';
-import type { GenericValue, IRun } from 'n8n-workflow';
+import type { ErrorReporter } from 'n8n-core';
+import type { ExecutionError, GenericValue, IRun } from 'n8n-workflow';
 import path from 'path';
 
 import type { ActiveExecutions } from '@/active-executions';
@@ -90,6 +91,16 @@ function mockExecutionData() {
 	});
 }
 
+function mockErrorExecutionData() {
+	return mock<IRun>({
+		data: {
+			resultData: {
+				error: mock<ExecutionError>(),
+			},
+		},
+	});
+}
+
 function mockEvaluationExecutionData(metrics: Record<string, GenericValue>) {
 	return mock<IRun>({
 		data: {
@@ -110,6 +121,9 @@ function mockEvaluationExecutionData(metrics: Record<string, GenericValue>) {
 						},
 					],
 				},
+				// error is an optional prop, but jest-mock-extended will mock it by default,
+				// which affects the code logic. So, we need to explicitly set it to undefined.
+				error: undefined,
 			},
 		},
 	});
@@ -156,6 +170,8 @@ describe('TestRunnerService', () => {
 		testRunRepository.createTestRun.mockClear();
 		testRunRepository.markAsRunning.mockClear();
 		testRunRepository.markAsCompleted.mockClear();
+		testRunRepository.incrementFailed.mockClear();
+		testRunRepository.incrementPassed.mockClear();
 	});
 
 	test('should create an instance of TestRunnerService', async () => {
@@ -167,6 +183,7 @@ describe('TestRunnerService', () => {
 			testRunRepository,
 			testMetricRepository,
 			mockNodeTypes,
+			mock<ErrorReporter>(),
 		);
 
 		expect(testRunnerService).toBeInstanceOf(TestRunnerService);
@@ -181,6 +198,7 @@ describe('TestRunnerService', () => {
 			testRunRepository,
 			testMetricRepository,
 			mockNodeTypes,
+			mock<ErrorReporter>(),
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -218,6 +236,7 @@ describe('TestRunnerService', () => {
 			testRunRepository,
 			testMetricRepository,
 			mockNodeTypes,
+			mock<ErrorReporter>(),
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -298,12 +317,185 @@ describe('TestRunnerService', () => {
 		// Check Test Run status was updated correctly
 		expect(testRunRepository.createTestRun).toHaveBeenCalledTimes(1);
 		expect(testRunRepository.markAsRunning).toHaveBeenCalledTimes(1);
-		expect(testRunRepository.markAsRunning).toHaveBeenCalledWith('test-run-id');
+		expect(testRunRepository.markAsRunning).toHaveBeenCalledWith('test-run-id', expect.any(Number));
 		expect(testRunRepository.markAsCompleted).toHaveBeenCalledTimes(1);
 		expect(testRunRepository.markAsCompleted).toHaveBeenCalledWith('test-run-id', {
 			metric1: 0.75,
 			metric2: 0,
 		});
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(2);
+		expect(testRunRepository.incrementFailed).not.toHaveBeenCalled();
+	});
+
+	test('should properly count passed and failed executions', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			mock<ErrorReporter>(),
+		);
+
+		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+			id: 'workflow-under-test-id',
+			...wfUnderTestJson,
+		});
+
+		workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+			id: 'evaluation-workflow-id',
+			...wfEvaluationJson,
+		});
+
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-2');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-3');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-4');
+
+		// Mock executions of workflow under test
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id')
+			.mockResolvedValue(mockExecutionData());
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockRejectedValue(new Error('Some error'));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
+			}),
+		);
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.incrementFailed).toHaveBeenCalledTimes(1);
+	});
+
+	test('should properly count failed test executions', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			mock<ErrorReporter>(),
+		);
+
+		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+			id: 'workflow-under-test-id',
+			...wfUnderTestJson,
+		});
+
+		workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+			id: 'evaluation-workflow-id',
+			...wfEvaluationJson,
+		});
+
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-2');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-3');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-4');
+
+		// Mock executions of workflow under test
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id')
+			.mockResolvedValue(mockExecutionData());
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-3')
+			.mockResolvedValue(mockErrorExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
+			}),
+		);
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.incrementFailed).toHaveBeenCalledTimes(1);
+	});
+
+	test('should properly count failed evaluations', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			mock<ErrorReporter>(),
+		);
+
+		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+			id: 'workflow-under-test-id',
+			...wfUnderTestJson,
+		});
+
+		workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+			id: 'evaluation-workflow-id',
+			...wfEvaluationJson,
+		});
+
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-2');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-3');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-4');
+
+		// Mock executions of workflow under test
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id')
+			.mockResolvedValue(mockExecutionData());
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockResolvedValue(mockErrorExecutionData());
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
+			}),
+		);
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.incrementFailed).toHaveBeenCalledTimes(1);
 	});
 
 	test('should specify correct start nodes when running workflow under test', async () => {
@@ -315,6 +507,7 @@ describe('TestRunnerService', () => {
 			testRunRepository,
 			testMetricRepository,
 			mockNodeTypes,
+			mock<ErrorReporter>(),
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -388,6 +581,7 @@ describe('TestRunnerService', () => {
 			testRunRepository,
 			testMetricRepository,
 			mockNodeTypes,
+			mock<ErrorReporter>(),
 		);
 
 		const startNodesData = (testRunnerService as any).getStartNodesData(
@@ -412,6 +606,7 @@ describe('TestRunnerService', () => {
 			testRunRepository,
 			testMetricRepository,
 			mockNodeTypes,
+			mock<ErrorReporter>(),
 		);
 
 		const startNodesData = (testRunnerService as any).getStartNodesData(
diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
index c1e6e33942..5a054a3527 100644
--- a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
@@ -1,5 +1,6 @@
 import { Service } from '@n8n/di';
 import { parse } from 'flatted';
+import { ErrorReporter } from 'n8n-core';
 import { NodeConnectionType, Workflow } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -45,6 +46,7 @@ export class TestRunnerService {
 		private readonly testRunRepository: TestRunRepository,
 		private readonly testMetricRepository: TestMetricRepository,
 		private readonly nodeTypes: NodeTypes,
+		private readonly errorReporter: ErrorReporter,
 	) {}
 
 	/**
@@ -230,51 +232,66 @@ export class TestRunnerService {
 
 		// 2. Run over all the test cases
 
-		await this.testRunRepository.markAsRunning(testRun.id);
+		await this.testRunRepository.markAsRunning(testRun.id, pastExecutions.length);
 
 		// Object to collect the results of the evaluation workflow executions
 		const metrics = new EvaluationMetrics(testMetricNames);
 
 		for (const { id: pastExecutionId } of pastExecutions) {
-			// Fetch past execution with data
-			const pastExecution = await this.executionRepository.findOne({
-				where: { id: pastExecutionId },
-				relations: ['executionData', 'metadata'],
-			});
-			assert(pastExecution, 'Execution not found');
+			try {
+				// Fetch past execution with data
+				const pastExecution = await this.executionRepository.findOne({
+					where: { id: pastExecutionId },
+					relations: ['executionData', 'metadata'],
+				});
+				assert(pastExecution, 'Execution not found');
 
-			const executionData = parse(pastExecution.executionData.data) as IRunExecutionData;
+				const executionData = parse(pastExecution.executionData.data) as IRunExecutionData;
 
-			// Run the test case and wait for it to finish
-			const testCaseExecution = await this.runTestCase(
-				workflow,
-				executionData,
-				pastExecution.executionData.workflowData,
-				test.mockedNodes,
-				user.id,
-			);
+				// Run the test case and wait for it to finish
+				const testCaseExecution = await this.runTestCase(
+					workflow,
+					executionData,
+					pastExecution.executionData.workflowData,
+					test.mockedNodes,
+					user.id,
+				);
 
-			// In case of a permission check issue, the test case execution will be undefined.
-			// Skip them and continue with the next test case
-			if (!testCaseExecution) {
-				continue;
+				// In case of a permission check issue, the test case execution will be undefined.
+				// Skip them, increment the failed count and continue with the next test case
+				if (!testCaseExecution) {
+					await this.testRunRepository.incrementFailed(testRun.id);
+					continue;
+				}
+
+				// Collect the results of the test case execution
+				const testCaseRunData = testCaseExecution.data.resultData.runData;
+
+				// Get the original runData from the test case execution data
+				const originalRunData = executionData.resultData.runData;
+
+				// Run the evaluation workflow with the original and new run data
+				const evalExecution = await this.runTestCaseEvaluation(
+					evaluationWorkflow,
+					originalRunData,
+					testCaseRunData,
+					testRun.id,
+				);
+				assert(evalExecution);
+
+				metrics.addResults(this.extractEvaluationResult(evalExecution));
+
+				if (evalExecution.data.resultData.error) {
+					await this.testRunRepository.incrementFailed(testRun.id);
+				} else {
+					await this.testRunRepository.incrementPassed(testRun.id);
+				}
+			} catch (e) {
+				// In case of an unexpected error, increment the failed count and continue with the next test case
+				await this.testRunRepository.incrementFailed(testRun.id);
+
+				this.errorReporter.error(e);
 			}
-
-			// Collect the results of the test case execution
-			const testCaseRunData = testCaseExecution.data.resultData.runData;
-
-			// Get the original runData from the test case execution data
-			const originalRunData = executionData.resultData.runData;
-
-			// Run the evaluation workflow with the original and new run data
-			const evalExecution = await this.runTestCaseEvaluation(
-				evaluationWorkflow,
-				originalRunData,
-				testCaseRunData,
-				testRun.id,
-			);
-			assert(evalExecution);
-			metrics.addResults(this.extractEvaluationResult(evalExecution));
 		}
 
 		const aggregatedMetrics = metrics.getAggregatedMetrics();
diff --git a/packages/cli/test/integration/evaluation/test-runs.api.test.ts b/packages/cli/test/integration/evaluation/test-runs.api.test.ts
index 8f01029ad2..3fcc321cc9 100644
--- a/packages/cli/test/integration/evaluation/test-runs.api.test.ts
+++ b/packages/cli/test/integration/evaluation/test-runs.api.test.ts
@@ -93,7 +93,7 @@ describe('GET /evaluation/test-definitions/:testDefinitionId/runs', () => {
 		const testRunRepository = Container.get(TestRunRepository);
 		const testRun1 = await testRunRepository.createTestRun(testDefinition.id);
 		// Mark as running just to make a slight delay between the runs
-		await testRunRepository.markAsRunning(testRun1.id);
+		await testRunRepository.markAsRunning(testRun1.id, 10);
 		const testRun2 = await testRunRepository.createTestRun(testDefinition.id);
 
 		// Fetch the first page

From 04e2928d345f83c202c762e4673cf878b4762f33 Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Tue, 7 Jan 2025 17:06:16 +0100
Subject: [PATCH 09/30] feat(editor): Update Sub-Workflow Debugging Copy
 (#12483)

---
 cypress/e2e/47-subworkflow-debugging.cy.ts             |  8 ++++----
 packages/editor-ui/src/components/RunData.test.ts      |  8 ++++----
 packages/editor-ui/src/components/RunData.vue          | 10 +++++++---
 .../src/components/RunDataAi/RunDataAiContent.vue      |  2 +-
 packages/editor-ui/src/components/RunDataTable.vue     |  4 ++--
 packages/editor-ui/src/plugins/i18n/locales/en.json    |  7 ++++---
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/cypress/e2e/47-subworkflow-debugging.cy.ts b/cypress/e2e/47-subworkflow-debugging.cy.ts
index f808bdd044..725b6b32c4 100644
--- a/cypress/e2e/47-subworkflow-debugging.cy.ts
+++ b/cypress/e2e/47-subworkflow-debugging.cy.ts
@@ -40,7 +40,7 @@ describe('Subworkflow debugging', () => {
 			openNode('Execute Workflow with param');
 
 			getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
-			getOutputPanelRelatedExecutionLink().should('contain.text', 'Inspect Sub-Execution');
+			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
 			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
 
 			// ensure workflow executed and waited on output
@@ -64,7 +64,7 @@ describe('Subworkflow debugging', () => {
 			openNode('Execute Workflow with param2');
 
 			getOutputPanelItemsCount().should('not.exist');
-			getOutputPanelRelatedExecutionLink().should('contain.text', 'Inspect Sub-Execution');
+			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
 			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
 
 			// ensure workflow executed but returned same data as input
@@ -109,7 +109,7 @@ describe('Subworkflow debugging', () => {
 			openNode('Execute Workflow with param');
 
 			getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
-			getOutputPanelRelatedExecutionLink().should('contain.text', 'Inspect Sub-Execution');
+			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
 			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
 
 			// ensure workflow executed and waited on output
@@ -125,7 +125,7 @@ describe('Subworkflow debugging', () => {
 
 			getExecutionPreviewOutputPanelRelatedExecutionLink().should(
 				'include.text',
-				'Inspect Parent Execution',
+				'View parent execution',
 			);
 
 			getExecutionPreviewOutputPanelRelatedExecutionLink()
diff --git a/packages/editor-ui/src/components/RunData.test.ts b/packages/editor-ui/src/components/RunData.test.ts
index 417bd6fb61..26a58b06ac 100644
--- a/packages/editor-ui/src/components/RunData.test.ts
+++ b/packages/editor-ui/src/components/RunData.test.ts
@@ -282,7 +282,7 @@ describe('RunData', () => {
 		});
 
 		expect(getByTestId('related-execution-link')).toBeInTheDocument();
-		expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Sub-Execution 123');
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution');
 		expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
 		expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
 
@@ -311,7 +311,7 @@ describe('RunData', () => {
 		});
 
 		expect(getByTestId('related-execution-link')).toBeInTheDocument();
-		expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Parent Execution 123');
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View parent execution');
 		expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
 		expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
 
@@ -344,7 +344,7 @@ describe('RunData', () => {
 		});
 
 		expect(getByTestId('related-execution-link')).toBeInTheDocument();
-		expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Sub-Execution 123');
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution 123');
 		expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
 		expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
 
@@ -389,7 +389,7 @@ describe('RunData', () => {
 		});
 
 		expect(getByTestId('related-execution-link')).toBeInTheDocument();
-		expect(getByTestId('related-execution-link')).toHaveTextContent('Inspect Sub-Execution 123');
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution 123');
 
 		expect(queryByTestId('ndv-items-count')).not.toBeInTheDocument();
 		expect(getByTestId('run-selector')).toBeInTheDocument();
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 57d0c8dc82..9634e1e04f 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -1263,9 +1263,13 @@ function getExecutionLinkLabel(task: ITaskMetadata): string | undefined {
 	}
 
 	if (task.subExecution) {
-		return i18n.baseText('runData.openSubExecution', {
-			interpolate: { id: task.subExecution.executionId },
-		});
+		if (activeTaskMetadata.value?.subExecutionsCount === 1) {
+			return i18n.baseText('runData.openSubExecutionSingle');
+		} else {
+			return i18n.baseText('runData.openSubExecutionWithId', {
+				interpolate: { id: task.subExecution.executionId },
+			});
+		}
 	}
 
 	return;
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
index 9812bff6fe..e065e46250 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -149,7 +149,7 @@ const outputError = computed(() => {
 						>
 							<N8nIcon icon="external-link-alt" size="xsmall" />
 							{{
-								i18n.baseText('runData.openSubExecution', {
+								i18n.baseText('runData.openSubExecutionWithId', {
 									interpolate: {
 										id: runMeta.subExecution?.executionId,
 									},
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 68e80a38a8..925c57cfee 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -439,7 +439,7 @@ watch(focusedMappableInput, (curr) => {
 					>
 						<N8nTooltip
 							:content="
-								i18n.baseText('runData.table.inspectSubExecution', {
+								i18n.baseText('runData.table.viewSubExecution', {
 									interpolate: {
 										id: `${tableData.metadata.data[index1]?.subExecution.executionId}`,
 									},
@@ -575,7 +575,7 @@ watch(focusedMappableInput, (curr) => {
 					>
 						<N8nTooltip
 							:content="
-								i18n.baseText('runData.table.inspectSubExecution', {
+								i18n.baseText('runData.table.viewSubExecution', {
 									interpolate: {
 										id: `${tableData.metadata.data[index1]?.subExecution.executionId}`,
 									},
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 67dc315aa6..146b8948a7 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1600,8 +1600,9 @@
 	"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
 	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
 	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
-	"runData.openSubExecution": "Inspect Sub-Execution {id}",
-	"runData.openParentExecution": "Inspect Parent Execution {id}",
+	"runData.openSubExecutionSingle": "View sub-execution",
+	"runData.openSubExecutionWithId": "View sub-execution {id}",
+	"runData.openParentExecution": "View parent execution {id}",
 	"runData.emptyItemHint": "This is an item, but it's empty.",
 	"runData.emptyArray": "[empty array]",
 	"runData.emptyString": "[empty]",
@@ -1649,7 +1650,7 @@
 	"runData.showBinaryData": "View",
 	"runData.startTime": "Start Time",
 	"runData.table": "Table",
-	"runData.table.inspectSubExecution": "Inspect sub-execution {id}",
+	"runData.table.viewSubExecution": "View sub-execution {id}",
 	"runData.pindata.learnMore": "Learn more",
 	"runData.pindata.thisDataIsPinned": "This data is pinned.",
 	"runData.pindata.unpin": "Unpin",

From 976586fbfd033a8eed2525f5e88cafd978200e59 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 7 Jan 2025 19:05:52 +0200
Subject: [PATCH 10/30] test: Update demo e2e tests for new canvas
 (no-changelog) (#12488)

---
 cypress/composables/workflow.ts                       |  5 ++++-
 .../components/canvas/elements/nodes/CanvasNode.vue   | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index 29b871f560..3289d43a79 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -46,7 +46,10 @@ export function getNodes() {
 }
 
 export function getNodeByName(name: string) {
-	return cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0);
+	return cy.ifCanvasVersion(
+		() => cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0),
+		() => cy.getByTestId('canvas-node').filter(`[data-node-name="${name}"]`).eq(0),
+	);
 }
 
 export function disableNode(name: string) {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index ff42272288..5dbd08db32 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -311,7 +311,12 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-	<div :class="classes" data-test-id="canvas-node" :data-node-type="data.type">
+	<div
+		:class="classes"
+		data-test-id="canvas-node"
+		:data-node-name="data.name"
+		:data-node-type="data.type"
+	>
 		<template
 			v-for="source in mappedOutputs"
 			:key="`${source.handleId}(${source.index + 1}/${mappedOutputs.length})`"
@@ -321,7 +326,7 @@ onBeforeUnmount(() => {
 				:mode="CanvasConnectionMode.Output"
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
-				:data-node-name="label"
+				:data-node-name="data.name"
 				data-test-id="canvas-node-output-handle"
 				:data-handle-index="source.index"
 				@add="onAdd"
@@ -339,7 +344,7 @@ onBeforeUnmount(() => {
 				:is-valid-connection="isValidConnection"
 				data-test-id="canvas-node-input-handle"
 				:data-handle-index="target.index"
-				:data-node-name="label"
+				:data-node-name="data.name"
 				@add="onAdd"
 			/>
 		</template>

From 10148c9ad3142ce40334aae6551dc72f32f9862e Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 7 Jan 2025 19:06:25 +0200
Subject: [PATCH 11/30] fix(editor): Fix workflow name input size on desktop
 (no-changelog) (#12490)

---
 .../src/components/MainHeader/WorkflowDetails.vue        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index e96705b753..39fc08ceb2 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -801,7 +801,6 @@ $--header-spacing: 20px;
 	color: $custom-font-dark;
 	font-size: 15px;
 	display: block;
-	min-width: 150px;
 }
 
 .activator {
@@ -848,6 +847,14 @@ $--header-spacing: 20px;
 	gap: var(--spacing-m);
 	flex-wrap: nowrap;
 }
+
+@include mixins.breakpoint('xs-only') {
+	.name {
+		:deep(input) {
+			min-width: 180px;
+		}
+	}
+}
 </style>
 
 <style module lang="scss">

From 6f00c74c1f2aec012a1a4c07b026faeabb9dfdbe Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 8 Jan 2025 01:59:08 -0500
Subject: [PATCH 12/30] fix(editor): Update easy AI workflow setup instructions
 when user is in free AI credits experiment (no-changelog) (#12479)

---
 cypress/e2e/27-cloud.cy.ts                    |  70 +++++++
 .../src/composables/usePushConnection.ts      |  15 +-
 packages/editor-ui/src/constants.workflows.ts | 166 ---------------
 .../src/utils/easyAiWorkflowUtils.test.ts     |  38 ++++
 .../src/utils/easyAiWorkflowUtils.ts          | 193 ++++++++++++++++++
 packages/editor-ui/src/views/NodeView.v2.vue  |  14 +-
 packages/editor-ui/src/views/NodeView.vue     |  15 +-
 .../editor-ui/src/views/WorkflowsView.vue     |  20 +-
 8 files changed, 354 insertions(+), 177 deletions(-)
 create mode 100644 packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
 create mode 100644 packages/editor-ui/src/utils/easyAiWorkflowUtils.ts

diff --git a/cypress/e2e/27-cloud.cy.ts b/cypress/e2e/27-cloud.cy.ts
index e9b814597d..131c549963 100644
--- a/cypress/e2e/27-cloud.cy.ts
+++ b/cypress/e2e/27-cloud.cy.ts
@@ -5,11 +5,15 @@ import {
 	WorkflowPage,
 	visitPublicApiPage,
 	getPublicApiUpgradeCTA,
+	WorkflowsPage,
 } from '../pages';
 
+const NUMBER_OF_AI_CREDITS = 100;
+
 const mainSidebar = new MainSidebar();
 const bannerStack = new BannerStack();
 const workflowPage = new WorkflowPage();
+const workflowsPage = new WorkflowsPage();
 
 describe('Cloud', () => {
 	before(() => {
@@ -22,6 +26,10 @@ describe('Cloud', () => {
 		cy.overrideSettings({
 			deployment: { type: 'cloud' },
 			n8nMetadata: { userId: '1' },
+			aiCredits: {
+				enabled: true,
+				credits: NUMBER_OF_AI_CREDITS,
+			},
 		});
 		cy.intercept('GET', '/rest/admin/cloud-plan', planData).as('getPlanData');
 		cy.intercept('GET', '/rest/cloud/proxy/user/me', {}).as('getCloudUserInfo');
@@ -64,4 +72,66 @@ describe('Cloud', () => {
 			getPublicApiUpgradeCTA().should('be.visible');
 		});
 	});
+
+	describe('Easy AI workflow experiment', () => {
+		it('should not show option to take you to the easy AI workflow if experiment is control', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '026_easy_ai_workflow': 'control' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').should('not.exist');
+		});
+
+		it('should show option to take you to the easy AI workflow if experiment is variant', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '026_easy_ai_workflow': 'variant' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').should('to.exist');
+		});
+
+		it('should show default instructions if free AI credits experiment is control', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '027_free_openai_calls': 'control', '026_easy_ai_workflow': 'variant' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').click();
+
+			workflowPage.getters
+				.stickies()
+				.eq(0)
+				.should(($el) => {
+					expect($el).contains.text('Set up your OpenAI credentials in the OpenAI Model node');
+				});
+		});
+
+		it('should show updated instructions if free AI credits experiment is variant', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '027_free_openai_calls': 'variant', '026_easy_ai_workflow': 'variant' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').click();
+
+			workflowPage.getters
+				.stickies()
+				.eq(0)
+				.should(($el) => {
+					expect($el).contains.text(
+						`Claim your free ${NUMBER_OF_AI_CREDITS} OpenAI calls in the OpenAI model node`,
+					);
+				});
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index e3b976a8ac..4ab211c984 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -18,7 +18,7 @@ import type { PushMessage } from '@n8n/api-types';
 
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useToast } from '@/composables/useToast';
-import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+import { AI_CREDITS_EXPERIMENT, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
 import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus';
 import { useUIStore } from '@/stores/ui.store';
@@ -36,8 +36,9 @@ import type { PushMessageQueueItem } from '@/types';
 import { useAssistantStore } from '@/stores/assistant.store';
 import NodeExecutionErrorMessage from '@/components/NodeExecutionErrorMessage.vue';
 import type { IExecutionResponse } from '@/Interface';
-import { EASY_AI_WORKFLOW_JSON } from '@/constants.workflows';
 import { clearPopupWindowState } from '../utils/executionUtils';
+import { usePostHog } from '@/stores/posthog.store';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
 	const workflowHelpers = useWorkflowHelpers({ router });
@@ -54,6 +55,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 	const uiStore = useUIStore();
 	const workflowsStore = useWorkflowsStore();
 	const assistantStore = useAssistantStore();
+	const posthogStore = usePostHog();
 
 	const retryTimeout = ref<NodeJS.Timeout | null>(null);
 	const pushMessageQueue = ref<PushMessageQueueItem[]>([]);
@@ -205,8 +207,13 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				clearPopupWindowState();
 				const workflow = workflowsStore.getWorkflowById(receivedData.data.workflowId);
 				if (workflow?.meta?.templateId) {
-					const isEasyAIWorkflow =
-						workflow.meta.templateId === EASY_AI_WORKFLOW_JSON.meta.templateId;
+					const isAiCreditsExperimentEnabled =
+						posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant;
+					const easyAiWorkflowJson = getEasyAiWorkflowJson({
+						isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+						withOpenAiFreeCredits: settingsStore.aiCreditsQuota,
+					});
+					const isEasyAIWorkflow = workflow.meta.templateId === easyAiWorkflowJson.meta.templateId;
 					if (isEasyAIWorkflow) {
 						telemetry.track(
 							'User executed test AI workflow',
diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/editor-ui/src/constants.workflows.ts
index 2116a471f9..3816ea80a8 100644
--- a/packages/editor-ui/src/constants.workflows.ts
+++ b/packages/editor-ui/src/constants.workflows.ts
@@ -1,172 +1,6 @@
 import { NodeConnectionType } from 'n8n-workflow';
 import type { INodeUi, WorkflowDataWithTemplateId } from './Interface';
 
-export const EASY_AI_WORKFLOW_JSON: WorkflowDataWithTemplateId = {
-	name: 'Demo: My first AI Agent in n8n',
-	meta: {
-		templateId: 'PT1i+zU92Ii5O2XCObkhfHJR5h9rNJTpiCIkYJk9jHU=',
-	},
-	nodes: [
-		{
-			id: '0d7e4666-bc0e-489a-9e8f-a5ef191f4954',
-			name: 'Google Calendar',
-			type: 'n8n-nodes-base.googleCalendarTool',
-			typeVersion: 1.2,
-			position: [880, 220],
-			parameters: {
-				operation: 'getAll',
-				calendar: {
-					__rl: true,
-					mode: 'list',
-				},
-				returnAll: true,
-				options: {
-					timeMin:
-						"={{ $fromAI('after', 'The earliest datetime we want to look for events for') }}",
-					timeMax: "={{ $fromAI('before', 'The latest datetime we want to look for events for') }}",
-					query:
-						"={{ $fromAI('query', 'The search query to look for in the calendar. Leave empty if no search query is needed') }}",
-					singleEvents: true,
-				},
-			},
-		},
-		{
-			id: '5b410409-5b0b-47bd-b413-5b9b1000a063',
-			name: 'When chat message received',
-			type: '@n8n/n8n-nodes-langchain.chatTrigger',
-			typeVersion: 1.1,
-			position: [360, 20],
-			webhookId: 'a889d2ae-2159-402f-b326-5f61e90f602e',
-			parameters: {
-				options: {},
-			},
-		},
-		{
-			id: '29963449-1dc1-487d-96f2-7ff0a5c3cd97',
-			name: 'AI Agent',
-			type: '@n8n/n8n-nodes-langchain.agent',
-			typeVersion: 1.7,
-			position: [560, 20],
-			parameters: {
-				options: {
-					systemMessage:
-						"=You're a helpful assistant that the user to answer questions about their calendar.\n\nToday is {{ $now.format('cccc') }} the {{ $now.format('yyyy-MM-dd HH:mm') }}.",
-				},
-			},
-		},
-		{
-			id: 'eae35513-07c2-4de2-a795-a153b6934c1b',
-			name: 'Sticky Note',
-			type: 'n8n-nodes-base.stickyNote',
-			typeVersion: 1,
-			position: [0, 0],
-			parameters: {
-				content:
-					'## 👋 Welcome to n8n!\nThis example shows how to build an AI Agent that interacts with your \ncalendar.\n\n### 1. Connect your accounts\n- Set up your [OpenAI credentials](https://docs.n8n.io/integrations/builtin/credentials/openai/?utm_source=n8n_app&utm_medium=credential_settings&utm_campaign=create_new_credentials_modal) in the `OpenAI Model` node\n- Connect your Google account in the `Google Calendar` node credentials section\n\n### 2. Ready to test it?\nClick Chat below and start asking questions! For example you can try `What meetings do I have today?`',
-				height: 389,
-				width: 319,
-				color: 6,
-			},
-		},
-		{
-			id: '68b59889-7aca-49fd-a49b-d86fa6239b96',
-			name: 'Sticky Note1',
-			type: 'n8n-nodes-base.stickyNote',
-			typeVersion: 1,
-			position: [820, 200],
-			parameters: {
-				content:
-					"\n\n\n\n\n\n\n\n\n\n\n\nDon't have **Google Calendar**? Simply exchange this with the **Microsoft Outlook** or other tools",
-				height: 253,
-				width: 226,
-				color: 7,
-			},
-		},
-		{
-			id: 'cbaedf86-9153-4778-b893-a7e50d3e04ba',
-			name: 'OpenAI Model',
-			type: '@n8n/n8n-nodes-langchain.lmChatOpenAi',
-			typeVersion: 1,
-			position: [520, 220],
-			parameters: {
-				options: {},
-			},
-		},
-		{
-			id: '75481370-bade-4d90-a878-3a3b0201edcc',
-			name: 'Memory',
-			type: '@n8n/n8n-nodes-langchain.memoryBufferWindow',
-			typeVersion: 1.3,
-			position: [680, 220],
-			parameters: {},
-		},
-		{
-			id: '907552eb-6e0f-472e-9d90-4513a67a31db',
-			name: 'Sticky Note3',
-			type: 'n8n-nodes-base.stickyNote',
-			typeVersion: 1,
-			position: [0, 400],
-			parameters: {
-				content:
-					'### Want to learn more?\nWant to learn more about AI and how to apply it best in n8n? Have a look at our [new tutorial series on YouTube](https://www.youtube.com/watch?v=yzvLfHb0nqE&lc).',
-				height: 100,
-				width: 317,
-				color: 6,
-			},
-		},
-	] as INodeUi[],
-	connections: {
-		'Google Calendar': {
-			ai_tool: [
-				[
-					{
-						node: 'AI Agent',
-						type: NodeConnectionType.AiTool,
-						index: 0,
-					},
-				],
-			],
-		},
-		'When chat message received': {
-			main: [
-				[
-					{
-						node: 'AI Agent',
-						type: NodeConnectionType.Main,
-						index: 0,
-					},
-				],
-			],
-		},
-		'OpenAI Model': {
-			ai_languageModel: [
-				[
-					{
-						node: 'AI Agent',
-						type: NodeConnectionType.AiLanguageModel,
-						index: 0,
-					},
-				],
-			],
-		},
-		Memory: {
-			ai_memory: [
-				[
-					{
-						node: 'AI Agent',
-						type: NodeConnectionType.AiMemory,
-						index: 0,
-					},
-				],
-			],
-		},
-	},
-	settings: {
-		executionOrder: 'v1',
-	},
-	pinData: {},
-};
-
 export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 	name: 'My Sub-Workflow',
 	meta: {
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts b/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
new file mode 100644
index 0000000000..9fa1654216
--- /dev/null
+++ b/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
@@ -0,0 +1,38 @@
+import { describe, it, expect } from 'vitest';
+import { getEasyAiWorkflowJson } from './easyAiWorkflowUtils';
+
+describe('getEasyAiWorkflowJson', () => {
+	it('should update sticky note content for AI free credits experiment', () => {
+		const workflow = getEasyAiWorkflowJson({
+			isInstanceInAiFreeCreditsExperiment: true,
+			withOpenAiFreeCredits: 25,
+		});
+
+		if (!workflow?.nodes) fail();
+
+		const stickyNote = workflow.nodes.find(
+			(node) => node.type === 'n8n-nodes-base.stickyNote' && node.name === 'Sticky Note',
+		);
+
+		expect(stickyNote?.parameters.content).toContain(
+			'Claim your `free` 25 OpenAI calls in the `OpenAI model` node',
+		);
+	});
+
+	it('should show default content when not in AI free credits experiment', () => {
+		const workflow = getEasyAiWorkflowJson({
+			isInstanceInAiFreeCreditsExperiment: false,
+			withOpenAiFreeCredits: 0,
+		});
+
+		if (!workflow?.nodes) fail();
+
+		const stickyNote = workflow.nodes.find(
+			(node) => node.type === 'n8n-nodes-base.stickyNote' && node.name === 'Sticky Note',
+		);
+
+		expect(stickyNote?.parameters.content).toContain(
+			'Set up your [OpenAI credentials](https://docs.n8n.io/integrations/builtin/credentials/openai/?utm_source=n8n_app&utm_medium=credential_settings&utm_campaign=create_new_credentials_modal) in the `OpenAI Model` node',
+		);
+	});
+});
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts b/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
new file mode 100644
index 0000000000..3d9fad7809
--- /dev/null
+++ b/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
@@ -0,0 +1,193 @@
+import type { INodeUi, WorkflowDataWithTemplateId } from '@/Interface';
+import { NodeConnectionType } from 'n8n-workflow';
+
+/**
+ * Generates a workflow JSON object for an AI Agent in n8n.
+ *
+ * @param {Object} params - The parameters for generating the workflow JSON.
+ * @param {boolean} params.isInstanceInAiFreeCreditsExperiment - Indicates if the instance is part of the AI free credits experiment.
+ * @param {number} params.withOpenAiFreeCredits - The number of free OpenAI calls available.
+ *
+ * @remarks
+ * This function can be deleted once the free AI credits experiment is removed.
+ */
+export const getEasyAiWorkflowJson = ({
+	isInstanceInAiFreeCreditsExperiment,
+	withOpenAiFreeCredits,
+}: {
+	withOpenAiFreeCredits: number;
+	isInstanceInAiFreeCreditsExperiment: boolean;
+}): WorkflowDataWithTemplateId => {
+	let instructionsFirstStep =
+		'Set up your [OpenAI credentials](https://docs.n8n.io/integrations/builtin/credentials/openai/?utm_source=n8n_app&utm_medium=credential_settings&utm_campaign=create_new_credentials_modal) in the `OpenAI Model` node';
+
+	if (isInstanceInAiFreeCreditsExperiment) {
+		instructionsFirstStep = `Claim your \`free\` ${withOpenAiFreeCredits} OpenAI calls in the \`OpenAI model\` node`;
+	}
+
+	return {
+		name: 'Demo: My first AI Agent in n8n',
+		meta: {
+			templateId: 'PT1i+zU92Ii5O2XCObkhfHJR5h9rNJTpiCIkYJk9jHU=',
+		},
+		nodes: [
+			{
+				id: '0d7e4666-bc0e-489a-9e8f-a5ef191f4954',
+				name: 'Google Calendar',
+				type: 'n8n-nodes-base.googleCalendarTool',
+				typeVersion: 1.2,
+				position: [880, 220],
+				parameters: {
+					operation: 'getAll',
+					calendar: {
+						__rl: true,
+						mode: 'list',
+					},
+					returnAll: true,
+					options: {
+						timeMin:
+							"={{ $fromAI('after', 'The earliest datetime we want to look for events for') }}",
+						timeMax:
+							"={{ $fromAI('before', 'The latest datetime we want to look for events for') }}",
+						query:
+							"={{ $fromAI('query', 'The search query to look for in the calendar. Leave empty if no search query is needed') }}",
+						singleEvents: true,
+					},
+				},
+			},
+			{
+				id: '5b410409-5b0b-47bd-b413-5b9b1000a063',
+				name: 'When chat message received',
+				type: '@n8n/n8n-nodes-langchain.chatTrigger',
+				typeVersion: 1.1,
+				position: [360, 20],
+				webhookId: 'a889d2ae-2159-402f-b326-5f61e90f602e',
+				parameters: {
+					options: {},
+				},
+			},
+			{
+				id: '29963449-1dc1-487d-96f2-7ff0a5c3cd97',
+				name: 'AI Agent',
+				type: '@n8n/n8n-nodes-langchain.agent',
+				typeVersion: 1.7,
+				position: [560, 20],
+				parameters: {
+					options: {
+						systemMessage:
+							"=You're a helpful assistant that the user to answer questions about their calendar.\n\nToday is {{ $now.format('cccc') }} the {{ $now.format('yyyy-MM-dd HH:mm') }}.",
+					},
+				},
+			},
+			{
+				id: 'eae35513-07c2-4de2-a795-a153b6934c1b',
+				name: 'Sticky Note',
+				type: 'n8n-nodes-base.stickyNote',
+				typeVersion: 1,
+				position: [0, 0],
+				parameters: {
+					content: `## 👋 Welcome to n8n!\nThis example shows how to build an AI Agent that interacts with your \ncalendar.\n\n### 1. Connect your accounts\n- ${instructionsFirstStep} \n- Connect your Google account in the \`Google Calendar\` node credentials section\n\n### 2. Ready to test it?\nClick Chat below and start asking questions! For example you can try \`What meetings do I have today?\``,
+					height: 389,
+					width: 319,
+					color: 6,
+				},
+			},
+			{
+				id: '68b59889-7aca-49fd-a49b-d86fa6239b96',
+				name: 'Sticky Note1',
+				type: 'n8n-nodes-base.stickyNote',
+				typeVersion: 1,
+				position: [820, 200],
+				parameters: {
+					content:
+						"\n\n\n\n\n\n\n\n\n\n\n\nDon't have **Google Calendar**? Simply exchange this with the **Microsoft Outlook** or other tools",
+					height: 253,
+					width: 226,
+					color: 7,
+				},
+			},
+			{
+				id: 'cbaedf86-9153-4778-b893-a7e50d3e04ba',
+				name: 'OpenAI Model',
+				type: '@n8n/n8n-nodes-langchain.lmChatOpenAi',
+				typeVersion: 1,
+				position: [520, 220],
+				parameters: {
+					options: {},
+				},
+			},
+			{
+				id: '75481370-bade-4d90-a878-3a3b0201edcc',
+				name: 'Memory',
+				type: '@n8n/n8n-nodes-langchain.memoryBufferWindow',
+				typeVersion: 1.3,
+				position: [680, 220],
+				parameters: {},
+			},
+			{
+				id: '907552eb-6e0f-472e-9d90-4513a67a31db',
+				name: 'Sticky Note3',
+				type: 'n8n-nodes-base.stickyNote',
+				typeVersion: 1,
+				position: [0, 400],
+				parameters: {
+					content:
+						'### Want to learn more?\nWant to learn more about AI and how to apply it best in n8n? Have a look at our [new tutorial series on YouTube](https://www.youtube.com/watch?v=yzvLfHb0nqE&lc).',
+					height: 100,
+					width: 317,
+					color: 6,
+				},
+			},
+		] as INodeUi[],
+		connections: {
+			'Google Calendar': {
+				ai_tool: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.AiTool,
+							index: 0,
+						},
+					],
+				],
+			},
+			'When chat message received': {
+				main: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.Main,
+							index: 0,
+						},
+					],
+				],
+			},
+			'OpenAI Model': {
+				ai_languageModel: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.AiLanguageModel,
+							index: 0,
+						},
+					],
+				],
+			},
+			Memory: {
+				ai_memory: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.AiMemory,
+							index: 0,
+						},
+					],
+				],
+			},
+		},
+		settings: {
+			executionOrder: 'v1',
+		},
+		pinData: {},
+	};
+};
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 865adf80b0..ee3fc857c1 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -62,6 +62,7 @@ import {
 	STICKY_NODE_TYPE,
 	VALID_WORKFLOW_IMPORT_URL_REGEX,
 	VIEWS,
+	AI_CREDITS_EXPERIMENT,
 } from '@/constants';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
@@ -85,6 +86,7 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useHistoryStore } from '@/stores/history.store';
 import { useProjectsStore } from '@/stores/projects.store';
+import { usePostHog } from '@/stores/posthog.store';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
 import { useUsersStore } from '@/stores/users.store';
@@ -108,7 +110,7 @@ import { getResourcePermissions } from '@/permissions';
 import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
 import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
 import { isValidNodeConnectionType } from '@/utils/typeGuards';
-import { EASY_AI_WORKFLOW_JSON } from '@/constants.workflows';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 const LazyNodeCreation = defineAsyncComponent(
 	async () => await import('@/components/Node/NodeCreation.vue'),
@@ -155,6 +157,7 @@ const tagsStore = useTagsStore();
 const pushConnectionStore = usePushConnectionStore();
 const ndvStore = useNDVStore();
 const templatesStore = useTemplatesStore();
+const posthogStore = usePostHog();
 
 const canvasEventBus = createEventBus<CanvasEventBusEvents>();
 
@@ -325,7 +328,14 @@ async function initializeRoute(force = false) {
 		const loadWorkflowFromJSON = route.query.fromJson === 'true';
 
 		if (loadWorkflowFromJSON) {
-			await openTemplateFromWorkflowJSON(EASY_AI_WORKFLOW_JSON);
+			const isAiCreditsExperimentEnabled =
+				posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant;
+
+			const easyAiWorkflowJson = getEasyAiWorkflowJson({
+				isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+				withOpenAiFreeCredits: settingsStore.aiCreditsQuota,
+			});
+			await openTemplateFromWorkflowJSON(easyAiWorkflowJson);
 		} else {
 			await openWorkflowTemplate(templateId.toString());
 		}
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 8dac152e5e..c199761a16 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -181,7 +181,8 @@ import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { getResourcePermissions } from '@/permissions';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
 import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
-import { EASY_AI_WORKFLOW_JSON } from '@/constants.workflows';
+import { AI_CREDITS_EXPERIMENT } from '@/constants';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -220,6 +221,7 @@ export default defineComponent({
 		const router = useRouter();
 		const route = useRoute();
 
+		const posthogStore = usePostHog();
 		const ndvStore = useNDVStore();
 		const externalHooks = useExternalHooks();
 		const i18n = useI18n();
@@ -254,6 +256,7 @@ export default defineComponent({
 			nodeViewRef,
 			onMouseMoveEnd,
 			workflowHelpers,
+			posthogStore,
 			runWorkflow,
 			stopCurrentExecution,
 			callDebounced,
@@ -3401,7 +3404,15 @@ export default defineComponent({
 				const templateId = this.$route.params.id;
 				const loadWorkflowFromJSON = this.$route.query.fromJson === 'true';
 				if (loadWorkflowFromJSON) {
-					await this.openWorkflowTemplateFromJson({ workflow: EASY_AI_WORKFLOW_JSON });
+					const isAiCreditsExperimentEnabled =
+						this.posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) ===
+						AI_CREDITS_EXPERIMENT.variant;
+
+					const easyAiWorkflowJson = getEasyAiWorkflowJson({
+						isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+						withOpenAiFreeCredits: useSettingsStore().aiCreditsQuota,
+					});
+					await this.openWorkflowTemplateFromJson({ workflow: easyAiWorkflowJson });
 				} else {
 					await this.openWorkflowTemplate(templateId.toString());
 				}
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 253946751f..1d5c3514d8 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -6,7 +6,12 @@ import ResourcesListLayout, {
 } from '@/components/layouts/ResourcesListLayout.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import WorkflowTagsDropdown from '@/components/WorkflowTagsDropdown.vue';
-import { EASY_AI_WORKFLOW_EXPERIMENT, EnterpriseEditionFeature, VIEWS } from '@/constants';
+import {
+	EASY_AI_WORKFLOW_EXPERIMENT,
+	AI_CREDITS_EXPERIMENT,
+	EnterpriseEditionFeature,
+	VIEWS,
+} from '@/constants';
 import type { IUser, IWorkflowDb } from '@/Interface';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
@@ -32,7 +37,7 @@ import {
 } from 'n8n-design-system';
 import { pickBy } from 'lodash-es';
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
-import { EASY_AI_WORKFLOW_JSON } from '@/constants.workflows';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 const i18n = useI18n();
 const route = useRoute();
@@ -269,9 +274,18 @@ const openAIWorkflow = async (source: string) => {
 		},
 		{ withPostHog: true },
 	);
+
+	const isAiCreditsExperimentEnabled =
+		posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant;
+
+	const easyAiWorkflowJson = getEasyAiWorkflowJson({
+		isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+		withOpenAiFreeCredits: settingsStore.aiCreditsQuota,
+	});
+
 	await router.push({
 		name: VIEWS.TEMPLATE_IMPORT,
-		params: { id: EASY_AI_WORKFLOW_JSON.meta.templateId },
+		params: { id: easyAiWorkflowJson.meta.templateId },
 		query: { fromJson: 'true' },
 	});
 };

From b1d17f520118e223ece9c5d96f3afb8957f8205d Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 8 Jan 2025 02:20:45 -0500
Subject: [PATCH 13/30] feat: Add more telemetry to free AI credits feature
 (no-changelog) (#12493)

---
 packages/cli/src/constants.ts                 |   1 -
 packages/cli/src/controllers/ai.controller.ts |   3 +-
 .../__tests__/telemetry-event-relay.test.ts   |  69 ++++++
 .../events/relays/telemetry.event-relay.ts    |   4 +
 .../cli/test/integration/ai/ai.api.test.ts    |   3 +-
 .../src/components/FreeAiCreditsCallout.vue   |   3 +-
 packages/workflow/src/Constants.ts            |   4 +
 packages/workflow/src/TelemetryHelpers.ts     |  36 +++
 .../workflow/test/TelemetryHelpers.test.ts    | 224 +++++++++++++++++-
 9 files changed, 341 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 4bd1890c4e..abcf298d3d 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -195,4 +195,3 @@ export const WsStatusCodes = {
 } as const;
 
 export const FREE_AI_CREDITS_CREDENTIAL_NAME = 'n8n free OpenAI API credits';
-export const OPEN_AI_API_CREDENTIAL_TYPE = 'openAiApi';
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index 791c02bec3..e82ecd77ef 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -6,10 +6,11 @@ import {
 } from '@n8n/api-types';
 import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
 import { Response } from 'express';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 import { strict as assert } from 'node:assert';
 import { WritableStream } from 'node:stream/web';
 
-import { FREE_AI_CREDITS_CREDENTIAL_NAME, OPEN_AI_API_CREDENTIAL_TYPE } from '@/constants';
+import { FREE_AI_CREDITS_CREDENTIAL_NAME } from '@/constants';
 import { CredentialsService } from '@/credentials/credentials.service';
 import { Body, Post, RestController } from '@/decorators';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index c41ea773dd..01673cd375 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -1622,5 +1622,74 @@ describe('TelemetryEventRelay', () => {
 				}),
 			);
 		});
+
+		it('should call telemetry.track when user ran out of free AI credits', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:editor');
+			credentialsRepository.findOneBy.mockResolvedValue(
+				mock<CredentialsEntity>({ type: 'openAiApi', isManaged: true }),
+			);
+
+			const runData = {
+				status: 'error',
+				mode: 'trigger',
+				data: {
+					startData: {
+						destinationNode: 'OpenAI',
+						runNodeFilter: ['OpenAI'],
+					},
+					executionData: {
+						nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+					},
+					resultData: {
+						runData: {},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'OpenAI',
+								type: 'n8n-nodes-base.openAi',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: `400 - ${JSON.stringify({
+									error: {
+										message: 'error message',
+										type: 'error_type',
+										code: 200,
+									},
+								})}`,
+								error: {
+									message: 'error message',
+									type: 'error_type',
+									code: 200,
+								},
+							},
+							{
+								httpCode: '400',
+							},
+						),
+					},
+				},
+			} as unknown as IRun;
+
+			jest
+				.spyOn(TelemetryHelpers, 'userInInstanceRanOutOfFreeAiCredits')
+				.mockImplementation(() => true);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith('User ran out of free AI credits');
+		});
 	});
 });
diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
index d2bc61c733..67fbacb107 100644
--- a/packages/cli/src/events/relays/telemetry.event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -634,6 +634,10 @@ export class TelemetryEventRelay extends EventRelay {
 			let nodeGraphResult: INodesGraphResult | null = null;
 
 			if (!telemetryProperties.success && runData?.data.resultData.error) {
+				if (TelemetryHelpers.userInInstanceRanOutOfFreeAiCredits(runData)) {
+					this.telemetry.track('User ran out of free AI credits');
+				}
+
 				telemetryProperties.error_message = runData?.data.resultData.error.message;
 				let errorNodeName =
 					'node' in runData?.data.resultData.error
diff --git a/packages/cli/test/integration/ai/ai.api.test.ts b/packages/cli/test/integration/ai/ai.api.test.ts
index 721f2296ed..6741930b2e 100644
--- a/packages/cli/test/integration/ai/ai.api.test.ts
+++ b/packages/cli/test/integration/ai/ai.api.test.ts
@@ -1,8 +1,9 @@
 import { Container } from '@n8n/di';
 import { randomUUID } from 'crypto';
 import { mock } from 'jest-mock-extended';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 
-import { FREE_AI_CREDITS_CREDENTIAL_NAME, OPEN_AI_API_CREDENTIAL_TYPE } from '@/constants';
+import { FREE_AI_CREDITS_CREDENTIAL_NAME } from '@/constants';
 import type { Project } from '@/databases/entities/project';
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
index 922df4cf89..97dd4eb9db 100644
--- a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
@@ -10,8 +10,7 @@ import { useProjectsStore } from '@/stores/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { computed, ref } from 'vue';
-
-const OPEN_AI_API_CREDENTIAL_TYPE = 'openAiApi';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 
 const LANGCHAIN_NODES_PREFIX = '@n8n/n8n-nodes-langchain.';
 
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index e5983013de..453b9be748 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -95,3 +95,7 @@ export const AI_TRANSFORM_JS_CODE = 'jsCode';
  * in `cli` package.
  */
 export const TRIMMED_TASK_DATA_CONNECTIONS_KEY = '__isTrimmedManualExecutionDataItem';
+
+export const OPEN_AI_API_CREDENTIAL_TYPE = 'openAiApi';
+export const FREE_AI_CREDITS_ERROR_TYPE = 'free_ai_credits_request_error';
+export const FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE = 400;
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 03d675e0e5..51d56ef154 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -4,16 +4,20 @@ import {
 	CHAIN_LLM_LANGCHAIN_NODE_TYPE,
 	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
 	EXECUTE_WORKFLOW_NODE_TYPE,
+	FREE_AI_CREDITS_ERROR_TYPE,
+	FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE,
 	HTTP_REQUEST_NODE_TYPE,
 	HTTP_REQUEST_TOOL_LANGCHAIN_NODE_TYPE,
 	LANGCHAIN_CUSTOM_TOOLS,
 	MERGE_NODE_TYPE,
+	OPEN_AI_API_CREDENTIAL_TYPE,
 	OPENAI_LANGCHAIN_NODE_TYPE,
 	STICKY_NODE_TYPE,
 	WEBHOOK_NODE_TYPE,
 	WORKFLOW_TOOL_LANGCHAIN_NODE_TYPE,
 } from './Constants';
 import { ApplicationError } from './errors/application.error';
+import type { NodeApiError } from './errors/node-api.error';
 import type {
 	IConnection,
 	INode,
@@ -29,6 +33,10 @@ import type {
 	IRun,
 } from './Interfaces';
 import { getNodeParameters } from './NodeHelpers';
+import { jsonParse } from './utils';
+
+const isNodeApiError = (error: unknown): error is NodeApiError =>
+	typeof error === 'object' && error !== null && 'name' in error && error?.name === 'NodeApiError';
 
 export function getNodeTypeForName(workflow: IWorkflowBase, nodeName: string): INode | undefined {
 	return workflow.nodes.find((node) => node.name === nodeName);
@@ -489,3 +497,31 @@ export function extractLastExecutedNodeCredentialData(
 
 	return { credentialId: id, credentialType };
 }
+
+export const userInInstanceRanOutOfFreeAiCredits = (runData: IRun): boolean => {
+	const credentials = extractLastExecutedNodeCredentialData(runData);
+
+	if (!credentials) return false;
+
+	if (credentials.credentialType !== OPEN_AI_API_CREDENTIAL_TYPE) return false;
+
+	const { error } = runData.data.resultData;
+
+	if (!isNodeApiError(error) || !error.messages[0]) return false;
+
+	const rawErrorResponse = error.messages[0].replace(`${error.httpCode} -`, '');
+
+	try {
+		const errorResponse = jsonParse<{ error: { code: number; type: string } }>(rawErrorResponse);
+		if (
+			errorResponse?.error?.type === FREE_AI_CREDITS_ERROR_TYPE &&
+			errorResponse.error.code === FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE
+		) {
+			return true;
+		}
+	} catch {
+		return false;
+	}
+
+	return false;
+};
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index c2b15864f5..4cb923bb9d 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended';
 import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
 
 import { STICKY_NODE_TYPE } from '@/Constants';
-import { ApplicationError } from '@/errors';
+import { ApplicationError, ExpressionError, NodeApiError } from '@/errors';
 import type { IRun, IRunData } from '@/Interfaces';
 import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
 import * as nodeHelpers from '@/NodeHelpers';
@@ -12,6 +12,7 @@ import {
 	generateNodesGraph,
 	getDomainBase,
 	getDomainPath,
+	userInInstanceRanOutOfFreeAiCredits,
 } from '@/TelemetryHelpers';
 import { randomInt } from '@/utils';
 
@@ -930,6 +931,227 @@ describe('extractLastExecutedNodeCredentialData', () => {
 	});
 });
 
+describe('userInInstanceRanOutOfFreeAiCredits', () => {
+	it('should return false if could not find node credentials', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: {} } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'free_ai_credits_request_error',
+									code: 200,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'free_ai_credits_request_error',
+								code: 200,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return false if could not credential type it is not openAiApi', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { jiraApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'free_ai_credits_request_error',
+									code: 200,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'free_ai_credits_request_error',
+								code: 200,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return false if error is not NodeApiError', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new ExpressionError('error'),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return false if error is not a free ai credit error', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'error_type',
+									code: 200,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'error_type',
+								code: 200,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return true if the user has ran out of free AI credits', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'free_ai_credits_request_error',
+									code: 400,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'free_ai_credits_request_error',
+								code: 400,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(true);
+	});
+});
+
 function validUrls(idMaker: typeof alphanumericId | typeof email, char = CHAR) {
 	const firstId = idMaker();
 	const secondId = idMaker();

From 491cb605e3c93d7a261bb0cef0d38f2ddc3affe8 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:06:36 +0200
Subject: [PATCH 14/30] fix(core): Use rate limiter for task runner endpoints
 (#12486)

---
 .../src/task-runners/task-runner-server.ts    | 10 +++++++++
 .../runners/task-runner-server.test.ts        | 22 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/packages/cli/src/task-runners/task-runner-server.ts b/packages/cli/src/task-runners/task-runner-server.ts
index 6e68c4fb32..80679f8c41 100644
--- a/packages/cli/src/task-runners/task-runner-server.ts
+++ b/packages/cli/src/task-runners/task-runner-server.ts
@@ -2,6 +2,7 @@ import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import compression from 'compression';
 import express from 'express';
+import { rateLimit as expressRateLimit } from 'express-rate-limit';
 import { Logger } from 'n8n-core';
 import * as a from 'node:assert/strict';
 import { randomBytes } from 'node:crypto';
@@ -147,8 +148,16 @@ export class TaskRunnerServer {
 	}
 
 	private configureRoutes() {
+		const createRateLimiter = () =>
+			expressRateLimit({
+				windowMs: 1000,
+				limit: 5,
+				message: { message: 'Too many requests' },
+			});
+
 		this.app.use(
 			this.upgradeEndpoint,
+			createRateLimiter(),
 			// eslint-disable-next-line @typescript-eslint/unbound-method
 			this.taskRunnerAuthController.authMiddleware,
 			(req: TaskRunnerServerInitRequest, res: TaskRunnerServerInitResponse) =>
@@ -158,6 +167,7 @@ export class TaskRunnerServer {
 		const authEndpoint = `${this.getEndpointBasePath()}/auth`;
 		this.app.post(
 			authEndpoint,
+			createRateLimiter(),
 			send(async (req) => await this.taskRunnerAuthController.createGrantToken(req)),
 		);
 
diff --git a/packages/cli/test/integration/runners/task-runner-server.test.ts b/packages/cli/test/integration/runners/task-runner-server.test.ts
index 11d77b53fc..6088af3525 100644
--- a/packages/cli/test/integration/runners/task-runner-server.test.ts
+++ b/packages/cli/test/integration/runners/task-runner-server.test.ts
@@ -19,4 +19,26 @@ describe('TaskRunnerServer', () => {
 			await agent.get('/healthz').expect(200);
 		});
 	});
+
+	describe('/runners/_ws', () => {
+		it('should return 429 when too many requests are made', async () => {
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(429);
+		});
+	});
+
+	describe('/runners/auth', () => {
+		it('should return 429 when too many requests are made', async () => {
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(429);
+		});
+	});
 });

From 803960e0924020a98177fcfe3bcf7af8276ba2bd Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Wed, 8 Jan 2025 09:36:44 +0100
Subject: [PATCH 15/30] test(editor): Add deprecation warnings for e2e page
 classes (no-changelog) (#12489)

---
 cypress/composables/workflow.ts                 |  4 ++++
 cypress/e2e/27-cloud.cy.ts                      |  6 ++----
 cypress/e2e/30-editor-after-route-changes.cy.ts | 12 ++++--------
 cypress/e2e/35-admin-user-smoke-test.cy.ts      | 12 +++++-------
 cypress/pages/bannerStack.ts                    |  9 ---------
 cypress/pages/base.ts                           |  8 ++++++++
 cypress/pages/credentials.ts                    |  8 ++++++++
 cypress/pages/features/ai-assistant.ts          |  8 ++++++++
 cypress/pages/features/node-creator.ts          |  8 ++++++++
 cypress/pages/index.ts                          |  2 --
 cypress/pages/mfa-login.ts                      |  8 ++++++++
 cypress/pages/modals/change-password-modal.ts   |  8 ++++++++
 cypress/pages/modals/credentials-modal.ts       |  8 ++++++++
 cypress/pages/modals/message-box.ts             |  8 ++++++++
 cypress/pages/modals/mfa-setup-modal.ts         |  8 ++++++++
 cypress/pages/modals/workflow-sharing-modal.ts  |  8 ++++++++
 cypress/pages/ndv.ts                            |  8 ++++++++
 cypress/pages/settings-log-streaming.ts         |  8 ++++++++
 cypress/pages/settings-personal.ts              |  8 ++++++++
 cypress/pages/settings-usage.ts                 |  9 ---------
 cypress/pages/settings-users.ts                 |  8 ++++++++
 cypress/pages/settings.ts                       | 11 -----------
 cypress/pages/sidebar/main-sidebar.ts           |  8 ++++++++
 cypress/pages/sidebar/settings-sidebar.ts       |  8 ++++++++
 cypress/pages/signin.ts                         |  8 ++++++++
 cypress/pages/templates.ts                      |  8 ++++++++
 cypress/pages/variables.ts                      |  8 ++++++++
 cypress/pages/workerView.ts                     |  8 ++++++++
 cypress/pages/workflow-executions-tab.ts        |  8 ++++++++
 cypress/pages/workflow-history.ts               |  7 -------
 cypress/pages/workflow.ts                       |  9 +++++++++
 cypress/pages/workflows.ts                      |  8 ++++++++
 32 files changed, 200 insertions(+), 57 deletions(-)
 delete mode 100644 cypress/pages/bannerStack.ts
 delete mode 100644 cypress/pages/settings-usage.ts
 delete mode 100644 cypress/pages/settings.ts
 delete mode 100644 cypress/pages/workflow-history.ts

diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index 3289d43a79..e8e402dd5f 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -52,6 +52,10 @@ export function getNodeByName(name: string) {
 	);
 }
 
+export function getWorkflowHistoryCloseButton() {
+	return cy.getByTestId('workflow-history-close-button');
+}
+
 export function disableNode(name: string) {
 	const target = getNodeByName(name);
 	target.rightclick(name ? 'center' : 'topLeft', { force: true });
diff --git a/cypress/e2e/27-cloud.cy.ts b/cypress/e2e/27-cloud.cy.ts
index 131c549963..bcf9750ecb 100644
--- a/cypress/e2e/27-cloud.cy.ts
+++ b/cypress/e2e/27-cloud.cy.ts
@@ -1,6 +1,5 @@
 import planData from '../fixtures/Plan_data_opt_in_trial.json';
 import {
-	BannerStack,
 	MainSidebar,
 	WorkflowPage,
 	visitPublicApiPage,
@@ -11,7 +10,6 @@ import {
 const NUMBER_OF_AI_CREDITS = 100;
 
 const mainSidebar = new MainSidebar();
-const bannerStack = new BannerStack();
 const workflowPage = new WorkflowPage();
 const workflowsPage = new WorkflowsPage();
 
@@ -48,11 +46,11 @@ describe('Cloud', () => {
 		it('should render trial banner for opt-in cloud user', () => {
 			visitWorkflowPage();
 
-			bannerStack.getters.banner().should('be.visible');
+			cy.getByTestId('banner-stack').should('be.visible');
 
 			mainSidebar.actions.signout();
 
-			bannerStack.getters.banner().should('not.be.visible');
+			cy.getByTestId('banner-stack').should('not.be.visible');
 		});
 	});
 
diff --git a/cypress/e2e/30-editor-after-route-changes.cy.ts b/cypress/e2e/30-editor-after-route-changes.cy.ts
index f0381a32a2..307c4a9537 100644
--- a/cypress/e2e/30-editor-after-route-changes.cy.ts
+++ b/cypress/e2e/30-editor-after-route-changes.cy.ts
@@ -1,18 +1,14 @@
+import { getWorkflowHistoryCloseButton } from '../composables/workflow';
 import {
 	CODE_NODE_NAME,
 	EDIT_FIELDS_SET_NODE_NAME,
 	IF_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 } from '../constants';
-import {
-	WorkflowExecutionsTab,
-	WorkflowPage as WorkflowPageClass,
-	WorkflowHistoryPage,
-} from '../pages';
+import { WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
 
 const workflowPage = new WorkflowPageClass();
 const executionsTab = new WorkflowExecutionsTab();
-const workflowHistoryPage = new WorkflowHistoryPage();
 
 const createNewWorkflowAndActivate = () => {
 	workflowPage.actions.visit();
@@ -92,7 +88,7 @@ const switchBetweenEditorAndHistory = () => {
 	cy.wait(['@getVersion']);
 
 	cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
-	workflowHistoryPage.getters.workflowHistoryCloseButton().click();
+	getWorkflowHistoryCloseButton().click();
 	cy.wait(['@workflowGet']);
 	cy.wait(1000);
 
@@ -168,7 +164,7 @@ describe('Editor actions should work', () => {
 		cy.wait(['@getVersion']);
 
 		cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
-		workflowHistoryPage.getters.workflowHistoryCloseButton().click();
+		getWorkflowHistoryCloseButton().click();
 		cy.wait(['@workflowGet']);
 		cy.wait(1000);
 
diff --git a/cypress/e2e/35-admin-user-smoke-test.cy.ts b/cypress/e2e/35-admin-user-smoke-test.cy.ts
index c8585118e7..6bb31ae1c2 100644
--- a/cypress/e2e/35-admin-user-smoke-test.cy.ts
+++ b/cypress/e2e/35-admin-user-smoke-test.cy.ts
@@ -1,22 +1,20 @@
-import { SettingsPage } from '../pages/settings';
-
-const settingsPage = new SettingsPage();
+const url = '/settings';
 
 describe('Admin user', { disableAutoLogin: true }, () => {
 	it('should see same Settings sub menu items as instance owner', () => {
 		cy.signinAsOwner();
-		cy.visit(settingsPage.url);
+		cy.visit(url);
 
 		let ownerMenuItems = 0;
 
-		settingsPage.getters.menuItems().then(($el) => {
+		cy.getByTestId('menu-item').then(($el) => {
 			ownerMenuItems = $el.length;
 		});
 
 		cy.signout();
 		cy.signinAsAdmin();
-		cy.visit(settingsPage.url);
+		cy.visit(url);
 
-		settingsPage.getters.menuItems().should('have.length', ownerMenuItems);
+		cy.getByTestId('menu-item').should('have.length', ownerMenuItems);
 	});
 });
diff --git a/cypress/pages/bannerStack.ts b/cypress/pages/bannerStack.ts
deleted file mode 100644
index c4936891ae..0000000000
--- a/cypress/pages/bannerStack.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BasePage } from './base';
-
-export class BannerStack extends BasePage {
-	getters = {
-		banner: () => cy.getByTestId('banner-stack'),
-	};
-
-	actions = {};
-}
diff --git a/cypress/pages/base.ts b/cypress/pages/base.ts
index abd7a210a8..dbcb65e5bd 100644
--- a/cypress/pages/base.ts
+++ b/cypress/pages/base.ts
@@ -1,5 +1,13 @@
 import type { IE2ETestPage } from '../types';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class BasePage implements IE2ETestPage {
 	getters = {};
 
diff --git a/cypress/pages/credentials.ts b/cypress/pages/credentials.ts
index 08b2fee9c7..b7b68504f9 100644
--- a/cypress/pages/credentials.ts
+++ b/cypress/pages/credentials.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class CredentialsPage extends BasePage {
 	url = '/home/credentials';
 
diff --git a/cypress/pages/features/ai-assistant.ts b/cypress/pages/features/ai-assistant.ts
index 6ff48851f3..f2e747817b 100644
--- a/cypress/pages/features/ai-assistant.ts
+++ b/cypress/pages/features/ai-assistant.ts
@@ -8,6 +8,14 @@ const AI_ASSISTANT_FEATURE = {
 	disabledFor: 'control',
 };
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class AIAssistant extends BasePage {
 	url = '/workflows/new';
 
diff --git a/cypress/pages/features/node-creator.ts b/cypress/pages/features/node-creator.ts
index a0d3995160..38c932468f 100644
--- a/cypress/pages/features/node-creator.ts
+++ b/cypress/pages/features/node-creator.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class NodeCreator extends BasePage {
 	url = '/workflow/new';
 
diff --git a/cypress/pages/index.ts b/cypress/pages/index.ts
index 39c9be3b56..93dd165621 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -7,9 +7,7 @@ export * from './settings-users';
 export * from './settings-log-streaming';
 export * from './sidebar';
 export * from './ndv';
-export * from './bannerStack';
 export * from './workflow-executions-tab';
 export * from './signin';
-export * from './workflow-history';
 export * from './workerView';
 export * from './settings-public-api';
diff --git a/cypress/pages/mfa-login.ts b/cypress/pages/mfa-login.ts
index 7e679804ff..884be7d75d 100644
--- a/cypress/pages/mfa-login.ts
+++ b/cypress/pages/mfa-login.ts
@@ -3,6 +3,14 @@ import { SigninPage } from './signin';
 import { WorkflowsPage } from './workflows';
 import { N8N_AUTH_COOKIE } from '../constants';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MfaLoginPage extends BasePage {
 	url = '/mfa';
 
diff --git a/cypress/pages/modals/change-password-modal.ts b/cypress/pages/modals/change-password-modal.ts
index 3e9ebc8697..28c4d01d86 100644
--- a/cypress/pages/modals/change-password-modal.ts
+++ b/cypress/pages/modals/change-password-modal.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class ChangePasswordModal extends BasePage {
 	getters = {
 		modalContainer: () => cy.getByTestId('changePassword-modal').last(),
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index ac8e966bc0..592a396161 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -2,6 +2,14 @@ import { getCredentialSaveButton, saveCredential } from '../../composables/modal
 import { getVisibleSelect } from '../../utils';
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class CredentialsModal extends BasePage {
 	getters = {
 		newCredentialModal: () => cy.getByTestId('selectCredential-modal', { timeout: 5000 }),
diff --git a/cypress/pages/modals/message-box.ts b/cypress/pages/modals/message-box.ts
index a40c2d1a88..42f83d9a15 100644
--- a/cypress/pages/modals/message-box.ts
+++ b/cypress/pages/modals/message-box.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MessageBox extends BasePage {
 	getters = {
 		modal: () => cy.get('.el-message-box', { withinSubject: null }),
diff --git a/cypress/pages/modals/mfa-setup-modal.ts b/cypress/pages/modals/mfa-setup-modal.ts
index d127731be2..baa37f5f3a 100644
--- a/cypress/pages/modals/mfa-setup-modal.ts
+++ b/cypress/pages/modals/mfa-setup-modal.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MfaSetupModal extends BasePage {
 	getters = {
 		modalContainer: () => cy.getByTestId('changePassword-modal').last(),
diff --git a/cypress/pages/modals/workflow-sharing-modal.ts b/cypress/pages/modals/workflow-sharing-modal.ts
index 02e183fc81..176cd84a7b 100644
--- a/cypress/pages/modals/workflow-sharing-modal.ts
+++ b/cypress/pages/modals/workflow-sharing-modal.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowSharingModal extends BasePage {
 	getters = {
 		modal: () => cy.getByTestId('workflowShare-modal', { timeout: 5000 }),
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 1926ef0ad1..91ece23122 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -1,6 +1,14 @@
 import { BasePage } from './base';
 import { getVisiblePopper, getVisibleSelect } from '../utils';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class NDV extends BasePage {
 	getters = {
 		container: () => cy.getByTestId('ndv'),
diff --git a/cypress/pages/settings-log-streaming.ts b/cypress/pages/settings-log-streaming.ts
index 9063b8dc41..959b18bce5 100644
--- a/cypress/pages/settings-log-streaming.ts
+++ b/cypress/pages/settings-log-streaming.ts
@@ -1,6 +1,14 @@
 import { BasePage } from './base';
 import { getVisibleSelect } from '../utils';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SettingsLogStreamingPage extends BasePage {
 	url = '/settings/log-streaming';
 
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index 5602bd7e92..49c7de1283 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -7,6 +7,14 @@ import { MfaSetupModal } from './modals/mfa-setup-modal';
 const changePasswordModal = new ChangePasswordModal();
 const mfaSetupModal = new MfaSetupModal();
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class PersonalSettingsPage extends BasePage {
 	url = '/settings/personal';
 
diff --git a/cypress/pages/settings-usage.ts b/cypress/pages/settings-usage.ts
deleted file mode 100644
index 85300fe05f..0000000000
--- a/cypress/pages/settings-usage.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BasePage } from './base';
-
-export class SettingsUsagePage extends BasePage {
-	url = '/settings/usage';
-
-	getters = {};
-
-	actions = {};
-}
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index 1eaebc911a..f442377fad 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -9,6 +9,14 @@ const workflowsPage = new WorkflowsPage();
 const mainSidebar = new MainSidebar();
 const settingsSidebar = new SettingsSidebar();
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SettingsUsersPage extends BasePage {
 	url = '/settings/users';
 
diff --git a/cypress/pages/settings.ts b/cypress/pages/settings.ts
deleted file mode 100644
index 74c3b0fe76..0000000000
--- a/cypress/pages/settings.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BasePage } from './base';
-
-export class SettingsPage extends BasePage {
-	url = '/settings';
-
-	getters = {
-		menuItems: () => cy.getByTestId('menu-item'),
-	};
-
-	actions = {};
-}
diff --git a/cypress/pages/sidebar/main-sidebar.ts b/cypress/pages/sidebar/main-sidebar.ts
index 4266b93688..7824a6bebb 100644
--- a/cypress/pages/sidebar/main-sidebar.ts
+++ b/cypress/pages/sidebar/main-sidebar.ts
@@ -1,6 +1,14 @@
 import { BasePage } from '../base';
 import { WorkflowsPage } from '../workflows';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MainSidebar extends BasePage {
 	getters = {
 		menuItem: (id: string) => cy.getByTestId('menu-item').get('#' + id),
diff --git a/cypress/pages/sidebar/settings-sidebar.ts b/cypress/pages/sidebar/settings-sidebar.ts
index 17d43b65e7..17bf5d10b7 100644
--- a/cypress/pages/sidebar/settings-sidebar.ts
+++ b/cypress/pages/sidebar/settings-sidebar.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SettingsSidebar extends BasePage {
 	getters = {
 		menuItem: (id: string) => cy.getByTestId('menu-item').get('#' + id),
diff --git a/cypress/pages/signin.ts b/cypress/pages/signin.ts
index a97fe4888e..bc0d7196a3 100644
--- a/cypress/pages/signin.ts
+++ b/cypress/pages/signin.ts
@@ -2,6 +2,14 @@ import { BasePage } from './base';
 import { WorkflowsPage } from './workflows';
 import { N8N_AUTH_COOKIE } from '../constants';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SigninPage extends BasePage {
 	url = '/signin';
 
diff --git a/cypress/pages/templates.ts b/cypress/pages/templates.ts
index a17da87ba2..8d8fdc15c5 100644
--- a/cypress/pages/templates.ts
+++ b/cypress/pages/templates.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class TemplatesPage extends BasePage {
 	url = '/templates';
 
diff --git a/cypress/pages/variables.ts b/cypress/pages/variables.ts
index 6ac9a939b2..5fb0a64d9a 100644
--- a/cypress/pages/variables.ts
+++ b/cypress/pages/variables.ts
@@ -2,6 +2,14 @@ import { BasePage } from './base';
 
 import Chainable = Cypress.Chainable;
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class VariablesPage extends BasePage {
 	url = '/variables';
 
diff --git a/cypress/pages/workerView.ts b/cypress/pages/workerView.ts
index f442468c52..ff56ab1ec5 100644
--- a/cypress/pages/workerView.ts
+++ b/cypress/pages/workerView.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkerViewPage extends BasePage {
 	url = '/settings/workers';
 
diff --git a/cypress/pages/workflow-executions-tab.ts b/cypress/pages/workflow-executions-tab.ts
index be022e6cdf..da91e99a98 100644
--- a/cypress/pages/workflow-executions-tab.ts
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -3,6 +3,14 @@ import { WorkflowPage } from './workflow';
 
 const workflowPage = new WorkflowPage();
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowExecutionsTab extends BasePage {
 	getters = {
 		executionsTabButton: () => cy.getByTestId('radio-button-executions'),
diff --git a/cypress/pages/workflow-history.ts b/cypress/pages/workflow-history.ts
deleted file mode 100644
index 1b9d7328b1..0000000000
--- a/cypress/pages/workflow-history.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BasePage } from './base';
-
-export class WorkflowHistoryPage extends BasePage {
-	getters = {
-		workflowHistoryCloseButton: () => cy.getByTestId('workflow-history-close-button'),
-	};
-}
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index e99b01aa46..4d6702b082 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -6,6 +6,15 @@ import { getVisibleSelect } from '../utils';
 import { getUniqueWorkflowName, isCanvasV2 } from '../utils/workflowUtils';
 
 const nodeCreator = new NodeCreator();
+
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowPage extends BasePage {
 	url = '/workflow/new';
 
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index a58911a355..7441bfa256 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowsPage extends BasePage {
 	url = '/home/workflows';
 

From 2c72047d0b260db5a4b1fd0d7448ab19378e908f Mon Sep 17 00:00:00 2001
From: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:30:35 +0000
Subject: [PATCH 16/30] fix(editor): Render empty string instead of [empty]
 (#12448)

---
 .../composables/useExpressionEditor.test.ts   | 103 ++++++++++++++++++
 .../src/composables/useExpressionEditor.ts    |  20 ++--
 2 files changed, 110 insertions(+), 13 deletions(-)

diff --git a/packages/editor-ui/src/composables/useExpressionEditor.test.ts b/packages/editor-ui/src/composables/useExpressionEditor.test.ts
index d6ed9338c5..4512e7654a 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.test.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.test.ts
@@ -132,6 +132,109 @@ describe('useExpressionEditor', () => {
 		});
 	});
 
+	test('render [empty] when expression evaluates to an empty string', async () => {
+		mockResolveExpression().mockReturnValueOnce('');
+
+		const {
+			expressionEditor: { segments },
+		} = await renderExpressionEditor({
+			editorValue: "{{ '' }}",
+			extensions: [n8nLang()],
+		});
+
+		await waitFor(() => {
+			expect(toValue(segments.all)).toEqual([
+				{
+					error: null,
+					from: 0,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '[empty]',
+					state: 'valid',
+					to: 8,
+				},
+			]);
+
+			expect(toValue(segments.resolvable)).toEqual([
+				{
+					error: null,
+					from: 0,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '[empty]',
+					state: 'valid',
+					to: 8,
+				},
+			]);
+
+			expect(toValue(segments.plaintext)).toEqual([]);
+		});
+	});
+
+	test('does not render [empty] when expression evaluates to an empty string within a string', async () => {
+		mockResolveExpression().mockReturnValueOnce('');
+
+		const {
+			expressionEditor: { segments },
+		} = await renderExpressionEditor({
+			editorValue: "before {{ '' }} after",
+			extensions: [n8nLang()],
+		});
+
+		await waitFor(() => {
+			expect(toValue(segments.all)).toEqual([
+				{
+					from: 0,
+					kind: 'plaintext',
+					plaintext: 'before ',
+					to: 7,
+				},
+				{
+					error: null,
+					from: 7,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '',
+					state: 'valid',
+					to: 15,
+				},
+				{
+					from: 15,
+					kind: 'plaintext',
+					plaintext: ' after',
+					to: 21,
+				},
+			]);
+
+			expect(toValue(segments.resolvable)).toEqual([
+				{
+					error: null,
+					from: 7,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '',
+					state: 'valid',
+					to: 15,
+				},
+			]);
+
+			expect(toValue(segments.plaintext)).toEqual([
+				{
+					from: 0,
+					kind: 'plaintext',
+					plaintext: 'before ',
+					to: 7,
+				},
+				{
+					from: 15,
+					kind: 'plaintext',
+					plaintext: ' after',
+					to: 21,
+				},
+			]);
+		});
+	});
+
 	describe('readEditorValue()', () => {
 		test('should return the full editor value (unresolved)', async () => {
 			mockResolveExpression().mockReturnValueOnce(15);
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/editor-ui/src/composables/useExpressionEditor.ts
index 0911621be3..6cee456249 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.ts
@@ -22,11 +22,7 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
 import { closeCursorInfoBox } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Html, Plaintext, RawSegment, Resolvable, Segment } from '@/types/expressions';
-import {
-	getExpressionErrorMessage,
-	getResolvableState,
-	isEmptyExpression,
-} from '@/utils/expressions';
+import { getExpressionErrorMessage, getResolvableState } from '@/utils/expressions';
 import { closeCompletion, completionStatus } from '@codemirror/autocomplete';
 import {
 	Compartment,
@@ -129,6 +125,12 @@ export const useExpressionEditor = ({
 
 			return acc;
 		}, []);
+		if (
+			segments.value.length === 1 &&
+			segments.value[0]?.kind === 'resolvable' &&
+			segments.value[0]?.resolved === ''
+		)
+			segments.value[0].resolved = i18n.baseText('expressionModalInput.empty');
 	};
 
 	function readEditorValue(): string {
@@ -314,14 +316,6 @@ export const useExpressionEditor = ({
 			result.fullError = error;
 		}
 
-		if (result.resolved === '') {
-			result.resolved = i18n.baseText('expressionModalInput.empty');
-		}
-
-		if (result.resolved === undefined && isEmptyExpression(resolvable)) {
-			result.resolved = i18n.baseText('expressionModalInput.empty');
-		}
-
 		if (result.resolved === undefined) {
 			result.resolved = isUncalledExpressionExtension(resolvable)
 				? i18n.baseText('expressionEditor.uncalledFunction')

From 9dd068632b1542126831baa83cf638ce369b0947 Mon Sep 17 00:00:00 2001
From: Dana <152518854+dana-gill@users.noreply.github.com>
Date: Wed, 8 Jan 2025 10:41:51 +0100
Subject: [PATCH 17/30] fix(Postgres Node): Allow passing in arrays to JSON
 columns for insert (#12452)

---
 .../nodes/Postgres/test/v2/operations.test.ts | 93 +++++++++++++++++++
 .../nodes/Postgres/test/v2/utils.test.ts      | 54 +++++++++++
 .../v2/actions/database/insert.operation.ts   | 29 ++++--
 .../nodes/Postgres/v2/actions/router.ts       |  1 +
 .../nodes/Postgres/v2/helpers/utils.ts        | 18 ++++
 5 files changed, 185 insertions(+), 10 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 a65c2d8de9..5a7addf0d1 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -6,6 +6,7 @@ import type {
 	INode,
 	INodeParameters,
 } from 'n8n-workflow';
+import pgPromise from 'pg-promise';
 
 import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
 import * as executeQuery from '../../v2/actions/database/executeQuery.operation';
@@ -506,6 +507,7 @@ describe('Test PostgresV2, insert operation', () => {
 			items,
 			nodeOptions,
 			createMockDb(columnsInfo),
+			pgPromise(),
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
@@ -579,6 +581,7 @@ describe('Test PostgresV2, insert operation', () => {
 			inputItems,
 			nodeOptions,
 			createMockDb(columnsInfo),
+			pgPromise(),
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
@@ -600,6 +603,96 @@ describe('Test PostgresV2, insert operation', () => {
 			nodeOptions,
 		);
 	});
+
+	it('dataMode: define, should accept an array with values if column is of type json', async () => {
+		const convertValuesToJsonWithPgpSpy = jest.spyOn(utils, 'convertValuesToJsonWithPgp');
+		const hasJsonDataTypeInSchemaSpy = jest.spyOn(utils, 'hasJsonDataTypeInSchema');
+
+		const values = [
+			{ value: { id: 1, json: [], foo: 'data 1' }, expected: { id: 1, json: '[]', foo: 'data 1' } },
+			{
+				value: {
+					id: 2,
+					json: [0, 1],
+					foo: 'data 2',
+				},
+				expected: {
+					id: 2,
+					json: '[0,1]',
+					foo: 'data 2',
+				},
+			},
+			{
+				value: {
+					id: 2,
+					json: [0],
+					foo: 'data 2',
+				},
+				expected: {
+					id: 2,
+					json: '[0]',
+					foo: 'data 2',
+				},
+			},
+		];
+
+		values.forEach(async (value) => {
+			const valuePassedIn = value.value;
+			const nodeParameters: IDataObject = {
+				schema: {
+					__rl: true,
+					mode: 'list',
+					value: 'public',
+				},
+				table: {
+					__rl: true,
+					value: 'my_table',
+					mode: 'list',
+				},
+				columns: {
+					mappingMode: 'defineBelow',
+					value: valuePassedIn,
+				},
+				options: { nodeVersion: 2.5 },
+			};
+			const columnsInfo: ColumnInfo[] = [
+				{ 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 = [
+				{
+					json: valuePassedIn,
+				},
+			];
+
+			const nodeOptions = nodeParameters.options as IDataObject;
+			const pg = pgPromise();
+
+			await insert.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				inputItems,
+				nodeOptions,
+				createMockDb(columnsInfo),
+				pg,
+			);
+
+			expect(runQueries).toHaveBeenCalledWith(
+				[
+					{
+						query: 'INSERT INTO $1:name.$2:name($3:name) VALUES($3:csv) RETURNING *',
+						values: ['public', 'my_table', value.expected],
+					},
+				],
+				inputItems,
+				nodeOptions,
+			);
+			expect(convertValuesToJsonWithPgpSpy).toHaveBeenCalledWith(pg, columnsInfo, valuePassedIn);
+			expect(hasJsonDataTypeInSchemaSpy).toHaveBeenCalledWith(columnsInfo);
+		});
+	});
 });
 
 describe('Test PostgresV2, select operation', () => {
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
index 25840b33bd..60cd74e085 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
@@ -1,5 +1,6 @@
 import type { IDataObject, INode } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import pgPromise from 'pg-promise';
 
 import type { ColumnInfo } from '../../v2/helpers/interfaces';
 import {
@@ -14,6 +15,8 @@ import {
 	wrapData,
 	convertArraysToPostgresFormat,
 	isJSON,
+	convertValuesToJsonWithPgp,
+	hasJsonDataTypeInSchema,
 } from '../../v2/helpers/utils';
 
 const node: INode = {
@@ -387,6 +390,57 @@ describe('Test PostgresV2, checkItemAgainstSchema', () => {
 	});
 });
 
+describe('Test PostgresV2, hasJsonDataType', () => {
+	it('returns true if there are columns which are of type json', () => {
+		const schema: ColumnInfo[] = [
+			{ column_name: 'data', data_type: 'json', is_nullable: 'YES' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
+		];
+
+		expect(hasJsonDataTypeInSchema(schema)).toEqual(true);
+	});
+
+	it('returns false if there are columns which are of type json', () => {
+		const schema: ColumnInfo[] = [{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' }];
+
+		expect(hasJsonDataTypeInSchema(schema)).toEqual(false);
+	});
+});
+
+describe('Test PostgresV2, convertValuesToJsonWithPgp', () => {
+	it('should use pgp to properly convert values to JSON', () => {
+		const pgp = pgPromise();
+		const pgpJsonSpy = jest.spyOn(pgp.as, 'json');
+
+		const schema: ColumnInfo[] = [
+			{ column_name: 'data', data_type: 'json', is_nullable: 'YES' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
+		];
+		const values = [
+			{
+				value: { data: [], id: 1 },
+				expected: { data: '[]', id: 1 },
+			},
+			{
+				value: { data: [0], id: 1 },
+				expected: { data: '[0]', id: 1 },
+			},
+			{
+				value: { data: { key: 2 }, id: 1 },
+				expected: { data: '{"key":2}', id: 1 },
+			},
+		];
+
+		values.forEach((value) => {
+			const data = value.value.data;
+
+			expect(convertValuesToJsonWithPgp(pgp, schema, value.value)).toEqual(value.expected);
+			expect(value.value).toEqual(value.expected);
+			expect(pgpJsonSpy).toHaveBeenCalledWith(data, true);
+		});
+	});
+});
+
 describe('Test PostgresV2, convertArraysToPostgresFormat', () => {
 	it('should convert js arrays to postgres format', () => {
 		const item = {
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
index 9e0b72f953..23d221d848 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
@@ -1,13 +1,14 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeProperties,
+import {
+	type IDataObject,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeProperties,
 } from 'n8n-workflow';
 
 import { updateDisplayOptions } from '@utils/utilities';
 
 import type {
+	PgpClient,
 	PgpDatabase,
 	PostgresNodeOptions,
 	QueriesRunner,
@@ -22,6 +23,8 @@ import {
 	prepareItem,
 	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
+	hasJsonDataTypeInSchema,
+	convertValuesToJsonWithPgp,
 } from '../../helpers/utils';
 import { optionsCollection } from '../common.descriptions';
 
@@ -160,6 +163,7 @@ export async function execute(
 	items: INodeExecutionData[],
 	nodeOptions: PostgresNodeOptions,
 	db: PgpDatabase,
+	pgp: PgpClient,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
 	const nodeVersion = nodeOptions.nodeVersion as number;
@@ -215,11 +219,16 @@ export async function execute(
 					: ((this.getNodeParameter('columns.values', i, []) as IDataObject)
 							.values as IDataObject[]);
 
-			if (nodeVersion < 2.2) {
-				item = prepareItem(valuesToSend);
-			} else {
-				item = this.getNodeParameter('columns.value', i) as IDataObject;
-			}
+			item =
+				nodeVersion < 2.2
+					? prepareItem(valuesToSend)
+					: hasJsonDataTypeInSchema(tableSchema)
+						? convertValuesToJsonWithPgp(
+								pgp,
+								tableSchema,
+								(this.getNodeParameter('columns', i) as IDataObject)?.value as IDataObject,
+							)
+						: (this.getNodeParameter('columns.value', i) as IDataObject);
 		}
 
 		tableSchema = await updateTableSchema(db, tableSchema, schema, table);
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index 28b7b2a7b2..883aff090a 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -43,6 +43,7 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 				items,
 				options,
 				db,
+				pgp,
 			);
 			break;
 		default:
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 69e0ff9046..289c8fe351 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -394,6 +394,24 @@ export function prepareItem(values: IDataObject[]) {
 	return item;
 }
 
+export function hasJsonDataTypeInSchema(schema: ColumnInfo[]) {
+	return schema.some(({ data_type }) => data_type === 'json');
+}
+
+export function convertValuesToJsonWithPgp(
+	pgp: PgpClient,
+	schema: ColumnInfo[],
+	values: IDataObject,
+) {
+	schema
+		.filter(({ data_type }: { data_type: string }) => data_type === 'json')
+		.forEach(({ column_name }) => {
+			values[column_name] = pgp.as.json(values[column_name], true);
+		});
+
+	return values;
+}
+
 export async function columnFeatureSupport(
 	db: PgpDatabase,
 ): Promise<{ identity_generation: boolean; is_generated: boolean }> {

From 6e189fda776051e09e90b3d86ecd0d1e80dcc0c6 Mon Sep 17 00:00:00 2001
From: Stanimira Rikova <104592468+Stamsy@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:59:01 +0200
Subject: [PATCH 18/30] feat(HighLevel Node): Add support for calendar items
 (#10820)

---
 .../HighLevelOAuth2Api.credentials.ts         |  10 +
 .../nodes/HighLevel/v2/GenericFunctions.ts    | 106 ++++-
 .../nodes/HighLevel/v2/HighLevelV2.node.ts    |  89 +++-
 .../v2/description/CalendarDescription.ts     | 387 ++++++++++++++++++
 .../v2/description/ContactDescription.ts      | 129 +++---
 .../test/AddCustomFieldsPreSendAction.test.ts |  98 +++++
 .../test/AddLocationIdPreSendAction.test.ts   | 125 ++++++
 .../v2/test/AddNotePostReceiveAction.test.ts  | 116 ++++++
 .../ContactIdentifierPreSendAction.test.ts    | 130 ++++++
 .../test/DateTimeToEpochPreSendAction.test.ts |  95 +++++
 .../v2/test/DateToIsoSuperssMillis.test.ts    |  33 ++
 .../v2/test/DueDatePreSendAction.test.ts      |  62 +++
 .../HighLevel/v2/test/GetContacts.test.ts     |  45 ++
 .../v2/test/GetPipelineStages.test.ts         |  87 ++++
 .../HighLevel/v2/test/GetPipelines.test.ts    |  45 ++
 .../nodes/HighLevel/v2/test/GetUsers.test.ts  |  45 ++
 .../v2/test/HighLevelApiPagination.test.ts    | 103 +++++
 .../v2/test/HighLevelApiRequest.test.ts       | 116 ++++++
 .../HighLevel/v2/test/IsEmailValid.test.ts    |  63 +++
 .../HighLevel/v2/test/IsPhoneValid.test.ts    |  33 ++
 .../v2/test/SplitTagsPreSendAction.test.ts    |  91 ++++
 .../v2/test/TaskPostReceiceAction.test.ts     |  86 ++++
 .../v2/test/TaskUpdatePreSendAction.test.ts   | 126 ++++++
 .../ValidEmailAndPhonePreSendAction.test.ts   |  70 ++++
 24 files changed, 2214 insertions(+), 76 deletions(-)
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts
 create mode 100644 packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts

diff --git a/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
index 656cfcc0fb..f41ef76449 100644
--- a/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
@@ -61,5 +61,15 @@ export class HighLevelOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: 'body',
 		},
+		{
+			displayName:
+				'Make sure your credentials include the required OAuth scopes for all actions this node performs.',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+			displayOptions: {
+				hideOnCloud: true,
+			},
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
index 5b4529b9be..1147371cfd 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
@@ -1,5 +1,5 @@
-import type { ToISOTimeOptions } from 'luxon';
 import { DateTime } from 'luxon';
+import type { ToISOTimeOptions } from 'luxon';
 import type {
 	DeclarativeRestApiSettings,
 	IDataObject,
@@ -16,7 +16,7 @@ import type {
 	IPollFunctions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 
 const VALID_EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -31,7 +31,7 @@ export function isPhoneValid(phone: string): boolean {
 	return VALID_PHONE_REGEX.test(String(phone));
 }
 
-function dateToIsoSupressMillis(dateTime: string) {
+export function dateToIsoSupressMillis(dateTime: string) {
 	const options: ToISOTimeOptions = { suppressMilliseconds: true };
 	return DateTime.fromISO(dateTime).toISO(options);
 }
@@ -63,7 +63,7 @@ export async function dueDatePreSendAction(
 		);
 	}
 	const dueDate = dateToIsoSupressMillis(dueDateParam);
-	requestOptions.body = (requestOptions.body || {}) as object;
+	requestOptions.body = (requestOptions.body ?? {}) as object;
 	Object.assign(requestOptions.body, { dueDate });
 	return requestOptions;
 }
@@ -72,7 +72,7 @@ export async function contactIdentifierPreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	requestOptions.body = (requestOptions.body || {}) as object;
+	requestOptions.body = (requestOptions.body ?? {}) as object;
 	let identifier = this.getNodeParameter('contactIdentifier', null) as string;
 	if (!identifier) {
 		const fields = this.getNodeParameter('updateFields') as { contactIdentifier: string };
@@ -92,7 +92,7 @@ export async function validEmailAndPhonePreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const body = (requestOptions.body || {}) as { email?: string; phone?: string };
+	const body = (requestOptions.body ?? {}) as { email?: string; phone?: string };
 
 	if (body.email && !isEmailValid(body.email)) {
 		const message = `email "${body.email}" has invalid format`;
@@ -111,7 +111,7 @@ export async function dateTimeToEpochPreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const qs = (requestOptions.qs || {}) as {
+	const qs = (requestOptions.qs ?? {}) as {
 		startDate?: string | number;
 		endDate?: string | number;
 	};
@@ -133,22 +133,22 @@ export async function addLocationIdPreSendAction(
 
 	if (resource === 'contact') {
 		if (operation === 'getAll') {
-			requestOptions.qs = requestOptions.qs || {};
+			requestOptions.qs = requestOptions.qs ?? {};
 			Object.assign(requestOptions.qs, { locationId });
 		}
 		if (operation === 'create') {
-			requestOptions.body = requestOptions.body || {};
+			requestOptions.body = requestOptions.body ?? {};
 			Object.assign(requestOptions.body, { locationId });
 		}
 	}
 
 	if (resource === 'opportunity') {
 		if (operation === 'create') {
-			requestOptions.body = requestOptions.body || {};
+			requestOptions.body = requestOptions.body ?? {};
 			Object.assign(requestOptions.body, { locationId });
 		}
 		if (operation === 'getAll') {
-			requestOptions.qs = requestOptions.qs || {};
+			requestOptions.qs = requestOptions.qs ?? {};
 			Object.assign(requestOptions.qs, { location_id: locationId });
 		}
 	}
@@ -179,7 +179,7 @@ export async function highLevelApiRequest(
 		method,
 		body,
 		qs,
-		url: url || `https://services.leadconnectorhq.com${resource}`,
+		url: url ?? `https://services.leadconnectorhq.com${resource}`,
 		json: true,
 	};
 	if (!Object.keys(body).length) {
@@ -192,11 +192,42 @@ export async function highLevelApiRequest(
 	return await this.helpers.httpRequestWithAuthentication.call(this, 'highLevelOAuth2Api', options);
 }
 
+export const addNotePostReceiveAction = async function (
+	this: IExecuteSingleFunctions,
+	items: INodeExecutionData[],
+	response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	const note = this.getNodeParameter('additionalFields.notes', 0) as string;
+
+	if (!note) {
+		return items;
+	}
+
+	const contact: IDataObject = (response.body as IDataObject).contact as IDataObject;
+
+	// Ensure there is a valid response and extract contactId and userId
+	if (!response || !response.body || !contact) {
+		throw new ApplicationError('No response data available to extract contact ID and user ID.');
+	}
+
+	const contactId = contact.id;
+	const userId = contact.locationId;
+
+	const requestBody = {
+		userId,
+		body: note,
+	};
+
+	await highLevelApiRequest.call(this, 'POST', `/contacts/${contactId}/notes`, requestBody, {});
+
+	return items;
+};
+
 export async function taskUpdatePreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const body = (requestOptions.body || {}) as { title?: string; dueDate?: string };
+	const body = (requestOptions.body ?? {}) as { title?: string; dueDate?: string };
 	if (!body.title || !body.dueDate) {
 		const contactId = this.getNodeParameter('contactId');
 		const taskId = this.getNodeParameter('taskId');
@@ -214,7 +245,7 @@ export async function splitTagsPreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const body = (requestOptions.body || {}) as IDataObject;
+	const body = (requestOptions.body ?? {}) as IDataObject;
 	if (body.tags) {
 		if (Array.isArray(body.tags)) return requestOptions;
 		body.tags = (body.tags as string).split(',').map((tag) => tag.trim());
@@ -236,7 +267,7 @@ export async function highLevelApiPagination(
 	};
 	const rootProperty = resourceMapping[resource];
 
-	requestData.options.qs = requestData.options.qs || {};
+	requestData.options.qs = requestData.options.qs ?? {};
 	if (returnAll) requestData.options.qs.limit = 100;
 
 	let responseTotal = 0;
@@ -344,11 +375,42 @@ export async function getUsers(this: ILoadOptionsFunctions): Promise<INodeProper
 	return options;
 }
 
-export async function getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-	const responseData = await highLevelApiRequest.call(this, 'GET', '/timezones');
-	const timezones = responseData.timezones as string[];
-	return timezones.map((zone) => ({
-		name: zone,
-		value: zone,
-	})) as INodePropertyOptions[];
+export async function addCustomFieldsPreSendAction(
+	this: IExecuteSingleFunctions,
+	requestOptions: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const requestBody = requestOptions.body as IDataObject;
+
+	if (requestBody && requestBody.customFields) {
+		const rawCustomFields = requestBody.customFields as IDataObject;
+
+		// Define the structure of fieldId
+		interface FieldIdType {
+			value: unknown;
+			cachedResultName?: string;
+		}
+
+		// Ensure rawCustomFields.values is an array of objects with fieldId and fieldValue
+		if (rawCustomFields && Array.isArray(rawCustomFields.values)) {
+			const formattedCustomFields = rawCustomFields.values.map((field: unknown) => {
+				// Assert that field is of the expected shape
+				const typedField = field as { fieldId: FieldIdType; fieldValue: unknown };
+
+				const fieldId = typedField.fieldId;
+
+				if (typeof fieldId === 'object' && fieldId !== null && 'value' in fieldId) {
+					return {
+						id: fieldId.value,
+						key: fieldId.cachedResultName ?? 'default_key',
+						field_value: typedField.fieldValue,
+					};
+				} else {
+					throw new ApplicationError('Error processing custom fields.');
+				}
+			});
+			requestBody.customFields = formattedCustomFields;
+		}
+	}
+
+	return requestOptions;
 }
diff --git a/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts b/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
index cb596319f9..be9ee5d4f7 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
@@ -1,4 +1,8 @@
 import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
 	INodeProperties,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -6,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import { calendarFields, calendarOperations } from './description/CalendarDescription';
 import { contactFields, contactNotes, contactOperations } from './description/ContactDescription';
 import { opportunityFields, opportunityOperations } from './description/OpportunityDescription';
 import { taskFields, taskOperations } from './description/TaskDescription';
@@ -13,7 +18,6 @@ import {
 	getContacts,
 	getPipelines,
 	getPipelineStages,
-	getTimezones,
 	getUsers,
 	highLevelApiPagination,
 } from './GenericFunctions';
@@ -37,6 +41,10 @@ const resources: INodeProperties[] = [
 				name: 'Task',
 				value: 'task',
 			},
+			{
+				name: 'Calendar',
+				value: 'calendar',
+			},
 		],
 		default: 'contact',
 		required: true,
@@ -82,6 +90,8 @@ const versionDescription: INodeTypeDescription = {
 		...opportunityFields,
 		...taskOperations,
 		...taskFields,
+		...calendarOperations,
+		...calendarFields,
 	],
 };
 
@@ -101,7 +111,82 @@ export class HighLevelV2 implements INodeType {
 			getContacts,
 			getPipelineStages,
 			getUsers,
-			getTimezones,
+		},
+		listSearch: {
+			async searchCustomFields(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const { locationId } =
+					((await this.getCredentials('highLevelOAuth2Api'))?.oauthTokenData as IDataObject) ?? {};
+
+				const responseData: IDataObject = (await this.helpers.httpRequestWithAuthentication.call(
+					this,
+					'highLevelOAuth2Api',
+					{
+						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+						url: `https://services.leadconnectorhq.com/locations/${locationId}/customFields?model=contact`,
+						headers: {
+							Accept: 'application/json',
+							'Content-Type': 'application/json',
+							Version: '2021-07-28',
+						},
+					},
+				)) as IDataObject;
+
+				const customFields = responseData.customFields as Array<{ name: string; id: string }>;
+
+				const results: INodeListSearchItems[] = customFields
+					.map((a) => ({
+						name: a.name,
+						value: a.id,
+					}))
+					.filter((a) => !filter || a.name.toLowerCase().includes(filter.toLowerCase()))
+					.sort((a, b) => {
+						if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
+						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+						return 0;
+					});
+
+				return { results };
+			},
+			async searchTimezones(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const { locationId } =
+					((await this.getCredentials('highLevelOAuth2Api'))?.oauthTokenData as IDataObject) ?? {};
+
+				const responseData: IDataObject = (await this.helpers.httpRequestWithAuthentication.call(
+					this,
+					'highLevelOAuth2Api',
+					{
+						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+						url: `https://services.leadconnectorhq.com/locations/${locationId}/timezones`,
+						headers: {
+							Accept: 'application/json',
+							'Content-Type': 'application/json',
+							Version: '2021-07-28',
+						},
+					},
+				)) as IDataObject;
+
+				const timezones = responseData.timeZones as string[];
+
+				const results: INodeListSearchItems[] = timezones
+					.map((zone) => ({
+						name: zone.trim(),
+						value: zone.trim(),
+					}))
+					.filter((zone) => !filter || zone.name.toLowerCase().includes(filter.toLowerCase()))
+					.sort((a, b) => {
+						if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
+						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+						return 0;
+					});
+
+				return { results };
+			},
 		},
 	};
 }
diff --git a/packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts b/packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts
new file mode 100644
index 0000000000..a30f2d0f03
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts
@@ -0,0 +1,387 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const calendarOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+			},
+		},
+		options: [
+			{
+				name: 'Book Appointment',
+				value: 'bookAppointment',
+				action: 'Book appointment in a calendar',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '=/calendars/events/appointments',
+					},
+				},
+			},
+			{
+				name: 'Get Free Slots',
+				value: 'getFreeSlots',
+				action: 'Get free slots of a calendar',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/calendars/{{$parameter.calendarId}}/free-slots',
+					},
+				},
+			},
+		],
+		default: 'bookAppointment',
+		noDataExpression: true,
+	},
+];
+
+const bookAppointmentProperties: INodeProperties[] = [
+	{
+		displayName: 'Calendar ID',
+		name: 'calendarId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'calendarId',
+			},
+		},
+	},
+	{
+		displayName: 'Location ID',
+		name: 'locationId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'locationId',
+			},
+		},
+	},
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'contactId',
+			},
+		},
+	},
+	{
+		displayName: 'Start Time',
+		name: 'startTime',
+		type: 'string',
+		required: true,
+		description: 'Example: 2021-06-23T03:30:00+05:30',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'startTime',
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		options: [
+			{
+				displayName: 'End Time',
+				name: 'endTime',
+				type: 'string',
+				description: 'Example: 2021-06-23T04:30:00+05:30',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'endTime',
+					},
+				},
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'title',
+					},
+				},
+			},
+			{
+				displayName: 'Appointment Status',
+				name: 'appointmentStatus',
+				type: 'options',
+				default: 'new',
+				description:
+					'The status of the appointment. Allowed values: new, confirmed, cancelled, showed, noshow, invalid.',
+				options: [
+					{
+						name: 'Cancelled',
+						value: 'cancelled',
+					},
+					{
+						name: 'Confirmed',
+						value: 'confirmed',
+					},
+					{
+						name: 'Invalid',
+						value: 'invalid',
+					},
+					{
+						name: 'New',
+						value: 'new',
+					},
+					{
+						name: 'No Show',
+						value: 'noshow',
+					},
+					{
+						name: 'Showed',
+						value: 'showed',
+					},
+				],
+				routing: {
+					send: {
+						type: 'body',
+						property: 'appointmentStatus',
+					},
+				},
+			},
+			{
+				displayName: 'Assigned User ID',
+				name: 'assignedUserId',
+				type: 'string',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'assignedUserId',
+					},
+				},
+			},
+			{
+				displayName: 'Address',
+				name: 'address',
+				type: 'string',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'address',
+					},
+				},
+			},
+			{
+				displayName: 'Ignore Date Range',
+				name: 'ignoreDateRange',
+				type: 'boolean',
+				default: false,
+				routing: {
+					send: {
+						type: 'body',
+						property: 'ignoreDateRange',
+					},
+				},
+			},
+			{
+				displayName: 'Notify',
+				name: 'toNotify',
+				type: 'boolean',
+				default: true,
+				routing: {
+					send: {
+						type: 'body',
+						property: 'toNotify',
+					},
+				},
+			},
+		],
+	},
+];
+
+const getFreeSlotsProperties: INodeProperties[] = [
+	{
+		displayName: 'Calendar ID',
+		name: 'calendarId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Start Date',
+		name: 'startDate',
+		type: 'number',
+		//type: 'dateTime' TODO
+		default: '',
+		required: true,
+		description: 'The start date for fetching free calendar slots. Example: 1548898600000.',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		routing: {
+			send: {
+				type: 'query',
+				property: 'startDate',
+			},
+		},
+	},
+	{
+		displayName: 'End Date',
+		name: 'endDate',
+		type: 'number',
+		//type: 'dateTime' TODO
+		default: '',
+		required: true,
+		description: 'The end date for fetching free calendar slots. Example: 1601490599999.',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		routing: {
+			send: {
+				type: 'query',
+				property: 'endDate',
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				default: '',
+				description: 'The timezone to use for the returned slots. Example: America/Chihuahua.',
+				routing: {
+					send: {
+						type: 'query',
+						property: 'timezone',
+					},
+				},
+			},
+			{
+				displayName: 'User ID',
+				name: 'userId',
+				type: 'string',
+				default: '',
+				description: 'User ID to filter the slots (optional)',
+				routing: {
+					send: {
+						type: 'query',
+						property: 'userId',
+					},
+				},
+			},
+			{
+				displayName: 'User IDs',
+				name: 'userIds',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'User IDs',
+						name: 'userIds',
+						type: 'string',
+						default: '',
+						description: 'Comma-separated list of user IDs to filter the slots',
+						routing: {
+							send: {
+								type: 'query',
+								property: 'userIds',
+							},
+						},
+					},
+				],
+			},
+			{
+				displayName: 'Apply Look Busy',
+				name: 'enableLookBusy',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description: 'Apply Look Busy to the slots',
+				routing: {
+					send: {
+						type: 'query',
+						property: 'enableLookBusy',
+					},
+				},
+			},
+		],
+	},
+];
+
+export const calendarFields: INodeProperties[] = [
+	...bookAppointmentProperties,
+	...getFreeSlotsProperties,
+];
diff --git a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
index 04b87b2d7d..770d2ed26e 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
@@ -1,7 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import {
+	addCustomFieldsPreSendAction,
 	addLocationIdPreSendAction,
+	addNotePostReceiveAction,
 	splitTagsPreSendAction,
 	validEmailAndPhonePreSendAction,
 } from '../GenericFunctions';
@@ -31,6 +33,7 @@ export const contactOperations: INodeProperties[] = [
 							validEmailAndPhonePreSendAction,
 							splitTagsPreSendAction,
 							addLocationIdPreSendAction,
+							addCustomFieldsPreSendAction,
 						],
 					},
 					output: {
@@ -41,6 +44,7 @@ export const contactOperations: INodeProperties[] = [
 									property: 'contact',
 								},
 							},
+							addNotePostReceiveAction,
 						],
 					},
 				},
@@ -165,44 +169,27 @@ const customFields: INodeProperties = {
 				{
 					displayName: 'Field Name or ID',
 					name: 'fieldId',
-					type: 'options',
 					required: true,
+					type: 'resourceLocator',
 					default: '',
-					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-					typeOptions: {
-						loadOptions: {
-							routing: {
-								request: {
-									url: '/custom-fields',
-									method: 'GET',
-								},
-								output: {
-									postReceive: [
-										{
-											type: 'rootProperty',
-											properties: {
-												property: 'customFields',
-											},
-										},
-										{
-											type: 'setKeyValue',
-											properties: {
-												name: '={{$responseItem.name}}',
-												value: '={{$responseItem.id}}',
-											},
-										},
-										{
-											type: 'sort',
-											properties: {
-												key: 'name',
-											},
-										},
-									],
-								},
+					description: 'Choose from the list, or specify an ID using an expression',
+					modes: [
+						{
+							displayName: 'List',
+							name: 'list',
+							type: 'list',
+							typeOptions: {
+								searchListMethod: 'searchCustomFields',
+								searchable: true,
 							},
 						},
-					},
+						{
+							displayName: 'ID',
+							name: 'id',
+							type: 'string',
+							placeholder: 'Enter Custom Field ID',
+						},
+					],
 				},
 				{
 					displayName: 'Field Value',
@@ -211,15 +198,22 @@ const customFields: INodeProperties = {
 					default: '',
 					routing: {
 						send: {
-							value: '={{$value}}',
-							property: '=customField.{{$parent.fieldId}}',
 							type: 'body',
+							property: 'customFields',
+							value:
+								'={{ $parent.values.map(field => ({ fieldId: { id: field.fieldId.id }, field_value: field.fieldValue })) }}',
 						},
 					},
 				},
 			],
 		},
 	],
+	routing: {
+		send: {
+			type: 'body',
+			property: 'customFields',
+		},
+	},
 };
 
 const createProperties: INodeProperties[] = [
@@ -391,6 +385,12 @@ const createProperties: INodeProperties[] = [
 					},
 				},
 			},
+			{
+				displayName: 'Note',
+				name: 'notes',
+				type: 'string',
+				default: '',
+			},
 			{
 				displayName: 'Tags',
 				name: 'tags',
@@ -405,16 +405,29 @@ const createProperties: INodeProperties[] = [
 				},
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 				displayName: 'Timezone',
 				name: 'timezone',
-				type: 'options',
+				placeholder: 'Select Timezone',
+				type: 'resourceLocator',
 				default: '',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getTimezones',
-				},
+				description: 'Choose from the list, or specify a timezone using an expression',
+				modes: [
+					{
+						displayName: 'List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'searchTimezones',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: 'Enter Timezone ID',
+					},
+				],
 				routing: {
 					send: {
 						type: 'body',
@@ -608,16 +621,29 @@ const updateProperties: INodeProperties[] = [
 				},
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 				displayName: 'Timezone',
 				name: 'timezone',
-				type: 'options',
+				placeholder: 'Select Timezone',
+				type: 'resourceLocator',
 				default: '',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getTimezones',
-				},
+				description: 'Choose from the list, or specify a timezone using an expression',
+				modes: [
+					{
+						displayName: 'List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'searchTimezones',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: 'Enter Timezone ID',
+					},
+				],
 				routing: {
 					send: {
 						type: 'body',
@@ -700,9 +726,8 @@ const getAllProperties: INodeProperties[] = [
 		},
 		typeOptions: {
 			minValue: 1,
-			maxValue: 100,
 		},
-		default: 20,
+		default: 50,
 		routing: {
 			send: {
 				type: 'query',
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts
new file mode 100644
index 0000000000..6d77177703
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts
@@ -0,0 +1,98 @@
+import type { IDataObject, IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { addCustomFieldsPreSendAction } from '../GenericFunctions';
+
+describe('addCustomFieldsPreSendAction', () => {
+	let mockThis: any;
+
+	beforeEach(() => {
+		mockThis = {
+			helpers: {
+				httpRequest: jest.fn(),
+				httpRequestWithAuthentication: jest.fn(),
+				requestWithAuthenticationPaginated: jest.fn(),
+				request: jest.fn(),
+				requestWithAuthentication: jest.fn(),
+				requestOAuth1: jest.fn(),
+				requestOAuth2: jest.fn(),
+				assertBinaryData: jest.fn(),
+				getBinaryDataBuffer: jest.fn(),
+				prepareBinaryData: jest.fn(),
+				setBinaryDataBuffer: jest.fn(),
+				copyBinaryFile: jest.fn(),
+				binaryToBuffer: jest.fn(),
+				binaryToString: jest.fn(),
+				getBinaryPath: jest.fn(),
+				getBinaryStream: jest.fn(),
+				getBinaryMetadata: jest.fn(),
+				createDeferredPromise: jest
+					.fn()
+					.mockReturnValue({ promise: Promise.resolve(), resolve: jest.fn(), reject: jest.fn() }),
+			},
+		};
+	});
+
+	it('should format custom fields correctly when provided', async () => {
+		const mockRequestOptions: IHttpRequestOptions = {
+			body: {
+				customFields: {
+					values: [
+						{
+							fieldId: { value: '123', cachedResultName: 'FieldName' },
+							fieldValue: 'TestValue',
+						},
+						{
+							fieldId: { value: '456' },
+							fieldValue: 'AnotherValue',
+						},
+					],
+				},
+			} as IDataObject,
+			url: '',
+		};
+
+		const result = await addCustomFieldsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			mockRequestOptions,
+		);
+
+		expect((result.body as IDataObject).customFields).toEqual([
+			{ id: '123', key: 'FieldName', field_value: 'TestValue' },
+			{ id: '456', key: 'default_key', field_value: 'AnotherValue' },
+		]);
+	});
+
+	it('should not modify request body if customFields is not provided', async () => {
+		const mockRequestOptions: IHttpRequestOptions = {
+			body: {
+				otherField: 'SomeValue',
+			} as IDataObject,
+			url: '',
+		};
+
+		const result = await addCustomFieldsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			mockRequestOptions,
+		);
+
+		expect(result).toEqual(mockRequestOptions);
+	});
+
+	it('should handle customFields with empty values', async () => {
+		const mockRequestOptions: IHttpRequestOptions = {
+			body: {
+				customFields: {
+					values: [],
+				},
+			} as IDataObject,
+			url: '',
+		};
+
+		const result = await addCustomFieldsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			mockRequestOptions,
+		);
+
+		expect((result.body as IDataObject).customFields).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts
new file mode 100644
index 0000000000..608a454cb3
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts
@@ -0,0 +1,125 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { addLocationIdPreSendAction } from '../GenericFunctions';
+
+describe('addLocationIdPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNodeParameter: jest.fn(),
+			getCredentials: jest.fn(),
+		};
+	});
+
+	it('should add locationId to query parameters for contact getAll operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('contact')
+			.mockReturnValueOnce('getAll');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({ locationId: '123' });
+	});
+
+	it('should add locationId to the body for contact create operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('contact')
+			.mockReturnValueOnce('create');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ locationId: '123' });
+	});
+
+	it('should add locationId to query parameters for opportunity getAll operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('opportunity')
+			.mockReturnValueOnce('getAll');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({ location_id: '123' });
+	});
+
+	it('should add locationId to the body for opportunity create operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('opportunity')
+			.mockReturnValueOnce('create');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ locationId: '123' });
+	});
+
+	it('should not modify requestOptions if no resource or operation matches', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('unknown')
+			.mockReturnValueOnce('unknown');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+			qs: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts
new file mode 100644
index 0000000000..77c790782e
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts
@@ -0,0 +1,116 @@
+import { highLevelApiRequest } from '../GenericFunctions';
+
+describe('GenericFunctions - highLevelApiRequest', () => {
+	let mockContext: any;
+	let mockHttpRequestWithAuthentication: jest.Mock;
+
+	beforeEach(() => {
+		mockHttpRequestWithAuthentication = jest.fn();
+		mockContext = {
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+		};
+	});
+
+	test('should make a successful request with all parameters', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'POST';
+		const resource = '/example-resource';
+		const body = { key: 'value' };
+		const qs = { query: 'test' };
+		const url = 'https://custom-url.example.com/api';
+		const option = { headers: { Authorization: 'Bearer test-token' } };
+
+		const result = await highLevelApiRequest.call(
+			mockContext,
+			method,
+			resource,
+			body,
+			qs,
+			url,
+			option,
+		);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: { Authorization: 'Bearer test-token' },
+			method: 'POST',
+			body: { key: 'value' },
+			qs: { query: 'test' },
+			url: 'https://custom-url.example.com/api',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should default to the base URL when no custom URL is provided', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'GET';
+		const resource = '/default-resource';
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'GET',
+			url: 'https://services.leadconnectorhq.com/default-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the body property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'DELETE';
+		const resource = '/example-resource';
+		const body = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, body);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'DELETE',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the query string property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'PATCH';
+		const resource = '/example-resource';
+		const qs = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, {}, qs);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'PATCH',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts
new file mode 100644
index 0000000000..f2c7bb1672
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts
@@ -0,0 +1,130 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions, INode } from 'n8n-workflow';
+
+import { contactIdentifierPreSendAction, isEmailValid, isPhoneValid } from '../GenericFunctions';
+
+jest.mock('../GenericFunctions', () => ({
+	...jest.requireActual('../GenericFunctions'),
+	isEmailValid: jest.fn(),
+	isPhoneValid: jest.fn(),
+}));
+
+describe('contactIdentifierPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNode: jest.fn(
+				() =>
+					({
+						id: 'mock-node-id',
+						name: 'mock-node',
+						typeVersion: 1,
+						type: 'n8n-nodes-base.mockNode',
+						position: [0, 0],
+						parameters: {},
+					}) as INode,
+			),
+			getNodeParameter: jest.fn((parameterName: string) => {
+				if (parameterName === 'contactIdentifier') return null;
+				if (parameterName === 'updateFields') return { contactIdentifier: 'default-identifier' };
+				return undefined;
+			}),
+		};
+	});
+
+	it('should add email to requestOptions.body if identifier is a valid email', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(true);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('valid@example.com'); // Mock email
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ email: 'valid@example.com' });
+	});
+
+	it('should add phone to requestOptions.body if identifier is a valid phone', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(false);
+		(isPhoneValid as jest.Mock).mockReturnValue(true);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('1234567890'); // Mock phone
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ phone: '1234567890' });
+	});
+
+	it('should add contactId to requestOptions.body if identifier is neither email nor phone', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(false);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('contact-id-123'); // Mock contactId
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ contactId: 'contact-id-123' });
+	});
+
+	it('should use updateFields.contactIdentifier if contactIdentifier is not provided', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(true);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+
+		(mockThis.getNodeParameter as jest.Mock).mockImplementation((parameterName: string) => {
+			if (parameterName === 'contactIdentifier') return null;
+			if (parameterName === 'updateFields')
+				return { contactIdentifier: 'default-email@example.com' };
+			return undefined;
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ email: 'default-email@example.com' });
+	});
+
+	it('should initialize body as an empty object if it is undefined', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(false);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('identifier-123');
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: undefined,
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ contactId: 'identifier-123' });
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts
new file mode 100644
index 0000000000..6816504641
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts
@@ -0,0 +1,95 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { dateTimeToEpochPreSendAction } from '../GenericFunctions';
+
+describe('dateTimeToEpochPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {};
+	});
+
+	it('should convert startDate and endDate to epoch time', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {
+				startDate: '2024-12-25T00:00:00Z',
+				endDate: '2024-12-26T00:00:00Z',
+			},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({
+			startDate: new Date('2024-12-25T00:00:00Z').getTime(),
+			endDate: new Date('2024-12-26T00:00:00Z').getTime(),
+		});
+	});
+
+	it('should convert only startDate if endDate is not provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {
+				startDate: '2024-12-25T00:00:00Z',
+			},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({
+			startDate: new Date('2024-12-25T00:00:00Z').getTime(),
+		});
+	});
+
+	it('should convert only endDate if startDate is not provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {
+				endDate: '2024-12-26T00:00:00Z',
+			},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({
+			endDate: new Date('2024-12-26T00:00:00Z').getTime(),
+		});
+	});
+
+	it('should not modify requestOptions if neither startDate nor endDate are provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should not modify requestOptions if qs is undefined', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: undefined,
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts
new file mode 100644
index 0000000000..c015908a9c
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts
@@ -0,0 +1,33 @@
+import { dateToIsoSupressMillis } from '../GenericFunctions';
+
+describe('dateToIsoSupressMillis', () => {
+	it('should return an ISO string without milliseconds (UTC)', () => {
+		const dateTime = '2024-12-25T10:15:30.123Z';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBe('2024-12-25T10:15:30.123+00:00');
+	});
+
+	it('should handle dates without milliseconds correctly', () => {
+		const dateTime = '2024-12-25T10:15:30Z';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBe('2024-12-25T10:15:30+00:00');
+	});
+
+	it('should handle time zone offsets correctly', () => {
+		const dateTime = '2024-12-25T10:15:30.123+02:00';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBe('2024-12-25T08:15:30.123+00:00');
+	});
+
+	it('should handle edge case for empty input', () => {
+		const dateTime = '';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBeNull();
+	});
+
+	it('should handle edge case for null input', () => {
+		const dateTime = null as unknown as string;
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBeNull();
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts
new file mode 100644
index 0000000000..1b68bb6206
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts
@@ -0,0 +1,62 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions, INode } from 'n8n-workflow';
+
+import { dueDatePreSendAction } from '../GenericFunctions';
+
+describe('dueDatePreSendAction', () => {
+	let mockThis: IExecuteSingleFunctions;
+
+	beforeEach(() => {
+		mockThis = {
+			getNode: jest.fn(
+				() =>
+					({
+						id: 'mock-node-id',
+						name: 'mock-node',
+						typeVersion: 1,
+						type: 'n8n-nodes-base.mockNode',
+						position: [0, 0],
+						parameters: {},
+					}) as INode,
+			),
+			getNodeParameter: jest.fn(),
+			getInputData: jest.fn(),
+			helpers: {} as any,
+		} as unknown as IExecuteSingleFunctions;
+
+		jest.clearAllMocks();
+	});
+
+	it('should add formatted dueDate to requestOptions.body if dueDate is provided directly', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('2024-12-25');
+
+		const requestOptions: IHttpRequestOptions = { url: 'https://example.com/api' };
+
+		const result = await dueDatePreSendAction.call(mockThis, requestOptions);
+
+		expect(result.body).toEqual({ dueDate: '2024-12-25T00:00:00+00:00' });
+	});
+
+	it('should add formatted dueDate to requestOptions.body if dueDate is provided in updateFields', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+			if (paramName === 'dueDate') return null;
+			if (paramName === 'updateFields') return { dueDate: '2024-12-25' };
+			return undefined;
+		});
+
+		const requestOptions: IHttpRequestOptions = { url: 'https://example.com/api' };
+
+		const result = await dueDatePreSendAction.call(mockThis, requestOptions);
+
+		expect(result.body).toEqual({ dueDate: '2024-12-25T00:00:00+00:00' });
+	});
+
+	it('should initialize body as an empty object if it is undefined', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('2024-12-25');
+
+		const requestOptions: IHttpRequestOptions = { url: 'https://example.com/api', body: undefined };
+
+		const result = await dueDatePreSendAction.call(mockThis, requestOptions);
+
+		expect(result.body).toEqual({ dueDate: '2024-12-25T00:00:00+00:00' });
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts
new file mode 100644
index 0000000000..a432bf315b
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts
@@ -0,0 +1,45 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { getContacts } from '../GenericFunctions';
+
+describe('getContacts', () => {
+	const mockHighLevelApiRequest = jest.fn();
+	const mockGetCredentials = jest.fn();
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHighLevelApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockHighLevelApiRequest.mockClear();
+		mockGetCredentials.mockClear();
+	});
+
+	it('should return a list of contacts', async () => {
+		const mockContacts = [
+			{ id: '1', name: 'Alice', email: 'alice@example.com' },
+			{ id: '2', name: 'Bob', email: 'bob@example.com' },
+		];
+
+		mockHighLevelApiRequest.mockResolvedValue({ contacts: mockContacts });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getContacts.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'alice@example.com', value: '1' },
+			{ name: 'bob@example.com', value: '2' },
+		]);
+	});
+
+	it('should handle empty contacts list', async () => {
+		mockHighLevelApiRequest.mockResolvedValue({ contacts: [] });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getContacts.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts
new file mode 100644
index 0000000000..fa0f534f26
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts
@@ -0,0 +1,87 @@
+import { getPipelineStages } from '../GenericFunctions';
+
+const mockHighLevelApiRequest = jest.fn();
+const mockGetNodeParameter = jest.fn();
+const mockGetCurrentNodeParameter = jest.fn();
+const mockGetCredentials = jest.fn();
+
+const mockContext: any = {
+	getNodeParameter: mockGetNodeParameter,
+	getCurrentNodeParameter: mockGetCurrentNodeParameter,
+	getCredentials: mockGetCredentials,
+	helpers: {
+		httpRequestWithAuthentication: mockHighLevelApiRequest,
+	},
+};
+
+describe('getPipelineStages', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return pipeline stages for create operation', async () => {
+		mockGetNodeParameter.mockReturnValue('create');
+		mockGetCurrentNodeParameter.mockReturnValue('pipeline-1');
+		mockHighLevelApiRequest.mockResolvedValue({
+			pipelines: [
+				{
+					id: 'pipeline-1',
+					stages: [
+						{ id: 'stage-1', name: 'Stage 1' },
+						{ id: 'stage-2', name: 'Stage 2' },
+					],
+				},
+			],
+		});
+
+		const response = await getPipelineStages.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'Stage 1', value: 'stage-1' },
+			{ name: 'Stage 2', value: 'stage-2' },
+		]);
+	});
+
+	it('should return pipeline stages for update operation', async () => {
+		mockGetNodeParameter.mockImplementation((param) => {
+			if (param === 'operation') return 'update';
+			if (param === 'updateFields.pipelineId') return 'pipeline-2';
+		});
+
+		mockHighLevelApiRequest.mockResolvedValue({
+			pipelines: [
+				{
+					id: 'pipeline-2',
+					stages: [
+						{ id: 'stage-3', name: 'Stage 3' },
+						{ id: 'stage-4', name: 'Stage 4' },
+					],
+				},
+			],
+		});
+
+		const response = await getPipelineStages.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'Stage 3', value: 'stage-3' },
+			{ name: 'Stage 4', value: 'stage-4' },
+		]);
+	});
+
+	it('should return an empty array if pipeline is not found', async () => {
+		mockGetNodeParameter.mockReturnValue('create');
+		mockGetCurrentNodeParameter.mockReturnValue('non-existent-pipeline');
+		mockHighLevelApiRequest.mockResolvedValue({
+			pipelines: [
+				{
+					id: 'pipeline-1',
+					stages: [{ id: 'stage-1', name: 'Stage 1' }],
+				},
+			],
+		});
+
+		const response = await getPipelineStages.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts
new file mode 100644
index 0000000000..3c86568dff
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts
@@ -0,0 +1,45 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { getPipelines } from '../GenericFunctions';
+
+describe('getPipelines', () => {
+	const mockHighLevelApiRequest = jest.fn();
+	const mockGetCredentials = jest.fn();
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHighLevelApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockHighLevelApiRequest.mockClear();
+		mockGetCredentials.mockClear();
+	});
+
+	it('should return a list of pipelines', async () => {
+		const mockPipelines = [
+			{ id: '1', name: 'Pipeline A' },
+			{ id: '2', name: 'Pipeline B' },
+		];
+
+		mockHighLevelApiRequest.mockResolvedValue({ pipelines: mockPipelines });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getPipelines.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'Pipeline A', value: '1' },
+			{ name: 'Pipeline B', value: '2' },
+		]);
+	});
+
+	it('should handle empty pipelines list', async () => {
+		mockHighLevelApiRequest.mockResolvedValue({ pipelines: [] });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getPipelines.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts
new file mode 100644
index 0000000000..a60335d20b
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts
@@ -0,0 +1,45 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { getUsers } from '../GenericFunctions';
+
+describe('getUsers', () => {
+	const mockHighLevelApiRequest = jest.fn();
+	const mockGetCredentials = jest.fn();
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHighLevelApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockHighLevelApiRequest.mockClear();
+		mockGetCredentials.mockClear();
+	});
+
+	it('should return a list of users', async () => {
+		const mockUsers = [
+			{ id: '1', name: 'John Doe', email: 'john.doe@example.com' },
+			{ id: '2', name: 'Jane Smith', email: 'jane.smith@example.com' },
+		];
+
+		mockHighLevelApiRequest.mockResolvedValue({ users: mockUsers });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getUsers.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'John Doe', value: '1' },
+			{ name: 'Jane Smith', value: '2' },
+		]);
+	});
+
+	it('should handle empty users list', async () => {
+		mockHighLevelApiRequest.mockResolvedValue({ users: [] });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getUsers.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts
new file mode 100644
index 0000000000..297856eac9
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts
@@ -0,0 +1,103 @@
+import type { IExecutePaginationFunctions } from 'n8n-workflow';
+
+import { highLevelApiPagination } from '../GenericFunctions';
+
+describe('highLevelApiPagination', () => {
+	let mockContext: Partial<IExecutePaginationFunctions>;
+
+	beforeEach(() => {
+		mockContext = {
+			getNodeParameter: jest.fn(),
+			makeRoutingRequest: jest.fn(),
+		};
+	});
+
+	it('should paginate and return all items when returnAll is true', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockImplementation((parameter) => {
+			if (parameter === 'resource') return 'contact';
+			if (parameter === 'returnAll') return true;
+		});
+
+		(mockContext.makeRoutingRequest as jest.Mock)
+			.mockResolvedValueOnce([
+				{
+					json: {
+						contacts: [{ id: '1' }, { id: '2' }],
+						meta: { startAfterId: '2', startAfter: 2, total: 4 },
+					},
+				},
+			])
+			.mockResolvedValueOnce([
+				{
+					json: {
+						contacts: [{ id: '3' }, { id: '4' }],
+						meta: { startAfterId: null, startAfter: null, total: 4 },
+					},
+				},
+			]);
+
+		const requestData = { options: { qs: {} } } as any;
+
+		const result = await highLevelApiPagination.call(
+			mockContext as IExecutePaginationFunctions,
+			requestData,
+		);
+
+		expect(result).toEqual([
+			{ json: { id: '1' } },
+			{ json: { id: '2' } },
+			{ json: { id: '3' } },
+			{ json: { id: '4' } },
+		]);
+	});
+
+	it('should return only the first page of items when returnAll is false', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockImplementation((parameter) => {
+			if (parameter === 'resource') return 'contact';
+			if (parameter === 'returnAll') return false;
+		});
+
+		(mockContext.makeRoutingRequest as jest.Mock).mockResolvedValueOnce([
+			{
+				json: {
+					contacts: [{ id: '1' }, { id: '2' }],
+					meta: { startAfterId: '2', startAfter: 2, total: 4 },
+				},
+			},
+		]);
+
+		const requestData = { options: { qs: {} } } as any;
+
+		const result = await highLevelApiPagination.call(
+			mockContext as IExecutePaginationFunctions,
+			requestData,
+		);
+
+		expect(result).toEqual([{ json: { id: '1' } }, { json: { id: '2' } }]);
+	});
+
+	it('should handle cases with no items', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockImplementation((parameter) => {
+			if (parameter === 'resource') return 'contact';
+			if (parameter === 'returnAll') return true;
+		});
+
+		(mockContext.makeRoutingRequest as jest.Mock).mockResolvedValueOnce([
+			{
+				json: {
+					contacts: [],
+					meta: { startAfterId: null, startAfter: null, total: 0 },
+				},
+			},
+		]);
+
+		const requestData = { options: { qs: {} } } as any;
+
+		const result = await highLevelApiPagination.call(
+			mockContext as IExecutePaginationFunctions,
+			requestData,
+		);
+
+		expect(result).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts
new file mode 100644
index 0000000000..77c790782e
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts
@@ -0,0 +1,116 @@
+import { highLevelApiRequest } from '../GenericFunctions';
+
+describe('GenericFunctions - highLevelApiRequest', () => {
+	let mockContext: any;
+	let mockHttpRequestWithAuthentication: jest.Mock;
+
+	beforeEach(() => {
+		mockHttpRequestWithAuthentication = jest.fn();
+		mockContext = {
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+		};
+	});
+
+	test('should make a successful request with all parameters', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'POST';
+		const resource = '/example-resource';
+		const body = { key: 'value' };
+		const qs = { query: 'test' };
+		const url = 'https://custom-url.example.com/api';
+		const option = { headers: { Authorization: 'Bearer test-token' } };
+
+		const result = await highLevelApiRequest.call(
+			mockContext,
+			method,
+			resource,
+			body,
+			qs,
+			url,
+			option,
+		);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: { Authorization: 'Bearer test-token' },
+			method: 'POST',
+			body: { key: 'value' },
+			qs: { query: 'test' },
+			url: 'https://custom-url.example.com/api',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should default to the base URL when no custom URL is provided', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'GET';
+		const resource = '/default-resource';
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'GET',
+			url: 'https://services.leadconnectorhq.com/default-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the body property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'DELETE';
+		const resource = '/example-resource';
+		const body = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, body);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'DELETE',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the query string property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'PATCH';
+		const resource = '/example-resource';
+		const qs = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, {}, qs);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'PATCH',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts
new file mode 100644
index 0000000000..40c54ad41b
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts
@@ -0,0 +1,63 @@
+import { isEmailValid } from '../GenericFunctions';
+
+describe('isEmailValid', () => {
+	it('should return true for a valid email address', () => {
+		const email = 'test@example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an invalid email address', () => {
+		const email = 'invalid-email';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return true for an email address with subdomain', () => {
+		const email = 'user@sub.example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an email address without a domain', () => {
+		const email = 'user@';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for an email address without a username', () => {
+		const email = '@example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return true for an email address with a plus sign', () => {
+		const email = 'user+alias@example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an email address with invalid characters', () => {
+		const email = 'user@exa$mple.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for an email address without a top-level domain', () => {
+		const email = 'user@example';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return true for an email address with a valid top-level domain', () => {
+		const email = 'user@example.co.uk';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an empty email string', () => {
+		const email = '';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts
new file mode 100644
index 0000000000..d0fef9099c
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts
@@ -0,0 +1,33 @@
+import { isPhoneValid } from '../GenericFunctions';
+
+describe('isPhoneValid', () => {
+	it('should return true for a valid phone number', () => {
+		const phone = '+1234567890';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an invalid phone number', () => {
+		const phone = 'invalid-phone';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for a phone number with invalid characters', () => {
+		const phone = '+123-abc-456';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for an empty phone number', () => {
+		const phone = '';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for a phone number with only special characters', () => {
+		const phone = '!!!@@@###';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts
new file mode 100644
index 0000000000..0d5a0aa729
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts
@@ -0,0 +1,91 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { splitTagsPreSendAction } from '../GenericFunctions';
+
+describe('splitTagsPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {};
+	});
+
+	it('should return requestOptions unchanged if tags are already an array', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				tags: ['tag1', 'tag2', 'tag3'],
+			},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should split a comma-separated string of tags into an array', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				tags: 'tag1, tag2, tag3',
+			},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			tags: ['tag1', 'tag2', 'tag3'],
+		});
+	});
+
+	it('should trim whitespace around tags when splitting a string', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				tags: 'tag1 ,   tag2 , tag3  ',
+			},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			tags: ['tag1', 'tag2', 'tag3'],
+		});
+	});
+
+	it('should return requestOptions unchanged if tags are not provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should return requestOptions unchanged if body is undefined', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: undefined,
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts
new file mode 100644
index 0000000000..8b54b12f54
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts
@@ -0,0 +1,86 @@
+import type {
+	IExecuteSingleFunctions,
+	INodeExecutionData,
+	IN8nHttpFullResponse,
+} from 'n8n-workflow';
+
+import { taskPostReceiceAction } from '../GenericFunctions';
+
+describe('taskPostReceiceAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNodeParameter: jest.fn((parameterName: string) => {
+				if (parameterName === 'contactId') return '12345';
+				return undefined;
+			}),
+		};
+	});
+
+	it('should add contactId to each item in items', async () => {
+		const items: INodeExecutionData[] = [
+			{ json: { field1: 'value1' } },
+			{ json: { field2: 'value2' } },
+		];
+
+		const response: IN8nHttpFullResponse = {
+			body: {},
+			headers: {},
+			statusCode: 200,
+		};
+
+		const result = await taskPostReceiceAction.call(
+			mockThis as IExecuteSingleFunctions,
+			items,
+			response,
+		);
+
+		expect(result).toEqual([
+			{ json: { field1: 'value1', contactId: '12345' } },
+			{ json: { field2: 'value2', contactId: '12345' } },
+		]);
+		expect(mockThis.getNodeParameter).toHaveBeenCalledWith('contactId');
+	});
+
+	it('should not modify other fields in items', async () => {
+		const items: INodeExecutionData[] = [{ json: { name: 'John Doe' } }, { json: { age: 30 } }];
+
+		const response: IN8nHttpFullResponse = {
+			body: {},
+			headers: {},
+			statusCode: 200,
+		};
+
+		const result = await taskPostReceiceAction.call(
+			mockThis as IExecuteSingleFunctions,
+			items,
+			response,
+		);
+
+		expect(result).toEqual([
+			{ json: { name: 'John Doe', contactId: '12345' } },
+			{ json: { age: 30, contactId: '12345' } },
+		]);
+		expect(mockThis.getNodeParameter).toHaveBeenCalledWith('contactId');
+	});
+
+	it('should return an empty array if items is empty', async () => {
+		const items: INodeExecutionData[] = [];
+
+		const response: IN8nHttpFullResponse = {
+			body: {},
+			headers: {},
+			statusCode: 200,
+		};
+
+		const result = await taskPostReceiceAction.call(
+			mockThis as IExecuteSingleFunctions,
+			items,
+			response,
+		);
+
+		expect(result).toEqual([]);
+		expect(mockThis.getNodeParameter).toHaveBeenCalledWith('contactId');
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts
new file mode 100644
index 0000000000..3598126af3
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts
@@ -0,0 +1,126 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { taskUpdatePreSendAction } from '../GenericFunctions';
+
+describe('taskUpdatePreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNodeParameter: jest.fn(),
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			} as any,
+		};
+	});
+
+	it('should not modify requestOptions if title and dueDate are provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: 'Task Title',
+				dueDate: '2024-12-25T00:00:00Z',
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should fetch missing title and dueDate from the API', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('123').mockReturnValueOnce('456');
+
+		const mockApiResponse = {
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T02:00:00+02:00',
+		};
+
+		(mockThis.helpers?.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			mockApiResponse,
+		);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: undefined,
+				dueDate: undefined,
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T00:00:00+00:00',
+		});
+	});
+
+	it('should only fetch title if dueDate is provided', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('123').mockReturnValueOnce('456');
+
+		const mockApiResponse = {
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T02:00:00+02:00',
+		};
+
+		(mockThis.helpers?.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			mockApiResponse,
+		);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: undefined,
+				dueDate: '2024-12-24T00:00:00Z',
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-24T00:00:00Z',
+		});
+	});
+
+	it('should only fetch dueDate if title is provided', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('123').mockReturnValueOnce('456');
+
+		const mockApiResponse = {
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T02:00:00+02:00',
+		};
+
+		(mockThis.helpers?.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			mockApiResponse,
+		);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: 'Existing Task Title',
+				dueDate: undefined,
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			title: 'Existing Task Title',
+			dueDate: '2024-12-25T00:00:00+00:00',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts
new file mode 100644
index 0000000000..6a322e0c92
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts
@@ -0,0 +1,70 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions, INode } from 'n8n-workflow';
+
+import { validEmailAndPhonePreSendAction, isEmailValid, isPhoneValid } from '../GenericFunctions';
+
+jest.mock('../GenericFunctions', () => ({
+	...jest.requireActual('../GenericFunctions'),
+	isEmailValid: jest.fn(),
+	isPhoneValid: jest.fn(),
+}));
+
+describe('validEmailAndPhonePreSendAction', () => {
+	let mockThis: IExecuteSingleFunctions;
+
+	beforeEach(() => {
+		mockThis = {
+			getNode: jest.fn(
+				() =>
+					({
+						id: 'mock-node-id',
+						name: 'mock-node',
+						typeVersion: 1,
+						type: 'n8n-nodes-base.mockNode',
+						position: [0, 0],
+						parameters: {},
+					}) as INode,
+			),
+		} as unknown as IExecuteSingleFunctions;
+
+		jest.clearAllMocks();
+	});
+
+	it('should return requestOptions unchanged if email and phone are valid', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(true);
+		(isPhoneValid as jest.Mock).mockReturnValue(true);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				email: 'valid@example.com',
+				phone: '+1234567890',
+			},
+		};
+
+		const result = await validEmailAndPhonePreSendAction.call(mockThis, requestOptions);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should not modify requestOptions if no email or phone is provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await validEmailAndPhonePreSendAction.call(mockThis, requestOptions);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should not modify requestOptions if body is undefined', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: undefined,
+		};
+
+		const result = await validEmailAndPhonePreSendAction.call(mockThis, requestOptions);
+
+		expect(result).toEqual(requestOptions);
+	});
+});

From 36548618860a8d21505a5de2376cf4253de245cd Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 8 Jan 2025 13:24:18 +0300
Subject: [PATCH 19/30] feat: Update copy for Vector Store Tool modes
 (no-changelog) (#12474)

---
 cypress/e2e/4-node-creator.cy.ts                            | 2 +-
 .../shared/__snapshots__/createVectorStoreNode.test.ts.snap | 6 +++---
 .../nodes/vector_store/shared/createVectorStoreNode.ts      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index e841605863..5e32d5568c 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -517,7 +517,7 @@ describe('Node Creator', () => {
 		const actions = [
 			'Get ranked documents from vector store',
 			'Add documents to vector store',
-			'Retrieve documents for AI processing',
+			'Retrieve documents for Chain/Tool as Vector Store',
 		];
 
 		nodeCreatorFeature.actions.openNodeCreator();
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap
index 91da891842..2eff69800b 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap
@@ -89,14 +89,14 @@ exports[`createVectorStoreNode retrieve mode supplies vector store as data 1`] =
           "value": "insert",
         },
         {
-          "action": "Retrieve documents for AI processing as Vector Store",
+          "action": "Retrieve documents for Chain/Tool as Vector Store",
           "description": "Retrieve documents from vector store to be used as vector store with AI nodes",
-          "name": "Retrieve Documents (As Vector Store for AI Agent)",
+          "name": "Retrieve Documents (As Vector Store for Chain/Tool)",
           "outputConnectionType": "ai_vectorStore",
           "value": "retrieve",
         },
         {
-          "action": "Retrieve documents for AI processing as Tool",
+          "action": "Retrieve documents for AI Agent as Tool",
           "description": "Retrieve documents from vector store to be used as tool with AI nodes",
           "name": "Retrieve Documents (As Tool for AI Agent)",
           "outputConnectionType": "ai_tool",
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index f8e11cadf1..441126c985 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -111,17 +111,17 @@ function getOperationModeOptions(args: VectorStoreNodeConstructorArgs): INodePro
 			action: 'Add documents to vector store',
 		},
 		{
-			name: 'Retrieve Documents (As Vector Store for AI Agent)',
+			name: 'Retrieve Documents (As Vector Store for Chain/Tool)',
 			value: 'retrieve',
 			description: 'Retrieve documents from vector store to be used as vector store with AI nodes',
-			action: 'Retrieve documents for AI processing as Vector Store',
+			action: 'Retrieve documents for Chain/Tool as Vector Store',
 			outputConnectionType: NodeConnectionType.AiVectorStore,
 		},
 		{
 			name: 'Retrieve Documents (As Tool for AI Agent)',
 			value: 'retrieve-as-tool',
 			description: 'Retrieve documents from vector store to be used as tool with AI nodes',
-			action: 'Retrieve documents for AI processing as Tool',
+			action: 'Retrieve documents for AI Agent as Tool',
 			outputConnectionType: NodeConnectionType.AiTool,
 		},
 		{

From 4182095af1c02832af2523f31e9cb85d9a345e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 8 Jan 2025 11:25:37 +0100
Subject: [PATCH 20/30] fix(core): Increase default concurrency and timeout in
 task runners (#12496)

---
 .../@n8n/config/src/configs/runners.config.ts  | 18 ++++++++++++++----
 packages/@n8n/config/test/config.test.ts       |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index 733e724408..f41f3e101e 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -39,13 +39,23 @@ export class TaskRunnersConfig {
 	@Env('N8N_RUNNERS_MAX_OLD_SPACE_SIZE')
 	maxOldSpaceSize: string = '';
 
-	/** How many concurrent tasks can a runner execute at a time */
+	/**
+	 * How many concurrent tasks can a runner execute at a time
+	 *
+	 * @note Kept high for backwards compatibility - n8n v2 will reduce this to `5`
+	 */
 	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
-	maxConcurrency: number = 5;
+	maxConcurrency: number = 10;
 
-	/** How long (in seconds) a task is allowed to take for completion, else the task will be aborted. (In internal mode, the runner will also be restarted.) Must be greater than 0. */
+	/**
+	 * How long (in seconds) a task is allowed to take for completion, else the
+	 * task will be aborted. (In internal mode, the runner will also be
+	 * restarted.) Must be greater than 0.
+	 *
+	 * @note Kept high for backwards compatibility - n8n v2 will reduce this to `60`
+	 */
 	@Env('N8N_RUNNERS_TASK_TIMEOUT')
-	taskTimeout: number = 60;
+	taskTimeout: number = 300; // 5 minutes
 
 	/** How often (in seconds) the runner must send a heartbeat to the broker, else the task will be aborted. (In internal mode, the runner will also  be restarted.) Must be greater than 0. */
 	@Env('N8N_RUNNERS_HEARTBEAT_INTERVAL')
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 9fd0a35d5a..ed386fee6b 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -229,8 +229,8 @@ describe('GlobalConfig', () => {
 			maxPayload: 1024 * 1024 * 1024,
 			port: 5679,
 			maxOldSpaceSize: '',
-			maxConcurrency: 5,
-			taskTimeout: 60,
+			maxConcurrency: 10,
+			taskTimeout: 300,
 			heartbeatInterval: 30,
 		},
 		sentry: {

From ac497c8a67be6c685040656818dd4f71812095d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 8 Jan 2025 11:26:45 +0100
Subject: [PATCH 21/30] chore(core): Mark `item.index` as deprecated (#12494)

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

diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 0a94261cf8..5711de38ca 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1184,6 +1184,11 @@ export interface INodeExecutionData {
 	metadata?: {
 		subExecution: RelatedExecution;
 	};
+
+	/**
+	 * @deprecated This key was added by accident and should not be used as it
+	 * will be removed in future. For more information see PR #12469.
+	 */
 	index?: number;
 }
 

From 52ae02abaa92e5bbfda58843c8eccc845506fa4b Mon Sep 17 00:00:00 2001
From: Elias Meire <elias@meire.dev>
Date: Wed, 8 Jan 2025 11:28:56 +0100
Subject: [PATCH 22/30] feat(editor): New Code editor based on the TypeScript
 language service (#12285)

---
 cypress/e2e/6-code-node.cy.ts                 |   4 +-
 .../design-system/src/css/_primitives.scss    |   1 +
 .../design-system/src/css/_tokens.dark.scss   |  35 +-
 packages/design-system/src/css/_tokens.scss   |  35 +-
 packages/editor-ui/package.json               |   5 +
 .../CodeNodeEditor/CodeNodeEditor.vue         | 295 +++---------
 .../CodeNodeEditor/baseExtensions.ts          |  49 --
 .../components/CodeNodeEditor/constants.ts    |   2 +-
 .../src/components/CodeNodeEditor/linter.ts   |  65 +--
 .../src/components/CodeNodeEditor/theme.ts    | 271 ++++++-----
 .../src/components/ExpressionEditModal.vue    |   1 -
 .../ExpressionEditorModalInput.vue            |  29 +-
 .../src/components/HtmlEditor/HtmlEditor.vue  |  18 +-
 .../ExpressionOutput.vue                      |   2 +-
 .../InlineExpressionEditorInput.vue           |  11 +-
 .../src/components/JsEditor/JsEditor.vue      |  23 +-
 .../src/components/JsonEditor/JsonEditor.vue  |  15 +-
 .../src/components/ParameterInput.vue         |  60 ++-
 .../src/components/SqlEditor/SqlEditor.vue    |  33 +-
 .../src/composables/useCodeEditor.ts          | 448 ++++++++++++++++++
 .../composables/useExpressionEditor.test.ts   |  43 +-
 .../src/composables/useExpressionEditor.ts    |   5 +-
 .../src/composables/usePushConnection.ts      |   2 +-
 .../src/event-bus/code-node-editor.ts         |   2 +-
 .../plugins/codemirror/completions/utils.ts   |  20 +-
 .../src/plugins/codemirror/format.ts          |  47 ++
 .../src/plugins/codemirror/keymap.ts          | 313 ++++++++++--
 .../src/plugins/codemirror/multiCursor.ts     |  52 ++
 .../typescript/client/completions.ts          |  94 ++++
 .../codemirror/typescript/client/facet.ts     |  12 +
 .../typescript/client/hoverTooltip.ts         |  54 +++
 .../codemirror/typescript/client/linter.ts    |  11 +
 .../codemirror/typescript/client/snippets.ts  |  60 +++
 .../typescript/client/useTypescript.ts        | 131 +++++
 .../plugins/codemirror/typescript/types.ts    |  49 ++
 .../codemirror/typescript/worker/cache.ts     | 130 +++++
 .../typescript/worker/completions.ts          |  60 +++
 .../codemirror/typescript/worker/constants.ts |  26 +
 .../typescript/worker/dynamicTypes.test.ts    |  66 +++
 .../typescript/worker/dynamicTypes.ts         |  91 ++++
 .../codemirror/typescript/worker/env.ts       |  60 +++
 .../typescript/worker/hoverTooltip.ts         |  24 +
 .../codemirror/typescript/worker/linter.ts    | 111 +++++
 .../typescript/worker/npmTypesLoader.ts       |  60 +++
 .../worker/type-declarations/globals.d.ts     |  16 +
 .../n8n-once-for-all-items.d.ts               |  15 +
 .../n8n-once-for-each-item.d.ts               |  16 +
 .../worker/type-declarations/n8n.d.ts         | 103 ++++
 .../typescript/worker/typescript.worker.ts    | 224 +++++++++
 .../typescript/worker/typescriptAst.ts        |  38 ++
 .../codemirror/typescript/worker/utils.ts     |  64 +++
 packages/editor-ui/src/shims-modules.d.ts     |   5 +
 packages/editor-ui/src/shims.d.ts             |   2 +
 .../src/styles/plugins/_codemirror.scss       |  56 ++-
 packages/editor-ui/src/utils/forceParse.ts    |   2 +-
 packages/editor-ui/tsconfig.json              |   3 +-
 packages/editor-ui/vite.config.mts            |   3 +
 pnpm-lock.yaml                                | 147 ++++--
 58 files changed, 2861 insertions(+), 758 deletions(-)
 delete mode 100644 packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
 create mode 100644 packages/editor-ui/src/composables/useCodeEditor.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/format.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/multiCursor.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/types.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts

diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 5bc7d05ee2..674d91af18 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -57,7 +57,7 @@ for (const item of $input.all()) {
 
 return
 `);
-			getParameter().get('.cm-lint-marker-error').should('have.length', 6);
+			getParameter().get('.cm-lintRange-error').should('have.length', 6);
 			getParameter().contains('itemMatching').realHover();
 			cy.get('.cm-tooltip-lint').should(
 				'have.text',
@@ -81,7 +81,7 @@ $input.item()
 return []
 `);
 
-			getParameter().get('.cm-lint-marker-error').should('have.length', 5);
+			getParameter().get('.cm-lintRange-error').should('have.length', 5);
 			getParameter().contains('all').realHover();
 			cy.get('.cm-tooltip-lint').should(
 				'have.text',
diff --git a/packages/design-system/src/css/_primitives.scss b/packages/design-system/src/css/_primitives.scss
index 71c6b4c10f..73d47a7fd4 100644
--- a/packages/design-system/src/css/_primitives.scss
+++ b/packages/design-system/src/css/_primitives.scss
@@ -16,6 +16,7 @@
 	--prim-gray-490: hsl(var(--prim-gray-h), 3%, 51%);
 	--prim-gray-420: hsl(var(--prim-gray-h), 4%, 58%);
 	--prim-gray-320: hsl(var(--prim-gray-h), 10%, 68%);
+	--prim-gray-320-alpha-010: hsla(var(--prim-gray-h), 10%, 68%, 0.1);
 	--prim-gray-200: hsl(var(--prim-gray-h), 18%, 80%);
 	--prim-gray-120: hsl(var(--prim-gray-h), 25%, 88%);
 	--prim-gray-70: hsl(var(--prim-gray-h), 32%, 93%);
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 4ea6566677..00eeafb981 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -139,12 +139,20 @@
 	--color-infobox-examples-border-color: var(--prim-gray-670);
 
 	// Code
-	--color-code-tags-string: var(--prim-color-alt-f-tint-150);
-	--color-code-tags-primitive: var(--prim-color-alt-b-shade-100);
-	--color-code-tags-keyword: var(--prim-color-alt-g-tint-150);
-	--color-code-tags-operator: var(--prim-color-alt-h);
-	--color-code-tags-variable: var(--prim-color-primary-tint-100);
-	--color-code-tags-definition: var(--prim-color-alt-e);
+	--color-code-tags-string: #9ecbff;
+	--color-code-tags-regex: #9ecbff;
+	--color-code-tags-primitive: #79b8ff;
+	--color-code-tags-keyword: #f97583;
+	--color-code-tags-variable: #79b8ff;
+	--color-code-tags-parameter: #e1e4e8;
+	--color-code-tags-function: #b392f0;
+	--color-code-tags-constant: #79b8ff;
+	--color-code-tags-property: #79b8ff;
+	--color-code-tags-type: #b392f0;
+	--color-code-tags-class: #b392f0;
+	--color-code-tags-heading: #79b8ff;
+	--color-code-tags-invalid: #f97583;
+	--color-code-tags-comment: #6a737d;
 	--color-json-default: var(--prim-color-secondary-tint-200);
 	--color-json-null: var(--color-danger);
 	--color-json-boolean: var(--prim-color-alt-a);
@@ -155,15 +163,18 @@
 	--color-json-brackets-hover: var(--prim-color-alt-e);
 	--color-json-line: var(--prim-gray-200);
 	--color-json-highlight: var(--color-background-base);
-	--color-code-background: var(--prim-gray-800);
+	--color-code-background: var(--prim-gray-820);
 	--color-code-background-readonly: var(--prim-gray-740);
-	--color-code-lineHighlight: var(--prim-gray-740);
+	--color-code-lineHighlight: var(--prim-gray-320-alpha-010);
 	--color-code-foreground: var(--prim-gray-70);
 	--color-code-caret: var(--prim-gray-10);
-	--color-code-selection: var(--prim-color-alt-e-alpha-04);
-	--color-code-gutterBackground: var(--prim-gray-670);
-	--color-code-gutterForeground: var(--prim-gray-320);
-	--color-code-tags-comment: var(--prim-gray-200);
+	--color-code-selection: #3392ff44;
+	--color-code-selection-highlight: #17e5e633;
+	--color-code-gutter-background: var(--prim-gray-820);
+	--color-code-gutter-foreground: var(--prim-gray-320);
+	--color-code-gutter-foreground-active: var(--prim-gray-10);
+	--color-code-indentation-marker: var(--prim-gray-740);
+	--color-code-indentation-marker-active: var(--prim-gray-670);
 	--color-line-break: var(--prim-gray-420);
 	--color-code-line-break: var(--prim-color-secondary-tint-100);
 
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index e4faf088cf..3b6b7451be 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -183,12 +183,20 @@
 	--color-infobox-examples-border-color: var(--color-foreground-light);
 
 	// Code
-	--color-code-tags-string: var(--prim-color-alt-f);
-	--color-code-tags-primitive: var(--prim-color-alt-b-shade-100);
-	--color-code-tags-keyword: var(--prim-color-alt-g);
-	--color-code-tags-operator: var(--prim-color-alt-h);
-	--color-code-tags-variable: var(--prim-color-alt-c-shade-100);
-	--color-code-tags-definition: var(--prim-color-alt-e-shade-150);
+	--color-code-tags-string: #032f62;
+	--color-code-tags-regex: #032f62;
+	--color-code-tags-primitive: #005cc5;
+	--color-code-tags-keyword: #d73a49;
+	--color-code-tags-variable: #005cc5;
+	--color-code-tags-parameter: #24292e;
+	--color-code-tags-function: #6f42c1;
+	--color-code-tags-constant: #005cc5;
+	--color-code-tags-property: #005cc5;
+	--color-code-tags-type: #005cc5;
+	--color-code-tags-class: #6f42c1;
+	--color-code-tags-heading: #005cc5;
+	--color-code-tags-invalid: #cb2431;
+	--color-code-tags-comment: #6a737d;
 	--color-json-default: var(--prim-color-secondary-shade-100);
 	--color-json-null: var(--prim-color-alt-c);
 	--color-json-boolean: var(--prim-color-alt-a);
@@ -201,13 +209,16 @@
 	--color-json-highlight: var(--prim-gray-70);
 	--color-code-background: var(--prim-gray-0);
 	--color-code-background-readonly: var(--prim-gray-40);
-	--color-code-lineHighlight: var(--prim-gray-40);
+	--color-code-lineHighlight: var(--prim-gray-320-alpha-010);
 	--color-code-foreground: var(--prim-gray-670);
-	--color-code-caret: var(--prim-gray-420);
-	--color-code-selection: var(--prim-gray-120);
-	--color-code-gutterBackground: var(--prim-gray-0);
-	--color-code-gutterForeground: var(--prim-gray-320);
-	--color-code-tags-comment: var(--prim-gray-420);
+	--color-code-caret: var(--prim-gray-820);
+	--color-code-selection: #0366d625;
+	--color-code-selection-highlight: #34d05840;
+	--color-code-gutter-background: var(--prim-gray-0);
+	--color-code-gutter-foreground: var(--prim-gray-320);
+	--color-code-gutter-foreground-active: var(--prim-gray-670);
+	--color-code-indentation-marker: var(--prim-gray-70);
+	--color-code-indentation-marker-active: var(--prim-gray-200);
 	--color-line-break: var(--prim-gray-320);
 	--color-code-line-break: var(--prim-color-secondary-tint-200);
 
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 3293abfe3b..e7756983a7 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -25,6 +25,7 @@
     "@codemirror/lang-python": "^6.1.6",
     "@codemirror/language": "^6.10.1",
     "@codemirror/lint": "^6.8.0",
+    "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.26.3",
     "@fontsource/open-sans": "^4.5.0",
@@ -39,6 +40,8 @@
     "@n8n/codemirror-lang": "workspace:*",
     "@n8n/codemirror-lang-sql": "^1.0.2",
     "@n8n/permissions": "workspace:*",
+    "@replit/codemirror-indentation-markers": "^6.5.3",
+    "@typescript/vfs": "^1.6.0",
     "@sentry/vue": "catalog:frontend",
     "@vue-flow/background": "^1.3.2",
     "@vue-flow/controls": "^1.1.2",
@@ -52,6 +55,7 @@
     "change-case": "^5.4.4",
     "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
+    "comlink": "^4.4.1",
     "dateformat": "^3.0.3",
     "email-providers": "^2.0.1",
     "esprima-next": "5.8.4",
@@ -70,6 +74,7 @@
     "qrcode.vue": "^3.3.4",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
+    "typescript": "^5.5.2",
     "uuid": "catalog:",
     "v3-infinite-loading": "^1.2.2",
     "vue": "catalog:frontend",
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 3f74bfe7a0..c17ff804c0 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -1,32 +1,24 @@
 <script setup lang="ts">
-import { javascript } from '@codemirror/lang-javascript';
-import { python } from '@codemirror/lang-python';
-import type { LanguageSupport } from '@codemirror/language';
-import type { Extension, Line } from '@codemirror/state';
-import { Compartment, EditorState } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
-import { EditorView } from '@codemirror/view';
 import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import { format } from 'prettier';
 import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
-import { type Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
 
 import { CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
 import { useRootStore } from '@/stores/root.store';
 
+import { useCodeEditor } from '@/composables/useCodeEditor';
+import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
+import { useTelemetry } from '@/composables/useTelemetry';
 import AskAI from './AskAI/AskAI.vue';
-import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
-import { useCompleter } from './completer';
 import { CODE_PLACEHOLDERS } from './constants';
 import { useLinter } from './linter';
-import { codeNodeEditorTheme } from './theme';
-import { useI18n } from '@/composables/useI18n';
-import { useTelemetry } from '@/composables/useTelemetry';
-import { dropInCodeEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { useSettingsStore } from '@/stores/settings.store';
+import { dropInCodeEditor } from '@/plugins/codemirror/dragAndDrop';
 
 type Props = {
 	mode: CodeExecutionMode;
@@ -36,6 +28,7 @@ type Props = {
 	language?: CodeNodeEditorLanguage;
 	isReadOnly?: boolean;
 	rows?: number;
+	id?: string;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -44,99 +37,57 @@ const props = withDefaults(defineProps<Props>(), {
 	language: 'javaScript',
 	isReadOnly: false,
 	rows: 4,
+	id: crypto.randomUUID(),
 });
 const emit = defineEmits<{
 	'update:modelValue': [value: string];
 }>();
 
 const message = useMessage();
-const editor = ref(null) as Ref<EditorView | null>;
-const languageCompartment = ref(new Compartment());
-const dragAndDropCompartment = ref(new Compartment());
-const linterCompartment = ref(new Compartment());
-const isEditorHovered = ref(false);
-const isEditorFocused = ref(false);
 const tabs = ref(['code', 'ask-ai']);
 const activeTab = ref('code');
-const hasChanges = ref(false);
 const isLoadingAIResponse = ref(false);
 const codeNodeEditorRef = ref<HTMLDivElement>();
 const codeNodeEditorContainerRef = ref<HTMLDivElement>();
-
-const { autocompletionExtension } = useCompleter(() => props.mode, editor);
-const { createLinter } = useLinter(() => props.mode, editor);
+const hasManualChanges = ref(false);
 
 const rootStore = useRootStore();
 const i18n = useI18n();
 const telemetry = useTelemetry();
 const settingsStore = useSettingsStore();
 
+const linter = useLinter(
+	() => props.mode,
+	() => props.language,
+);
+const extensions = computed(() => [linter.value]);
+const placeholder = computed(() => CODE_PLACEHOLDERS[props.language]?.[props.mode] ?? '');
+const dragAndDropEnabled = computed(() => {
+	return !props.isReadOnly;
+});
+
+const { highlightLine, readEditorValue, editor } = useCodeEditor({
+	id: props.id,
+	editorRef: codeNodeEditorRef,
+	language: () => props.language,
+	languageParams: () => ({ mode: props.mode }),
+	editorValue: () => props.modelValue,
+	placeholder,
+	extensions,
+	isReadOnly: () => props.isReadOnly,
+	theme: {
+		maxHeight: props.fillParent ? '100%' : '40vh',
+		minHeight: '20vh',
+		rows: props.rows,
+	},
+	onChange: onEditorUpdate,
+});
+
 onMounted(() => {
 	if (!props.isReadOnly) codeNodeEditorEventBus.on('highlightLine', highlightLine);
-
 	codeNodeEditorEventBus.on('codeDiffApplied', diffApplied);
 
-	const { isReadOnly, language } = props;
-	const extensions: Extension[] = [
-		...readOnlyEditorExtensions,
-		EditorState.readOnly.of(isReadOnly),
-		EditorView.editable.of(!isReadOnly),
-		codeNodeEditorTheme({
-			isReadOnly,
-			maxHeight: props.fillParent ? '100%' : '40vh',
-			minHeight: '20vh',
-			rows: props.rows,
-		}),
-	];
-
-	if (!isReadOnly) {
-		const linter = createLinter(language);
-		if (linter) {
-			extensions.push(linterCompartment.value.of(linter));
-		}
-
-		extensions.push(
-			...writableEditorExtensions,
-			dragAndDropCompartment.value.of(dragAndDropExtension.value),
-			EditorView.domEventHandlers({
-				focus: () => {
-					isEditorFocused.value = true;
-				},
-				blur: () => {
-					isEditorFocused.value = false;
-				},
-			}),
-
-			EditorView.updateListener.of((viewUpdate) => {
-				if (!viewUpdate.docChanged) return;
-
-				trackCompletion(viewUpdate);
-
-				const value = editor.value?.state.doc.toString();
-				if (value) {
-					emit('update:modelValue', value);
-				}
-				hasChanges.value = true;
-			}),
-		);
-	}
-
-	const [languageSupport, ...otherExtensions] = languageExtensions.value;
-	extensions.push(languageCompartment.value.of(languageSupport), ...otherExtensions);
-
-	const state = EditorState.create({
-		doc: props.modelValue ?? placeholder.value,
-		extensions,
-	});
-
-	editor.value = new EditorView({
-		parent: codeNodeEditorRef.value,
-		state,
-	});
-
-	// empty on first load, default param value
 	if (!props.modelValue) {
-		refreshPlaceholder();
 		emit('update:modelValue', placeholder.value);
 	}
 });
@@ -150,89 +101,12 @@ const askAiEnabled = computed(() => {
 	return settingsStore.isAskAiEnabled && props.language === 'javaScript';
 });
 
-const placeholder = computed(() => {
-	return CODE_PLACEHOLDERS[props.language]?.[props.mode] ?? '';
-});
-
-const dragAndDropEnabled = computed(() => {
-	return !props.isReadOnly && props.mode === 'runOnceForEachItem';
-});
-
-const dragAndDropExtension = computed(() => (dragAndDropEnabled.value ? mappingDropCursor() : []));
-
-// eslint-disable-next-line vue/return-in-computed-property
-const languageExtensions = computed<[LanguageSupport, ...Extension[]]>(() => {
-	switch (props.language) {
-		case 'javaScript':
-			return [javascript(), autocompletionExtension('javaScript')];
-		case 'python':
-			return [python(), autocompletionExtension('python')];
+watch([() => props.language, () => props.mode], (_, [prevLanguage, prevMode]) => {
+	if (readEditorValue().trim() === CODE_PLACEHOLDERS[prevLanguage]?.[prevMode]) {
+		emit('update:modelValue', placeholder.value);
 	}
 });
 
-watch(
-	() => props.modelValue,
-	(newValue) => {
-		if (!editor.value) {
-			return;
-		}
-		const current = editor.value.state.doc.toString();
-		if (current === newValue) {
-			return;
-		}
-		editor.value.dispatch({
-			changes: { from: 0, to: getCurrentEditorContent().length, insert: newValue },
-		});
-	},
-);
-
-watch(
-	() => props.mode,
-	(_newMode, previousMode: CodeExecutionMode) => {
-		reloadLinter();
-
-		if (getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[props.language]?.[previousMode]) {
-			refreshPlaceholder();
-		}
-	},
-);
-
-watch(dragAndDropExtension, (extension) => {
-	editor.value?.dispatch({
-		effects: dragAndDropCompartment.value.reconfigure(extension),
-	});
-});
-
-watch(
-	() => props.language,
-	(_newLanguage, previousLanguage: CodeNodeEditorLanguage) => {
-		if (getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[previousLanguage]?.[props.mode]) {
-			refreshPlaceholder();
-		}
-
-		const [languageSupport] = languageExtensions.value;
-		editor.value?.dispatch({
-			effects: languageCompartment.value.reconfigure(languageSupport),
-		});
-		reloadLinter();
-	},
-);
-watch(
-	askAiEnabled,
-	async (isEnabled) => {
-		if (isEnabled && !props.modelValue) {
-			emit('update:modelValue', placeholder.value);
-		}
-		await nextTick();
-		hasChanges.value = props.modelValue !== placeholder.value;
-	},
-	{ immediate: true },
-);
-
-function getCurrentEditorContent() {
-	return editor.value?.state.doc.toString() ?? '';
-}
-
 async function onBeforeTabLeave(_activeName: string, oldActiveName: string) {
 	// Confirm dialog if leaving ask-ai tab during loading
 	if (oldActiveName === 'ask-ai' && isLoadingAIResponse.value) {
@@ -243,69 +117,28 @@ async function onBeforeTabLeave(_activeName: string, oldActiveName: string) {
 			showCancelButton: true,
 		});
 
-		if (confirmModal === 'confirm') {
-			return true;
-		}
-
-		return false;
+		return confirmModal === 'confirm';
 	}
 
 	return true;
 }
 
-async function onReplaceCode(code: string) {
+async function onAiReplaceCode(code: string) {
 	const formattedCode = await format(code, {
 		parser: 'babel',
 		plugins: [jsParser, estree],
 	});
 
-	editor.value?.dispatch({
-		changes: { from: 0, to: getCurrentEditorContent().length, insert: formattedCode },
-	});
+	emit('update:modelValue', formattedCode);
 
 	activeTab.value = 'code';
-	hasChanges.value = false;
+	hasManualChanges.value = false;
 }
 
-function onMouseOver(event: MouseEvent) {
-	const fromElement = event.relatedTarget as HTMLElement;
-	const containerRef = codeNodeEditorContainerRef.value;
-
-	if (!containerRef?.contains(fromElement)) isEditorHovered.value = true;
-}
-
-function onMouseOut(event: MouseEvent) {
-	const fromElement = event.relatedTarget as HTMLElement;
-	const containerRef = codeNodeEditorContainerRef.value;
-
-	if (!containerRef?.contains(fromElement)) isEditorHovered.value = false;
-}
-
-function reloadLinter() {
-	if (!editor.value) return;
-
-	const linter = createLinter(props.language);
-	if (linter) {
-		editor.value.dispatch({
-			effects: linterCompartment.value.reconfigure(linter),
-		});
-	}
-}
-
-function refreshPlaceholder() {
-	if (!editor.value) return;
-
-	editor.value.dispatch({
-		changes: { from: 0, to: getCurrentEditorContent().length, insert: placeholder.value },
-	});
-}
-
-function getLine(lineNumber: number): Line | null {
-	try {
-		return editor.value?.state.doc.line(lineNumber) ?? null;
-	} catch {
-		return null;
-	}
+function onEditorUpdate(viewUpdate: ViewUpdate) {
+	trackCompletion(viewUpdate);
+	hasManualChanges.value = true;
+	emit('update:modelValue', readEditorValue());
 }
 
 function diffApplied() {
@@ -315,25 +148,6 @@ function diffApplied() {
 	});
 }
 
-function highlightLine(lineNumber: number | 'final') {
-	if (!editor.value) return;
-
-	if (lineNumber === 'final') {
-		editor.value.dispatch({
-			selection: { anchor: (props.modelValue ?? getCurrentEditorContent()).length },
-		});
-		return;
-	}
-
-	const line = getLine(lineNumber);
-
-	if (!line) return;
-
-	editor.value.dispatch({
-		selection: { anchor: line.from },
-	});
-}
-
 function trackCompletion(viewUpdate: ViewUpdate) {
 	const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
 
@@ -342,7 +156,7 @@ function trackCompletion(viewUpdate: ViewUpdate) {
 	try {
 		// @ts-expect-error - undocumented fields
 		const { fromA, toB } = viewUpdate?.changedRanges[0];
-		const full = getCurrentEditorContent().slice(fromA, toB);
+		const full = viewUpdate.state.doc.slice(fromA, toB).toString();
 		const lastDotIndex = full.lastIndexOf('.');
 
 		let context = null;
@@ -379,16 +193,19 @@ function onAiLoadEnd() {
 async function onDrop(value: string, event: MouseEvent) {
 	if (!editor.value) return;
 
-	await dropInCodeEditor(toRaw(editor.value), event, value);
+	const valueToInsert =
+		props.mode === 'runOnceForAllItems'
+			? value.replace('$json', '$input.first().json').replace(/\$\((.*)\)\.item/, '$($1).first()')
+			: value;
+
+	await dropInCodeEditor(toRaw(editor.value), event, valueToInsert);
 }
 </script>
 
 <template>
 	<div
 		ref="codeNodeEditorContainerRef"
-		:class="['code-node-editor', $style['code-node-editor-container'], language]"
-		@mouseover="onMouseOver"
-		@mouseout="onMouseOut"
+		:class="['code-node-editor', $style['code-node-editor-container']]"
 	>
 		<el-tabs
 			v-if="askAiEnabled"
@@ -433,8 +250,8 @@ async function onDrop(value: string, event: MouseEvent) {
 				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
 				<AskAI
 					:key="activeTab"
-					:has-changes="hasChanges"
-					@replace-code="onReplaceCode"
+					:has-changes="hasManualChanges"
+					@replace-code="onAiReplaceCode"
 					@started-loading="onAiLoadStart"
 					@finished-loading="onAiLoadEnd"
 				/>
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts b/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
deleted file mode 100644
index a9b00a0b82..0000000000
--- a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {
-	dropCursor,
-	EditorView,
-	highlightActiveLine,
-	highlightActiveLineGutter,
-	highlightSpecialChars,
-	keymap,
-	lineNumbers,
-} from '@codemirror/view';
-import { bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
-import { history, toggleComment, deleteCharBackward } from '@codemirror/commands';
-import { lintGutter } from '@codemirror/lint';
-import { type Extension, Prec } from '@codemirror/state';
-
-import { codeInputHandler } from '@/plugins/codemirror/inputHandlers/code.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
-
-export const readOnlyEditorExtensions: readonly Extension[] = [
-	lineNumbers(),
-	EditorView.lineWrapping,
-	highlightSpecialChars(),
-];
-
-export const writableEditorExtensions: readonly Extension[] = [
-	history(),
-	lintGutter(),
-	foldGutter(),
-	codeInputHandler(),
-	dropCursor(),
-	indentOnInput(),
-	bracketMatching(),
-	highlightActiveLine(),
-	highlightActiveLineGutter(),
-	Prec.highest(
-		keymap.of([
-			...tabKeyMap(),
-			...enterKeyMap,
-			...autocompleteKeyMap,
-			...historyKeyMap,
-			{ key: 'Mod-/', run: toggleComment },
-			{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
-		]),
-	),
-];
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
index d9dcaccabd..2f648e41d2 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
@@ -28,7 +28,7 @@ export const AUTOCOMPLETABLE_BUILT_IN_MODULES_JS = [
 
 export const DEFAULT_LINTER_SEVERITY: Diagnostic['severity'] = 'error';
 
-export const DEFAULT_LINTER_DELAY_IN_MS = 300;
+export const DEFAULT_LINTER_DELAY_IN_MS = 500;
 
 /**
  * Length of the start of the script wrapper, used as offset for the linter to find a location in source text.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index defbdbfa73..ff954d5bc7 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -1,10 +1,10 @@
 import type { Diagnostic } from '@codemirror/lint';
-import { linter } from '@codemirror/lint';
+import { linter as codeMirrorLinter } from '@codemirror/lint';
 import type { EditorView } from '@codemirror/view';
 import * as esprima from 'esprima-next';
 import type { Node, MemberExpression } from 'estree';
 import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
-import { toValue, type MaybeRefOrGetter } from 'vue';
+import { computed, toValue, type MaybeRefOrGetter } from 'vue';
 
 import { useI18n } from '@/composables/useI18n';
 import {
@@ -17,17 +17,17 @@ import { walk } from './utils';
 
 export const useLinter = (
 	mode: MaybeRefOrGetter<CodeExecutionMode>,
-	editor: MaybeRefOrGetter<EditorView | null>,
+	language: MaybeRefOrGetter<CodeNodeEditorLanguage>,
 ) => {
 	const i18n = useI18n();
-
-	function createLinter(language: CodeNodeEditorLanguage) {
-		switch (language) {
+	const linter = computed(() => {
+		switch (toValue(language)) {
 			case 'javaScript':
-				return linter(lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
+				return codeMirrorLinter(lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
 		}
-		return undefined;
-	}
+
+		return [];
+	});
 
 	function lintSource(editorView: EditorView): Diagnostic[] {
 		const doc = editorView.state.doc.toString();
@@ -38,34 +38,7 @@ export const useLinter = (
 		try {
 			ast = esprima.parseScript(script, { range: true });
 		} catch (syntaxError) {
-			let line;
-
-			try {
-				const lineAtError = editorView.state.doc.line(syntaxError.lineNumber - 1).text;
-
-				// optional chaining operators currently unsupported by esprima-next
-				if (['?.', ']?'].some((operator) => lineAtError.includes(operator))) return [];
-			} catch {
-				return [];
-			}
-
-			try {
-				line = editorView.state.doc.line(syntaxError.lineNumber);
-
-				return [
-					{
-						from: line.from,
-						to: line.to,
-						severity: DEFAULT_LINTER_SEVERITY,
-						message: i18n.baseText('codeNodeEditor.linter.bothModes.syntaxError'),
-					},
-				];
-			} catch {
-				/**
-				 * For invalid (e.g. half-written) n8n syntax, esprima errors with an off-by-one line number for the final line. In future, we should add full linting for n8n syntax before parsing JS.
-				 */
-				return [];
-			}
+			return [];
 		}
 
 		if (ast === null) return [];
@@ -118,7 +91,7 @@ export const useLinter = (
 			walk(ast, isUnavailableVarInAllItems).forEach((node) => {
 				const [start, end] = getRange(node);
 
-				const varName = getText(node);
+				const varName = getText(editorView, node);
 
 				if (!varName) return;
 
@@ -250,7 +223,7 @@ export const useLinter = (
 			walk<TargetNode>(ast, isUnavailableMethodinEachItem).forEach((node) => {
 				const [start, end] = getRange(node.property);
 
-				const method = getText(node.property);
+				const method = getText(editorView, node.property);
 
 				if (!method) return;
 
@@ -444,7 +417,7 @@ export const useLinter = (
 
 					if (shadowStart && start > shadowStart) return; // skip shadow item
 
-					const varName = getText(node);
+					const varName = getText(editorView, node);
 
 					if (!varName) return;
 
@@ -489,7 +462,7 @@ export const useLinter = (
 				!['json', 'binary'].includes(node.property.name);
 
 			walk<TargetNode>(ast, isDirectAccessToItemSubproperty).forEach((node) => {
-				const varName = getText(node);
+				const varName = getText(editorView, node);
 
 				if (!varName) return;
 
@@ -636,19 +609,15 @@ export const useLinter = (
 	//            helpers
 	// ----------------------------------
 
-	function getText(node: RangeNode) {
-		const editorValue = toValue(editor);
-
-		if (!editorValue) return null;
-
+	function getText(editorView: EditorView, node: RangeNode) {
 		const [start, end] = getRange(node);
 
-		return editorValue.state.doc.toString().slice(start, end);
+		return editorView.state.doc.toString().slice(start, end);
 	}
 
 	function getRange(node: RangeNode) {
 		return node.range.map((loc) => loc - OFFSET_FOR_SCRIPT_WRAPPER);
 	}
 
-	return { createLinter };
+	return linter;
 };
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
index e8e10aaad8..aa5977bc3e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
@@ -32,16 +32,62 @@ interface ThemeSettings {
 	maxHeight?: string;
 	minHeight?: string;
 	rows?: number;
-	highlightColors?: 'default' | 'html';
 }
 
-export const codeNodeEditorTheme = ({
-	isReadOnly,
-	minHeight,
-	maxHeight,
-	rows,
-	highlightColors,
-}: ThemeSettings) => [
+const codeEditorSyntaxHighlighting = syntaxHighlighting(
+	HighlightStyle.define([
+		{ tag: tags.keyword, color: 'var(--color-code-tags-keyword)' },
+		{
+			tag: [
+				tags.deleted,
+				tags.character,
+				tags.macroName,
+				tags.definition(tags.name),
+				tags.definition(tags.variableName),
+				tags.atom,
+				tags.bool,
+			],
+			color: 'var(--color-code-tags-variable)',
+		},
+		{ tag: [tags.name, tags.propertyName], color: 'var(--color-code-tags-property)' },
+		{
+			tag: [tags.processingInstruction, tags.string, tags.inserted, tags.special(tags.string)],
+			color: 'var(--color-code-tags-string)',
+		},
+		{
+			tag: [tags.function(tags.variableName), tags.labelName],
+			color: 'var(--color-code-tags-function)',
+		},
+		{
+			tag: [tags.color, tags.constant(tags.name), tags.standard(tags.name)],
+			color: 'var(--color-code-tags-constant)',
+		},
+		{ tag: [tags.className], color: 'var(--color-code-tags-class)' },
+		{
+			tag: [tags.number, tags.changed, tags.annotation, tags.modifier, tags.self, tags.namespace],
+			color: 'var(--color-code-tags-primitive)',
+		},
+		{ tag: [tags.typeName], color: 'var(--color-code-tags-type)' },
+		{ tag: [tags.operator, tags.operatorKeyword], color: 'var(--color-code-tags-keyword)' },
+		{
+			tag: [tags.url, tags.escape, tags.regexp, tags.link],
+			color: 'var(--color-code-tags-keyword)',
+		},
+		{ tag: [tags.meta, tags.comment, tags.lineComment], color: 'var(--color-code-tags-comment)' },
+		{ tag: tags.strong, fontWeight: 'bold' },
+		{ tag: tags.emphasis, fontStyle: 'italic' },
+		{ tag: tags.link, textDecoration: 'underline' },
+		{ tag: tags.heading, fontWeight: 'bold', color: 'var(--color-code-tags-heading)' },
+		{ tag: tags.invalid, color: 'var(--color-code-tags-invalid)' },
+		{ tag: tags.strikethrough, textDecoration: 'line-through' },
+		{
+			tag: [tags.derefOperator, tags.special(tags.variableName), tags.variableName, tags.separator],
+			color: 'var(--color-code-foreground)',
+		},
+	]),
+);
+
+export const codeEditorTheme = ({ isReadOnly, minHeight, maxHeight, rows }: ThemeSettings) => [
 	EditorView.theme({
 		'&': {
 			'font-size': BASE_STYLING.fontSize,
@@ -54,13 +100,17 @@ export const codeNodeEditorTheme = ({
 		'.cm-content': {
 			fontFamily: BASE_STYLING.fontFamily,
 			caretColor: isReadOnly ? 'transparent' : 'var(--color-code-caret)',
+			lineHeight: 'var(--font-line-height-xloose)',
+			paddingTop: 'var(--spacing-2xs)',
+			paddingBottom: 'var(--spacing-s)',
 		},
 		'.cm-cursor, .cm-dropCursor': {
 			borderLeftColor: 'var(--color-code-caret)',
 		},
-		'&.cm-focused .cm-selectionBackgroundm .cm-selectionBackground, .cm-content ::selection': {
-			backgroundColor: 'var(--color-code-selection)',
-		},
+		'&.cm-focused > .cm-scroller .cm-selectionLayer > .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection':
+			{
+				background: 'var(--color-code-selection)',
+			},
 		'&.cm-editor': {
 			...(isReadOnly ? { backgroundColor: 'var(--color-code-background-readonly)' } : {}),
 			borderColor: 'var(--border-color-base)',
@@ -75,13 +125,19 @@ export const codeNodeEditorTheme = ({
 		'.cm-activeLineGutter': {
 			backgroundColor: 'var(--color-code-lineHighlight)',
 		},
+		'.cm-lineNumbers .cm-activeLineGutter': {
+			color: 'var(--color-code-gutter-foreground-active)',
+		},
 		'.cm-gutters': {
 			backgroundColor: isReadOnly
 				? 'var(--color-code-background-readonly)'
-				: 'var(--color-code-gutterBackground)',
-			color: 'var(--color-code-gutterForeground)',
+				: 'var(--color-code-gutter-background)',
+			color: 'var(--color-code-gutter-foreground)',
+			border: '0',
 			borderRadius: 'var(--border-radius-base)',
-			borderRightColor: 'var(--border-color-base)',
+		},
+		'.cm-gutterElement': {
+			padding: 0,
 		},
 		'.cm-tooltip': {
 			maxWidth: BASE_STYLING.tooltip.maxWidth,
@@ -92,11 +148,30 @@ export const codeNodeEditorTheme = ({
 			maxHeight: maxHeight ?? '100%',
 			...(isReadOnly
 				? {}
-				: { minHeight: rows && rows !== -1 ? `${Number(rows + 1) * 1.3}em` : 'auto' }),
+				: {
+						minHeight: rows && rows !== -1 ? `${Number(rows + 1) * 1.3}em` : 'auto',
+					}),
+		},
+		'.cm-lineNumbers .cm-gutterElement': {
+			padding: '0 var(--spacing-5xs) 0 var(--spacing-2xs)',
 		},
 		'.cm-gutter,.cm-content': {
 			minHeight: rows && rows !== -1 ? 'auto' : (minHeight ?? 'calc(35vh - var(--spacing-2xl))'),
 		},
+		'.cm-foldGutter': {
+			width: '16px',
+		},
+		'.cm-fold-marker': {
+			display: 'flex',
+			alignItems: 'center',
+			justifyContent: 'center',
+			height: '100%',
+			opacity: 0,
+			transition: 'opacity 0.3s ease',
+		},
+		'.cm-activeLineGutter .cm-fold-marker, .cm-gutters:hover .cm-fold-marker': {
+			opacity: 1,
+		},
 		'.cm-diagnosticAction': {
 			backgroundColor: BASE_STYLING.diagnosticButton.backgroundColor,
 			color: 'var(--color-primary)',
@@ -106,103 +181,81 @@ export const codeNodeEditorTheme = ({
 			cursor: BASE_STYLING.diagnosticButton.cursor,
 		},
 		'.cm-diagnostic-error': {
-			backgroundColor: 'var(--color-background-base)',
+			backgroundColor: 'var(--color-infobox-background)',
 		},
 		'.cm-diagnosticText': {
+			fontSize: 'var(--font-size-xs)',
 			color: 'var(--color-text-base)',
 		},
+		'.cm-diagnosticDocs': {
+			fontSize: 'var(--font-size-2xs)',
+		},
+		'.cm-foldPlaceholder': {
+			color: 'var(--color-text-base)',
+			backgroundColor: 'var(--color-background-base)',
+			border: 'var(--border-base)',
+		},
+		'.cm-selectionMatch': {
+			background: 'var(--color-code-selection-highlight)',
+		},
+		'.cm-selectionMatch-main': {
+			background: 'var(--color-code-selection-highlight)',
+		},
+		'.cm-matchingBracket': {
+			background: 'var(--color-code-selection)',
+		},
+		'.cm-completionMatchedText': {
+			textDecoration: 'none',
+			fontWeight: '600',
+			color: 'var(--color-autocomplete-item-selected)',
+		},
+		'.cm-faded > span': {
+			opacity: 0.6,
+		},
+		'.cm-panel.cm-search': {
+			padding: 'var(--spacing-4xs) var(--spacing-2xs)',
+		},
+		'.cm-panels': {
+			background: 'var(--color-background-light)',
+			color: 'var(--color-text-base)',
+		},
+		'.cm-panels-bottom': {
+			borderTop: 'var(--border-base)',
+		},
+		'.cm-textfield': {
+			color: 'var(--color-text-dark)',
+			background: 'var(--color-foreground-xlight)',
+			borderRadius: 'var(--border-radius-base)',
+			border: 'var(--border-base)',
+			fontSize: '90%',
+		},
+		'.cm-textfield:focus': {
+			outline: 'none',
+			borderColor: 'var(--color-secondary)',
+		},
+		'.cm-panel button': {
+			color: 'var(--color-text-base)',
+		},
+		'.cm-panel input[type="checkbox"]': {
+			border: 'var(--border-base)',
+			outline: 'none',
+		},
+		'.cm-panel input[type="checkbox"]:hover': {
+			border: 'var(--border-base)',
+			outline: 'none',
+		},
+		'.cm-panel.cm-search label': {
+			fontSize: '90%',
+		},
+		'.cm-button': {
+			outline: 'none',
+			border: 'var(--border-base)',
+			color: 'var(--color-text-dark)',
+			backgroundColor: 'var(--color-foreground-xlight)',
+			backgroundImage: 'none',
+			borderRadius: 'var(--border-radius-base)',
+			fontSize: '90%',
+		},
 	}),
-	highlightColors === 'html'
-		? syntaxHighlighting(
-				HighlightStyle.define([
-					{ tag: tags.keyword, color: '#c678dd' },
-					{
-						tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
-						color: '#e06c75',
-					},
-					{ tag: [tags.function(tags.variableName), tags.labelName], color: '#61afef' },
-					{
-						tag: [tags.color, tags.constant(tags.name), tags.standard(tags.name)],
-						color: '#d19a66',
-					},
-					{ tag: [tags.definition(tags.name), tags.separator], color: '#abb2bf' },
-					{
-						tag: [
-							tags.typeName,
-							tags.className,
-							tags.number,
-							tags.changed,
-							tags.annotation,
-							tags.modifier,
-							tags.self,
-							tags.namespace,
-						],
-						color: '#e06c75',
-					},
-					{
-						tag: [
-							tags.operator,
-							tags.operatorKeyword,
-							tags.url,
-							tags.escape,
-							tags.regexp,
-							tags.link,
-							tags.special(tags.string),
-						],
-						color: '#56b6c2',
-					},
-					{ tag: [tags.meta, tags.comment], color: '#7d8799' },
-					{ tag: tags.strong, fontWeight: 'bold' },
-					{ tag: tags.emphasis, fontStyle: 'italic' },
-					{ tag: tags.strikethrough, textDecoration: 'line-through' },
-					{ tag: tags.link, color: '#7d8799', textDecoration: 'underline' },
-					{ tag: tags.heading, fontWeight: 'bold', color: '#e06c75' },
-					{ tag: [tags.atom, tags.bool, tags.special(tags.variableName)], color: '#d19a66' },
-					{ tag: [tags.processingInstruction, tags.string, tags.inserted], color: '#98c379' },
-					{ tag: tags.invalid, color: 'red', 'font-weight': 'bold' },
-				]),
-			)
-		: syntaxHighlighting(
-				HighlightStyle.define([
-					{
-						tag: tags.comment,
-						color: 'var(--color-code-tags-comment)',
-					},
-					{
-						tag: [tags.string, tags.special(tags.brace)],
-						color: 'var(--color-code-tags-string)',
-					},
-					{
-						tag: [tags.number, tags.self, tags.bool, tags.null],
-						color: 'var(--color-code-tags-primitive)',
-					},
-					{
-						tag: tags.keyword,
-						color: 'var(--color-code-tags-keyword)',
-					},
-					{
-						tag: tags.operator,
-						color: 'var(--color-code-tags-operator)',
-					},
-					{
-						tag: [
-							tags.variableName,
-							tags.propertyName,
-							tags.attributeName,
-							tags.regexp,
-							tags.className,
-							tags.typeName,
-						],
-						color: 'var(--color-code-tags-variable)',
-					},
-					{
-						tag: [
-							tags.definition(tags.typeName),
-							tags.definition(tags.propertyName),
-							tags.function(tags.variableName),
-						],
-						color: 'var(--color-code-tags-definition)',
-					},
-				]),
-			),
+	codeEditorSyntaxHighlighting,
 ];
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/editor-ui/src/components/ExpressionEditModal.vue
index 07dcee3c3a..15fb08f88c 100644
--- a/packages/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/editor-ui/src/components/ExpressionEditModal.vue
@@ -245,7 +245,6 @@ const onResizeThrottle = useThrottleFn(onResize, 10);
 	margin-bottom: 0;
 
 	:global(.el-dialog__body) {
-		background-color: var(--color-expression-editor-modal-background);
 		height: 100%;
 		padding: var(--spacing-s);
 	}
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index bae21c58fe..07e1346545 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -7,20 +7,14 @@ import { computed, onMounted, ref, watch } from 'vue';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
 import { forceParse } from '@/utils/forceParse';
-import { completionStatus } from '@codemirror/autocomplete';
 import { inputTheme } from './theme';
 
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
 import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
 import { removeExpressionPrefix } from '@/utils/expressions';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 
 type Props = {
 	modelValue: string;
@@ -41,24 +35,7 @@ const emit = defineEmits<{
 const root = ref<HTMLElement>();
 const extensions = computed(() => [
 	inputTheme(props.isReadOnly),
-	Prec.highest(
-		keymap.of([
-			...tabKeyMap(),
-			...historyKeyMap,
-			...enterKeyMap,
-			...autocompleteKeyMap,
-			{
-				any: (view, event) => {
-					if (event.key === 'Escape' && completionStatus(view.state) === null) {
-						event.stopPropagation();
-						emit('close');
-					}
-
-					return false;
-				},
-			},
-		]),
-	),
+	Prec.highest(keymap.of(editorKeymap)),
 	n8nLang(),
 	n8nAutocompletion(),
 	mappingDropCursor(),
@@ -66,7 +43,7 @@ const extensions = computed(() => [
 	history(),
 	expressionInputHandler(),
 	EditorView.lineWrapping,
-	EditorView.domEventHandlers({ scroll: forceParse }),
+	EditorView.domEventHandlers({ scroll: (_, view) => forceParse(view) }),
 	infoBoxTooltips(),
 ]);
 const editorValue = ref<string>(removeExpressionPrefix(props.modelValue));
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 02fd40737e..91b9b0c35a 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -22,19 +22,14 @@ import htmlParser from 'prettier/plugins/html';
 import cssParser from 'prettier/plugins/postcss';
 import { computed, onBeforeUnmount, onMounted, ref, toRaw, toValue, watch } from 'vue';
 
-import { htmlEditorEventBus } from '@/event-bus';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { htmlEditorEventBus } from '@/event-bus';
 import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
 import { autoCloseTags, htmlLanguage } from 'codemirror-lang-html-n8n';
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 import type { Range, Section } from './types';
 import { nonTakenRanges } from './utils';
 import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
@@ -67,16 +62,13 @@ const extensions = computed(() => [
 	),
 	autoCloseTags,
 	expressionInputHandler(),
-	Prec.highest(
-		keymap.of([...tabKeyMap(), ...enterKeyMap, ...historyKeyMap, ...autocompleteKeyMap]),
-	),
+	Prec.highest(keymap.of(editorKeymap)),
 	indentOnInput(),
-	codeNodeEditorTheme({
+	codeEditorTheme({
 		isReadOnly: props.isReadOnly,
 		maxHeight: props.fullscreen ? '100%' : '40vh',
 		minHeight: '20vh',
 		rows: props.rows,
-		highlightColors: 'html',
 	}),
 	lineNumbers(),
 	highlightActiveLineGutter(),
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
index 1424b7d2e3..a0b88dff75 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
@@ -97,7 +97,7 @@ onMounted(() => {
 			extensions: [
 				EditorState.readOnly.of(true),
 				EditorView.lineWrapping,
-				EditorView.domEventHandlers({ scroll: forceParse }),
+				EditorView.domEventHandlers({ scroll: (_, view) => forceParse(view) }),
 				...props.extensions,
 			],
 		}),
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 23cb31c7ea..72c430d24e 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -7,12 +7,7 @@ import { computed, ref, watch } from 'vue';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
 import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
@@ -42,9 +37,7 @@ const emit = defineEmits<{
 
 const root = ref<HTMLElement>();
 const extensions = computed(() => [
-	Prec.highest(
-		keymap.of([...tabKeyMap(false), ...enterKeyMap, ...autocompleteKeyMap, ...historyKeyMap]),
-	),
+	Prec.highest(keymap.of(editorKeymap)),
 	n8nLang(),
 	n8nAutocompletion(),
 	inputTheme({ isReadOnly: props.isReadOnly, rows: props.rows }),
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
index 906a8476db..f8ef90cc3a 100644
--- a/packages/editor-ui/src/components/JsEditor/JsEditor.vue
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { history, toggleComment } from '@codemirror/commands';
+import { history } from '@codemirror/commands';
 import { javascript } from '@codemirror/lang-javascript';
 import { foldGutter, indentOnInput } from '@codemirror/language';
 import { lintGutter } from '@codemirror/lint';
@@ -16,14 +16,9 @@ import {
 } from '@codemirror/view';
 import { computed, onMounted, ref, watch } from 'vue';
 
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 
 type Props = {
 	modelValue: string;
@@ -85,7 +80,7 @@ const extensions = computed(() => {
 		lineNumbers(),
 		EditorView.lineWrapping,
 		EditorState.readOnly.of(props.isReadOnly),
-		codeNodeEditorTheme({
+		codeEditorTheme({
 			isReadOnly: props.isReadOnly,
 			maxHeight: props.fillParent ? '100%' : '40vh',
 			minHeight: '20vh',
@@ -96,15 +91,7 @@ const extensions = computed(() => {
 	if (!props.isReadOnly) {
 		extensionsToApply.push(
 			history(),
-			Prec.highest(
-				keymap.of([
-					...tabKeyMap(),
-					...enterKeyMap,
-					...historyKeyMap,
-					...autocompleteKeyMap,
-					{ key: 'Mod-/', run: toggleComment },
-				]),
-			),
+			Prec.highest(keymap.of(editorKeymap)),
 			lintGutter(),
 			n8nAutocompletion(),
 			indentOnInput(),
diff --git a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
index a24bf2373f..998430838f 100644
--- a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
+++ b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
@@ -15,15 +15,10 @@ import {
 	lineNumbers,
 } from '@codemirror/view';
 
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
 import { computed, onMounted, ref, watch } from 'vue';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 
 type Props = {
@@ -48,7 +43,7 @@ const extensions = computed(() => {
 		lineNumbers(),
 		EditorView.lineWrapping,
 		EditorState.readOnly.of(props.isReadOnly),
-		codeNodeEditorTheme({
+		codeEditorTheme({
 			isReadOnly: props.isReadOnly,
 			maxHeight: props.fillParent ? '100%' : '40vh',
 			minHeight: '20vh',
@@ -58,9 +53,7 @@ const extensions = computed(() => {
 	if (!props.isReadOnly) {
 		extensionsToApply.push(
 			history(),
-			Prec.highest(
-				keymap.of([...tabKeyMap(), ...enterKeyMap, ...historyKeyMap, ...autocompleteKeyMap]),
-			),
+			Prec.highest(keymap.of(editorKeymap)),
 			createLinter(jsonParseLinter()),
 			lintGutter(),
 			n8nAutocompletion(),
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index c7e35e7e72..ba04cbfc2f 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -476,6 +476,10 @@ const shortPath = computed<string>(() => {
 	return short.join('.');
 });
 
+const parameterId = computed(() => {
+	return `${node.value?.id ?? crypto.randomUUID()}${props.path}`;
+});
+
 const isResourceLocatorParameter = computed<boolean>(() => {
 	return props.parameter.type === 'resourceLocator' || props.parameter.type === 'workflowSelector';
 });
@@ -1092,21 +1096,20 @@ onUpdated(async () => {
 				"
 			>
 				<el-dialog
+					width="calc(100% - var(--spacing-3xl))"
+					:class="$style.modal"
 					:model-value="codeEditDialogVisible"
 					:append-to="`#${APP_MODALS_ELEMENT_ID}`"
-					width="80%"
 					:title="`${i18n.baseText('codeEdit.edit')} ${i18n
 						.nodeText()
 						.inputLabelDisplayName(parameter, path)}`"
 					:before-close="closeCodeEditDialog"
 					data-test-id="code-editor-fullscreen"
 				>
-					<div
-						:key="codeEditDialogVisible.toString()"
-						class="ignore-key-press-canvas code-edit-dialog"
-					>
+					<div class="ignore-key-press-canvas code-edit-dialog">
 						<CodeNodeEditor
 							v-if="editorType === 'codeNodeEditor'"
+							:id="parameterId"
 							:mode="codeEditorMode"
 							:model-value="modelValueString"
 							:default-value="parameter.default"
@@ -1116,7 +1119,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<HtmlEditor
-							v-else-if="editorType === 'htmlEditor'"
+							v-else-if="editorType === 'htmlEditor' && !codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1126,7 +1129,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<SqlEditor
-							v-else-if="editorType === 'sqlEditor'"
+							v-else-if="editorType === 'sqlEditor' && !codeEditDialogVisible"
 							:model-value="modelValueString"
 							:dialect="getArgument('sqlDialect')"
 							:is-read-only="isReadOnly"
@@ -1135,7 +1138,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<JsEditor
-							v-else-if="editorType === 'jsEditor'"
+							v-else-if="editorType === 'jsEditor' && !codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1145,7 +1148,7 @@ onUpdated(async () => {
 						/>
 
 						<JsonEditor
-							v-else-if="parameter.type === 'json'"
+							v-else-if="parameter.type === 'json' && !codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1166,8 +1169,8 @@ onUpdated(async () => {
 				></TextEdit>
 
 				<CodeNodeEditor
-					v-if="editorType === 'codeNodeEditor' && isCodeNode"
-					:key="'code-' + codeEditDialogVisible.toString()"
+					v-if="editorType === 'codeNodeEditor' && isCodeNode && !codeEditDialogVisible"
+					:id="parameterId"
 					:mode="codeEditorMode"
 					:model-value="modelValueString"
 					:default-value="parameter.default"
@@ -1191,8 +1194,7 @@ onUpdated(async () => {
 				</CodeNodeEditor>
 
 				<HtmlEditor
-					v-else-if="editorType === 'htmlEditor'"
-					:key="'html-' + codeEditDialogVisible.toString()"
+					v-else-if="editorType === 'htmlEditor' && !codeEditDialogVisible"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly"
 					:rows="editorRows"
@@ -1214,7 +1216,6 @@ onUpdated(async () => {
 
 				<SqlEditor
 					v-else-if="editorType === 'sqlEditor'"
-					:key="'sql-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
 					:dialect="getArgument('sqlDialect')"
 					:is-read-only="isReadOnly"
@@ -1235,7 +1236,6 @@ onUpdated(async () => {
 
 				<JsEditor
 					v-else-if="editorType === 'jsEditor'"
-					:key="'js-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly || editorIsReadOnly"
 					:rows="editorRows"
@@ -1257,7 +1257,6 @@ onUpdated(async () => {
 
 				<JsonEditor
 					v-else-if="parameter.type === 'json'"
-					:key="'json-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly"
 					:rows="editorRows"
@@ -1278,6 +1277,7 @@ onUpdated(async () => {
 				<div v-else-if="editorType" class="readonly-code clickable" @click="displayEditDialog()">
 					<CodeNodeEditor
 						v-if="!codeEditDialogVisible"
+						:id="parameterId"
 						:mode="codeEditorMode"
 						:model-value="modelValueString"
 						:language="editorLanguage"
@@ -1630,8 +1630,8 @@ onUpdated(async () => {
 
 .textarea-modal-opener {
 	position: absolute;
-	right: 0;
-	bottom: 0;
+	right: 1px;
+	bottom: 1px;
 	background-color: var(--color-code-background);
 	padding: 3px;
 	line-height: 9px;
@@ -1639,6 +1639,8 @@ onUpdated(async () => {
 	border-top-left-radius: var(--border-radius-base);
 	border-bottom-right-radius: var(--border-radius-base);
 	cursor: pointer;
+	border-right: none;
+	border-bottom: none;
 
 	svg {
 		width: 9px !important;
@@ -1660,7 +1662,7 @@ onUpdated(async () => {
 }
 
 .code-edit-dialog {
-	height: 70vh;
+	height: 100%;
 
 	.code-node-editor {
 		height: 100%;
@@ -1668,7 +1670,25 @@ onUpdated(async () => {
 }
 </style>
 
-<style lang="scss" module>
+<style lang="css" module>
+.modal {
+	--dialog-close-top: var(--spacing-m);
+	display: flex;
+	flex-direction: column;
+	overflow: clip;
+	height: calc(100% - var(--spacing-4xl));
+	margin-bottom: 0;
+
+	:global(.el-dialog__header) {
+		padding-bottom: 0;
+	}
+
+	:global(.el-dialog__body) {
+		height: calc(100% - var(--spacing-3xl));
+		padding: var(--spacing-s);
+	}
+}
+
 .tipVisible {
 	--input-border-bottom-left-radius: 0;
 	--input-border-bottom-right-radius: 0;
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 6350ea52aa..98b25db9b6 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
 import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
-import { codeNodeEditorEventBus } from '@/event-bus';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { codeNodeEditorEventBus } from '@/event-bus';
 import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
+import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
 import { ifNotIn } from '@codemirror/autocomplete';
-import { history, toggleComment } from '@codemirror/commands';
+import { history } from '@codemirror/commands';
 import { LanguageSupport, bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
 import { Prec, type Line } from '@codemirror/state';
 import {
@@ -34,10 +30,9 @@ import {
 	StandardSQL,
 	keywordCompletionSource,
 } from '@n8n/codemirror-lang-sql';
-import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
-import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { onClickOutside } from '@vueuse/core';
+import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 
 const SQL_DIALECTS = {
 	StandardSQL,
@@ -87,7 +82,7 @@ const extensions = computed(() => {
 	const baseExtensions = [
 		sqlWithN8nLanguageSupport(),
 		expressionInputHandler(),
-		codeNodeEditorTheme({
+		codeEditorTheme({
 			isReadOnly: props.isReadOnly,
 			maxHeight: props.fullscreen ? '100%' : '40vh',
 			minHeight: '10vh',
@@ -100,15 +95,7 @@ const extensions = computed(() => {
 	if (!props.isReadOnly) {
 		return baseExtensions.concat([
 			history(),
-			Prec.highest(
-				keymap.of([
-					...tabKeyMap(),
-					...enterKeyMap,
-					...historyKeyMap,
-					...autocompleteKeyMap,
-					{ key: 'Mod-/', run: toggleComment },
-				]),
-			),
+			Prec.highest(keymap.of(editorKeymap)),
 			n8nAutocompletion(),
 			indentOnInput(),
 			highlightActiveLine(),
@@ -185,10 +172,10 @@ function line(lineNumber: number): Line | null {
 	}
 }
 
-function highlightLine(lineNumber: number | 'final') {
+function highlightLine(lineNumber: number | 'last') {
 	if (!editor.value) return;
 
-	if (lineNumber === 'final') {
+	if (lineNumber === 'last') {
 		editor.value.dispatch({
 			selection: { anchor: editor.value.state.doc.length },
 		});
diff --git a/packages/editor-ui/src/composables/useCodeEditor.ts b/packages/editor-ui/src/composables/useCodeEditor.ts
new file mode 100644
index 0000000000..0a63189eed
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCodeEditor.ts
@@ -0,0 +1,448 @@
+import { codeEditorTheme } from '@/components/CodeNodeEditor/theme';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
+import { useTypescript } from '@/plugins/codemirror/typescript/client/useTypescript';
+import { closeCursorInfoBox } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
+import { closeBrackets, closeCompletion, completionStatus } from '@codemirror/autocomplete';
+import { history, historyField } from '@codemirror/commands';
+import { javascript } from '@codemirror/lang-javascript';
+import { json } from '@codemirror/lang-json';
+import { python } from '@codemirror/lang-python';
+import { bracketMatching, foldGutter, foldState, indentOnInput } from '@codemirror/language';
+import { highlightSelectionMatches } from '@codemirror/search';
+import {
+	Compartment,
+	EditorSelection,
+	EditorState,
+	type EditorStateConfig,
+	type Extension,
+	type SelectionRange,
+} from '@codemirror/state';
+import {
+	drawSelection,
+	dropCursor,
+	EditorView,
+	highlightActiveLineGutter,
+	highlightActiveLine,
+	highlightSpecialChars,
+	keymap,
+	lineNumbers,
+	type ViewUpdate,
+} from '@codemirror/view';
+import { indentationMarkers } from '@replit/codemirror-indentation-markers';
+import { html } from 'codemirror-lang-html-n8n';
+import { debounce } from 'lodash-es';
+import { jsonParse, type CodeExecutionMode, type IDataObject } from 'n8n-workflow';
+import { v4 as uuid } from 'uuid';
+import {
+	computed,
+	onBeforeUnmount,
+	onMounted,
+	ref,
+	toRef,
+	toValue,
+	watch,
+	type MaybeRefOrGetter,
+	type Ref,
+} from 'vue';
+import { useCompleter } from '../components/CodeNodeEditor/completer';
+import { mappingDropCursor } from '../plugins/codemirror/dragAndDrop';
+import { languageFacet, type CodeEditorLanguage } from '../plugins/codemirror/format';
+
+export type CodeEditorLanguageParamsMap = {
+	json: {};
+	html: {};
+	javaScript: { mode: CodeExecutionMode };
+	python: { mode: CodeExecutionMode };
+};
+
+export const useCodeEditor = <L extends CodeEditorLanguage>({
+	editorRef,
+	editorValue,
+	language,
+	languageParams,
+	placeholder,
+	extensions = [],
+	isReadOnly = false,
+	theme = {},
+	onChange = () => {},
+	id = uuid(),
+}: {
+	editorRef: MaybeRefOrGetter<HTMLElement | undefined>;
+	language: MaybeRefOrGetter<L>;
+	editorValue?: MaybeRefOrGetter<string>;
+	placeholder?: MaybeRefOrGetter<string>;
+	extensions?: MaybeRefOrGetter<Extension[]>;
+	isReadOnly?: MaybeRefOrGetter<boolean>;
+	theme?: MaybeRefOrGetter<{
+		maxHeight?: string;
+		minHeight?: string;
+		rows?: number;
+	}>;
+	languageParams?: MaybeRefOrGetter<CodeEditorLanguageParamsMap[L]>;
+	id?: MaybeRefOrGetter<string>;
+	onChange?: (viewUpdate: ViewUpdate) => void;
+}) => {
+	const editor = ref<EditorView>();
+	const hasFocus = ref(false);
+	const hasChanges = ref(false);
+	const lastChange = ref<ViewUpdate>();
+	const selection = ref<SelectionRange>(EditorSelection.cursor(0)) as Ref<SelectionRange>;
+	const customExtensions = ref<Compartment>(new Compartment());
+	const readOnlyExtensions = ref<Compartment>(new Compartment());
+	const telemetryExtensions = ref<Compartment>(new Compartment());
+	const languageExtensions = ref<Compartment>(new Compartment());
+	const themeExtensions = ref<Compartment>(new Compartment());
+	const autocompleteStatus = ref<'pending' | 'active' | null>(null);
+	const dragging = ref(false);
+	const storedStateFields = { fold: foldState, history: historyField };
+
+	const storedStateId = computed(() => `${toValue(id)}.editorState`);
+	const mode = computed(() => {
+		const params = toValue(languageParams);
+		return params && 'mode' in params ? params.mode : 'runOnceForAllItems';
+	});
+	const { createWorker: createTsWorker } = useTypescript(editor, mode, id);
+
+	function getInitialLanguageExtensions(lang: CodeEditorLanguage): Extension[] {
+		switch (lang) {
+			case 'javaScript':
+				return [javascript()];
+			default:
+				return [];
+		}
+	}
+
+	async function getFullLanguageExtensions(): Promise<Extension[]> {
+		if (!editor.value) return [];
+		const lang = toValue(language);
+		const langExtensions: Extension[] = [languageFacet.of(lang)];
+
+		switch (lang) {
+			case 'javaScript': {
+				const tsExtension = await createTsWorker();
+				langExtensions.push(tsExtension);
+				break;
+			}
+			case 'python': {
+				const pythonAutocomplete = useCompleter(mode, editor.value ?? null).autocompletionExtension(
+					'python',
+				);
+				langExtensions.push([python(), pythonAutocomplete]);
+				break;
+			}
+			case 'json':
+				langExtensions.push(json());
+				break;
+			case 'html':
+				langExtensions.push(html());
+				break;
+		}
+
+		return langExtensions;
+	}
+
+	function readEditorValue(): string {
+		return editor.value?.state.doc.toString() ?? '';
+	}
+
+	function updateSelection(update: ViewUpdate) {
+		const currentSelection = selection.value;
+		const newSelection = update.state.selection.ranges[0];
+
+		if (!currentSelection?.eq(newSelection)) {
+			selection.value = newSelection;
+		}
+	}
+
+	const emitChanges = debounce((update: ViewUpdate) => {
+		onChange(update);
+	}, 300);
+
+	function onEditorUpdate(update: ViewUpdate) {
+		autocompleteStatus.value = completionStatus(update.view.state);
+		updateSelection(update);
+
+		if (update.docChanged) {
+			hasChanges.value = true;
+			lastChange.value = update;
+			emitChanges(update);
+		}
+	}
+
+	function blur() {
+		if (editor.value) {
+			editor.value.contentDOM.blur();
+			closeCompletion(editor.value);
+			closeCursorInfoBox(editor.value);
+		}
+	}
+
+	function blurOnClickOutside(event: MouseEvent) {
+		if (event.target && !dragging.value && !editor.value?.dom.contains(event.target as Node)) {
+			blur();
+		}
+		dragging.value = false;
+	}
+
+	async function setLanguageExtensions() {
+		if (!editor.value) return;
+		const initialExtensions = getInitialLanguageExtensions(toValue(language));
+		if (initialExtensions.length > 0) {
+			editor.value.dispatch({
+				effects: languageExtensions.value.reconfigure(initialExtensions),
+			});
+		}
+
+		editor.value.dispatch({
+			effects: languageExtensions.value.reconfigure(await getFullLanguageExtensions()),
+		});
+	}
+
+	function getReadOnlyExtensions() {
+		return [
+			EditorState.readOnly.of(toValue(isReadOnly)),
+			EditorView.editable.of(!toValue(isReadOnly)),
+			highlightSpecialChars(),
+		];
+	}
+
+	function setReadOnlyExtensions() {
+		if (!editor.value) return;
+		editor.value.dispatch({
+			effects: readOnlyExtensions.value.reconfigure([getReadOnlyExtensions()]),
+		});
+	}
+
+	watch(toRef(editorRef), async () => {
+		const parent = toValue(editorRef);
+
+		if (!parent) return;
+
+		const initialValue = toValue(editorValue) ? toValue(editorValue) : toValue(placeholder);
+
+		const allExtensions = [
+			customExtensions.value.of(toValue(extensions)),
+			readOnlyExtensions.value.of(getReadOnlyExtensions()),
+			telemetryExtensions.value.of([]),
+			languageExtensions.value.of(getInitialLanguageExtensions(toValue(language))),
+			themeExtensions.value.of(codeEditorTheme(toValue(theme))),
+			EditorView.updateListener.of(onEditorUpdate),
+			EditorView.focusChangeEffect.of((_, newHasFocus) => {
+				hasFocus.value = newHasFocus;
+				selection.value = state.selection.ranges[0];
+				if (!newHasFocus) {
+					autocompleteStatus.value = null;
+				}
+				return null;
+			}),
+			EditorState.allowMultipleSelections.of(true),
+			EditorView.clickAddsSelectionRange.of(
+				(event) => event.altKey && !event.metaKey && !event.shiftKey,
+			),
+			EditorView.contentAttributes.of({ 'data-gramm': 'false' }), // disable grammarly
+			EditorView.domEventHandlers({
+				mousedown: () => {
+					dragging.value = true;
+				},
+			}),
+			highlightSelectionMatches({ minSelectionLength: 2 }),
+			lineNumbers(),
+			drawSelection(),
+			foldGutter({
+				markerDOM: (open) => {
+					const svgNS = 'http://www.w3.org/2000/svg';
+					const wrapper = document.createElement('div');
+					wrapper.classList.add('cm-fold-marker');
+					const svgElement = document.createElementNS(svgNS, 'svg');
+					svgElement.setAttribute('viewBox', '0 0 10 10');
+					svgElement.setAttribute('width', '10');
+					svgElement.setAttribute('height', '10');
+					const pathElement = document.createElementNS(svgNS, 'path');
+					const d = open ? 'M1 3 L5 7 L9 3' : 'M3 1 L7 5 L3 9'; // Chevron paths
+					pathElement.setAttribute('d', d);
+					pathElement.setAttribute('fill', 'none');
+					pathElement.setAttribute('stroke', 'currentColor');
+					pathElement.setAttribute('stroke-width', '1.5');
+					pathElement.setAttribute('stroke-linecap', 'round');
+					svgElement.appendChild(pathElement);
+					wrapper.appendChild(svgElement);
+					return wrapper;
+				},
+			}),
+			EditorView.lineWrapping,
+			history(),
+			dropCursor(),
+			indentOnInput(),
+			bracketMatching(),
+			closeBrackets(),
+			highlightActiveLine(),
+			highlightActiveLineGutter(),
+			mappingDropCursor(),
+			indentationMarkers({
+				highlightActiveBlock: true,
+				markerType: 'fullScope',
+				colors: {
+					activeDark: 'var(--color-code-indentation-marker-active)',
+					activeLight: 'var(--color-code-indentation-marker-active)',
+					dark: 'var(--color-code-indentation-marker)',
+					light: 'var(--color-code-indentation-marker)',
+				},
+			}),
+			keymap.of(editorKeymap),
+		];
+
+		const parsedStoredState = jsonParse<IDataObject | null>(
+			localStorage.getItem(storedStateId.value) ?? '',
+			{
+				fallbackValue: null,
+			},
+		);
+		const config: EditorStateConfig = {
+			doc: initialValue,
+			extensions: allExtensions,
+		};
+
+		const state =
+			// Only restore from localstorage when code did not change
+			parsedStoredState && parsedStoredState.doc === initialValue
+				? EditorState.fromJSON(parsedStoredState, config, storedStateFields)
+				: EditorState.create(config);
+
+		if (editor.value) {
+			editor.value.destroy();
+		}
+		editor.value = new EditorView({
+			parent,
+			state,
+			scrollTo: EditorView.scrollIntoView(state.selection.main, { y: 'center' }),
+		});
+
+		editor.value.dispatch({
+			effects: languageExtensions.value.reconfigure(await getFullLanguageExtensions()),
+		});
+	});
+
+	watch(extensions, () => {
+		if (editor.value) {
+			editor.value.dispatch({
+				effects: customExtensions.value.reconfigure(toValue(extensions)),
+			});
+		}
+	});
+
+	watch(toRef(language), setLanguageExtensions);
+
+	watch(toRef(isReadOnly), setReadOnlyExtensions);
+
+	watch(toRef(theme), () => {
+		if (editor.value) {
+			editor.value.dispatch({
+				effects: themeExtensions.value.reconfigure(codeEditorTheme(toValue(theme))),
+			});
+		}
+	});
+
+	watch(toRef(editorValue), () => {
+		if (!editor.value || hasFocus.value) return;
+
+		const newValue = toValue(editorValue);
+		const currentValue = readEditorValue();
+		if (newValue === undefined || newValue === currentValue) return;
+
+		editor.value.dispatch({
+			changes: { from: 0, to: currentValue.length, insert: newValue },
+		});
+	});
+
+	onMounted(() => {
+		document.addEventListener('click', blurOnClickOutside);
+	});
+
+	onBeforeUnmount(() => {
+		document.removeEventListener('click', blurOnClickOutside);
+
+		if (editor.value) {
+			const stateToStore = editor.value.state.toJSON(storedStateFields);
+			try {
+				localStorage.setItem(storedStateId.value, JSON.stringify(stateToStore));
+			} catch (error) {
+				// Code is too large, localStorage quota exceeded
+				localStorage.removeItem(storedStateId.value);
+			}
+			if (lastChange.value) onChange(lastChange.value);
+			editor.value.destroy();
+		}
+	});
+
+	function setCursorPosition(pos: number | 'end'): void {
+		const finalPos = pos === 'end' ? (editor.value?.state.doc.length ?? 0) : pos;
+		editor.value?.dispatch({ selection: { head: finalPos, anchor: finalPos } });
+	}
+
+	function select(anchor: number, head: number | 'end' = 'end'): void {
+		editor.value?.dispatch({
+			selection: {
+				anchor,
+				head: head === 'end' ? (editor.value?.state.doc.length ?? 0) : head,
+			},
+		});
+	}
+
+	function getLine(lineNumber: number | 'last' | 'first') {
+		if (!editor.value) return;
+
+		const { doc } = editor.value.state;
+		switch (lineNumber) {
+			case 'first':
+				return doc.lineAt(0);
+			case 'last':
+				return doc.lineAt(doc.length - 1);
+			default:
+				return doc.line(lineNumber);
+		}
+	}
+
+	function selectLine(lineNumber: number | 'last' | 'first'): void {
+		if (!editor.value) return;
+
+		const line = getLine(lineNumber);
+
+		if (!line) return;
+
+		editor.value.dispatch({
+			selection: EditorSelection.range(line.from, line.to),
+		});
+	}
+
+	function highlightLine(lineNumber: number | 'last' | 'first'): void {
+		if (!editor.value) return;
+
+		const line = getLine(lineNumber);
+
+		if (!line) return;
+
+		editor.value.dispatch({ selection: EditorSelection.cursor(line.from) });
+	}
+
+	const selectAll = () => select(0, 'end');
+
+	function focus(): void {
+		if (hasFocus.value) return;
+		editor.value?.focus();
+	}
+
+	return {
+		editor,
+		hasFocus,
+		hasChanges,
+		selection,
+		readEditorValue,
+		setCursorPosition,
+		select,
+		selectLine,
+		selectAll,
+		highlightLine,
+		focus,
+		blur,
+	};
+};
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.test.ts b/packages/editor-ui/src/composables/useExpressionEditor.test.ts
index 4512e7654a..7f5b6d73c1 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.test.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.test.ts
@@ -1,17 +1,16 @@
+import { renderComponent } from '@/__tests__/render';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import { EditorView, keymap } from '@codemirror/view';
+import { n8nLang } from '@/plugins/codemirror/n8nLang';
+import { EditorSelection } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
 import { createTestingPinia } from '@pinia/testing';
-import { waitFor, fireEvent } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { fireEvent, waitFor } from '@testing-library/vue';
 import { setActivePinia } from 'pinia';
 import { beforeEach, describe, vi } from 'vitest';
 import { defineComponent, h, ref, toValue } from 'vue';
-import { n8nLang } from '@/plugins/codemirror/n8nLang';
-import { useExpressionEditor } from './useExpressionEditor';
 import { useRouter } from 'vue-router';
-import { EditorSelection } from '@codemirror/state';
-import userEvent from '@testing-library/user-event';
-import { renderComponent } from '@/__tests__/render';
-import { tabKeyMap } from '@/plugins/codemirror/keymap';
+import { useExpressionEditor } from './useExpressionEditor';
 
 vi.mock('@/composables/useAutocompleteTelemetry', () => ({
 	useAutocompleteTelemetry: vi.fn(),
@@ -358,32 +357,4 @@ describe('useExpressionEditor', () => {
 			expect(expressionEditor.editor.value?.hasFocus).toBe(true);
 		});
 	});
-
-	describe('keymap', () => {
-		const TEST_EDITOR_VALUE = '{{ { "foo": "bar" } }}';
-
-		test('should indent on tab if blurOnTab is false', async () => {
-			const { renderResult, expressionEditor } = await renderExpressionEditor({
-				editorValue: TEST_EDITOR_VALUE,
-				extensions: [keymap.of([...tabKeyMap(false)])],
-			});
-			const root = renderResult.getByTestId('editor-root');
-			const input = root.querySelector('.cm-line') as HTMLDivElement;
-
-			await userEvent.type(input, '{tab}');
-			expect(expressionEditor.editor.value?.state.doc.toString()).toEqual(`  ${TEST_EDITOR_VALUE}`);
-		});
-
-		test('should NOT indent on tab if blurOnTab is true', async () => {
-			const { renderResult, expressionEditor } = await renderExpressionEditor({
-				editorValue: TEST_EDITOR_VALUE,
-				extensions: [keymap.of([...tabKeyMap(true)])],
-			});
-			const root = renderResult.getByTestId('editor-root');
-			const input = root.querySelector('.cm-line') as HTMLDivElement;
-
-			await userEvent.type(input, '{tab}');
-			expect(expressionEditor.editor.value?.state.doc.toString()).toEqual(TEST_EDITOR_VALUE);
-		});
-	});
 });
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/editor-ui/src/composables/useExpressionEditor.ts
index 6cee456249..c196988764 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.ts
@@ -3,6 +3,7 @@ import {
 	onBeforeUnmount,
 	onMounted,
 	ref,
+	toRef,
 	toValue,
 	watch,
 	watchEffect,
@@ -47,7 +48,7 @@ export const useExpressionEditor = ({
 	autocompleteTelemetry,
 	isReadOnly = false,
 }: {
-	editorRef: Ref<HTMLElement | undefined>;
+	editorRef: MaybeRefOrGetter<HTMLElement | undefined>;
 	editorValue?: MaybeRefOrGetter<string>;
 	extensions?: MaybeRefOrGetter<Extension[]>;
 	additionalData?: MaybeRefOrGetter<IDataObject>;
@@ -178,7 +179,7 @@ export const useExpressionEditor = ({
 		dragging.value = false;
 	}
 
-	watch(editorRef, () => {
+	watch(toRef(editorRef), () => {
 		const parent = toValue(editorRef);
 
 		if (!parent) return;
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 4ab211c984..1c4d0c4b48 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -281,7 +281,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 
 			const lineNumber = iRunExecutionData.resultData?.error?.lineNumber;
 
-			codeNodeEditorEventBus.emit('highlightLine', lineNumber ?? 'final');
+			codeNodeEditorEventBus.emit('highlightLine', lineNumber ?? 'last');
 
 			const workflow = workflowHelpers.getCurrentWorkflow();
 			if (executionData.data?.waitTill !== undefined) {
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 6ba3a32a7c..92bd35bd3a 100644
--- a/packages/editor-ui/src/event-bus/code-node-editor.ts
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -1,6 +1,6 @@
 import { createEventBus } from 'n8n-design-system/utils';
 
-export type HighlightLineEvent = number | 'final';
+export type HighlightLineEvent = number | 'last';
 
 export interface CodeNodeEditorEventBusEvents {
 	/** Event that a diff have been applied to the code node editor */
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
index 6d4ee5c56d..929d1d918c 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
@@ -112,23 +112,19 @@ export function expressionWithFirstItem(syntaxTree: Tree, expression: string): s
 }
 
 export function longestCommonPrefix(...strings: string[]) {
-	if (strings.length < 2) {
-		throw new Error('Expected at least two strings');
-	}
+	if (strings.length < 2) return '';
 
-	return strings.reduce((acc, next) => {
-		let i = 0;
-
-		while (acc[i] && next[i] && acc[i] === next[i]) {
-			i++;
+	return strings.reduce((prefix, str) => {
+		while (!str.startsWith(prefix)) {
+			prefix = prefix.slice(0, -1);
+			if (prefix === '') return '';
 		}
-
-		return acc.slice(0, i);
-	}, '');
+		return prefix;
+	}, strings[0]);
 }
 
 export const prefixMatch = (first: string, second: string) =>
-	first.toLocaleLowerCase().startsWith(second.toLocaleLowerCase()) && first !== second;
+	first.toLocaleLowerCase().startsWith(second.toLocaleLowerCase());
 
 export const isPseudoParam = (candidate: string) => {
 	const PSEUDO_PARAMS = ['notice']; // user input disallowed
diff --git a/packages/editor-ui/src/plugins/codemirror/format.ts b/packages/editor-ui/src/plugins/codemirror/format.ts
new file mode 100644
index 0000000000..feeb7ae34e
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/format.ts
@@ -0,0 +1,47 @@
+import { EditorSelection, Facet } from '@codemirror/state';
+import type { EditorView } from '@codemirror/view';
+import { formatWithCursor, type BuiltInParserName } from 'prettier';
+import babelPlugin from 'prettier/plugins/babel';
+import estreePlugin from 'prettier/plugins/estree';
+
+export type CodeEditorLanguage = 'json' | 'html' | 'javaScript' | 'python';
+
+export const languageFacet = Facet.define<CodeEditorLanguage, CodeEditorLanguage>({
+	combine: (values) => values[0] ?? 'javaScript',
+});
+
+export function formatDocument(view: EditorView) {
+	function format(parser: BuiltInParserName) {
+		void formatWithCursor(view.state.doc.toString(), {
+			cursorOffset: view.state.selection.main.anchor,
+			parser,
+			plugins: [babelPlugin, estreePlugin],
+		}).then(({ formatted, cursorOffset }) => {
+			view.dispatch({
+				changes: {
+					from: 0,
+					to: view.state.doc.length,
+					insert: formatted,
+				},
+				selection: EditorSelection.single(cursorOffset),
+			});
+		});
+	}
+
+	const langauge = view.state.facet(languageFacet);
+	switch (langauge) {
+		case 'javaScript':
+			format('babel');
+			break;
+		case 'html':
+			format('html');
+			break;
+		case 'json':
+			format('json');
+			break;
+		default:
+			return false;
+	}
+
+	return true;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/keymap.ts b/packages/editor-ui/src/plugins/codemirror/keymap.ts
index 46e8e284d8..b656b9a8cc 100644
--- a/packages/editor-ui/src/plugins/codemirror/keymap.ts
+++ b/packages/editor-ui/src/plugins/codemirror/keymap.ts
@@ -1,51 +1,83 @@
 import {
 	acceptCompletion,
+	closeCompletion,
 	completionStatus,
+	deleteBracketPair,
 	moveCompletionSelection,
-	selectedCompletion,
+	startCompletion,
 } from '@codemirror/autocomplete';
-import { indentLess, indentMore, insertNewlineAndIndent, redo, undo } from '@codemirror/commands';
 import type { EditorView, KeyBinding } from '@codemirror/view';
 
-export const tabKeyMap = (blurOnTab = false): KeyBinding[] => [
-	{
-		any(view, event) {
-			if (
-				event.key === 'Tab' ||
-				(event.key === 'Escape' && completionStatus(view.state) !== null)
-			) {
-				event.stopPropagation();
-			}
-
-			return false;
-		},
-	},
-	{
-		key: 'Tab',
-		run: (view) => {
-			if (selectedCompletion(view.state)) {
-				return acceptCompletion(view);
-			}
-
-			if (!blurOnTab) return indentMore(view);
-			return false;
-		},
-	},
-	{ key: 'Shift-Tab', run: indentLess },
-];
-
-export const enterKeyMap: KeyBinding[] = [
-	{
-		key: 'Enter',
-		run: (view) => {
-			if (selectedCompletion(view.state)) {
-				return acceptCompletion(view);
-			}
-
-			return insertNewlineAndIndent(view);
-		},
-	},
-];
+import {
+	insertNewlineAndIndent,
+	cursorCharLeft,
+	selectCharLeft,
+	deleteLine,
+	moveLineDown,
+	moveLineUp,
+	copyLineDown,
+	copyLineUp,
+	selectLine,
+	cursorMatchingBracket,
+	indentMore,
+	indentLess,
+	cursorLineBoundaryBackward,
+	selectLineBoundaryBackward,
+	cursorDocStart,
+	selectDocStart,
+	cursorLineBoundaryForward,
+	selectLineBoundaryForward,
+	cursorDocEnd,
+	selectDocEnd,
+	cursorGroupLeft,
+	selectGroupLeft,
+	cursorPageDown,
+	cursorPageUp,
+	deleteCharBackward,
+	deleteCharForward,
+	deleteGroupBackward,
+	deleteGroupForward,
+	deleteToLineEnd,
+	deleteToLineStart,
+	selectAll,
+	selectPageDown,
+	selectPageUp,
+	cursorCharRight,
+	cursorGroupRight,
+	selectCharRight,
+	selectGroupRight,
+	cursorLineUp,
+	selectLineUp,
+	cursorLineDown,
+	selectLineDown,
+	cursorLineEnd,
+	cursorLineStart,
+	selectLineEnd,
+	selectLineStart,
+	splitLine,
+	transposeChars,
+	redo,
+	undo,
+	undoSelection,
+	toggleComment,
+	lineComment,
+	lineUncomment,
+	toggleBlockComment,
+} from '@codemirror/commands';
+import {
+	closeSearchPanel,
+	gotoLine,
+	openSearchPanel,
+	replaceAll,
+	selectMatches,
+	selectNextOccurrence,
+	selectSelectionMatches,
+} from '@codemirror/search';
+import { addCursorAtEachSelectionLine, addCursorDown, addCursorUp } from './multiCursor';
+import { foldAll, foldCode, unfoldAll, unfoldCode } from '@codemirror/language';
+import { nextDiagnostic, previousDiagnostic, openLintPanel } from '@codemirror/lint';
+import { EditorSelection } from '@codemirror/state';
+import { formatDocument } from './format';
 
 const SELECTED_AUTOCOMPLETE_OPTION_SELECTOR = '.cm-tooltip-autocomplete li[aria-selected]';
 const onAutocompleteNavigate = (dir: 'up' | 'down') => (view: EditorView) => {
@@ -59,7 +91,20 @@ const onAutocompleteNavigate = (dir: 'up' | 'down') => (view: EditorView) => {
 	return false;
 };
 
-export const autocompleteKeyMap: KeyBinding[] = [
+// Keymap based on VSCode
+export const editorKeymap: KeyBinding[] = [
+	{ key: 'Ctrl-Space', run: startCompletion },
+	{ key: 'Escape', run: closeCompletion },
+	{
+		key: 'Escape',
+		run: (view) => {
+			if (view.state.selection.ranges.length > 1) {
+				view.dispatch({ selection: EditorSelection.single(view.state.selection.main.head) });
+				return true;
+			}
+			return false;
+		},
+	},
 	{
 		key: 'ArrowDown',
 		run: onAutocompleteNavigate('down'),
@@ -68,9 +113,185 @@ export const autocompleteKeyMap: KeyBinding[] = [
 		key: 'ArrowUp',
 		run: onAutocompleteNavigate('up'),
 	},
-];
+	{ key: 'PageDown', run: moveCompletionSelection(true, 'page') },
+	{ key: 'PageUp', run: moveCompletionSelection(false, 'page') },
+	{ key: 'Enter', run: acceptCompletion },
+	{ key: 'Tab', run: acceptCompletion },
 
-export const historyKeyMap: KeyBinding[] = [
-	{ key: 'Mod-z', run: undo },
-	{ key: 'Mod-Shift-z', run: redo },
+	{ key: 'Mod-f', run: openSearchPanel, scope: 'editor search-panel' },
+	{ key: 'Escape', run: closeSearchPanel, scope: 'editor search-panel' },
+	{ key: 'Alt-Enter', run: selectMatches, scope: 'editor search-panel' },
+	{ key: 'Mod-Alt-Enter', run: replaceAll, scope: 'editor search-panel' },
+	{ key: 'Ctrl-g', run: gotoLine },
+	{ key: 'Mod-d', run: selectNextOccurrence, preventDefault: true },
+	{ key: 'Shift-Mod-l', run: selectSelectionMatches },
+	{ key: 'Enter', run: insertNewlineAndIndent, shift: insertNewlineAndIndent },
+	{
+		key: 'ArrowLeft',
+		run: cursorCharLeft,
+		shift: selectCharLeft,
+		preventDefault: true,
+	},
+	{
+		key: 'Mod-ArrowLeft',
+		mac: 'Alt-ArrowLeft',
+		run: cursorGroupLeft,
+		shift: selectGroupLeft,
+	},
+	{
+		key: 'ArrowRight',
+		run: cursorCharRight,
+		shift: selectCharRight,
+		preventDefault: true,
+	},
+	{
+		key: 'Mod-ArrowRight',
+		mac: 'Alt-ArrowRight',
+		run: cursorGroupRight,
+		shift: selectGroupRight,
+	},
+
+	{
+		key: 'ArrowUp',
+		run: cursorLineUp,
+		shift: selectLineUp,
+		preventDefault: true,
+	},
+	{
+		key: 'ArrowDown',
+		run: cursorLineDown,
+		shift: selectLineDown,
+		preventDefault: true,
+	},
+
+	{
+		key: 'Home',
+		run: cursorLineBoundaryBackward,
+		shift: selectLineBoundaryBackward,
+	},
+	{
+		mac: 'Cmd-ArrowLeft',
+		run: cursorLineBoundaryBackward,
+		shift: selectLineBoundaryBackward,
+	},
+	{ key: 'Mod-Home', run: cursorDocStart, shift: selectDocStart },
+	{ mac: 'Cmd-ArrowUp', run: cursorDocStart, shift: selectDocStart },
+
+	{ key: 'PageUp', run: cursorPageUp, shift: selectPageUp },
+	{ mac: 'Ctrl-ArrowUp', run: cursorPageUp, shift: selectPageUp },
+
+	{ key: 'PageDown', run: cursorPageDown, shift: selectPageDown },
+	{ mac: 'Ctrl-ArrowDown', run: cursorPageDown, shift: selectPageDown },
+
+	{
+		key: 'End',
+		run: cursorLineBoundaryForward,
+		shift: selectLineBoundaryForward,
+	},
+	{
+		mac: 'Cmd-ArrowRight',
+		run: cursorLineBoundaryForward,
+		shift: selectLineBoundaryForward,
+	},
+
+	{
+		key: 'Mod-Alt-ArrowUp',
+		linux: 'Shift-Alt-ArrowUp',
+		run: addCursorUp,
+		preventDefault: true,
+	},
+	{
+		key: 'Mod-Alt-ArrowDown',
+		linux: 'Shift-Alt-ArrowDown',
+		run: addCursorDown,
+		preventDefault: true,
+	},
+
+	{
+		key: 'Shift-Alt-i',
+		run: addCursorAtEachSelectionLine,
+	},
+
+	{ key: 'Mod-End', run: cursorDocEnd, shift: selectDocEnd },
+	{ mac: 'Cmd-ArrowDown', run: cursorDocEnd, shift: selectDocEnd },
+
+	{ key: 'Mod-a', run: selectAll },
+	{ key: 'Backspace', run: deleteBracketPair },
+	{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
+	{ key: 'Delete', run: deleteCharForward },
+	{ key: 'Mod-Backspace', mac: 'Alt-Backspace', run: deleteGroupBackward },
+	{ key: 'Mod-Delete', mac: 'Alt-Delete', run: deleteGroupForward },
+	{ mac: 'Mod-Backspace', run: deleteToLineStart },
+	{ mac: 'Mod-Delete', run: deleteToLineEnd },
+
+	{
+		mac: 'Ctrl-b',
+		run: cursorCharLeft,
+		shift: selectCharLeft,
+		preventDefault: true,
+	},
+	{ mac: 'Ctrl-f', run: cursorCharRight, shift: selectCharRight },
+
+	{ mac: 'Ctrl-p', run: cursorLineUp, shift: selectLineUp },
+	{ mac: 'Ctrl-n', run: cursorLineDown, shift: selectLineDown },
+
+	{ mac: 'Ctrl-a', run: cursorLineStart, shift: selectLineStart },
+	{ mac: 'Ctrl-e', run: cursorLineEnd, shift: selectLineEnd },
+
+	{ mac: 'Ctrl-d', run: deleteCharForward },
+	{ mac: 'Ctrl-h', run: deleteCharBackward },
+	{ mac: 'Ctrl-k', run: deleteToLineEnd },
+	{ mac: 'Ctrl-Alt-h', run: deleteGroupBackward },
+
+	{ mac: 'Ctrl-o', run: splitLine },
+	{ mac: 'Ctrl-t', run: transposeChars },
+
+	{ mac: 'Ctrl-v', run: cursorPageDown },
+	{ mac: 'Alt-v', run: cursorPageUp },
+
+	{ key: 'Shift-Mod-k', run: deleteLine },
+	{ key: 'Alt-ArrowDown', run: moveLineDown },
+	{ key: 'Alt-ArrowUp', run: moveLineUp },
+	{ win: 'Shift-Alt-ArrowDown', mac: 'Shift-Alt-ArrowDown', run: copyLineDown },
+	{ win: 'Shift-Alt-ArrowUp', mac: 'Shift-Alt-ArrowUp', run: copyLineUp },
+
+	{ key: 'Mod-l', run: selectLine, preventDefault: true },
+	{ key: 'Shift-Mod-\\', run: cursorMatchingBracket },
+	{
+		any(view, event) {
+			if (
+				event.key === 'Tab' ||
+				(event.key === 'Escape' && completionStatus(view.state) !== null)
+			) {
+				event.stopPropagation();
+			}
+
+			return false;
+		},
+	},
+	{ key: 'Tab', run: indentMore, shift: indentLess, preventDefault: true },
+
+	{ key: 'Mod-[', run: indentLess },
+	{ key: 'Mod-]', run: indentMore },
+
+	{ key: 'Ctrl-Shift-[', mac: 'Cmd-Alt-[', run: foldCode },
+	{ key: 'Ctrl-Shift-]', mac: 'Cmd-Alt-]', run: unfoldCode },
+	{ key: 'Mod-k Mod-0', run: foldAll },
+	{ key: 'Mod-k Mod-j', run: unfoldAll },
+
+	{ key: 'Mod-k Mod-c', run: lineComment },
+	{ key: 'Mod-k Mod-u', run: lineUncomment },
+	{ key: 'Mod-/', run: toggleComment },
+	{ key: 'Shift-Alt-a', run: toggleBlockComment },
+
+	{ key: 'Mod-z', run: undo, preventDefault: true },
+	{ key: 'Mod-y', run: redo, preventDefault: true },
+	{ key: 'Mod-Shift-z', run: redo, preventDefault: true },
+	{ key: 'Mod-u', run: undoSelection, preventDefault: true },
+
+	{ key: 'Mod-Shift-m', run: openLintPanel },
+	{ key: 'F8', run: nextDiagnostic },
+	{ key: 'Shift-F8', run: previousDiagnostic },
+
+	{ key: 'Shift-Alt-f', linux: 'Ctrl-Shift-i', run: formatDocument },
 ];
diff --git a/packages/editor-ui/src/plugins/codemirror/multiCursor.ts b/packages/editor-ui/src/plugins/codemirror/multiCursor.ts
new file mode 100644
index 0000000000..f61b784486
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/multiCursor.ts
@@ -0,0 +1,52 @@
+import { EditorSelection } from '@codemirror/state';
+import type { Command } from '@codemirror/view';
+
+const createAddCursor =
+	(direction: 'up' | 'down'): Command =>
+	(view) => {
+		const forward = direction === 'down';
+
+		let selection = view.state.selection;
+
+		for (const r of selection.ranges) {
+			selection = selection.addRange(view.moveVertically(r, forward));
+		}
+
+		view.dispatch({ selection });
+
+		return true;
+	};
+
+export const addCursorUp = createAddCursor('up');
+export const addCursorDown = createAddCursor('down');
+
+export const addCursorAtEachSelectionLine: Command = (view) => {
+	let selection: EditorSelection | null = null;
+	for (const r of view.state.selection.ranges) {
+		if (r.empty) {
+			continue;
+		}
+
+		for (let pos = r.from; pos <= r.to; ) {
+			const line = view.state.doc.lineAt(pos);
+
+			const anchor = Math.min(line.to, r.to);
+
+			if (selection) {
+				selection = selection.addRange(EditorSelection.range(anchor, anchor));
+			} else {
+				selection = EditorSelection.single(anchor);
+			}
+
+			pos = line.to + 1;
+		}
+	}
+
+	if (!selection) {
+		return false;
+	}
+
+	view.dispatch({ selection });
+
+	return true;
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
new file mode 100644
index 0000000000..6a6cac8282
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
@@ -0,0 +1,94 @@
+import { escapeMappingString } from '@/utils/mappingUtils';
+import {
+	insertCompletionText,
+	pickedCompletion,
+	type Completion,
+	type CompletionSource,
+} from '@codemirror/autocomplete';
+import {
+	autocompletableNodeNames,
+	longestCommonPrefix,
+	prefixMatch,
+} from '../../completions/utils';
+import { typescriptWorkerFacet } from './facet';
+import { blockCommentSnippet, snippets } from './snippets';
+
+const START_CHARACTERS = ['"', "'", '(', '.', '@'];
+const START_CHARACTERS_REGEX = /[\.\(\'\"\@]/;
+
+export const typescriptCompletionSource: CompletionSource = async (context) => {
+	const { worker } = context.state.facet(typescriptWorkerFacet);
+
+	let word = context.matchBefore(START_CHARACTERS_REGEX);
+	if (!word?.text) {
+		word = context.matchBefore(/[\"\'].*/);
+	}
+	if (!word?.text) {
+		word = context.matchBefore(/[\$\w]+/);
+	}
+
+	const blockComment = context.matchBefore(/\/\*?\*?/);
+	if (blockComment) {
+		// Autocomplete a block comment snippet
+		return { from: blockComment?.from, options: [blockCommentSnippet] };
+	}
+
+	if (!word) return null;
+
+	const completionResult = await worker.getCompletionsAtPos(context.pos);
+
+	if (!completionResult || context.aborted) return null;
+
+	const { result, isGlobal } = completionResult;
+
+	let options = [...result.options];
+
+	if (isGlobal) {
+		options = options
+			.flatMap((opt) => {
+				if (opt.label === '$') {
+					return [
+						opt,
+						...autocompletableNodeNames().map((name) => ({
+							...opt,
+							label: `$('${escapeMappingString(name)}')`,
+						})),
+					];
+				}
+				return opt;
+			})
+			.concat(snippets);
+	}
+
+	return {
+		from: word ? (START_CHARACTERS.includes(word.text) ? word.to : word.from) : context.pos,
+		filter: false,
+		getMatch(completion: Completion) {
+			const lcp = longestCommonPrefix(completion.label, word.text);
+			return [0, lcp.length];
+		},
+		options: options
+			.filter(
+				(option) =>
+					word.text === '' ||
+					START_CHARACTERS.includes(word.text) ||
+					prefixMatch(
+						option.label.replace(START_CHARACTERS_REGEX, ''),
+						word.text.replace(START_CHARACTERS_REGEX, ''),
+					),
+			)
+			.map((completion) => {
+				if (completion.label.endsWith('()')) {
+					completion.apply = (view, _, from, to) => {
+						const cursorPosition = from + completion.label.length - 1;
+						view.dispatch({
+							...insertCompletionText(view.state, completion.label, from, to),
+							annotations: pickedCompletion.of(completion),
+							selection: { anchor: cursorPosition, head: cursorPosition },
+						});
+					};
+				}
+				return completion;
+			}),
+	};
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
new file mode 100644
index 0000000000..57bb2a2350
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
@@ -0,0 +1,12 @@
+import { Facet, combineConfig } from '@codemirror/state';
+import type { LanguageServiceWorker } from '../types';
+import type * as Comlink from 'comlink';
+
+export const typescriptWorkerFacet = Facet.define<
+	{ worker: Comlink.Remote<LanguageServiceWorker> },
+	{ worker: Comlink.Remote<LanguageServiceWorker> }
+>({
+	combine(configs) {
+		return combineConfig(configs, {});
+	},
+});
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
new file mode 100644
index 0000000000..30c1f177e1
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
@@ -0,0 +1,54 @@
+import type { hoverTooltip } from '@codemirror/view';
+import { typescriptWorkerFacet } from './facet';
+
+type HoverSource = Parameters<typeof hoverTooltip>[0];
+export const typescriptHoverTooltips: HoverSource = async (view, pos) => {
+	const { worker } = view.state.facet(typescriptWorkerFacet);
+
+	const info = await worker.getHoverTooltip(pos);
+
+	if (!info) return null;
+
+	return {
+		pos: info.start,
+		end: info.end,
+		above: true,
+		create: () => {
+			const div = document.createElement('div');
+			div.classList.add('cm-tooltip-lint');
+			const wrapper = document.createElement('div');
+			wrapper.classList.add('cm-diagnostic');
+			div.appendChild(wrapper);
+			const text = document.createElement('div');
+			text.classList.add('cm-diagnosticText');
+			wrapper.appendChild(text);
+
+			if (info.quickInfo?.displayParts) {
+				for (const part of info.quickInfo.displayParts) {
+					const span = text.appendChild(document.createElement('span'));
+					if (
+						part.kind === 'keyword' &&
+						['string', 'number', 'boolean', 'object'].includes(part.text)
+					) {
+						span.className = 'ts-primitive';
+					} else if (part.kind === 'punctuation' && ['(', ')'].includes(part.text)) {
+						span.className = 'ts-text';
+					} else {
+						span.className = `ts-${part.kind}`;
+					}
+					span.innerText = part.text;
+				}
+			}
+
+			const documentation = info.quickInfo?.documentation?.find((doc) => doc.kind === 'text')?.text;
+			if (documentation) {
+				const docElement = document.createElement('div');
+				docElement.classList.add('cm-diagnosticDocs');
+				docElement.textContent = documentation;
+				wrapper.appendChild(docElement);
+			}
+
+			return { dom: div };
+		},
+	};
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
new file mode 100644
index 0000000000..c0c4042aca
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
@@ -0,0 +1,11 @@
+import type { LintSource } from '@codemirror/lint';
+import { typescriptWorkerFacet } from './facet';
+
+export const typescriptLintSource: LintSource = async (view) => {
+	const { worker } = view.state.facet(typescriptWorkerFacet);
+	const docLength = view.state.doc.length;
+
+	return (await worker.getDiagnostics()).filter((diag) => {
+		return diag.from < docLength && diag.to <= docLength && diag.from >= 0;
+	});
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
new file mode 100644
index 0000000000..720e100249
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
@@ -0,0 +1,60 @@
+import { snippetCompletion } from '@codemirror/autocomplete';
+
+export const blockCommentSnippet = snippetCompletion('/**\n * #{}\n */', {
+	label: '/**',
+	detail: 'Block Comment',
+});
+
+export const snippets = [
+	snippetCompletion('console.log(#{})', { label: 'log', detail: 'Log to console' }),
+	snippetCompletion('for (const #{1:element} of #{2:array}) {\n\t#{}\n}', {
+		label: 'forof',
+		detail: 'For-of Loop',
+	}),
+	snippetCompletion(
+		'for (const #{1:key} in #{2:object}) {\n\tif (Object.prototype.hasOwnProperty.call(#{2:object}, #{1:key})) {\n\t\tconst #{3:element} = #{2:object}[#{1:key}];\n\t\t#{}\n\t}\n}',
+		{
+			label: 'forin',
+			detail: 'For-in Loop',
+		},
+	),
+	snippetCompletion(
+		'for (let #{1:index} = 0; #{1:index} < #{2:array}.length; #{1:index}++) {\n\tconst #{3:element} = #{2:array}[#{1:index}];\n\t#{}\n}',
+		{
+			label: 'for',
+			detail: 'For Loop',
+		},
+	),
+	snippetCompletion('if (#{1:condition}) {\n\t#{}\n}', {
+		label: 'if',
+		detail: 'If Statement',
+	}),
+	snippetCompletion('if (#{1:condition}) {\n\t#{}\n} else {\n\t\n}', {
+		label: 'ifelse',
+		detail: 'If-Else Statement',
+	}),
+	snippetCompletion('function #{1:name}(#{2:params}) {\n\t#{}\n}', {
+		label: 'function',
+		detail: 'Function Statement',
+	}),
+	snippetCompletion('function #{1:name}(#{2:params}) {\n\t#{}\n}', {
+		label: 'fn',
+		detail: 'Function Statement',
+	}),
+	snippetCompletion(
+		'switch (#{1:key}) {\n\tcase #{2:value}:\n\t\t#{}\n\t\tbreak;\n\tdefault:\n\t\tbreak;\n}',
+		{
+			label: 'switch',
+			detail: 'Switch Statement',
+		},
+	),
+	snippetCompletion('try {\n\t#{}\n} catch (#{1:error}) {\n\t\n}', {
+		label: 'trycatch',
+		detail: 'Try-Catch Statement',
+	}),
+	snippetCompletion('while (#{1:condition}) {\n\t#{}\n}', {
+		label: 'while',
+		detail: 'While Statement',
+	}),
+	blockCommentSnippet,
+];
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
new file mode 100644
index 0000000000..aef7eb5126
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
@@ -0,0 +1,131 @@
+import { useDataSchema } from '@/composables/useDataSchema';
+import { useDebounce } from '@/composables/useDebounce';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { autocompletableNodeNames } from '@/plugins/codemirror/completions/utils';
+import useEnvironmentsStore from '@/stores/environments.ee.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { forceParse } from '@/utils/forceParse';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { autocompletion } from '@codemirror/autocomplete';
+import { javascriptLanguage } from '@codemirror/lang-javascript';
+import { LanguageSupport } from '@codemirror/language';
+import { Text, type Extension } from '@codemirror/state';
+import { EditorView, hoverTooltip } from '@codemirror/view';
+import * as Comlink from 'comlink';
+import { NodeConnectionType, type CodeExecutionMode, type INodeExecutionData } from 'n8n-workflow';
+import { ref, toRef, toValue, watch, type MaybeRefOrGetter } from 'vue';
+import type { LanguageServiceWorker, RemoteLanguageServiceWorkerInit } from '../types';
+import { typescriptCompletionSource } from './completions';
+import { typescriptWorkerFacet } from './facet';
+import { typescriptHoverTooltips } from './hoverTooltip';
+import { linter } from '@codemirror/lint';
+import { typescriptLintSource } from './linter';
+
+export function useTypescript(
+	view: MaybeRefOrGetter<EditorView | undefined>,
+	mode: MaybeRefOrGetter<CodeExecutionMode>,
+	id: MaybeRefOrGetter<string>,
+) {
+	const { getInputDataWithPinned, getSchemaForExecutionData } = useDataSchema();
+	const ndvStore = useNDVStore();
+	const workflowsStore = useWorkflowsStore();
+	const { debounce } = useDebounce();
+	const activeNodeName = ndvStore.activeNodeName;
+	const worker = ref<Comlink.Remote<LanguageServiceWorker>>();
+
+	async function createWorker(): Promise<Extension> {
+		const { init } = Comlink.wrap<RemoteLanguageServiceWorkerInit>(
+			new Worker(new URL('../worker/typescript.worker.ts', import.meta.url), { type: 'module' }),
+		);
+		worker.value = await init(
+			{
+				id: toValue(id),
+				content: Comlink.proxy((toValue(view)?.state.doc ?? Text.empty).toJSON()),
+				allNodeNames: autocompletableNodeNames(),
+				variables: useEnvironmentsStore().variables.map((v) => v.key),
+				inputNodeNames: activeNodeName
+					? workflowsStore
+							.getCurrentWorkflow()
+							.getParentNodes(activeNodeName, NodeConnectionType.Main, 1)
+					: [],
+				mode: toValue(mode),
+			},
+			Comlink.proxy(async (nodeName) => {
+				const node = workflowsStore.getNodeByName(nodeName);
+
+				if (node) {
+					const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
+					const schema = getSchemaForExecutionData(executionDataToJson(inputData), true);
+					const execution = workflowsStore.getWorkflowExecution;
+					const binaryData = useNodeHelpers()
+						.getBinaryData(
+							execution?.data?.resultData?.runData ?? null,
+							node.name,
+							ndvStore.ndvInputRunIndex ?? 0,
+							0,
+						)
+						.filter((data) => Boolean(data && Object.keys(data).length));
+
+					return {
+						json: schema,
+						binary: Object.keys(binaryData.reduce((acc, obj) => ({ ...acc, ...obj }), {})),
+						params: getSchemaForExecutionData([node.parameters]),
+					};
+				}
+
+				return undefined;
+			}),
+		);
+
+		const editor = toValue(view);
+
+		if (editor) {
+			forceParse(editor);
+		}
+
+		return [
+			typescriptWorkerFacet.of({ worker: worker.value }),
+			new LanguageSupport(javascriptLanguage, [
+				javascriptLanguage.data.of({ autocomplete: typescriptCompletionSource }),
+			]),
+			autocompletion({ icons: false, aboveCursor: true }),
+			linter(typescriptLintSource),
+			hoverTooltip(typescriptHoverTooltips, {
+				hideOnChange: true,
+				hoverTime: 500,
+			}),
+			EditorView.updateListener.of(async (update) => {
+				if (update.docChanged) {
+					void worker.value?.updateFile(update.changes.toJSON());
+				}
+			}),
+		];
+	}
+
+	async function onWorkflowDataChange() {
+		const editor = toValue(view);
+		if (!editor || !worker.value) return;
+
+		await worker.value.updateNodeTypes();
+
+		forceParse(editor);
+	}
+
+	watch(
+		[() => workflowsStore.getWorkflowExecution, () => workflowsStore.getWorkflowRunData],
+		debounce(onWorkflowDataChange, { debounceTime: 200, trailing: true }),
+	);
+
+	watch(toRef(mode), async (newMode) => {
+		const editor = toValue(view);
+		if (!editor || !worker.value) return;
+
+		await worker.value.updateMode(newMode);
+		forceParse(editor);
+	});
+
+	return {
+		createWorker,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/types.ts b/packages/editor-ui/src/plugins/codemirror/typescript/types.ts
new file mode 100644
index 0000000000..ab795f7401
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/types.ts
@@ -0,0 +1,49 @@
+import type { Schema } from '@/Interface';
+import type { CompletionResult } from '@codemirror/autocomplete';
+import type { Diagnostic } from '@codemirror/lint';
+import type { CodeExecutionMode } from 'n8n-workflow';
+import type ts from 'typescript';
+import type * as Comlink from 'comlink';
+import type { ChangeSet } from '@codemirror/state';
+
+export interface HoverInfo {
+	start: number;
+	end: number;
+	typeDef?: readonly ts.DefinitionInfo[];
+	quickInfo: ts.QuickInfo | undefined;
+}
+
+export type WorkerInitOptions = {
+	id: string;
+	content: string[];
+	allNodeNames: string[];
+	inputNodeNames: string[];
+	variables: string[];
+	mode: CodeExecutionMode;
+};
+
+export type NodeData = { json: Schema | undefined; binary: string[]; params: Schema };
+export type NodeDataFetcher = (nodeName: string) => Promise<NodeData | undefined>;
+
+export type LanguageServiceWorker = {
+	updateFile(changes: ChangeSet): void;
+	updateMode(mode: CodeExecutionMode): void;
+	updateNodeTypes(): void;
+	getCompletionsAtPos(pos: number): Promise<{ result: CompletionResult; isGlobal: boolean } | null>;
+	getDiagnostics(): Diagnostic[];
+	getHoverTooltip(pos: number): HoverInfo | null;
+};
+
+export type LanguageServiceWorkerInit = {
+	init(
+		options: WorkerInitOptions,
+		nodeDataFetcher: NodeDataFetcher,
+	): Promise<LanguageServiceWorker>;
+};
+
+export type RemoteLanguageServiceWorkerInit = {
+	init(
+		options: WorkerInitOptions,
+		nodeDataFetcher: NodeDataFetcher,
+	): Comlink.Remote<LanguageServiceWorker>;
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
new file mode 100644
index 0000000000..1a516c3bb7
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
@@ -0,0 +1,130 @@
+export type IndexedDbCache = Awaited<ReturnType<typeof indexedDbCache>>;
+
+export async function indexedDbCache(dbName: string, storeName: string) {
+	let cache: Record<string, string> = {};
+
+	void (await loadCache());
+
+	async function loadCache() {
+		await transaction('readonly', async (store, db) => {
+			return await new Promise<void>((resolve, reject) => {
+				const request = store.openCursor();
+
+				request.onsuccess = (event) => {
+					const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result;
+
+					if (cursor) {
+						cache[cursor.key as string] = cursor.value.value;
+						cursor.continue();
+					} else {
+						db.close();
+						resolve();
+					}
+				};
+
+				request.onerror = (event) => {
+					db.close();
+					reject(event);
+				};
+			});
+		});
+	}
+
+	async function openDb(): Promise<IDBDatabase> {
+		return await new Promise((resolve, reject) => {
+			const request = indexedDB.open(dbName, 1);
+			request.onupgradeneeded = () => {
+				request.result.createObjectStore(storeName, { keyPath: 'key' });
+			};
+			request.onsuccess = () => resolve(request.result);
+			request.onerror = () => reject(request.error);
+		});
+	}
+
+	function setItem(key: string, value: string): void {
+		cache[key] = value;
+		void persistToIndexedDB(key, value);
+	}
+
+	function getItem(key: string): string | null {
+		return cache[key] ?? null;
+	}
+
+	function removeItem(key: string): void {
+		delete cache[key];
+		void deleteFromIndexedDB(key);
+	}
+
+	function clear(): void {
+		cache = {};
+		void clearIndexedDB();
+	}
+
+	async function getAllWithPrefix(prefix: string) {
+		const keyRange = IDBKeyRange.bound(prefix, prefix + '\uffff', false, false);
+
+		const results: Record<string, string> = {};
+		return await transaction('readonly', async (store) => {
+			return await new Promise<Record<string, string>>((resolve, reject) => {
+				const request = store.openCursor(keyRange);
+
+				request.onsuccess = (event) => {
+					const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result;
+
+					if (cursor) {
+						results[cursor.key as string] = cursor.value.value;
+						cursor.continue();
+					} else {
+						resolve(results);
+					}
+				};
+
+				request.onerror = () => {
+					reject(request.error);
+				};
+			});
+		});
+	}
+
+	async function transaction<T>(
+		mode: 'readonly' | 'readwrite',
+		action: (store: IDBObjectStore, db: IDBDatabase) => Promise<T> | T,
+	): Promise<T> {
+		const db = await openDb();
+		const tx = db.transaction(storeName, mode);
+		const store = tx.objectStore(storeName);
+
+		const result = await action(store, db);
+
+		return await new Promise<T>((resolve, reject) => {
+			tx.oncomplete = () => {
+				db.close();
+				resolve(result);
+			};
+			tx.onerror = () => {
+				db.close();
+				reject(tx.error);
+			};
+		});
+	}
+
+	async function persistToIndexedDB(key: string, value: string) {
+		await transaction('readwrite', (store) => {
+			store.put({ key, value });
+		});
+	}
+
+	async function deleteFromIndexedDB(key: string) {
+		await transaction('readwrite', (store) => {
+			store.delete(key);
+		});
+	}
+
+	async function clearIndexedDB() {
+		await transaction('readwrite', (store) => {
+			store.clear();
+		});
+	}
+
+	return { getItem, removeItem, setItem, clear, getAllWithPrefix };
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
new file mode 100644
index 0000000000..1a634397cf
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
@@ -0,0 +1,60 @@
+import type * as tsvfs from '@typescript/vfs';
+import type ts from 'typescript';
+
+import { type Completion } from '@codemirror/autocomplete';
+import { TS_COMPLETE_BLOCKLIST, TYPESCRIPT_AUTOCOMPLETE_THRESHOLD } from './constants';
+
+function convertTsKindtoEditorCompletionType(kind: ts.ScriptElementKind) {
+	if (!kind) return undefined;
+
+	const type = String(kind);
+	if (type === 'member') return 'property';
+
+	return type;
+}
+
+function typescriptCompletionToEditor(
+	completionInfo: ts.WithMetadata<ts.CompletionInfo>,
+	entry: ts.CompletionEntry,
+): Completion {
+	const boost = -Number(entry.sortText) || 0;
+	const type = convertTsKindtoEditorCompletionType(entry.kind);
+
+	return {
+		label: type && ['method', 'function'].includes(type) ? entry.name + '()' : entry.name,
+		type: convertTsKindtoEditorCompletionType(entry.kind),
+		commitCharacters: entry.commitCharacters ?? completionInfo.defaultCommitCharacters,
+		detail: entry.labelDetails?.detail,
+		boost,
+	};
+}
+
+function filterTypescriptCompletions(
+	completionInfo: ts.WithMetadata<ts.CompletionInfo>,
+	entry: ts.CompletionEntry,
+) {
+	return (
+		!TS_COMPLETE_BLOCKLIST.includes(entry.kind) &&
+		(entry.sortText < TYPESCRIPT_AUTOCOMPLETE_THRESHOLD ||
+			completionInfo.optionalReplacementSpan?.length)
+	);
+}
+
+export async function getCompletionsAtPos({
+	pos,
+	fileName,
+	env,
+}: { pos: number; fileName: string; env: tsvfs.VirtualTypeScriptEnvironment }) {
+	const completionInfo = env.languageService.getCompletionsAtPosition(fileName, pos, {}, {});
+
+	if (!completionInfo) return null;
+
+	const options = completionInfo.entries
+		.filter((entry) => filterTypescriptCompletions(completionInfo, entry))
+		.map((entry) => typescriptCompletionToEditor(completionInfo, entry));
+
+	return {
+		result: { from: pos, options },
+		isGlobal: completionInfo.isGlobalCompletion,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
new file mode 100644
index 0000000000..215d7a2544
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
@@ -0,0 +1,26 @@
+import ts from 'typescript';
+
+export const TS_COMPLETE_BLOCKLIST: ts.ScriptElementKind[] = [ts.ScriptElementKind.warning];
+export const COMPILER_OPTIONS: ts.CompilerOptions = {
+	allowJs: true,
+	checkJs: true,
+	target: ts.ScriptTarget.ESNext,
+	lib: ['es2023'],
+	module: ts.ModuleKind.ESNext,
+	strict: true,
+	noUnusedLocals: true,
+	noUnusedParameters: true,
+	importHelpers: false,
+	skipDefaultLibCheck: true,
+	noEmit: true,
+};
+export const TYPESCRIPT_AUTOCOMPLETE_THRESHOLD = '15';
+export const TYPESCRIPT_FILES = {
+	DYNAMIC_TYPES: 'n8n-dynamic.d.ts',
+	DYNAMIC_INPUT_TYPES: 'n8n-dynamic-input.d.ts',
+	DYNAMIC_VARIABLES_TYPES: 'n8n-variables.d.ts',
+	MODE_TYPES: 'n8n-mode-specific.d.ts',
+	N8N_TYPES: 'n8n.d.ts',
+	GLOBAL_TYPES: 'globals.d.ts',
+};
+export const LUXON_VERSION = '3.2.0';
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
new file mode 100644
index 0000000000..668a86d4c6
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
@@ -0,0 +1,66 @@
+import { schemaToTypescriptTypes } from './dynamicTypes';
+
+describe('typescript worker dynamicTypes', () => {
+	describe('schemaToTypescriptTypes', () => {
+		it('should convert a schema to a typescript type', () => {
+			expect(
+				schemaToTypescriptTypes(
+					{
+						type: 'object',
+						value: [
+							{
+								key: 'test',
+								type: 'string',
+								value: '',
+								path: '.test',
+							},
+							{
+								type: 'object',
+								key: 'nested',
+								path: '.nested',
+								value: [
+									{
+										key: 'amount',
+										type: 'number',
+										value: '',
+										path: '.amount',
+									},
+								],
+							},
+							{
+								type: 'array',
+								key: 'nestedArray',
+								path: '.nestedArray',
+								value: [
+									{
+										type: 'object',
+										key: 'nested',
+										path: '.nestedArray.nested',
+										value: [
+											{
+												key: 'amount',
+												type: 'number',
+												value: '',
+												path: '.amount',
+											},
+										],
+									},
+								],
+							},
+						],
+						path: '',
+					},
+					'NodeName_1',
+				),
+			).toEqual(`interface NodeName_1 {
+  test: string;
+  nested: {
+  amount: number;
+};
+  nestedArray: Array<{
+  amount: number;
+}>;
+}`);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
new file mode 100644
index 0000000000..0991472246
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
@@ -0,0 +1,91 @@
+import type { Schema } from '@/Interface';
+import { pascalCase } from 'change-case';
+import { globalTypeDefinition } from './utils';
+
+function processSchema(schema: Schema): string {
+	switch (schema.type) {
+		case 'string':
+		case 'number':
+		case 'boolean':
+		case 'bigint':
+		case 'symbol':
+		case 'null':
+		case 'undefined':
+			return schema.type;
+
+		case 'function':
+			return 'Function';
+
+		case 'array':
+			if (Array.isArray(schema.value)) {
+				if (schema.value.length > 0) {
+					return `Array<${processSchema(schema.value[0])}>`;
+				}
+				return 'any[]';
+			}
+
+			return `${schema.value}[]`;
+
+		case 'object':
+			if (!Array.isArray(schema.value)) {
+				return '{}';
+			}
+
+			const properties = schema.value
+				.map((prop) => {
+					const key = prop.key ?? 'unknown';
+					const type = processSchema(prop);
+					return `  ${key}: ${type};`;
+				})
+				.join('\n');
+
+			return `{\n${properties}\n}`;
+
+		default:
+			return 'any';
+	}
+}
+
+export function schemaToTypescriptTypes(schema: Schema, interfaceName: string): string {
+	return `interface ${interfaceName} ${processSchema(schema)}`;
+}
+
+export async function getDynamicNodeTypes({
+	nodeNames,
+	loadedNodes,
+}: { nodeNames: string[]; loadedNodes: Map<string, { type: string; typeName: string }> }) {
+	return globalTypeDefinition(`
+type NodeName = ${nodeNames.map((name) => `'${name}'`).join(' | ')};
+
+${Array.from(loadedNodes.values())
+	.map(({ type }) => type)
+	.join(';\n')}
+
+interface NodeDataMap {
+    ${Array.from(loadedNodes.entries())
+			.map(
+				([nodeName, { typeName }]) =>
+					`'${nodeName}': NodeData<${typeName}Context, ${typeName}Json, ${typeName}BinaryKeys, ${typeName}Params>`,
+			)
+			.join(';\n')}
+}
+`);
+}
+
+export async function getDynamicInputNodeTypes(inputNodeNames: string[]) {
+	const typeNames = inputNodeNames.map((nodeName) => pascalCase(nodeName));
+
+	return globalTypeDefinition(`
+type N8nInputJson = ${typeNames.map((typeName) => `${typeName}Json`).join(' | ')};
+type N8nInputBinaryKeys = ${typeNames.map((typeName) => `${typeName}BinaryKeys`).join(' | ')};
+type N8nInputContext = ${typeNames.map((typeName) => `${typeName}Context`).join(' | ')};
+type N8nInputParams = ${typeNames.map((typeName) => `${typeName}Params`).join(' | ')};
+`);
+}
+
+export async function getDynamicVariableTypes(variables: string[]) {
+	return globalTypeDefinition(`
+	interface N8nVars {
+	${variables.map((key) => `${key}: string;`).join('\n')}
+}`);
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
new file mode 100644
index 0000000000..e746f2a853
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
@@ -0,0 +1,60 @@
+import * as tsvfs from '@typescript/vfs';
+import { COMPILER_OPTIONS, TYPESCRIPT_FILES } from './constants';
+import ts from 'typescript';
+import type { IndexedDbCache } from './cache';
+
+import globalTypes from './type-declarations/globals.d.ts?raw';
+import n8nTypes from './type-declarations/n8n.d.ts?raw';
+
+import type { CodeExecutionMode } from 'n8n-workflow';
+import { wrapInFunction } from './utils';
+
+type EnvOptions = {
+	code: {
+		content: string;
+		fileName: string;
+	};
+	mode: CodeExecutionMode;
+	cache: IndexedDbCache;
+};
+
+export function removeUnusedLibs(fsMap: Map<string, string>) {
+	for (const [name] of fsMap.entries()) {
+		if (
+			name === 'lib.d.ts' ||
+			name.startsWith('/lib.dom') ||
+			name.startsWith('/lib.webworker') ||
+			name.startsWith('/lib.scripthost') ||
+			name.endsWith('.full.d.ts')
+		) {
+			fsMap.delete(name);
+		}
+	}
+}
+
+export async function setupTypescriptEnv({ cache, code, mode }: EnvOptions) {
+	const fsMap = await tsvfs.createDefaultMapFromCDN(
+		COMPILER_OPTIONS,
+		ts.version,
+		true,
+		ts,
+		undefined,
+		undefined,
+		cache,
+	);
+
+	removeUnusedLibs(fsMap);
+
+	fsMap.set(TYPESCRIPT_FILES.N8N_TYPES, n8nTypes);
+	fsMap.set(TYPESCRIPT_FILES.GLOBAL_TYPES, globalTypes);
+
+	fsMap.set(code.fileName, wrapInFunction(code.content, mode));
+
+	const system = tsvfs.createSystem(fsMap);
+	return tsvfs.createVirtualTypeScriptEnvironment(
+		system,
+		Array.from(fsMap.keys()),
+		ts,
+		COMPILER_OPTIONS,
+	);
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
new file mode 100644
index 0000000000..e6a5c9ff2f
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
@@ -0,0 +1,24 @@
+import type * as tsvfs from '@typescript/vfs';
+
+export function getHoverTooltip({
+	pos,
+	fileName,
+	env,
+}: { pos: number; fileName: string; env: tsvfs.VirtualTypeScriptEnvironment }) {
+	const quickInfo = env.languageService.getQuickInfoAtPosition(fileName, pos);
+
+	if (!quickInfo) return null;
+
+	const start = quickInfo.textSpan.start;
+
+	const typeDef =
+		env.languageService.getTypeDefinitionAtPosition(fileName, pos) ??
+		env.languageService.getDefinitionAtPosition(fileName, pos);
+
+	return {
+		start,
+		end: start + quickInfo.textSpan.length,
+		typeDef,
+		quickInfo,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
new file mode 100644
index 0000000000..c53774cbfe
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
@@ -0,0 +1,111 @@
+import type { Diagnostic } from '@codemirror/lint';
+import type * as tsvfs from '@typescript/vfs';
+import ts from 'typescript';
+import type { DiagnosticWithLocation } from 'typescript';
+
+/**
+ * TypeScript has a set of diagnostic categories,
+ * which maps roughly onto CodeMirror's categories.
+ * Here, we do the mapping.
+ */
+export function tsCategoryToSeverity(
+	diagnostic: Pick<ts.DiagnosticWithLocation, 'category' | 'code'>,
+): Diagnostic['severity'] {
+	switch (diagnostic.code) {
+		case 6133:
+			// No unused variables
+			return 'warning';
+		case 7027:
+			// Unreachable code detected
+			return 'warning';
+		default: {
+			switch (diagnostic.category) {
+				case ts.DiagnosticCategory.Error:
+					return 'error';
+				case ts.DiagnosticCategory.Message:
+					return 'info';
+				case ts.DiagnosticCategory.Warning:
+					return 'warning';
+				case ts.DiagnosticCategory.Suggestion:
+					return 'info';
+			}
+		}
+	}
+}
+
+/**
+ * Not all TypeScript diagnostic relate to specific
+ * ranges in source code: here we filter for those that
+ * do.
+ */
+function isDiagnosticWithLocation(
+	diagnostic: ts.Diagnostic,
+): diagnostic is ts.DiagnosticWithLocation {
+	return !!(
+		diagnostic.file &&
+		typeof diagnostic.start === 'number' &&
+		typeof diagnostic.length === 'number'
+	);
+}
+
+function isIgnoredDiagnostic(diagnostic: ts.Diagnostic) {
+	// No implicit any
+	return diagnostic.code === 7006;
+}
+
+/**
+ * Get the message for a diagnostic. TypeScript
+ * is kind of weird: messageText might have the message,
+ * or a pointer to the message. This follows the chain
+ * to get a string, regardless of which case we're in.
+ */
+function tsDiagnosticMessage(diagnostic: Pick<ts.Diagnostic, 'messageText'>): string {
+	if (typeof diagnostic.messageText === 'string') {
+		return diagnostic.messageText;
+	}
+	// TODO: go through linked list
+	return diagnostic.messageText.messageText;
+}
+
+function tsDiagnosticClassName(diagnostic: ts.Diagnostic) {
+	switch (diagnostic.code) {
+		case 6133:
+			// No unused variables
+			return 'cm-faded';
+		default:
+			return undefined;
+	}
+}
+
+function convertTSDiagnosticToCM(d: ts.DiagnosticWithLocation): Diagnostic {
+	const start = d.start;
+	const message = tsDiagnosticMessage(d);
+
+	return {
+		from: start,
+		to: start + d.length,
+		message,
+		markClass: tsDiagnosticClassName(d),
+		severity: tsCategoryToSeverity(d),
+	};
+}
+
+export function getDiagnostics({
+	env,
+	fileName,
+}: { env: tsvfs.VirtualTypeScriptEnvironment; fileName: string }) {
+	const exists = env.getSourceFile(fileName);
+	if (!exists) return [];
+
+	const tsDiagnostics = [
+		...env.languageService.getSemanticDiagnostics(fileName),
+		...env.languageService.getSyntacticDiagnostics(fileName),
+	];
+
+	const diagnostics = tsDiagnostics.filter(
+		(diagnostic): diagnostic is DiagnosticWithLocation =>
+			isDiagnosticWithLocation(diagnostic) && !isIgnoredDiagnostic(diagnostic),
+	);
+
+	return diagnostics.map((d) => convertTSDiagnosticToCM(d));
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
new file mode 100644
index 0000000000..a1eadf750c
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
@@ -0,0 +1,60 @@
+type NPMTreeMeta = {
+	default: string;
+	files: Array<{ name: string }>;
+	moduleName: string;
+	version: string;
+};
+
+const jsDelivrApi = {
+	async getFileTree(packageName: string, version = 'latest'): Promise<NPMTreeMeta> {
+		const url = `https://data.jsdelivr.com/v1/package/npm/${packageName}@${version}/flat`;
+		const res = await fetch(url);
+		return await res.json();
+	},
+	async getFileContent(packageName: string, fileName: string, version = 'latest'): Promise<string> {
+		const url = `https://cdn.jsdelivr.net/npm/${packageName}@${version}${fileName}`;
+		const res = await fetch(url);
+		return await res.text();
+	},
+};
+
+function isRequiredTypePackageFile(fileName: string) {
+	return fileName.endsWith('.d.ts') || fileName === '/package.json';
+}
+
+function toLocalFilePath(packageName: string, fileName: string) {
+	return `/node_modules/@types/${packageName}${fileName}`;
+}
+
+export const loadTypes = async (
+	packageName: string,
+	version: string,
+	onFileReceived: (path: string, content: string) => void,
+): Promise<void> => {
+	const { files } = await loadTypesFileTree(packageName, version);
+	await Promise.all(
+		files
+			.filter((file) => isRequiredTypePackageFile(file.name))
+			.map(
+				async (file) =>
+					await loadFileContent(packageName, file.name, version).then((content) =>
+						onFileReceived(toLocalFilePath(packageName, file.name), content),
+					),
+			),
+	);
+};
+
+export const loadTypesFileTree = async (
+	packageName: string,
+	version: string,
+): Promise<NPMTreeMeta> => {
+	return await jsDelivrApi.getFileTree(`@types/${packageName}`, version);
+};
+
+export const loadFileContent = async (
+	packageName: string,
+	fileName: string,
+	version = 'latest',
+) => {
+	return await jsDelivrApi.getFileContent(`@types/${packageName}`, fileName, version);
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
new file mode 100644
index 0000000000..4ea8fc639b
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
@@ -0,0 +1,16 @@
+export {};
+
+import luxon from 'luxon';
+
+declare global {
+	const DateTime: typeof luxon.DateTime;
+	type DateTime = luxon.DateTime;
+
+	/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/console) */
+	interface Console {
+		/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/log_static) */
+		log(...data: any[]): void;
+	}
+
+	var console: Console;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
new file mode 100644
index 0000000000..fd6f13ee3d
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
@@ -0,0 +1,15 @@
+export {};
+
+declare global {
+	interface NodeData<C = any, J extends N8nJson = any, B extends string = string, P = any> {
+		context: C;
+		params: P;
+		all(branchIndex?: number, runIndex?: number): Array<N8nItem<J, B>>;
+		first(branchIndex?: number, runIndex?: number): N8nItem<J, B>;
+		last(branchIndex?: number, runIndex?: number): N8nItem<J, B>;
+		itemMatching(itemIndex: number): N8nItem<J, B>;
+	}
+
+	// @ts-expect-error N8nInputJson is populated dynamically
+	type N8nInput = NodeData<N8nInputContext, N8nInputJson, N8nInputBinaryKeys, N8nInputParams>;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
new file mode 100644
index 0000000000..b1d6f6ddf1
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
@@ -0,0 +1,16 @@
+export {};
+
+declare global {
+	interface NodeData<C, J extends N8nJson, B extends string, P> {
+		context: C;
+		item: N8nItem<J, B>;
+		params: P;
+	}
+
+	// @ts-expect-error N8nInputJson is populated dynamically
+	type N8nInput = NodeData<{}, N8nInputJson, {}, {}>;
+
+	const $itemIndex: number;
+	const $json: N8nInput['item']['json'];
+	const $binary: N8nInput['item']['binary'];
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
new file mode 100644
index 0000000000..c211470bf7
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
@@ -0,0 +1,103 @@
+import type { DateTime } from 'luxon';
+
+export {};
+
+declare global {
+	type OutputItemWithoutJsonKey = {
+		[key: string]: unknown;
+	} & { json?: never };
+
+	type OutputItemWithJsonKey = {
+		json: {
+			[key: string]: unknown;
+		};
+	};
+
+	type MaybePromise<T> = Promise<T> | T;
+
+	type OneOutputItem = OutputItemWithJsonKey | OutputItemWithoutJsonKey;
+	type AllOutputItems = OneOutputItem | Array<OneOutputItem>;
+
+	type N8nOutputItem = MaybePromise<OneOutputItem>;
+	type N8nOutputItems = MaybePromise<AllOutputItems>;
+
+	interface N8nJson {
+		[key: string]: any;
+	}
+
+	interface N8nBinary {
+		id: string;
+		fileName: string;
+		fileExtension: string;
+		fileType: string;
+		fileSize: string;
+		mimeType: string;
+	}
+
+	interface N8nVars {}
+
+	// TODO: populate dynamically
+	interface N8nParameter {}
+
+	interface N8nItem<J extends N8nJson = N8nJson, B extends string = string> {
+		json: J & N8nJson;
+		binary: Record<B, N8nBinary>;
+	}
+
+	interface N8nCustomData {
+		set(key: string, value: string): void;
+		get(key: string): string;
+		getAll(): Record<string, string>;
+		setAll(values: Record<string, string>): void;
+	}
+
+	type N8nExecutionMode = 'test' | 'production';
+	interface N8nExecution {
+		id: string;
+		mode: N8nExecutionMode;
+		resumeUrl?: string;
+		resumeFormUrl?: string;
+		customData: N8nCustomData;
+	}
+
+	interface N8nWorkflow {
+		id: string;
+		active: boolean;
+		name: string;
+	}
+
+	interface N8nPrevNode {
+		name: string;
+		outputIndex: number;
+		runIndex: number;
+	}
+
+	const $input: N8nInput;
+	const $execution: N8nExecution;
+	const $workflow: N8nWorkflow;
+	const $prevNode: N8nPrevNode;
+	const $runIndex: number;
+	const $now: DateTime;
+	const $today: DateTime;
+
+	const $parameter: N8nInput['params'];
+	const $vars: N8nVars;
+	const $nodeVersion: number;
+
+	function $jmespath(object: Object | Array<any>, expression: string): any;
+	function $if<B extends boolean, T, F>(
+		condition: B,
+		valueIfTrue: T,
+		valueIfFalse: F,
+	): B extends true ? T : T extends false ? F : T | F;
+	function $ifEmpty<V, E>(value: V, valueIfEmpty: E): V | E;
+	function $min(...numbers: number[]): number;
+	function $max(...numbers: number[]): number;
+
+	type SomeOtherString = string & NonNullable<unknown>;
+	// @ts-expect-error NodeName is created dynamically
+	function $<K extends NodeName>(
+		nodeName: K | SomeOtherString,
+		// @ts-expect-error NodeDataMap is created dynamically
+	): K extends keyof NodeDataMap ? NodeDataMap[K] : NodeData;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
new file mode 100644
index 0000000000..a6467d1cfd
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
@@ -0,0 +1,224 @@
+import * as Comlink from 'comlink';
+import type { LanguageServiceWorker, LanguageServiceWorkerInit } from '../types';
+import { indexedDbCache } from './cache';
+import { bufferChangeSets, fnPrefix } from './utils';
+
+import type { CodeExecutionMode } from 'n8n-workflow';
+
+import { pascalCase } from 'change-case';
+import { computed, reactive, ref, watch } from 'vue';
+import { getCompletionsAtPos } from './completions';
+import { LUXON_VERSION, TYPESCRIPT_FILES } from './constants';
+import {
+	getDynamicInputNodeTypes,
+	getDynamicNodeTypes,
+	getDynamicVariableTypes,
+	schemaToTypescriptTypes,
+} from './dynamicTypes';
+import { setupTypescriptEnv } from './env';
+import { getHoverTooltip } from './hoverTooltip';
+import { getDiagnostics } from './linter';
+import { getUsedNodeNames } from './typescriptAst';
+
+import runOnceForAllItemsTypes from './type-declarations/n8n-once-for-all-items.d.ts?raw';
+import runOnceForEachItemTypes from './type-declarations/n8n-once-for-each-item.d.ts?raw';
+import { loadTypes } from './npmTypesLoader';
+import { ChangeSet, Text } from '@codemirror/state';
+import { until } from '@vueuse/core';
+
+self.process = { env: {} } as NodeJS.Process;
+
+const worker: LanguageServiceWorkerInit = {
+	async init(options, nodeDataFetcher) {
+		const loadedNodeTypesMap: Map<string, { type: string; typeName: string }> = reactive(new Map());
+
+		const inputNodeNames = options.inputNodeNames;
+		const allNodeNames = options.allNodeNames;
+		const codeFileName = `${options.id}.js`;
+		const mode = ref<CodeExecutionMode>(options.mode);
+		const busyApplyingChangesToCode = ref(false);
+
+		const cache = await indexedDbCache('typescript-cache', 'fs-map');
+		const env = await setupTypescriptEnv({
+			cache,
+			mode: mode.value,
+			code: { content: Text.of(options.content).toString(), fileName: codeFileName },
+		});
+
+		const prefix = computed(() => fnPrefix(mode.value));
+
+		function editorPositionToTypescript(pos: number) {
+			return pos + prefix.value.length;
+		}
+
+		function typescriptPositionToEditor(pos: number) {
+			return pos - prefix.value.length;
+		}
+
+		async function loadNodeTypes(nodeName: string) {
+			const data = await nodeDataFetcher(nodeName);
+
+			const typeName = pascalCase(nodeName);
+			const jsonType = data?.json
+				? schemaToTypescriptTypes(data.json, `${typeName}Json`)
+				: `type ${typeName}Json = N8nJson`;
+			const paramsType = data?.params
+				? schemaToTypescriptTypes(data.params, `${typeName}Params`)
+				: `type ${typeName}Params = {}`;
+
+			// Using || on purpose to handle empty string
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			const binaryType = `type ${typeName}BinaryKeys = ${data?.binary.map((key) => `'${key}'`).join(' | ') || 'string'}`;
+			const contextType = `type ${typeName}Context = {}`;
+			const type = [jsonType, binaryType, paramsType, contextType].join('\n');
+			loadedNodeTypesMap.set(nodeName, { type, typeName });
+		}
+
+		async function loadTypesIfNeeded() {
+			const file = env.getSourceFile(codeFileName);
+
+			if (!file) return;
+
+			const nodeNames = await getUsedNodeNames(file);
+
+			for (const nodeName of nodeNames) {
+				if (!loadedNodeTypesMap.has(nodeName)) {
+					await loadNodeTypes(nodeName);
+				}
+			}
+		}
+
+		async function loadLuxonTypes() {
+			if (cache.getItem('/node_modules/@types/luxon/package.json')) {
+				const fileMap = await cache.getAllWithPrefix('/node_modules/@types/luxon');
+
+				for (const [path, content] of Object.entries(fileMap)) {
+					updateFile(path, content);
+				}
+			} else {
+				await loadTypes('luxon', LUXON_VERSION, (path, types) => {
+					cache.setItem(path, types);
+					updateFile(path, types);
+				});
+			}
+		}
+
+		async function setVariableTypes() {
+			updateFile(
+				TYPESCRIPT_FILES.DYNAMIC_VARIABLES_TYPES,
+				await getDynamicVariableTypes(options.variables),
+			);
+		}
+
+		function updateFile(fileName: string, content: string) {
+			const exists = env.getSourceFile(fileName);
+			if (exists) {
+				env.updateFile(fileName, content);
+			} else {
+				env.createFile(fileName, content);
+			}
+		}
+
+		const loadInputNodes = options.inputNodeNames.map(
+			async (nodeName) => await loadNodeTypes(nodeName),
+		);
+		await Promise.all(
+			loadInputNodes.concat(loadTypesIfNeeded(), loadLuxonTypes(), setVariableTypes()),
+		);
+
+		watch(
+			loadedNodeTypesMap,
+			async (loadedNodes) => {
+				updateFile(
+					TYPESCRIPT_FILES.DYNAMIC_INPUT_TYPES,
+					await getDynamicInputNodeTypes(inputNodeNames),
+				);
+				updateFile(
+					TYPESCRIPT_FILES.DYNAMIC_TYPES,
+					await getDynamicNodeTypes({ nodeNames: allNodeNames, loadedNodes }),
+				);
+			},
+			{ immediate: true },
+		);
+
+		watch(
+			mode,
+			(newMode) => {
+				updateFile(
+					TYPESCRIPT_FILES.MODE_TYPES,
+					newMode === 'runOnceForAllItems' ? runOnceForAllItemsTypes : runOnceForEachItemTypes,
+				);
+			},
+			{ immediate: true },
+		);
+
+		watch(prefix, (newPrefix, oldPrefix) => {
+			env.updateFile(codeFileName, newPrefix, { start: 0, length: oldPrefix.length });
+		});
+
+		const applyChangesToCode = bufferChangeSets((bufferedChanges) => {
+			bufferedChanges.iterChanges((start, end, _fromNew, _toNew, text) => {
+				const length = end - start;
+
+				env.updateFile(codeFileName, text.toString(), {
+					start: editorPositionToTypescript(start),
+					length,
+				});
+			});
+
+			void loadTypesIfNeeded();
+		});
+
+		const waitForChangesAppliedToCode = async () => {
+			await until(busyApplyingChangesToCode).toBe(false, { timeout: 500 });
+		};
+
+		return Comlink.proxy<LanguageServiceWorker>({
+			updateFile: async (changes) => {
+				busyApplyingChangesToCode.value = true;
+				void applyChangesToCode(ChangeSet.fromJSON(changes)).then(() => {
+					busyApplyingChangesToCode.value = false;
+				});
+			},
+			async getCompletionsAtPos(pos) {
+				await waitForChangesAppliedToCode();
+
+				return await getCompletionsAtPos({
+					pos: editorPositionToTypescript(pos),
+					fileName: codeFileName,
+					env,
+				});
+			},
+			getDiagnostics() {
+				return getDiagnostics({ env, fileName: codeFileName }).map((diagnostic) => ({
+					...diagnostic,
+					from: typescriptPositionToEditor(diagnostic.from),
+					to: typescriptPositionToEditor(diagnostic.to),
+				}));
+			},
+			getHoverTooltip(pos) {
+				const tooltip = getHoverTooltip({
+					pos: editorPositionToTypescript(pos),
+					fileName: codeFileName,
+					env,
+				});
+
+				if (!tooltip) return null;
+
+				tooltip.start = typescriptPositionToEditor(tooltip.start);
+				tooltip.end = typescriptPositionToEditor(tooltip.end);
+
+				return tooltip;
+			},
+			async updateMode(newMode) {
+				mode.value = newMode;
+			},
+			async updateNodeTypes() {
+				const loadedNodeNames = Array.from(loadedNodeTypesMap.keys());
+				await Promise.all(loadedNodeNames.map(async (nodeName) => await loadNodeTypes(nodeName)));
+			},
+		});
+	},
+};
+
+Comlink.expose(worker);
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
new file mode 100644
index 0000000000..ea44d75faa
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
@@ -0,0 +1,38 @@
+import ts from 'typescript';
+
+function findNodes(node: ts.Node, check: (node: ts.Node) => boolean): ts.Node[] {
+	const result: ts.Node[] = [];
+
+	// If the current node matches the condition, add it to the result
+	if (check(node)) {
+		result.push(node);
+	}
+
+	// Recursively check all child nodes
+	node.forEachChild((child) => {
+		result.push(...findNodes(child, check));
+	});
+
+	return result;
+}
+
+/**
+ * Get nodes mentioned in the code
+ * Check if code includes calls to $('Node A')
+ */
+export async function getUsedNodeNames(file: ts.SourceFile) {
+	const callExpressions = findNodes(
+		file,
+		(n) =>
+			n.kind === ts.SyntaxKind.CallExpression &&
+			(n as ts.CallExpression).expression.getText() === '$',
+	);
+
+	if (callExpressions.length === 0) return [];
+
+	const nodeNames = (callExpressions as ts.CallExpression[])
+		.map((e) => (e.arguments.at(0) as ts.StringLiteral)?.text)
+		.filter(Boolean);
+
+	return nodeNames;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
new file mode 100644
index 0000000000..b43a7bcd1b
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
@@ -0,0 +1,64 @@
+import { ChangeSet } from '@codemirror/state';
+import { type CodeExecutionMode } from 'n8n-workflow';
+
+export const fnPrefix = (mode: CodeExecutionMode) => `(
+/**
+ * @returns {${returnTypeForMode(mode)}}
+*/
+() => {\n`;
+
+export function wrapInFunction(script: string, mode: CodeExecutionMode): string {
+	return `${fnPrefix(mode)}${script}\n})()`;
+}
+
+export function globalTypeDefinition(types: string) {
+	return `export {};
+declare global {
+	${types}
+}`;
+}
+
+export function returnTypeForMode(mode: CodeExecutionMode): string {
+	return mode === 'runOnceForAllItems' ? 'N8nOutputItems' : 'N8nOutputItem';
+}
+
+const MAX_CHANGE_BUFFER_CHAR_SIZE = 10_000_000;
+const MIN_CHANGE_BUFFER_WINDOW_MS = 50;
+const MAX_CHANGE_BUFFER_WINDOW_MS = 500;
+
+// Longer buffer window for large code
+function calculateBufferWindowMs(docSize: number, minDelay: number, maxDelay: number): number {
+	const clampedSize = Math.min(docSize, MAX_CHANGE_BUFFER_CHAR_SIZE);
+	const normalizedSize = clampedSize / MAX_CHANGE_BUFFER_CHAR_SIZE;
+
+	return Math.ceil(minDelay + (maxDelay - minDelay) * normalizedSize);
+}
+
+// Create a buffer function to accumulate and compose changesets
+export function bufferChangeSets(fn: (changeset: ChangeSet) => void) {
+	let changeSet = ChangeSet.empty(0);
+	let timeoutId: NodeJS.Timeout | null = null;
+
+	return async (changes: ChangeSet) => {
+		changeSet = changeSet.compose(changes);
+
+		if (timeoutId) {
+			clearTimeout(timeoutId);
+		}
+
+		return await new Promise<void>((resolve) => {
+			timeoutId = setTimeout(
+				() => {
+					fn(changeSet);
+					resolve();
+					changeSet = ChangeSet.empty(0);
+				},
+				calculateBufferWindowMs(
+					changeSet.length,
+					MIN_CHANGE_BUFFER_WINDOW_MS,
+					MAX_CHANGE_BUFFER_WINDOW_MS,
+				),
+			);
+		});
+	};
+}
diff --git a/packages/editor-ui/src/shims-modules.d.ts b/packages/editor-ui/src/shims-modules.d.ts
index 7191a5a3ab..ff3351fa15 100644
--- a/packages/editor-ui/src/shims-modules.d.ts
+++ b/packages/editor-ui/src/shims-modules.d.ts
@@ -16,6 +16,11 @@ declare module '*.jpeg';
 declare module '*.gif';
 declare module '*.webp';
 
+declare module '*?raw' {
+	const content: string;
+	export default content;
+}
+
 declare module 'v3-infinite-loading' {
 	import { Plugin, DefineComponent } from 'vue';
 
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/editor-ui/src/shims.d.ts
index 30b8303cd8..0fa35a73f0 100644
--- a/packages/editor-ui/src/shims.d.ts
+++ b/packages/editor-ui/src/shims.d.ts
@@ -1,3 +1,5 @@
+/// <reference types="vite-plugin-comlink/client" />
+
 import type { VNode, ComponentPublicInstance } from 'vue';
 import type { PartialDeep } from 'type-fest';
 import type { ExternalHooks } from '@/types/externalHooks';
diff --git a/packages/editor-ui/src/styles/plugins/_codemirror.scss b/packages/editor-ui/src/styles/plugins/_codemirror.scss
index 00de6a0136..210791d562 100644
--- a/packages/editor-ui/src/styles/plugins/_codemirror.scss
+++ b/packages/editor-ui/src/styles/plugins/_codemirror.scss
@@ -1,11 +1,3 @@
-.code-node-editor .cm-tooltip-autocomplete:after {
-	padding: var(--spacing-2xs) var(--spacing-s);
-	border: var(--border-base);
-	border-bottom-left-radius: var(--border-radius-base);
-	display: block;
-	content: 'n8n supports all JavaScript functions, including those not listed.';
-}
-
 .code-node-editor .cm-editor .cm-tooltip-autocomplete > ul[role='listbox'] {
 	border-bottom: none;
 	border-bottom-left-radius: 0;
@@ -24,9 +16,9 @@
 
 	> ul[role='listbox'] {
 		font-family: var(--font-family-monospace);
-		height: min(250px, 50vh);
-		max-height: none;
-		max-width: 200px;
+		max-height: min(220px, 20vh);
+		max-width: 240px;
+		min-width: 200px;
 
 		border: var(--border-base);
 		border-top-left-radius: var(--border-radius-base);
@@ -41,6 +33,10 @@
 			border-bottom-right-radius: var(--border-radius-base);
 		}
 
+		&:has(+ .cm-completionInfo) {
+			height: min(220px, 20vh);
+		}
+
 		li[role='option'] {
 			color: var(--color-text-base);
 			display: flex;
@@ -105,6 +101,10 @@
 	&:has(.cm-tooltip-lint) {
 		padding: 0;
 		overflow: hidden;
+
+		.cm-diagnostic {
+			border-left: none;
+		}
 	}
 
 	.autocomplete-info-container {
@@ -267,6 +267,30 @@
 		font-size: var(--font-size-3xs);
 		font-weight: var(--font-weight-bold);
 	}
+
+	// Syntax highlighting
+	.ts-keyword,
+	.ts-punctuation {
+		color: var(--color-code-tags-keyword);
+	}
+
+	.ts-stringLiteral,
+	.ts-primitive {
+		color: var(--color-code-tags-primitive);
+	}
+
+	.ts-localName,
+	.ts-parameterName,
+	.ts-methodName {
+		color: var(--color-code-tags-variable);
+	}
+
+	.ts-typeName,
+	.ts-interfaceName,
+	.ts-className,
+	.ts-aliasName {
+		color: var(--color-code-tags-class);
+	}
 }
 
 .cm-editor .cm-tooltip.cm-completionInfo {
@@ -286,7 +310,7 @@
 	top: 0 !important;
 	left: 100% !important;
 	right: auto !important;
-	max-width: 320px !important;
+	max-width: 280px !important;
 	height: 100%;
 
 	&.cm-completionInfo-left-narrow,
@@ -319,10 +343,14 @@
 	border-radius: var(--border-radius-base);
 	line-height: var(--font-line-height-loose);
 	padding: 0;
-	max-width: 320px;
+	max-width: 280px;
+
+	.cm-tooltip-section:not(:first-child) {
+		border-top: var(--border-base);
+	}
 
 	.autocomplete-info-container {
 		height: auto;
-		max-height: min(250px, 50vh);
+		max-height: min(220px, 20vh);
 	}
 }
diff --git a/packages/editor-ui/src/utils/forceParse.ts b/packages/editor-ui/src/utils/forceParse.ts
index 1b0136f0a4..d6cd800405 100644
--- a/packages/editor-ui/src/utils/forceParse.ts
+++ b/packages/editor-ui/src/utils/forceParse.ts
@@ -3,7 +3,7 @@ import type { EditorView } from '@codemirror/view';
 /**
  * Simulate user action to force parser to catch up during scroll.
  */
-export function forceParse(_: Event, view: EditorView) {
+export function forceParse(view: EditorView) {
 	view.dispatch({
 		changes: { from: view.viewport.to, insert: '_' },
 	});
diff --git a/packages/editor-ui/tsconfig.json b/packages/editor-ui/tsconfig.json
index 32aa6eaaa0..7ba161b78d 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/editor-ui/tsconfig.json
@@ -27,5 +27,6 @@
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue"]
+	"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue"],
+	"exclude": ["src/plugins/codemirror/typescript/worker/**/*.d.ts"]
 }
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index e4266a2d23..0a5c157c39 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -98,6 +98,9 @@ export default mergeConfig(
 			sourcemap: !!release,
 			target: browserslistToEsbuild(browsers),
 		},
+		worker: {
+			format: 'es',
+		},
 	}),
 	vitestConfig,
 );
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bdefe6baa9..4b1f8c6ac1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1369,6 +1369,9 @@ importers:
       '@codemirror/lint':
         specifier: ^6.8.0
         version: 6.8.0
+      '@codemirror/search':
+        specifier: ^6.5.6
+        version: 6.5.6
       '@codemirror/state':
         specifier: ^6.4.1
         version: 6.4.1
@@ -1423,9 +1426,15 @@ importers:
       '@n8n/permissions':
         specifier: workspace:*
         version: link:../@n8n/permissions
+      '@replit/codemirror-indentation-markers':
+        specifier: ^6.5.3
+        version: 6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)
       '@sentry/vue':
         specifier: catalog:frontend
         version: 8.33.1(vue@3.5.13(typescript@5.7.2))
+      '@typescript/vfs':
+        specifier: ^1.6.0
+        version: 1.6.0(typescript@5.7.2)
       '@vue-flow/background':
         specifier: ^1.3.2
         version: 1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
@@ -1462,6 +1471,9 @@ importers:
       codemirror-lang-html-n8n:
         specifier: ^1.0.0
         version: 1.0.0
+      comlink:
+        specifier: ^4.4.1
+        version: 4.4.1
       dateformat:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1516,6 +1528,9 @@ importers:
       timeago.js:
         specifier: ^4.0.2
         version: 4.0.2
+      typescript:
+        specifier: ^5.7.2
+        version: 5.7.2
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
@@ -3134,6 +3149,9 @@ packages:
   '@codemirror/lint@6.8.0':
     resolution: {integrity: sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA==}
 
+  '@codemirror/search@6.5.6':
+    resolution: {integrity: sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==}
+
   '@codemirror/state@6.3.3':
     resolution: {integrity: sha512-0wufKcTw2dEwEaADajjHf6hBy1sh3M6V0e+q4JKIhLuiMSe5td5HOWpUdvKth1fT1M9VYOboajoBHpkCd7PG7A==}
 
@@ -4728,6 +4746,13 @@ packages:
     resolution: {integrity: sha512-BNgXjqesJu4L5f8F73c2hkkH5IdvjYCKYFgIl+m9oNgqGRIPBJjtiEGOx7jkQ6nElN4311z7Z4aTECtklaaHwg==}
     engines: {node: '>=14.19.0', npm: '>=7.0.0'}
 
+  '@replit/codemirror-indentation-markers@6.5.3':
+    resolution: {integrity: sha512-hL5Sfvw3C1vgg7GolLe/uxX5T3tmgOA3ZzqlMv47zjU1ON51pzNWiVbS22oh6crYhtVhv8b3gdXwoYp++2ilHw==}
+    peerDependencies:
+      '@codemirror/language': ^6.0.0
+      '@codemirror/state': ^6.0.0
+      '@codemirror/view': ^6.0.0
+
   '@rollup/pluginutils@5.1.0':
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
@@ -5528,9 +5553,6 @@ packages:
   '@types/concat-stream@2.0.0':
     resolution: {integrity: sha512-t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==}
 
-  '@types/connect@3.4.35':
-    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
-
   '@types/connect@3.4.36':
     resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
 
@@ -5753,8 +5775,8 @@ packages:
   '@types/psl@1.1.0':
     resolution: {integrity: sha512-HhZnoLAvI2koev3czVPzBNRYvdrzJGLjQbWZhqFmS9Q6a0yumc5qtfSahBGb5g+6qWvA8iiQktqGkwoIXa/BNQ==}
 
-  '@types/qs@6.9.7':
-    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
+  '@types/qs@6.9.15':
+    resolution: {integrity: sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==}
 
   '@types/quoted-printable@1.0.2':
     resolution: {integrity: sha512-3B28oB1rRaZNb3N5dlxysm8lH1ujzvReDuYBiIO4jvpTIg9ksrILCNgPxSGVyTWE/qwuxzgHaVehwMK3CVqAtA==}
@@ -6003,6 +6025,11 @@ packages:
     resolution: {integrity: sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
+  '@typescript/vfs@1.6.0':
+    resolution: {integrity: sha512-hvJUjNVeBMp77qPINuUvYXj4FyWeeMMKZkxEATEU3hqBAQ7qdTBCUFT7Sp0Zu0faeEtFf+ldXxMEDr/bk73ISg==}
+    peerDependencies:
+      typescript: ^5.7.2
+
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
@@ -7052,6 +7079,9 @@ packages:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
 
+  comlink@4.4.1:
+    resolution: {integrity: sha512-+1dlx0aY5Jo1vHy/tSsIGpSkN4tS9rZSW8FIhG0JH/crs9wwweswIo/POr451r7bZww3hFbPAKnTpimzL/mm4Q==}
+
   commander@10.0.1:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
@@ -14492,10 +14522,10 @@ snapshots:
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helpers': 7.24.0
-      '@babel/parser': 7.26.2
+      '@babel/parser': 7.26.3
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
       convert-source-map: 2.0.0
       debug: 4.3.7
       gensync: 1.0.0-beta.2
@@ -14526,14 +14556,14 @@ snapshots:
 
   '@babel/generator@7.22.9':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
   '@babel/generator@7.23.6':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
@@ -14602,22 +14632,22 @@ snapshots:
   '@babel/helper-function-name@7.23.0':
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-hoist-variables@7.22.5':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-member-expression-to-functions@7.25.9':
     dependencies:
       '@babel/traverse': 7.26.3
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-module-imports@7.22.15':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-module-imports@7.25.9':
     dependencies:
@@ -14646,7 +14676,7 @@ snapshots:
 
   '@babel/helper-optimise-call-expression@7.25.9':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-plugin-utils@7.22.5': {}
 
@@ -14672,7 +14702,7 @@ snapshots:
 
   '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
     dependencies:
@@ -14683,7 +14713,7 @@ snapshots:
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-string-parser@7.24.8': {}
 
@@ -14703,7 +14733,7 @@ snapshots:
     dependencies:
       '@babel/template': 7.25.9
       '@babel/traverse': 7.26.3
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
@@ -14711,14 +14741,14 @@ snapshots:
     dependencies:
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helpers@7.26.0':
     dependencies:
       '@babel/template': 7.25.9
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/highlight@7.24.6':
     dependencies:
@@ -14733,7 +14763,7 @@ snapshots:
 
   '@babel/parser@7.26.2':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/parser@7.26.3':
     dependencies:
@@ -15272,14 +15302,14 @@ snapshots:
   '@babel/template@7.24.0':
     dependencies:
       '@babel/code-frame': 7.24.6
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@babel/template@7.25.9':
     dependencies:
       '@babel/code-frame': 7.26.2
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@babel/traverse@7.24.0':
     dependencies:
@@ -15289,8 +15319,8 @@ snapshots:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       debug: 4.3.7
       globals: 11.12.0
     transitivePeerDependencies:
@@ -15465,6 +15495,12 @@ snapshots:
       '@codemirror/view': 6.26.3
       crelt: 1.0.5
 
+  '@codemirror/search@6.5.6':
+    dependencies:
+      '@codemirror/state': 6.4.1
+      '@codemirror/view': 6.26.3
+      crelt: 1.0.5
+
   '@codemirror/state@6.3.3': {}
 
   '@codemirror/state@6.4.1': {}
@@ -17107,6 +17143,12 @@ snapshots:
       - encoding
       - supports-color
 
+  '@replit/codemirror-indentation-markers@6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)':
+    dependencies:
+      '@codemirror/language': 6.10.1
+      '@codemirror/state': 6.4.1
+      '@codemirror/view': 6.26.3
+
   '@rollup/pluginutils@5.1.0(rollup@4.24.0)':
     dependencies:
       '@types/estree': 1.0.6
@@ -18178,24 +18220,24 @@ snapshots:
 
   '@types/babel__core@7.20.0':
     dependencies:
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.2
 
   '@types/babel__generator@7.6.4':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@types/babel__template@7.4.1':
     dependencies:
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@types/babel__traverse@7.18.2':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@types/basic-auth@1.1.3':
     dependencies:
@@ -18207,7 +18249,7 @@ snapshots:
 
   '@types/body-parser@1.19.2':
     dependencies:
-      '@types/connect': 3.4.35
+      '@types/connect': 3.4.36
       '@types/node': 18.16.16
 
   '@types/caseless@0.12.5': {}
@@ -18224,10 +18266,6 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/connect@3.4.35':
-    dependencies:
-      '@types/node': 18.16.16
-
   '@types/connect@3.4.36':
     dependencies:
       '@types/node': 18.16.16
@@ -18264,7 +18302,7 @@ snapshots:
   '@types/express-serve-static-core@4.17.43(patch_hash=5orrj4qleu2iko5t27vl44u4we)':
     dependencies:
       '@types/node': 18.16.16
-      '@types/qs': 6.9.7
+      '@types/qs': 6.9.15
       '@types/range-parser': 1.2.4
       '@types/send': 0.17.4
 
@@ -18272,7 +18310,7 @@ snapshots:
     dependencies:
       '@types/body-parser': 1.19.2
       '@types/express-serve-static-core': 4.17.43(patch_hash=5orrj4qleu2iko5t27vl44u4we)
-      '@types/qs': 6.9.7
+      '@types/qs': 6.9.15
       '@types/serve-static': 1.15.0
 
   '@types/file-saver@2.0.5': {}
@@ -18477,7 +18515,7 @@ snapshots:
 
   '@types/psl@1.1.0': {}
 
-  '@types/qs@6.9.7': {}
+  '@types/qs@6.9.15': {}
 
   '@types/quoted-printable@1.0.2': {}
 
@@ -18784,6 +18822,13 @@ snapshots:
       '@typescript-eslint/types': 7.2.0
       eslint-visitor-keys: 3.4.3
 
+  '@typescript/vfs@1.6.0(typescript@5.7.2)':
+    dependencies:
+      debug: 4.3.6(supports-color@8.1.1)
+      typescript: 5.7.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@ungap/structured-clone@1.2.0': {}
 
   '@vitejs/plugin-legacy@6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))':
@@ -18947,7 +18992,7 @@ snapshots:
 
   '@vue/compiler-sfc@3.5.13':
     dependencies:
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@vue/compiler-core': 3.5.13
       '@vue/compiler-dom': 3.5.13
       '@vue/compiler-ssr': 3.5.13
@@ -19528,7 +19573,7 @@ snapshots:
   babel-plugin-jest-hoist@29.5.0:
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
 
@@ -19580,7 +19625,7 @@ snapshots:
 
   babel-walk@3.0.0-canary-5:
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   balanced-match@1.0.2: {}
 
@@ -20102,6 +20147,8 @@ snapshots:
     dependencies:
       delayed-stream: 1.0.0
 
+  comlink@4.4.1: {}
+
   commander@10.0.1: {}
 
   commander@11.1.0: {}
@@ -20194,8 +20241,8 @@ snapshots:
 
   constantinople@4.0.1:
     dependencies:
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   content-disposition@0.5.4:
     dependencies:
@@ -22668,7 +22715,7 @@ snapshots:
   istanbul-lib-instrument@5.2.1:
     dependencies:
       '@babel/core': 7.24.0
-      '@babel/parser': 7.26.2
+      '@babel/parser': 7.26.3
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
       semver: 7.6.0
@@ -23652,8 +23699,8 @@ snapshots:
 
   magicast@0.3.5:
     dependencies:
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       source-map-js: 1.2.1
 
   mailparser@3.6.7:
@@ -27601,8 +27648,8 @@ snapshots:
 
   with@7.0.2:
     dependencies:
-      '@babel/parser': 7.26.2
-      '@babel/types': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 

From 3006ccf41bb911ba72f087a1479889fbf308c17d Mon Sep 17 00:00:00 2001
From: feelgood-interface
 <78543720+feelgood-interface@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:49:26 +0100
Subject: [PATCH 23/30] feat(Microsoft Entra ID Node): New node (#11779)

Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
---
 .../MicrosoftEntraOAuth2Api.credentials.ts    |    7 +-
 .../nodes/Microsoft/Entra/GenericFunctions.ts |  412 ++++
 .../Microsoft/Entra/MicrosoftEntra.node.json  |   18 +
 .../Microsoft/Entra/MicrosoftEntra.node.ts    |  115 +
 .../Entra/descriptions/GroupDescription.ts    | 1179 +++++++++
 .../Entra/descriptions/UserDescription.ts     | 2109 +++++++++++++++++
 .../Microsoft/Entra/descriptions/index.ts     |    2 +
 .../Microsoft/Entra/microsoftEntra.dark.svg   |    4 +
 .../nodes/Microsoft/Entra/microsoftEntra.svg  |    8 +
 .../Entra/test/GroupDescription.test.ts       |  775 ++++++
 .../Entra/test/MicrosoftEntra.node.test.ts    |  249 ++
 .../Entra/test/UserDescription.test.ts        | 1161 +++++++++
 .../nodes/Microsoft/Entra/test/mocks.ts       | 1270 ++++++++++
 packages/nodes-base/package.json              |    1 +
 .../test/nodes/FakeCredentialsMap.ts          |   24 +
 packages/workflow/src/Interfaces.ts           |    2 +-
 16 files changed, 7331 insertions(+), 5 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts

diff --git a/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
index c1c77edb41..be1e04de19 100644
--- a/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
@@ -1,4 +1,4 @@
-import type { ICredentialType, INodeProperties, Icon } from 'n8n-workflow';
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class MicrosoftEntraOAuth2Api implements ICredentialType {
 	name = 'microsoftEntraOAuth2Api';
@@ -7,8 +7,6 @@ export class MicrosoftEntraOAuth2Api implements ICredentialType {
 
 	extends = ['microsoftOAuth2Api'];
 
-	icon: Icon = 'file:icons/Azure.svg';
-
 	documentationUrl = 'microsoftentra';
 
 	properties: INodeProperties[] = [
@@ -16,8 +14,9 @@ export class MicrosoftEntraOAuth2Api implements ICredentialType {
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
+			// Sites.FullControl.All required to update user specific properties https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/1316
 			default:
-				'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All',
+				'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All User.ReadWrite.All Directory.AccessAsUser.All Sites.FullControl.All GroupMember.ReadWrite.All',
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts
new file mode 100644
index 0000000000..e7b2e940b7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts
@@ -0,0 +1,412 @@
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	INodeExecutionData,
+	IN8nHttpFullResponse,
+	INodePropertyOptions,
+	INodeListSearchResult,
+	INodeListSearchItems,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import { parseStringPromise } from 'xml2js';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	qs?: IDataObject,
+	headers?: IDataObject,
+	url?: string,
+): Promise<any> {
+	const options: IHttpRequestOptions = {
+		method,
+		url: url ?? `https://graph.microsoft.com/v1.0${endpoint}`,
+		json: true,
+		headers,
+		body,
+		qs,
+	};
+
+	return await this.helpers.requestWithAuthentication.call(
+		this,
+		'microsoftEntraOAuth2Api',
+		options,
+	);
+}
+
+export async function microsoftApiPaginateRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	qs?: IDataObject,
+	headers?: IDataObject,
+	url?: string,
+	itemIndex: number = 0,
+): Promise<IDataObject[]> {
+	// Todo: IHttpRequestOptions doesn't have uri property which is required for requestWithAuthenticationPaginated
+	const options: IRequestOptions = {
+		method,
+		uri: url ?? `https://graph.microsoft.com/v1.0${endpoint}`,
+		json: true,
+		headers,
+		body,
+		qs,
+	};
+
+	const pages = await this.helpers.requestWithAuthenticationPaginated.call(
+		this,
+		options,
+		itemIndex,
+		{
+			continue: '={{ !!$response.body?.["@odata.nextLink"] }}',
+			request: {
+				url: '={{ $response.body?.["@odata.nextLink"] ?? $request.url }}',
+			},
+			requestInterval: 0,
+		},
+		'microsoftEntraOAuth2Api',
+	);
+
+	let results: IDataObject[] = [];
+	for (const page of pages) {
+		const items = page.body.value as IDataObject[];
+		if (items) {
+			results = results.concat(items);
+		}
+	}
+
+	return results;
+}
+
+export async function handleErrorPostReceive(
+	this: IExecuteSingleFunctions,
+	data: INodeExecutionData[],
+	response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	if (String(response.statusCode).startsWith('4') || String(response.statusCode).startsWith('5')) {
+		const resource = this.getNodeParameter('resource') as string;
+		const operation = this.getNodeParameter('operation') as string;
+		const {
+			code: errorCode,
+			message: errorMessage,
+			details: errorDetails,
+		} = (response.body as IDataObject)?.error as {
+			code: string;
+			message: string;
+			innerError?: {
+				code: string;
+				'request-id'?: string;
+				date?: string;
+			};
+			details?: Array<{
+				code: string;
+				message: string;
+			}>;
+		};
+
+		// Operation specific errors
+		if (resource === 'group') {
+			if (operation === 'create') {
+			} else if (operation === 'delete') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required group doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Group to Delete' and try again",
+					});
+				}
+			} else if (operation === 'get') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required group doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Group to Get' and try again",
+					});
+				}
+			} else if (operation === 'getAll') {
+			} else if (operation === 'update') {
+				if (
+					errorCode === 'BadRequest' &&
+					errorMessage === 'Empty Payload. JSON content expected.'
+				) {
+					// Ignore empty payload error. Currently n8n deletes the empty body object from the request.
+					return data;
+				}
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required group doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Group to Update' and try again",
+					});
+				}
+			}
+		} else if (resource === 'user') {
+			if (operation === 'addGroup') {
+				if (
+					errorCode === 'Request_BadRequest' &&
+					errorMessage ===
+						"One or more added object references already exist for the following modified properties: 'members'."
+				) {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: 'The user is already in the group',
+						description:
+							'The specified user cannot be added to the group because they are already a member',
+					});
+				} else if (errorCode === 'Request_ResourceNotFound') {
+					const group = this.getNodeParameter('group.value') as string;
+					if (errorMessage.includes(group)) {
+						throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+							message: "The required group doesn't match any existing one",
+							description: "Double-check the value in the parameter 'Group' and try again",
+						});
+					} else {
+						throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+							message: "The required user doesn't match any existing one",
+							description: "Double-check the value in the parameter 'User to Add' and try again",
+						});
+					}
+				}
+			} else if (operation === 'create') {
+			} else if (operation === 'delete') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required user doesn't match any existing one",
+						description: "Double-check the value in the parameter 'User to Delete' and try again",
+					});
+				}
+			} else if (operation === 'get') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required user doesn't match any existing one",
+						description: "Double-check the value in the parameter 'User to Get' and try again",
+					});
+				}
+			} else if (operation === 'getAll') {
+			} else if (operation === 'removeGroup') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: 'The user is not in the group',
+						description:
+							'The specified user cannot be removed from the group because they are not a member of the group',
+					});
+				} else if (
+					errorCode === 'Request_UnsupportedQuery' &&
+					errorMessage ===
+						"Unsupported referenced-object resource identifier for link property 'members'."
+				) {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: 'The user ID is invalid',
+						description: 'The ID should be in the format e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+					});
+				}
+			} else if (operation === 'update') {
+				if (
+					errorCode === 'BadRequest' &&
+					errorMessage === 'Empty Payload. JSON content expected.'
+				) {
+					// Ignore empty payload error. Currently n8n deletes the empty body object from the request.
+					return data;
+				}
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required user doesn't match any existing one",
+						description: "Double-check the value in the parameter 'User to Update' and try again",
+					});
+				}
+			}
+		}
+
+		// Generic errors
+		if (
+			errorCode === 'Request_BadRequest' &&
+			errorMessage.startsWith('Invalid object identifier')
+		) {
+			const group = this.getNodeParameter('group.value', '') as string;
+			const parameterResource =
+				resource === 'group' || errorMessage.includes(group) ? 'group' : 'user';
+
+			throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+				message: `The ${parameterResource} ID is invalid`,
+				description: 'The ID should be in the format e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+			});
+		}
+		if (errorDetails?.some((x) => x.code === 'ObjectConflict' || x.code === 'ConflictingObjects')) {
+			throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+				message: `The ${resource} already exists`,
+				description: errorMessage,
+			});
+		}
+
+		throw new NodeApiError(this.getNode(), response as unknown as JsonObject);
+	}
+
+	return data;
+}
+
+export async function getGroupProperties(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const response = await microsoftApiRequest.call(this, 'GET', '/$metadata#groups');
+	const metadata = await parseStringPromise(response as string, {
+		explicitArray: false,
+	});
+
+	/* eslint-disable */
+	const entities = metadata['edmx:Edmx']['edmx:DataServices']['Schema']
+		.find((x: any) => x['$']['Namespace'] === 'microsoft.graph')
+		['EntityType'].filter((x: any) =>
+			['entity', 'directoryObject', 'group'].includes(x['$']['Name']),
+		);
+	let properties = entities
+		.flatMap((x: any) => x['Property'])
+		.map((x: any) => x['$']['Name']) as string[];
+	/* eslint-enable */
+
+	properties = properties.filter(
+		(x) => !['id', 'isArchived', 'hasMembersWithLicenseErrors'].includes(x),
+	);
+
+	properties = properties.sort();
+
+	for (const property of properties) {
+		returnData.push({
+			name: property,
+			value: property,
+		});
+	}
+
+	return returnData;
+}
+
+export async function getUserProperties(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const response = await microsoftApiRequest.call(this, 'GET', '/$metadata#users');
+	const metadata = await parseStringPromise(response as string, {
+		explicitArray: false,
+	});
+
+	/* eslint-disable */
+	const entities = metadata['edmx:Edmx']['edmx:DataServices']['Schema']
+		.find((x: any) => x['$']['Namespace'] === 'microsoft.graph')
+		['EntityType'].filter((x: any) =>
+			['entity', 'directoryObject', 'user'].includes(x['$']['Name']),
+		);
+	let properties = entities
+		.flatMap((x: any) => x['Property'])
+		.map((x: any) => x['$']['Name']) as string[];
+	/* eslint-enable */
+
+	// signInActivity requires AuditLog.Read.All
+	// mailboxSettings MailboxSettings.Read
+	properties = properties.filter(
+		(x) =>
+			!['id', 'deviceEnrollmentLimit', 'mailboxSettings', 'print', 'signInActivity'].includes(x),
+	);
+
+	properties = properties.sort();
+
+	for (const property of properties) {
+		returnData.push({
+			name: property,
+			value: property,
+		});
+	}
+	return returnData;
+}
+
+export async function getGroups(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: any;
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'/groups',
+			{},
+			undefined,
+			undefined,
+			paginationToken,
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,displayName',
+		};
+		const headers: IDataObject = {};
+		if (filter) {
+			headers.ConsistencyLevel = 'eventual';
+			qs.$search = `"displayName:${filter}"`;
+		}
+		response = await microsoftApiRequest.call(this, 'GET', '/groups', {}, qs, headers);
+	}
+
+	const groups: Array<{
+		id: string;
+		displayName: string;
+	}> = response.value;
+
+	const results: INodeListSearchItems[] = groups
+		.map((g) => ({
+			name: g.displayName,
+			value: g.id,
+		}))
+		.sort((a, b) =>
+			a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }),
+		);
+
+	return { results, paginationToken: response['@odata.nextLink'] };
+}
+
+export async function getUsers(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: any;
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'/users',
+			{},
+			undefined,
+			undefined,
+			paginationToken,
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,displayName',
+		};
+		const headers: IDataObject = {};
+		if (filter) {
+			qs.$filter = `startsWith(displayName, '${filter}') OR startsWith(userPrincipalName, '${filter}')`;
+		}
+		response = await microsoftApiRequest.call(this, 'GET', '/users', {}, qs, headers);
+	}
+
+	const users: Array<{
+		id: string;
+		displayName: string;
+	}> = response.value;
+
+	const results: INodeListSearchItems[] = users
+		.map((u) => ({
+			name: u.displayName,
+			value: u.id,
+		}))
+		.sort((a, b) =>
+			a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }),
+		);
+
+	return { results, paginationToken: response['@odata.nextLink'] };
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json
new file mode 100644
index 0000000000..3e45875d3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.microsoftEntra",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development", "Developer Tools"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/microsoft/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftentra/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
new file mode 100644
index 0000000000..d07255b86d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
@@ -0,0 +1,115 @@
+import type {
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { groupFields, groupOperations, userFields, userOperations } from './descriptions';
+import { getGroupProperties, getGroups, getUserProperties, getUsers } from './GenericFunctions';
+
+export class MicrosoftEntra implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Microsoft Entra ID',
+		name: 'microsoftEntra',
+		icon: {
+			light: 'file:microsoftEntra.svg',
+			dark: 'file:microsoftEntra.dark.svg',
+		},
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Interact with Micosoft Entra ID API',
+		defaults: {
+			name: 'Micosoft Entra ID',
+		},
+		inputs: [NodeConnectionType.Main],
+		outputs: [NodeConnectionType.Main],
+		credentials: [
+			{
+				name: 'microsoftEntraOAuth2Api',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			baseURL: 'https://graph.microsoft.com/v1.0',
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		},
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Group',
+						value: 'group',
+					},
+					{
+						name: 'User',
+						value: 'user',
+					},
+				],
+				default: 'user',
+			},
+
+			...groupOperations,
+			...groupFields,
+			...userOperations,
+			...userFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			getGroupProperties,
+
+			async getGroupPropertiesGetAll(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				// Filter items not supported for list endpoint
+				return (await getGroupProperties.call(this)).filter(
+					(x) =>
+						![
+							'allowExternalSenders',
+							'autoSubscribeNewMembers',
+							'hideFromAddressLists',
+							'hideFromOutlookClients',
+							'isSubscribedByMail',
+							'unseenCount',
+						].includes(x.value as string),
+				);
+			},
+
+			getUserProperties,
+
+			async getUserPropertiesGetAll(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				// Filter items not supported for list endpoint
+				return (await getUserProperties.call(this)).filter(
+					(x) =>
+						![
+							'aboutMe',
+							'birthday',
+							'hireDate',
+							'interests',
+							'mySite',
+							'pastProjects',
+							'preferredName',
+							'responsibilities',
+							'schools',
+							'skills',
+							'mailboxSettings',
+						].includes(x.value as string),
+				);
+			},
+		},
+
+		listSearch: {
+			getGroups,
+
+			getUsers,
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts
new file mode 100644
index 0000000000..07f5ef908b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts
@@ -0,0 +1,1179 @@
+import { merge } from 'lodash';
+import type {
+	IDataObject,
+	IExecuteSingleFunctions,
+	IHttpRequestOptions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { handleErrorPostReceive, microsoftApiRequest } from '../GenericFunctions';
+
+export const groupOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['group'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'POST',
+						url: '/groups',
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Create group',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'DELETE',
+						url: '=/groups/{{ $parameter["group"] }}',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "deleted": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Delete group',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data for a specific group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						url: '=/groups/{{ $parameter["group"] }}',
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Get group',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve a list of groups',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						url: '/groups',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'value',
+								},
+							},
+						],
+					},
+				},
+				action: 'Get many groups',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'PATCH',
+						url: '=/groups/{{ $parameter["group"] }}',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "updated": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Update group',
+			},
+		],
+		default: 'getAll',
+	},
+];
+
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'Group Type',
+		name: 'groupType',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				name: 'Microsoft 365',
+				value: 'Unified',
+			},
+			{
+				name: 'Security',
+				value: '',
+			},
+		],
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const groupType = this.getNodeParameter('groupType') as string;
+						const body = requestOptions.body as IDataObject;
+						if (groupType) {
+							body.groupTypes ??= [] as string[];
+							(body.groupTypes as string[]).push(groupType);
+						} else {
+							// Properties mailEnabled and securityEnabled are not visible for Security group, but are required. So we add them here.
+							body.mailEnabled = false;
+							body.securityEnabled = true;
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'options',
+	},
+	{
+		displayName: 'Group Name',
+		name: 'displayName',
+		default: '',
+		description: 'The name to display in the address book for the group',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'displayName',
+				type: 'body',
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const displayName = this.getNodeParameter('displayName') as string;
+						if (displayName?.length > 256) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Display Name' should have a maximum length of 256",
+							);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Group Email Address',
+		name: 'mailNickname',
+		default: '',
+		description: 'The mail alias for the group. Only enter the local-part without the domain.',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. alias',
+		required: true,
+		routing: {
+			send: {
+				property: 'mailNickname',
+				type: 'body',
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const mailNickname = this.getNodeParameter('mailNickname') as string;
+						if (mailNickname?.includes('@')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`'Group Email Address' should only include the local-part of the email address, without ${mailNickname.slice(mailNickname.indexOf('@'))}`,
+							);
+						}
+						if (mailNickname?.length > 64) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Group Email Address' should have a maximum length of 64",
+							);
+						}
+						if (mailNickname && !/^((?![@()\[\]"\\;:<> ,])[\x00-\x7F])*$/.test(mailNickname)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Group Email Address' should only contain characters in the ASCII character set 0 - 127 except the following: @ () \\ [] \" ; : <> , SPACE",
+							);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Mail Enabled',
+		name: 'mailEnabled',
+		default: false,
+		description: 'Whether the group is mail-enabled',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+				groupType: ['Unified'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'mailEnabled',
+				type: 'body',
+			},
+		},
+		type: 'boolean',
+		validateType: 'boolean',
+	},
+	{
+		displayName: 'Membership Type',
+		name: 'membershipType',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				name: 'Assigned',
+				value: '',
+				description:
+					'Lets you add specific users as members of a group and have unique permissions',
+			},
+			{
+				name: 'Dynamic',
+				value: 'DynamicMembership',
+				description: 'Lets you use rules to automatically add and remove users as members',
+			},
+		],
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const membershipType = this.getNodeParameter('membershipType') as string;
+						if (membershipType) {
+							const body = requestOptions.body as IDataObject;
+							body.groupTypes ??= [] as string[];
+							(body.groupTypes as string[]).push(membershipType);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'options',
+	},
+	{
+		displayName: 'Security Enabled',
+		name: 'securityEnabled',
+		default: true,
+		description: 'Whether the group is a security group',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+				groupType: ['Unified'],
+			},
+		},
+		routing: {
+			send: {
+				property: 'securityEnabled',
+				type: 'body',
+			},
+		},
+		type: 'boolean',
+		validateType: 'boolean',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assignable to Role',
+				name: 'isAssignableToRole',
+				default: false,
+				description: 'Whether Microsoft Entra roles can be assigned to the group',
+				displayOptions: {
+					hide: {
+						'/membershipType': ['DynamicMembership'],
+					},
+				},
+				routing: {
+					send: {
+						property: 'isAssignableToRole',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const isAssignableToRole = this.getNodeParameter(
+									'additionalFields.isAssignableToRole',
+								) as boolean;
+								if (isAssignableToRole) {
+									const securityEnabled = this.getNodeParameter('securityEnabled', true) as boolean;
+									const visibility = this.getNodeParameter(
+										'additionalFields.visibility',
+										'',
+									) as string;
+									const groupType = this.getNodeParameter('groupType') as string;
+									const mailEnabled = this.getNodeParameter('mailEnabled', false) as boolean;
+									if (!securityEnabled) {
+										throw new NodeOperationError(
+											this.getNode(),
+											"'Security Enabled' must be set to true if 'Assignable to Role' is set",
+										);
+									}
+									if (visibility !== 'Private') {
+										throw new NodeOperationError(
+											this.getNode(),
+											"'Visibility' must be set to 'Private' if 'Assignable to Role' is set",
+										);
+									}
+									if (groupType === 'Unified' && !mailEnabled) {
+										throw new NodeOperationError(
+											this.getNode(),
+											"'Mail Enabled' must be set to true if 'Assignable to Role' is set",
+										);
+									}
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				default: '',
+				description: 'Description for the group',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule',
+				name: 'membershipRule',
+				default: '',
+				description:
+					'The <a href="https://learn.microsoft.com/en-us/entra/identity/users/groups-dynamic-membership">dynamic membership rules</a>',
+				displayOptions: {
+					show: {
+						'/membershipType': ['DynamicMembership'],
+					},
+				},
+				placeholder: 'e.g. user.department -eq "Marketing"',
+				routing: {
+					send: {
+						property: 'membershipRule',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule Processing State',
+				name: 'membershipRuleProcessingState',
+				default: 'On',
+				description: 'Indicates whether the dynamic membership processing is on or paused',
+				displayOptions: {
+					show: {
+						'/membershipType': ['DynamicMembership'],
+					},
+				},
+				options: [
+					{
+						name: 'On',
+						value: 'On',
+					},
+					{
+						name: 'Paused',
+						value: 'Paused',
+					},
+				],
+				routing: {
+					send: {
+						property: 'membershipRuleProcessingState',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Preferred Data Location',
+				name: 'preferredDataLocation',
+				default: '',
+				description:
+					'A property set for the group that Office 365 services use to provision the corresponding data-at-rest resources (mailbox, OneDrive, groups sites, and so on)',
+				displayOptions: {
+					show: {
+						'/groupType': ['Unified'],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Unique Name',
+				name: 'uniqueName',
+				default: '',
+				description:
+					'The unique identifier for the group, can only be updated if null, and is immutable once set',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Visibility',
+				name: 'visibility',
+				default: 'Public',
+				description: 'Specifies the visibility of the group',
+				options: [
+					{
+						name: 'Private',
+						value: 'Private',
+					},
+					{
+						name: 'Public',
+						value: 'Public',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const groupId = item.json.id as string;
+							const fields = this.getNodeParameter('additionalFields', item.index) as IDataObject;
+							delete fields.isAssignableToRole;
+							delete fields.membershipRule;
+							delete fields.membershipRuleProcessingState;
+							if (Object.keys(fields).length) {
+								const body: IDataObject = {
+									...fields,
+								};
+								if (body.assignedLabels) {
+									body.assignedLabels = [(body.assignedLabels as IDataObject).labelValues];
+								}
+
+								try {
+									await microsoftApiRequest.call(this, 'PATCH', `/groups/${groupId}`, body);
+									merge(item.json, body);
+								} catch (error) {
+									try {
+										await microsoftApiRequest.call(this, 'DELETE', `/groups/${groupId}`);
+									} catch {}
+									throw error;
+								}
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+const deleteFields: INodeProperties[] = [
+	{
+		displayName: 'Group to Delete',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const getFields: INodeProperties[] = [
+	{
+		displayName: 'Group to Get',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getGroupProperties',
+		},
+		type: 'multiOptions',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Members',
+				name: 'includeMembers',
+				default: false,
+				routing: {
+					send: {
+						property: '$expand',
+						type: 'query',
+						value:
+							'={{ $value ? "members($select=id,accountEnabled,createdDateTime,displayName,employeeId,mail,securityIdentifier,userPrincipalName,userType)" : undefined }}',
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+		],
+		placeholder: 'Add Option',
+		type: 'collection',
+	},
+];
+
+const getAllFields: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+			},
+		},
+		routing: {
+			send: {
+				paginate: '={{ $value }}',
+			},
+			operations: {
+				pagination: {
+					type: 'generic',
+					properties: {
+						continue: '={{ !!$response.body?.["@odata.nextLink"] }}',
+						request: {
+							url: '={{ $response.body?.["@odata.nextLink"] ?? $request.url }}',
+							qs: {
+								$filter:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$filter }}',
+								$select:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$select }}',
+							},
+						},
+					},
+				},
+			},
+		},
+		type: 'boolean',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		routing: {
+			send: {
+				property: '$top',
+				type: 'query',
+				value: '={{ $value }}',
+			},
+		},
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		validateType: 'number',
+	},
+	{
+		displayName: 'Filter',
+		name: 'filter',
+		default: '',
+		description:
+			'<a href="https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter">Query parameter</a> to filter results by',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+			},
+		},
+		hint: 'If empty, all the groups will be returned',
+		placeholder: "e.g. startswith(displayName, 'a')",
+		routing: {
+			send: {
+				property: '$filter',
+				type: 'query',
+				value: '={{ $value ? $value : undefined }}',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getGroupPropertiesGetAll',
+		},
+		type: 'multiOptions',
+	},
+];
+
+const updateFields: INodeProperties[] = [
+	{
+		displayName: 'Group to Update',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Allow External Senders',
+				name: 'allowExternalSenders',
+				default: false,
+				description:
+					'Whether people external to the organization can send messages to the group. Wait a few seconds before editing this field in a newly created group.',
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Auto Subscribe New Members',
+				name: 'autoSubscribeNewMembers',
+				default: false,
+				description:
+					'Whether new members added to the group will be auto-subscribed to receive email notifications. Wait a few seconds before editing this field in a newly created group.',
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				default: '',
+				description: 'Description for the group',
+				routing: {
+					send: {
+						property: 'description',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Group Name',
+				name: 'displayName',
+				default: '',
+				description: 'The name to display in the address book for the group',
+				routing: {
+					send: {
+						property: 'displayName',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const displayName = this.getNodeParameter('updateFields.displayName') as string;
+								if (displayName?.length > 256) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Display Name' should have a maximum length of 256",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Group Email Address',
+				name: 'mailNickname',
+				default: '',
+				description: 'The mail alias for the group. Only enter the local-part without the domain.',
+				placeholder: 'e.g. alias',
+				routing: {
+					send: {
+						property: 'mailNickname',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const mailNickname = this.getNodeParameter('updateFields.mailNickname') as string;
+								if (mailNickname?.includes('@')) {
+									throw new NodeOperationError(
+										this.getNode(),
+										`'Group Email Address' should only include the local-part of the email address, without ${mailNickname.slice(mailNickname.indexOf('@'))}`,
+									);
+								}
+								if (mailNickname?.length > 64) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Group Email Address' should have a maximum length of 64",
+									);
+								}
+								if (mailNickname && !/^((?![@()\[\]"\\;:<> ,])[\x00-\x7F])*$/.test(mailNickname)) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Group Email Address' should only contain characters in the ASCII character set 0 - 127 except the following: @ () \\ [] \" ; : <> , SPACE",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule',
+				name: 'membershipRule',
+				default: '',
+				description:
+					'The <a href="https://learn.microsoft.com/en-us/entra/identity/users/groups-dynamic-membership">dynamic membership rules</a>',
+				placeholder: 'e.g. user.department -eq "Marketing"',
+				routing: {
+					send: {
+						property: 'membershipRule',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule Processing State',
+				name: 'membershipRuleProcessingState',
+				default: 'On',
+				description: 'Indicates whether the dynamic membership processing is on or paused',
+				options: [
+					{
+						name: 'On',
+						value: 'On',
+					},
+					{
+						name: 'Paused',
+						value: 'Paused',
+					},
+				],
+				routing: {
+					send: {
+						property: 'membershipRuleProcessingState',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Preferred Data Location',
+				name: 'preferredDataLocation',
+				default: '',
+				description:
+					'A property set for the group that Office 365 services use to provision the corresponding data-at-rest resources (mailbox, OneDrive, groups sites, and so on)',
+				routing: {
+					send: {
+						property: 'preferredDataLocation',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Security Enabled',
+				name: 'securityEnabled',
+				default: true,
+				description: 'Whether the group is a security group',
+				routing: {
+					send: {
+						property: 'securityEnabled',
+						type: 'body',
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Unique Name',
+				name: 'uniqueName',
+				default: '',
+				description:
+					'The unique identifier for the group, can only be updated if null, and is immutable once set',
+				routing: {
+					send: {
+						property: 'uniqueName',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Visibility',
+				name: 'visibility',
+				default: 'Public',
+				description: 'Specifies the visibility of the group',
+				options: [
+					{
+						name: 'Private',
+						value: 'Private',
+					},
+					{
+						name: 'Public',
+						value: 'Public',
+					},
+				],
+				routing: {
+					send: {
+						property: 'visibility',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const groupId = this.getNodeParameter('group.value', item.index) as string;
+							const fields = this.getNodeParameter('updateFields', item.index) as IDataObject;
+							// To update the following properties, you must specify them in their own PATCH request, without including the other properties
+							const separateProperties = [
+								'allowExternalSenders',
+								'autoSubscribeNewMembers',
+								// 'hideFromAddressLists',
+								// 'hideFromOutlookClients',
+								// 'isSubscribedByMail',
+								// 'unseenCount',
+							];
+							const separateFields = Object.keys(fields)
+								.filter((key) => separateProperties.includes(key))
+								.reduce((obj, key) => {
+									return {
+										...obj,
+										[key]: fields[key],
+									};
+								}, {});
+							if (Object.keys(separateFields).length) {
+								const body: IDataObject = {
+									...separateFields,
+								};
+								await microsoftApiRequest.call(this, 'PATCH', `/groups/${groupId}`, body);
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+export const groupFields: INodeProperties[] = [
+	...createFields,
+	...deleteFields,
+	...getFields,
+	...getAllFields,
+	...updateFields,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts
new file mode 100644
index 0000000000..4e4914e796
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts
@@ -0,0 +1,2109 @@
+import { merge } from 'lodash';
+import type { DateTime } from 'luxon';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteSingleFunctions,
+	type IHttpRequestOptions,
+	type IN8nHttpFullResponse,
+	type INodeExecutionData,
+	type INodeProperties,
+} from 'n8n-workflow';
+
+import { handleErrorPostReceive, microsoftApiRequest } from '../GenericFunctions';
+
+export const userOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['user'],
+			},
+		},
+		options: [
+			{
+				name: 'Add to Group',
+				value: 'addGroup',
+				description: 'Add user to group',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '=/groups/{{ $parameter["group"] }}/members/$ref',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "added": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Add user to group',
+			},
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a user',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '/users',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Create user',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a user',
+				routing: {
+					request: {
+						method: 'DELETE',
+						url: '=/users/{{ $parameter["user"] }}',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "deleted": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Delete user',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data for a specific user',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/users/{{ $parameter["user"] }}',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Get user',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve a list of users',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/users',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'value',
+								},
+							},
+						],
+					},
+				},
+				action: 'Get many users',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				name: 'Remove from Group',
+				value: 'removeGroup',
+				description: 'Remove user from group',
+				routing: {
+					request: {
+						method: 'DELETE',
+						url: '=/groups/{{ $parameter["group"] }}/members/{{ $parameter["user"] }}/$ref',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "removed": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Remove user from group',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a user',
+				routing: {
+					request: {
+						method: 'PATCH',
+						url: '=/users/{{ $parameter["user"] }}',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "updated": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Update user',
+			},
+		],
+		default: 'getAll',
+	},
+];
+
+const addGroupFields: INodeProperties[] = [
+	{
+		displayName: 'Group',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['addGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'User to Add',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['addGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		routing: {
+			send: {
+				property: '@odata.id',
+				propertyInDotNotation: false,
+				type: 'body',
+				value: '=https://graph.microsoft.com/v1.0/directoryObjects/{{ $value }}',
+			},
+		},
+		type: 'resourceLocator',
+	},
+];
+
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'Account Enabled',
+		name: 'accountEnabled',
+		default: true,
+		description: 'Whether the account is enabled',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'accountEnabled',
+				type: 'body',
+			},
+		},
+		type: 'boolean',
+		validateType: 'boolean',
+	},
+	{
+		displayName: 'Display Name',
+		name: 'displayName',
+		default: '',
+		description: 'The name to display in the address book for the user',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. Nathan Smith',
+		required: true,
+		routing: {
+			send: {
+				property: 'displayName',
+				type: 'body',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'User Principal Name',
+		name: 'userPrincipalName',
+		default: '',
+		description: 'The user principal name (UPN)',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. NathanSmith@contoso.com',
+		required: true,
+		routing: {
+			send: {
+				property: 'userPrincipalName',
+				type: 'body',
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const userPrincipalName = this.getNodeParameter('userPrincipalName') as string;
+						if (!/^[A-Za-z0-9'._\-!#^~@]+$/.test(userPrincipalName)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"Only the following characters are allowed for 'User Principal Name': A-Z, a-z, 0-9, ' . - _ ! # ^ ~",
+							);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Mail Nickname',
+		name: 'mailNickname',
+		default: '',
+		description: 'The mail alias for the user',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. NathanSmith',
+		required: true,
+		routing: {
+			send: {
+				property: 'mailNickname',
+				type: 'body',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Password',
+		name: 'password',
+		default: '',
+		description: 'The password for the user',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'passwordProfile.password',
+				type: 'body',
+			},
+		},
+		type: 'string',
+		typeOptions: {
+			password: true,
+		},
+		validateType: 'string',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Me',
+				name: 'aboutMe',
+				default: '',
+				description: 'A freeform text entry field for the user to describe themselves',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Age Group',
+				name: 'ageGroup',
+				default: 'Adult',
+				description: 'Sets the age group of the user',
+				options: [
+					{
+						name: 'Adult',
+						value: 'Adult',
+					},
+					{
+						name: 'Minor',
+						value: 'Minor',
+					},
+					{
+						name: 'Not Adult',
+						value: 'NotAdult',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Birthday',
+				name: 'birthday',
+				default: '',
+				description: 'The birthday of the user',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Business Phone',
+				name: 'businessPhones',
+				default: '',
+				description: 'The telephone number for the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				default: '',
+				description: 'The city in which the user is located',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Company Name',
+				name: 'companyName',
+				default: '',
+				description: 'The name of the company associated with the user',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const companyName = this.getNodeParameter('additionalFields.companyName') as string;
+								if (companyName?.length > 64) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Company Name' should have a maximum length of 64",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Consent Provided',
+				name: 'consentProvidedForMinor',
+				default: 'Denied',
+				description: 'Specifies if consent is provided for minors',
+				options: [
+					{
+						name: 'Denied',
+						value: 'Denied',
+					},
+					{
+						name: 'Granted',
+						value: 'Granted',
+					},
+					{
+						name: 'Not Required',
+						value: 'NotRequired',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Country',
+				name: 'country',
+				default: '',
+				description: 'The country/region of the user',
+				placeholder: 'e.g. US',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Department',
+				name: 'department',
+				default: '',
+				description: 'The department name where the user works',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee ID',
+				name: 'employeeId',
+				default: '',
+				description: 'Employee identifier assigned by the organization',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const employeeId = this.getNodeParameter('additionalFields.employeeId') as string;
+								if (employeeId?.length > 16) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Employee ID' should have a maximum length of 16",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Type',
+				name: 'employeeType',
+				default: '',
+				description: 'Defines enterprise worker type',
+				placeholder: 'e.g. Contractor',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Hire Date',
+				name: 'employeeHireDate',
+				default: '',
+				description: 'The hire date of the user',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Leave Date',
+				name: 'employeeLeaveDateTime',
+				default: '',
+				description: 'The date and time when the user left or will leave the organization',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Organization Data',
+				name: 'employeeOrgData',
+				default: {},
+				description:
+					'Represents organization data (for example, division and costCenter) associated with a user',
+				options: [
+					{
+						displayName: 'Employee Organization Data',
+						name: 'employeeOrgValues',
+						values: [
+							{
+								displayName: 'Cost Center',
+								name: 'costCenter',
+								description: 'The cost center associated with the user',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Division',
+								name: 'division',
+								description: 'The name of the division in which the user works',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+				type: 'fixedCollection',
+				validateType: 'string',
+			},
+			{
+				displayName: 'First Name',
+				name: 'givenName',
+				default: '',
+				description: 'The given name (first name) of the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Force Change Password',
+				name: 'forceChangePassword',
+				default: 'forceChangePasswordNextSignIn',
+				description: 'Whether the user must change their password on the next sign-in',
+				options: [
+					{
+						name: 'Next Sign In',
+						value: 'forceChangePasswordNextSignIn',
+					},
+					{
+						name: 'Next Sign In with MFA',
+						value: 'forceChangePasswordNextSignInWithMfa',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Interests',
+				name: 'interests',
+				default: [],
+				description: 'A list for the user to describe their interests',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Job Title',
+				name: 'jobTitle',
+				default: '',
+				description: "The user's job title",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'surname',
+				default: '',
+				description: "The user's last name (family name)",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mail',
+				name: 'mail',
+				default: '',
+				description: 'The SMTP address for the user',
+				placeholder: 'e.g. jeff@contoso.com',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mobile Phone',
+				name: 'mobilePhone',
+				default: '',
+				description: 'The primary cellular telephone number for the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'My Site',
+				name: 'mySite',
+				default: '',
+				description: "The URL for the user's personal site",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Office Location',
+				name: 'officeLocation',
+				default: '',
+				description: 'The office location for the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'On Premises Immutable ID',
+				name: 'onPremisesImmutableId',
+				default: '',
+				description:
+					'This property is used to associate an on-premises Active Directory user account to their Microsoft Entra user object',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Other Emails',
+				name: 'otherMails',
+				default: [],
+				description: 'Additional email addresses for the user',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Password Policies',
+				name: 'passwordPolicies',
+				default: [],
+				description: 'Specifies password policies',
+				options: [
+					{
+						name: 'Disable Password Expiration',
+						value: 'DisablePasswordExpiration',
+					},
+					{
+						name: 'Disable Strong Password',
+						value: 'DisableStrongPassword',
+					},
+				],
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Past Projects',
+				name: 'pastProjects',
+				default: [],
+				description: 'A list of past projects the user has worked on',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				default: '',
+				description: "The postal code for the user's address",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Preferred Language',
+				name: 'preferredLanguage',
+				default: '',
+				description: "User's preferred language in ISO 639-1 code",
+				placeholder: 'e.g. en-US',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Responsibilities',
+				name: 'responsibilities',
+				default: [],
+				description: 'A list of responsibilities the user has',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Schools Attended',
+				name: 'schools',
+				default: [],
+				description: 'A list of schools the user attended',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Skills',
+				name: 'skills',
+				default: [],
+				description: 'A list of skills the user possesses',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				default: '',
+				description: "The state or province of the user's address",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				default: '',
+				description: "The street address of the user's place of business",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Usage Location',
+				name: 'usageLocation',
+				default: '',
+				description: 'Two-letter country code where the user is located',
+				placeholder: 'e.g. US',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'User Type',
+				name: 'userType',
+				default: 'Guest',
+				description: 'Classifies the user type',
+				options: [
+					{
+						name: 'Guest',
+						value: 'Guest',
+					},
+					{
+						name: 'Member',
+						value: 'Member',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const userId = item.json.id as string;
+							const fields = this.getNodeParameter('additionalFields', item.index) as IDataObject;
+							if (Object.keys(fields).length) {
+								const body: IDataObject = {
+									...fields,
+								};
+								if (body.birthday) {
+									body.birthday = (body.birthday as DateTime).toUTC().toISO();
+								}
+								if (body.businessPhones) {
+									body.businessPhones = [body.businessPhones as string];
+								}
+								if (body.employeeHireDate) {
+									body.employeeHireDate = (body.employeeHireDate as DateTime).toUTC().toISO();
+								}
+								if (body.employeeLeaveDateTime) {
+									body.employeeLeaveDateTime = (body.employeeLeaveDateTime as DateTime)
+										.toUTC()
+										.toISO();
+								}
+								if (body.employeeOrgData) {
+									body.employeeOrgData = (body.employeeOrgData as IDataObject).employeeOrgValues;
+								}
+								if (body.passwordPolicies) {
+									body.passwordPolicies = (body.passwordPolicies as string[]).join(',');
+								}
+								// forceChangePasswordNextSignInWithMfa doesn't seem to take effect when providing it in the initial create request,
+								// so we add it in the update request
+								if (body.forceChangePassword) {
+									if (body.forceChangePassword === 'forceChangePasswordNextSignIn') {
+										body.passwordProfile ??= {};
+										(body.passwordProfile as IDataObject).forceChangePasswordNextSignIn = true;
+									} else if (body.forceChangePassword === 'forceChangePasswordNextSignInWithMfa') {
+										body.passwordProfile ??= {};
+										(body.passwordProfile as IDataObject).forceChangePasswordNextSignInWithMfa =
+											true;
+									}
+									delete body.forceChangePassword;
+								}
+
+								// To update the following properties, you must specify them in their own PATCH request, without including the other properties
+								const separateProperties = [
+									'aboutMe',
+									'birthday',
+									'interests',
+									'mySite',
+									'pastProjects',
+									'responsibilities',
+									'schools',
+									'skills',
+								];
+								const separateBody: IDataObject = {};
+								for (const [key, value] of Object.entries(body)) {
+									if (separateProperties.includes(key)) {
+										separateBody[key] = value;
+										delete body[key];
+									}
+								}
+
+								try {
+									if (Object.keys(separateBody).length) {
+										await microsoftApiRequest.call(this, 'PATCH', `/users/${userId}`, separateBody);
+										merge(item.json, separateBody);
+									}
+									if (Object.keys(body).length) {
+										await microsoftApiRequest.call(this, 'PATCH', `/users/${userId}`, body);
+										merge(item.json, body);
+									}
+								} catch (error) {
+									try {
+										await microsoftApiRequest.call(this, 'DELETE', `/users/${userId}`);
+									} catch {}
+									throw error;
+								}
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+const deleteFields: INodeProperties[] = [
+	{
+		displayName: 'User to Delete',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const getFields: INodeProperties[] = [
+	{
+		displayName: 'User to Get',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+					},
+				},
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getUserProperties',
+		},
+		type: 'multiOptions',
+	},
+];
+
+const getAllFields: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		routing: {
+			send: {
+				paginate: '={{ $value }}',
+			},
+			operations: {
+				pagination: {
+					type: 'generic',
+					properties: {
+						continue: '={{ !!$response.body?.["@odata.nextLink"] }}',
+						request: {
+							url: '={{ $response.body?.["@odata.nextLink"] ?? $request.url }}',
+							qs: {
+								$filter:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$filter }}',
+								$select:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$select }}',
+							},
+						},
+					},
+				},
+			},
+		},
+		type: 'boolean',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		routing: {
+			send: {
+				property: '$top',
+				type: 'query',
+				value: '={{ $value }}',
+			},
+		},
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		validateType: 'number',
+	},
+	{
+		displayName: 'Filter',
+		name: 'filter',
+		default: '',
+		description:
+			'<a href="https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter">Query parameter</a> to filter results by',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		placeholder: "e.g. startswith(displayName, 'a')",
+		routing: {
+			send: {
+				property: '$filter',
+				type: 'query',
+				value: '={{ $value ? $value : undefined }}',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+					},
+				},
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getUserPropertiesGetAll',
+		},
+		type: 'multiOptions',
+	},
+];
+
+const removeGroupFields: INodeProperties[] = [
+	{
+		displayName: 'Group',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['removeGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'User to Remove',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['removeGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const updateFields: INodeProperties[] = [
+	{
+		displayName: 'User to Update',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Me',
+				name: 'aboutMe',
+				default: '',
+				description: 'A freeform text entry field for the user to describe themselves',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Account Enabled',
+				name: 'accountEnabled',
+				default: true,
+				description: 'Whether the account is enabled',
+				routing: {
+					send: {
+						property: 'accountEnabled',
+						type: 'body',
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Age Group',
+				name: 'ageGroup',
+				default: 'Adult',
+				description: 'Sets the age group of the user',
+				options: [
+					{
+						name: 'Adult',
+						value: 'Adult',
+					},
+					{
+						name: 'Minor',
+						value: 'Minor',
+					},
+					{
+						name: 'Not Adult',
+						value: 'NotAdult',
+					},
+				],
+				routing: {
+					send: {
+						property: 'ageGroup',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Birthday',
+				name: 'birthday',
+				default: '',
+				description: 'The birthday of the user',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Business Phone',
+				name: 'businessPhones',
+				default: '',
+				description: 'The telephone number for the user',
+				routing: {
+					send: {
+						property: 'businessPhones',
+						type: 'body',
+						value: '={{ $value ? [$value] : [] }}',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				default: '',
+				description: 'The city in which the user is located',
+				routing: {
+					send: {
+						property: 'city',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Company Name',
+				name: 'companyName',
+				default: '',
+				description: 'The name of the company associated with the user',
+				routing: {
+					send: {
+						property: 'companyName',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const companyName = this.getNodeParameter('updateFields.companyName') as string;
+								if (companyName?.length > 64) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Company Name' should have a maximum length of 64",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Consent Provided',
+				name: 'consentProvidedForMinor',
+				default: 'Denied',
+				description: 'Specifies if consent is provided for minors',
+				options: [
+					{
+						name: 'Denied',
+						value: 'Denied',
+					},
+					{
+						name: 'Granted',
+						value: 'Granted',
+					},
+					{
+						name: 'Not Required',
+						value: 'NotRequired',
+					},
+				],
+				routing: {
+					send: {
+						property: 'consentProvidedForMinor',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Country',
+				name: 'country',
+				default: '',
+				description: 'The country/region of the user',
+				placeholder: 'e.g. US',
+				routing: {
+					send: {
+						property: 'country',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Department',
+				name: 'department',
+				default: '',
+				description: 'The department name where the user works',
+				routing: {
+					send: {
+						property: 'department',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Display Name',
+				name: 'displayName',
+				default: '',
+				description: 'The name to display in the address book for the user',
+				routing: {
+					send: {
+						property: 'displayName',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+
+			{
+				displayName: 'Employee ID',
+				name: 'employeeId',
+				default: '',
+				description: 'Employee identifier assigned by the organization',
+				routing: {
+					send: {
+						property: 'employeeId',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const employeeId = this.getNodeParameter('updateFields.employeeId') as string;
+								if (employeeId?.length > 16) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Employee ID' should have a maximum length of 16",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Type',
+				name: 'employeeType',
+				default: '',
+				description: 'Defines enterprise worker type',
+				placeholder: 'e.g. Contractor',
+				routing: {
+					send: {
+						property: 'employeeType',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'First Name',
+				name: 'givenName',
+				default: '',
+				description: 'The given name (first name) of the user',
+				routing: {
+					send: {
+						property: 'givenName',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Hire Date',
+				name: 'employeeHireDate',
+				default: '',
+				description: 'The hire date of the user',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				routing: {
+					send: {
+						property: 'employeeHireDate',
+						type: 'body',
+						value: '={{ $value?.toUTC().toISO() }}',
+					},
+				},
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Leave Date',
+				name: 'employeeLeaveDateTime',
+				default: '',
+				description: 'The date and time when the user left or will leave the organization',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				routing: {
+					send: {
+						property: 'employeeLeaveDateTime',
+						type: 'body',
+						value: '={{ $value?.toUTC().toISO() }}',
+					},
+				},
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Organization Data',
+				name: 'employeeOrgData',
+				default: {},
+				description:
+					'Represents organization data (for example, division and costCenter) associated with a user',
+				options: [
+					{
+						displayName: 'Employee Organization Data',
+						name: 'employeeOrgValues',
+						values: [
+							{
+								displayName: 'Cost Center',
+								name: 'costCenter',
+								description: 'The cost center associated with the user',
+								routing: {
+									send: {
+										property: 'employeeOrgData.costCenter',
+										type: 'body',
+									},
+								},
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Division',
+								name: 'division',
+								description: 'The name of the division in which the user works',
+								routing: {
+									send: {
+										property: 'employeeOrgData.division',
+										type: 'body',
+									},
+								},
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+				type: 'fixedCollection',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Force Change Password',
+				name: 'forceChangePassword',
+				default: 'forceChangePasswordNextSignIn',
+				description: 'Whether the user must change their password on the next sign-in',
+				options: [
+					{
+						name: 'Next Sign In',
+						value: 'forceChangePasswordNextSignIn',
+					},
+					{
+						name: 'Next Sign In with MFA',
+						value: 'forceChangePasswordNextSignInWithMfa',
+					},
+				],
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const forceChangePassword = this.getNodeParameter(
+									'updateFields.forceChangePassword',
+								) as string;
+								if (forceChangePassword === 'forceChangePasswordNextSignIn') {
+									(requestOptions.body as IDataObject).passwordProfile ??= {};
+									(
+										(requestOptions.body as IDataObject).passwordProfile as IDataObject
+									).forceChangePasswordNextSignIn = true;
+								} else if (forceChangePassword === 'forceChangePasswordNextSignInWithMfa') {
+									(
+										(requestOptions.body as IDataObject).passwordProfile as IDataObject
+									).forceChangePasswordNextSignInWithMfa = true;
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Interests',
+				name: 'interests',
+				default: [],
+				description: 'A list for the user to describe their interests',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Job Title',
+				name: 'jobTitle',
+				default: '',
+				description: "The user's job title",
+				routing: {
+					send: {
+						property: 'jobTitle',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'surname',
+				default: '',
+				description: "The user's last name (family name)",
+				routing: {
+					send: {
+						property: 'surname',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mail',
+				name: 'mail',
+				default: '',
+				description: 'The SMTP address for the user',
+				placeholder: 'e.g. jeff@contoso.com',
+				routing: {
+					send: {
+						property: 'mail',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mail Nickname',
+				name: 'mailNickname',
+				default: '',
+				description: 'The mail alias for the user',
+				routing: {
+					send: {
+						property: 'mailNickname',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mobile Phone',
+				name: 'mobilePhone',
+				default: '',
+				description: 'The primary cellular telephone number for the user',
+				routing: {
+					send: {
+						property: 'mobilePhone',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'My Site',
+				name: 'mySite',
+				default: '',
+				description: "The URL for the user's personal site",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Office Location',
+				name: 'officeLocation',
+				default: '',
+				description: 'The office location for the user',
+				routing: {
+					send: {
+						property: 'officeLocation',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'On Premises Immutable ID',
+				name: 'onPremisesImmutableId',
+				default: '',
+				description:
+					'This property is used to associate an on-premises Active Directory user account to their Microsoft Entra user object',
+				routing: {
+					send: {
+						property: 'onPremisesImmutableId',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Other Emails',
+				name: 'otherMails',
+				default: [],
+				description: 'Additional email addresses for the user',
+				routing: {
+					send: {
+						property: 'otherMails',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				default: '',
+				description:
+					'The password for the user. The password must satisfy minimum requirements as specified by the passwordPolicies property.',
+				routing: {
+					send: {
+						property: 'passwordProfile.password',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				typeOptions: {
+					password: true,
+				},
+				validateType: 'string',
+			},
+			{
+				displayName: 'Password Policies',
+				name: 'passwordPolicies',
+				default: [],
+				description: 'Specifies password policies',
+				options: [
+					{
+						name: 'Disable Password Expiration',
+						value: 'DisablePasswordExpiration',
+					},
+					{
+						name: 'Disable Strong Password',
+						value: 'DisableStrongPassword',
+					},
+				],
+				routing: {
+					send: {
+						property: 'passwordPolicies',
+						type: 'body',
+						value: '={{ $value?.join(",") }}',
+					},
+				},
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Past Projects',
+				name: 'pastProjects',
+				default: [],
+				description: 'A list of past projects the user has worked on',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				default: '',
+				description: "The postal code for the user's address",
+				routing: {
+					send: {
+						property: 'postalCode',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Preferred Language',
+				name: 'preferredLanguage',
+				default: '',
+				description: "User's preferred language in ISO 639-1 code",
+				placeholder: 'e.g. en-US',
+				routing: {
+					send: {
+						property: 'preferredLanguage',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Responsibilities',
+				name: 'responsibilities',
+				default: [],
+				description: 'A list of responsibilities the user has',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Schools Attended',
+				name: 'schools',
+				default: [],
+				description: 'A list of schools the user attended',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Skills',
+				name: 'skills',
+				default: [],
+				description: 'A list of skills the user possesses',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				default: '',
+				description: "The state or province of the user's address",
+				routing: {
+					send: {
+						property: 'state',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				default: '',
+				description: "The street address of the user's place of business",
+				routing: {
+					send: {
+						property: 'streetAddress',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Usage Location',
+				name: 'usageLocation',
+				default: '',
+				description: 'Two-letter country code where the user is located',
+				placeholder: 'e.g. US',
+				routing: {
+					send: {
+						property: 'usageLocation',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'User Principal Name',
+				name: 'userPrincipalName',
+				default: '',
+				description: 'The user principal name (UPN)',
+				placeholder: 'e.g. AdeleV@contoso.com',
+				routing: {
+					send: {
+						property: 'userPrincipalName',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const userPrincipalName = this.getNodeParameter(
+									'updateFields.userPrincipalName',
+								) as string;
+								if (!/^[A-Za-z0-9'._\-!#^~@]+$/.test(userPrincipalName)) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"Only the following characters are allowed for 'User Principal Name': A-Z, a-z, 0-9, ' . - _ ! # ^ ~",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'User Type',
+				name: 'userType',
+				default: 'Guest',
+				description: 'Classifies the user type',
+				options: [
+					{
+						name: 'Guest',
+						value: 'Guest',
+					},
+					{
+						name: 'Member',
+						value: 'Member',
+					},
+				],
+				routing: {
+					send: {
+						property: 'userType',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const userId = this.getNodeParameter('user.value', item.index) as string;
+							const fields = this.getNodeParameter('updateFields', item.index) as IDataObject;
+							// To update the following properties, you must specify them in their own PATCH request, without including the other properties
+							const separateProperties = [
+								'aboutMe',
+								'birthday',
+								'interests',
+								'mySite',
+								'pastProjects',
+								'responsibilities',
+								'schools',
+								'skills',
+							];
+							const separateFields = Object.keys(fields)
+								.filter((key) => separateProperties.includes(key))
+								.reduce((obj, key) => {
+									return {
+										...obj,
+										[key]: fields[key],
+									};
+								}, {});
+							if (Object.keys(separateFields).length) {
+								const body: IDataObject = {
+									...separateFields,
+								};
+								if (body.birthday) {
+									body.birthday = (body.birthday as DateTime).toUTC().toISO();
+								}
+								await microsoftApiRequest.call(this, 'PATCH', `/users/${userId}`, body);
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+export const userFields: INodeProperties[] = [
+	...addGroupFields,
+	...createFields,
+	...deleteFields,
+	...getFields,
+	...getAllFields,
+	...removeGroupFields,
+	...updateFields,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts
new file mode 100644
index 0000000000..ee8ab1abc0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts
@@ -0,0 +1,2 @@
+export * from './GroupDescription';
+export * from './UserDescription';
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg
new file mode 100644
index 0000000000..25b70ef180
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg
@@ -0,0 +1,4 @@
+<svg width="42" height="40" viewBox="0 0 42 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M40.2158 22.1487C41.5024 23.6021 41.1669 25.7976 39.498 26.8398V26.8376L22.8313 37.2554C22.33 37.5682 21.7635 37.7399 21.189 37.7704L21.1882 37.7906C20.5527 37.7906 19.7243 37.6044 19.1687 37.2577L9.44873 31.1821C10.311 31.7199 11.7443 32.3177 13.2598 32.3177C14.6398 32.3177 15.9221 31.9177 16.9843 31.2355C16.9843 31.2355 16.9865 31.2355 16.9887 31.2332L21.5727 28.3589L21.5723 28.3681L30.7024 22.6621L21.0047 11.7198L21.2469 11.4465C22.4691 10.0532 24.3069 9.1665 26.3624 9.1665C27.4091 9.1665 28.398 9.40206 29.2802 9.81317L40.2158 22.1487Z" stroke="white" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M21.0022 2.22439V2.22217L21 2.22439L21.0022 2.22439ZM21.0022 2.22439C21.9415 2.22498 22.8827 2.60054 23.5467 3.35106L29.2778 9.8155C28.3956 9.40661 27.4089 9.16883 26.36 9.16883C24.3044 9.16883 22.4667 10.0555 21.2444 11.4488L21.0703 11.6453L21.0703 11.6484L11.3022 22.6644L21 28.7266L16.9889 31.2333C16.9867 31.2355 16.9844 31.2355 16.9844 31.2355C15.9222 31.9177 14.64 32.3177 13.26 32.3177C11.7444 32.3177 10.3111 31.7199 9.44888 31.1822C8.6711 30.6955 2.50221 26.8399 2.50221 26.8399C0.833325 25.7977 0.49777 23.6022 1.78444 22.1488L18.4511 3.34883C19.1091 2.60751 20.0714 2.2363 21.0022 2.22675V2.22439Z" stroke="white" stroke-width="1.2" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg
new file mode 100644
index 0000000000..de31695579
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg
@@ -0,0 +1,8 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.44824 30.9595C9.31047 31.4972 10.7438 32.095 12.2594 32.095C13.6394 32.095 14.9216 31.695 15.9838 31.0128C15.9838 31.0128 15.986 31.0128 15.9883 31.0106L19.9994 28.5039V37.555C19.3638 37.555 18.7238 37.3817 18.1683 37.035L8.44824 30.9595Z" fill="#225086"/>
+<path d="M17.4511 3.12667L0.784438 21.9267C-0.502231 23.38 -0.166675 25.5756 1.50222 26.6178C1.50222 26.6178 7.67112 30.4734 8.44889 30.96C9.31112 31.4978 10.7445 32.0956 12.26 32.0956C13.64 32.0956 14.9222 31.6956 15.9845 31.0134C15.9845 31.0134 15.9867 31.0134 15.9889 31.0112L20 28.5045L10.3022 22.4423L20.0022 11.5V2C19.06 2 18.1178 2.37556 17.4511 3.12667Z" fill="#66DDFF"/>
+<path d="M10.3027 22.4422L10.4183 22.5133L20.0005 28.5045H20.0027V11.5022L20.0005 11.5L10.3027 22.4422Z" fill="#CBF8FF"/>
+<path d="M38.498 26.6177C40.1669 25.5755 40.5025 23.3799 39.2158 21.9266L28.2802 9.591C27.398 9.17989 26.4091 8.94434 25.3624 8.94434C23.3069 8.94434 21.4691 9.831 20.2469 11.2243L20.0047 11.4977L29.7025 22.4399L20.0024 28.5021V37.5533C20.6402 37.5533 21.2758 37.3799 21.8313 37.0333L38.498 26.6155V26.6177Z" fill="#074793"/>
+<path d="M20.0022 2V11.5L20.2444 11.2267C21.4667 9.83334 23.3044 8.94668 25.36 8.94668C26.4089 8.94668 27.3956 9.18445 28.2778 9.59334L22.5467 3.12889C21.8822 2.37778 20.94 2.00222 20 2.00222L20.0022 2Z" fill="#0294E4"/>
+<path d="M29.7002 22.442L20.0024 11.502V28.502L29.7002 22.442Z" fill="#96BCC2"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
new file mode 100644
index 0000000000..632792ea96
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
@@ -0,0 +1,775 @@
+import { NodeConnectionType } from 'n8n-workflow';
+import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
+
+describe('Gong Node', () => {
+	const baseUrl = 'https://graph.microsoft.com/v1.0';
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('Group description', () => {
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'should create group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'create',
+									displayName: 'Group Display Name',
+									groupType: 'Unified',
+									mailEnabled: true,
+									mailNickname: 'MailNickname',
+									membershipType: 'DynamicMembership',
+									securityEnabled: true,
+									additionalFields: {
+										isAssignableToRole: true,
+										description: 'Group Description',
+										membershipRule: 'department -eq "Marketing"',
+										membershipRuleProcessingState: 'On',
+										preferredDataLocation: 'Preferred Data Location',
+										uniqueName: 'UniqueName',
+										visibility: 'Public',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.createGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'post',
+							path: '/groups',
+							statusCode: 201,
+							requestBody: {
+								displayName: 'Group Display Name',
+								mailNickname: 'MailNickname',
+								mailEnabled: true,
+								membershipRule: 'department -eq "Marketing"',
+								membershipRuleProcessingState: 'On',
+								securityEnabled: true,
+								groupTypes: ['Unified', 'DynamicMembership'],
+							},
+							responseBody: microsoftEntraApiResponse.postGroup,
+						},
+						{
+							method: 'patch',
+							path: `/groups/${microsoftEntraApiResponse.postGroup.id}`,
+							statusCode: 204,
+							requestBody: {
+								description: 'Group Description',
+								preferredDataLocation: 'Preferred Data Location',
+								uniqueName: 'UniqueName',
+								visibility: 'Public',
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should delete group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'delete',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									options: {},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.deleteGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'delete',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b',
+							statusCode: 204,
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'get',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b',
+							statusCode: 200,
+							responseBody: microsoftEntraApiResponse.getGroup,
+						},
+					],
+				},
+			},
+			{
+				description: 'should get group with fields output and members',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'get',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									output: 'fields',
+									fields: [
+										'assignedLabels',
+										'assignedLicenses',
+										'createdDateTime',
+										'classification',
+										'deletedDateTime',
+										'description',
+										'displayName',
+										'expirationDateTime',
+										'groupTypes',
+										'visibility',
+										'unseenCount',
+										'theme',
+										'uniqueName',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'renewedDateTime',
+										'securityEnabled',
+										'autoSubscribeNewMembers',
+										'allowExternalSenders',
+										'licenseProcessingState',
+										'isManagementRestricted',
+										'isSubscribedByMail',
+										'isAssignableToRole',
+										'id',
+										'hideFromOutlookClients',
+										'hideFromAddressLists',
+										'onPremisesProvisioningErrors',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSamAccountName',
+										'onPremisesNetBiosName',
+										'onPremisesSyncEnabled',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'proxyAddresses',
+										'onPremisesLastSyncDateTime',
+										'onPremisesDomainName',
+										'membershipRuleProcessingState',
+										'membershipRule',
+										'mailNickname',
+										'mailEnabled',
+										'mail',
+									],
+									options: {
+										includeMembers: true,
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getGroupWithProperties],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b?$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,unseenCount,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,autoSubscribeNewMembers,allowExternalSenders,licenseProcessingState,isManagementRestricted,isSubscribedByMail,isAssignableToRole,id,hideFromOutlookClients,hideFromAddressLists,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id&$expand=members($select=id,accountEnabled,createdDateTime,displayName,employeeId,mail,securityIdentifier,userPrincipalName,userType)',
+							statusCode: 200,
+							responseBody: microsoftEntraApiResponse.getGroupWithProperties,
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all groups with simple output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'getAll',
+									returnAll: true,
+									filter: '',
+									output: 'simple',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(102).fill(microsoftEntraNodeResponse.getGroup[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups?$select=id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/groups?$select=id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(100).fill(microsoftEntraApiResponse.getGroup),
+							},
+						},
+						{
+							method: 'get',
+							path: '/groups?$select=id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								value: new Array(2).fill(microsoftEntraApiResponse.getGroup),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get limit 10 groups with raw output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'getAll',
+									limit: 10,
+									filter: '',
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(10).fill(microsoftEntraNodeResponse.getGroup[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups?$top=10',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/groups?$top=10&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(10).fill(microsoftEntraApiResponse.getGroup),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all groups with options and filter',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'getAll',
+									returnAll: true,
+									filter: "startswith(displayName,'group')",
+									output: 'fields',
+									fields: [
+										'assignedLabels',
+										'assignedLicenses',
+										'createdDateTime',
+										'classification',
+										'deletedDateTime',
+										'description',
+										'displayName',
+										'expirationDateTime',
+										'groupTypes',
+										'visibility',
+										'theme',
+										'uniqueName',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'renewedDateTime',
+										'securityEnabled',
+										'licenseProcessingState',
+										'isManagementRestricted',
+										'isAssignableToRole',
+										'onPremisesProvisioningErrors',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSamAccountName',
+										'onPremisesNetBiosName',
+										'onPremisesSyncEnabled',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'proxyAddresses',
+										'onPremisesLastSyncDateTime',
+										'onPremisesDomainName',
+										'membershipRuleProcessingState',
+										'membershipRule',
+										'mailNickname',
+										'mailEnabled',
+										'mail',
+									],
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [
+							new Array(102).fill(microsoftEntraNodeResponse.getGroupWithProperties[0]),
+						],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: "/groups?$filter=startswith(displayName,'group')&$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,licenseProcessingState,isManagementRestricted,isAssignableToRole,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								'@odata.nextLink':
+									"https://graph.microsoft.com/v1.0/groups?$filter=startswith(displayName,'group')&$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,licenseProcessingState,isManagementRestricted,isAssignableToRole,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+								value: new Array(100).fill(microsoftEntraApiResponse.getGroupWithProperties),
+							},
+						},
+						{
+							method: 'get',
+							path: "/groups?$filter=startswith(displayName,'group')&$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,licenseProcessingState,isManagementRestricted,isAssignableToRole,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								value: new Array(2).fill(microsoftEntraApiResponse.getGroupWithProperties),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should update group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'update',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									updateFields: {
+										allowExternalSenders: true,
+										autoSubscribeNewMembers: true,
+										description: 'Group Description',
+										displayName: 'Group Display Name',
+										mailNickname: 'MailNickname',
+										membershipRule: 'department -eq "Marketing"',
+										membershipRuleProcessingState: 'On',
+										preferredDataLocation: 'Preferred Data Location',
+										securityEnabled: true,
+										uniqueName: 'UniqueName',
+										visibility: 'Public',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.updateGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'patch',
+							path: `/groups/${microsoftEntraApiResponse.postGroup.id}`,
+							statusCode: 204,
+							requestBody: {
+								description: 'Group Description',
+								displayName: 'Group Display Name',
+								mailNickname: 'MailNickname',
+								membershipRule: 'department -eq "Marketing"',
+								membershipRuleProcessingState: 'On',
+								preferredDataLocation: 'Preferred Data Location',
+								securityEnabled: true,
+								uniqueName: 'UniqueName',
+								visibility: 'Public',
+							},
+							responseBody: {},
+						},
+						{
+							method: 'patch',
+							path: `/groups/${microsoftEntraApiResponse.postGroup.id}`,
+							statusCode: 204,
+							requestBody: {
+								allowExternalSenders: true,
+								autoSubscribeNewMembers: true,
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+		];
+
+		const nodeTypes = Helpers.setup(tests);
+
+		test.each(tests)('$description', async (testData) => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+			expect(result.status).toEqual('success');
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
new file mode 100644
index 0000000000..5b15152624
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
@@ -0,0 +1,249 @@
+import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
+import { FAKE_CREDENTIALS_DATA } from '../../../../test/nodes/FakeCredentialsMap';
+import { MicrosoftEntra } from '../MicrosoftEntra.node';
+
+describe('Gong Node', () => {
+	const baseUrl = 'https://graph.microsoft.com/v1.0';
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('Credentials', () => {
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'should use correct credentials',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								type: 'n8n-nodes-base.manualTrigger',
+								typeVersion: 1,
+								position: [0, 0],
+								id: '1307e408-a8a5-464e-b858-494953e2f43b',
+								name: "When clicking 'Test workflow'",
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'get',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									filter: '',
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getGroup],
+					},
+				},
+			},
+		];
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			jest
+				.spyOn(Helpers.CredentialsHelper.prototype, 'authenticate')
+				.mockImplementation(
+					async (
+						credentials: ICredentialDataDecryptedObject,
+						typeName: string,
+						requestParams: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> => {
+						if (typeName === 'microsoftEntraOAuth2Api') {
+							return {
+								...requestParams,
+								headers: {
+									authorization:
+										'bearer ' + (credentials.oauthTokenData as IDataObject).access_token,
+								},
+							};
+						} else {
+							return requestParams;
+						}
+					},
+				);
+		});
+
+		afterAll(() => {
+			nock.restore();
+			jest.restoreAllMocks();
+		});
+
+		nock(baseUrl)
+			.get(`/groups/${microsoftEntraApiResponse.getGroup.id}`)
+			.matchHeader(
+				'authorization',
+				'bearer ' + FAKE_CREDENTIALS_DATA.microsoftEntraOAuth2Api.oauthTokenData.access_token,
+			)
+			.reply(200, {
+				...microsoftEntraApiResponse.getGroup,
+			});
+
+		const nodeTypes = Helpers.setup(tests);
+
+		test.each(tests)('$description', async (testData) => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+			expect(result.status).toEqual('success');
+		});
+	});
+
+	describe('Load options', () => {
+		it('should load group properties', async () => {
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: jest
+						.fn()
+						.mockReturnValue(microsoftEntraApiResponse.metadata.groups),
+				},
+				getCurrentNodeParameter: jest.fn(),
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const properties = await node.methods.loadOptions.getGroupProperties.call(mockContext);
+
+			expect(properties).toEqual(microsoftEntraNodeResponse.loadOptions.getGroupProperties);
+		});
+
+		it('should load user properties', async () => {
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: jest
+						.fn()
+						.mockReturnValue(microsoftEntraApiResponse.metadata.users),
+				},
+				getCurrentNodeParameter: jest.fn(),
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const properties = await node.methods.loadOptions.getUserProperties.call(mockContext);
+
+			expect(properties).toEqual(microsoftEntraNodeResponse.loadOptions.getUserProperties);
+		});
+	});
+
+	describe('List search', () => {
+		it('should list search groups', async () => {
+			const mockResponse = {
+				value: Array.from({ length: 2 }, (_, i) => ({
+					id: (i + 1).toString(),
+					displayName: `Group ${i + 1}`,
+				})),
+				'@odata.nextLink': '',
+			};
+			const mockRequestWithAuthentication = jest.fn().mockReturnValue(mockResponse);
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: mockRequestWithAuthentication,
+				},
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const listSearchResult = await node.methods.listSearch.getGroups.call(mockContext);
+
+			expect(mockRequestWithAuthentication).toHaveBeenCalledWith('microsoftEntraOAuth2Api', {
+				method: 'GET',
+				url: 'https://graph.microsoft.com/v1.0/groups',
+				json: true,
+				headers: {},
+				body: {},
+				qs: {
+					$select: 'id,displayName',
+				},
+			});
+			expect(listSearchResult).toEqual({
+				results: mockResponse.value.map((x) => ({ name: x.displayName, value: x.id })),
+				paginationToken: mockResponse['@odata.nextLink'],
+			});
+		});
+
+		it('should list search users', async () => {
+			const mockResponse = {
+				value: Array.from({ length: 2 }, (_, i) => ({
+					id: (i + 1).toString(),
+					displayName: `User ${i + 1}`,
+				})),
+				'@odata.nextLink': '',
+			};
+			const mockRequestWithAuthentication = jest.fn().mockReturnValue(mockResponse);
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: mockRequestWithAuthentication,
+				},
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const listSearchResult = await node.methods.listSearch.getUsers.call(mockContext);
+
+			expect(mockRequestWithAuthentication).toHaveBeenCalledWith('microsoftEntraOAuth2Api', {
+				method: 'GET',
+				url: 'https://graph.microsoft.com/v1.0/users',
+				json: true,
+				headers: {},
+				body: {},
+				qs: {
+					$select: 'id,displayName',
+				},
+			});
+			expect(listSearchResult).toEqual({
+				results: mockResponse.value.map((x) => ({ name: x.displayName, value: x.id })),
+				paginationToken: mockResponse['@odata.nextLink'],
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
new file mode 100644
index 0000000000..b245e12f70
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
@@ -0,0 +1,1161 @@
+import { NodeConnectionType } from 'n8n-workflow';
+import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
+
+describe('Gong Node', () => {
+	const baseUrl = 'https://graph.microsoft.com/v1.0';
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('User description', () => {
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'should add user to group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'addGroup',
+									group: {
+										__rl: true,
+										mode: 'id',
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+									},
+									user: {
+										__rl: true,
+										mode: 'id',
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.addUserToGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'post',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b/members/$ref',
+							statusCode: 204,
+							requestBody: {
+								'@odata.id':
+									'https://graph.microsoft.com/v1.0/directoryObjects/87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should create user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									operation: 'create',
+									displayName: 'John Doe',
+									mailNickname: 'johndoe',
+									password: 'Test!12345',
+									userPrincipalName: 'johndoe@contoso.com',
+									additionalFields: {
+										aboutMe: 'About me',
+										ageGroup: 'Adult',
+										birthday: '2024-11-12T00:00:00Z',
+										businessPhones: '0123456789',
+										city: 'New York',
+										companyName: 'Contoso',
+										consentProvidedForMinor: 'Granted',
+										country: 'US',
+										department: 'IT',
+										employeeId: 'employee-id-123',
+										employeeType: 'Contractor',
+										forceChangePassword: 'forceChangePasswordNextSignInWithMfa',
+										givenName: 'John',
+										employeeHireDate: '2024-11-13T00:00:00Z',
+										employeeLeaveDateTime: '2024-11-18T00:00:00Z',
+										employeeOrgData: {
+											employeeOrgValues: {
+												costCenter: 'Cost Center 1',
+												division: 'Division 1',
+											},
+										},
+										interests: ['interest1', 'interest2'],
+										jobTitle: 'Project manager',
+										surname: 'Doe',
+										mail: 'johndoe@contoso.com',
+										mobilePhone: '+123456789',
+										mySite: 'My Site',
+										officeLocation: 'New York',
+										onPremisesImmutableId: 'premiseid123',
+										otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+										passwordPolicies: ['DisablePasswordExpiration', 'DisableStrongPassword'],
+										pastProjects: ['project1', 'project2'],
+										postalCode: '0123456',
+										preferredLanguage: 'en-US',
+										responsibilities: ['responsibility1', 'responsibility2'],
+										schools: ['school1', 'school2'],
+										skills: ['skill1', 'skill2'],
+										state: 'New York',
+										streetAddress: 'Street 123',
+										usageLocation: 'US',
+										userType: 'Guest',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.createUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'post',
+							path: '/users',
+							statusCode: 201,
+							requestBody: {
+								accountEnabled: true,
+								displayName: 'John Doe',
+								mailNickname: 'johndoe',
+								passwordProfile: {
+									password: 'Test!12345',
+								},
+								userPrincipalName: 'johndoe@contoso.com',
+							},
+							responseBody: microsoftEntraApiResponse.postUser,
+						},
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								ageGroup: 'Adult',
+								businessPhones: ['0123456789'],
+								city: 'New York',
+								companyName: 'Contoso',
+								consentProvidedForMinor: 'Granted',
+								country: 'US',
+								department: 'IT',
+								employeeId: 'employee-id-123',
+								employeeType: 'Contractor',
+								givenName: 'John',
+								employeeHireDate: '2024-11-13T00:00:00.000Z',
+								employeeLeaveDateTime: '2024-11-18T00:00:00.000Z',
+								employeeOrgData: {
+									costCenter: 'Cost Center 1',
+									division: 'Division 1',
+								},
+								jobTitle: 'Project manager',
+								surname: 'Doe',
+								mail: 'johndoe@contoso.com',
+								mobilePhone: '+123456789',
+								officeLocation: 'New York',
+								onPremisesImmutableId: 'premiseid123',
+								otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+								passwordPolicies: 'DisablePasswordExpiration,DisableStrongPassword',
+								passwordProfile: {
+									forceChangePasswordNextSignInWithMfa: true,
+								},
+								postalCode: '0123456',
+								preferredLanguage: 'en-US',
+								state: 'New York',
+								streetAddress: 'Street 123',
+								usageLocation: 'US',
+								userType: 'Guest',
+							},
+							responseBody: {},
+						},
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								aboutMe: 'About me',
+								birthday: '2024-11-12T00:00:00.000Z',
+								interests: ['interest1', 'interest2'],
+								mySite: 'My Site',
+								pastProjects: ['project1', 'project2'],
+								responsibilities: ['responsibility1', 'responsibility2'],
+								schools: ['school1', 'school2'],
+								skills: ['skill1', 'skill2'],
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should delete user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'delete',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									options: {},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.deleteUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'delete',
+							path: '/users/87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+							statusCode: 204,
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'get',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users/87d349ed-44d7-43e1-9a83-5f2406dee5bd?$select=id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+							statusCode: 200,
+							responseBody: microsoftEntraApiResponse.getUser,
+						},
+					],
+				},
+			},
+			{
+				description: 'should get user with options',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'get',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									output: 'fields',
+									fields: [
+										'aboutMe',
+										'accountEnabled',
+										'ageGroup',
+										'assignedLicenses',
+										'assignedPlans',
+										'authorizationInfo',
+										'birthday',
+										'businessPhones',
+										'city',
+										'companyName',
+										'consentProvidedForMinor',
+										'country',
+										'createdDateTime',
+										'creationType',
+										'customSecurityAttributes',
+										'deletedDateTime',
+										'department',
+										'displayName',
+										'employeeHireDate',
+										'employeeId',
+										'employeeLeaveDateTime',
+										'employeeOrgData',
+										'externalUserStateChangeDateTime',
+										'externalUserState',
+										'employeeType',
+										'faxNumber',
+										'givenName',
+										'hireDate',
+										'identities',
+										'imAddresses',
+										'interests',
+										'isManagementRestricted',
+										'isResourceAccount',
+										'jobTitle',
+										'lastPasswordChangeDateTime',
+										'legalAgeGroupClassification',
+										'licenseAssignmentStates',
+										'mail',
+										'mailNickname',
+										'mobilePhone',
+										'mySite',
+										'officeLocation',
+										'onPremisesDistinguishedName',
+										'onPremisesDomainName',
+										'onPremisesExtensionAttributes',
+										'onPremisesImmutableId',
+										'onPremisesLastSyncDateTime',
+										'onPremisesProvisioningErrors',
+										'onPremisesSamAccountName',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSyncEnabled',
+										'onPremisesUserPrincipalName',
+										'otherMails',
+										'passwordPolicies',
+										'passwordProfile',
+										'pastProjects',
+										'postalCode',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'preferredName',
+										'provisionedPlans',
+										'proxyAddresses',
+										'userType',
+										'userPrincipalName',
+										'usageLocation',
+										'surname',
+										'streetAddress',
+										'state',
+										'skills',
+										'signInSessionsValidFromDateTime',
+										'showInAddressList',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'schools',
+										'responsibilities',
+									],
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [
+							[
+								{
+									json: {
+										'@odata.context':
+											'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+										id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+									},
+								},
+							],
+						],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users/87d349ed-44d7-43e1-9a83-5f2406dee5bd?$select=aboutMe,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,birthday,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,externalUserStateChangeDateTime,externalUserState,employeeType,faxNumber,givenName,hireDate,identities,imAddresses,interests,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,mySite,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,pastProjects,postalCode,preferredDataLocation,preferredLanguage,preferredName,provisionedPlans,proxyAddresses,userType,userPrincipalName,usageLocation,surname,streetAddress,state,skills,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,schools,responsibilities,id',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+								id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all users with simple output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'getAll',
+									returnAll: true,
+									filter: '',
+									output: 'simple',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(102).fill(microsoftEntraNodeResponse.getUser[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users?$select=id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/users?$select=id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(100).fill(microsoftEntraApiResponse.getUser),
+							},
+						},
+						{
+							method: 'get',
+							path: '/users?$select=id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								value: new Array(2).fill(microsoftEntraApiResponse.getUser),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get limit 10 users with raw output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'getAll',
+									limit: 10,
+									filter: '',
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(10).fill(microsoftEntraNodeResponse.getUser[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users?$top=10&$select=id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/users?$top=10&$select=id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(10).fill(microsoftEntraApiResponse.getUser),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all users with options and filter',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'getAll',
+									returnAll: true,
+									filter: "startswith(displayName,'user')",
+									output: 'fields',
+									fields: [
+										'accountEnabled',
+										'ageGroup',
+										'assignedLicenses',
+										'assignedPlans',
+										'businessPhones',
+										'authorizationInfo',
+										'city',
+										'companyName',
+										'consentProvidedForMinor',
+										'country',
+										'createdDateTime',
+										'creationType',
+										'customSecurityAttributes',
+										'deletedDateTime',
+										'department',
+										'displayName',
+										'employeeHireDate',
+										'employeeId',
+										'employeeLeaveDateTime',
+										'employeeOrgData',
+										'employeeType',
+										'externalUserState',
+										'externalUserStateChangeDateTime',
+										'faxNumber',
+										'givenName',
+										'identities',
+										'imAddresses',
+										'isManagementRestricted',
+										'isResourceAccount',
+										'jobTitle',
+										'lastPasswordChangeDateTime',
+										'legalAgeGroupClassification',
+										'licenseAssignmentStates',
+										'mailNickname',
+										'mail',
+										'mobilePhone',
+										'officeLocation',
+										'onPremisesDistinguishedName',
+										'onPremisesExtensionAttributes',
+										'onPremisesDomainName',
+										'onPremisesImmutableId',
+										'onPremisesLastSyncDateTime',
+										'onPremisesProvisioningErrors',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSamAccountName',
+										'onPremisesSyncEnabled',
+										'onPremisesUserPrincipalName',
+										'otherMails',
+										'passwordPolicies',
+										'passwordProfile',
+										'postalCode',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'provisionedPlans',
+										'proxyAddresses',
+										'signInSessionsValidFromDateTime',
+										'showInAddressList',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'state',
+										'streetAddress',
+										'surname',
+										'usageLocation',
+										'userPrincipalName',
+										'userType',
+									],
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [
+							new Array(102).fill({
+								json: {
+									'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+									id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+								},
+							}),
+						],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: "/users?$filter=startswith(displayName,'user')&$select=accountEnabled,ageGroup,assignedLicenses,assignedPlans,businessPhones,authorizationInfo,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mailNickname,mail,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesExtensionAttributes,onPremisesDomainName,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,state,streetAddress,surname,usageLocation,userPrincipalName,userType,id",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								'@odata.nextLink':
+									"https://graph.microsoft.com/v1.0/users?$filter=startswith(displayName,'user')&$select=accountEnabled,ageGroup,assignedLicenses,assignedPlans,businessPhones,authorizationInfo,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mailNickname,mail,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesExtensionAttributes,onPremisesDomainName,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,state,streetAddress,surname,usageLocation,userPrincipalName,userType,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+								value: new Array(100).fill({
+									'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+									id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+								}),
+							},
+						},
+						{
+							method: 'get',
+							path: "/users?$filter=startswith(displayName,'user')&$select=accountEnabled,ageGroup,assignedLicenses,assignedPlans,businessPhones,authorizationInfo,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mailNickname,mail,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesExtensionAttributes,onPremisesDomainName,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,state,streetAddress,surname,usageLocation,userPrincipalName,userType,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								value: new Array(2).fill({
+									'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+									id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+								}),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should remove user from group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'removeGroup',
+									group: {
+										__rl: true,
+										mode: 'id',
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+									},
+									user: {
+										__rl: true,
+										mode: 'id',
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.removeUserFromGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'delete',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b/members/87d349ed-44d7-43e1-9a83-5f2406dee5bd/$ref',
+							statusCode: 204,
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should update user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'update',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									updateFields: {
+										aboutMe: 'About me',
+										accountEnabled: true,
+										ageGroup: 'Adult',
+										birthday: '2024-11-12T00:00:00Z',
+										businessPhones: '0123456789',
+										city: 'New York',
+										companyName: 'Contoso',
+										consentProvidedForMinor: 'Granted',
+										country: 'US',
+										department: 'IT',
+										displayName: 'Group Display Name',
+										employeeId: 'employee-id-123',
+										employeeType: 'Contractor',
+										forceChangePassword: 'forceChangePasswordNextSignInWithMfa',
+										givenName: 'John',
+										employeeHireDate: '2024-11-13T00:00:00Z',
+										employeeLeaveDateTime: '2024-11-18T00:00:00Z',
+										employeeOrgData: {
+											employeeOrgValues: {
+												costCenter: 'Cost Center 1',
+												division: 'Division 1',
+											},
+										},
+										interests: ['interest1', 'interest2'],
+										jobTitle: 'Project manager',
+										surname: 'Doe',
+										mail: 'johndoe@contoso.com',
+										mailNickname: 'MailNickname',
+										mobilePhone: '+123456789',
+										mySite: 'My Site',
+										officeLocation: 'New York',
+										onPremisesImmutableId: 'premiseid123',
+										otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+										password: 'Test!12345',
+										passwordPolicies: ['DisablePasswordExpiration', 'DisableStrongPassword'],
+										pastProjects: ['project1', 'project2'],
+										postalCode: '0123456',
+										preferredLanguage: 'en-US',
+										responsibilities: ['responsibility1', 'responsibility2'],
+										schools: ['school1', 'school2'],
+										skills: ['skill1', 'skill2'],
+										state: 'New York',
+										streetAddress: 'Street 123',
+										usageLocation: 'US',
+										userPrincipalName: 'johndoe@contoso.com',
+										userType: 'Guest',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.updateUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								accountEnabled: true,
+								ageGroup: 'Adult',
+								businessPhones: ['0123456789'],
+								city: 'New York',
+								companyName: 'Contoso',
+								consentProvidedForMinor: 'Granted',
+								country: 'US',
+								department: 'IT',
+								displayName: 'Group Display Name',
+								employeeId: 'employee-id-123',
+								employeeType: 'Contractor',
+								givenName: 'John',
+								employeeHireDate: null,
+								employeeLeaveDateTime: null,
+								employeeOrgData: {
+									costCenter: 'Cost Center 1',
+									division: 'Division 1',
+								},
+								jobTitle: 'Project manager',
+								surname: 'Doe',
+								mail: 'johndoe@contoso.com',
+								mailNickname: 'MailNickname',
+								mobilePhone: '+123456789',
+								officeLocation: 'New York',
+								onPremisesImmutableId: 'premiseid123',
+								otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+								passwordProfile: {
+									password: 'Test!12345',
+									forceChangePasswordNextSignInWithMfa: true,
+								},
+								passwordPolicies: 'DisablePasswordExpiration,DisableStrongPassword',
+								postalCode: '0123456',
+								preferredLanguage: 'en-US',
+								state: 'New York',
+								streetAddress: 'Street 123',
+								usageLocation: 'US',
+								userPrincipalName: 'johndoe@contoso.com',
+								userType: 'Guest',
+							},
+							responseBody: {},
+						},
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								aboutMe: 'About me',
+								birthday: '2024-11-12T00:00:00.000Z',
+								interests: ['interest1', 'interest2'],
+								mySite: 'My Site',
+								pastProjects: ['project1', 'project2'],
+								responsibilities: ['responsibility1', 'responsibility2'],
+								schools: ['school1', 'school2'],
+								skills: ['skill1', 'skill2'],
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+		];
+
+		const nodeTypes = Helpers.setup(tests);
+
+		test.each(tests)('$description', async (testData) => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+			expect(result.status).toEqual('success');
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts
new file mode 100644
index 0000000000..003df7f193
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts
@@ -0,0 +1,1270 @@
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased-id */
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased */
+
+export const microsoftEntraApiResponse = {
+	postGroup: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups/$entity',
+		id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+		deletedDateTime: null,
+		classification: null,
+		createdDateTime: '2024-11-17T15:46:32Z',
+		creationOptions: [],
+		description: null,
+		displayName: 'Group Display Name',
+		expirationDateTime: null,
+		groupTypes: ['DynamicMembership', 'Unified'],
+		isAssignableToRole: true,
+		mail: null,
+		mailEnabled: true,
+		mailNickname: 'MailNickname',
+		membershipRule: 'department -eq "Marketing"',
+		membershipRuleProcessingState: 'On',
+		onPremisesDomainName: null,
+		onPremisesLastSyncDateTime: null,
+		onPremisesNetBiosName: null,
+		onPremisesSamAccountName: null,
+		onPremisesSecurityIdentifier: null,
+		onPremisesSyncEnabled: null,
+		preferredDataLocation: null,
+		preferredLanguage: null,
+		proxyAddresses: [],
+		renewedDateTime: '2024-11-17T15:46:32Z',
+		resourceBehaviorOptions: [],
+		resourceProvisioningOptions: [],
+		securityEnabled: true,
+		securityIdentifier: 'S-1-12-1-2833998051-1300103493-633794437-460752023',
+		theme: null,
+		uniqueName: null,
+		visibility: null,
+		onPremisesProvisioningErrors: [],
+		serviceProvisioningErrors: [],
+	},
+
+	getGroup: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups/$entity',
+		id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+		deletedDateTime: null,
+		classification: null,
+		createdDateTime: '2024-11-04T16:00:21Z',
+		creationOptions: ['YammerProvisioning'],
+		description: 'This is the default group for everyone in the network',
+		displayName: 'All Company',
+		expirationDateTime: null,
+		groupTypes: ['Unified'],
+		isAssignableToRole: null,
+		mail: 'HRTaskforce@contoso.com',
+		mailEnabled: true,
+		mailNickname: 'allcompany',
+		membershipRule: 'department -eq "Marketing"',
+		membershipRuleProcessingState: 'On',
+		onPremisesDomainName: null,
+		onPremisesLastSyncDateTime: null,
+		onPremisesNetBiosName: null,
+		onPremisesSamAccountName: null,
+		onPremisesSecurityIdentifier: null,
+		onPremisesSyncEnabled: null,
+		preferredDataLocation: null,
+		preferredLanguage: null,
+		proxyAddresses: ['SMTP:HRTaskforce@contoso.com'],
+		renewedDateTime: '2024-11-04T16:00:21Z',
+		resourceBehaviorOptions: ['CalendarMemberReadOnly'],
+		resourceProvisioningOptions: [],
+		securityEnabled: false,
+		securityIdentifier: 'S-1-12-1-1394793482-1222919313-3222267053-1234900903',
+		theme: null,
+		uniqueName: null,
+		visibility: 'Public',
+		onPremisesProvisioningErrors: [],
+		serviceProvisioningErrors: [],
+	},
+
+	getGroupWithProperties: {
+		'@odata.context':
+			'https://graph.microsoft.com/v1.0/$metadata#groups(assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,unseenCount,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,autoSubscribeNewMembers,allowExternalSenders,licenseProcessingState,isManagementRestricted,isSubscribedByMail,isAssignableToRole,id,hideFromOutlookClients,hideFromAddressLists,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,members())/$entity',
+		createdDateTime: '2024-11-04T16:00:21Z',
+		classification: null,
+		deletedDateTime: null,
+		description: 'This is the default group for everyone in the network',
+		displayName: 'All Company',
+		expirationDateTime: null,
+		groupTypes: ['Unified'],
+		visibility: 'Public',
+		theme: null,
+		uniqueName: null,
+		securityIdentifier: 'S-1-12-1-1394793482-1222919313-3222267053-1234900903',
+		renewedDateTime: '2024-11-04T16:00:21Z',
+		securityEnabled: false,
+		isManagementRestricted: null,
+		isAssignableToRole: null,
+		id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+		onPremisesSecurityIdentifier: null,
+		onPremisesSamAccountName: null,
+		onPremisesNetBiosName: null,
+		onPremisesSyncEnabled: null,
+		preferredDataLocation: null,
+		preferredLanguage: null,
+		proxyAddresses: ['SMTP:HRTaskforce@contoso.com'],
+		onPremisesLastSyncDateTime: null,
+		onPremisesDomainName: null,
+		membershipRule: 'department -eq "Marketing"',
+		membershipRuleProcessingState: 'On',
+		mailNickname: 'allcompany',
+		mailEnabled: true,
+		mail: 'HRTaskforce@contoso.com',
+		licenseProcessingState: null,
+		allowExternalSenders: false,
+		autoSubscribeNewMembers: false,
+		isSubscribedByMail: false,
+		unseenCount: 0,
+		hideFromOutlookClients: false,
+		hideFromAddressLists: false,
+		assignedLabels: [],
+		assignedLicenses: [],
+		serviceProvisioningErrors: [],
+		onPremisesProvisioningErrors: [],
+		members: [
+			{
+				'@odata.type': '#microsoft.graph.user',
+				id: '5f7afebb-121d-4664-882b-a09fe6584ce0',
+				deletedDateTime: null,
+				accountEnabled: true,
+				ageGroup: null,
+				businessPhones: ['4917600000000'],
+				city: null,
+				companyName: null,
+				consentProvidedForMinor: null,
+				country: 'US',
+				createdDateTime: '2024-11-03T16:15:19Z',
+				creationType: null,
+				department: null,
+				displayName: 'John Doe',
+				employeeId: null,
+				employeeHireDate: null,
+				employeeLeaveDateTime: null,
+				employeeType: null,
+				externalUserState: null,
+				externalUserStateChangeDateTime: null,
+				faxNumber: null,
+				givenName: 'John',
+				isLicenseReconciliationNeeded: false,
+				jobTitle: null,
+				legalAgeGroupClassification: null,
+				mail: 'john.doe@contoso.com',
+				mailNickname: 'johndoe',
+				mobilePhone: null,
+				onPremisesDistinguishedName: null,
+				onPremisesDomainName: null,
+				onPremisesImmutableId: null,
+				onPremisesLastSyncDateTime: null,
+				onPremisesSecurityIdentifier: null,
+				onPremisesSamAccountName: null,
+				onPremisesSyncEnabled: null,
+				onPremisesUserPrincipalName: null,
+				otherMails: ['matstallmann@gmail.com'],
+				passwordPolicies: null,
+				officeLocation: null,
+				postalCode: null,
+				preferredDataLocation: null,
+				preferredLanguage: 'en',
+				proxyAddresses: ['SMTP:john.doe@contoso.com'],
+				refreshTokensValidFromDateTime: '2024-11-03T16:15:18Z',
+				imAddresses: ['john.doe@contoso.com'],
+				isResourceAccount: null,
+				showInAddressList: null,
+				securityIdentifier: 'S-1-12-1-1601896123-1180963357-2678074248-3763099878',
+				signInSessionsValidFromDateTime: '2024-11-03T16:15:18Z',
+				state: null,
+				streetAddress: null,
+				surname: 'Doe',
+				usageLocation: 'US',
+				userPrincipalName: 'john.doe@contoso.com',
+				userType: 'Member',
+				employeeOrgData: null,
+				passwordProfile: null,
+				assignedLicenses: [
+					{
+						disabledPlans: [],
+						skuId: 'cbdc14ab-d96c-4c30-b9f4-6ada7cdc1d46',
+					},
+				],
+				assignedPlans: [
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'WhiteboardServices',
+						servicePlanId: 'b8afc642-032e-4de5-8c0a-507a7bba7e5d',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: 'a6520331-d7d4-4276-95f5-15c0933bc757',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'DynamicsNAV',
+						servicePlanId: '39b5c996-467e-4e60-bd62-46066f572726',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'WindowsDefenderATP',
+						servicePlanId: 'bfc1bbd9-981b-4f71-9b82-17c35fd0e2a4',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SharePoint',
+						servicePlanId: 'e95bec33-7c88-4a70-8e19-b10bd9d0c014',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '176a09a6-7ec5-4039-ac02-b2791c6ba793',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'AADPremiumService',
+						servicePlanId: '41781fb2-bc02-4b7c-bd55-b576c07bb09d',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '33c4f319-9bdd-48d6-9c4d-410b750a4a5a',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftKaizala',
+						servicePlanId: '54fc630f-5a40-48ee-8965-af0503c1386e',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'To-Do',
+						servicePlanId: '5e62787c-c316-451f-b873-1d05acd4d12c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Bing',
+						servicePlanId: '0d0c0d31-fae7-41f2-b909-eaf4d7f26dba',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ccibotsprod',
+						servicePlanId: 'ded3d325-1bdc-453e-8432-5bac26d7a014',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SharePoint',
+						servicePlanId: 'a1ace008-72f3-4ea0-8dac-33b3a23a2472',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '9aaf7827-d63c-4b61-89c3-182f06f82e5c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '9bec7e34-c9fa-40b7-a9d1-bd6d1165c7ed',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MixedRealityCollaborationServices',
+						servicePlanId: 'f0ff6ac6-297d-49cd-be34-6dfef97f0c28',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'RMSOnline',
+						servicePlanId: '6c57d4b6-3b23-47a5-9bc9-69f17b4947b3',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'RMSOnline',
+						servicePlanId: 'bea4c11e-220a-4e6d-8eb8-8ea15d019f90',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftOffice',
+						servicePlanId: '094e7854-93fc-4d55-b2c0-3ab5369ebdc1',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Sway',
+						servicePlanId: 'a23b959c-7ce8-4e57-9140-b90eb88a9e97',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Microsoft.ProjectBabylon',
+						servicePlanId: 'c948ea65-2053-4a5a-8a62-9eaaaf11b522',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '5bfe124c-bbdc-4494-8835-f1297d457d79',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'PowerAppsService',
+						servicePlanId: '92f7a6f3-b89b-4bbd-8c30-809e6da5ad1c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MixedRealityCollaborationServices',
+						servicePlanId: '3efbd4ed-8958-4824-8389-1321f8730af8',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'CRM',
+						servicePlanId: '28b0fa46-c39a-4188-89e2-58e979a6b014',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MixedRealityCollaborationServices',
+						servicePlanId: 'dcf9d2f4-772e-4434-b757-77a453cfbc02',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ProcessSimple',
+						servicePlanId: '0f9b09cb-62d1-4ff4-9129-43f4996f83f4',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'YammerEnterprise',
+						servicePlanId: 'a82fbf69-b4d7-49f4-83a6-915b2cf354f4',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MultiFactorService',
+						servicePlanId: '8a256a2b-b617-496d-b51b-e76466e88db0',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'OfficeForms',
+						servicePlanId: '159f4cd6-e380-449f-a816-af1a9ef76344',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftCommunicationsOnline',
+						servicePlanId: '0feaeb32-d00e-4d66-bd5a-43b5b83db82c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Windows',
+						servicePlanId: '8e229017-d77b-43d5-9305-903395523b99',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ProjectProgramsAndPortfolios',
+						servicePlanId: 'b21a6b06-1988-436e-a07b-51ec6d9f52ad',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SCO',
+						servicePlanId: 'c1ec4a95-1f05-45b3-a911-aa3fa01094f5',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'WindowsUpdateforBusinessCloudExtensions',
+						servicePlanId: '7bf960f6-2cd9-443a-8046-5dbff9558365',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'YammerEnterprise',
+						servicePlanId: '7547a3fe-08ee-4ccb-b430-5077c5041653',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'CRM',
+						servicePlanId: 'afa73018-811e-46e9-988f-f75d2b1b8430',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SharePoint',
+						servicePlanId: 'c7699d2e-19aa-44de-8edf-1736da088ca1',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'AADPremiumService',
+						servicePlanId: 'de377cbc-0019-4ec2-b77c-3f223947e102',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '199a5c09-e0ca-4e37-8f7c-b05d533e1ea2',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Adallom',
+						servicePlanId: '932ad362-64a8-4783-9106-97849a1a30b9',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Chapter5FluidApp',
+						servicePlanId: 'c4b8c31a-fb44-4c65-9837-a21f55fcabda',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'LearningAppServiceInTeams',
+						servicePlanId: 'b76fb638-6ba6-402a-b9f9-83d28acb3d86',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Deskless',
+						servicePlanId: '8c7d2df8-86f0-4902-b2ed-a0458298f3b3',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftStream',
+						servicePlanId: '743dd19e-1ce3-4c62-a3ad-49ba8f63a2f6',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'TeamspaceAPI',
+						servicePlanId: '57ff2da0-773e-42df-b2af-ffb7a2317929',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftOffice',
+						servicePlanId: '276d6e8a-f056-4f70-b7e8-4fc27f79f809',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SCO',
+						servicePlanId: '8e9ff0ff-aa7a-4b20-83c1-2f636b600ac2',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftPrint',
+						servicePlanId: '795f6fe0-cc4d-4773-b050-5dde4dc704c9',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ProjectWorkManagement',
+						servicePlanId: 'b737dad2-2f6c-4c65-90e3-ca563267e8b9',
+					},
+				],
+				authorizationInfo: {
+					certificateUserIds: [],
+				},
+				identities: [
+					{
+						signInType: 'userPrincipalName',
+						issuer: 'contoso.com',
+						issuerAssignedId: 'john.doe@contoso.com',
+					},
+				],
+				onPremisesProvisioningErrors: [],
+				onPremisesExtensionAttributes: {
+					extensionAttribute1: null,
+					extensionAttribute2: null,
+					extensionAttribute3: null,
+					extensionAttribute4: null,
+					extensionAttribute5: null,
+					extensionAttribute6: null,
+					extensionAttribute7: null,
+					extensionAttribute8: null,
+					extensionAttribute9: null,
+					extensionAttribute10: null,
+					extensionAttribute11: null,
+					extensionAttribute12: null,
+					extensionAttribute13: null,
+					extensionAttribute14: null,
+					extensionAttribute15: null,
+				},
+				provisionedPlans: [
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'MicrosoftCommunicationsOnline',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'SharePoint',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'SharePoint',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'SharePoint',
+					},
+				],
+				serviceProvisioningErrors: [],
+			},
+		],
+	},
+
+	postUser: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+		id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+		businessPhones: [],
+		displayName: 'John Doe',
+		givenName: null,
+		jobTitle: null,
+		mail: null,
+		mobilePhone: null,
+		officeLocation: null,
+		preferredLanguage: null,
+		surname: null,
+		userPrincipalName: 'johndoe@contoso.com',
+	},
+
+	getUser: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+		businessPhones: ['0123456789'],
+		displayName: 'John Doe',
+		givenName: 'John',
+		jobTitle: 'Project manager',
+		mail: 'johndoe@contoso.com',
+		mobilePhone: '+123456789',
+		officeLocation: 'New York',
+		preferredLanguage: 'en-US',
+		surname: 'Doe',
+		userPrincipalName: 'johndoe@contoso.com',
+		id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+	},
+
+	metadata: {
+		groups:
+			'<?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="microsoft.graph.identityGovernance" xmlns="http://docs.oasis-open.org/odata/ns/edm"></Schema><Schema Namespace="microsoft.graph" Alias="graph" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="entity" Abstract="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.String" Nullable="false"/></EntityType><EntityType Name="directoryObject" BaseType="graph.entity" OpenType="true"><Property Name="deletedDateTime" Type="Edm.DateTimeOffset"/></EntityType><EntityType Name="group" BaseType="graph.directoryObject" OpenType="true"><Property Name="assignedLabels" Type="Collection(graph.assignedLabel)"/><Property Name="assignedLicenses" Type="Collection(graph.assignedLicense)"/><Property Name="classification" Type="Edm.String"/><Property Name="createdDateTime" Type="Edm.DateTimeOffset"/><Property Name="description" Type="Edm.String"/><Property Name="displayName" Type="Edm.String"/><Property Name="expirationDateTime" Type="Edm.DateTimeOffset"/><Property Name="groupTypes" Type="Collection(Edm.String)" Nullable="false"/><Property Name="hasMembersWithLicenseErrors" Type="Edm.Boolean"/><Property Name="isAssignableToRole" Type="Edm.Boolean"/><Property Name="isManagementRestricted" Type="Edm.Boolean"/><Property Name="licenseProcessingState" Type="graph.licenseProcessingState"/><Property Name="mail" Type="Edm.String"/><Property Name="mailEnabled" Type="Edm.Boolean"/><Property Name="mailNickname" Type="Edm.String"/><Property Name="membershipRule" Type="Edm.String"/><Property Name="membershipRuleProcessingState" Type="Edm.String"/><Property Name="onPremisesDomainName" Type="Edm.String"/><Property Name="onPremisesLastSyncDateTime" Type="Edm.DateTimeOffset"/><Property Name="onPremisesNetBiosName" Type="Edm.String"/><Property Name="onPremisesProvisioningErrors" Type="Collection(graph.onPremisesProvisioningError)"/><Property Name="onPremisesSamAccountName" Type="Edm.String"/><Property Name="onPremisesSecurityIdentifier" Type="Edm.String"/><Property Name="onPremisesSyncEnabled" Type="Edm.Boolean"/><Property Name="preferredDataLocation" Type="Edm.String"/><Property Name="preferredLanguage" Type="Edm.String"/><Property Name="proxyAddresses" Type="Collection(Edm.String)" Nullable="false"/><Property Name="renewedDateTime" Type="Edm.DateTimeOffset"/><Property Name="securityEnabled" Type="Edm.Boolean"/><Property Name="securityIdentifier" Type="Edm.String"/><Property Name="serviceProvisioningErrors" Type="Collection(graph.serviceProvisioningError)"/><Property Name="theme" Type="Edm.String"/><Property Name="uniqueName" Type="Edm.String"/><Property Name="visibility" Type="Edm.String"/><Property Name="allowExternalSenders" Type="Edm.Boolean"/><Property Name="autoSubscribeNewMembers" Type="Edm.Boolean"/><Property Name="hideFromAddressLists" Type="Edm.Boolean"/><Property Name="hideFromOutlookClients" Type="Edm.Boolean"/><Property Name="isSubscribedByMail" Type="Edm.Boolean"/><Property Name="unseenCount" Type="Edm.Int32"/><Property Name="isArchived" Type="Edm.Boolean"/><NavigationProperty Name="appRoleAssignments" Type="Collection(graph.appRoleAssignment)" ContainsTarget="true"/><NavigationProperty Name="createdOnBehalfOf" Type="graph.directoryObject"/><NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="members" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="membersWithLicenseErrors" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="owners" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="permissionGrants" Type="Collection(graph.resourceSpecificPermissionGrant)" ContainsTarget="true"/><NavigationProperty Name="settings" Type="Collection(graph.groupSetting)" ContainsTarget="true"/><NavigationProperty Name="transitiveMemberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="transitiveMembers" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="acceptedSenders" Type="Collection(graph.directoryObject)" ContainsTarget="true"/><NavigationProperty Name="calendar" Type="graph.calendar" ContainsTarget="true"/><NavigationProperty Name="calendarView" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="conversations" Type="Collection(graph.conversation)" ContainsTarget="true"/><NavigationProperty Name="events" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="rejectedSenders" Type="Collection(graph.directoryObject)" ContainsTarget="true"/><NavigationProperty Name="threads" Type="Collection(graph.conversationThread)" ContainsTarget="true"/><NavigationProperty Name="drive" Type="graph.drive" ContainsTarget="true"/><NavigationProperty Name="drives" Type="Collection(graph.drive)" ContainsTarget="true"/><NavigationProperty Name="sites" Type="Collection(graph.site)" ContainsTarget="true"/><NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true"/><NavigationProperty Name="groupLifecyclePolicies" Type="Collection(graph.groupLifecyclePolicy)" ContainsTarget="true"/><NavigationProperty Name="planner" Type="graph.plannerGroup" ContainsTarget="true"/><NavigationProperty Name="onenote" Type="graph.onenote" ContainsTarget="true"/><NavigationProperty Name="photo" Type="graph.profilePhoto" ContainsTarget="true"/><NavigationProperty Name="photos" Type="Collection(graph.profilePhoto)" ContainsTarget="true"/><NavigationProperty Name="team" Type="graph.team" ContainsTarget="true"/><Annotation Term="Org.OData.Core.V1.AlternateKeys"><Collection><Record Type="Org.OData.Core.V1.AlternateKey"><PropertyValue Property="Key"><Collection><Record Type="Org.OData.Core.V1.PropertyRef"><PropertyValue Property="Alias" String="uniqueName"/><PropertyValue Property="Name" PropertyPath="uniqueName"/></Record></Collection></PropertyValue></Record></Collection></Annotation></EntityType></Schema></edmx:DataServices></edmx:Edmx>',
+		users:
+			'<?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="microsoft.graph.identityGovernance" xmlns="http://docs.oasis-open.org/odata/ns/edm"></Schema><Schema Namespace="microsoft.graph" Alias="graph" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="entity" Abstract="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.String" Nullable="false"/></EntityType><EntityType Name="directoryObject" BaseType="graph.entity" OpenType="true"><Property Name="deletedDateTime" Type="Edm.DateTimeOffset"/></EntityType><EntityType Name="user" BaseType="graph.directoryObject" OpenType="true"><Property Name="signInActivity" Type="graph.signInActivity"/><Property Name="accountEnabled" Type="Edm.Boolean"/><Property Name="ageGroup" Type="Edm.String"/><Property Name="assignedLicenses" Type="Collection(graph.assignedLicense)" Nullable="false"/><Property Name="assignedPlans" Type="Collection(graph.assignedPlan)" Nullable="false"/><Property Name="authorizationInfo" Type="graph.authorizationInfo"/><Property Name="businessPhones" Type="Collection(Edm.String)" Nullable="false"/><Property Name="city" Type="Edm.String"/><Property Name="companyName" Type="Edm.String"/><Property Name="consentProvidedForMinor" Type="Edm.String"/><Property Name="country" Type="Edm.String"/><Property Name="createdDateTime" Type="Edm.DateTimeOffset"/><Property Name="creationType" Type="Edm.String"/><Property Name="customSecurityAttributes" Type="graph.customSecurityAttributeValue"/><Property Name="department" Type="Edm.String"/><Property Name="displayName" Type="Edm.String"/><Property Name="employeeHireDate" Type="Edm.DateTimeOffset"/><Property Name="employeeId" Type="Edm.String"/><Property Name="employeeLeaveDateTime" Type="Edm.DateTimeOffset"/><Property Name="employeeOrgData" Type="graph.employeeOrgData"/><Property Name="employeeType" Type="Edm.String"/><Property Name="externalUserState" Type="Edm.String"/><Property Name="externalUserStateChangeDateTime" Type="Edm.DateTimeOffset"/><Property Name="faxNumber" Type="Edm.String"/><Property Name="givenName" Type="Edm.String"/><Property Name="identities" Type="Collection(graph.objectIdentity)"/><Property Name="imAddresses" Type="Collection(Edm.String)"/><Property Name="isManagementRestricted" Type="Edm.Boolean"/><Property Name="isResourceAccount" Type="Edm.Boolean"/><Property Name="jobTitle" Type="Edm.String"/><Property Name="lastPasswordChangeDateTime" Type="Edm.DateTimeOffset"/><Property Name="legalAgeGroupClassification" Type="Edm.String"/><Property Name="licenseAssignmentStates" Type="Collection(graph.licenseAssignmentState)"/><Property Name="mail" Type="Edm.String"/><Property Name="mailNickname" Type="Edm.String"/><Property Name="mobilePhone" Type="Edm.String"/><Property Name="officeLocation" Type="Edm.String"/><Property Name="onPremisesDistinguishedName" Type="Edm.String"/><Property Name="onPremisesDomainName" Type="Edm.String"/><Property Name="onPremisesExtensionAttributes" Type="graph.onPremisesExtensionAttributes"/><Property Name="onPremisesImmutableId" Type="Edm.String"/><Property Name="onPremisesLastSyncDateTime" Type="Edm.DateTimeOffset"/><Property Name="onPremisesProvisioningErrors" Type="Collection(graph.onPremisesProvisioningError)"/><Property Name="onPremisesSamAccountName" Type="Edm.String"/><Property Name="onPremisesSecurityIdentifier" Type="Edm.String"/><Property Name="onPremisesSyncEnabled" Type="Edm.Boolean"/><Property Name="onPremisesUserPrincipalName" Type="Edm.String"/><Property Name="otherMails" Type="Collection(Edm.String)" Nullable="false"/><Property Name="passwordPolicies" Type="Edm.String"/><Property Name="passwordProfile" Type="graph.passwordProfile"/><Property Name="postalCode" Type="Edm.String"/><Property Name="preferredDataLocation" Type="Edm.String"/><Property Name="preferredLanguage" Type="Edm.String"/><Property Name="provisionedPlans" Type="Collection(graph.provisionedPlan)" Nullable="false"/><Property Name="proxyAddresses" Type="Collection(Edm.String)" Nullable="false"/><Property Name="securityIdentifier" Type="Edm.String"/><Property Name="serviceProvisioningErrors" Type="Collection(graph.serviceProvisioningError)"/><Property Name="showInAddressList" Type="Edm.Boolean"/><Property Name="signInSessionsValidFromDateTime" Type="Edm.DateTimeOffset"/><Property Name="state" Type="Edm.String"/><Property Name="streetAddress" Type="Edm.String"/><Property Name="surname" Type="Edm.String"/><Property Name="usageLocation" Type="Edm.String"/><Property Name="userPrincipalName" Type="Edm.String"/><Property Name="userType" Type="Edm.String"/><Property Name="mailboxSettings" Type="graph.mailboxSettings"/><Property Name="deviceEnrollmentLimit" Type="Edm.Int32" Nullable="false"/><Property Name="print" Type="graph.userPrint"/><Property Name="aboutMe" Type="Edm.String"/><Property Name="birthday" Type="Edm.DateTimeOffset" Nullable="false"/><Property Name="hireDate" Type="Edm.DateTimeOffset" Nullable="false"/><Property Name="interests" Type="Collection(Edm.String)"/><Property Name="mySite" Type="Edm.String"/><Property Name="pastProjects" Type="Collection(Edm.String)"/><Property Name="preferredName" Type="Edm.String"/><Property Name="responsibilities" Type="Collection(Edm.String)"/><Property Name="schools" Type="Collection(Edm.String)"/><Property Name="skills" Type="Collection(Edm.String)"/><NavigationProperty Name="appRoleAssignments" Type="Collection(graph.appRoleAssignment)" ContainsTarget="true"/><NavigationProperty Name="createdObjects" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="directReports" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="licenseDetails" Type="Collection(graph.licenseDetails)" ContainsTarget="true"/><NavigationProperty Name="manager" Type="graph.directoryObject"/><NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="oauth2PermissionGrants" Type="Collection(graph.oAuth2PermissionGrant)"/><NavigationProperty Name="ownedDevices" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="ownedObjects" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="registeredDevices" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="scopedRoleMemberOf" Type="Collection(graph.scopedRoleMembership)" ContainsTarget="true"/><NavigationProperty Name="sponsors" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="transitiveMemberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="calendar" Type="graph.calendar" ContainsTarget="true"/><NavigationProperty Name="calendarGroups" Type="Collection(graph.calendarGroup)" ContainsTarget="true"/><NavigationProperty Name="calendars" Type="Collection(graph.calendar)" ContainsTarget="true"/><NavigationProperty Name="calendarView" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="contactFolders" Type="Collection(graph.contactFolder)" ContainsTarget="true"/><NavigationProperty Name="contacts" Type="Collection(graph.contact)" ContainsTarget="true"/><NavigationProperty Name="events" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="inferenceClassification" Type="graph.inferenceClassification" ContainsTarget="true"/><NavigationProperty Name="mailFolders" Type="Collection(graph.mailFolder)" ContainsTarget="true"/><NavigationProperty Name="messages" Type="Collection(graph.message)" ContainsTarget="true"/><NavigationProperty Name="outlook" Type="graph.outlookUser" ContainsTarget="true"/><NavigationProperty Name="people" Type="Collection(graph.person)" ContainsTarget="true"/><NavigationProperty Name="drive" Type="graph.drive" ContainsTarget="true"/><NavigationProperty Name="drives" Type="Collection(graph.drive)" ContainsTarget="true"/><NavigationProperty Name="followedSites" Type="Collection(graph.site)"/><NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true"/><NavigationProperty Name="agreementAcceptances" Type="Collection(graph.agreementAcceptance)"/><NavigationProperty Name="managedDevices" Type="Collection(graph.managedDevice)" ContainsTarget="true"/><NavigationProperty Name="managedAppRegistrations" Type="Collection(graph.managedAppRegistration)"/><NavigationProperty Name="deviceManagementTroubleshootingEvents" Type="Collection(graph.deviceManagementTroubleshootingEvent)" ContainsTarget="true"/><NavigationProperty Name="planner" Type="graph.plannerUser" ContainsTarget="true"/><NavigationProperty Name="insights" Type="graph.itemInsights" ContainsTarget="true"/><NavigationProperty Name="settings" Type="graph.userSettings" ContainsTarget="true"/><NavigationProperty Name="onenote" Type="graph.onenote" ContainsTarget="true"/><NavigationProperty Name="cloudClipboard" Type="graph.cloudClipboardRoot" ContainsTarget="true"/><NavigationProperty Name="photo" Type="graph.profilePhoto" ContainsTarget="true"/><NavigationProperty Name="photos" Type="Collection(graph.profilePhoto)" ContainsTarget="true"/><NavigationProperty Name="activities" Type="Collection(graph.userActivity)" ContainsTarget="true"/><NavigationProperty Name="onlineMeetings" Type="Collection(graph.onlineMeeting)" ContainsTarget="true"/><NavigationProperty Name="presence" Type="graph.presence" ContainsTarget="true"/><NavigationProperty Name="authentication" Type="graph.authentication" ContainsTarget="true"/><NavigationProperty Name="chats" Type="Collection(graph.chat)" ContainsTarget="true"/><NavigationProperty Name="joinedTeams" Type="Collection(graph.team)" ContainsTarget="true"/><NavigationProperty Name="permissionGrants" Type="Collection(graph.resourceSpecificPermissionGrant)" ContainsTarget="true"/><NavigationProperty Name="teamwork" Type="graph.userTeamwork" ContainsTarget="true"/><NavigationProperty Name="solutions" Type="graph.userSolutionRoot" ContainsTarget="true"/><NavigationProperty Name="todo" Type="graph.todo" ContainsTarget="true"/><NavigationProperty Name="employeeExperience" Type="graph.employeeExperienceUser" ContainsTarget="true"/><Annotation Term="Org.OData.Core.V1.AlternateKeys"><Collection><Record Type="Org.OData.Core.V1.AlternateKey"><PropertyValue Property="Key"><Collection><Record Type="Org.OData.Core.V1.PropertyRef"><PropertyValue Property="Alias" String="userPrincipalName"/><PropertyValue Property="Name" PropertyPath="userPrincipalName"/></Record></Collection></PropertyValue></Record></Collection></Annotation></EntityType></Schema></edmx:DataServices></edmx:Edmx>',
+	},
+};
+
+export const microsoftEntraNodeResponse = {
+	createGroup: [
+		{
+			json: {
+				'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups/$entity',
+				id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+				deletedDateTime: null,
+				classification: null,
+				createdDateTime: '2024-11-17T15:46:32Z',
+				creationOptions: [],
+				displayName: 'Group Display Name',
+				expirationDateTime: null,
+				groupTypes: ['DynamicMembership', 'Unified'],
+				isAssignableToRole: true,
+				mail: null,
+				mailEnabled: true,
+				mailNickname: 'MailNickname',
+				membershipRule: 'department -eq "Marketing"',
+				membershipRuleProcessingState: 'On',
+				onPremisesDomainName: null,
+				onPremisesLastSyncDateTime: null,
+				onPremisesNetBiosName: null,
+				onPremisesSamAccountName: null,
+				onPremisesSecurityIdentifier: null,
+				onPremisesSyncEnabled: null,
+				preferredLanguage: null,
+				proxyAddresses: [],
+				renewedDateTime: '2024-11-17T15:46:32Z',
+				resourceBehaviorOptions: [],
+				resourceProvisioningOptions: [],
+				securityEnabled: true,
+				securityIdentifier: 'S-1-12-1-2833998051-1300103493-633794437-460752023',
+				theme: null,
+				onPremisesProvisioningErrors: [],
+				serviceProvisioningErrors: [],
+				description: 'Group Description',
+				preferredDataLocation: 'Preferred Data Location',
+				uniqueName: 'UniqueName',
+				visibility: 'Public',
+			},
+		},
+	],
+
+	deleteGroup: [
+		{
+			json: {
+				deleted: true,
+			},
+		},
+	],
+
+	getGroup: [{ json: { ...microsoftEntraApiResponse.getGroup } }],
+
+	getGroupWithProperties: [{ json: { ...microsoftEntraApiResponse.getGroupWithProperties } }],
+
+	updateGroup: [
+		{
+			json: {
+				updated: true,
+			},
+		},
+	],
+
+	addUserToGroup: [
+		{
+			json: {
+				added: true,
+			},
+		},
+	],
+
+	createUser: [
+		{
+			json: {
+				'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+				id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+				businessPhones: ['0123456789'],
+				displayName: 'John Doe',
+				givenName: 'John',
+				jobTitle: 'Project manager',
+				mail: 'johndoe@contoso.com',
+				mobilePhone: '+123456789',
+				officeLocation: 'New York',
+				preferredLanguage: 'en-US',
+				// mailNickname: 'johndoe',
+				userPrincipalName: 'johndoe@contoso.com',
+				aboutMe: 'About me',
+				ageGroup: 'Adult',
+				birthday: '2024-11-12T00:00:00.000Z',
+				city: 'New York',
+				companyName: 'Contoso',
+				consentProvidedForMinor: 'Granted',
+				country: 'US',
+				department: 'IT',
+				employeeId: 'employee-id-123',
+				employeeType: 'Contractor',
+				employeeHireDate: '2024-11-13T00:00:00.000Z',
+				employeeLeaveDateTime: '2024-11-18T00:00:00.000Z',
+				employeeOrgData: {
+					costCenter: 'Cost Center 1',
+					division: 'Division 1',
+				},
+				interests: ['interest1', 'interest2'],
+				surname: 'Doe',
+				mySite: 'My Site',
+				onPremisesImmutableId: 'premiseid123',
+				otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+				passwordPolicies: 'DisablePasswordExpiration,DisableStrongPassword',
+				passwordProfile: {
+					forceChangePasswordNextSignInWithMfa: true,
+				},
+				pastProjects: ['project1', 'project2'],
+				postalCode: '0123456',
+				responsibilities: ['responsibility1', 'responsibility2'],
+				schools: ['school1', 'school2'],
+				skills: ['skill1', 'skill2'],
+				state: 'New York',
+				streetAddress: 'Street 123',
+				usageLocation: 'US',
+				userType: 'Guest',
+			},
+		},
+	],
+
+	deleteUser: [
+		{
+			json: {
+				deleted: true,
+			},
+		},
+	],
+
+	getUser: [
+		{
+			json: {
+				'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+				businessPhones: ['0123456789'],
+				displayName: 'John Doe',
+				givenName: 'John',
+				jobTitle: 'Project manager',
+				mail: 'johndoe@contoso.com',
+				mobilePhone: '+123456789',
+				officeLocation: 'New York',
+				preferredLanguage: 'en-US',
+				surname: 'Doe',
+				userPrincipalName: 'johndoe@contoso.com',
+				id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+			},
+		},
+	],
+
+	removeUserFromGroup: [
+		{
+			json: {
+				removed: true,
+			},
+		},
+	],
+
+	updateUser: [
+		{
+			json: {
+				updated: true,
+			},
+		},
+	],
+
+	loadOptions: {
+		getGroupProperties: [
+			{
+				name: 'allowExternalSenders',
+				value: 'allowExternalSenders',
+			},
+			{
+				name: 'assignedLabels',
+				value: 'assignedLabels',
+			},
+			{
+				name: 'assignedLicenses',
+				value: 'assignedLicenses',
+			},
+			{
+				name: 'autoSubscribeNewMembers',
+				value: 'autoSubscribeNewMembers',
+			},
+			{
+				name: 'classification',
+				value: 'classification',
+			},
+			{
+				name: 'createdDateTime',
+				value: 'createdDateTime',
+			},
+			{
+				name: 'deletedDateTime',
+				value: 'deletedDateTime',
+			},
+			{
+				name: 'description',
+				value: 'description',
+			},
+			{
+				name: 'displayName',
+				value: 'displayName',
+			},
+			{
+				name: 'expirationDateTime',
+				value: 'expirationDateTime',
+			},
+			{
+				name: 'groupTypes',
+				value: 'groupTypes',
+			},
+			{
+				name: 'hideFromAddressLists',
+				value: 'hideFromAddressLists',
+			},
+			{
+				name: 'hideFromOutlookClients',
+				value: 'hideFromOutlookClients',
+			},
+			// {
+			// 	name: 'id',
+			// 	value: 'id',
+			// },
+			{
+				name: 'isAssignableToRole',
+				value: 'isAssignableToRole',
+			},
+			{
+				name: 'isManagementRestricted',
+				value: 'isManagementRestricted',
+			},
+			{
+				name: 'isSubscribedByMail',
+				value: 'isSubscribedByMail',
+			},
+			{
+				name: 'licenseProcessingState',
+				value: 'licenseProcessingState',
+			},
+			{
+				name: 'mail',
+				value: 'mail',
+			},
+			{
+				name: 'mailEnabled',
+				value: 'mailEnabled',
+			},
+			{
+				name: 'mailNickname',
+				value: 'mailNickname',
+			},
+			{
+				name: 'membershipRule',
+				value: 'membershipRule',
+			},
+			{
+				name: 'membershipRuleProcessingState',
+				value: 'membershipRuleProcessingState',
+			},
+			{
+				name: 'onPremisesDomainName',
+				value: 'onPremisesDomainName',
+			},
+			{
+				name: 'onPremisesLastSyncDateTime',
+				value: 'onPremisesLastSyncDateTime',
+			},
+			{
+				name: 'onPremisesNetBiosName',
+				value: 'onPremisesNetBiosName',
+			},
+			{
+				name: 'onPremisesProvisioningErrors',
+				value: 'onPremisesProvisioningErrors',
+			},
+			{
+				name: 'onPremisesSamAccountName',
+				value: 'onPremisesSamAccountName',
+			},
+			{
+				name: 'onPremisesSecurityIdentifier',
+				value: 'onPremisesSecurityIdentifier',
+			},
+			{
+				name: 'onPremisesSyncEnabled',
+				value: 'onPremisesSyncEnabled',
+			},
+			{
+				name: 'preferredDataLocation',
+				value: 'preferredDataLocation',
+			},
+			{
+				name: 'preferredLanguage',
+				value: 'preferredLanguage',
+			},
+			{
+				name: 'proxyAddresses',
+				value: 'proxyAddresses',
+			},
+			{
+				name: 'renewedDateTime',
+				value: 'renewedDateTime',
+			},
+			{
+				name: 'securityEnabled',
+				value: 'securityEnabled',
+			},
+			{
+				name: 'securityIdentifier',
+				value: 'securityIdentifier',
+			},
+			{
+				name: 'serviceProvisioningErrors',
+				value: 'serviceProvisioningErrors',
+			},
+			{
+				name: 'theme',
+				value: 'theme',
+			},
+			{
+				name: 'uniqueName',
+				value: 'uniqueName',
+			},
+			{
+				name: 'unseenCount',
+				value: 'unseenCount',
+			},
+			{
+				name: 'visibility',
+				value: 'visibility',
+			},
+		],
+
+		getUserProperties: [
+			{
+				name: 'aboutMe',
+				value: 'aboutMe',
+			},
+			{
+				name: 'accountEnabled',
+				value: 'accountEnabled',
+			},
+			{
+				name: 'ageGroup',
+				value: 'ageGroup',
+			},
+			{
+				name: 'assignedLicenses',
+				value: 'assignedLicenses',
+			},
+			{
+				name: 'assignedPlans',
+				value: 'assignedPlans',
+			},
+			{
+				name: 'authorizationInfo',
+				value: 'authorizationInfo',
+			},
+			{
+				name: 'birthday',
+				value: 'birthday',
+			},
+			{
+				name: 'businessPhones',
+				value: 'businessPhones',
+			},
+			{
+				name: 'city',
+				value: 'city',
+			},
+			{
+				name: 'companyName',
+				value: 'companyName',
+			},
+			{
+				name: 'consentProvidedForMinor',
+				value: 'consentProvidedForMinor',
+			},
+			{
+				name: 'country',
+				value: 'country',
+			},
+			{
+				name: 'createdDateTime',
+				value: 'createdDateTime',
+			},
+			{
+				name: 'creationType',
+				value: 'creationType',
+			},
+			{
+				name: 'customSecurityAttributes',
+				value: 'customSecurityAttributes',
+			},
+			{
+				name: 'deletedDateTime',
+				value: 'deletedDateTime',
+			},
+			{
+				name: 'department',
+				value: 'department',
+			},
+			{
+				name: 'displayName',
+				value: 'displayName',
+			},
+			{
+				name: 'employeeHireDate',
+				value: 'employeeHireDate',
+			},
+			{
+				name: 'employeeId',
+				value: 'employeeId',
+			},
+			{
+				name: 'employeeLeaveDateTime',
+				value: 'employeeLeaveDateTime',
+			},
+			{
+				name: 'employeeOrgData',
+				value: 'employeeOrgData',
+			},
+			{
+				name: 'employeeType',
+				value: 'employeeType',
+			},
+			{
+				name: 'externalUserState',
+				value: 'externalUserState',
+			},
+			{
+				name: 'externalUserStateChangeDateTime',
+				value: 'externalUserStateChangeDateTime',
+			},
+			{
+				name: 'faxNumber',
+				value: 'faxNumber',
+			},
+			{
+				name: 'givenName',
+				value: 'givenName',
+			},
+			{
+				name: 'hireDate',
+				value: 'hireDate',
+			},
+			// {
+			// 	name: 'id',
+			// 	value: 'id',
+			// },
+			{
+				name: 'identities',
+				value: 'identities',
+			},
+			{
+				name: 'imAddresses',
+				value: 'imAddresses',
+			},
+			{
+				name: 'interests',
+				value: 'interests',
+			},
+			{
+				name: 'isManagementRestricted',
+				value: 'isManagementRestricted',
+			},
+			{
+				name: 'isResourceAccount',
+				value: 'isResourceAccount',
+			},
+			{
+				name: 'jobTitle',
+				value: 'jobTitle',
+			},
+			{
+				name: 'lastPasswordChangeDateTime',
+				value: 'lastPasswordChangeDateTime',
+			},
+			{
+				name: 'legalAgeGroupClassification',
+				value: 'legalAgeGroupClassification',
+			},
+			{
+				name: 'licenseAssignmentStates',
+				value: 'licenseAssignmentStates',
+			},
+			{
+				name: 'mail',
+				value: 'mail',
+			},
+			{
+				name: 'mailNickname',
+				value: 'mailNickname',
+			},
+			// {
+			// 	name: 'mailboxSettings',
+			// 	value: 'mailboxSettings',
+			// },
+			{
+				name: 'mobilePhone',
+				value: 'mobilePhone',
+			},
+			{
+				name: 'mySite',
+				value: 'mySite',
+			},
+			{
+				name: 'officeLocation',
+				value: 'officeLocation',
+			},
+			{
+				name: 'onPremisesDistinguishedName',
+				value: 'onPremisesDistinguishedName',
+			},
+			{
+				name: 'onPremisesDomainName',
+				value: 'onPremisesDomainName',
+			},
+			{
+				name: 'onPremisesExtensionAttributes',
+				value: 'onPremisesExtensionAttributes',
+			},
+			{
+				name: 'onPremisesImmutableId',
+				value: 'onPremisesImmutableId',
+			},
+			{
+				name: 'onPremisesLastSyncDateTime',
+				value: 'onPremisesLastSyncDateTime',
+			},
+			{
+				name: 'onPremisesProvisioningErrors',
+				value: 'onPremisesProvisioningErrors',
+			},
+			{
+				name: 'onPremisesSamAccountName',
+				value: 'onPremisesSamAccountName',
+			},
+			{
+				name: 'onPremisesSecurityIdentifier',
+				value: 'onPremisesSecurityIdentifier',
+			},
+			{
+				name: 'onPremisesSyncEnabled',
+				value: 'onPremisesSyncEnabled',
+			},
+			{
+				name: 'onPremisesUserPrincipalName',
+				value: 'onPremisesUserPrincipalName',
+			},
+			{
+				name: 'otherMails',
+				value: 'otherMails',
+			},
+			{
+				name: 'passwordPolicies',
+				value: 'passwordPolicies',
+			},
+			{
+				name: 'passwordProfile',
+				value: 'passwordProfile',
+			},
+			{
+				name: 'pastProjects',
+				value: 'pastProjects',
+			},
+			{
+				name: 'postalCode',
+				value: 'postalCode',
+			},
+			{
+				name: 'preferredDataLocation',
+				value: 'preferredDataLocation',
+			},
+			{
+				name: 'preferredLanguage',
+				value: 'preferredLanguage',
+			},
+			{
+				name: 'preferredName',
+				value: 'preferredName',
+			},
+			{
+				name: 'provisionedPlans',
+				value: 'provisionedPlans',
+			},
+			{
+				name: 'proxyAddresses',
+				value: 'proxyAddresses',
+			},
+			{
+				name: 'responsibilities',
+				value: 'responsibilities',
+			},
+			{
+				name: 'schools',
+				value: 'schools',
+			},
+			{
+				name: 'securityIdentifier',
+				value: 'securityIdentifier',
+			},
+			{
+				name: 'serviceProvisioningErrors',
+				value: 'serviceProvisioningErrors',
+			},
+			{
+				name: 'showInAddressList',
+				value: 'showInAddressList',
+			},
+			// {
+			// 	name: 'signInActivity',
+			// 	value: 'signInActivity',
+			// },
+			{
+				name: 'signInSessionsValidFromDateTime',
+				value: 'signInSessionsValidFromDateTime',
+			},
+			{
+				name: 'skills',
+				value: 'skills',
+			},
+			{
+				name: 'state',
+				value: 'state',
+			},
+			{
+				name: 'streetAddress',
+				value: 'streetAddress',
+			},
+			{
+				name: 'surname',
+				value: 'surname',
+			},
+			{
+				name: 'usageLocation',
+				value: 'usageLocation',
+			},
+			{
+				name: 'userPrincipalName',
+				value: 'userPrincipalName',
+			},
+			{
+				name: 'userType',
+				value: 'userType',
+			},
+		],
+	},
+};
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 51bbf93fea..8ee27fe195 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -626,6 +626,7 @@
       "dist/nodes/MessageBird/MessageBird.node.js",
       "dist/nodes/Metabase/Metabase.node.js",
       "dist/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.js",
+      "dist/nodes/Microsoft/Entra/MicrosoftEntra.node.js",
       "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js",
       "dist/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.js",
       "dist/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.js",
diff --git a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
index 4daacbfd07..96445973e9 100644
--- a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
+++ b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
@@ -80,6 +80,30 @@ BQIDAQAB
 		},
 		baseUrl: 'https://api.gong.io',
 	},
+	microsoftEntraOAuth2Api: {
+		grantType: 'authorizationCode',
+		authUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
+		accessTokenUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+		clientId: 'CLIENTID',
+		clientSecret: 'CLIENTSECRET',
+		scope:
+			'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All User.ReadWrite.All Directory.AccessAsUser.All Sites.FullControl.All',
+		authQueryParameters: 'response_mode=query',
+		authentication: 'body',
+		oauthTokenData: {
+			token_type: 'Bearer',
+			scope:
+				'AccessReview.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All Directory.AccessAsUser.All Directory.Read.All Directory.ReadWrite.All EntitlementManagement.ReadWrite.All Group.ReadWrite.All NetworkAccessPolicy.ReadWrite.All openid Sites.FullControl.All User.DeleteRestore.All User.EnableDisableAccount.All User.Export.All User.Invite.All User.ManageIdentities.All User.Read User.Read.All User.ReadBasic.All User.ReadWrite User.ReadWrite.All User.RevokeSessions.All profile email',
+			expires_in: 4822,
+			ext_expires_in: 4822,
+			access_token: 'ACCESSTOKEN',
+			refresh_token: 'REFRESHTOKEN',
+			id_token: 'IDTOKEN',
+			callbackQueryString: {
+				session_state: 'SESSIONSTATE',
+			},
+		},
+	},
 	n8nApi: {
 		apiKey: 'key123',
 		baseUrl: 'https://test.app.n8n.cloud/api/v1',
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 5711de38ca..2161569b7d 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2451,7 +2451,7 @@ export interface WorkflowTestData {
 	nock?: {
 		baseUrl: string;
 		mocks: Array<{
-			method: 'delete' | 'get' | 'post' | 'put';
+			method: 'delete' | 'get' | 'patch' | 'post' | 'put';
 			path: string;
 			requestBody?: RequestBodyMatcher;
 			statusCode: number;

From 8cce5882092a85a0371ac954f5998c60f94f1585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Wed, 8 Jan 2025 12:11:11 +0100
Subject: [PATCH 24/30] test(editor): Update workflow actions tests for the new
 canvas (no-changelog) (#12245)

Co-authored-by: Alex Grozav <alex@grozav.com>
---
 cypress/e2e/7-workflow-actions.cy.ts         | 19 +++++++++++++++++--
 packages/editor-ui/src/views/NodeView.v2.vue |  5 +++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 8571b174d9..f0f3ae019a 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -171,9 +171,16 @@ describe('Workflow Actions', () => {
 		cy.get('#node-creator').should('not.exist');
 
 		WorkflowPage.actions.hitSelectAll();
-		cy.get('.jtk-drag-selected').should('have.length', 2);
 		WorkflowPage.actions.hitCopy();
 		successToast().should('exist');
+		// Both nodes should be copied
+		cy.window()
+			.its('navigator.clipboard')
+			.then((clip) => clip.readText())
+			.then((text) => {
+				const copiedWorkflow = JSON.parse(text);
+				expect(copiedWorkflow.nodes).to.have.length(2);
+			});
 	});
 
 	it('should paste nodes (both current and old node versions)', () => {
@@ -345,7 +352,15 @@ describe('Workflow Actions', () => {
 		WorkflowPage.actions.hitDeleteAllNodes();
 		WorkflowPage.getters.canvasNodes().should('have.length', 0);
 		// Button should be disabled
-		WorkflowPage.getters.executeWorkflowButton().should('be.disabled');
+		cy.ifCanvasVersion(
+			() => {
+				WorkflowPage.getters.executeWorkflowButton().should('be.disabled');
+			},
+			() => {
+				// In new canvas, button does not exist when there are no nodes
+				WorkflowPage.getters.executeWorkflowButton().should('not.exist');
+			},
+		);
 		// Keyboard shortcut should not work
 		WorkflowPage.actions.hitExecuteWorkflow();
 		successToast().should('not.exist');
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index ee3fc857c1..fda3f17e6f 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -697,6 +697,11 @@ function onPinNodes(ids: string[], source: PinDataSource) {
 }
 
 async function onSaveWorkflow() {
+	const workflowIsSaved = !uiStore.stateIsDirty;
+
+	if (workflowIsSaved) {
+		return;
+	}
 	const saved = await workflowHelpers.saveCurrentWorkflow();
 	if (saved) {
 		canvasEventBus.emit('saved:workflow');

From 0ecce10faf60ae44d11007d45e87766b678d3a84 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 8 Jan 2025 13:11:20 +0200
Subject: [PATCH 25/30] fix(editor): Improve configurable nodes design on new
 canvas (#12317)

---
 .../canvas/elements/nodes/CanvasNode.test.ts  | 27 ++++++
 .../canvas/elements/nodes/CanvasNode.vue      | 97 +++++++++++--------
 .../nodes/render-types/CanvasNodeDefault.vue  |  6 ++
 .../editor-ui/src/utils/canvasUtilsV2.test.ts | 74 +++++++++++++-
 packages/editor-ui/src/utils/canvasUtilsV2.ts | 20 ++++
 5 files changed, 182 insertions(+), 42 deletions(-)

diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
index 6b72cdf037..816310ac7d 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
@@ -84,6 +84,33 @@ describe('CanvasNode', () => {
 			expect(inputHandles.length).toBe(3);
 			expect(outputHandles.length).toBe(2);
 		});
+
+		it('should insert spacers after required non-main input handle', () => {
+			const { getAllByTestId } = renderComponent({
+				props: {
+					...createCanvasNodeProps({
+						data: {
+							inputs: [
+								{ type: NodeConnectionType.Main, index: 0 },
+								{ type: NodeConnectionType.AiAgent, index: 0, required: true },
+								{ type: NodeConnectionType.AiTool, index: 0 },
+							],
+							outputs: [],
+						},
+					}),
+				},
+				global: {
+					stubs: {
+						Handle: true,
+					},
+				},
+			});
+
+			const inputHandles = getAllByTestId('canvas-node-input-handle');
+
+			expect(inputHandles[1]).toHaveStyle('left: 20%');
+			expect(inputHandles[2]).toHaveStyle('left: 80%');
+		});
 	});
 
 	describe('toolbar', () => {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index 5dbd08db32..a0b812489d 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -28,7 +28,10 @@ import { useContextMenu } from '@/composables/useContextMenu';
 import type { NodeProps, XYPosition } from '@vue-flow/core';
 import { Position } from '@vue-flow/core';
 import { useCanvas } from '@/composables/useCanvas';
-import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
+import {
+	createCanvasConnectionHandleString,
+	insertSpacersBetweenEndpoints,
+} from '@/utils/canvasUtilsV2';
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
 import { isEqual } from 'lodash-es';
@@ -77,12 +80,18 @@ const nodeClasses = ref<string[]>([]);
 const inputs = computed(() => props.data.inputs);
 const outputs = computed(() => props.data.outputs);
 const connections = computed(() => props.data.connections);
-const { mainInputs, nonMainInputs, mainOutputs, nonMainOutputs, isValidConnection } =
-	useNodeConnections({
-		inputs,
-		outputs,
-		connections,
-	});
+const {
+	mainInputs,
+	nonMainInputs,
+	requiredNonMainInputs,
+	mainOutputs,
+	nonMainOutputs,
+	isValidConnection,
+} = useNodeConnections({
+	inputs,
+	outputs,
+	connections,
+});
 
 const isDisabled = computed(() => props.data.disabled);
 
@@ -114,23 +123,15 @@ function emitCanvasNodeEvent(event: CanvasEventBusEvents['nodes:action']) {
  * Inputs
  */
 
+const nonMainInputsWithSpacer = computed(() =>
+	insertSpacersBetweenEndpoints(nonMainInputs.value, requiredNonMainInputs.value.length),
+);
+
 const mappedInputs = computed(() => {
 	return [
-		...mainInputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Input,
-				position: Position.Left,
-				offsetAxis: 'top',
-			}),
-		),
-		...nonMainInputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Input,
-				position: Position.Bottom,
-				offsetAxis: 'left',
-			}),
-		),
-	];
+		...mainInputs.value.map(mainInputsMappingFn),
+		...nonMainInputsWithSpacer.value.map(nonMainInputsMappingFn),
+	].filter((endpoint) => !!endpoint);
 });
 
 /**
@@ -139,21 +140,9 @@ const mappedInputs = computed(() => {
 
 const mappedOutputs = computed(() => {
 	return [
-		...mainOutputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Output,
-				position: Position.Right,
-				offsetAxis: 'top',
-			}),
-		),
-		...nonMainOutputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Output,
-				position: Position.Top,
-				offsetAxis: 'left',
-			}),
-		),
-	];
+		...mainOutputs.value.map(mainOutputsMappingFn),
+		...nonMainOutputs.value.map(nonMainOutputsMappingFn),
+	].filter((endpoint) => !!endpoint);
 });
 
 /**
@@ -179,10 +168,14 @@ const createEndpointMappingFn =
 		offsetAxis: 'top' | 'left';
 	}) =>
 	(
-		endpoint: CanvasConnectionPort,
+		endpoint: CanvasConnectionPort | null,
 		index: number,
-		endpoints: CanvasConnectionPort[],
-	): CanvasElementPortWithRenderData => {
+		endpoints: Array<CanvasConnectionPort | null>,
+	): CanvasElementPortWithRenderData | undefined => {
+		if (!endpoint) {
+			return;
+		}
+
 		const handleId = createCanvasConnectionHandleString({
 			mode,
 			type: endpoint.type,
@@ -207,6 +200,30 @@ const createEndpointMappingFn =
 		};
 	};
 
+const mainInputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Input,
+	position: Position.Left,
+	offsetAxis: 'top',
+});
+
+const nonMainInputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Input,
+	position: Position.Bottom,
+	offsetAxis: 'left',
+});
+
+const mainOutputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Output,
+	position: Position.Right,
+	offsetAxis: 'top',
+});
+
+const nonMainOutputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Output,
+	position: Position.Top,
+	offsetAxis: 'left',
+});
+
 /**
  * Events
  */
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 9c9f864a86..2481831249 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -201,6 +201,12 @@ function openContextMenu(event: MouseEvent) {
 				var(--configurable-node--input-width)
 		);
 
+		justify-content: flex-start;
+
+		:global(.n8n-node-icon) {
+			margin-left: var(--configurable-node--icon-offset);
+		}
+
 		.description {
 			top: unset;
 			position: relative;
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.test.ts b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
index 61425172b3..63c7321808 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
@@ -1,14 +1,15 @@
 import {
+	checkOverlap,
 	createCanvasConnectionHandleString,
 	createCanvasConnectionId,
+	insertSpacersBetweenEndpoints,
 	mapCanvasConnectionToLegacyConnection,
 	mapLegacyConnectionsToCanvasConnections,
 	mapLegacyEndpointsToCanvasConnectionPort,
 	parseCanvasConnectionHandleString,
-	checkOverlap,
 } from '@/utils/canvasUtilsV2';
+import type { IConnection, IConnections, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import type { IConnections, INodeTypeDescription, IConnection } from 'n8n-workflow';
 import type { CanvasConnection } from '@/types';
 import { CanvasConnectionMode } from '@/types';
 import type { INodeUi } from '@/Interface';
@@ -976,3 +977,72 @@ describe('checkOverlap', () => {
 		expect(checkOverlap(node1, node2)).toBe(false);
 	});
 });
+
+describe('insertSpacersBetweenEndpoints', () => {
+	it('should insert spacers when there are less than min endpoints count', () => {
+		const endpoints = [{ index: 0, required: true }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([{ index: 0, required: true }, null, null, null]);
+	});
+
+	it('should not insert spacers when there are at least min endpoints count', () => {
+		const endpoints = [{ index: 0, required: true }, { index: 1 }, { index: 2 }, { index: 3 }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual(endpoints);
+	});
+
+	it('should handle zero required endpoints', () => {
+		const endpoints = [{ index: 0, required: false }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([null, null, null, { index: 0, required: false }]);
+	});
+
+	it('should handle no endpoints', () => {
+		const endpoints: Array<{ index: number; required: boolean }> = [];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([null, null, null, null]);
+	});
+
+	it('should handle required endpoints greater than min endpoints count', () => {
+		const endpoints = [
+			{ index: 0, required: true },
+			{ index: 1, required: true },
+			{ index: 2, required: true },
+			{ index: 3, required: true },
+			{ index: 4, required: true },
+		];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual(endpoints);
+	});
+
+	it('should insert spacers between required and optional endpoints', () => {
+		const endpoints = [{ index: 0, required: true }, { index: 1, required: true }, { index: 2 }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([
+			{ index: 0, required: true },
+			{ index: 1, required: true },
+			null,
+			{ index: 2 },
+		]);
+	});
+
+	it('should handle required endpoints count greater than endpoints length', () => {
+		const endpoints = [{ index: 0, required: true }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([{ index: 0, required: true }, null, null, null]);
+	});
+
+	it('should handle min endpoints count less than required endpoints count', () => {
+		const endpoints = [{ index: 0, required: false }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 0);
+		expect(result).toEqual([{ index: 0, required: false }]);
+	});
+});
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.ts b/packages/editor-ui/src/utils/canvasUtilsV2.ts
index d08f817d82..f8e412caea 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.ts
@@ -210,3 +210,23 @@ export function checkOverlap(node1: BoundingBox, node2: BoundingBox) {
 		)
 	);
 }
+
+export function insertSpacersBetweenEndpoints<T>(
+	endpoints: T[],
+	requiredEndpointsCount = 0,
+	minEndpointsCount = 4,
+) {
+	const endpointsWithSpacers: Array<T | null> = [...endpoints];
+	const optionalNonMainInputsCount = endpointsWithSpacers.length - requiredEndpointsCount;
+	const spacerCount = minEndpointsCount - requiredEndpointsCount - optionalNonMainInputsCount;
+
+	// Insert `null` in between required non-main inputs and non-required non-main inputs
+	// to separate them visually if there are less than 4 inputs in total
+	if (endpointsWithSpacers.length < minEndpointsCount) {
+		for (let i = 0; i < spacerCount; i++) {
+			endpointsWithSpacers.splice(requiredEndpointsCount + i, 0, null);
+		}
+	}
+
+	return endpointsWithSpacers;
+}

From c64cd518224b3c028887c24fa5257728b0302b81 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 8 Jan 2025 13:24:41 +0200
Subject: [PATCH 26/30] chore: Fix dev setup on windows machines (no-changelog)
 (#11065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
---
 scripts/prepare.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/prepare.mjs b/scripts/prepare.mjs
index d729715347..2ad91f7767 100644
--- a/scripts/prepare.mjs
+++ b/scripts/prepare.mjs
@@ -7,4 +7,4 @@ if (process.env.CI || process.env.DOCKER_BUILD) {
 	process.exit(0);
 }
 
-execSync('./node_modules/.bin/lefthook install', { stdio: 'inherit' });
+execSync('pnpm lefthook install', { stdio: 'inherit' });

From bb6cd790b81001083787fa37e38686586e9b3e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:44:31 +0100
Subject: [PATCH 27/30] ci: Skip workflow tests on community PRs (#12501)

---
 .github/workflows/test-workflows.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 90a69438ab..2df829f7c6 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -17,7 +17,9 @@ jobs:
   build:
     name: Install & Build
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request_review' || startsWith(github.event.pull_request.base.ref, 'release/')
+    if: |
+      (github.event_name != 'pull_request_review' || startsWith(github.event.pull_request.base.ref, 'release/')) &&
+      !contains(github.event.pull_request.labels.*.name, 'community')
     steps:
       - uses: actions/checkout@v4.1.1
       - run: corepack enable

From 3ea592ecc91a9e308fa205f96877f203b6b6b3df Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 8 Jan 2025 14:16:56 +0200
Subject: [PATCH 28/30] feat: Make it easier to get started on developing front
 end and e2e tests (no-changelog) (#12500)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 cypress/package.json                |  2 +-
 package.json                        |  6 +++
 packages/design-system/package.json |  2 +-
 pnpm-lock.yaml                      | 68 +++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/cypress/package.json b/cypress/package.json
index 26b585408b..6725c46bc6 100644
--- a/cypress/package.json
+++ b/cypress/package.json
@@ -12,7 +12,7 @@
     "format:check": "biome ci .",
     "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
-    "develop": "cd ..; pnpm dev",
+    "develop": "cd ..; pnpm dev:e2e:server",
     "start": "cd ..; pnpm start"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
index 90e48e9bd8..7b6c9027df 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,11 @@
     "dev": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat --filter=!@n8n/task-runner",
     "dev:be": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat --filter=!@n8n/task-runner --filter=!n8n-editor-ui",
     "dev:ai": "turbo run dev --parallel --env-mode=loose --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core",
+    "dev:fe": "run-p start \"dev:fe:editor --filter=n8n-design-system\"",
+    "dev:fe:editor": "turbo run dev --parallel --env-mode=loose --filter=n8n-editor-ui",
+    "dev:e2e": "cd cypress && pnpm run test:e2e:dev",
+    "dev:e2e:v2": "cd cypress && pnpm run test:e2e:dev:v2",
+    "dev:e2e:server": "run-p start dev:fe:editor",
     "clean": "turbo run clean --parallel",
     "reset": "node scripts/ensure-zx.mjs && zx scripts/reset.mjs",
     "format": "turbo run format && node scripts/format.mjs",
@@ -55,6 +60,7 @@
     "lefthook": "^1.7.15",
     "nock": "^13.3.2",
     "nodemon": "^3.0.1",
+    "npm-run-all2": "^7.0.2",
     "p-limit": "^3.1.0",
     "rimraf": "^5.0.1",
     "run-script-os": "^1.0.7",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 2ecd0513ac..68e47f908a 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -11,7 +11,7 @@
     "test": "vitest run",
     "test:dev": "vitest",
     "build:storybook": "storybook build",
-    "storybook": "storybook dev -p 6006",
+    "storybook": "storybook dev -p 6006 --no-open",
     "chromatic": "chromatic",
     "format": "biome format --write .  && prettier --write . --ignore-path ../../.prettierignore",
     "format:check": "biome ci .  && prettier --check . --ignore-path ../../.prettierignore",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b1f8c6ac1..679b1155d2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -186,6 +186,9 @@ importers:
       nodemon:
         specifier: ^3.0.1
         version: 3.0.1
+      npm-run-all2:
+        specifier: ^7.0.2
+        version: 7.0.2
       p-limit:
         specifier: ^3.1.0
         version: 3.1.0
@@ -9139,6 +9142,10 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
+  isexe@3.1.1:
+    resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==}
+    engines: {node: '>=16'}
+
   iso-639-1@2.1.15:
     resolution: {integrity: sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==}
     engines: {node: '>=6.0'}
@@ -9455,6 +9462,10 @@ packages:
   json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
+  json-parse-even-better-errors@4.0.0:
+    resolution: {integrity: sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
   json-pointer@0.6.2:
     resolution: {integrity: sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==}
 
@@ -9983,6 +9994,10 @@ packages:
   memory-pager@1.5.0:
     resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
 
+  memorystream@0.3.1:
+    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
+    engines: {node: '>= 0.10.0'}
+
   mensch@0.3.4:
     resolution: {integrity: sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==}
 
@@ -10531,6 +10546,15 @@ packages:
   normalize-wheel-es@1.2.0:
     resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
 
+  npm-normalize-package-bin@4.0.0:
+    resolution: {integrity: sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
+  npm-run-all2@7.0.2:
+    resolution: {integrity: sha512-7tXR+r9hzRNOPNTvXegM+QzCuMjzUIIq66VDunL6j60O4RrExx32XUhlrS7UK4VcdGw5/Wxzb3kfNcFix9JKDA==}
+    engines: {node: ^18.17.0 || >=20.5.0, npm: '>= 9'}
+    hasBin: true
+
   npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
@@ -10946,6 +10970,11 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  pidtree@0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
   pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
@@ -11367,6 +11396,10 @@ packages:
   read-cache@1.0.0:
     resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
+  read-package-json-fast@4.0.0:
+    resolution: {integrity: sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
   read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
     engines: {node: '>=8'}
@@ -13225,6 +13258,11 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
+  which@5.0.0:
+    resolution: {integrity: sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+    hasBin: true
+
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
@@ -22706,6 +22744,8 @@ snapshots:
 
   isexe@2.0.0: {}
 
+  isexe@3.1.1: {}
+
   iso-639-1@2.1.15: {}
 
   isstream@0.1.2: {}
@@ -23273,6 +23313,8 @@ snapshots:
 
   json-parse-even-better-errors@2.3.1: {}
 
+  json-parse-even-better-errors@4.0.0: {}
+
   json-pointer@0.6.2:
     dependencies:
       foreach: 2.0.6
@@ -23819,6 +23861,8 @@ snapshots:
 
   memory-pager@1.5.0: {}
 
+  memorystream@0.3.1: {}
+
   mensch@0.3.4: {}
 
   meow@13.2.0: {}
@@ -24576,6 +24620,19 @@ snapshots:
 
   normalize-wheel-es@1.2.0: {}
 
+  npm-normalize-package-bin@4.0.0: {}
+
+  npm-run-all2@7.0.2:
+    dependencies:
+      ansi-styles: 6.2.1
+      cross-spawn: 7.0.6
+      memorystream: 0.3.1
+      minimatch: 9.0.5
+      pidtree: 0.6.0
+      read-package-json-fast: 4.0.0
+      shell-quote: 1.8.1
+      which: 5.0.0
+
   npm-run-path@4.0.1:
     dependencies:
       path-key: 3.1.1
@@ -25026,6 +25083,8 @@ snapshots:
 
   picomatch@2.3.1: {}
 
+  pidtree@0.6.0: {}
+
   pify@2.3.0: {}
 
   pinia@2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)):
@@ -25484,6 +25543,11 @@ snapshots:
     dependencies:
       pify: 2.3.0
 
+  read-package-json-fast@4.0.0:
+    dependencies:
+      json-parse-even-better-errors: 4.0.0
+      npm-normalize-package-bin: 4.0.0
+
   read-pkg-up@7.0.1:
     dependencies:
       find-up: 4.1.0
@@ -27612,6 +27676,10 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
+  which@5.0.0:
+    dependencies:
+      isexe: 3.1.1
+
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0

From 9953477450c28ec2d211e55aadb825dbae2ee4d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 8 Jan 2025 13:33:43 +0100
Subject: [PATCH 29/30] fix(core): Align concurrency and timeout defaults
 between instance and runner (#12503)

---
 .../@n8n/config/src/configs/runners.config.ts    |  4 ++--
 .../task-runner/src/config/base-runner-config.ts | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index f41f3e101e..02ebdf5df9 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -42,7 +42,7 @@ export class TaskRunnersConfig {
 	/**
 	 * How many concurrent tasks can a runner execute at a time
 	 *
-	 * @note Kept high for backwards compatibility - n8n v2 will reduce this to `5`
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `5`
 	 */
 	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
 	maxConcurrency: number = 10;
@@ -52,7 +52,7 @@ export class TaskRunnersConfig {
 	 * task will be aborted. (In internal mode, the runner will also be
 	 * restarted.) Must be greater than 0.
 	 *
-	 * @note Kept high for backwards compatibility - n8n v2 will reduce this to `60`
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `60`
 	 */
 	@Env('N8N_RUNNERS_TASK_TIMEOUT')
 	taskTimeout: number = 300; // 5 minutes
diff --git a/packages/@n8n/task-runner/src/config/base-runner-config.ts b/packages/@n8n/task-runner/src/config/base-runner-config.ts
index d08056c5ae..f9032dda9f 100644
--- a/packages/@n8n/task-runner/src/config/base-runner-config.ts
+++ b/packages/@n8n/task-runner/src/config/base-runner-config.ts
@@ -23,8 +23,13 @@ export class BaseRunnerConfig {
 	@Env('N8N_RUNNERS_MAX_PAYLOAD')
 	maxPayloadSize: number = 1024 * 1024 * 1024;
 
+	/**
+	 * How many concurrent tasks can a runner execute at a time
+	 *
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `5`
+	 */
 	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
-	maxConcurrency: number = 5;
+	maxConcurrency: number = 10;
 
 	/**
 	 * How long (in seconds) a runner may be idle for before exit. Intended
@@ -37,8 +42,15 @@ export class BaseRunnerConfig {
 	@Env('GENERIC_TIMEZONE')
 	timezone: string = 'America/New_York';
 
+	/**
+	 * How long (in seconds) a task is allowed to take for completion, else the
+	 * task will be aborted. (In internal mode, the runner will also be
+	 * restarted.) Must be greater than 0.
+	 *
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `60`
+	 */
 	@Env('N8N_RUNNERS_TASK_TIMEOUT')
-	taskTimeout: number = 60;
+	taskTimeout: number = 300; // 5 minutes
 
 	@Nested
 	healthcheckServer!: HealthcheckServerConfig;

From be2dcffc9487973d3e287dd4f6956dbba03757e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 8 Jan 2025 13:39:52 +0100
Subject: [PATCH 30/30] fix(core): Fix manually running a pinned trigger with
 offloading enabled (#12491)

---
 .../src/workflows/workflow-execution.service.ts    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index 3b384f4c53..bccd5c1f13 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -147,6 +147,12 @@ export class WorkflowExecutionService {
 			triggerToStartFrom,
 		};
 
+		const hasRunData = (node: INode) => runData !== undefined && !!runData[node.name];
+
+		if (pinnedTrigger && !hasRunData(pinnedTrigger)) {
+			data.startNodes = [{ name: pinnedTrigger.name, sourceData: null }];
+		}
+
 		/**
 		 * Historically, manual executions in scaling mode ran in the main process,
 		 * so some execution details were never persisted in the database.
@@ -160,7 +166,7 @@ export class WorkflowExecutionService {
 		) {
 			data.executionData = {
 				startData: {
-					startNodes,
+					startNodes: data.startNodes,
 					destinationNode,
 				},
 				resultData: {
@@ -176,12 +182,6 @@ export class WorkflowExecutionService {
 			};
 		}
 
-		const hasRunData = (node: INode) => runData !== undefined && !!runData[node.name];
-
-		if (pinnedTrigger && !hasRunData(pinnedTrigger)) {
-			data.startNodes = [{ name: pinnedTrigger.name, sourceData: null }];
-		}
-
 		const executionId = await this.workflowRunner.run(data);
 
 		return {