Skip to content
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

[FIX] Admin sidebar navigation #26958

Merged
merged 3 commits into from
Sep 28, 2022
Merged

[FIX] Admin sidebar navigation #26958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8363fd5
Fix admin sidebar navigation
juliajforesti Sep 27, 2022
8fb31fb
Fix admin sidebar navigation
juliajforesti Sep 27, 2022
bcc2e57
Merge branch 'develop' into fix/admin-sidebar-navigation
rique223 Sep 28, 2022
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
3 changes: 2 additions & 1 deletion apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ const SidebarNavigationItem: FC<SidebarNavigationItemProps> = ({
}) => {
const params = useMemo(() => ({ group: pathGroup }), [pathGroup]);
const path = useRoutePath(pathSection, params);
const isActive = path === currentPath || false;
const isActive = currentPath?.includes(path as string);

if (permissionGranted === false || (typeof permissionGranted === 'function' && !permissionGranted())) {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23023,7 +23023,7 @@ __metadata:
optional: true
bin:
lessc: ./bin/lessc
checksum: c9b8c0e865427112c48a9cac36f14964e130577743c29d56a6d93b5812b70846b04ccaa364acf1e8d75cee3855215ec0a2d8d9de569c80e774f10b6245f39b7d
checksum: 61568b56b5289fdcfe3d51baf3c13e7db7140022c0a37ef0ae343169f0de927a4b4f4272bc10c20101796e8ee79e934e024051321bba93b3ae071f734309bd98
languageName: node
linkType: hard

Expand Down