fixed merge error
This commit is contained in:
parent
3f4e32dc5a
commit
5a8762b3fa
2 changed files with 2 additions and 3 deletions
|
@ -41,8 +41,7 @@ export const PageNav: React.FunctionComponent = () => {
|
|||
type LeftNavProps = { title: string; path: string };
|
||||
const LeftNav = ({ title, path }: LeftNavProps) => {
|
||||
const route = routes(() => {}).find(
|
||||
(route) =>
|
||||
route.path.replaceAll(/\/:.+?(\?|(?:(?!\/).)*|$)/g, "") === path
|
||||
(route) => route.path.replace(/\/:.+?(\?|(?:(?!\/).)*|$)/g, "") === path
|
||||
);
|
||||
if (!route || !hasAccess(route.access)) return <></>;
|
||||
//remove "/realm-name" from the start of the path
|
||||
|
|
|
@ -163,7 +163,7 @@ export const ViewHeader = ({
|
|||
/>
|
||||
)}
|
||||
</PageSection>
|
||||
<Divider component={dividerComponent} />
|
||||
{divider && <Divider component={dividerComponent} />}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue