From 7fe6b86548b4868da42c3a9c0fbb25e9d9738910 Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Fri, 5 Dec 2025 13:34:49 +0100 Subject: [PATCH 1/3] Update file picker filters for folder visibility Refine file picker filters to only show folders and exclude encrypted ones. --- apps/files/src/actions/moveOrCopyAction.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index a39d6ca6630d6..dec492d08202c 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -221,6 +221,11 @@ async function openFilePickerForAction( // We don't want to show the current nodes in the file picker return !fileIDs.includes(n.fileid) }) + .setFilter((n: Node) => { + // We only want to show folders in the file picker + // We don't want to show encrypted folders in the file picker + return !(n.attributes?.['type'] !== "directory" || n.attributes?.['is-encrypted'] === 1) + }) .setCanPick((n) => { const hasCreatePermissions = (n.permissions & Permission.CREATE) === Permission.CREATE return hasCreatePermissions From fcc00ae4681462ccab15af02dd78fa554f19959a Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Thu, 11 Dec 2025 08:28:33 +0100 Subject: [PATCH 2/3] Refactor file picker filter to exclude encrypted folders --- apps/files/src/actions/moveOrCopyAction.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index dec492d08202c..96e3b645d626e 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -222,8 +222,7 @@ async function openFilePickerForAction( return !fileIDs.includes(n.fileid) }) .setFilter((n: Node) => { - // We only want to show folders in the file picker - // We don't want to show encrypted folders in the file picker + // Show only non-encrypted directories in the file picker return !(n.attributes?.['type'] !== "directory" || n.attributes?.['is-encrypted'] === 1) }) .setCanPick((n) => { From e9d747e30b7e8864062a426a5ba6d4854b0a7aa0 Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Mon, 16 Feb 2026 14:12:40 +0100 Subject: [PATCH 3/3] Change button type to variant in moveOrCopyAction --- apps/files/src/actions/moveOrCopyAction.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/src/actions/moveOrCopyAction.ts b/apps/files/src/actions/moveOrCopyAction.ts index 96e3b645d626e..1418744608be6 100644 --- a/apps/files/src/actions/moveOrCopyAction.ts +++ b/apps/files/src/actions/moveOrCopyAction.ts @@ -242,7 +242,7 @@ async function openFilePickerForAction( if (action === MoveCopyAction.COPY || action === MoveCopyAction.MOVE_OR_COPY) { buttons.push({ label: target ? t('files', 'Copy to {target}', { target }, undefined, { escape: false, sanitize: false }) : t('files', 'Copy'), - type: 'primary', + variant: 'primary', icon: CopyIconSvg, async callback(destination: Node[]) { resolve({ @@ -272,7 +272,7 @@ async function openFilePickerForAction( if (action === MoveCopyAction.MOVE || action === MoveCopyAction.MOVE_OR_COPY) { buttons.push({ label: target ? t('files', 'Move to {target}', { target }, undefined, { escape: false, sanitize: false }) : t('files', 'Move'), - type: action === MoveCopyAction.MOVE ? 'primary' : 'secondary', + variant: action === MoveCopyAction.MOVE ? 'primary' : 'secondary', icon: FolderMoveSvg, async callback(destination: Node[]) { resolve({