Skip to content

[FIX] Cannot open admin when server uses ROOT_URL with subpath (#18105) #18147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 1 commit into from
Jul 4, 2020
Merged

[FIX] Cannot open admin when server uses ROOT_URL with subpath (#18105) #18147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions client/admin/sidebar/AdminSidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { useReactiveValue } from '../../hooks/useReactiveValue';
import { useSettings } from '../../contexts/SettingsContext';
import { useTranslation } from '../../contexts/TranslationContext';
import { useRoutePath, useCurrentRoute } from '../../contexts/RouterContext';
import { useAbsoluteUrl } from '../../contexts/ServerContext';
import { useAtLeastOnePermission } from '../../contexts/AuthorizationContext';
import SettingsProvider from '../../providers/SettingsProvider';
import { sidebarItems } from '../sidebarItems';
Expand Down Expand Up @@ -175,12 +176,14 @@ export default React.memo(function AdminSidebar() {

const currentRoute = useCurrentRoute();
const currentPath = useRoutePath(...currentRoute);
const absoluteUrl = useAbsoluteUrl();

useEffect(() => {
if (!currentPath.startsWith('/admin/')) {
const { pathname: adminPath } = new URL(absoluteUrl('admin/'));
if (!currentPath.startsWith(adminPath)) {
SideNav.closeFlex();
}
}, [currentRoute, currentPath]);
}, [absoluteUrl, currentPath]);

// TODO: uplift this provider
return <SettingsProvider privileged>
Expand Down