From 98b821bbd89a069acc228730f2dd1eafd7b0fdd4 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 27 Jun 2025 13:04:21 +0300
Subject: [PATCH] feat: Don't allow multiple active workflows with same form
 path (#16722)

---
 ...wActivationConflictingWebhookModal.test.ts | 31 ++++++-
 ...kflowActivationConflictingWebhookModal.vue | 13 ++-
 .../src/components/WorkflowActivator.vue      |  2 +-
 .../composables/useWorkflowHelpers.test.ts    | 86 +++++++++++++++++++
 .../src/composables/useWorkflowHelpers.ts     | 38 ++++++--
 .../frontend/editor-ui/src/stores/ui.store.ts |  1 +
 6 files changed, 160 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.test.ts b/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.test.ts
index a0bc26342a..4eb726e1b6 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.test.ts
@@ -4,6 +4,7 @@ import WorkflowActivationConflictingWebhookModal from '@/components/WorkflowActi
 import { WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY } from '@/constants';
 
 import { waitFor } from '@testing-library/vue';
+import { FORM_TRIGGER_NODE_TYPE, WEBHOOK_NODE_TYPE } from 'n8n-workflow';
 
 vi.mock('@/stores/ui.store', () => {
 	return {
@@ -37,12 +38,13 @@ describe('WorkflowActivationConflictingWebhookModal', () => {
 		createTestingPinia();
 	});
 
-	it('should render modal', async () => {
+	it('should render webhook conflict modal', async () => {
 		const props = {
 			modalName: WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY,
 			data: {
 				triggerName: 'Trigger in this workflow',
 				workflowName: 'Test Workflow',
+				triggerType: WEBHOOK_NODE_TYPE,
 				workflowId: '123',
 				webhookPath: 'webhook-path',
 				method: 'GET',
@@ -62,4 +64,31 @@ describe('WorkflowActivationConflictingWebhookModal', () => {
 			'http://webhook-base/webhook-path',
 		);
 	});
+
+	it('should render form conflict modal', async () => {
+		const props = {
+			modalName: WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY,
+			data: {
+				triggerName: 'Trigger in this workflow',
+				workflowName: 'Test Form',
+				triggerType: FORM_TRIGGER_NODE_TYPE,
+				workflowId: '123',
+				webhookPath: 'form-path',
+				method: 'GET',
+				node: 'Node in workflow',
+			},
+		};
+
+		const wrapper = renderComponent({ props });
+		await waitFor(() => {
+			expect(wrapper.queryByTestId('conflicting-webhook-callout')).toBeInTheDocument();
+		});
+
+		expect(wrapper.getByTestId('conflicting-webhook-callout')).toHaveTextContent(
+			"A form trigger 'Node in workflow' in the workflow 'Test Form' uses a conflicting URL path, so this workflow cannot be activated",
+		);
+		expect(wrapper.getByTestId('conflicting-webhook-path')).toHaveTextContent(
+			'http://webhook-base/form-path',
+		);
+	});
 });
diff --git a/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.vue b/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.vue
index 987d369e76..a6cda1d9f4 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowActivationConflictingWebhookModal.vue
@@ -6,6 +6,7 @@ import { useUIStore } from '@/stores/ui.store';
 
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { computed } from 'vue';
+import { FORM_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 
 const modalBus = createEventBus();
 const uiStore = useUIStore();
@@ -14,6 +15,7 @@ const rootStore = useRootStore();
 const props = defineProps<{
 	data: {
 		workflowName: string;
+		triggerType: string;
 		workflowId: string;
 		webhookPath: string;
 		node: string;
@@ -26,6 +28,11 @@ const webhookUrl = computed(() => {
 	return rootStore.webhookUrl;
 });
 
+const webhookType = computed(() => {
+	if (data.triggerType === FORM_TRIGGER_NODE_TYPE) return 'form';
+	return 'webhook';
+});
+
 const workflowUrl = computed(() => {
 	return rootStore.urlBaseEditor + 'workflow/' + data.workflowId;
 });
@@ -39,14 +46,14 @@ const onClick = async () => {
 	<Modal
 		width="540px"
 		:name="WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY"
-		title="Conflicting Webhook Path"
+		:title="`Conflicting ${webhookType === 'form' ? 'Form' : 'Webhook'} Path`"
 		:event-bus="modalBus"
 		:center="true"
 	>
 		<template #content>
 			<n8n-callout theme="danger" data-test-id="conflicting-webhook-callout">
-				A webhook trigger '{{ data.node }}' in the workflow '{{ data.workflowName }}' uses a
-				conflicting URL path, so this workflow cannot be activated
+				A {{ webhookType }} trigger '{{ data.node }}' in the workflow '{{ data.workflowName }}' uses
+				a conflicting URL path, so this workflow cannot be activated
 			</n8n-callout>
 			<div :class="$style.container">
 				<div>
diff --git a/packages/frontend/editor-ui/src/components/WorkflowActivator.vue b/packages/frontend/editor-ui/src/components/WorkflowActivator.vue
index 90dcc8f2ea..3b30d4f30a 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowActivator.vue
@@ -143,7 +143,7 @@ async function activeChanged(newActiveState: boolean) {
 			uiStore.openModalWithData({
 				name: WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY,
 				data: {
-					triggerName: trigger.name,
+					triggerType: trigger.type,
 					workflowName: conflictingWorkflow.name,
 					...conflict,
 				},
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
index 3f3e52e854..9e2cd4b90f 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
@@ -362,6 +362,92 @@ describe('useWorkflowHelpers', () => {
 			} as unknown as WorkflowData);
 			expect(await workflowHelpers.checkConflictingWebhooks('12345')).toEqual(null);
 		});
+
+		it('should return null if no conflicts with FORM_TRIGGER_NODE_TYPE', async () => {
+			const workflowHelpers = useWorkflowHelpers();
+			uiStore.stateIsDirty = false;
+			vi.spyOn(workflowsStore, 'fetchWorkflow').mockResolvedValue({
+				nodes: [
+					{
+						type: 'n8n-nodes-base.formTrigger',
+						parameters: {
+							options: {
+								path: 'test-path',
+							},
+						},
+						webhookId: '123',
+					},
+				],
+			} as unknown as IWorkflowDb);
+			vi.spyOn(apiWebhooks, 'findWebhook').mockResolvedValue(null);
+			expect(await workflowHelpers.checkConflictingWebhooks('12345')).toEqual(null);
+		});
+
+		it('should return conflicting webhook data and workflow id is different with FORM_TRIGGER_NODE_TYPE', async () => {
+			const workflowHelpers = useWorkflowHelpers();
+			uiStore.stateIsDirty = false;
+			vi.spyOn(workflowsStore, 'fetchWorkflow').mockResolvedValue({
+				nodes: [
+					{
+						type: 'n8n-nodes-base.formTrigger',
+						parameters: {
+							options: {
+								path: 'test-path',
+							},
+						},
+						webhookId: '123',
+					},
+				],
+			} as unknown as IWorkflowDb);
+			vi.spyOn(apiWebhooks, 'findWebhook').mockResolvedValue({
+				method: 'GET',
+				webhookPath: 'test-path',
+				node: 'Form Trigger 1',
+				workflowId: '456',
+			});
+			expect(await workflowHelpers.checkConflictingWebhooks('123')).toEqual({
+				conflict: {
+					method: 'GET',
+					node: 'Form Trigger 1',
+					webhookPath: 'test-path',
+					workflowId: '456',
+				},
+				trigger: {
+					parameters: {
+						options: {
+							path: 'test-path',
+						},
+					},
+					type: 'n8n-nodes-base.formTrigger',
+					webhookId: '123',
+				},
+			});
+		});
+
+		it('should return null if webhook already exist but workflow id is the same with FORM_TRIGGER_NODE_TYPE', async () => {
+			const workflowHelpers = useWorkflowHelpers();
+			uiStore.stateIsDirty = false;
+			vi.spyOn(workflowsStore, 'fetchWorkflow').mockResolvedValue({
+				nodes: [
+					{
+						type: 'n8n-nodes-base.formTrigger',
+						parameters: {
+							options: {
+								path: 'test-path',
+							},
+						},
+						webhookId: '123',
+					},
+				],
+			} as unknown as IWorkflowDb);
+			vi.spyOn(apiWebhooks, 'findWebhook').mockResolvedValue({
+				method: 'GET',
+				webhookPath: 'test-path',
+				node: 'Form Trigger 1',
+				workflowId: '123',
+			});
+			expect(await workflowHelpers.checkConflictingWebhooks('123')).toEqual(null);
+		});
 	});
 
 	describe('executeData', () => {
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
index 4aeef009e3..60ecc70d6f 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -21,7 +21,12 @@ import type {
 	NodeParameterValue,
 	Workflow,
 } from 'n8n-workflow';
-import { NodeConnectionTypes, NodeHelpers, WEBHOOK_NODE_TYPE } from 'n8n-workflow';
+import {
+	FORM_TRIGGER_NODE_TYPE,
+	NodeConnectionTypes,
+	NodeHelpers,
+	WEBHOOK_NODE_TYPE,
+} from 'n8n-workflow';
 
 import type {
 	ICredentialsResponse,
@@ -909,6 +914,26 @@ export function useWorkflowHelpers() {
 		return workflow.nodes.some((node) => node.type.startsWith(packageName));
 	};
 
+	function getMethod(trigger: INode) {
+		if (trigger.type === WEBHOOK_NODE_TYPE) {
+			return (trigger.parameters.method as string) ?? 'GET';
+		}
+		return 'GET';
+	}
+
+	function getWebhookPath(trigger: INode) {
+		if (trigger.type === WEBHOOK_NODE_TYPE) {
+			return trigger.parameters.path as string;
+		}
+		if (trigger.type === FORM_TRIGGER_NODE_TYPE) {
+			return (
+				(((trigger.parameters.options as { path: string }) || {}).path as string) ??
+				trigger.webhookId
+			);
+		}
+		return '';
+	}
+
 	async function checkConflictingWebhooks(workflowId: string) {
 		let data;
 		if (uiStore.stateIsDirty) {
@@ -917,14 +942,15 @@ export function useWorkflowHelpers() {
 			data = await workflowsStore.fetchWorkflow(workflowId);
 		}
 
-		const webhookTriggers = data.nodes.filter(
-			(node) => node.disabled !== true && node.type === WEBHOOK_NODE_TYPE,
+		const triggers = data.nodes.filter(
+			(node) =>
+				node.disabled !== true && [WEBHOOK_NODE_TYPE, FORM_TRIGGER_NODE_TYPE].includes(node.type),
 		);
 
-		for (const trigger of webhookTriggers) {
-			const method = (trigger.parameters.method as string) ?? 'GET';
+		for (const trigger of triggers) {
+			const method = getMethod(trigger);
 
-			const path = trigger.parameters.path as string;
+			const path = getWebhookPath(trigger);
 
 			const conflict = await findWebhook(rootStore.restApiContext, {
 				path,
diff --git a/packages/frontend/editor-ui/src/stores/ui.store.ts b/packages/frontend/editor-ui/src/stores/ui.store.ts
index a8ce140c4c..a0f0e0ccfc 100644
--- a/packages/frontend/editor-ui/src/stores/ui.store.ts
+++ b/packages/frontend/editor-ui/src/stores/ui.store.ts
@@ -184,6 +184,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		[WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY]: {
 			open: false,
 			data: {
+				triggerType: '',
 				workflowName: '',
 				workflowId: '',
 				webhookPath: '',