From 0e238d8127d8ea9ebdbd0900d787c1708445d904 Mon Sep 17 00:00:00 2001 From: alma Date: Thu, 17 Apr 2025 17:13:10 +0200 Subject: [PATCH] clean pages 3 rest 2 --- components/sidebar.tsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/components/sidebar.tsx b/components/sidebar.tsx index 9a909500..616eb524 100644 --- a/components/sidebar.tsx +++ b/components/sidebar.tsx @@ -57,17 +57,18 @@ export function Sidebar({ isOpen, onClose }: SidebarProps) { console.log('User roles:', userRoles); 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)) { - return userRoles.some(role => { - const cleanRole = role.replace('ROLE_', ''); - return requiredRole.includes(cleanRole) || cleanRole === 'Admin'; - }); + return requiredRole.some(role => + cleanUserRoles.includes(role) || cleanUserRoles.includes('Admin') + ); } - return userRoles.some(role => { - const cleanRole = role.replace('ROLE_', ''); - return cleanRole === requiredRole || cleanRole === 'Admin'; - }); + return cleanUserRoles.includes(requiredRole) || cleanUserRoles.includes('Admin'); }; // Base menu items (available for everyone)