From 467016e4bff84cb27e9a7f94649251bf087fa817 Mon Sep 17 00:00:00 2001 From: Eric Doughty-Papassideris Date: Thu, 26 Sep 2024 16:08:39 +0200 Subject: [PATCH 01/20] =?UTF-8?q?=F0=9F=92=84=20frontend:=20remove=20"Move?= =?UTF-8?q?"=20and=20"Download"=20options=20from=20trash=20(#662)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/app/views/client/body/drive/context-menu.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx b/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx index 1880d56a5..a01484b45 100644 --- a/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx +++ b/tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx @@ -203,7 +203,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s { type: 'menu', text: Languages.t('components.item_context_menu.move_multiple'), - hide: parent.access === 'read', + hide: parent.access === 'read' || inTrash, onClick: () => setSelectorModalState({ open: true, @@ -227,6 +227,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s { type: 'menu', text: Languages.t('components.item_context_menu.download_multiple'), + hide: inTrash, onClick: () => selectedCount === 1 ? download(checked[0].id) : downloadZip(checked.map(c => c.id)), }, From c2f67c119fb6c3191a9b04e64d4b22680c239c3d Mon Sep 17 00:00:00 2001 From: Eric Doughty-Papassideris Date: Thu, 26 Sep 2024 16:25:26 +0200 Subject: [PATCH 02/20] =?UTF-8?q?=F0=9F=92=84=20front:=20remove=20arrow=20?= =?UTF-8?q?keys=20from=20preview=20if=20a=20single=20file=20available=20(#?= =?UTF-8?q?661)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/views/client/viewer/drive-preview.tsx | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/tdrive/frontend/src/app/views/client/viewer/drive-preview.tsx b/tdrive/frontend/src/app/views/client/viewer/drive-preview.tsx index fb4e2ef36..06904f5b6 100644 --- a/tdrive/frontend/src/app/views/client/viewer/drive-preview.tsx +++ b/tdrive/frontend/src/app/views/client/viewer/drive-preview.tsx @@ -63,6 +63,8 @@ export const DrivePreview: React.FC = ({ items }) => { }, []); useEffect(() => { + if (items.length < 2) + return () => {}; addShortcut({ shortcut: 'Right', handler: handleSwitchRight }); addShortcut({ shortcut: 'Left', handler: handleSwitchLeft }); @@ -146,22 +148,26 @@ export const DrivePreview: React.FC = ({ items }) => {
-