@jmruthers/pace-core 0.5.193 → 0.6.1

package/src/hooks/useSecureDataAccess.ts

@@ -237,9 +237,11 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
       // SECURITY: Phase 2 additions - complete organisation table mapping
       'organisation_audit_log', 'organisation_invitations', 'organisation_app_access',
       // SECURITY: Emergency additions for Phase 1 fixes
-      'cake_meal', 'cake_mealtype', 'core_person',
-      // NOTE: core_member, medi_profile, core_contact, core_consent, core_identification, core_qualification
-      // are now person-scoped (not organisation-scoped) - removed from this list
+      'cake_meal', 'cake_mealtype',
+      // NOTE: core_person, core_member, core_contact, core_consent, core_identification, 
+      // core_qualification, and medi_profile are person-scoped tables that do NOT have 
+      // organisation_id columns. They were removed as part of the person-scoped profiles migration.
+      // Do NOT add organisation_id filters to these tables - it will cause 400 errors.
       // SECURITY: Phase 3A additions - medical and personal data
       // NOTE: medi_condition, medi_diet, medi_action_plan, medi_profile_versions are now person-scoped
       // (via medi_profile) - removed from this list
@@ -370,7 +372,20 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
       // SECURITY: Phase 2 additions - complete organisation table mapping
       'organisation_audit_log', 'organisation_invitations', 'organisation_app_access',
       // SECURITY: Emergency additions for Phase 1 fixes
-      'cake_meal', 'cake_mealtype', 'core_person', 'core_member'
+      'cake_meal', 'cake_mealtype', 'core_person',
+      // SECURITY: These tables still have organisation_id columns and must be filtered
+      'core_member', 'core_contact', 'core_consent', 'core_identification', 'core_qualification',
+      'medi_profile',
+      // SECURITY: Phase 3A additions - medical and personal data
+      'medi_condition', 'medi_diet', 'medi_action_plan', 'medi_profile_versions',
+      'core_identification_type',
+      'form_responses', 'form_response_values', 'forms',
+      // SECURITY: Phase 3B additions - remaining critical tables
+      'invoice', 'line_item', 'credit_balance', 'payment_method',
+      'form_contexts', 'form_field_config', 'form_fields',
+      'cake_delivery', 'cake_diettype', 'cake_diner', 'cake_dish', 'cake_item', 
+      'cake_logistics', 'cake_mealplan', 'cake_package', 'cake_recipe', 'cake_supplier', 
+      'cake_supply', 'cake_unit', 'event_app_access', 'base_application', 'base_questions'
     ];
     
     if (!bypassOrganisationFilter && organisationId && tablesWithOrganisation.includes(table)) {

package/src/hooks/useToast.ts

@@ -23,7 +23,7 @@ export interface ToastProps {
   description?: React.ReactNode;
   variant?: 'default' | 'destructive' | 'success';
   onClose?: () => void;
-  action?: React.ReactElement;
+  action?: React.ReactElement<any>;
 }
 
 /**
@@ -40,7 +40,7 @@ type ToasterToast = ToastProps & {
   /** Optional description content */
   description?: React.ReactNode
   /** Optional action button */
-  action?: React.ReactElement
+  action?: React.ReactElement<any>
   /** Open state */
   open?: boolean
   /** Open change handler */

package/src/providers/__tests__/OrganisationProvider.test.tsx

@@ -17,9 +17,14 @@ vi.mock('../../utils/debugLogger', () => ({
   },
 }));
 
-// Mock setOrganisationContext
+// Mock setOrganisationContext - make it resolve immediately to avoid delays
 vi.mock('../../utils/context/organisationContext', () => ({
-  setOrganisationContext: vi.fn().mockResolvedValue(undefined),
+  setOrganisationContext: vi.fn().mockImplementation(() => Promise.resolve(undefined)),
+}));
+
+// Mock isSuperAdmin to return false (normal user, not super admin)
+vi.mock('../../rbac/api', () => ({
+  isSuperAdmin: vi.fn().mockResolvedValue(false),
 }));
 
 // Create mock user and session
@@ -63,18 +68,36 @@ const createMockSupabaseClient = () => {
         role: 'org_admin',
         status: 'active',
         granted_at: '2023-01-01T00:00:00Z',
+        granted_by: null,
         revoked_at: null,
-        core_organisations: mockOrganisation
+        revoked_by: null,
+        notes: null,
+        created_at: '2023-01-01T00:00:00Z',
+        updated_at: '2023-01-01T00:00:00Z',
+        core_organisations: {
+          id: orgId,
+          name: 'Test Organisation 1',
+          display_name: 'Test Organisation 1',
+          subscription_tier: 'basic',
+          settings: {},
+          is_active: true,
+          parent_id: null,
+          created_at: '2023-01-01T00:00:00Z',
+          updated_at: '2023-01-01T00:00:00Z'
+        }
       }],
       error: null
     })
   };
   
+  // Mock RPC function for setOrganisationContext
+  const mockRpc = vi.fn().mockResolvedValue({
+    data: null,
+    error: null,
+  });
+  
   return {
-    rpc: vi.fn().mockResolvedValue({
-      data: [],
-            error: null,
-          }),
+    rpc: mockRpc,
     from: vi.fn((table: string) => {
       if (table === 'rbac_organisation_roles') {
         return mockQueryBuilder;
@@ -127,6 +150,8 @@ describe('OrganisationProvider', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
+    // Clear localStorage to ensure clean state
+    localStorage.clear();
     mockSupabaseClient = createMockSupabaseClient();
   });
 
@@ -140,10 +165,19 @@ describe('OrganisationProvider', () => {
 
       expect(screen.getByTestId('test-component')).toBeInTheDocument();
       
-      // Wait for organisations to load
+      // Wait for organisations to load - OrganisationService initializes asynchronously
+      // The service calls notify() in finally block, and useOrganisationService has 50ms debounce
+      // Also need to account for the 2 second minimum retry delay in loadUserOrganisations
       await waitFor(() => {
-        expect(screen.getByTestId('organisations-count')).toHaveTextContent('1');
-      }, { timeout: 3000 });
+        const count = screen.getByTestId('organisations-count').textContent;
+        const error = screen.getByTestId('error').textContent;
+        // Log for debugging if test fails
+        if (count !== '1' || error !== 'no-error') {
+          console.log('Test state:', { count, error, isLoading: screen.getByTestId('isLoading').textContent });
+        }
+        expect(count).toBe('1');
+        expect(error).toBe('no-error');
+      }, { timeout: 15000, interval: 200 });
       
       expect(screen.getByTestId('isLoading')).toHaveTextContent('false');
       expect(screen.getByTestId('error')).toHaveTextContent('no-error');
@@ -169,10 +203,20 @@ describe('OrganisationProvider', () => {
       );
 
       // Wait for organisations to load and selected organisation to be set
+      // The service calls notify() in finally block, and useOrganisationService has 50ms debounce
+      // Also need to account for the 2 second minimum retry delay in loadUserOrganisations
       await waitFor(() => {
-        expect(screen.getByTestId('organisations-count')).toHaveTextContent('1');
-        expect(screen.getByTestId('selectedOrg')).not.toHaveTextContent('no-org');
-      }, { timeout: 3000 });
+        const count = screen.getByTestId('organisations-count').textContent;
+        const error = screen.getByTestId('error').textContent;
+        const selectedOrg = screen.getByTestId('selectedOrg').textContent;
+        // Log for debugging if test fails
+        if (count !== '1' || error !== 'no-error' || selectedOrg === 'no-org') {
+          console.log('Test state:', { count, error, selectedOrg, isLoading: screen.getByTestId('isLoading').textContent });
+        }
+        expect(count).toBe('1');
+        expect(error).toBe('no-error');
+        expect(selectedOrg).not.toBe('no-org');
+      }, { timeout: 15000, interval: 200 });
       
       expect(screen.getByTestId('organisations-count')).toHaveTextContent('1');
       expect(screen.getByTestId('isLoading')).toHaveTextContent('false');

package/src/providers/__tests__/ProviderLifecycle.test.tsx

@@ -7,7 +7,7 @@
  * Tests for provider lifecycle management, state persistence, cleanup, and edge cases.
  */
 
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, act } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import React, { ReactNode, useState } from 'react';
 import { createMockSupabaseClient } from '../../__tests__/helpers/supabaseMock';
@@ -88,8 +88,12 @@ describe('Provider Lifecycle Tests', () => {
     it('should cleanup subscription listeners', () => {
       const cleanup = vi.fn();
       const TestComponent = () => {
+        const cleanupRef = React.useRef(cleanup);
         React.useEffect(() => {
-          return cleanup;
+          // Return a function that calls cleanup from ref
+          return () => {
+            cleanupRef.current();
+          };
         }, []);
         return <div data-testid="listener-test">Test</div>;
       };
@@ -98,7 +102,9 @@ describe('Provider Lifecycle Tests', () => {
       
       expect(screen.getByTestId('listener-test')).toBeInTheDocument();
       
-      unmountComponent();
+      act(() => {
+        unmountComponent();
+      });
       
       // Cleanup should be called on unmount
       expect(cleanup).toHaveBeenCalled();
@@ -109,13 +115,22 @@ describe('Provider Lifecycle Tests', () => {
       const cleanup2 = vi.fn();
       
       const TestComponent = () => {
-        React.useEffect(() => cleanup1, []);
-        React.useEffect(() => cleanup2, []);
+        const cleanup1Ref = React.useRef(cleanup1);
+        const cleanup2Ref = React.useRef(cleanup2);
+        React.useEffect(() => {
+          return () => cleanup1Ref.current();
+        }, []);
+        React.useEffect(() => {
+          return () => cleanup2Ref.current();
+        }, []);
         return <div data-testid="multi-listener">Test</div>;
       };
 
       const { unmount: unmountComponent } = render(<TestComponent />);
-      unmountComponent();
+      
+      act(() => {
+        unmountComponent();
+      });
       
       expect(cleanup1).toHaveBeenCalled();
       expect(cleanup2).toHaveBeenCalled();

package/src/providers/__tests__/UnifiedAuthProvider.test.tsx

@@ -72,7 +72,7 @@ const TestComponent = () => {
 
 describe('UnifiedAuthProvider', () => {
   let mockSupabaseClient: ReturnType<typeof createMockSupabaseClient>;
-  const defaultProps = {
+  const baseProps = {
     idleTimeoutMs: 30 * 60 * 1000,
     warnBeforeMs: 60 * 1000,
     onIdleLogout: vi.fn(),
@@ -86,7 +86,7 @@ describe('UnifiedAuthProvider', () => {
   describe('Rendering', () => {
     it('renders without crashing', () => {
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} {...baseProps}>
           <TestComponent />
         </UnifiedAuthProvider>
       );
@@ -96,7 +96,7 @@ describe('UnifiedAuthProvider', () => {
 
     it('renders with custom app name', () => {
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Custom App" {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Custom App" {...baseProps}>
           <TestComponent />
         </UnifiedAuthProvider>
       );
@@ -118,7 +118,7 @@ describe('UnifiedAuthProvider', () => {
   describe('Context Values', () => {
     it('provides all required context values', async () => {
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...baseProps}>
           <TestComponent />
         </UnifiedAuthProvider>
       );
@@ -182,7 +182,7 @@ describe('UnifiedAuthProvider', () => {
 
     it('uses default configuration', () => {
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} {...baseProps}>
           <TestComponent />
         </UnifiedAuthProvider>
       );
@@ -207,7 +207,7 @@ describe('UnifiedAuthProvider', () => {
       };
 
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...baseProps}>
           <TestCompositionComponent />
         </UnifiedAuthProvider>
       );
@@ -236,7 +236,7 @@ describe('UnifiedAuthProvider', () => {
       };
 
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...baseProps}>
           <TestCompleteContextComponent />
         </UnifiedAuthProvider>
       );
@@ -428,7 +428,7 @@ describe('UnifiedAuthProvider', () => {
       };
 
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...baseProps}>
           <TestHookIntegrationComponent />
         </UnifiedAuthProvider>
       );
@@ -494,7 +494,7 @@ describe('UnifiedAuthProvider', () => {
       };
 
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" {...baseProps}>
           <TestConcurrentComponent />
         </UnifiedAuthProvider>
       );
@@ -554,7 +554,7 @@ describe('UnifiedAuthProvider', () => {
       };
 
       render(
-        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" enableRBAC={true} {...defaultProps}>
+        <UnifiedAuthProvider supabaseClient={mockSupabaseClient} appName="Test App" enableRBAC={true} {...baseProps}>
           <TestRBACConfigComponent />
         </UnifiedAuthProvider>
       );

package/src/providers/services/UnifiedAuthProvider.tsx

@@ -526,31 +526,31 @@ function UnifiedAuthContextProvider({
   
   const hasErrors = !!(authError || organisationError || eventError || sessionRestoration.restorationError);
 
-  // Create stable references for all methods using useCallback
-  const signIn = useCallback((email: string, password?: string) => authService.signIn(email, password), [authService]);
-  const signUp = useCallback((email: string, password: string) => authService.signUp(email, password), [authService]);
-  const signOut = useCallback(() => authService.signOut(), [authService]);
-  const resetPassword = useCallback((email: string) => authService.resetPassword(email), [authService]);
-  const updatePassword = useCallback((password: string) => authService.updatePassword(password), [authService]);
-  const refreshSession = useCallback(() => authService.refreshSession(), [authService]);
+  // React Compiler handles memoization automatically
+  const signIn = (email: string, password?: string) => authService.signIn(email, password);
+  const signUp = (email: string, password: string) => authService.signUp(email, password);
+  const signOut = () => authService.signOut();
+  const resetPassword = (email: string) => authService.resetPassword(email);
+  const updatePassword = (password: string) => authService.updatePassword(password);
+  const refreshSession = () => authService.refreshSession();
   
-  const switchOrganisation = useCallback((orgId: string) => organisationService.switchOrganisation(orgId), [organisationService]);
-  const getUserRole = useCallback((orgId?: string) => organisationService.getUserRole(orgId), [organisationService]);
-  const validateOrganisationAccess = useCallback((orgId: string) => organisationService.validateOrganisationAccess(orgId), [organisationService]);
-  const refreshOrganisations = useCallback(() => organisationService.refreshOrganisations(), [organisationService]);
-  const ensureOrganisationContext = useCallback(() => organisationService.ensureOrganisationContext(), [organisationService]);
-  const isOrganisationSecure = useCallback(() => organisationService.isOrganisationSecure(), [organisationService]);
-  const getPrimaryOrganisation = useCallback(() => organisationService.getPrimaryOrganisation(), [organisationService]);
+  const switchOrganisation = (orgId: string) => organisationService.switchOrganisation(orgId);
+  const getUserRole = (orgId?: string) => organisationService.getUserRole(orgId);
+  const validateOrganisationAccess = (orgId: string) => organisationService.validateOrganisationAccess(orgId);
+  const refreshOrganisations = () => organisationService.refreshOrganisations();
+  const ensureOrganisationContext = () => organisationService.ensureOrganisationContext();
+  const isOrganisationSecure = () => organisationService.isOrganisationSecure();
+  const getPrimaryOrganisation = () => organisationService.getPrimaryOrganisation();
   
-  const setSelectedEvent = useCallback((event: Event | null) => eventService.setSelectedEvent(event), [eventService]);
-  const refreshEvents = useCallback(() => eventService.refreshEvents(), [eventService]);
+  const setSelectedEvent = (event: Event | null) => eventService.setSelectedEvent(event);
+  const refreshEvents = () => eventService.refreshEvents();
   
-  const resetActivity = useCallback(() => inactivityService.resetActivity(), [inactivityService]);
-  const startTracking = useCallback(() => inactivityService.startTracking(), [inactivityService]);
-  const stopTracking = useCallback(() => inactivityService.stopTracking(), [inactivityService]);
-  const handleIdleLogout = useCallback(() => inactivityService.handleIdleLogout(), [inactivityService]);
-  const handleStaySignedIn = useCallback(() => inactivityService.handleStaySignedIn(), [inactivityService]);
-  const handleSignOutNow = useCallback(() => inactivityService.handleSignOutNow(), [inactivityService]);
+  const resetActivity = () => inactivityService.resetActivity();
+  const startTracking = () => inactivityService.startTracking();
+  const stopTracking = () => inactivityService.stopTracking();
+  const handleIdleLogout = () => inactivityService.handleIdleLogout();
+  const handleStaySignedIn = () => inactivityService.handleStaySignedIn();
+  const handleSignOutNow = () => inactivityService.handleSignOutNow();
 
   // Use ref to track previous state for conditional logging (dev only)
   const prevStateRef = useRef<{

package/src/providers/services/__tests__/AuthServiceProvider.integration.test.tsx

@@ -9,7 +9,7 @@
  */
 
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor, act } from '@testing-library/react';
 import React from 'react';
 import { AuthServiceProvider } from '../AuthServiceProvider';
 import { useAuthService } from '../../../hooks/services/useAuthService';
@@ -195,16 +195,26 @@ describe('AuthServiceProvider Integration', () => {
       }, { interval: 10 });
 
       // Simulate auth state change using the captured callback
+      // Supabase auth state change callback receives (event, session) as arguments
       if (capturedCallback) {
+        // Call the callback - AuthService will update state and notify subscribers
+        // The callback is synchronous, but notify() triggers subscribers which have debounce
         capturedCallback('SIGNED_IN', mockSession);
+        
+        // Wait for debounced subscriber updates (50ms debounce in useAuthService)
+        // The test component subscribes directly, so we need to wait for the debounce
+        await act(async () => {
+          await new Promise(resolve => setTimeout(resolve, 150));
+        });
       }
 
-      // Wait for UI updates after state change
+      // Wait for UI updates after state change - need longer timeout for async updates
+      // The debounce in useAuthService adds a 50ms delay, so we need to wait longer
       await waitFor(() => {
         expect(screen.getByTestId('user-id')).toHaveTextContent('test-user-id');
         expect(screen.getByTestId('is-authenticated')).toHaveTextContent('true');
         expect(screen.getByTestId('is-loading')).toHaveTextContent('false');
-      }, { interval: 10 });
+      }, { interval: 50, timeout: 10000 });
     });
   });
 

package/src/rbac/__tests__/adapters.comprehensive.test.tsx

@@ -91,7 +91,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
   });
 
   describe('PermissionGuard Component', () => {
-    const defaultProps = {
+    const baseProps = {
       userId: 'user-123' as UUID,
       scope: { organisationId: 'org-123' as UUID },
       permission: 'read:users' as Permission,
@@ -106,7 +106,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} />);
+        render(<PermissionGuard {...baseProps} />);
         
         expect(screen.getByText('Protected Content')).toBeInTheDocument();
       });
@@ -119,7 +119,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
         });
 
         const fallback = <div>Access Denied</div>;
-        render(<PermissionGuard {...defaultProps} fallback={fallback} />);
+        render(<PermissionGuard {...baseProps} fallback={fallback} />);
         
         expect(screen.getByText('Access Denied')).toBeInTheDocument();
         expect(screen.queryByText('Protected Content')).not.toBeInTheDocument();
@@ -133,7 +133,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
         });
 
         const loading = <div>Checking permissions...</div>;
-        render(<PermissionGuard {...defaultProps} loading={loading} />);
+        render(<PermissionGuard {...baseProps} loading={loading} />);
         
         expect(screen.getByText('Checking permissions...')).toBeInTheDocument();
         expect(screen.queryByText('Protected Content')).not.toBeInTheDocument();
@@ -146,7 +146,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} />);
+        render(<PermissionGuard {...baseProps} />);
         
         expect(screen.getByRole('status')).toBeInTheDocument();
         expect(screen.getByText('Checking permissions...')).toBeInTheDocument();
@@ -160,7 +160,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
         });
 
         const fallback = <div>Error occurred</div>;
-        render(<PermissionGuard {...defaultProps} fallback={fallback} />);
+        render(<PermissionGuard {...baseProps} fallback={fallback} />);
         
         expect(screen.getByText('Error occurred')).toBeInTheDocument();
         expect(screen.queryByText('Protected Content')).not.toBeInTheDocument();
@@ -180,7 +180,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <PermissionGuard
-            {...defaultProps}
+            {...baseProps}
             userId={'' as any}
             fallback={<div>No Access</div>}
           />
@@ -202,7 +202,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <PermissionGuard
-            {...defaultProps}
+            {...baseProps}
             userId={'' as any}
             fallback={<div>No Access</div>}
           />
@@ -221,7 +221,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} onDenied={onDenied} />);
+        render(<PermissionGuard {...baseProps} onDenied={onDenied} />);
         
         expect(onDenied).toHaveBeenCalledTimes(1);
       });
@@ -234,7 +234,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} onDenied={onDenied} />);
+        render(<PermissionGuard {...baseProps} onDenied={onDenied} />);
         
         expect(onDenied).not.toHaveBeenCalled();
       });
@@ -255,7 +255,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} auditLog={true} />);
+        render(<PermissionGuard {...baseProps} auditLog={true} />);
         
         // Note: Audit logging is currently commented out in PermissionGuard
         // The component checks auditLog but doesn't actually log - this is expected behavior
@@ -278,7 +278,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} auditLog={true} />);
+        render(<PermissionGuard {...baseProps} auditLog={true} />);
         
         // Note: Audit logging is currently commented out in PermissionGuard
         // The component checks auditLog but doesn't actually log - this is expected behavior
@@ -301,7 +301,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<PermissionGuard {...defaultProps} strictMode={true} />);
+        render(<PermissionGuard {...baseProps} strictMode={true} />);
         
         expect(mockLoggerInstance.error).toHaveBeenCalledWith(
           expect.stringContaining('STRICT MODE VIOLATION:'),
@@ -316,7 +316,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
   });
 
   describe('AccessLevelGuard Component', () => {
-    const defaultProps = {
+    const baseProps = {
       userId: 'user-123' as UUID,
       scope: { organisationId: 'org-123' as UUID },
       minLevel: 'admin' as const,
@@ -331,7 +331,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<AccessLevelGuard {...defaultProps} />);
+        render(<AccessLevelGuard {...baseProps} />);
         
         expect(screen.getByText('Admin Content')).toBeInTheDocument();
       });
@@ -344,7 +344,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
         });
 
         const fallback = <div>Insufficient Access</div>;
-        render(<AccessLevelGuard {...defaultProps} fallback={fallback} />);
+        render(<AccessLevelGuard {...baseProps} fallback={fallback} />);
         
         expect(screen.getByText('Insufficient Access')).toBeInTheDocument();
         expect(screen.queryByText('Admin Content')).not.toBeInTheDocument();
@@ -358,7 +358,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
         });
 
         const loading = <div>Checking access level...</div>;
-        render(<AccessLevelGuard {...defaultProps} loading={loading} />);
+        render(<AccessLevelGuard {...baseProps} loading={loading} />);
         
         expect(screen.getByText('Checking access level...')).toBeInTheDocument();
         expect(screen.queryByText('Admin Content')).not.toBeInTheDocument();
@@ -372,7 +372,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
         });
 
         const fallback = <div>Error occurred</div>;
-        render(<AccessLevelGuard {...defaultProps} fallback={fallback} />);
+        render(<AccessLevelGuard {...baseProps} fallback={fallback} />);
         
         expect(screen.getByText('Error occurred')).toBeInTheDocument();
         expect(screen.queryByText('Admin Content')).not.toBeInTheDocument();
@@ -387,7 +387,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<AccessLevelGuard {...defaultProps} minLevel="admin" />);
+        render(<AccessLevelGuard {...baseProps} minLevel="admin" />);
         
         expect(screen.getByText('Admin Content')).toBeInTheDocument();
       });
@@ -399,7 +399,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<AccessLevelGuard {...defaultProps} minLevel="admin" />);
+        render(<AccessLevelGuard {...baseProps} minLevel="admin" />);
         
         expect(screen.getByText('Admin Content')).toBeInTheDocument();
       });
@@ -411,7 +411,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<AccessLevelGuard {...defaultProps} minLevel="admin" />);
+        render(<AccessLevelGuard {...baseProps} minLevel="admin" />);
         
         expect(screen.queryByText('Admin Content')).not.toBeInTheDocument();
       });
@@ -423,7 +423,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
           error: null,
         });
 
-        render(<AccessLevelGuard {...defaultProps} minLevel="planner" />);
+        render(<AccessLevelGuard {...baseProps} minLevel="planner" />);
         
         expect(screen.getByText('Admin Content')).toBeInTheDocument();
       });
@@ -439,7 +439,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <AccessLevelGuard
-            {...defaultProps}
+            {...baseProps}
             userId={'' as any}
             minLevel="admin"
             fallback={<div>No Access</div>}
@@ -462,7 +462,7 @@ describe('RBAC Adapters - Comprehensive Tests', () => {
 
         render(
           <AccessLevelGuard
-            {...defaultProps}
+            {...baseProps}
             userId={'' as any}
             minLevel="admin"
             fallback={<div>No Access</div>}

package/src/rbac/components/EnhancedNavigationMenu.tsx

@@ -49,7 +49,7 @@
  * - Efficient filtering
  *
  * @dependencies
- * - React 18+ - Component framework
+ * - React 19+ - Component framework
  * - NavigationProvider - Navigation permission context
  * - NavigationGuard - Individual navigation item protection
  * - RBAC types - Type definitions

package/src/rbac/components/NavigationGuard.tsx

@@ -58,7 +58,7 @@
  * - Efficient error handling
  *
  * @dependencies
- * - React 18+ - Component framework
+ * - React 19+ - Component framework
  * - useCan hook - Permission checking
  * - useUnifiedAuth - Authentication context
  * - RBAC types - Type definitions

package/src/rbac/components/NavigationProvider.tsx

@@ -49,7 +49,7 @@
  * - Cached permission checks
  *
  * @dependencies
- * - React 18+ - Context and hooks
+ * - React 19+ - Context and hooks
  * - useUnifiedAuth - Authentication context
  * - RBAC types - Type definitions
  */