From 8aa7631ffcc04efe9ecc114d3f7cd4e436493aaf Mon Sep 17 00:00:00 2001 From: Monta Date: Tue, 14 Nov 2023 22:52:33 +0100 Subject: [PATCH 1/3] fix: file in new window opens twice --- tdrive/frontend/src/app/views/client/body/drive/context-menu.tsx | 1 - 1 file changed, 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 3cc001a3d..76c83a950 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 @@ -102,7 +102,6 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s const viewId = item.is_directory ? item.id : item.parent_id; const route = RouterServices.generateRouteFromState({ companyId: company, viewId, itemId }); window.open(route, '_blank'); - window.open(route, '_blank'); } }, { type: 'separator' }, From 3a4af862e0247257ca76e91f783f0ce53b7a1527 Mon Sep 17 00:00:00 2001 From: Monta Date: Tue, 14 Nov 2023 23:10:01 +0100 Subject: [PATCH 2/3] fix: size of the folder not displayed after upload --- .../frontend/src/app/features/drive/hooks/use-drive-upload.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tdrive/frontend/src/app/features/drive/hooks/use-drive-upload.tsx b/tdrive/frontend/src/app/features/drive/hooks/use-drive-upload.tsx index aecac709b..8aed3b46c 100644 --- a/tdrive/frontend/src/app/features/drive/hooks/use-drive-upload.tsx +++ b/tdrive/frontend/src/app/features/drive/hooks/use-drive-upload.tsx @@ -90,6 +90,8 @@ export const useDriveUpload = () => { }, }); } + logger.debug("Finished uploading files"); + await refresh(context.parentId); }; const uploadFromUrl = ( From 195b34bde5a08bfd25bbcc6136ada7430742e5e9 Mon Sep 17 00:00:00 2001 From: Monta Date: Tue, 14 Nov 2023 23:29:17 +0100 Subject: [PATCH 3/3] fix: personal trash size --- tdrive/backend/node/src/services/documents/utils.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tdrive/backend/node/src/services/documents/utils.ts b/tdrive/backend/node/src/services/documents/utils.ts index bce12a3a0..1fce68cc5 100644 --- a/tdrive/backend/node/src/services/documents/utils.ts +++ b/tdrive/backend/node/src/services/documents/utils.ts @@ -183,7 +183,12 @@ export const calculateItemSize = async ( if (item.id === "trash_" + context.user.id) { const trashedItems = await repository.find( - { company_id: context.company.id, is_in_trash: true, scope: "personal" }, + { + company_id: context.company.id, + creator: context.user.id, + is_in_trash: true, + scope: "personal", + }, {}, context, );