clean pages 3 rest 2
This commit is contained in:
parent
edf9a5d150
commit
0e238d8127
@ -57,17 +57,18 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) {
|
|||||||
console.log('User roles:', userRoles);
|
console.log('User roles:', userRoles);
|
||||||
console.log('Required role:', requiredRole);
|
console.log('Required role:', requiredRole);
|
||||||
|
|
||||||
|
// Clean up user roles by removing ROLE_ prefix and / prefix
|
||||||
|
const cleanUserRoles = userRoles.map(role =>
|
||||||
|
role.replace('ROLE_', '').replace('/', '')
|
||||||
|
);
|
||||||
|
|
||||||
if (Array.isArray(requiredRole)) {
|
if (Array.isArray(requiredRole)) {
|
||||||
return userRoles.some(role => {
|
return requiredRole.some(role =>
|
||||||
const cleanRole = role.replace('ROLE_', '');
|
cleanUserRoles.includes(role) || cleanUserRoles.includes('Admin')
|
||||||
return requiredRole.includes(cleanRole) || cleanRole === 'Admin';
|
);
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return userRoles.some(role => {
|
return cleanUserRoles.includes(requiredRole) || cleanUserRoles.includes('Admin');
|
||||||
const cleanRole = role.replace('ROLE_', '');
|
|
||||||
return cleanRole === requiredRole || cleanRole === 'Admin';
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Base menu items (available for everyone)
|
// Base menu items (available for everyone)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user