#7162: Don't modify the original API URL when prepending BASE_PATH

netbox-community · Sep 7, 2021 · c35563d · c35563d
1 parent 70cd096
commit c35563d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 16 deletions.
diff --git a/netbox/project-static/dist/config.js b/netbox/project-static/dist/config.js
diff --git a/netbox/project-static/dist/config.js.map b/netbox/project-static/dist/config.js.map
diff --git a/netbox/project-static/dist/jobs.js b/netbox/project-static/dist/jobs.js
diff --git a/netbox/project-static/dist/jobs.js.map b/netbox/project-static/dist/jobs.js.map
diff --git a/netbox/project-static/dist/lldp.js b/netbox/project-static/dist/lldp.js
diff --git a/netbox/project-static/dist/lldp.js.map b/netbox/project-static/dist/lldp.js.map
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
diff --git a/netbox/project-static/dist/status.js b/netbox/project-static/dist/status.js
diff --git a/netbox/project-static/dist/status.js.map b/netbox/project-static/dist/status.js.map
diff --git a/netbox/project-static/src/util.ts b/netbox/project-static/src/util.ts
@@ -163,17 +163,21 @@ function buildUrl(destination: string): string {
 
   // If the `origin` exists in the API path (as in the case of paginated responses), remove it.
   const origin = new RegExp(window.location.origin, 'g');
-  let path = pathname.replaceAll(origin, '');
+  let path = pathname
+    .replaceAll(origin, '')
+    .split('/')
+    .filter(p => p);
 
   const basePath = getBasePath();
 
-  // If the `BASE_PATH` already exists in the URL, remove it.
-  if (basePath !== '' && path.includes(basePath)) {
-    path = path.replaceAll(basePath, '');
+  // If the `BASE_PATH` already exists in the URL, and it is the first element, remove it.
+  if (basePath !== '' && path[0].includes(basePath)) {
+    const [_, ...appPath] = path;
+    path = ['', ...appPath];
   }
 
   // Combine `BASE_PATH` with this request's path, removing _all_ slashes.
-  let combined = [...basePath.split('/'), ...path.split('/')].filter(p => p);
+  let combined = [...basePath.split('/'), ...path].filter(p => p);
 
   if (combined[0] !== '/') {
     // Ensure the URL has a leading slash.