Leopoldadmin/leocrm
1
0
Fork 0
Code Issues 363 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: canAccess + isModuleVisible fallback while permissions loading (contacts + settings link)

Browse Source
This commit is contained in:
Agent Zero
2026-07-30 01:53:30 +02:00
parent c5f0ef9d4d
commit 25e70cf749
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/layout/Sidebar.tsx
+2 -2
View File
@@ -50,8 +50,8 @@ export function Sidebar() {
// Use hasPermission directly — permissions are loaded via useUserPermissions hook // Use hasPermission directly — permissions are loaded via useUserPermissions hook
const canAccess = (perm?: string): boolean => { const canAccess = (perm?: string): boolean => {
if (!perm) return true; if (!perm) return true;
// While permissions are loading, show everything (backend 403 catches errors) // While permissions are loading (undefined), show everything; backend 403 catches errors
if (!user || (user.permissions?.length === 0 && user.is_system_admin === undefined)) return true; if (!user?.permissions && user?.is_system_admin === undefined) return true;
return hasPermission(perm); return hasPermission(perm);
}; };
frontend/src/components/layout/TopBar.tsx
+2 -1
View File
@@ -23,8 +23,9 @@ export function TopBar() {
const logoutMutation = useLogout(); const logoutMutation = useLogout();
const minimizedWindows = useWindowStore((s) => s.windows.filter((w) => w.state === 'minimized')); const minimizedWindows = useWindowStore((s) => s.windows.filter((w) => w.state === 'minimized'));
const { hasPermission } = usePermission(); const { hasPermission } = usePermission();
// Use hasPermission directly — permissions are loaded via useUserPermissions hook // While permissions are loading (undefined), show everything; backend 403 catches errors
const canAccess = (perm: string): boolean => { const canAccess = (perm: string): boolean => {
if (!user?.permissions && user?.is_system_admin === undefined) return true;
return hasPermission(perm); return hasPermission(perm);
}; };
const restoreWindow = useWindowStore((s) => s.restoreWindow); const restoreWindow = useWindowStore((s) => s.restoreWindow);
frontend/src/hooks/useWorkspace.ts
+2
View File
@@ -51,6 +51,8 @@ export function useWorkspace() {
// System admins see all modules regardless of workspace // System admins see all modules regardless of workspace
const user = useAuthStore.getState().user; const user = useAuthStore.getState().user;
if (user?.is_system_admin) return true; if (user?.is_system_admin) return true;
// While permissions are loading (is_system_admin undefined), show everything
if (user && user.is_system_admin === undefined) return true;
// If no workspace context, show all (backward compatible) // If no workspace context, show all (backward compatible)
if (!context?.workspace_id || !context?.modules?.length) return true; if (!context?.workspace_id || !context?.modules?.length) return true;
return visibleModuleKeys.has(moduleKey); return visibleModuleKeys.has(moduleKey);