Fixes #7, another dormant bug (#9)

* Fixes #7, another dormant bug * Review comment - Combine Regexes
conductor-oss · Jan 9, 2024 · 2e309b2 · 2e309b2
1 parent f42a279
commit 2e309b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ui/src/components/NavLink.jsx b/ui/src/components/NavLink.jsx
@@ -26,7 +26,8 @@ export default React.forwardRef((props, ref) => {
       </Link>
     );
   } else {
-    const href = absolutePath ? url.toString() : cleanDuplicateSlash(getBasename() + url.toString());
+    // Note: + '/' + is required here
+    const href = absolutePath ? url.toString() : cleanDuplicateSlash(getBasename() + '/' + url.toString());
     return (
       <Link ref={ref} target="_blank" href={href}>
         {rest.children}

diff --git a/ui/src/plugins/fetch.js b/ui/src/plugins/fetch.js
@@ -41,6 +41,11 @@ export function fetchWithContext(
     });
 }
 
+/**
+ * @param {string} path 
+ * @returns path with '/' not duplicated, except at ://
+ * 
+ */
 export function cleanDuplicateSlash(path) {
-  return path.replace(/([^:]\/)\/+/g, "$1");
+  return path.replace(/(:\/\/)\/*|(\/)+/g, "$1$2");
 }