Fix api requests.

netdata · Jun 16, 2023 · cbd6535 · cbd6535
1 parent 0165d89
commit cbd6535
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/dashboard-react.js b/dashboard-react.js
@@ -470,7 +470,7 @@ const fixHost = (host) => {
     host = host.substring(0, host.length - 1);
   }
 
-  return host;
+  return host.replace(/\/v1\/?$/, "");
 }
 
 NETDATA.chartRegistry = {
@@ -555,7 +555,7 @@ NETDATA.fixHost = function (host) {
     host = host.substring(0, host.length - 1);
   }
 
-  return host;
+  return host.replace(/\/v1\/?$/, "");
 };
 
 

diff --git a/public/index.html b/public/index.html
@@ -712,7 +712,8 @@ <h4 class="modal-title" id="gotoServerModalLabel"><span id="gotoServerName"></sp
         window.NETDATA = null
       }
 
-      fetch(location.origin + location.pathname + "/version.txt").then(function(res) {
+      const pathname = location.pathname.replace("/v1", "")
+      fetch(location.origin + pathname + "/version.txt").then(function(res) {
         if (res.url && /index\.html/.test(res.url)) {
           show404()
           return

diff --git a/src/utils/server-detection.ts b/src/utils/server-detection.ts
@@ -46,11 +46,11 @@ const getDefaultServer = () => {
       .replace("index.html", "")
       // todo consider .replace(/[^\/]*\.html/, "") (every .html file in the url)
       .replace("default.html", "") // for netdata demo servers
-    return window.location.origin + pathname
+    return window.location.origin + pathname.replace(/\/v1\/?$/, "")
   }
 
   const source = getScriptSource()
-  return getPathFromScriptSource(source)
+  return getPathFromScriptSource(source).replace(/\/v1\/?$/, "")
 }
 
 // append "/" at the end, if it's not already there