@jmruthers/pace-core 0.5.135 → 0.5.137

package/src/hooks/useDataTablePerformance.ts

@@ -34,6 +34,7 @@ import {
   DEFAULT_FALLBACK_CONFIG,
   type FallbackConfig
 } from '../components/DataTable/utils/errorHandling';
+import { logger } from '../utils/core/logger';
 
 export interface UseDataTablePerformanceOptions<TData extends DataRecord> {
   data: TData[];
@@ -236,7 +237,7 @@ export function useDataTablePerformance<TData extends DataRecord>({
       const response = await serverSide.fetchData(params);
       setServerData(response);
     } catch (error) {
-      console.error('Failed to fetch server data:', error);
+      logger.error('useDataTablePerformance', 'Failed to fetch server data:', error);
     } finally {
       setIsLoading(false);
     }
@@ -310,7 +311,7 @@ export function useDataTablePerformance<TData extends DataRecord>({
         onError?.(error);
         return recovery;
       } catch (recoveryError) {
-        console.error('Error recovery failed:', recoveryError);
+        logger.error('useDataTablePerformance', 'Error recovery failed:', recoveryError);
       }
     }
     throw error;
@@ -323,7 +324,7 @@ export function useDataTablePerformance<TData extends DataRecord>({
         setLastFailedOperation(null);
         setErrorState(prev => ({ ...prev, hasErrors: false }));
       } catch (error) {
-        console.error('Retry failed:', error);
+        logger.error('useDataTablePerformance', 'Retry failed:', error);
       }
     }
   }, [lastFailedOperation]);

package/src/hooks/useEventTheme.test.ts

@@ -23,6 +23,20 @@ vi.mock('../theming/runtime', () => ({
   clearPalette: vi.fn()
 }));
 
+// Mock the Logger module
+vi.mock('../utils/core/logger', () => {
+  const mockLoggerInstance = {
+    error: vi.fn(),
+  };
+  return {
+    createLogger: vi.fn(() => mockLoggerInstance),
+  };
+});
+
+// Get the mock instance after mock is set up
+import { createLogger } from '../utils/core/logger';
+const getMockLogger = () => createLogger('test');
+
 // Mock react-router-dom useLocation
 vi.mock('react-router-dom', () => ({
   useLocation: vi.fn(() => ({
@@ -254,7 +268,7 @@ describe('useEventTheme', () => {
 
   describe('Error handling', () => {
     it('handles errors when applying palette', () => {
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      vi.clearAllMocks();
       
       mockUseEvents.mockReturnValue({
         selectedEvent: {
@@ -276,12 +290,11 @@ describe('useEventTheme', () => {
 
       renderHook(() => useEventTheme());
 
-      expect(consoleSpy).toHaveBeenCalledWith(
-        '[useEventTheme] Failed to apply event palette:',
+      const logger = getMockLogger();
+      expect(vi.mocked(logger.error)).toHaveBeenCalledWith(
+        'Failed to apply event palette:',
         expect.any(Error)
       );
-
-      consoleSpy.mockRestore();
     });
   });
 

package/src/hooks/useEventTheme.ts

@@ -44,6 +44,9 @@ import { useEvents } from './useEvents';
 import { applyPalette, clearPalette } from '../theming/runtime';
 import { parseAndNormalizeEventColours } from '../theming/parseEventColours';
 import type { Event } from '../types/unified';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('useEventTheme');
 
 /**
  * Hook that automatically applies event-specific theming
@@ -147,7 +150,7 @@ export function useEventTheme(event?: Event | null): void {
     try {
       applyPalette(normalized);
     } catch (error) {
-      console.error('[useEventTheme] Failed to apply event palette:', error);
+      log.error('Failed to apply event palette:', error);
     }
 
     // Cleanup function to clear palette when component unmounts or event changes

package/src/hooks/useEvents.ts

@@ -21,6 +21,7 @@ export interface EventContextType {
   error: Error | null;
   setSelectedEvent: (event: Event | null) => void;
   refreshEvents: () => Promise<void>;
+  clearEventSelection: () => Promise<void>;
 }
 
 /**
@@ -58,6 +59,7 @@ export function useEvents(): EventContextType {
     error: eventService.getError(),
     setSelectedEvent: (event: Event | null) => eventService.setSelectedEvent(event),
     refreshEvents: () => eventService.refreshEvents(),
+    clearEventSelection: () => eventService.clearEventSelection(),
   };
 }
 

package/src/hooks/useFileDisplay.ts

@@ -39,6 +39,7 @@ import type { SupabaseClient } from '@supabase/supabase-js';
 import { FileReference, FileCategory } from '../types/file-reference';
 import { getPublicUrl, getSignedUrl } from '../utils/storage/helpers';
 import { createFileReferenceService } from '../utils/file-reference';
+import { logger } from '../utils/core/logger';
 
 // Simple in-memory cache for authenticated file data
 const authenticatedFileCache = new Map<string, { data: any; timestamp: number; ttl: number }>();
@@ -147,7 +148,7 @@ export function useFileDisplay(
     // Validate UUID format for organisationId to prevent database errors
     const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
     if (!uuidRegex.test(organisation_id)) {
-      console.warn('[useFileDisplay] Invalid organisationId format (not a valid UUID):', organisation_id);
+      logger.warn('useFileDisplay', 'Invalid organisationId format (not a valid UUID):', organisation_id);
     }
 
     // Check cache first
@@ -178,7 +179,7 @@ export function useFileDisplay(
             return;
           } catch (err) {
             // If signed URL regeneration fails, fall through to normal fetch
-            console.warn('[useFileDisplay] Failed to regenerate signed URL from cache, falling back to fetch:', err);
+            logger.warn('useFileDisplay', 'Failed to regenerate signed URL from cache, falling back to fetch:', err);
           }
         }
         
@@ -205,7 +206,7 @@ export function useFileDisplay(
       // Category is stored in file_metadata JSONB field, not a direct column
       if (category) {
         // Single file mode - get files by category using RPC
-        console.log('[useFileDisplay] Using RPC function for category filtering:', {
+        logger.debug('useFileDisplay', 'Using RPC function for category filtering:', {
           table_name,
           record_id,
           category,
@@ -251,7 +252,7 @@ export function useFileDisplay(
       if (category && files.length > 0) {
         // Single file mode - get first file
         const firstFile = files[0];
-        console.log('[useFileDisplay] Processing category files, first file:', {
+        logger.debug('useFileDisplay', 'Processing category files, first file:', {
           id: firstFile.id,
           file_path: firstFile.file_path,
           is_public: firstFile.is_public,
@@ -265,7 +266,7 @@ export function useFileDisplay(
         let url: string | null = null;
         if (firstFile.is_public) {
           url = getPublicUrl(supabase, firstFile.file_path, true);
-          console.log('[useFileDisplay] Generated public URL:', url);
+          logger.debug('useFileDisplay', 'Generated public URL:', url);
         } else {
           const signedUrlResult = await getSignedUrl(supabase, firstFile.file_path, {
             appName: 'pace-core',
@@ -273,9 +274,9 @@ export function useFileDisplay(
             expiresIn: 3600
           });
           url = signedUrlResult?.url || null;
-          console.log('[useFileDisplay] Generated signed URL:', url ? 'URL generated' : 'URL generation failed');
+          logger.debug('useFileDisplay', 'Generated signed URL:', url ? 'URL generated' : 'URL generation failed');
         }
-        console.log('[useFileDisplay] Setting file URL:', url ? 'URL set' : 'URL is null');
+        logger.debug('useFileDisplay', 'Setting file URL:', url ? 'URL set' : 'URL is null');
         setFileUrl(url);
       } else {
         // Multiple files mode - generate URLs for all files
@@ -340,7 +341,7 @@ export function useFileDisplay(
       }
 
     } catch (err) {
-      console.error('[useFileDisplay] Error fetching files:', err);
+      logger.error('useFileDisplay', 'Error fetching files:', err);
       const error = err instanceof Error ? err : new Error('Unknown error occurred');
       setError(error);
       setFileUrl(null);

package/src/hooks/useFileReference.ts

@@ -12,6 +12,9 @@ import {
 } from '../types/file-reference';
 import { createFileReferenceService, uploadFileWithReference } from '../utils/file-reference';
 import { getPublicUrl, getSignedUrl } from '../utils/storage/helpers';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('useFileReference');
 
 export function useFileReference(supabase: SupabaseClient) {
   const [isLoading, setIsLoading] = useState(false);
@@ -422,7 +425,7 @@ export function useFilesByCategory(
           urlMap.set(fileRef.id, url);
         }
       } catch (err) {
-        console.error(`Failed to load URL for file ${fileRef.id}:`, err);
+        log.error(`Failed to load URL for file ${fileRef.id}:`, err);
       }
     }
     

package/src/hooks/useFileUrl.ts

@@ -11,6 +11,9 @@ import { useState, useEffect, useCallback, useRef } from 'react';
 import { SupabaseClient } from '@supabase/supabase-js';
 import { FileReference } from '../types/file-reference';
 import { getPublicUrl, getSignedUrl } from '../utils/storage/helpers';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('useFileUrl');
 
 export interface UseFileUrlOptions {
   /** Organisation ID for signed URL generation */
@@ -91,7 +94,7 @@ export function useFileUrl(
       const error = err instanceof Error ? err : new Error('Failed to generate file URL');
       setError(error);
       setUrl(null);
-      console.error('[useFileUrl] Error generating URL:', error);
+      log.error('Error generating URL:', error);
     } finally {
       setIsLoading(false);
     }

package/src/hooks/useInactivityTracker.ts

@@ -53,6 +53,7 @@
  */
 
 import { useState, useEffect, useCallback, useRef } from 'react';
+import { logger } from '../utils/core/logger';
 
 export interface UseInactivityTrackerOptions {
   /** Timeout in milliseconds before user is considered idle (default: 30 minutes) */
@@ -221,7 +222,7 @@ export function useInactivityTracker({
     try {
       localStorage.setItem(storageKey, now.toString());
     } catch (error) {
-      console.warn('[useInactivityTracker] Failed to persist activity time:', error);
+      logger.warn('useInactivityTracker', 'Failed to persist activity time:', error);
     }
 
     // Broadcast activity to other tabs
@@ -230,7 +231,7 @@ export function useInactivityTracker({
         channelRef.current.postMessage({ type: 'activity', timestamp: now });
       }
     } catch (error) {
-      console.warn('[useInactivityTracker] Failed to broadcast activity:', error);
+      logger.warn('useInactivityTracker', 'Failed to broadcast activity:', error);
     }
   }, [enabled, idleTimeoutMs, warnBeforeMs, onIdle, onWarning, onActivity, storageKey, clearTimers]);
 
@@ -261,7 +262,7 @@ export function useInactivityTracker({
         };
       }
     } catch (error) {
-      console.warn('[useInactivityTracker] Failed to set up cross-tab communication:', error);
+      logger.warn('useInactivityTracker', 'Failed to set up cross-tab communication:', error);
     }
 
     // Check for persisted activity time
@@ -290,7 +291,7 @@ export function useInactivityTracker({
         }
       }
     } catch (error) {
-      console.warn('[useInactivityTracker] Failed to check persisted activity time:', error);
+      logger.warn('useInactivityTracker', 'Failed to check persisted activity time:', error);
     }
 
     // Set up throttled activity handler

package/src/hooks/useOrganisationSecurity.test.ts

@@ -12,6 +12,7 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { useOrganisationSecurity } from './useOrganisationSecurity';
 import { useUnifiedAuth } from '../providers';
 import { useOrganisations } from './useOrganisations';
+import { Logger, LogLevel } from '../utils/core/logger';
 
 // Mock the providers
 vi.mock('../providers', () => ({
@@ -44,6 +45,7 @@ describe('useOrganisationSecurity', () => {
   const mockIsSuperAdmin = vi.mocked(isSuperAdmin);
   const mockGetPermissionMap = vi.mocked(getPermissionMap);
   const mockEmitAuditEvent = vi.mocked(emitAuditEvent);
+  let originalMode: string | undefined;
 
   const mockUser = {
     id: 'user-123',
@@ -82,6 +84,17 @@ describe('useOrganisationSecurity', () => {
   };
 
   beforeEach(() => {
+    // Ensure logger is enabled by setting MODE to development
+    originalMode = import.meta.env.MODE;
+    (import.meta.env as any).MODE = 'development';
+    
+    // Configure logger to ensure it logs in test environment
+    Logger.configure({
+      level: LogLevel.DEBUG,
+      includeTimestamp: false,
+      includeComponent: true,
+    });
+    
     // Clear all mocks but preserve the structure
     mockUseUnifiedAuth.mockClear();
     mockUseOrganisations.mockClear();
@@ -535,18 +548,18 @@ describe('useOrganisationSecurity', () => {
       mockIsSuperAdmin.mockResolvedValue(false);
       mockIsPermitted.mockRejectedValue(new Error('Permission check failed'));
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
       const { result } = renderHook(() => useOrganisationSecurity());
 
       const hasPermission = await result.current.hasPermission('read:users');
       expect(hasPermission).toBe(false);
-      expect(consoleSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Exception checking permission'),
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[ERROR] [useOrganisationSecurity] Exception checking permission'),
         expect.any(Error)
       );
 
-      consoleSpy.mockRestore();
+      consoleErrorSpy.mockRestore();
     });
   });
 
@@ -611,18 +624,18 @@ describe('useOrganisationSecurity', () => {
       mockIsSuperAdmin.mockResolvedValue(false);
       mockIsPermitted.mockRejectedValue(new Error('Permission retrieval failed'));
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
       const { result } = renderHook(() => useOrganisationSecurity());
 
       const permissions = await result.current.getUserPermissions();
       expect(permissions).toEqual([]);
-      expect(consoleSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Exception getting user permissions'),
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[ERROR] [useOrganisationSecurity] Exception getting user permissions'),
         expect.any(Error)
       );
 
-      consoleSpy.mockRestore();
+      consoleErrorSpy.mockRestore();
     });
   });
 
@@ -719,18 +732,18 @@ describe('useOrganisationSecurity', () => {
 
       mockSingle.mockRejectedValue(new Error('Validation failed'));
 
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
       const { result } = renderHook(() => useOrganisationSecurity());
 
       const isValid = await result.current.validateUserAccess('user-123', 'org-123');
       expect(isValid).toBe(false);
-      expect(consoleSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Exception validating organisation access'),
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[ERROR] [useOrganisationSecurity] Exception validating organisation access'),
         expect.any(Error)
       );
 
-      consoleSpy.mockRestore();
+      consoleErrorSpy.mockRestore();
     });
   });
 
@@ -768,4 +781,12 @@ describe('useOrganisationSecurity', () => {
       expect(result.current.hasMinimumRole('member')).toBe(false);
     });
   });
+
+  afterEach(() => {
+    // Restore original mode
+    if (originalMode !== undefined) {
+      (import.meta.env as any).MODE = originalMode;
+    }
+    vi.clearAllMocks();
+  });
 });

package/src/hooks/useOrganisationSecurity.ts

@@ -14,6 +14,7 @@ import { useOrganisations } from './useOrganisations';
 // Legacy useRBAC hook removed - use new RBAC system instead
 import type { OrganisationSecurityError, SuperAdminContext } from '../types/organisation';
 import type { Permission } from '../rbac/types';
+import { logger } from '../utils/core/logger';
 
 export interface OrganisationSecurityHook {
   // Super admin context
@@ -66,7 +67,7 @@ export const useOrganisationSecurity = (): OrganisationSecurityHook => {
 
         setIsSuperAdmin(!error && data && data.length > 0);
       } catch (error) {
-        console.error('[useOrganisationSecurity] Error checking super admin status:', error);
+        logger.error('useOrganisationSecurity', 'Error checking super admin status:', error);
         setIsSuperAdmin(false);
       } finally {
         setIsCheckingSuperAdmin(false);
@@ -107,13 +108,13 @@ export const useOrganisationSecurity = (): OrganisationSecurityHook => {
         .single();
 
       if (error) {
-        console.error('[useOrganisationSecurity] Error validating organisation access:', error);
+        logger.error('useOrganisationSecurity', 'Error validating organisation access:', error);
         return false;
       }
 
       return !!data;
     } catch (error) {
-      console.error('[useOrganisationSecurity] Exception validating organisation access:', error);
+      logger.error('useOrganisationSecurity', 'Exception validating organisation access:', error);
       return false;
     }
   }, [user, session, supabase, superAdminContext.isSuperAdmin]);
@@ -177,7 +178,7 @@ export const useOrganisationSecurity = (): OrganisationSecurityHook => {
         permission: permission as Permission
       });
     } catch (error) {
-      console.error('[useOrganisationSecurity] Exception checking permission:', error);
+      logger.error('useOrganisationSecurity', 'Exception checking permission:', error);
       return false;
     }
   }, [selectedOrganisation, user, superAdminContext.isSuperAdmin]);
@@ -213,7 +214,7 @@ export const useOrganisationSecurity = (): OrganisationSecurityHook => {
         .map(([permission]) => permission);
       return [...new Set(allPermissions)]; // Remove duplicates
     } catch (error) {
-      console.error('[useOrganisationSecurity] Exception getting user permissions:', error);
+      logger.error('useOrganisationSecurity', 'Exception getting user permissions:', error);
       return [];
     }
   }, [selectedOrganisation, user, getUserRole, superAdminContext.isSuperAdmin]);
@@ -239,7 +240,7 @@ export const useOrganisationSecurity = (): OrganisationSecurityHook => {
         });
       }
     } catch (error) {
-      console.error('[useOrganisationSecurity] Error logging organisation access:', error);
+      logger.error('useOrganisationSecurity', 'Error logging organisation access:', error);
     }
   }, [user, selectedOrganisation]);
 
@@ -274,7 +275,7 @@ export const useOrganisationSecurity = (): OrganisationSecurityHook => {
 
       return await validateOrganisationAccess(orgId);
     } catch (error) {
-      console.error('[useOrganisationSecurity] Exception validating user access:', error);
+      logger.error('useOrganisationSecurity', 'Exception validating user access:', error);
       return false;
     }
   }, [supabase, superAdminContext.isSuperAdmin, user, validateOrganisationAccess]);

package/src/hooks/usePerformanceMonitor.ts

@@ -1,6 +1,9 @@
 
 import { useEffect, useRef, useCallback } from 'react';
-import { performanceBudgetMonitor, PERFORMANCE_BUDGETS } from '../utils/performanceBudgets';
+import { performanceBudgetMonitor, PERFORMANCE_BUDGETS } from '../utils/performance/performanceBudgets';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('usePerformanceMonitor');
 
 export interface PerformanceMetrics {
   renderTime: number;
@@ -54,8 +57,8 @@ export function usePerformanceMonitor(
     
     // Log slow renders in development
     if (!measurement.passed) {
-      console.warn(
-        `🐌 Performance budget exceeded in ${componentName}: ${renderTime.toFixed(2)}ms ` +
+      log.warn(
+        `Performance budget exceeded in ${componentName}: ${renderTime.toFixed(2)}ms ` +
         `(budget: ${PERFORMANCE_BUDGETS[budgetName]?.threshold}ms)`
       );
     }

package/src/hooks/usePermissionCache.ts

@@ -59,6 +59,7 @@ import { useUnifiedAuth } from '../providers/UnifiedAuthProvider';
 import { useOrganisations } from './useOrganisations';
 import { useEvents } from './useEvents';
 import { isPermittedCached } from '../rbac/api';
+import { logger } from '../utils/core/logger';
 import type { Operation, Permission, Scope, UUID } from '../rbac/types';
 
 // Cache entry interface
@@ -213,12 +214,15 @@ export function usePermissionCache(config: Partial<CacheConfig> = {}) {
   ): Promise<boolean> => {
     // Validate parameters
     if (!operation || !pageId) {
-      console.warn('[PermissionCache] Invalid parameters: operation and pageId are required');
+      logger.warn('PermissionCache', 'Invalid parameters: operation and pageId are required', { operation, pageId });
       return false;
     }
 
     if (!user?.id || !scope.organisationId) {
-      console.warn('[PermissionCache] User or organisation context not available - permission check failed');
+      logger.warn('PermissionCache', 'User or organisation context not available - permission check failed', { 
+        hasUserId: !!user?.id, 
+        hasOrganisationId: !!scope.organisationId 
+      });
       return false;
     }
 
@@ -278,7 +282,7 @@ export function usePermissionCache(config: Partial<CacheConfig> = {}) {
         logPermissionCheck(operation, pageId, result, false, responseTime);
         return result;
       } catch (error) {
-        console.error(`[PermissionCache] Error checking permission ${operation}:${pageId}:`, error);
+        logger.error('PermissionCache', `Error checking permission ${operation}:${pageId}`, { operation, pageId, error });
         return false;
       } finally {
         // Remove the promise from cache after completion
@@ -299,12 +303,15 @@ export function usePermissionCache(config: Partial<CacheConfig> = {}) {
   ): Promise<PermissionResult[]> => {
     // Validate parameters
     if (!permissions || !Array.isArray(permissions) || permissions.length === 0) {
-      console.warn('[PermissionCache] Invalid permissions array');
+      logger.warn('PermissionCache', 'Invalid permissions array', { permissions });
       return [];
     }
 
     if (!user?.id || !scope.organisationId) {
-      console.warn('[PermissionCache] User or organisation context not available - permission checks failed');
+      logger.warn('PermissionCache', 'User or organisation context not available - permission checks failed', {
+        hasUserId: !!user?.id,
+        hasOrganisationId: !!scope.organisationId
+      });
       return permissions.map(([operation, pageId]) => ({
         operation,
         pageId,
@@ -388,7 +395,7 @@ export function usePermissionCache(config: Partial<CacheConfig> = {}) {
           
           stats.current.cacheMisses++;
         } catch (error) {
-          console.error(`[PermissionCache] Error checking permission ${operation}:${pageId}:`, error);
+          logger.error('PermissionCache', `Error checking permission ${operation}:${pageId}`, { operation, pageId, error });
           results[originalIndex] = {
             operation,
             pageId,

package/src/hooks/useSecureDataAccess.test.ts

@@ -12,7 +12,7 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { useSecureDataAccess } from './useSecureDataAccess';
 import { useUnifiedAuth } from '../providers';
 import { useOrganisations } from './useOrganisations';
-import { setOrganisationContext } from '../utils/organisationContext';
+import { setOrganisationContext } from '../utils/context/organisationContext';
 import { createMockSupabaseClient, createMockQueryBuilderWithData } from '../__tests__/helpers/supabaseMock';
 
 // Mock the providers
@@ -25,7 +25,7 @@ vi.mock('./useOrganisations', () => ({
 }));
 
 // Mock the organisation context utility
-vi.mock('../utils/organisationContext', () => ({
+vi.mock('../utils/context/organisationContext', () => ({
   setOrganisationContext: vi.fn()
 }));
 

package/src/hooks/useSecureDataAccess.ts

@@ -55,7 +55,8 @@ import { useCallback, useState, useContext } from 'react';
 import { useUnifiedAuth } from '../providers';
 import { useOrganisations } from './useOrganisations';
 import { EventServiceContext } from '../providers/services/EventServiceProvider';
-import { setOrganisationContext } from '../utils/organisationContext';
+import { setOrganisationContext } from '../utils/context/organisationContext';
+import { logger } from '../utils/core/logger';
 import type { Permission } from '../rbac/types';
 import type { OrganisationSecurityError } from '../types/organisation';
 
@@ -261,7 +262,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
     const { data, error } = await query;
     
     if (error) {
-      console.error('[useSecureDataAccess] Query failed:', error);
+      logger.error('useSecureDataAccess', 'Query failed', { table, columns, filters, error });
       // NEW: Phase 1 - Record failed data access attempt
       recordDataAccess(table, 'read', false, `SELECT ${columns} FROM ${table}`, filters);
       throw error;
@@ -296,7 +297,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
       .single();
 
     if (error) {
-      console.error('[useSecureDataAccess] Insert failed:', error);
+      logger.error('useSecureDataAccess', 'Insert failed', { table, data: secureData, error });
       throw error;
     }
 
@@ -346,7 +347,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
     const { data: updateData, error } = await query.select();
 
     if (error) {
-      console.error('[useSecureDataAccess] Update failed:', error);
+      logger.error('useSecureDataAccess', 'Update failed', { table, data: secureData, filters, error });
       throw error;
     }
 
@@ -402,7 +403,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
     const { error } = await query;
 
     if (error) {
-      console.error('[useSecureDataAccess] Delete failed:', error);
+      logger.error('useSecureDataAccess', 'Delete failed', { table, filters, error });
       throw error;
     }
   }, [validateContext, getCurrentOrganisationId, setOrganisationContextInSession, supabase]);
@@ -499,7 +500,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
     const { data, error } = await supabase!.rpc(functionName, secureParams);
 
     if (error) {
-      console.error('[useSecureDataAccess] RPC failed:', error);
+      logger.error('useSecureDataAccess', 'RPC failed', { functionName, params: secureParams, error });
       throw error;
     }
 
@@ -553,7 +554,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
     try {
       validateContext();
     } catch (error) {
-      console.error(`[useSecureDataAccess] Organisation context validation failed:`, error);
+      logger.error('useSecureDataAccess', 'Organisation context validation failed', { table, operation, error });
       return false;
     }
     
@@ -587,7 +588,7 @@ export function useSecureDataAccess(): SecureDataAccessReturn {
     });
     
     if (isStrictMode && !allowed) {
-      console.error(`[useSecureDataAccess] STRICT MODE VIOLATION: User attempted data access without permission`, {
+      logger.error('useSecureDataAccess', 'STRICT MODE VIOLATION: User attempted data access without permission', {
         table,
         operation,
         userId: user.id,

package/src/hooks/useSessionRestoration.ts

@@ -12,6 +12,9 @@
 import { useContext, useMemo, useEffect, useState } from 'react';
 import { AuthServiceContext } from '../providers/services/AuthServiceProvider';
 import type { SessionRestorationState } from '../types/auth';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('useSessionRestoration');
 
 const SESSION_RESTORATION_TIMEOUT_MS = 5000;
 
@@ -38,7 +41,7 @@ export function useSessionRestoration(): UseSessionRestorationResult {
     if (sessionRestoration.isRestoring && !sessionRestoration.restorationComplete && !sessionRestoration.restorationError) {
       setHasTimedOut(false);
       timeoutHandle = setTimeout(() => {
-        console.warn('[useSessionRestoration] Session restoration timed out');
+        log.warn('Session restoration timed out');
         setHasTimedOut(true);
       }, SESSION_RESTORATION_TIMEOUT_MS);
     } else {