feat(editor): Combine Move and Change owner modals

cypress/composables/folders.ts

@@ -500,7 +500,12 @@ function deleteFolderAndMoveContents(folderName: string, destinationName: string
 function moveFolder(folderName: string, destinationName: string) {
 	cy.intercept('PATCH', '/rest/projects/**').as('moveFolder');
 	getMoveFolderModal().should('be.visible');
-	getMoveFolderModal().find('h1').first().contains(`Move "${folderName}" to another folder`);
+	getMoveFolderModal().find('h1').first().contains(`Move folder ${folderName}`);
+
+	// The dropdown focuses after a small delay (once modal's slide in animation is done).
+	// On the component we listen for an event, but here the wait should be very predictable.
+	cy.wait(500);
+
 	// Try to find current folder in the dropdown
 	// This tests that auto-focus worked as expected
 	cy.focused().type(folderName, { delay: 50 });

cypress/e2e/49-folders.cy.ts

@@ -465,7 +465,7 @@ describe('Folders', () => {
 			goToPersonalProject();
 			createFolderFromProjectHeader('Test parent');
 			createFolderInsideFolder('Move me to root', 'Test parent');
-			moveFolderFromFolderCardActions('Move me to root', 'Personal');
+			moveFolderFromFolderCardActions('Move me to root', 'No folder (project root)');
 			// Parent folder should be empty
 			getFolderEmptyState().should('exist');
 			// Child folder should be in the root

packages/frontend/editor-ui/src/Interface.ts

@@ -373,7 +373,6 @@ export type BaseFolderItem = BaseResource & {
 	subFolderCount: number;
 	parentFolder?: ResourceParentFolder;
 	homeProject?: ProjectSharingData;
-	sharedWithProjects?: ProjectSharingData[];
 	tags?: ITag[];
 };
 
@@ -387,12 +386,16 @@ export interface FolderListItem extends BaseFolderItem {
 	resource: 'folder';
 }
 
-export interface ChangeLocationSearchResult extends BaseFolderItem {
-	resource: 'folder' | 'project';
+export interface ChangeLocationSearchResponseItem extends BaseFolderItem {
+	path: string[];
 }
 
 export type FolderPathItem = PathItem & { parentFolder?: string };
 
+export interface ChangeLocationSearchResult extends ChangeLocationSearchResponseItem {
+	resource: 'folder' | 'project';
+}
+
 export type WorkflowListResource = WorkflowListItem | FolderListItem;
 
 export type FolderCreateResponse = Omit<

packages/frontend/editor-ui/src/api/workflows.ee.ts

@@ -23,3 +23,23 @@ export async function moveWorkflowToProject(
 ): Promise<void> {
 	return await makeRestApiRequest(context, 'PUT', `/workflows/${id}/transfer`, body);
 }
+
+export async function moveFolderToProject(
+	context: IRestApiContext,
+	projectId: string,
+	folderId: string,
+	destinationProjectId: string,
+	destinationParentFolderId?: string,
+	shareCredentials?: string[],
+): Promise<void> {
+	return await makeRestApiRequest(
+		context,
+		'PUT',
+		`/projects/${projectId}/folders/${folderId}/transfer`,
+		{
+			destinationProjectId,
+			destinationParentFolderId: destinationParentFolderId ?? '0',
+			shareCredentials,
+		},
+	);
+}

packages/frontend/editor-ui/src/api/workflows.ts

@@ -1,10 +1,11 @@
 import type {
-	ChangeLocationSearchResult,
+	ChangeLocationSearchResponseItem,
 	FolderCreateResponse,
 	FolderTreeResponseItem,
 	IExecutionResponse,
 	IExecutionsCurrentSummaryExtended,
 	IRestApiContext,
+	IUsedCredential,
 	IWorkflowDb,
 	NewWorkflowResponse,
 	WorkflowListResource,
@@ -146,16 +147,34 @@ export async function getProjectFolders(
 		excludeFolderIdAndDescendants?: string;
 		name?: string;
 	},
-): Promise<ChangeLocationSearchResult[]> {
-	const res = await getFullApiResponse<ChangeLocationSearchResult[]>(
+	select?: string[],
+): Promise<{ data: ChangeLocationSearchResponseItem[]; count: number }> {
+	const res = await getFullApiResponse<ChangeLocationSearchResponseItem[]>(
 		context,
 		'GET',
 		`/projects/${projectId}/folders`,
 		{
 			...(filter ? { filter } : {}),
 			...(options ? options : {}),
+			...(select ? { select: JSON.stringify(select) } : {}),
 		},
 	);
+	return {
+		data: res.data,
+		count: res.count,
+	};
+}
+
+export async function getFolderUsedCredentials(
+	context: IRestApiContext,
+	projectId: string,
+	folderId: string,
+): Promise<IUsedCredential[]> {
+	const res = await getFullApiResponse<IUsedCredential[]>(
+		context,
+		'GET',
+		`/projects/${projectId}/folders/${folderId}/credentials`,
+	);
 	return res.data;
 }
 

packages/frontend/editor-ui/src/components/Folders/DeleteFolderModal.vue

@@ -8,6 +8,7 @@ import { useFoldersStore } from '@/stores/folders.store';
 import { useRoute } from 'vue-router';
 import { useProjectsStore } from '@/stores/projects.store';
 import { ProjectTypes } from '@/types/projects.types';
+import type { ChangeLocationSearchResult } from '@/Interface';
 
 const props = defineProps<{
 	modalName: string;
@@ -32,7 +33,7 @@ const projectsStore = useProjectsStore();
 const loading = ref(false);
 const operation = ref('');
 const deleteConfirmText = ref('');
-const selectedFolder = ref<{ id: string; name: string; type: 'folder' | 'project' } | null>(null);
+const selectedFolder = ref<ChangeLocationSearchResult | null>(null);
 
 const folderToDelete = computed(() => {
 	if (!props.activeId) return null;
@@ -106,7 +107,7 @@ async function onSubmit() {
 		loading.value = true;
 
 		const newParentId =
-			selectedFolder.value?.type === 'project' ? '0' : (selectedFolder.value?.id ?? undefined);
+			selectedFolder.value?.resource === 'project' ? '0' : (selectedFolder.value?.id ?? undefined);
 
 		await foldersStore.deleteFolder(route.params.projectId as string, props.activeId, newParentId);
 
@@ -134,7 +135,7 @@ async function onSubmit() {
 	}
 }
 
-const onFolderSelected = (payload: { id: string; name: string; type: 'folder' | 'project' }) => {
+const onFolderSelected = (payload: ChangeLocationSearchResult) => {
 	selectedFolder.value = payload;
 };
 </script>
@@ -180,8 +181,10 @@ const onFolderSelected = (payload: { id: string; name: string; type: 'folder' |
 						}}</n8n-text>
 						<MoveToFolderDropdown
 							v-if="projectsStore.currentProject"
-							:current-folder-id="props.activeId"
+							:selected-location="selectedFolder"
+							:selected-project-id="projectsStore.currentProject?.id"
 							:current-project-id="projectsStore.currentProject?.id"
+							:current-folder-id="props.activeId"
 							:parent-folder-id="folderToDelete?.parentFolder"
 							@location:selected="onFolderSelected"
 						/>