Skip to content

fix: make menu conditions dynamic and optimize accessibility check #83

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

Open
SarthakDudhe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make menu conditions dynamic and optimize accessibility check #83

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
46 changes: 14 additions & 32 deletions client/app/layouts/admin/components/MainListItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,42 +53,29 @@ const MainListItem = ({ location: { pathname }, access }) => {

const [initialLoad, setInitialLoad] = useState(true);

const togglePathKeys = (splitPath) => {
const newOpenSet = { ...openSet };
let tempKey = '';
for (let i = 0; i < splitPath.length - 1; i++) {
tempKey = tempKey ? `${tempKey}.${splitPath[i]}` : splitPath[i];
newOpenSet[tempKey] = !openSet[tempKey];
}
setOpenSet(newOpenSet);
setInitialLoad(false);
};

const checkOpenRoute = (menu) => {
let splitPath = [];
if (initialLoad && searchPath !== '') {
if (searchPath.includes(menu.link)) {
splitPath = menu.key.split('.');
// TODO make conditions dynamic
if (splitPath.length === 2) {
setOpenSet({ ...openSet, [splitPath[0]]: !openSet[splitPath[0]] });
setInitialLoad(false);
} else if (splitPath.length === 3) {
setOpenSet({
...openSet,
[splitPath[0]]: !openSet[splitPath[0]],
[`${splitPath[0]}.${splitPath[1]}`]:
!openSet[`${splitPath[0]}.${splitPath[1]}`],
});
setInitialLoad(false);
}
togglePathKeys(splitPath);
}
}
if (initialLoad) {
if (pathname.includes(menu.link)) {
splitPath = menu.key.split('.');
// TODO make conditions dynamic
if (splitPath.length === 2) {
setOpenSet({ ...openSet, [splitPath[0]]: !openSet[splitPath[0]] });
setInitialLoad(false);
} else if (splitPath.length === 3) {
setOpenSet({
...openSet,
[splitPath[0]]: !openSet[splitPath[0]],
[`${splitPath[0]}.${splitPath[1]}`]:
!openSet[`${splitPath[0]}.${splitPath[1]}`],
});
setInitialLoad(false);
}
togglePathKeys(splitPath);
}
}
};
Expand All @@ -107,12 +94,7 @@ const MainListItem = ({ location: { pathname }, access }) => {
const menuFunction = (e) => {
let showChildren = false;
if (e.menu) {
// TODO: can be optimized to break when if condition is fulfilled
e.menu.map((each) => {
if (hasAccess(each.link)) {
showChildren = true;
}
});
showChildren = e.menu.some((each) => hasAccess(each.link));
}
const isVisible = e.menu ? showChildren : hasAccess(e.link);
if (!isVisible) return null;
Expand Down