From fb74ac2601d5176841b95ee0e8b92de3708d736e Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Wed, 12 Jan 2022 19:04:08 -0800 Subject: [PATCH] Detect basename for react router (#1384) Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- portal-ui/src/history.ts | 6 ++++++ .../ListBuckets/Objects/Preview/PreviewFileContent.tsx | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/portal-ui/src/history.ts b/portal-ui/src/history.ts index 9ecc96453..bc3a05e31 100644 --- a/portal-ui/src/history.ts +++ b/portal-ui/src/history.ts @@ -3,4 +3,10 @@ import { BrowserHistoryBuildOptions } from "history/createBrowserHistory"; let browserHistoryOpts: BrowserHistoryBuildOptions = {}; +let basename = document.baseURI.replace(window.location.origin, ""); + +if (basename !== "") { + browserHistoryOpts.basename = basename; +} + export default createBrowserHistory(browserHistoryOpts); diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx index 14f9d16fb..de7f93b8d 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/Preview/PreviewFileContent.tsx @@ -76,7 +76,8 @@ const PreviewFile = ({ if (object) { const encodedPath = encodeFileName(object.name); - path = `${window.location.origin}/api/v1/buckets/${bucketName}/objects/download?preview=true&prefix=${encodedPath}`; + let basename = document.baseURI.replace(window.location.origin, ""); + path = `${window.location.origin}${basename}api/v1/buckets/${bucketName}/objects/download?preview=true&prefix=${encodedPath}`; if (object.version_id) { path = path.concat(`&version_id=${object.version_id}`); }