From fd0492bccd63116b1581e60f93f09b441e174cdf Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 11 Oct 2023 14:26:07 +0200
Subject: [PATCH 1/3] fix(editor): Add cloned workflow link to success toast
 message

---
 .../editor-ui/src/composables/useToast.ts     | 17 ++--
 .../src/plugins/i18n/locales/en.json          |  1 +
 .../src/stores/workflowHistory.store.ts       | 36 ++++-----
 .../editor-ui/src/views/WorkflowHistory.vue   | 79 +++++++++++++------
 4 files changed, 79 insertions(+), 54 deletions(-)

diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index f0c1b200c0992..3b5256ba5cec0 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -19,17 +19,14 @@ export function useToast() {
 	const externalHooks = useExternalHooks();
 	const i18n = useI18n();
 
-	function showMessage(
-		messageData: Omit<NotificationOptions, 'message'> & { message?: string },
-		track = true,
-	) {
+	function showMessage(messageData: NotificationOptions, track = true) {
 		messageData = { ...messageDefaults, ...messageData };
-		messageData.message = messageData.message
-			? sanitizeHtml(messageData.message)
-			: messageData.message;
+		messageData.message =
+			typeof messageData.message === 'string'
+				? sanitizeHtml(messageData.message)
+				: messageData.message;
 
-		// @TODO Check if still working
-		const notification = Notification(messageData as NotificationOptions);
+		const notification = Notification(messageData);
 
 		if (messageData.duration === 0) {
 			stickyNotificationQueue.push(notification);
@@ -49,7 +46,7 @@ export function useToast() {
 
 	function showToast(config: {
 		title: string;
-		message: string;
+		message: NotificationOptions['message'];
 		onClick?: () => void;
 		onClose?: () => void;
 		duration?: number;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 3d4739bd728a2..6924c37b1bccd 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1873,6 +1873,7 @@
 	"workflowHistory.action.restore.modal.button.cancel": "Cancel",
 	"workflowHistory.action.restore.success.title": "Successfully restored workflow version",
 	"workflowHistory.action.clone.success.title": "Successfully cloned workflow version",
+	"workflowHistory.action.clone.success.message": "Open cloned workflow in a new tab",
 	"workflows.heading": "Workflows",
 	"workflows.add": "Add Workflow",
 	"workflows.menu.my": "My workflows",
diff --git a/packages/editor-ui/src/stores/workflowHistory.store.ts b/packages/editor-ui/src/stores/workflowHistory.store.ts
index 7a488ae3caf13..614ede34c86ff 100644
--- a/packages/editor-ui/src/stores/workflowHistory.store.ts
+++ b/packages/editor-ui/src/stores/workflowHistory.store.ts
@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { defineStore } from 'pinia';
 import { saveAs } from 'file-saver';
-import type { IWorkflowDataUpdate } from '@/Interface';
+import type { IWorkflowDataUpdate, IWorkflowDb } from '@/Interface';
 import type {
 	WorkflowHistory,
 	WorkflowVersion,
@@ -34,7 +34,7 @@ export const useWorkflowHistoryStore = defineStore('workflowHistory', () => {
 	const getWorkflowVersion = async (
 		workflowId: string,
 		versionId: string,
-	): Promise<WorkflowVersion | null> =>
+	): Promise<WorkflowVersion> =>
 		whApi.getWorkflowVersion(rootStore.getRestApiContext, workflowId, versionId);
 
 	const downloadVersion = async (
@@ -46,34 +46,30 @@ export const useWorkflowHistoryStore = defineStore('workflowHistory', () => {
 			workflowsStore.fetchWorkflow(workflowId),
 			getWorkflowVersion(workflowId, workflowVersionId),
 		]);
-		if (workflow && workflowVersion) {
-			const { connections, nodes } = workflowVersion;
-			const blob = new Blob([JSON.stringify({ ...workflow, nodes, connections }, null, 2)], {
-				type: 'application/json;charset=utf-8',
-			});
-			saveAs(blob, `${workflow.name}(${data.formattedCreatedAt}).json`);
-		}
+		const { connections, nodes } = workflowVersion;
+		const blob = new Blob([JSON.stringify({ ...workflow, nodes, connections }, null, 2)], {
+			type: 'application/json;charset=utf-8',
+		});
+		saveAs(blob, `${workflow.name}(${data.formattedCreatedAt}).json`);
 	};
 
 	const cloneIntoNewWorkflow = async (
 		workflowId: string,
 		workflowVersionId: string,
 		data: { formattedCreatedAt: string },
-	) => {
+	): Promise<IWorkflowDb> => {
 		const [workflow, workflowVersion] = await Promise.all([
 			workflowsStore.fetchWorkflow(workflowId),
 			getWorkflowVersion(workflowId, workflowVersionId),
 		]);
-		if (workflow && workflowVersion) {
-			const { connections, nodes } = workflowVersion;
-			const { name } = workflow;
-			const newWorkflowData: IWorkflowDataUpdate = {
-				nodes,
-				connections,
-				name: `${name} (${data.formattedCreatedAt})`,
-			};
-			await workflowsStore.createNewWorkflow(newWorkflowData);
-		}
+		const { connections, nodes } = workflowVersion;
+		const { name } = workflow;
+		const newWorkflowData: IWorkflowDataUpdate = {
+			nodes,
+			connections,
+			name: `${name} (${data.formattedCreatedAt})`,
+		};
+		return workflowsStore.createNewWorkflow(newWorkflowData);
 	};
 
 	const restoreWorkflow = async (
diff --git a/packages/editor-ui/src/views/WorkflowHistory.vue b/packages/editor-ui/src/views/WorkflowHistory.vue
index 0a0a98cb37697..ee1a05df2ec23 100644
--- a/packages/editor-ui/src/views/WorkflowHistory.vue
+++ b/packages/editor-ui/src/views/WorkflowHistory.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onBeforeMount, ref, watchEffect, computed } from 'vue';
+import { onBeforeMount, ref, watchEffect, computed, h } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import type { IWorkflowDb, UserAction } from '@/Interface';
 import { VIEWS, WORKFLOW_HISTORY_VERSION_RESTORE } from '@/constants';
@@ -162,6 +162,58 @@ const openRestorationModal = async (
 	});
 };
 
+const cloneWorkflowVersion = async (
+	id: WorkflowVersionId,
+	data: { formattedCreatedAt: string },
+) => {
+	const clonedWorkflow = await workflowHistoryStore.cloneIntoNewWorkflow(
+		route.params.workflowId,
+		id,
+		data,
+	);
+	const { href } = router.resolve({
+		name: VIEWS.WORKFLOW,
+		params: {
+			name: clonedWorkflow.id,
+		},
+	});
+
+	toast.showMessage({
+		title: i18n.baseText('workflowHistory.action.clone.success.title'),
+		message: h(
+			'a',
+			{ href, target: '_blank' },
+			i18n.baseText('workflowHistory.action.clone.success.message'),
+		),
+		type: 'success',
+		duration: 10000,
+	});
+};
+
+const restoreWorkflowVersion = async (
+	id: WorkflowVersionId,
+	data: { formattedCreatedAt: string },
+) => {
+	const workflow = await workflowsStore.fetchWorkflow(route.params.workflowId);
+	const modalAction = await openRestorationModal(workflow.active, data.formattedCreatedAt);
+	if (modalAction === WorkflowHistoryVersionRestoreModalActions.cancel) {
+		return;
+	}
+	await workflowHistoryStore.restoreWorkflow(
+		route.params.workflowId,
+		id,
+		modalAction === WorkflowHistoryVersionRestoreModalActions.deactivateAndRestore,
+	);
+	const history = await workflowHistoryStore.getWorkflowHistory(route.params.workflowId, {
+		take: 1,
+	});
+	workflowHistory.value = history.concat(workflowHistory.value);
+	toast.showMessage({
+		title: i18n.baseText('workflowHistory.action.restore.success.title'),
+		type: 'success',
+	});
+};
+
 const onAction = async ({
 	action,
 	id,
@@ -180,31 +232,10 @@ const onAction = async ({
 				await workflowHistoryStore.downloadVersion(route.params.workflowId, id, data);
 				break;
 			case WORKFLOW_HISTORY_ACTIONS.CLONE:
-				await workflowHistoryStore.cloneIntoNewWorkflow(route.params.workflowId, id, data);
-				toast.showMessage({
-					title: i18n.baseText('workflowHistory.action.clone.success.title'),
-					type: 'success',
-				});
+				await cloneWorkflowVersion(id, data);
 				break;
 			case WORKFLOW_HISTORY_ACTIONS.RESTORE:
-				const workflow = await workflowsStore.fetchWorkflow(route.params.workflowId);
-				const modalAction = await openRestorationModal(workflow.active, data.formattedCreatedAt);
-				if (modalAction === WorkflowHistoryVersionRestoreModalActions.cancel) {
-					break;
-				}
-				await workflowHistoryStore.restoreWorkflow(
-					route.params.workflowId,
-					id,
-					modalAction === WorkflowHistoryVersionRestoreModalActions.deactivateAndRestore,
-				);
-				const history = await workflowHistoryStore.getWorkflowHistory(route.params.workflowId, {
-					take: 1,
-				});
-				workflowHistory.value = history.concat(workflowHistory.value);
-				toast.showMessage({
-					title: i18n.baseText('workflowHistory.action.restore.success.title'),
-					type: 'success',
-				});
+				await restoreWorkflowVersion(id, data);
 				break;
 		}
 	} catch (error) {

From edc1225c6fca00bba735ba410c3e6f500fc7570b Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 11 Oct 2023 14:51:13 +0200
Subject: [PATCH 2/3] fix(editor): Add cloning test

---
 .../views/__tests__/WorkflowHistory.test.ts   | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts b/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
index d189a79c65688..2710274b18aeb 100644
--- a/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
+++ b/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
@@ -1,6 +1,6 @@
 import type { SpyInstance } from 'vitest';
 import { createTestingPinia } from '@pinia/testing';
-import { waitFor } from '@testing-library/vue';
+import { waitFor, within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { defineComponent } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -54,8 +54,10 @@ const renderComponent = createComponentRenderer(WorkflowHistoryPage, {
 						default: versionId,
 					},
 				},
-				template:
-					'<div><button data-test-id="stub-preview-button" @click="event => $emit(`preview`, {id, event})">Preview</button>button></div>',
+				template: `<div>
+						<button data-test-id="stub-preview-button" @click="event => $emit('preview', {id, event})" />
+						<button data-test-id="stub-clone-button" @click="() => $emit('action', { action: 'clone', id })" />
+					</div>`,
 			}),
 		},
 	},
@@ -147,4 +149,24 @@ describe('WorkflowHistory', () => {
 		);
 		expect(windowOpenSpy).toHaveBeenCalled();
 	});
+
+	it('should clone workflow from version data', async () => {
+		route.params.workflowId = workflowId;
+		const newWorkflowId = faker.string.nanoid();
+		vi.spyOn(workflowHistoryStore, 'cloneIntoNewWorkflow').mockResolvedValue({
+			id: newWorkflowId,
+		} as IWorkflowDb);
+
+		const { getByTestId, getByRole } = renderComponent({ pinia });
+		await userEvent.click(getByTestId('stub-clone-button'));
+
+		await waitFor(() =>
+			expect(router.resolve).toHaveBeenCalledWith({
+				name: VIEWS.WORKFLOW,
+				params: { name: newWorkflowId },
+			}),
+		);
+
+		expect(within(getByRole('alert')).getByRole('link')).toBeInTheDocument();
+	});
 });

From 53852d505586ba4f888bd75a3d41e9d98e9378fd Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 13 Oct 2023 14:00:31 +0200
Subject: [PATCH 3/3] fix(editor): Fix multiple cloning

---
 packages/editor-ui/src/stores/workflowHistory.store.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/stores/workflowHistory.store.ts b/packages/editor-ui/src/stores/workflowHistory.store.ts
index 614ede34c86ff..5fd10b7fd319e 100644
--- a/packages/editor-ui/src/stores/workflowHistory.store.ts
+++ b/packages/editor-ui/src/stores/workflowHistory.store.ts
@@ -12,6 +12,7 @@ import * as whApi from '@/api/workflowHistory';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { getNewWorkflow } from '@/api/workflows';
 
 export const useWorkflowHistoryStore = defineStore('workflowHistory', () => {
 	const rootStore = useRootStore();
@@ -64,10 +65,14 @@ export const useWorkflowHistoryStore = defineStore('workflowHistory', () => {
 		]);
 		const { connections, nodes } = workflowVersion;
 		const { name } = workflow;
+		const newWorkflow = await getNewWorkflow(
+			rootStore.getRestApiContext,
+			`${name} (${data.formattedCreatedAt})`,
+		);
 		const newWorkflowData: IWorkflowDataUpdate = {
 			nodes,
 			connections,
-			name: `${name} (${data.formattedCreatedAt})`,
+			name: newWorkflow.name,
 		};
 		return workflowsStore.createNewWorkflow(newWorkflowData);
 	};