empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix site nav software item to link to software/titles (#15734)

Browse Source 
relates to #15717

Fixes software navigation link to always navigate to /software/titles
page.
This commit is contained in:
Gabriel Hernandez 2023-12-18 22:52:58 +00:00 committed by GitHub
parent ed938f88f5
commit 5bdb74c717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx
View File

@ -41,7 +41,8 @@ const REGEX_DETAIL_PAGES = {
QUERIES_NEW: /\/queries\/new/i, QUERIES_NEW: /\/queries\/new/i,
POLICY_EDIT: /\/policies\/\d+/i, POLICY_EDIT: /\/policies\/\d+/i,
POLICY_NEW: /\/policies\/new/i, POLICY_NEW: /\/policies\/new/i,
SOFTWARE_DETAILS: /\/software\/\d+/i, SOFTWARE_TITLES_DETAILS: /\/software\/titles\/\d+/i,
SOFTWARE_VERSIONS_DETAILS: /\/software\/versions\/\d+/i,
}; };
const REGEX_GLOBAL_PAGES = { const REGEX_GLOBAL_PAGES = {
@ -144,13 +145,17 @@ const SiteTopNav = ({
} }
if (active && !isActiveDetailPage) { if (active && !isActiveDetailPage) {
const path = navItem.alwaysToPathname
? navItem.location.pathname
: currentPath;
// TODO: confirm link should be noop and find best pattern (one that doesn't dispatch a // TODO: confirm link should be noop and find best pattern (one that doesn't dispatch a
// replace to the same url, which triggers a re-render) // replace to the same url, which triggers a re-render)
return ( return (
<li className={navItemClasses} key={`nav-item-${name}`}> <li className={navItemClasses} key={`nav-item-${name}`}>
<Link <Link
className={`${navItemBaseClass}__link`} className={`${navItemBaseClass}__link`}
to={currentPath.concat(search).concat(hash)} to={path.concat(search).concat(hash)}
> >
<span <span
className={`${navItemBaseClass}__name`} className={`${navItemBaseClass}__name`}

8
frontend/components/top_nav/SiteTopNav/navItems.ts
View File

@ -11,6 +11,13 @@ export interface INavItem {
pathname: string; pathname: string;
}; };
exclude?: boolean; exclude?: boolean;
/** If `true`, this nav item will always navigate to the given `location.pathname`. This
* is useful when you always want to always naviate to a specific path no matter
* which child page you are on (e.g. always navigate to /sofware/titles/ when
* clicking on the software nav item even if on /software/versions,
* software/titles/:id, or /software/versions/:id). Defaults to `undefined`.
*/
alwaysToPathname?: boolean;
withParams?: { type: "query"; names: string[] }; withParams?: { type: "query"; names: string[] };
} }
@ -69,6 +76,7 @@ export default (
regex: new RegExp(`^${URL_PREFIX}/software/`), regex: new RegExp(`^${URL_PREFIX}/software/`),
pathname: PATHS.SOFTWARE_TITLES, pathname: PATHS.SOFTWARE_TITLES,
}, },
alwaysToPathname: true,
withParams: { type: "query", names: ["team_id"] }, withParams: { type: "query", names: ["team_id"] },
}, },
{ {