QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-18 05:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip trailing slashes from routes / breadcrumbs / titles

Browse Source
This commit is contained in:
darin.kelkhoff
2023-07-19 11:16:59 -05:00
parent ba79ccb2eb
commit 95144608e5
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/qqq/components/horseshoe/Breadcrumbs.tsx
View File

@ -59,11 +59,25 @@ export const routeToLabel = (route: string): string =>
function QBreadcrumbs({icon, title, route, light}: Props): JSX.Element function QBreadcrumbs({icon, title, route, light}: Props): JSX.Element
{ {
///////////////////////////////////////////////////////////////////////
// strip away empty elements of the route (e.g., trailing slash(es)) //
///////////////////////////////////////////////////////////////////////
if(route.length)
{
// @ts-ignore
route = route.filter(r => r != "");
}
const routes: string[] | any = route.slice(0, -1); const routes: string[] | any = route.slice(0, -1);
const {pageHeader, pathToLabelMap, branding} = useContext(QContext); const {pageHeader, pathToLabelMap, branding} = useContext(QContext);
const fullPathToLabel = (fullPath: string, route: string): string => const fullPathToLabel = (fullPath: string, route: string): string =>
{ {
if(fullPath.endsWith("/"))
{
fullPath = fullPath.replace(/\/+$/, "");
}
if(pathToLabelMap && pathToLabelMap[fullPath]) if(pathToLabelMap && pathToLabelMap[fullPath])
{ {
return pathToLabelMap[fullPath]; return pathToLabelMap[fullPath];
@ -82,6 +96,11 @@ function QBreadcrumbs({icon, title, route, light}: Props): JSX.Element
continue; continue;
} }
if(routes[i] === "")
{
continue;
}
accumulatedPath = `${accumulatedPath}/${routes[i]}`; accumulatedPath = `${accumulatedPath}/${routes[i]}`;
fullRoutes.push(accumulatedPath); fullRoutes.push(accumulatedPath);
pageTitle = `${fullPathToLabel(accumulatedPath, routes[i])} | ${pageTitle}`; pageTitle = `${fullPathToLabel(accumulatedPath, routes[i])} | ${pageTitle}`;

5
src/qqq/components/horseshoe/NavBar.tsx
View File

@ -215,6 +215,11 @@ function NavBar({absolute, light, isMini}: Props): JSX.Element
const {pathToLabelMap} = useContext(QContext); const {pathToLabelMap} = useContext(QContext);
const fullPathToLabel = (fullPath: string, route: string): string => const fullPathToLabel = (fullPath: string, route: string): string =>
{ {
if(fullPath.endsWith("/"))
{
fullPath = fullPath.replace(/\/+$/, "");
}
if(pathToLabelMap && pathToLabelMap[fullPath]) if(pathToLabelMap && pathToLabelMap[fullPath])
{ {
return pathToLabelMap[fullPath]; return pathToLabelMap[fullPath];