fix(editor): Simplifying empty project deletion (#15834)

packages/frontend/editor-ui/src/components/Projects/ProjectDeleteDialog.test.ts

@@ -0,0 +1,74 @@
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import ProjectDeleteDialog from '@/components/Projects/ProjectDeleteDialog.vue';
+import { createTestProject } from '@/__tests__/data/projects';
+
+const renderComponent = createComponentRenderer(ProjectDeleteDialog, {
+	pinia: createTestingPinia(),
+});
+
+const currentProject = createTestProject({
+	id: 'xyz123',
+	name: 'Test',
+});
+
+describe('ProjectDeleteDialog', () => {
+	let user: ReturnType<typeof userEvent.setup>;
+
+	beforeEach(() => {
+		user = userEvent.setup();
+	});
+
+	it('should render the dialog with correct title and content when project is empty', async () => {
+		const { findByRole, getByRole, queryAllByRole } = renderComponent({
+			props: {
+				currentProject,
+				projects: [],
+				isCurrentProjectEmpty: true,
+				modelValue: true,
+			},
+		});
+
+		const dialog = await findByRole('dialog');
+		expect(dialog).toBeInTheDocument();
+		expect(getByRole('heading', { name: 'Delete "Test" Project?' })).toBeInTheDocument();
+		expect(queryAllByRole('radio')).toHaveLength(0);
+		expect(getByRole('button', { name: 'Delete this project' })).toBeEnabled();
+	});
+
+	it('should render the dialog with correct title and content when project is not empty', async () => {
+		const { findByRole, getByRole, getAllByRole, getByTestId, queryByTestId, emitted } =
+			renderComponent({
+				props: {
+					currentProject,
+					projects: [],
+					isCurrentProjectEmpty: false,
+					modelValue: true,
+				},
+			});
+
+		const dialog = await findByRole('dialog');
+		expect(dialog).toBeInTheDocument();
+		expect(getByRole('heading', { name: 'Delete "Test" Project?' })).toBeInTheDocument();
+		expect(getByRole('button', { name: 'Delete this project' })).toBeDisabled();
+
+		expect(getAllByRole('radio')).toHaveLength(2);
+
+		await user.click(getAllByRole('radio')[0]);
+		expect(getByTestId('project-sharing-select')).toBeVisible();
+		expect(queryByTestId('project-delete-confirm-input')).not.toBeInTheDocument();
+		expect(getByRole('button', { name: 'Delete this project' })).toBeDisabled();
+
+		await user.click(getAllByRole('radio')[1]);
+		expect(queryByTestId('project-sharing-select')).not.toBeInTheDocument();
+		expect(getByTestId('project-delete-confirm-input')).toBeVisible();
+		expect(getByRole('button', { name: 'Delete this project' })).toBeDisabled();
+
+		await user.type(getByTestId('project-delete-confirm-input'), 'delete all data');
+		expect(getByRole('button', { name: 'Delete this project' })).toBeEnabled();
+
+		await user.click(getByRole('button', { name: 'Delete this project' }));
+		expect(emitted()).toHaveProperty('confirmDelete');
+	});
+});

packages/frontend/editor-ui/src/components/Projects/ProjectDeleteDialog.vue

@@ -7,6 +7,7 @@ import { useI18n } from '@/composables/useI18n';
 type Props = {
 	currentProject: Project | null;
 	projects: ProjectListItem[];
+	isCurrentProjectEmpty: boolean;
 };
 
 const props = defineProps<Props>();
@@ -21,16 +22,15 @@ const selectedProject = ref<ProjectSharingData | null>(null);
 const operation = ref<'transfer' | 'wipe' | null>(null);
 const wipeConfirmText = ref('');
 const isValid = computed(() => {
-	if (operation.value === 'transfer') {
-		return !!selectedProject.value;
-	}
-	if (operation.value === 'wipe') {
-		return (
-			wipeConfirmText.value ===
-			locale.baseText('projects.settings.delete.question.wipe.placeholder')
-		);
-	}
-	return false;
+	const expectedWipeConfirmation = locale.baseText(
+		'projects.settings.delete.question.wipe.placeholder',
+	);
+
+	return (
+		props.isCurrentProjectEmpty ||
+		(operation.value === 'transfer' && !!selectedProject.value) ||
+		(operation.value === 'wipe' && wipeConfirmText.value === expectedWipeConfirmation)
+	);
 });
 
 const onDelete = () => {
@@ -55,47 +55,55 @@ const onDelete = () => {
 		"
 		width="500"
 	>
-		<n8n-text color="text-base">{{ locale.baseText('projects.settings.delete.message') }}</n8n-text>
-		<div class="pt-l">
-			<el-radio
-				:model-value="operation"
-				label="transfer"
-				class="mb-s"
-				@update:model-value="operation = 'transfer'"
-			>
-				<n8n-text color="text-dark">{{
-					locale.baseText('projects.settings.delete.question.transfer.label')
-				}}</n8n-text>
-			</el-radio>
-			<div v-if="operation === 'transfer'" :class="$style.operation">
-				<n8n-text color="text-dark">{{
-					locale.baseText('projects.settings.delete.question.transfer.title')
-				}}</n8n-text>
-				<ProjectSharing
-					v-model="selectedProject"
-					class="pt-2xs"
-					:projects="props.projects"
-					:empty-options-text="locale.baseText('projects.sharing.noMatchingProjects')"
-				/>
-			</div>
-
-			<el-radio
-				:model-value="operation"
-				label="wipe"
-				class="mb-s"
-				@update:model-value="operation = 'wipe'"
-			>
-				<n8n-text color="text-dark">{{
-					locale.baseText('projects.settings.delete.question.wipe.label')
-				}}</n8n-text>
-			</el-radio>
-			<div v-if="operation === 'wipe'" :class="$style.operation">
-				<n8n-input-label :label="locale.baseText('projects.settings.delete.question.wipe.title')">
-					<n8n-input
-						v-model="wipeConfirmText"
-						:placeholder="locale.baseText('projects.settings.delete.question.wipe.placeholder')"
+		<n8n-text v-if="isCurrentProjectEmpty" color="text-base">{{
+			locale.baseText('projects.settings.delete.message.empty')
+		}}</n8n-text>
+		<div v-else>
+			<n8n-text color="text-base">{{
+				locale.baseText('projects.settings.delete.message')
+			}}</n8n-text>
+			<div class="pt-l">
+				<el-radio
+					:model-value="operation"
+					label="transfer"
+					class="mb-s"
+					@update:model-value="operation = 'transfer'"
+				>
+					<n8n-text color="text-dark">{{
+						locale.baseText('projects.settings.delete.question.transfer.label')
+					}}</n8n-text>
+				</el-radio>
+				<div v-if="operation === 'transfer'" :class="$style.operation">
+					<n8n-text color="text-dark">{{
+						locale.baseText('projects.settings.delete.question.transfer.title')
+					}}</n8n-text>
+					<ProjectSharing
+						v-model="selectedProject"
+						class="pt-2xs"
+						:projects="props.projects"
+						:empty-options-text="locale.baseText('projects.sharing.noMatchingProjects')"
 					/>
-				</n8n-input-label>
+				</div>
+
+				<el-radio
+					:model-value="operation"
+					label="wipe"
+					class="mb-s"
+					@update:model-value="operation = 'wipe'"
+				>
+					<n8n-text color="text-dark">{{
+						locale.baseText('projects.settings.delete.question.wipe.label')
+					}}</n8n-text>
+				</el-radio>
+				<div v-if="operation === 'wipe'" :class="$style.operation">
+					<n8n-input-label :label="locale.baseText('projects.settings.delete.question.wipe.title')">
+						<n8n-input
+							v-model="wipeConfirmText"
+							data-test-id="project-delete-confirm-input"
+							:placeholder="locale.baseText('projects.settings.delete.question.wipe.placeholder')"
+						/>
+					</n8n-input-label>
+				</div>
 			</div>
 		</div>
 		<template #footer>

packages/frontend/editor-ui/src/plugins/i18n/locales/en.json

@@ -2798,8 +2798,9 @@
 	"projects.settings.role.admin": "Admin",
 	"projects.settings.role.editor": "Editor",
 	"projects.settings.role.viewer": "Viewer",
-	"projects.settings.delete.title": "Delete {projectName}",
+	"projects.settings.delete.title": "Delete \"{projectName}\" Project?",
 	"projects.settings.delete.message": "What should we do with the project data?",
+	"projects.settings.delete.message.empty": "There are no workflows or credentials in this project.",
 	"projects.settings.delete.question.transfer.label": "Transfer its workflows and credentials to another project or user",
 	"projects.settings.delete.question.transfer.title": "Project or user to transfer to",
 	"projects.settings.delete.question.wipe.label": "Delete its workflows and credentials",

packages/frontend/editor-ui/src/stores/projects.store.ts

@@ -3,7 +3,9 @@ import { ref, watch, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import * as projectsApi from '@/api/projects.api';
+import * as workflowsApi from '@/api/workflows';
 import * as workflowsEEApi from '@/api/workflows.ee';
+import * as credentialsApi from '@/api/credentials';
 import * as credentialsEEApi from '@/api/credentials.ee';
 import type { Project, ProjectListItem, ProjectsCount } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
@@ -191,6 +193,15 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 		}
 	};
 
+	const isProjectEmpty = async (projectId: string) => {
+		const [credentials, workflows] = await Promise.all([
+			credentialsApi.getAllCredentials(rootStore.restApiContext, { projectId }),
+			workflowsApi.getWorkflows(rootStore.restApiContext, { projectId }),
+		]);
+
+		return credentials.length === 0 && workflows.count === 0;
+	};
+
 	watch(
 		route,
 		async (newRoute) => {
@@ -252,5 +263,6 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 		getProjectsCount,
 		setProjectNavActiveIdByWorkflowHomeProject,
 		moveResourceToProject,
+		isProjectEmpty,
 	};
 });

packages/frontend/editor-ui/src/views/ProjectSettings.test.ts

@@ -53,6 +53,7 @@ describe('ProjectSettings', () => {
 		vi.spyOn(usersStore, 'fetchUsers').mockImplementation(async () => await Promise.resolve());
 		vi.spyOn(projectsStore, 'getAvailableProjects').mockImplementation(async () => {});
 		vi.spyOn(projectsStore, 'availableProjects', 'get').mockReturnValue(projects);
+		vi.spyOn(projectsStore, 'isProjectEmpty').mockResolvedValue(false);
 		vi.spyOn(settingsStore, 'settings', 'get').mockReturnValue({
 			enterprise: {
 				projects: {
@@ -82,12 +83,12 @@ describe('ProjectSettings', () => {
 			.spyOn(projectsStore, 'deleteProject')
 			.mockImplementation(async () => {});
 
-		const { getByTestId, getByRole } = renderComponent();
+		const { getByTestId, findByRole } = renderComponent();
 		const deleteButton = getByTestId('project-settings-delete-button');
 
 		await userEvent.click(deleteButton);
 		expect(deleteProjectSpy).not.toHaveBeenCalled();
-		const modal = getByRole('dialog');
+		const modal = await findByRole('dialog');
 		expect(modal).toBeVisible();
 		const confirmButton = getByTestId('project-settings-delete-confirm-button');
 		expect(confirmButton).toBeDisabled();
@@ -108,12 +109,12 @@ describe('ProjectSettings', () => {
 			.spyOn(projectsStore, 'deleteProject')
 			.mockImplementation(async () => {});
 
-		const { getByTestId, getByRole } = renderComponent();
+		const { getByTestId, findByRole } = renderComponent();
 		const deleteButton = getByTestId('project-settings-delete-button');
 
 		await userEvent.click(deleteButton);
 		expect(deleteProjectSpy).not.toHaveBeenCalled();
-		const modal = getByRole('dialog');
+		const modal = await findByRole('dialog');
 		expect(modal).toBeVisible();
 		const confirmButton = getByTestId('project-settings-delete-confirm-button');
 		expect(confirmButton).toBeDisabled();

packages/frontend/editor-ui/src/views/ProjectSettings.vue

@@ -43,6 +43,7 @@ const upgradeDialogVisible = ref(false);
 
 const isDirty = ref(false);
 const isValid = ref(false);
+const isCurrentProjectEmpty = ref(true);
 const formData = ref<Pick<Project, 'name' | 'relations'>>({
 	name: '',
 	relations: [],
@@ -222,6 +223,13 @@ const onSubmit = async () => {
 
 const onDelete = async () => {
 	await projectsStore.getAvailableProjects();
+
+	if (projectsStore.currentProjectId) {
+		isCurrentProjectEmpty.value = await projectsStore.isProjectEmpty(
+			projectsStore.currentProjectId,
+		);
+	}
+
 	dialogVisible.value = true;
 };
 
@@ -429,6 +437,7 @@ onMounted(() => {
 		<ProjectDeleteDialog
 			v-model="dialogVisible"
 			:current-project="projectsStore.currentProject"
+			:is-current-project-empty="isCurrentProjectEmpty"
 			:projects="projects"
 			@confirm-delete="onConfirmDelete"
 		/>