fixed the getproxybasepath and onHistoryServerClick to

deal with a gateway
dataflint · Oct 22, 2024 · 6d2d71b · 6d2d71b
1 parent fdcbc5e
commit 6d2d71b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/spark-ui/src/components/AppDrawer/DrawerFooter.tsx b/spark-ui/src/components/AppDrawer/DrawerFooter.tsx
@@ -5,15 +5,16 @@ import {
   BASE_PATH,
   IS_HISTORY_SERVER_MODE,
 } from "../../utils/UrlConsts";
-import { getBaseAppUrl, isDataFlintSaaSUI } from "../../utils/UrlUtils";
+import { getBaseAppUrl, isDataFlintSaaSUI, getProxyBasePath } from "../../utils/UrlUtils";
 
 export default function DrawerFooter({ version }: { version?: string }) {
   const onSparkUiClick = (): void => {
     window.location.href = `${getBaseAppUrl(BASE_CURRENT_PAGE)}/jobs/`;
   };
 
   const onHistoryServerClick = (): void => {
-    window.location.href = `${BASE_PATH}/history`;
+    const basePath = getProxyBasePath();
+    window.location.href = basePath;
   };
 
   return (

diff --git a/spark-ui/src/utils/UrlUtils.ts b/spark-ui/src/utils/UrlUtils.ts
@@ -27,11 +27,11 @@ export function hrefWithoutEndSlash(): string {
   return fixedUrl;
 }
 
-export const getProxyBasePath = (): string =>
-  hrefWithoutEndSlash().substring(
-    0,
-    hrefWithoutEndSlash().lastIndexOf("/dataflint"),
-  );
+export const getProxyBasePath = (): string => {
+  const url = new URL(window.location.href);
+  const pathToRemove = /\/history\/[^/]+\/dataflint\/?$/;
+  return url.origin + url.pathname.replace(pathToRemove, '');
+};
 
 export function getHistoryServerCurrentAppId(): string {
   const urlSegments = hrefWithoutEndSlash().split("/");