Merge pull request #60 from digma-ai/fix/base-url

Add baseUrl variable

Author: kshmidt-digma

packages/jaeger-ui/index.html

@@ -39,6 +39,7 @@
       window.global = {};
     </script>
     <script>
+      window.baseUrl;
       window.apiBaseUrl;
       window.initialRoutePath;
       window.embeddedMode;

packages/jaeger-ui/src/components/TracePage/TracePageHeader/AltViewOptions.tsx

@@ -71,37 +71,41 @@ export default function AltViewOptions(props: Props) {
     onTraceViewChange(item);
   };
 
-  const menu = (
-    <Menu>
-      {MENU_ITEMS.filter(item => item.viewType !== viewType).map(item => (
-        <Menu.Item key={item.viewType}>
-          <a onClick={() => handleSelectView(item.viewType)} role="button">
-            {item.label}
+  const menu = () => {
+    const baseUrl = window.baseUrl ?? window.apiBaseUrl;
+
+    return (
+      <Menu>
+        {MENU_ITEMS.filter(item => item.viewType !== viewType).map(item => (
+          <Menu.Item key={item.viewType}>
+            <a onClick={() => handleSelectView(item.viewType)} role="button">
+              {item.label}
+            </a>
+          </Menu.Item>
+        ))}
+        <Menu.Item>
+          <a
+            href={`${baseUrl}/api/traces/${traceID}?prettyPrint=true`}
+            rel="noopener noreferrer"
+            target="_blank"
+            onClick={trackJsonView}
+          >
+            Trace JSON
           </a>
         </Menu.Item>
-      ))}
-      <Menu.Item>
-        <a
-          href={`${window.apiBaseUrl}/api/traces/${traceID}?prettyPrint=true`}
-          rel="noopener noreferrer"
-          target="_blank"
-          onClick={trackJsonView}
-        >
-          Trace JSON
-        </a>
-      </Menu.Item>
-      <Menu.Item>
-        <a
-          href={`${window.apiBaseUrl}/api/traces/${traceID}?raw=true&prettyPrint=true`}
-          rel="noopener noreferrer"
-          target="_blank"
-          onClick={trackRawJsonView}
-        >
-          Trace JSON (unadjusted)
-        </a>
-      </Menu.Item>
-    </Menu>
-  );
+        <Menu.Item>
+          <a
+            href={`${baseUrl}/api/traces/${traceID}?raw=true&prettyPrint=true`}
+            rel="noopener noreferrer"
+            target="_blank"
+            onClick={trackRawJsonView}
+          >
+            Trace JSON (unadjusted)
+          </a>
+        </Menu.Item>
+      </Menu>
+    );
+  };
 
   const currentItem = MENU_ITEMS.find(item => item.viewType === viewType);
   const dropdownText = currentItem ? currentItem.label : 'Alternate Views';

packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.tsx

@@ -159,11 +159,12 @@ export function TracePageHeaderFn(props: TracePageHeaderEmbedProps & { forwarded
   );
 
   const handleStandaloneLinkClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
+    const baseUrl = window.baseUrl ?? window.apiBaseUrl;
     e.preventDefault();
     window.sendMessageToDigma<OpenURLInDefaultBrowserPayload>({
       action: globalActions.OPEN_URL_IN_DEFAULT_BROWSER,
       payload: {
-        url: `${window.apiBaseUrl}${window.location.pathname}${window.location.search}`,
+        url: `${baseUrl}${window.location.pathname}${window.location.search}`,
       },
     });
   };

packages/jaeger-ui/src/components/common/ErrorMessage.tsx

@@ -164,6 +164,7 @@ export default function ErrorMessage({
   }
 
   if (error.message.includes('Failed to fetch') || error.httpStatus === 502) {
+    const baseUrl = window.baseUrl ?? window.apiBaseUrl;
     const isUserDefinedJaegerQueryURL = window.isUserDefinedJaegerQueryURL === true;
     return (
       <DigmaErrorMessage
@@ -173,16 +174,16 @@ export default function ErrorMessage({
           isUserDefinedJaegerQueryURL ? (
             <>
               The Jaeger link
-              {isString(window.apiBaseUrl) && (
+              {isString(baseUrl) && (
                 <>
                   {' '}
                   <a
                     className="CustomErrorMessage--link"
-                    href={window.apiBaseUrl}
+                    href={baseUrl}
                     target="_blank"
                     rel="noopener noreferrer"
                   >
-                    {window.apiBaseUrl}
+                    {baseUrl}
                   </a>
                 </>
               )}{' '}

packages/jaeger-ui/typings/custom.d.ts

@@ -36,6 +36,7 @@ declare interface Window {
   ) => string | undefined;
   cancelMessageToDigma: (request_id: string) => void;
   platform?: unknown;
+  baseUrl?: unknown
   apiBaseUrl?: unknown;
   initialRoutePath?: unknown;
   embeddedMode?: unknown;