From 5d8b09fcc7dd9b78845d6ff1f3e991499e1dfc92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ir=C3=A9n=C3=A9e?= <irenee.ajeneza@n8n.io>
Date: Wed, 29 Oct 2025 09:46:17 +0000
Subject: [PATCH 1/5] feat: add loading state to project move modal

---
 .../projects/components/ProjectMoveResourceModal.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
index 7a350a405156f..a72785211ec5b 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
@@ -62,6 +62,7 @@ const projectId = ref<string | null>(null);
 const shareUsedCredentials = ref(false);
 const usedCredentials = ref<IUsedCredential[]>([]);
 const allCredentials = ref<ICredentialsResponse[]>([]);
+const loading = ref(false);
 const shareableCredentials = computed(() =>
 	allCredentials.value.filter(
 		(credential) =>
@@ -133,7 +134,9 @@ const setFilter = (query: string) => {
 };
 
 const moveResource = async () => {
-	if (!selectedProject.value) return;
+	if (!selectedProject.value || loading.value) return;
+
+	loading.value = true;
 	try {
 		await projectsStore.moveResourceToProject(
 			props.data.resourceType,
@@ -183,6 +186,8 @@ const moveResource = async () => {
 				},
 			}),
 		);
+	} finally {
+		loading.value = false;
 	}
 };
 
@@ -337,11 +342,12 @@ onMounted(async () => {
 		</template>
 		<template #footer>
 			<div :class="$style.buttons">
-				<N8nButton type="secondary" text class="mr-2xs" @click="closeModal">
+				<N8nButton type="secondary" text class="mr-2xs" :disabled="loading" @click="closeModal">
 					{{ i18n.baseText('generic.cancel') }}
 				</N8nButton>
 				<N8nButton
-					:disabled="!projectId"
+					:loading="loading"
+					:disabled="!projectId || loading"
 					type="primary"
 					data-test-id="project-move-resource-modal-button"
 					@click="moveResource"

From cdd3f7e3a82600074967867ca5d83eb4bcf0356c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ir=C3=A9n=C3=A9e?= <irenee.ajeneza@n8n.io>
Date: Wed, 29 Oct 2025 09:51:38 +0000
Subject: [PATCH 2/5] test: Test duplicate submissions prevention in
 ProjectMoveResourceModal

---
 .../ProjectMoveResourceModal.test.ts          | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.test.ts
index ed0a226c61fb5..e05864c7118f1 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.test.ts
@@ -242,4 +242,51 @@ describe('ProjectMoveResourceModal', () => {
 			['1', '2'],
 		);
 	});
+
+	it('should prevent duplicate submissions when button clicked multiple times', async () => {
+		const destinationProject = createProjectListItem();
+		projectsStore.availableProjects = [destinationProject];
+		workflowsStore.fetchWorkflow.mockResolvedValueOnce(createTestWorkflow());
+
+		// Make moveResourceToProject take time to simulate slow operation
+		let resolveMove: () => void;
+		const movePromise = new Promise<void>((resolve) => {
+			resolveMove = resolve;
+		});
+		projectsStore.moveResourceToProject.mockReturnValue(movePromise);
+
+		const props: ComponentProps<typeof ProjectMoveResourceModal> = {
+			modalName: PROJECT_MOVE_RESOURCE_MODAL,
+			data: {
+				resourceType: ResourceType.Workflow,
+				resourceTypeLabel: 'workflow',
+				resource: createTestWorkflow({
+					id: '1',
+					name: 'My Workflow',
+				}),
+			},
+		};
+
+		const { getByTestId } = renderComponent({ props });
+
+		// Select a project
+		const projectSelect = getByTestId('project-move-resource-modal-select');
+		const projectSelectDropdownItems = await getDropdownItems(projectSelect);
+		await userEvent.click(projectSelectDropdownItems[0]);
+
+		const moveButton = getByTestId('project-move-resource-modal-button');
+		expect(moveButton).toBeEnabled();
+
+		// Click the button multiple times rapidly
+		await userEvent.click(moveButton);
+		await userEvent.click(moveButton);
+		await userEvent.click(moveButton);
+
+		// Should only be called once due to loading state guard
+		expect(projectsStore.moveResourceToProject).toHaveBeenCalledTimes(1);
+
+		// Resolve the operation
+		resolveMove!();
+		await movePromise;
+	});
 });

From b0f57f62610ad4a45915e95c71ae710fcbfa4da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ir=C3=A9n=C3=A9e?= <irenee.ajeneza@n8n.io>
Date: Wed, 29 Oct 2025 11:35:11 +0000
Subject: [PATCH 3/5] feat(editor): Enhance ProjectMoveResourceModal with
 router integration for project navigation

---
 .../projects/components/ProjectMoveResourceModal.vue  | 11 +++++++++++
 .../components/ProjectMoveSuccessToastMessage.vue     |  9 ++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
index a72785211ec5b..25274d53b0e8b 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
@@ -28,6 +28,7 @@ import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 import { truncate } from '@n8n/utils/string/truncate';
 import { computed, h, onMounted, ref } from 'vue';
 import { I18nT } from 'vue-i18n';
+import { useRouter } from 'vue-router';
 
 import {
 	N8nButton,
@@ -52,6 +53,7 @@ const props = defineProps<{
 const i18n = useI18n();
 const uiStore = useUIStore();
 const toast = useToast();
+const router = useRouter();
 const projectsStore = useProjectsStore();
 const workflowsStore = useWorkflowsStore();
 const credentialsStore = useCredentialsStore();
@@ -166,6 +168,15 @@ const moveResource = async () => {
 				areAllUsedCredentialsShareable:
 					shareableCredentials.value.length === usedCredentials.value.length,
 			}),
+			onClick: (event: MouseEvent | undefined) => {
+				if (event?.target instanceof HTMLAnchorElement && selectedProject.value) {
+					event.preventDefault();
+					void router.push({
+						name: isResourceWorkflow.value ? VIEWS.PROJECTS_WORKFLOWS : VIEWS.PROJECTS_CREDENTIALS,
+						params: { projectId: selectedProject.value.id },
+					});
+				}
+			},
 			type: 'success',
 			duration: 8000,
 		});
diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
index 07bdcc4002f49..7026021fd479e 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
@@ -34,18 +34,13 @@ const targetProjectName = computed(() => {
 			<span v-else>{{ i18n.baseText('projects.move.resource.success.message.workflow') }}</span>
 		</N8nText>
 		<p v-if="isTargetProjectTeam" class="pt-s">
-			<RouterLink
-				:to="{
-					name: props.routeName,
-					params: { projectId: props.targetProject.id },
-				}"
-			>
+			<a href="#">
 				{{
 					i18n.baseText('projects.move.resource.success.link', {
 						interpolate: { targetProjectName },
 					})
 				}}
-			</RouterLink>
+			</a>
 		</p>
 	</div>
 </template>

From b394e6e07cb1ed486ff29e98cd8677514a288d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ir=C3=A9n=C3=A9e?= <irenee.ajeneza@n8n.io>
Date: Wed, 29 Oct 2025 11:37:54 +0000
Subject: [PATCH 4/5] fix(editor): Add comment for navigation handling in
 ProjectMoveSuccessToastMessage component

---
 .../projects/components/ProjectMoveSuccessToastMessage.vue       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
index 7026021fd479e..8183b64fe17b8 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
@@ -34,6 +34,7 @@ const targetProjectName = computed(() => {
 			<span v-else>{{ i18n.baseText('projects.move.resource.success.message.workflow') }}</span>
 		</N8nText>
 		<p v-if="isTargetProjectTeam" class="pt-s">
+			<!-- The navigation should be handled by the component showing the toast  -->
 			<a href="#">
 				{{
 					i18n.baseText('projects.move.resource.success.link', {

From 61e1cb86cd937e3c7a5457c825498ba8d51c3c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ir=C3=A9n=C3=A9e?= <irenee.ajeneza@n8n.io>
Date: Wed, 29 Oct 2025 11:45:20 +0000
Subject: [PATCH 5/5] fix: Fix error toast message display

---
 .../projects/components/ProjectMoveResourceModal.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
index 25274d53b0e8b..4d25deb65bef3 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
@@ -189,7 +189,7 @@ const moveResource = async () => {
 		}
 	} catch (error) {
 		toast.showError(
-			error.message,
+			error,
 			i18n.baseText('projects.move.resource.error.title', {
 				interpolate: {
 					resourceTypeLabel: props.data.resourceTypeLabel,