@jmruthers/pace-core 0.6.10 → 0.6.11

package/src/hooks/{__tests__/usePublicFileDisplay.test.ts → usePublicFileDisplay.test.ts}

@@ -14,14 +14,14 @@ import {
   usePublicFileDisplay, 
   clearPublicFileDisplayCache, 
   getPublicFileDisplayCacheStats 
-} from '../public/usePublicFileDisplay';
-import { createMockSupabaseClient } from '../../__tests__/helpers/supabaseMock';
+} from '../components/FileDisplay/usePublicFileDisplay';
+import { createMockSupabaseClient } from '../__tests__/helpers/supabaseMock';
 import type { SupabaseClient } from '@supabase/supabase-js';
-import type { Database } from '../../types/database';
-import { FileCategory as FileCategoryEnum } from '../../types/file-reference';
+import type { Database } from '../types/database';
+import { FileCategory as FileCategoryEnum } from '../types/file-reference';
 
-// Mock getPublicUrl and generateFileUrlsBatch
-vi.mock('../../utils/storage/helpers', () => ({
+// Mock getPublicUrl and generateFileUrlsBatch - path relative to src/hooks/
+vi.mock('../utils/storage/helpers', () => ({
   getPublicUrl: vi.fn((supabase: any, path: string) => `https://example.com/${path}`),
   generateFileUrlsBatch: vi.fn().mockImplementation(async (supabase, files) => {
     const urlMap = new Map<string, string>();
@@ -32,12 +32,12 @@ vi.mock('../../utils/storage/helpers', () => ({
         urlMap.set(file.id, `https://example.com/signed/${file.file_path}`);
       }
     }
-    return urlMap;
+    return { ok: true, data: urlMap };
   })
 }));
 
 // Mock logger
-vi.mock('../../utils/core/logger', () => ({
+vi.mock('../utils/core/logger', () => ({
   logger: {
     debug: vi.fn(),
     info: vi.fn(),
@@ -46,7 +46,7 @@ vi.mock('../../utils/core/logger', () => ({
   },
 }));
 
-import { generateFileUrlsBatch } from '../../utils/storage/helpers';
+import { generateFileUrlsBatch } from '../utils/storage/helpers';
 
 describe('usePublicFileDisplay Hook', () => {
   let mockSupabase: SupabaseClient<Database>;
@@ -72,7 +72,7 @@ describe('usePublicFileDisplay Hook', () => {
     clearPublicFileDisplayCache();
     mockSupabase = createMockSupabaseClient() as any;
     
-    // Reset generateFileUrlsBatch mock to ensure it returns a Map
+    // Reset generateFileUrlsBatch mock to return ApiResult with Map
     vi.mocked(generateFileUrlsBatch).mockImplementation(async (supabase, files) => {
       const urlMap = new Map<string, string>();
       for (const file of files) {
@@ -82,7 +82,7 @@ describe('usePublicFileDisplay Hook', () => {
           urlMap.set(file.id, `https://example.com/signed/${file.file_path}`);
         }
       }
-      return urlMap;
+      return { ok: true, data: urlMap };
     });
   });
 
@@ -650,7 +650,7 @@ describe('usePublicFileDisplay Hook', () => {
     });
 
     it('validates UUID format for organisation_id', async () => {
-      const { logger } = await import('../../utils/core/logger');
+      const { logger } = await import('../utils/core/logger');
 
       (mockSupabase.rpc as any).mockResolvedValue({
         data: [],

package/src/hooks/{__tests__/usePublicRouteParams.unit.test.ts → usePublicRouteParams.unit.test.ts}

@@ -5,8 +5,8 @@ import {
   usePublicEventCode, 
   generatePublicRoutePath, 
   extractEventCodeFromPath 
-} from '../public/usePublicRouteParams';
-import { usePublicEvent } from '../public/usePublicEvent';
+} from './public/usePublicRouteParams';
+import { usePublicEvent } from './public/usePublicEvent';
 
 // Mock React Router
 const mockParams = {};
@@ -18,7 +18,7 @@ vi.mock('react-router-dom', () => ({
 }));
 
 // Mock usePublicEvent
-vi.mock('../public/usePublicEvent', () => ({
+vi.mock('./public/usePublicEvent', () => ({
   usePublicEvent: vi.fn(() => ({
     event: null,
     isLoading: false,

package/src/hooks/{__tests__/useQueryCache.test.ts → useQueryCache.test.ts}

@@ -1,7 +1,7 @@
 /**
  * @file useQueryCache Hook Tests
  * @package @jmruthers/pace-core
- * @module Hooks/__tests__
+ * @module Hooks
  * @since 2.0.0
  *
  * Comprehensive tests for the useQueryCache hook covering caching, expiration,
@@ -11,7 +11,7 @@
 import { renderHook, act } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { SupabaseClient } from '@supabase/supabase-js';
-import { useQueryCache, queryCacheHelpers, cleanupQueryCache } from '../useQueryCache';
+import { useQueryCache, queryCacheHelpers, cleanupQueryCache } from './useQueryCache';
 
 vi.mock('../../utils/core/logger', () => ({
   createLogger: () => ({

package/src/hooks/useQueryCache.ts

@@ -56,7 +56,6 @@ if (typeof window !== 'undefined' && !cleanupTimer) {
     if (cleanupTimer) {
       clearInterval(cleanupTimer);
       cleanupTimer = null;
-      log.debug('Query cache cleanup timer cleared on page unload.');
     }
   });
 }
@@ -69,7 +68,6 @@ export function cleanupQueryCache(): void {
   if (cleanupTimer) {
     clearInterval(cleanupTimer);
     cleanupTimer = null;
-    log.debug('Query cache cleanup timer cleared.');
   }
 }
 

package/src/hooks/{__tests__/useRBAC.unit.test.ts → useRBAC.unit.test.ts}

@@ -1,47 +1,46 @@
 import { renderHook, waitFor } from '@testing-library/react';
 import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { useRBAC } from '../../rbac/hooks/useRBAC';
+import { useRBAC } from '../rbac/hooks/useRBAC';
 
-vi.mock('../../providers/UnifiedAuthProvider', () => ({
+vi.mock('../providers/services/UnifiedAuthProvider', () => ({
   useUnifiedAuth: vi.fn(),
 }));
 
-vi.mock('../../providers/services/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: vi.fn(),
-}));
-
-vi.mock('../../hooks/useOrganisations', () => ({
+vi.mock('./useOrganisations', () => ({
   useOrganisations: vi.fn(),
 }));
 
-vi.mock('../../hooks/useEvents', () => ({
+vi.mock('./useEvents', () => ({
   useEvents: vi.fn(),
 }));
 
-vi.mock('../../rbac/api', () => ({
+vi.mock('../rbac/api', () => ({
   getPermissionMap: vi.fn(),
   getAccessLevel: vi.fn(),
+  getPageScopeType: vi.fn(),
   isPermittedCached: vi.fn(),
   resolveAppContext: vi.fn(),
   getRoleContext: vi.fn(),
 }));
 
-import { useUnifiedAuth } from '../../providers';
-import { useOrganisations } from '../../hooks/useOrganisations';
-import { useEvents } from '../../hooks/useEvents';
+import { useUnifiedAuth } from '../providers/services/UnifiedAuthProvider';
+import { useOrganisations } from './useOrganisations';
+import { useEvents } from './useEvents';
 import {
   getPermissionMap,
   getAccessLevel,
+  getPageScopeType,
   isPermittedCached,
   resolveAppContext,
   getRoleContext,
-} from '../../rbac/api';
+} from '../rbac/api';
 
 const mockUseUnifiedAuth = vi.mocked(useUnifiedAuth);
 const mockUseOrganisations = vi.mocked(useOrganisations);
 const mockUseEvents = vi.mocked(useEvents);
 const mockGetPermissionMap = vi.mocked(getPermissionMap);
 const mockGetAccessLevel = vi.mocked(getAccessLevel);
+const mockGetPageScopeType = vi.mocked(getPageScopeType);
 const mockIsPermittedCached = vi.mocked(isPermittedCached);
 const mockResolveAppContext = vi.mocked(resolveAppContext);
 const mockGetRoleContext = vi.mocked(getRoleContext);
@@ -58,15 +57,19 @@ describe('useRBAC (unit)', () => {
     mockUseOrganisations.mockReturnValue({ selectedOrganisation: null });
     mockUseEvents.mockReturnValue({ selectedEvent: null });
 
-    mockResolveAppContext.mockResolvedValue({ appId: 'app-1' as any, hasAccess: true });
-    mockGetPermissionMap.mockResolvedValue({});
-    mockGetAccessLevel.mockResolvedValue('viewer');
+    mockResolveAppContext.mockResolvedValue({ ok: true, data: { appId: 'app-1' as any, hasAccess: true } });
+    mockGetPageScopeType.mockResolvedValue({ ok: true, data: 'organisation' });
+    mockGetPermissionMap.mockResolvedValue({ ok: true, data: {} });
+    mockGetAccessLevel.mockResolvedValue({ ok: true, data: 'viewer' });
     mockGetRoleContext.mockResolvedValue({
-      globalRole: null,
-      organisationRole: null,
-      eventAppRole: null,
+      ok: true,
+      data: {
+        globalRole: null,
+        organisationRole: null,
+        eventAppRole: null,
+      },
     });
-    mockIsPermittedCached.mockResolvedValue(false);
+    mockIsPermittedCached.mockResolvedValue({ ok: true, data: false });
   });
 
   it('returns null roles when user is not authenticated', () => {
@@ -94,11 +97,15 @@ describe('useRBAC (unit)', () => {
     mockUseOrganisations.mockReturnValue({ selectedOrganisation: { id: 'org-1' } });
     mockUseEvents.mockReturnValue({ selectedEvent: { event_id: 'event-1' } });
 
-    mockGetPermissionMap.mockResolvedValue({ 'read:dashboard': true });
+    mockGetPageScopeType.mockResolvedValue({ ok: true, data: 'organisation' });
+    mockGetPermissionMap.mockResolvedValue({ ok: true, data: { 'read:dashboard': true } });
     mockGetRoleContext.mockResolvedValue({
-      globalRole: 'super_admin',
-      organisationRole: 'org_admin',
-      eventAppRole: null,
+      ok: true,
+      data: {
+        globalRole: 'super_admin',
+        organisationRole: 'org_admin',
+        eventAppRole: null,
+      },
     });
 
     const { result } = renderHook(() => useRBAC('dashboard'));
@@ -123,14 +130,18 @@ describe('useRBAC (unit)', () => {
       selectedEvent: null,
       eventLoading: false,
     });
-    mockResolveAppContext.mockResolvedValue({ appId: 'app-1' as any, hasAccess: true });
-    mockGetPermissionMap.mockResolvedValue({});
+    mockResolveAppContext.mockResolvedValue({ ok: true, data: { appId: 'app-1' as any, hasAccess: true } });
+    mockGetPageScopeType.mockResolvedValue({ ok: true, data: 'organisation' });
+    mockGetPermissionMap.mockResolvedValue({ ok: true, data: {} });
     mockGetRoleContext.mockResolvedValue({
-      globalRole: null,
-      organisationRole: null,
-      eventAppRole: null,
+      ok: true,
+      data: {
+        globalRole: null,
+        organisationRole: null,
+        eventAppRole: null,
+      },
     });
-    mockGetAccessLevel.mockResolvedValue('planner');
+    mockGetAccessLevel.mockResolvedValue({ ok: true, data: 'planner' });
 
     const { result } = renderHook(() => useRBAC());
 
@@ -160,7 +171,10 @@ describe('useRBAC (unit)', () => {
       eventLoading: false,
     });
     mockUseOrganisations.mockReturnValue({ selectedOrganisation: { id: 'org-1' } });
-    mockGetPermissionMap.mockResolvedValue({ '*': true });
+    mockGetPageScopeType.mockResolvedValue({ ok: true, data: 'organisation' });
+    mockGetPermissionMap.mockResolvedValue({ ok: true, data: { '*': true } });
+    mockGetRoleContext.mockResolvedValue({ ok: true, data: { globalRole: null, organisationRole: null, eventAppRole: null } });
+    mockGetAccessLevel.mockResolvedValue({ ok: true, data: 'viewer' });
 
     const { result } = renderHook(() => useRBAC());
 
@@ -185,13 +199,16 @@ describe('useRBAC (unit)', () => {
       selectedEvent: null,
       eventLoading: false,
     });
-    mockResolveAppContext.mockResolvedValue({ appId: 'app-1' as any, hasAccess: true });
-    mockGetPermissionMap.mockResolvedValue({});
-    mockGetAccessLevel.mockResolvedValue('viewer');
+    mockResolveAppContext.mockResolvedValue({ ok: true, data: { appId: 'app-1' as any, hasAccess: true } });
+    mockGetPermissionMap.mockResolvedValue({ ok: true, data: {} });
+    mockGetAccessLevel.mockResolvedValue({ ok: true, data: 'viewer' });
     mockGetRoleContext.mockResolvedValue({
-      globalRole: null,
-      organisationRole: 'org_admin',
-      eventAppRole: null,
+      ok: true,
+      data: {
+        globalRole: null,
+        organisationRole: 'org_admin',
+        eventAppRole: null,
+      },
     });
 
     const { result } = renderHook(() => useRBAC());
@@ -223,7 +240,7 @@ describe('useRBAC (unit)', () => {
       selectedEvent: null,
       eventLoading: false,
     });
-    mockResolveAppContext.mockResolvedValue(null);
+    mockResolveAppContext.mockResolvedValue({ ok: false, error: { code: 'ERR', message: 'Failed' } });
 
     const { result } = renderHook(() => useRBAC());
 

package/src/hooks/{__tests__/useSessionDraft.test.ts → useSessionDraft.test.ts}

@@ -1,12 +1,12 @@
 /**
  * @file useSessionDraft Hook Tests
  * @package @jmruthers/pace-core
- * @module Hooks/__tests__
+ * @module Hooks
  */
 
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
-import { useSessionDraft } from '../useSessionDraft';
+import { useSessionDraft } from './useSessionDraft';
 
 describe('useSessionDraft', () => {
   beforeEach(() => {

package/src/hooks/{__tests__/useSessionRestoration.unit.test.tsx → useSessionRestoration.unit.test.tsx}

@@ -1,7 +1,7 @@
 /**
  * @file useSessionRestoration Hook Unit Tests
  * @package @jmruthers/pace-core
- * @module Hooks/__tests__/useSessionRestoration
+ * @module Hooks/useSessionRestoration
  * @since 0.1.0
  * 
  * Comprehensive tests for the useSessionRestoration hook covering all critical functionality.
@@ -10,23 +10,15 @@
 import { renderHook, act } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import React from 'react';
-import { useSessionRestoration } from '../useSessionRestoration';
-import { AuthServiceContext } from '../../providers/services/AuthServiceContext';
-import type { SessionRestorationState } from '../../types/auth';
-
-// Mock the Logger module
-vi.mock('../../utils/core/logger', () => {
-  const mockLoggerInstance = {
-    warn: vi.fn(),
-  };
-  return {
-    createLogger: vi.fn(() => mockLoggerInstance),
-  };
-});
+import { useSessionRestoration } from './useSessionRestoration';
+import { AuthServiceContext } from '../providers/services/AuthServiceContext';
+import type { SessionRestorationState } from '../types/auth';
 
-// Get the mock instance after mock is set up
-import { createLogger } from '../../utils/core/logger';
-const getMockLogger = () => createLogger('test');
+// Mock the Logger module - use hoisted warn so it's a proper spy (same path as hook imports)
+const mockWarn = vi.hoisted(() => vi.fn());
+vi.mock('../utils/core/logger', () => ({
+  createLogger: vi.fn(() => ({ warn: mockWarn })),
+}));
 
 // Match the actual timeout value from useSessionRestoration.ts
 const SESSION_RESTORATION_TIMEOUT_MS = 10000; // 10 seconds (matches implementation)
@@ -144,8 +136,7 @@ describe('useSessionRestoration', () => {
       // With fake timers, the timeout should fire after advancing
       expect(result.current.hasTimedOut).toBe(true);
 
-      const logger = getMockLogger();
-      expect(vi.mocked(logger.warn)).toHaveBeenCalledWith(
+      expect(mockWarn).toHaveBeenCalledWith(
         'Session restoration timed out'
       );
     });

package/src/hooks/useStorage.ts

@@ -85,8 +85,12 @@ export function useStorage({ supabase, appName, orgId }: UseStorageOptions): Use
       };
 
       const result = await listFiles(supabase, listOptions);
-      setFiles(result.files);
-      return result;
+      if (!result.ok) {
+        setListError(result.error.message);
+        return { files: [], totalCount: 0, hasMore: false };
+      }
+      setFiles(result.data.files);
+      return result.data;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : 'List failed';
       setListError(errorMessage);
@@ -119,14 +123,13 @@ export function useStorage({ supabase, appName, orgId }: UseStorageOptions): Use
 
       const result = await uploadFile(supabase, file, uploadOptions);
       
-      if (result.success) {
-        // Refresh file list
+      if (result.ok) {
         await refreshFiles();
+        return { success: true, path: result.data.path, publicUrl: result.data.publicUrl, metadata: result.data.metadata };
       } else {
-        setUploadError(result.error || 'Upload failed');
+        setUploadError(result.error.message);
+        return { success: false, error: result.error.message };
       }
-
-      return result;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : 'Upload failed';
       setUploadError(errorMessage);
@@ -155,7 +158,7 @@ export function useStorage({ supabase, appName, orgId }: UseStorageOptions): Use
         orgId,
         expiresIn
       });
-      return result?.url || null;
+      return result.ok ? result.data.url : null;
     } catch (error) {
       log.error('Failed to get signed URL:', error);
       return null;
@@ -166,10 +169,11 @@ export function useStorage({ supabase, appName, orgId }: UseStorageOptions): Use
   const handleDeleteFile = useCallback(async (path: string) => {
     try {
       const result = await deleteFile(supabase, path);
-      if (result.success) {
+      if (result.ok) {
         await refreshFiles();
+        return { success: true };
       }
-      return result;
+      return { success: false, error: result.error.message };
     } catch (error) {
       return {
         success: false,
@@ -182,10 +186,11 @@ export function useStorage({ supabase, appName, orgId }: UseStorageOptions): Use
   const handleArchiveFile = useCallback(async (path: string) => {
     try {
       const result = await archiveFile(supabase, path, { appName, orgId });
-      if (result.success) {
+      if (result.ok) {
         await refreshFiles();
+        return { success: true };
       }
-      return result;
+      return { success: false, error: result.error.message };
     } catch (error) {
       return {
         success: false,
@@ -278,11 +283,11 @@ export function useFileUpload({ supabase, appName, orgId }: UseStorageOptions) {
       }
       setUploadProgress(100);
 
-      if (!result.success) {
-        setUploadError(result.error || 'Upload failed');
+      if (!result.ok) {
+        setUploadError(result.error.message);
+        return { success: false, error: result.error.message };
       }
-
-      return result;
+      return { success: true, path: result.data.path, publicUrl: result.data.publicUrl, metadata: result.data.metadata };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : 'Upload failed';
       setUploadError(errorMessage);