style: Implement critical fixes to ensure Admin users are never locked and can always change branches

Author: Ifaz-Ikram

src/components/Layout/Navbar.js

@@ -40,13 +40,16 @@ const Navbar = () => {
   };
 
   // Extra safety: Admin should NEVER be locked, regardless of isLocked value
-  const shouldShowDropdown = user?.role === 'Admin' || !isLocked;
+  // CRITICAL FIX: Force dropdown for Admin role, even if isLocked is incorrectly true
+  const isAdmin = user?.role === 'Admin';
+  const shouldShowDropdown = isAdmin || !isLocked;
 
   console.log('🎨 Navbar Render Decision:', {
     userRole: user?.role,
-    isAdmin: user?.role === 'Admin',
+    isAdmin: isAdmin,
     isLocked: isLocked,
-    shouldShowDropdown: shouldShowDropdown
+    shouldShowDropdown: shouldShowDropdown,
+    forceAdminDropdown: isAdmin ? 'YES - Admin always gets dropdown' : 'NO'
   });
 
   return (

src/context/BranchContext.js

@@ -22,18 +22,24 @@ export const BranchProvider = ({ children }) => {
   useEffect(() => {
     if (user) {
       console.log('🔍 BranchContext - User logged in:', user.username);
+      console.log('🔍 BranchContext - User role:', user.role, '(type:', typeof user.role, ')');
+      console.log('🔍 BranchContext - User branch_id:', user.branch_id, '(type:', typeof user.branch_id, ')');
+      console.log('🔍 BranchContext - Is Admin check:', user.role === 'Admin', user.role === 'admin');
 
       // Check if user has a branch_id (could be string or number)
       const hasBranchId = user.branch_id !== null && user.branch_id !== undefined && user.branch_id !== '';
 
-      // If user is not Admin and has a branch_id, lock them to their branch
+      // CRITICAL: Admin should NEVER be locked, even if they have a branch_id
       if (user.role !== 'Admin' && hasBranchId) {
         console.log(`🔒 User locked to branch ${user.branch_id}`);
         // Convert to number if it's a string
         const branchId = typeof user.branch_id === 'string' ? parseInt(user.branch_id, 10) : user.branch_id;
         setSelectedBranchId(branchId);
       } else if (user.role === 'Admin') {
-        console.log('👑 Admin user - can access all branches');
+        console.log('👑 Admin user - can access all branches (branch_id ignored)');
+        setSelectedBranchId('All');
+      } else {
+        console.log('🌐 User has no branch restriction - showing all branches');
         setSelectedBranchId('All');
       }
     } else {
@@ -70,6 +76,13 @@ export const BranchProvider = ({ children }) => {
 
   // Prevent non-admin users from changing branch
   const handleSetSelectedBranchId = (branchId) => {
+    // CRITICAL FIX: Admin should ALWAYS be able to change branch
+    if (user && user.role === 'Admin') {
+      console.log('👑 Admin changing branch to:', branchId);
+      setSelectedBranchId(branchId);
+      return;
+    }
+    
     const hasBranchId = user?.branch_id !== null && user?.branch_id !== undefined && user?.branch_id !== '';
 
     if (user && user.role !== 'Admin' && hasBranchId) {
@@ -81,8 +94,9 @@ export const BranchProvider = ({ children }) => {
   };
 
   // Calculate isLocked based on current user state
+  // CRITICAL FIX: Admin should NEVER be locked, regardless of branch_id
   const hasBranchId = user?.branch_id !== null && user?.branch_id !== undefined && user?.branch_id !== '';
-  const isLocked = user && user.role !== 'Admin' && hasBranchId;
+  const isLocked = user && user.role !== 'Admin' && hasBranchId; // Admin is never locked
   const isNotAdmin = user ? user.role !== 'Admin' : false;
 
   // Find the selected branch with proper type comparison