@jmruthers/pace-core 0.5.135 → 0.5.137

package/src/hooks/useStorage.ts

@@ -17,6 +17,9 @@ import {
   listFiles,
   archiveFile
 } from '../utils/storage';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('useStorage');
 
 export interface UseStorageOptions {
   supabase: SupabaseClient;
@@ -117,7 +120,7 @@ export function useStorage({ supabase, appName, orgId }: UseStorageOptions): Use
       });
       return result?.url || null;
     } catch (error) {
-      console.error('Failed to get signed URL:', error);
+      log.error('Failed to get signed URL:', error);
       return null;
     }
   }, [supabase, appName, orgId]);

package/src/index.ts

@@ -21,7 +21,7 @@ export { UnifiedAuthProvider, useUnifiedAuth } from './providers/UnifiedAuthProv
 export type { UnifiedAuthProviderProps, UnifiedAuthContextType, UserEventAccess } from './providers/UnifiedAuthProvider';
 
 // Session tracking utility (for manual use if needed)
-export { useSessionTracking } from './utils/sessionTracking';
+export { useSessionTracking } from './utils/context/sessionTracking';
 
 // Provider components (using service architecture)
 export { EventProvider } from './providers/EventProvider';
@@ -79,6 +79,9 @@ export type { LabelProps } from './components/Label/Label';
 export { Alert, AlertTitle, AlertDescription } from './components/Alert/Alert';
 export { Avatar, AvatarImage, AvatarFallback } from './components/Avatar/Avatar';
 
+export { Badge } from './components/Badge/Badge';
+export type { BadgeProps, BadgeVariant } from './components/Badge/Badge';
+
 export { Checkbox } from './components/Checkbox/Checkbox';
 export { Switch } from './components/Switch/Switch';
 export type { SwitchProps } from './components/Switch/Switch';
@@ -141,6 +144,7 @@ export {
   type AggregateConfig,
   type EmptyStateConfig,
   type GetRowId,
+  type DataTableFeatureConfig,
   ColumnFactory
 } from './components/DataTable';
 
@@ -155,6 +159,15 @@ export {
   type ExportColumn
 } from './components/DataTable/utils/exportUtils';
 
+// Export DataTable aggregation utilities
+export {
+  sum,
+  average,
+  count,
+  min,
+  max
+} from './components/DataTable/utils/aggregationUtils';
+
 // FORM COMPONENTS
 export { Form } from './components/Form/Form';
 export { LoginForm } from './components/LoginForm/LoginForm';
@@ -183,7 +196,8 @@ export type { ProtectedRouteProps } from './components/ProtectedRoute/ProtectedR
 // UTILITY COMPONENTS
 export { ErrorBoundary } from './components/ErrorBoundary/ErrorBoundary';
 export { LoadingSpinner } from './components/LoadingSpinner/LoadingSpinner';
-export { SessionRestorationLoader } from './components/SessionRestorationLoader';
+export { SessionRestorationLoader } from './components/SessionRestorationLoader/SessionRestorationLoader';
+export type { SessionRestorationLoaderProps } from './components/SessionRestorationLoader/SessionRestorationLoader';
 
 // EVENT MANAGEMENT
 export { EventSelector } from './components/EventSelector/EventSelector';
@@ -192,20 +206,19 @@ export { EventSelector } from './components/EventSelector/EventSelector';
 export { OrganisationSelector } from './components/OrganisationSelector/OrganisationSelector';
 export { useOrganisationPermissions } from './hooks/useOrganisationPermissions';
 export { useOrganisationSecurity } from './hooks/useOrganisationSecurity';
-export { createSecureDataAccess } from './utils/secureDataAccess';
+export { createSecureDataAccess } from './utils/security/secureDataAccess';
 
 // TYPES
 export type { UserProfile } from './types/organisation';
 
 // AUTHENTICATION FORMS
-export { PasswordResetForm } from './components/PasswordReset/PasswordResetForm';
 export { PasswordChangeForm } from './components/PasswordReset/PasswordChangeForm';
 
 // UTILS & HOOKS
 export { useAppConfig } from './hooks/useAppConfig';
 export { useEventTheme } from './hooks/useEventTheme';
-export { cn } from './utils/cn';
-export { setAppConfig, getAppConfig, getCurrentAppName, getCurrentAppId } from './utils/appConfig';
+export { cn } from './utils/core/cn';
+export { setAppConfig, getAppConfig, getCurrentAppName, getCurrentAppId } from './utils/app/appConfig';
 
 // FORMATTING UTILITIES
 export { 
@@ -215,7 +228,7 @@ export {
   formatPercent,
   formatCompactNumber,
   formatFileSize
-} from './utils/formatting';
+} from './utils/formatting/formatting';
 
 // STORAGE UTILITIES
 export { FileUpload } from './components/FileUpload';

package/src/providers/services/AuthServiceProvider.tsx

@@ -12,6 +12,7 @@ import React, { createContext, useContext, useMemo, useEffect, useState } from '
 import { type SupabaseClient } from '@supabase/supabase-js';
 import { AuthService } from '../../services/AuthService';
 import type { SessionRestorationState } from '../../types/auth';
+import { logger } from '../../utils/core/logger';
 
 // Context type
 export interface AuthServiceContextType {
@@ -46,7 +47,7 @@ export function AuthServiceProvider({ children, supabaseClient, appName }: AuthS
 
       const isDev = typeof import.meta !== 'undefined' && (import.meta.env.DEV || import.meta.env.MODE === 'development');
       if (isDev) {
-        console.debug('[AuthServiceProvider] Session restoration state updated', restorationState);
+        logger.debug('AuthServiceProvider', 'Session restoration state updated', restorationState);
       }
     });
 
@@ -58,7 +59,7 @@ export function AuthServiceProvider({ children, supabaseClient, appName }: AuthS
   // Initialize service on mount
   useEffect(() => {
     authService.initialize().catch(error => {
-      console.error('[AuthServiceProvider] Failed to initialize auth service:', error);
+      logger.error('AuthServiceProvider', 'Failed to initialize auth service:', error);
     });
 
     // Cleanup on unmount

package/src/providers/services/EventServiceProvider.tsx

@@ -11,6 +11,7 @@
 import React, { createContext, useContext, useMemo, useEffect, useRef } from 'react';
 import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
 import { EventService } from '../../services/EventService';
+import { logger } from '../../utils/core/logger';
 
 // Context type
 export interface EventServiceContextType {
@@ -63,7 +64,7 @@ export function EventServiceProvider({
       // Re-initialize service when dependencies change
       await eventService.initialize().catch(error => {
         if (isMounted) {
-          console.error('[EventServiceProvider] Failed to initialize event service:', error);
+          logger.error('EventServiceProvider', 'Failed to initialize event service:', error);
         }
       });
     };

package/src/providers/services/InactivityServiceProvider.tsx

@@ -11,6 +11,7 @@
 import React, { createContext, useContext, useMemo, useEffect, useRef } from 'react';
 import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
 import { InactivityService } from '../../services/InactivityService';
+import { logger } from '../../utils/core/logger';
 
 // Context type
 export interface InactivityServiceContextType {
@@ -56,7 +57,7 @@ export function InactivityServiceProvider({
     
     inactivityService.initialize().catch(error => {
       if (isMounted) {
-        console.error('[InactivityServiceProvider] Failed to initialize inactivity service:', error);
+        logger.error('InactivityServiceProvider', 'Failed to initialize inactivity service:', error);
       }
     });
 

package/src/providers/services/OrganisationServiceProvider.tsx

@@ -11,6 +11,7 @@
 import React, { createContext, useContext, useMemo, useEffect, useRef } from 'react';
 import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
 import { OrganisationService } from '../../services/OrganisationService';
+import { logger } from '../../utils/core/logger';
 
 // Context type
 export interface OrganisationServiceContextType {
@@ -50,7 +51,7 @@ export function OrganisationServiceProvider({
     
     organisationService.initialize().catch(error => {
       if (isMounted) {
-        console.error('[OrganisationServiceProvider] Failed to initialize organisation service:', error);
+        logger.error('OrganisationServiceProvider', 'Failed to initialize organisation service:', error);
       }
     });
 

package/src/providers/services/UnifiedAuthProvider.tsx

@@ -23,6 +23,7 @@ import type { Organisation, OrganisationMembership } from '../../types/organisat
 import type { Event } from '../../types/unified';
 import type { AuthError } from '@supabase/supabase-js';
 import type { SessionRestorationState } from '../../types/auth';
+import { logger } from '../../utils/core/logger';
 
 // Re-export UserEventAccess type
 export interface UserEventAccess {
@@ -116,8 +117,8 @@ const UnifiedAuthContext = createContext<UnifiedAuthContextType | undefined>(und
 export const useUnifiedAuth = () => {
   const context = useContext(UnifiedAuthContext);
   if (!context) {
-    // Provide a helpful console error in addition to throwing for testability and DX
-    console.error('useUnifiedAuth must be used within a UnifiedAuthProvider');
+    // Provide a helpful error log in addition to throwing for testability and DX
+    logger.error('useUnifiedAuth', 'useUnifiedAuth must be used within a UnifiedAuthProvider');
     throw new Error('useUnifiedAuth must be used within a UnifiedAuthProvider');
   }
   return context;
@@ -265,7 +266,7 @@ function UnifiedAuthContextProvider({
         prevState.isAuthenticated !== currentState.isAuthenticated ||
         prevState.userEmail !== currentState.userEmail ||
         prevState.totalLoading !== currentState.totalLoading) {
-      console.log('[UnifiedAuthContext] Auth state changed:', {
+      logger.debug('UnifiedAuthContext', 'Auth state changed:', {
         isAuthenticated: isAuth,
         user: currentUser?.email,
         session: currentSession ? 'exists' : 'null',

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

@@ -13,6 +13,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
 import { AuthServiceProvider, useAuthService } from '../AuthServiceProvider';
 import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
+import { Logger, LogLevel } from '../../../utils/core/logger';
 
 // Mock Supabase client
 const createMockSupabaseClient = (): SupabaseClient => ({
@@ -76,12 +77,28 @@ function TestComponent() {
 
 describe('AuthServiceProvider Integration', () => {
   let mockSupabase: SupabaseClient;
+  let originalMode: string | undefined;
 
   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,
+    });
+    
     mockSupabase = createMockSupabaseClient();
   });
 
   afterEach(() => {
+    // Restore original mode
+    if (originalMode !== undefined) {
+      (import.meta.env as any).MODE = originalMode;
+    }
     vi.clearAllMocks();
   });
 
@@ -201,8 +218,11 @@ describe('AuthServiceProvider Integration', () => {
 
       // Error is logged during initialization
       await waitFor(() => {
-        expect(consoleSpy).toHaveBeenCalled();
-      }, { interval: 10 });
+        expect(consoleSpy).toHaveBeenCalledWith(
+          expect.stringContaining('[ERROR] [AuthServiceProvider] Failed to initialize auth service'),
+          expect.any(Error)
+        );
+      }, { interval: 10, timeout: 2000 });
 
       consoleSpy.mockRestore();
     });

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

@@ -12,6 +12,7 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
 import { UnifiedAuthProvider, useUnifiedAuth } from '../UnifiedAuthProvider';
 import { type SupabaseClient, type User, type Session } from '@supabase/supabase-js';
+import { Logger, LogLevel } from '../../../utils/core/logger';
 
 // Mock Supabase client
 const createMockSupabaseClient = (): SupabaseClient => ({
@@ -72,12 +73,28 @@ function TestComponent() {
 
 describe('UnifiedAuthProvider Integration', () => {
   let mockSupabase: SupabaseClient;
+  let originalMode: string | undefined;
 
   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,
+    });
+    
     mockSupabase = createMockSupabaseClient();
   });
 
   afterEach(() => {
+    // Restore original mode
+    if (originalMode !== undefined) {
+      (import.meta.env as any).MODE = originalMode;
+    }
     vi.clearAllMocks();
   });
 
@@ -162,8 +179,13 @@ describe('UnifiedAuthProvider Integration', () => {
       );
 
       await waitFor(() => {
-        expect(consoleSpy).toHaveBeenCalled();
-      });
+        // Check that logger.error was called (which uses console.error internally)
+        // The error could be from any of the service providers (Auth, Organisation, Event, Inactivity)
+        expect(consoleSpy).toHaveBeenCalledWith(
+          expect.stringMatching(/\[ERROR\] \[(AuthServiceProvider|OrganisationServiceProvider|EventServiceProvider|InactivityServiceProvider)\]/),
+          expect.any(Error)
+        );
+      }, { timeout: 2000 });
 
       consoleSpy.mockRestore();
     });

package/src/rbac/__tests__/cache-invalidation.test.ts

@@ -20,6 +20,22 @@ import {
 import { rbacCache, CACHE_PATTERNS } from '../cache';
 import { emitAuditEvent } from '../audit';
 
+// Mock the Logger module
+vi.mock('../../utils/core/logger', () => {
+  const mockLoggerInstance = {
+    warn: vi.fn(),
+    debug: vi.fn(),
+    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 the cache module
 vi.mock('../cache', () => ({
   rbacCache: {
@@ -365,20 +381,18 @@ describe('RBAC Cache Invalidation', () => {
 
   describe('Error Handling', () => {
     it('handles audit event errors gracefully', async () => {
+      vi.clearAllMocks();
       vi.mocked(emitAuditEvent).mockRejectedValue(new Error('Audit error'));
       
-      const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-      
       manager.invalidateUser('user-123' as const, 'test');
       
       await vi.waitFor(() => {
-        expect(consoleWarnSpy).toHaveBeenCalledWith(
-          expect.stringContaining('[RBAC Cache] Failed to log cache invalidation audit event'),
+        const logger = getMockLogger();
+        expect(vi.mocked(logger.warn)).toHaveBeenCalledWith(
+          'Failed to log cache invalidation audit event:',
           expect.any(Error)
         );
       });
-      
-      consoleWarnSpy.mockRestore();
     });
   });
 });

package/src/rbac/api.ts

@@ -26,6 +26,9 @@ import { createAuditManager, setGlobalAuditManager } from './audit';
 import { rbacCache, RBACCache, CACHE_PATTERNS } from './cache';
 import { createRBACConfig, RBACConfig, getRBACLogger } from './config';
 import { SecurityContext } from './security';
+import { createLogger } from '../utils/core/logger';
+
+const log = createLogger('RBACAPI');
 
 // Global engine instance
 let globalEngine: RBACEngine | null = null;
@@ -292,7 +295,7 @@ export async function isSuperAdmin(userId: UUID): Promise<boolean> {
 export async function getAppConfig(appId: UUID): Promise<{ requires_event: boolean } | null> {
   // This function requires a Supabase client to be provided
   // Callers should pass the client as a parameter
-  console.warn('[RBAC] getAppConfig called without Supabase client - returning null');
+  log.warn('getAppConfig called without Supabase client - returning null');
   return null;
 }
 
@@ -311,7 +314,7 @@ export async function getAppConfigWithClient(client: SupabaseClient, appId: UUID
 
     return { requires_event: data.requires_event };
   } catch (err) {
-    console.error('[RBAC] Error fetching app config:', err);
+    log.error('Error fetching app config:', err);
     return null;
   }
 }

package/src/rbac/audit-enhanced.ts

@@ -15,6 +15,7 @@ import {
   AuditEventSource, 
   RBACAuditEvent 
 } from './types';
+import { logger } from '../utils/core/logger';
 
 /**
  * Enhanced audit event payload for permission checks
@@ -154,7 +155,7 @@ export class EnhancedRBACAuditManager {
 
     // Validate required fields before attempting to insert
     if (!event.userId || !event.organisationId) {
-      console.warn('[RBAC Audit] Skipping audit event - missing required fields:', {
+      logger.warn('RBAC Audit', 'Skipping audit event - missing required fields:', {
         userId: event.userId,
         organisationId: event.organisationId,
         eventType: event.type
@@ -184,7 +185,7 @@ export class EnhancedRBACAuditManager {
 
       if (error) {
         // Log the error for debugging
-        console.warn('[RBAC Audit] Failed to insert audit event:', {
+        logger.warn('RBAC Audit', 'Failed to insert audit event:', {
           error: error.message,
           code: error.code,
           details: error.details,
@@ -199,7 +200,7 @@ export class EnhancedRBACAuditManager {
       }
     } catch (error) {
       // Log unexpected errors
-      console.error('[RBAC Audit] Unexpected error during audit logging:', error);
+      logger.error('RBAC Audit', 'Unexpected error during audit logging:', error);
       
       // Use fallback logging if enabled
       if (this.fallbackEnabled) {
@@ -215,11 +216,10 @@ export class EnhancedRBACAuditManager {
    * @param error - The error that occurred
    */
   private logFallbackEvent(event: EnhancedAuditEventPayload, error: any): void {
-    console.log('[RBAC Audit Fallback]', {
+    logger.debug('RBAC Audit Fallback', 'Database audit logging failed, using console fallback', {
       timestamp: new Date().toISOString(),
       event,
-      error: error?.message || error,
-      note: 'Database audit logging failed, using console fallback'
+      error: error?.message || error
     });
   }
 

package/src/rbac/audit.test.ts

@@ -24,6 +24,7 @@ import {
 } from './audit';
 import { UUID, AuditEventSource } from './types';
 import { Database } from '../types/database';
+import { Logger, LogLevel } from '../utils/core/logger';
 
 // Mock Supabase client
 const createMockSupabaseClient = () => {
@@ -350,17 +351,38 @@ describe('RBACAuditManager', () => {
   });
 
   describe('Fallback Logging', () => {
-    let consoleLogSpy: any;
+    let consoleDebugSpy: any;
     let consoleWarnSpy: any;
+    let consoleErrorSpy: any;
+    let originalMode: string | undefined;
 
     beforeEach(() => {
-      consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+      // 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,
+      });
+      
+      // Logger uses console.debug for debug logs, console.warn for warnings, console.error for errors
+      consoleDebugSpy = vi.spyOn(console, 'debug').mockImplementation(() => {});
       consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+      consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
     });
 
     afterEach(() => {
-      consoleLogSpy.mockRestore();
+      consoleDebugSpy.mockRestore();
       consoleWarnSpy.mockRestore();
+      consoleErrorSpy.mockRestore();
+      
+      // Restore original mode
+      if (originalMode !== undefined) {
+        (import.meta.env as any).MODE = originalMode;
+      }
     });
 
     it('uses fallback logging when database insert fails', async () => {
@@ -388,9 +410,9 @@ describe('RBACAuditManager', () => {
 
       await auditManager.emitPermissionCheck(event);
 
-      // Verify fallback logging was called
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        '[RBAC Audit Fallback]',
+      // Verify fallback logging was called (logger.debug calls console.debug)
+      expect(consoleDebugSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[RBAC Audit Fallback]'),
         expect.objectContaining({
           timestamp: expect.any(String),
           event: expect.objectContaining({
@@ -399,8 +421,7 @@ describe('RBACAuditManager', () => {
             organisationId: 'org-456',
             permission: 'read:users'
           }),
-          error: 'Database connection failed',
-          note: 'Database audit logging failed, using console fallback'
+          error: 'Database connection failed'
         })
       );
     });
@@ -421,9 +442,9 @@ describe('RBACAuditManager', () => {
 
       await auditManager.emitPermissionCheck(event);
 
-      // Verify fallback logging was called
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        '[RBAC Audit Fallback]',
+      // Verify fallback logging was called (logger.debug calls console.debug)
+      expect(consoleDebugSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[RBAC Audit Fallback]'),
         expect.objectContaining({
           timestamp: expect.any(String),
           event: expect.objectContaining({
@@ -435,8 +456,7 @@ describe('RBACAuditManager', () => {
             source: 'api',
             duration_ms: 100
           }),
-          error: 'Network error', // Error is converted to string message
-          note: 'Database audit logging failed, using console fallback'
+          error: 'Network error' // Error is converted to string message
         })
       );
     });
@@ -467,9 +487,9 @@ describe('RBACAuditManager', () => {
       await auditManager.emitPermissionCheck(event);
 
       // Verify fallback logging was NOT called
-      expect(consoleLogSpy).not.toHaveBeenCalled();
+      expect(consoleDebugSpy).not.toHaveBeenCalled();
       
-      // But warning should still be logged
+      // But warning should still be logged (logger.warn calls console.warn)
       expect(consoleWarnSpy).toHaveBeenCalled();
     });
 
@@ -499,8 +519,8 @@ describe('RBACAuditManager', () => {
 
       await auditManager.emitPermissionCheck(event);
 
-      // Verify fallback logging was called after re-enabling
-      expect(consoleLogSpy).toHaveBeenCalled();
+      // Verify fallback logging was called after re-enabling (logger.debug calls console.debug)
+      expect(consoleDebugSpy).toHaveBeenCalled();
     });
 
     it('fallback logging includes correct event data', async () => {
@@ -531,27 +551,29 @@ describe('RBACAuditManager', () => {
 
       await auditManager.emitPermissionCheck(event);
 
-      const fallbackCall = consoleLogSpy.mock.calls[0];
-      expect(fallbackCall[0]).toBe('[RBAC Audit Fallback]');
-      expect(fallbackCall[1]).toMatchObject({
-        event: {
-          type: 'permission_check',
-          userId: 'user-123',
-          organisationId: 'org-456',
-          eventId: 'event-789',
-          appId: 'app-101',
-          permission: 'read:users',
-          decision: false,
-          source: 'ui',
-          bypass: true,
-          duration_ms: 250,
-          cache_hit: true,
-          cache_source: 'memory',
-          metadata: { test: 'data' }
-        },
-        error: 'Database error',
-        note: 'Database audit logging failed, using console fallback'
-      });
+      // Logger.debug formats the message, so we check the formatted string and the data object
+      expect(consoleDebugSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[RBAC Audit Fallback]'),
+        expect.objectContaining({
+          timestamp: expect.any(String),
+          event: expect.objectContaining({
+            type: 'permission_check',
+            userId: 'user-123',
+            organisationId: 'org-456',
+            eventId: 'event-789',
+            appId: 'app-101',
+            permission: 'read:users',
+            decision: false,
+            source: 'ui',
+            bypass: true,
+            duration_ms: 250,
+            cache_hit: true,
+            cache_source: 'memory',
+            metadata: { test: 'data' }
+          }),
+          error: 'Database error'
+        })
+      );
     });
   });