@jmruthers/pace-core 0.6.10 → 0.6.11

package/src/providers/{__tests__/InactivityProvider.test.tsx → InactivityProvider.test.tsx}

@@ -6,8 +6,9 @@
 import React from 'react';
 import { render, screen, act } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { createMockSupabaseClient } from '../../__tests__/helpers';
-import { useInactivity, TestWrapper } from './InactivityProvider.test-helper';
+import { createMockSupabaseClient } from '../__tests__/helpers';
+import { useInactivity } from './useInactivity.test-helper';
+import { TestWrapper } from './InactivityProvider.test-helper';
 
 // Mock the inactivity tracker hook
 const mockUseInactivityTracker = vi.hoisted(() => vi.fn(() => ({
@@ -166,7 +167,7 @@ describe('InactivityProvider', () => {
       expect(screen.getByTestId('test-component')).toBeDefined();
 
       rerender(
-        <TestWrapper dangerouslyDisableInactivity={true} supabaseClient={mockSupabaseClient}>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
@@ -192,21 +193,21 @@ describe('InactivityProvider', () => {
       mockSupabaseClient.auth.signOut.mockRejectedValue(new Error('Sign out failed'));
 
       const { rerender } = render(
-        <TestWrapper onIdleLogout={onIdleLogout}>
+        <TestWrapper supabaseClient={mockSupabaseClient} onIdleLogout={onIdleLogout}>
           <TestComponent />
         </TestWrapper>
       );
       expect(screen.getByText('Idle Logout')).toBeDefined();
 
       rerender(
-        <TestWrapper>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
       expect(screen.getByText('Idle Logout')).toBeDefined();
 
       rerender(
-        <TestWrapper>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
@@ -226,7 +227,7 @@ describe('InactivityProvider', () => {
       });
 
       render(
-        <TestWrapper>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
@@ -261,7 +262,7 @@ describe('InactivityProvider', () => {
       });
 
       render(
-        <TestWrapper>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
@@ -309,15 +310,7 @@ describe('InactivityProvider', () => {
   });
 
   describe('Warning Modal', () => {
-    it('renders default warning modal when no custom renderer, custom warning modal when provided, and handles custom modal actions', () => {
-      const customRenderer = vi.fn(({ timeRemaining, onStaySignedIn, onSignOutNow }) => (
-        <section data-testid="custom-modal">
-          <p data-testid="custom-time">{timeRemaining}</p>
-          <button onClick={onStaySignedIn}>Custom Stay</button>
-          <button onClick={onSignOutNow}>Custom Sign Out</button>
-        </section>
-      ));
-
+    it('renders when warning is shown and handles rerender', () => {
       mockUseInactivityTracker.mockReturnValue({
         ...mockTracker,
         showWarning: true,
@@ -325,14 +318,14 @@ describe('InactivityProvider', () => {
       });
 
       const { rerender } = render(
-        <TestWrapper>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
       expect(screen.getByTestId('test-component')).toBeDefined();
 
       rerender(
-        <TestWrapper renderInactivityWarning={customRenderer}>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
@@ -346,7 +339,7 @@ describe('InactivityProvider', () => {
       const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
 
       render(
-        <TestWrapper dangerouslyDisableInactivity={true} supabaseClient={mockSupabaseClient}>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <TestComponent />
         </TestWrapper>
       );
@@ -416,7 +409,7 @@ describe('InactivityProvider', () => {
   describe('Cleanup', () => {
     it('handles component unmount gracefully', () => {
       const { unmount } = render(
-        <TestWrapper>
+        <TestWrapper supabaseClient={mockSupabaseClient}>
           <p>Test content</p>
         </TestWrapper>
       );

package/src/providers/{__tests__/ProviderLifecycle.test.tsx → ProviderLifecycle.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file Provider Lifecycle Tests
  * @package @jmruthers/pace-core
- * @module Providers/__tests__
+ * @module Providers
  * @since 1.0.0
  *
  * Tests for provider lifecycle management, state persistence, cleanup, and edge cases.
@@ -10,7 +10,7 @@
 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';
+import { createMockSupabaseClient } from '../__tests__/helpers/supabaseMock';
 
 // Mock providers
 vi.mock('../AuthProvider', () => ({
@@ -23,8 +23,8 @@ vi.mock('../AuthProvider', () => ({
   })
 }));
 
-vi.mock('../OrganisationProvider', () => ({
-  OrganisationProvider: ({ children }: { children: ReactNode }) => <section data-testid="org-provider">{children}</section>,
+// OrganisationProvider removed - UnifiedAuthProvider includes OrganisationServiceProvider
+vi.mock('../../hooks/useOrganisations', () => ({
   useOrganisations: () => ({
     selectedOrganisation: { id: 'test-org' },
     isContextReady: true,

package/src/providers/{__tests__/UnifiedAuthProvider.test.tsx → UnifiedAuthProvider.test.tsx}

@@ -6,7 +6,7 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { vi, describe, it, expect } from 'vitest';
-import { UnifiedAuthProvider, useUnifiedAuth } from '../services/UnifiedAuthProvider';
+import { UnifiedAuthProvider, useUnifiedAuth } from './services/UnifiedAuthProvider';
 
 // Mock the debug logger
 vi.mock('../../utils/debugLogger', () => ({

package/src/providers/{__tests__/index.test.ts → index.test.ts}

@@ -1,7 +1,7 @@
 /**
  * @file Providers Index Barrel File Tests
  * @package @jmruthers/pace-core
- * @module Providers/__tests__
+ * @module Providers
  * @since 0.1.0
  *
  * Comprehensive tests for the providers barrel file (src/providers/index.ts) ensuring
@@ -9,7 +9,7 @@
  */
 
 import { describe, it, expect } from 'vitest';
-import * as ProviderExports from '../index';
+import * as ProviderExports from './index';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test

package/src/providers/services/{__tests__/AuthServiceProvider.integration.test.tsx → AuthServiceProvider.integration.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file Auth Service Provider Integration Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Integration tests for AuthServiceProvider.
@@ -11,10 +11,10 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { render, screen, waitFor, act } from '@testing-library/react';
 import React from 'react';
-import { AuthServiceProvider } from '../AuthServiceProvider';
-import { useAuthService } from '../../../hooks/services/useAuthService';
+import { AuthServiceProvider } from './AuthServiceProvider';
+import { useAuthService } from '../../hooks/services/useAuthService';
 import { type SupabaseClient } from '@supabase/supabase-js';
-import { Logger, LogLevel } from '../../../utils/core/logger';
+import { Logger, LogLevel } from '../../utils/core/logger';
 
 // Mock Supabase client
 const createMockSupabaseClient = (): SupabaseClient => ({

package/src/providers/services/{__tests__/AuthServiceProvider.test.tsx → AuthServiceProvider.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file Auth Service Provider Unit Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Comprehensive unit tests for AuthServiceProvider component covering:
@@ -17,17 +17,17 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { AuthServiceProvider } from '../AuthServiceProvider';
-import { AuthServiceContext } from '../AuthServiceContext';
-import { AuthService } from '../../../services/AuthService';
-import type { SessionRestorationState } from '../../../types/auth';
+import { AuthServiceProvider } from './AuthServiceProvider';
+import { AuthServiceContext } from './AuthServiceContext';
+import { AuthService } from '../../services/AuthService';
+import type { SessionRestorationState } from '../../types/auth';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test
 
 // Mock AuthService
-vi.mock('../../../services/AuthService');
-vi.mock('../../../utils/core/logger', () => ({
+vi.mock('../../services/AuthService');
+vi.mock('../../utils/core/logger', () => ({
   logger: {
     error: vi.fn(),
     warn: vi.fn(),

package/src/providers/services/{__tests__/EventServiceProvider.test.tsx → EventServiceProvider.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file Event Service Provider Unit Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Comprehensive unit tests for EventServiceProvider component covering:
@@ -16,18 +16,18 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { EventServiceProvider } from '../EventServiceProvider';
-import { EventServiceContext } from '../EventServiceContext';
-import { EventService } from '../../../services/EventService';
+import { EventServiceProvider } from './EventServiceProvider';
+import { EventServiceContext } from './EventServiceContext';
+import { EventService } from '../../services/EventService';
 import type { User, Session } from '@supabase/supabase-js';
-import type { Organisation } from '../../../types/organisation';
+import type { Organisation } from '../../types/organisation';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test
 
 // Mock EventService
-vi.mock('../../../services/EventService');
-vi.mock('../../../utils/core/logger', () => ({
+vi.mock('../../services/EventService');
+vi.mock('../../utils/core/logger', () => ({
   logger: {
     error: vi.fn(),
     warn: vi.fn(),

package/src/providers/services/{__tests__/InactivityServiceProvider.test.tsx → InactivityServiceProvider.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file Inactivity Service Provider Unit Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Comprehensive unit tests for InactivityServiceProvider component covering:
@@ -16,16 +16,16 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { InactivityServiceProvider, InactivityServiceContext } from '../InactivityServiceProvider';
-import { InactivityService } from '../../../services/InactivityService';
+import { InactivityServiceProvider, InactivityServiceContext } from './InactivityServiceProvider';
+import { InactivityService } from '../../services/InactivityService';
 import type { User, Session } from '@supabase/supabase-js';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test
 
 // Mock InactivityService
-vi.mock('../../../services/InactivityService');
-vi.mock('../../../utils/core/logger', () => ({
+vi.mock('../../services/InactivityService');
+vi.mock('../../utils/core/logger', () => ({
   logger: {
     error: vi.fn(),
     warn: vi.fn(),

package/src/providers/services/{__tests__/OrganisationServiceProvider.test.tsx → OrganisationServiceProvider.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file Organisation Service Provider Unit Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Comprehensive unit tests for OrganisationServiceProvider component covering:
@@ -15,17 +15,17 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { OrganisationServiceProvider, OrganisationServiceContext } from '../OrganisationServiceProvider';
-import { OrganisationService } from '../../../services/OrganisationService';
+import { OrganisationServiceProvider, OrganisationServiceContext } from './OrganisationServiceProvider';
+import { OrganisationService } from '../../services/OrganisationService';
 import type { User, Session } from '@supabase/supabase-js';
-import { logger } from '../../../utils/core/logger';
+import { logger } from '../../utils/core/logger';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test
 
 // Mock OrganisationService
-vi.mock('../../../services/OrganisationService');
-vi.mock('../../../utils/core/logger', () => ({
+vi.mock('../../services/OrganisationService');
+vi.mock('../../utils/core/logger', () => ({
   logger: {
     error: vi.fn(),
     warn: vi.fn(),

package/src/providers/services/UnifiedAuthContext.ts

@@ -9,36 +9,32 @@
 
 import { createContext } from 'react';
 import type { SupabaseClient, User, Session, AuthError } from '@supabase/supabase-js';
+import type { ApiResult } from '../../types/api-result';
+import type { AuthSessionData } from '../../services/interfaces/IAuthService';
 import type { Organisation, OrganisationMembership } from '../../types/organisation';
 import type { Event } from '../../types/event';
 import type { SessionRestorationState } from '../../types/auth';
 
-/**
- * Unified auth context type.
- * Provides combined authentication, organisation, event, and inactivity state and methods.
- */
-export interface UnifiedAuthContextType {
-  // Auth state
+/** Auth state and methods for unified auth context (ISP). */
+export interface UnifiedAuthContextAuth {
   user: User | null;
   session: Session | null;
   isAuthenticated: boolean;
   authLoading: boolean;
   authError: AuthError | null;
   supabase: SupabaseClient | null;
-  
-  // App context (resolved immediately on login)
   appName: string;
-  appId: string | undefined; // Resolved from appName when user logs in
-  
-  // Auth methods
-  signIn: (email: string, password?: string) => Promise<{ error: AuthError | null }>;
-  signUp: (email: string, password: string) => Promise<{ error: AuthError | null }>;
-  signOut: () => Promise<{ error: AuthError | null }>;
-  resetPassword: (email: string) => Promise<{ error: AuthError | null }>;
-  updatePassword: (password: string) => Promise<{ error: AuthError | null }>;
-  refreshSession: () => Promise<{ error: AuthError | null }>;
+  appId: string | undefined;
+  signIn: (email: string, password?: string) => Promise<ApiResult<AuthSessionData>>;
+  signUp: (email: string, password: string) => Promise<ApiResult<AuthSessionData>>;
+  signOut: () => Promise<ApiResult<AuthSessionData>>;
+  resetPassword: (email: string) => Promise<ApiResult<AuthSessionData>>;
+  updatePassword: (password: string) => Promise<ApiResult<AuthSessionData>>;
+  refreshSession: () => Promise<ApiResult<AuthSessionData>>;
+}
 
-  // Organisation state
+/** Organisation state and methods for unified auth context (ISP). */
+export interface UnifiedAuthContextOrganisation {
   selectedOrganisation: Organisation | null;
   selectedOrganisationId: string | null;
   organisations: Organisation[];
@@ -47,8 +43,6 @@ export interface UnifiedAuthContextType {
   organisationError: Error | null;
   hasValidOrganisationContext: boolean;
   isContextReady: boolean;
-  
-  // Organisation methods
   switchOrganisation: (orgId: string) => Promise<void>;
   getUserRole: (orgId?: string) => string;
   validateOrganisationAccess: (orgId: string) => boolean;
@@ -56,35 +50,37 @@ export interface UnifiedAuthContextType {
   ensureOrganisationContext: () => Organisation;
   isOrganisationSecure: () => boolean;
   getPrimaryOrganisation: () => Organisation | null;
+}
 
-  // Event state
+/** Event state and methods for unified auth context (ISP). */
+export interface UnifiedAuthContextEvent {
   events: Event[];
   selectedEvent: Event | null;
   selectedEventId: string | null;
   eventLoading: boolean;
   eventError: Error | null;
-  
-  // Event methods
   setSelectedEvent: (event: Event | null) => void;
   refreshEvents: () => Promise<void>;
+}
 
-  // Inactivity state
+/** Inactivity state and methods for unified auth context (ISP). */
+export interface UnifiedAuthContextInactivity {
   showInactivityWarning: boolean;
   inactivityTimeRemaining: number;
   isIdle: boolean;
   timeRemaining: number;
   showWarning: boolean;
   isTracking: boolean;
-  
-  // Inactivity methods
   resetActivity: () => void;
   startTracking: () => void;
   stopTracking: () => void;
   handleIdleLogout: () => Promise<void>;
   handleStaySignedIn: () => void;
   handleSignOutNow: () => Promise<void>;
+}
 
-  // Additional unified properties
+/** Unified loading/errors/session restoration (ISP). */
+export interface UnifiedAuthContextUnified {
   isLoading: boolean;
   hasErrors: boolean;
   sessionRestoration: SessionRestorationState;
@@ -92,6 +88,13 @@ export interface UnifiedAuthContextType {
   sessionRestorationTimeoutMs: number;
 }
 
+/** Unified auth context type (ISP: composed from focused interfaces). */
+export type UnifiedAuthContextType = UnifiedAuthContextAuth
+  & UnifiedAuthContextOrganisation
+  & UnifiedAuthContextEvent
+  & UnifiedAuthContextInactivity
+  & UnifiedAuthContextUnified;
+
 /**
  * Context for unified authentication.
  * Provides combined authentication, organisation, event, and inactivity functionality.

package/src/providers/services/{__tests__/UnifiedAuthProvider.advanced.test.tsx → UnifiedAuthProvider.advanced.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file UnifiedAuthProvider Advanced Features Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Comprehensive tests for UnifiedAuthProvider advanced features covering:
@@ -15,14 +15,14 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { UnifiedAuthProvider, useUnifiedAuth } from '../UnifiedAuthProvider';
+import { UnifiedAuthProvider, useUnifiedAuth } from './UnifiedAuthProvider';
 import type { SupabaseClient } from '@supabase/supabase-js';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test
 
 // Mock dependencies
-vi.mock('../../../utils/debugLogger', () => ({
+vi.mock('../../utils/debugLogger', () => ({
   DebugLogger: {
     log: vi.fn(),
   },
@@ -35,21 +35,20 @@ const mockLogger = {
   info: vi.fn(),
 };
 
-vi.mock('../../../utils/core/logger', () => ({
+vi.mock('../../utils/core/logger', () => ({
   logger: mockLogger,
 }));
 
-vi.mock('../../../utils/context/organisationContext', () => ({
-  setOrganisationContext: vi.fn().mockResolvedValue(undefined),
+vi.mock('../../utils/context/organisationContext', () => ({
+  setOrganisationContext: vi.fn().mockResolvedValue({ ok: true, data: undefined }),
 }));
 
 // Mock RBAC API - must match the import path in UnifiedAuthProvider
-// From services/__tests__/, need ../../../rbac/api to reach src/rbac/api
 const mockSetupRBAC = vi.fn();
 const mockIsRBACInitialized = vi.fn();
 
-vi.mock('../../../rbac/api', async () => {
-  const actual = await vi.importActual('../../../rbac/api');
+vi.mock('../../rbac/api', async () => {
+  const actual = await vi.importActual('../../rbac/api');
   return {
     ...actual,
     setupRBAC: mockSetupRBAC,

package/src/providers/services/{__tests__/UnifiedAuthProvider.appId.test.tsx → UnifiedAuthProvider.appId.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file UnifiedAuthProvider AppId Resolution Tests
  * @package @jmruthers/pace-core
- * @module Providers/Services/__tests__
+ * @module Providers/Services
  * @since 0.1.0
  *
  * Comprehensive tests for UnifiedAuthProvider appId resolution covering:
@@ -13,16 +13,16 @@
  */
 
 import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { UnifiedAuthProvider, useUnifiedAuth } from '../UnifiedAuthProvider';
+import { UnifiedAuthProvider, useUnifiedAuth } from './UnifiedAuthProvider';
 import type { SupabaseClient, User, Session } from '@supabase/supabase-js';
 
 // Following testing standards: use timeout parameter to prevent hanging
 const TEST_TIMEOUT = 10000; // 10 seconds per test
 
 // Mock dependencies
-vi.mock('../../../utils/debugLogger', () => ({
+vi.mock('../../utils/debugLogger', () => ({
   DebugLogger: {
     log: vi.fn(),
   },
@@ -35,12 +35,12 @@ const mockLogger = {
   info: vi.fn(),
 };
 
-vi.mock('../../../utils/core/logger', () => ({
+vi.mock('../../utils/core/logger', () => ({
   logger: mockLogger,
 }));
 
-vi.mock('../../../utils/context/organisationContext', () => ({
-  setOrganisationContext: vi.fn().mockResolvedValue(undefined),
+vi.mock('../../utils/context/organisationContext', () => ({
+  setOrganisationContext: vi.fn().mockResolvedValue({ ok: true, data: undefined }),
 }));
 
 // Mock RBAC API
@@ -48,8 +48,8 @@ const mockSetupRBAC = vi.fn();
 const mockIsRBACInitialized = vi.fn();
 const mockResolveAppContext = vi.fn();
 
-vi.mock('../../../rbac/api', async () => {
-  const actual = await vi.importActual('../../../rbac/api');
+vi.mock('../../rbac/api', async () => {
+  const actual = await vi.importActual('../../rbac/api');
   return {
     ...actual,
     setupRBAC: mockSetupRBAC,
@@ -59,7 +59,7 @@ vi.mock('../../../rbac/api', async () => {
 });
 
 // Mock services
-vi.mock('../../../services/AuthService', () => ({
+vi.mock('../../services/AuthService', () => ({
   AuthService: vi.fn().mockImplementation(() => ({
     initialize: vi.fn().mockResolvedValue(undefined),
     cleanup: vi.fn(),
@@ -78,7 +78,7 @@ vi.mock('../../../services/AuthService', () => ({
   })),
 }));
 
-vi.mock('../../../services/OrganisationService', () => ({
+vi.mock('../../services/OrganisationService', () => ({
   OrganisationService: vi.fn().mockImplementation(() => ({
     initialize: vi.fn().mockResolvedValue(undefined),
     cleanup: vi.fn(),
@@ -94,7 +94,7 @@ vi.mock('../../../services/OrganisationService', () => ({
   })),
 }));
 
-vi.mock('../../../services/EventService', () => ({
+vi.mock('../../services/EventService', () => ({
   EventService: vi.fn().mockImplementation(() => ({
     initialize: vi.fn().mockResolvedValue(undefined),
     cleanup: vi.fn(),
@@ -107,7 +107,7 @@ vi.mock('../../../services/EventService', () => ({
   })),
 }));
 
-vi.mock('../../../services/InactivityService', () => ({
+vi.mock('../../services/InactivityService', () => ({
   InactivityService: vi.fn().mockImplementation(() => ({
     initialize: vi.fn().mockResolvedValue(undefined),
     cleanup: vi.fn(),
@@ -123,37 +123,37 @@ vi.mock('../../../services/InactivityService', () => ({
 }));
 
 // Mock hooks
-vi.mock('../../../hooks/services/useAuthService', () => ({
+vi.mock('../../hooks/services/useAuthService', () => ({
   useAuthService: vi.fn(),
 }));
 
-vi.mock('../../../hooks/services/useOrganisationService', () => ({
+vi.mock('../../hooks/services/useOrganisationService', () => ({
   useOrganisationService: vi.fn(),
 }));
 
-vi.mock('../../../hooks/services/useEventService', () => ({
+vi.mock('../../hooks/services/useEventService', () => ({
   useEventService: vi.fn(),
 }));
 
-vi.mock('../../../hooks/services/useInactivityService', () => ({
+vi.mock('../../hooks/services/useInactivityService', () => ({
   useInactivityService: vi.fn(),
 }));
 
-vi.mock('../../../hooks/useSessionRestoration', () => ({
+vi.mock('../../hooks/useSessionRestoration', () => ({
   useSessionRestoration: vi.fn(),
 }));
 
-vi.mock('../../../hooks/useOrganisations', () => ({
+vi.mock('../../hooks/useOrganisations', () => ({
   useOrganisations: vi.fn(),
 }));
 
 // Import mocked hooks after mocks are defined
-import { useAuthService } from '../../../hooks/services/useAuthService';
-import { useOrganisationService } from '../../../hooks/services/useOrganisationService';
-import { useEventService } from '../../../hooks/services/useEventService';
-import { useInactivityService } from '../../../hooks/services/useInactivityService';
-import { useSessionRestoration } from '../../../hooks/useSessionRestoration';
-import { useOrganisations } from '../../../hooks/useOrganisations';
+import { useAuthService } from '../../hooks/services/useAuthService';
+import { useOrganisationService } from '../../hooks/services/useOrganisationService';
+import { useEventService } from '../../hooks/services/useEventService';
+import { useInactivityService } from '../../hooks/services/useInactivityService';
+import { useSessionRestoration } from '../../hooks/useSessionRestoration';
+import { useOrganisations } from '../../hooks/useOrganisations';
 
 // Create mock Supabase client
 const createMockSupabaseClient = (): SupabaseClient => ({