Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

[Hot-fix] fix: remove redundant slash that cause proxy fail #3873

Merged
merged 1 commit into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/components/NavLink.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/plugins/AppLogo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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} />;
}
2 changes: 1 addition & 1 deletion ui/src/plugins/fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading