removing the URLs changes

Signed-off-by: sj895092 <[email protected]>
zowe · Dec 2, 2024 · 52693e6 · 52693e6
1 parent 6875f5d
commit 52693e6
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/api-catalog-ui/frontend/src/helpers/urls.jsx b/api-catalog-ui/frontend/src/helpers/urls.jsx
@@ -24,28 +24,20 @@ const getBaseUrl = (pEnvironment, pLocation) => {
 
     // Going through the Gateway
     const urlParts = location.pathname.split('/');
-
-    if(urlParts[1]==="apicatalog") {
-        if (urlParts[2] === 'ui') {
-            return `${location.protocol}//${location.host}/${urlParts[1]}/api/${urlParts[3]}`;
-        }
-    } else {
-        if (urlParts[3] === 'ui') {
-            return `${location.protocol}//${location.host}/${urlParts[1]}${urlParts[2]}/api/${urlParts[4]}`;
-        }
+    if (urlParts[2] === 'ui') {
+        return `${location.protocol}//${location.host}/${urlParts[1]}/api/${urlParts[3]}`;
     }
+
     // Testing environment
     if (environment.REACT_APP_GATEWAY_URL && environment.REACT_APP_CATALOG_HOME) {
         return `${environment.REACT_APP_GATEWAY_URL}${environment.REACT_APP_CATALOG_HOME}`;
     }
 
     // Local development environment
     if (environment.REACT_APP_CATALOG_HOME) {
-        if(urlParts[1]!== "apicatalog") {
-            return `${location.protocol}//${location.host}/${urlParts[1]}${environment.REACT_APP_CATALOG_HOME}`;
-        }
         return `${location.protocol}//${location.host}${environment.REACT_APP_CATALOG_HOME}`;
     }
+
     // Standalone access to the Catalog
     return location.href;
 };