fix: fix error with relative baseUrl

This happens in prod, where the baseUrl returned by useConfig is a relative URL. The URL constructor needs an absolute URL for the base parameter.
dhis2 · Dec 17, 2024 · 300da50 · 300da50
1 parent d00f3a7
commit 300da50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/DataDimension/Info/CalculationInfo.js b/src/components/DataDimension/Info/CalculationInfo.js
@@ -53,7 +53,7 @@ export const CalculationInfo = ({ id, displayNameProp }) => {
         // inject href as it is not returned from the API
         calculation.href = new URL(
             `${calculationQuery.calculation.resource}/${id}`,
-            new URL(`api/${apiVersion}/`, `${baseUrl}/`)
+            new URL(`api/${apiVersion}/`, baseUrl === '..' ? window.location.href.split('dhis-web-data-visualizer/')[0] : `${baseUrl}/`)
         ).href
 
         setData({ calculation })

diff --git a/src/components/DataDimension/Info/DataElementOperandInfo.js b/src/components/DataDimension/Info/DataElementOperandInfo.js
@@ -66,7 +66,7 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
             `${
                 dataElementOperandsQuery.dataElementOperands.resource
             }?${new URLSearchParams({ filter: `id:eq:${id}` })}`,
-            new URL(`api/${apiVersion}/`, `${baseUrl}/`)
+            new URL(`api/${apiVersion}/`, baseUrl === '..' ? window.location.href.split('dhis-web-data-visualizer/')[0] : `${baseUrl}/`)
         ).href
 
         setData({ dataElementOperand })