From 14f772e32ec0f8da5e8c0bdd4be584ce4a12dc0c Mon Sep 17 00:00:00 2001 From: Anton Shepilov Date: Fri, 23 Jun 2023 18:26:01 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9BFix=20downloading=20by=20shared=20l?= =?UTF-8?q?ink=20(#118)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/features/drive/api-client/api-client.ts | 9 ++------- .../src/app/views/client/body/drive/context-menu.tsx | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tdrive/frontend/src/app/features/drive/api-client/api-client.ts b/tdrive/frontend/src/app/features/drive/api-client/api-client.ts index 573cdb2c..9dc86f7a 100644 --- a/tdrive/frontend/src/app/features/drive/api-client/api-client.ts +++ b/tdrive/frontend/src/app/features/drive/api-client/api-client.ts @@ -120,17 +120,12 @@ export class DriveApiClient { } static async getDownloadUrl(companyId: string, id: string, versionId?: string) { - const { token } = await DriveApiClient.getDownloadToken(companyId, [id], versionId); if (versionId) return Api.route( - `/internal/services/documents/v1/companies/${companyId}/item/${id}/download?version_id=${versionId}&token=${token}${appendTdriveToken( - true, - )}`, + `/internal/services/files/v1/companies/${companyId}/files/${id}/download?version_id=${versionId}`, ); return Api.route( - `/internal/services/documents/v1/companies/${companyId}/item/${id}/download?token=${token}${appendTdriveToken( - true, - )}`, + `/internal/services/files/v1/companies/${companyId}/files/${id}/download`, ); } 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 6c440274..814a6f9b 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 @@ -72,7 +72,7 @@ export const useOnBuildContextMenu = (children: DriveItem[], initialParentId?: s { type: 'menu', text: Languages.t('components.item_context_menu.download'), - onClick: () => download(item.id), + onClick: () => download(item.last_version_cache.file_metadata.external_id), }, { type: 'separator' }, { @@ -444,6 +444,7 @@ export const useOnBuildFileContextMenu = () => { const { open: preview } = useDrivePreview(); return useCallback( (item: DriveItem) => { + console.log(item); const menuItems = [ { type: 'menu',