libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

fixed merge error

Browse source
This commit is contained in:
Erik Jan de Wit 2021-03-05 11:42:06 +01:00
parent 3f4e32dc5a
commit 5a8762b3fa
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/PageNav.tsx
View file

@ -41,8 +41,7 @@ export const PageNav: React.FunctionComponent = () => {
type LeftNavProps = { title: string; path: string }; type LeftNavProps = { title: string; path: string };
const LeftNav = ({ title, path }: LeftNavProps) => { const LeftNav = ({ title, path }: LeftNavProps) => {
const route = routes(() => {}).find( const route = routes(() => {}).find(
(route) => (route) => route.path.replace(/\/:.+?(\?|(?:(?!\/).)*|$)/g, "") === path
route.path.replaceAll(/\/:.+?(\?|(?:(?!\/).)*|$)/g, "") === path
); );
if (!route || !hasAccess(route.access)) return <></>; if (!route || !hasAccess(route.access)) return <></>;
//remove "/realm-name" from the start of the path //remove "/realm-name" from the start of the path

2
src/components/view-header/ViewHeader.tsx
View file

@ -163,7 +163,7 @@ export const ViewHeader = ({
/> />
)} )}
</PageSection> </PageSection>
<Divider component={dividerComponent} /> {divider && <Divider component={dividerComponent} />}
</> </>
); );
}; };