fix test

minio · Dec 5, 2023 · 33553f4 · 33553f4
1 parent 3950305
commit 33553f4
Showing 1 changed file with 20 additions and 24 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
@@ -127,8 +127,6 @@ import ListObjectsTable from "./ListObjectsTable";
 import FilterObjectsSB from "../../../../ObjectBrowser/FilterObjectsSB";
 import AddAccessRule from "../../../BucketDetails/AddAccessRule";
 
-import sanitize from "sanitize-filename";
-
 const DeleteMultipleObjects = withSuspense(
   React.lazy(() => import("./DeleteMultipleObjects")),
 );
@@ -524,6 +522,8 @@ const ListObjects = () => {
               relativeFolderPath = fileWebkitRelativePath;
             }
 
+            let prefixPath = "";
+
             if (path !== "" || relativeFolderPath !== "") {
               const finalFolderPath = relativeFolderPath
                 .split("/")
@@ -532,34 +532,30 @@ const ListObjects = () => {
 
               const pathClean = path.endsWith("/") ? path.slice(0, -1) : path;
 
-              encodedPath = encodeURLString(
-                `${pathClean}${
-                  !pathClean.endsWith("/") &&
-                  finalFolderPath !== "" &&
-                  !finalFolderPath.startsWith("/")
-                    ? "/"
-                    : ""
-                }${finalFolderPath}${
-                  !finalFolderPath.endsWith("/") ||
-                  (finalFolderPath.trim() === "" && !path.endsWith("/"))
-                    ? "/"
-                    : ""
-                }`,
-              );
+              prefixPath = `${pathClean}${
+                !pathClean.endsWith("/") &&
+                finalFolderPath !== "" &&
+                !finalFolderPath.startsWith("/")
+                  ? "/"
+                  : ""
+              }${finalFolderPath}${
+                !finalFolderPath.endsWith("/") ||
+                (finalFolderPath.trim() === "" && !path.endsWith("/"))
+                  ? "/"
+                  : ""
+              }`;
             }
 
-            const sanitizedFileName = sanitize(fileName);
-
-            if (encodedPath !== "") {
-              uploadUrl = `${uploadUrl}?prefix=${encodedPath}${encodeURLString(
-                sanitizedFileName,
-              )}`;
-            } else {
+            if (prefixPath !== "") {
               uploadUrl = `${uploadUrl}?prefix=${encodeURLString(
-                sanitizedFileName,
+                prefixPath + fileName,
               )}`;
+            } else {
+              uploadUrl = `${uploadUrl}?prefix=${encodeURLString(fileName)}`;
             }
 
+            encodedPath = encodeURLString(prefixPath);
+
             const identity = encodeURLString(
               `${bucketName}-${encodedPath}-${new Date().getTime()}-${Math.random()}`,
             );