fix(editor): Allow resources to move between personal and team projects

cypress/composables/projects.ts

@@ -32,8 +32,6 @@ export const addProjectMember = (email: string, role?: string) => {
 	}
 };
 export const getResourceMoveModal = () => cy.getByTestId('project-move-resource-modal');
-export const getResourceMoveConfirmModal = () =>
-	cy.getByTestId('project-move-resource-confirm-modal');
 export const getProjectMoveSelect = () => cy.getByTestId('project-move-resource-modal-select');
 
 export function createProject(name: string) {

cypress/e2e/39-projects.cy.ts

@@ -1,5 +1,11 @@
 import * as projects from '../composables/projects';
-import { INSTANCE_MEMBERS, MANUAL_TRIGGER_NODE_NAME, NOTION_NODE_NAME } from '../constants';
+import {
+	INSTANCE_ADMIN,
+	INSTANCE_MEMBERS,
+	INSTANCE_OWNER,
+	MANUAL_TRIGGER_NODE_NAME,
+	NOTION_NODE_NAME,
+} from '../constants';
 import {
 	WorkflowsPage,
 	WorkflowPage,
@@ -481,54 +487,93 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Next")')
+				.find('button:contains("Move workflow")')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
-				.first()
-				.should('contain.text', 'Project 1')
+				.should('have.length', 5)
+				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Next")').click();
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+
+			workflowsPage.getters
+				.workflowCards()
+				.should('have.length', 3)
+				.filter(':contains("Owned by me")')
+				.should('not.exist');
+
+			// Move the workflow from Project 1 to Project 2
+			projects.getMenuItems().first().click();
+			workflowsPage.getters.workflowCards().should('have.length', 2);
+			workflowsPage.getters.workflowCardActions('Workflow in Home project').click();
+			workflowsPage.getters.workflowMoveButton().click();
 
 			projects
-				.getResourceMoveConfirmModal()
+				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Confirm")')
+				.find('button:contains("Move workflow")')
 				.should('be.disabled');
-
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.first()
-				.parents('label')
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(':contains("Project 2")')
 				.click();
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+
+			// Move the workflow from Project 2 to a member user
+			projects.getMenuItems().last().click();
+			workflowsPage.getters.workflowCards().should('have.length', 2);
+			workflowsPage.getters.workflowCardActions('Workflow in Home project').click();
+			workflowsPage.getters.workflowMoveButton().click();
+
 			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move workflow")')
 				.should('be.disabled');
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.last()
-				.parents('label')
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_MEMBERS[0].email}")`)
 				.click();
+
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			workflowsPage.getters.workflowCards().should('have.length', 1);
+
+			// Move the workflow from member user back to Home
+			projects.getHomeButton().click();
+			workflowsPage.getters
+				.workflowCards()
+				.should('have.length', 3)
+				.filter(':has(.n8n-badge:contains("Project"))')
+				.should('have.length', 2);
+			workflowsPage.getters.workflowCardActions('Workflow in Home project').click();
+			workflowsPage.getters.workflowMoveButton().click();
+
 			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
-				.should('not.be.disabled')
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move workflow")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_OWNER.email}")`)
 				.click();
 
+			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
 			workflowsPage.getters
 				.workflowCards()
 				.should('have.length', 3)
 				.filter(':contains("Owned by me")')
-				.should('not.exist');
+				.should('have.length', 1);
 
 			// Move the credential from Project 1 to Project 2
 			projects.getMenuItems().first().click();
-			workflowsPage.getters.workflowCards().should('have.length', 2);
 			projects.getProjectTabCredentials().click();
 			credentialsPage.getters.credentialCards().should('have.length', 1);
 			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
@@ -537,48 +582,90 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Next")')
+				.find('button:contains("Move credential")')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 1)
-				.first()
-				.should('contain.text', 'Project 2')
+				.should('have.length', 5)
+				.filter(':contains("Project 2")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Next")').click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+
+			credentialsPage.getters.credentialCards().should('not.have.length');
+
+			// Move the credential from Project 2 to admin user
+			projects.getMenuItems().last().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters.credentialCards().should('have.length', 2);
+
+			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
+			credentialsPage.getters.credentialMoveButton().click();
 
 			projects
-				.getResourceMoveConfirmModal()
+				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Confirm")')
+				.find('button:contains("Move credential")')
 				.should('be.disabled');
-
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.first()
-				.parents('label')
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_ADMIN.email}")`)
 				.click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			credentialsPage.getters.credentialCards().should('have.length', 1);
+
+			// Move the credential from admin user back to instance owner
+			projects.getHomeButton().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters.credentialCards().should('have.length', 3);
+
+			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
+			credentialsPage.getters.credentialMoveButton().click();
+
 			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move credential")')
 				.should('be.disabled');
-			projects
-				.getResourceMoveConfirmModal()
-				.find('input[type="checkbox"]')
-				.last()
-				.parents('label')
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(`:contains("${INSTANCE_OWNER.email}")`)
 				.click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+
+			credentialsPage.getters
+				.credentialCards()
+				.should('have.length', 3)
+				.filter(':contains("Owned by me")')
+				.should('have.length', 2);
+
+			// Move the credential from admin user back to its original project (Project 1)
+			credentialsPage.getters.credentialCardActions('Credential in Project 1').click();
+			credentialsPage.getters.credentialMoveButton().click();
+
 			projects
-				.getResourceMoveConfirmModal()
-				.find('button:contains("Confirm")')
-				.should('not.be.disabled')
+				.getResourceMoveModal()
+				.should('be.visible')
+				.find('button:contains("Move credential")')
+				.should('be.disabled');
+			projects.getProjectMoveSelect().click();
+			getVisibleSelect()
+				.find('li')
+				.should('have.length', 5)
+				.filter(':contains("Project 1")')
 				.click();
-			credentialsPage.getters.credentialCards().should('not.have.length');
-			projects.getMenuItems().last().click();
+			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+
+			projects.getMenuItems().first().click();
 			projects.getProjectTabCredentials().click();
-			credentialsPage.getters.credentialCards().should('have.length', 2);
+			credentialsPage.getters
+				.credentialCards()
+				.filter(':contains("Credential in Project 1")')
+				.should('have.length', 1);
 		});
 
 		it('should handle viewer role', () => {

packages/cli/src/credentials/credentials.service.ee.ts

@@ -157,14 +157,6 @@ export class EnterpriseCredentialsService {
 				"You can't transfer a credential into the project that's already owning it.",
 			);
 		}
-		if (sourceProject.type !== 'team' && sourceProject.type !== 'personal') {
-			throw new TransferCredentialError(
-				'You can only transfer credentials out of personal or team projects.',
-			);
-		}
-		if (destinationProject.type !== 'team') {
-			throw new TransferCredentialError('You can only transfer credentials into team projects.');
-		}
 
 		await this.sharedCredentialsRepository.manager.transaction(async (trx) => {
 			// 6. transfer the credential

packages/cli/src/workflows/workflow.service.ee.ts

@@ -285,14 +285,6 @@ export class EnterpriseWorkflowService {
 				"You can't transfer a workflow into the project that's already owning it.",
 			);
 		}
-		if (sourceProject.type !== 'team' && sourceProject.type !== 'personal') {
-			throw new TransferWorkflowError(
-				'You can only transfer workflows out of personal or team projects.',
-			);
-		}
-		if (destinationProject.type !== 'team') {
-			throw new TransferWorkflowError('You can only transfer workflows into team projects.');
-		}
 
 		// 6. deactivate workflow if necessary
 		const wasActive = workflow.active;