Skip to content
Snippets Groups Projects
Unverified Commit 1d849d9c authored by Anton Kulyk's avatar Anton Kulyk Committed by GitHub
Browse files

Allow navbar on embedded homepage (#22183)

* Allow navbar on embedded homepage

* Use regexps
parent 7941eaa6
Branches
Tags
No related merge requests found
......@@ -47,7 +47,12 @@ const getErrorComponent = ({ status, data, context }: AppErrorDescriptor) => {
const PATHS_WITHOUT_NAVBAR = [/\/model\/.*\/query/, /\/model\/.*\/metadata/];
const EMBEDDED_ROUTES_WITH_NAVBAR = ["/collection", "/archive"];
const HOMEPAGE_PATTERN = /^\/$/;
const EMBEDDED_ROUTES_WITH_NAVBAR = [
HOMEPAGE_PATTERN,
/^\/collection\/.*/,
/^\/archive/,
];
interface AppStateProps {
currentUser?: User;
......@@ -102,8 +107,8 @@ function App({
return false;
}
if (IFRAMED) {
return EMBEDDED_ROUTES_WITH_NAVBAR.some(path =>
pathname.startsWith(path),
return EMBEDDED_ROUTES_WITH_NAVBAR.some(pattern =>
pattern.test(pathname),
);
}
return !PATHS_WITHOUT_NAVBAR.some(pattern => pattern.test(pathname));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment