Merge branch 'main' of https://github.com/LuisLainez/conductor into i…

…ssue/upgradeConductorToSpring3
Netflix · Nov 30, 2023 · 93ee139 · 93ee139
2 parents 2504d24 + f95e476
commit 93ee139
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: CI
 
 on: [ push, pull_request ]
-
+ 
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/ui/src/components/NavLink.jsx b/ui/src/components/NavLink.jsx
@@ -26,7 +26,7 @@ export default React.forwardRef((props, ref) => {
       </Link>
     );
   } else {
-    const href = absolutePath ? url.toString() : cleanDuplicateSlash(getBasename() + "/" + url.toString());
+    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/AppLogo.jsx b/ui/src/plugins/AppLogo.jsx
@@ -13,6 +13,6 @@ const useStyles = makeStyles((theme) => ({
 
 export default function AppLogo() {
   const classes = useStyles();
-  const logoPath = getBasename() + '/logo.svg';
+  const logoPath = getBasename() + 'logo.svg';
   return <img src={cleanDuplicateSlash(logoPath)} alt="Conductor" className={classes.logo} />;
 }
diff --git a/ui/src/plugins/fetch.js b/ui/src/plugins/fetch.js
@@ -17,7 +17,7 @@ export function fetchWithContext(
   const newParams = { ...fetchParams };
 
   const basename = getBasename();
-  const newPath = basename + `/api/${path}`;
+  const newPath = basename + `api/${path}`;
   const cleanPath = cleanDuplicateSlash(newPath); // Cleanup duplicated slashes
 
   return fetch(cleanPath, newParams)