From 67082e1b1dd5e4d388bc664e8ec3de0f0090b27c Mon Sep 17 00:00:00 2001
From: Alex <33497058+bexsoft@users.noreply.github.com>
Date: Tue, 19 Oct 2021 20:57:07 -0500
Subject: [PATCH] Fixed file download in list (#1130)

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>
---
 .../ListBuckets/Objects/ListObjects/ListObjects.tsx |  2 +-
 .../Objects/ObjectDetails/ObjectDetails.tsx         | 13 ++++---------
 .../Console/Buckets/ListBuckets/Objects/utils.ts    |  4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
index 7110f7da5..54e67c8ea 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
@@ -623,7 +623,7 @@ const ListObjects = ({
       );
     }
 
-    download(bucketName, object.name, object.version_id);
+    download(bucketName, encodeFileName(object.name), object.version_id);
   };
 
   const openPath = (idElement: string) => {
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
index 9dc70fef7..4905ab28c 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/ObjectDetails.tsx
@@ -356,20 +356,15 @@ const ObjectDetails = ({
     setDeleteTagModalOpen(true);
   };
 
-  const downloadObject = (object: IFileInfo, includeVersion?: boolean) => {
+  const downloadObject = (object: IFileInfo) => {
     if (object.size && parseInt(object.size) > 104857600) {
       // If file is bigger than 100MB we show a notification
       setSnackBarMessage(
         "Download process started, it may take a few moments to complete"
       );
     }
-    download(
-      bucketName,
-      internalPaths,
-      object.version_id,
-      () => {},
-      includeVersion
-    );
+
+    download(bucketName, internalPaths, object.version_id);
   };
 
   const tableActions: ItemActions[] = [
@@ -391,7 +386,7 @@ const ObjectDetails = ({
     {
       type: "download",
       onClick: (item: IFileInfo) => {
-        downloadObject(item, true);
+        downloadObject(item);
       },
       disableButtonFunction: (item: string) => {
         const element = versions.find((elm) => elm.version_id === item);
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts
index cd653dc02..66ef72da6 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/utils.ts
@@ -17,9 +17,7 @@
 export const download = (
   bucketName: string,
   objectPath: string,
-  versionID: any,
-  callBack?: (objIdentifier: string) => void,
-  includeVersionInCallback?: boolean
+  versionID: any
 ) => {
   const anchor = document.createElement("a");
   document.body.appendChild(anchor);