@jmruthers/pace-core 0.5.193 → 0.6.2

package/src/components/PaceAppLayout/PaceAppLayout.test.tsx

@@ -273,7 +273,7 @@ const TestWrapper = ({ children }: { children: React.ReactNode }) => (
 );
 
 describe('PaceAppLayout Component', () => {
-  const defaultProps = {
+  const baseProps = {
     appName: 'Test App',
   };
 
@@ -296,7 +296,7 @@ describe('PaceAppLayout Component', () => {
     it('renders with default props', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -309,7 +309,7 @@ describe('PaceAppLayout Component', () => {
     it('renders with custom app name', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} appName="Custom App" />
+          <PaceAppLayout {...baseProps} appName="Custom App" />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -325,7 +325,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} navItems={customNavItems} />
+          <PaceAppLayout {...baseProps} navItems={customNavItems} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -337,7 +337,7 @@ describe('PaceAppLayout Component', () => {
     it('renders with default navigation items when none provided', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -352,7 +352,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} headerActions={headerActions} />
+          <PaceAppLayout {...baseProps} headerActions={headerActions} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -365,7 +365,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} customLogo={customLogo} />
+          <PaceAppLayout {...baseProps} customLogo={customLogo} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -378,7 +378,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} customUserMenu={customUserMenu} />
+          <PaceAppLayout {...baseProps} customUserMenu={customUserMenu} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -389,7 +389,7 @@ describe('PaceAppLayout Component', () => {
     it('renders with custom header className', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} headerClassName="custom-header" />
+          <PaceAppLayout {...baseProps} headerClassName="custom-header" />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -402,7 +402,7 @@ describe('PaceAppLayout Component', () => {
     it('uses default header className when not provided', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -416,7 +416,7 @@ describe('PaceAppLayout Component', () => {
     it('shows event selector by default', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -427,7 +427,7 @@ describe('PaceAppLayout Component', () => {
     it('hides event selector when showEventSelector is false', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} showEventSelector={false} />
+          <PaceAppLayout {...baseProps} showEventSelector={false} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -438,7 +438,7 @@ describe('PaceAppLayout Component', () => {
     it('shows event selector when showEventSelector is explicitly true', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} showEventSelector={true} />
+          <PaceAppLayout {...baseProps} showEventSelector={true} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -451,7 +451,7 @@ describe('PaceAppLayout Component', () => {
     it('shows user menu by default', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -462,7 +462,7 @@ describe('PaceAppLayout Component', () => {
     it('hides user menu when showUserMenu is false', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} showUserMenu={false} />
+          <PaceAppLayout {...baseProps} showUserMenu={false} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -476,7 +476,7 @@ describe('PaceAppLayout Component', () => {
       const user = userEvent.setup();
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -489,7 +489,7 @@ describe('PaceAppLayout Component', () => {
       const user = userEvent.setup();
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -507,7 +507,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} navItems={customNavItems} />
+          <PaceAppLayout {...baseProps} navItems={customNavItems} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -522,7 +522,7 @@ describe('PaceAppLayout Component', () => {
     it('passes current path to header', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} />
+          <PaceAppLayout {...baseProps} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -536,7 +536,7 @@ describe('PaceAppLayout Component', () => {
     it('renders normally when enforcePermissions is false', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={false} />
+          <PaceAppLayout {...baseProps} enforcePermissions={false} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -575,7 +575,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={true} />
+          <PaceAppLayout {...baseProps} enforcePermissions={true} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -602,7 +602,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={true} />
+          <PaceAppLayout {...baseProps} enforcePermissions={true} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -635,7 +635,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={true} />
+          <PaceAppLayout {...baseProps} enforcePermissions={true} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -667,7 +667,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={true} />
+          <PaceAppLayout {...baseProps} enforcePermissions={true} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -704,7 +704,7 @@ describe('PaceAppLayout Component', () => {
       
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={true} />
+          <PaceAppLayout {...baseProps} enforcePermissions={true} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -742,7 +742,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true} 
             permissionFallback={customFallback}
           />
@@ -778,7 +778,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
             enforcePagePermissions={true}
             pagePermissionFallback={pageFallback}
@@ -814,7 +814,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             navItems={customNavItems}
             enforcePermissions={true}
             routePermissions={{
@@ -850,7 +850,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             navItems={customNavItems}
             enforcePermissions={false}
             routePermissions={{
@@ -875,7 +875,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
             routePermissions={{
               '/dashboard': 'update',
@@ -889,7 +889,7 @@ describe('PaceAppLayout Component', () => {
       );
       
       await waitFor(() => {
-        // useCan is called with userId, scope, permission, pageId, useCache, appName
+        // useCan is called with userId, scope, permission, pageId, useCache, precomputedSuperAdmin, appName
         expect(mockUseCan).toHaveBeenCalledWith(
           'user-123',
           expect.objectContaining({
@@ -900,6 +900,7 @@ describe('PaceAppLayout Component', () => {
           'update:page.dashboard-page',
           'dashboard-page',
           true,
+          expect.any(Boolean), // precomputedSuperAdmin - can be false, null, or undefined during checks
           'Test App'
         );
       }, { timeout: 2000 });
@@ -909,7 +910,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
             defaultPermission="create"
             routePermissions={{
@@ -921,7 +922,7 @@ describe('PaceAppLayout Component', () => {
       );
       
       await waitFor(() => {
-        // useCan is called with userId, scope, permission, pageId, useCache, appName
+        // useCan is called with userId, scope, permission, pageId, useCache, precomputedSuperAdmin, appName
         // Uses defaultPermission "create" since /dashboard is not in routePermissions
         expect(mockUseCan).toHaveBeenCalledWith(
           'user-123',
@@ -933,6 +934,7 @@ describe('PaceAppLayout Component', () => {
           'create:page.dashboard',
           'dashboard',
           true,
+          expect.any(Boolean), // precomputedSuperAdmin - can be false, null, or undefined during checks
           'Test App'
         );
       }, { timeout: 2000 });
@@ -947,7 +949,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
           />
         </TestWrapper>,
@@ -976,7 +978,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
             onPageAccessDenied={onPageAccessDenied}
           />
@@ -1004,7 +1006,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
             strictMode={true}
             onStrictModeViolation={onStrictModeViolation}
@@ -1036,7 +1038,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             roleBasedRouting={true}
             routeConfig={routeConfig}
             onRouteAccessDenied={onRouteAccessDenied}
@@ -1065,7 +1067,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             roleBasedRouting={true}
             routeConfig={routeConfig}
             strictMode={true}
@@ -1107,7 +1109,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <FallbackWrapper>
           <PaceAppLayout
-            {...defaultProps}
+            {...baseProps}
             roleBasedRouting={true}
             strictMode={true}
             fallbackRoute="/no-access"
@@ -1151,7 +1153,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
           />
         </TestWrapper>,
@@ -1193,7 +1195,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             enforcePermissions={true}
           />
         </TestWrapper>,
@@ -1217,7 +1219,7 @@ describe('PaceAppLayout Component', () => {
       it('renders with proper semantic HTML elements', () => {
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1230,7 +1232,7 @@ describe('PaceAppLayout Component', () => {
       it('provides proper main content area', () => {
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1243,7 +1245,7 @@ describe('PaceAppLayout Component', () => {
       it('renders main content area with proper styling', () => {
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1257,7 +1259,7 @@ describe('PaceAppLayout Component', () => {
       it('has accessible navigation', () => {
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1269,7 +1271,7 @@ describe('PaceAppLayout Component', () => {
       it('has accessible user menu', () => {
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1283,7 +1285,7 @@ describe('PaceAppLayout Component', () => {
       it('provides meaningful text for screen readers', () => {
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1298,7 +1300,7 @@ describe('PaceAppLayout Component', () => {
         const user = userEvent.setup();
         renderWithProviders(
           <TestWrapper>
-            <PaceAppLayout {...defaultProps} />
+            <PaceAppLayout {...baseProps} />
           </TestWrapper>,
           { withRouter: false }
         );
@@ -1314,7 +1316,7 @@ describe('PaceAppLayout Component', () => {
     it('handles empty navigation items array', () => {
       renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} navItems={[]} />
+          <PaceAppLayout {...baseProps} navItems={[]} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -1332,7 +1334,7 @@ describe('PaceAppLayout Component', () => {
       renderWithProviders(
         <TestWrapper>
           <PaceAppLayout 
-            {...defaultProps} 
+            {...baseProps} 
             navItems={navItemsWithoutHref}
             enforcePermissions={false}
           />
@@ -1349,7 +1351,7 @@ describe('PaceAppLayout Component', () => {
       // without breaking. We don't enforce permissions to simplify the test.
       const { rerender } = renderWithProviders(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={false} />
+          <PaceAppLayout {...baseProps} enforcePermissions={false} />
         </TestWrapper>,
         { withRouter: false }
       );
@@ -1363,7 +1365,7 @@ describe('PaceAppLayout Component', () => {
       mockLocation.pathname = '/settings';
       rerender(
         <TestWrapper>
-          <PaceAppLayout {...defaultProps} enforcePermissions={false} />
+          <PaceAppLayout {...baseProps} enforcePermissions={false} />
         </TestWrapper>
       );
       

package/src/components/PaceAppLayout/PaceAppLayout.tsx

@@ -86,7 +86,7 @@
  * - Permission-based route protection
  *
  * @dependencies
- * - React 18+ - Component framework
+ * - React 19+ - Component framework
  * - React Router v6 - Routing
  * - UnifiedAuthProvider - Authentication
  * - usePermissionCache - Permission management
@@ -121,6 +121,10 @@ import type { PasswordChangeFormError } from '../PasswordChange/PasswordChangeFo
 // Define Operation type locally since old RBAC types are removed
 type Operation = 'read' | 'create' | 'update' | 'delete' | 'manage';
 
+/**
+ * Props for the PaceAppLayout component.
+ * Configures the application layout including navigation, header, and footer.
+ */
 export interface PaceAppLayoutProps {
   /** The name of the application to be displayed in the header. */
   appName: string;
@@ -524,12 +528,15 @@ export function PaceAppLayout({
   // Pass appName to useCan so it can be passed to isPermitted for PORTAL/ADMIN special case
   // Only check permissions if enforcePermissions is true and we have a valid permission string
   const shouldCheckPermission = enforcePermissions && !!currentPermission && !!currentPageId;
+  // Pass super admin status to avoid duplicate check - use null if still checking, false/true if known
+  const superAdminStatus = isSuperAdminFromRBAC ? true : (isCheckingSuperAdminDirect ? null : isSuperAdminDirect);
   const { can: canFromHook, isLoading: isCheckingPermission, error: permissionError } = useCan(
     user?.id || '',
     scope,
     shouldCheckPermission ? currentPermission : ('' as Permission),
     shouldCheckPermission ? currentPageId : '',
     true, // useCache
+    superAdminStatus, // Pass super admin status to avoid duplicate check
     appName // Pass appName for PORTAL/ADMIN special case
   );
 
@@ -817,25 +824,39 @@ export function PaceAppLayout({
   }, [roleBasedRouting, routeConfig, location.pathname, strictMode, user?.id, fallbackRoute, scope, navigate, auditLog, onRouteAccessDenied, onRouteStrictModeViolation]);
 
   const handleSignOut = async () => {
-    await signOut();
+    try {
+      await signOut();
+    } catch (error) {
+      logger.error('PaceAppLayout', 'Failed to sign out', { error: error instanceof Error ? error.message : String(error) });
+    }
   };
 
   const handleChangePassword = async (newPassword: string, confirmPassword: string) => {
-    // The form component in UserMenu already checks for matching passwords
-    const result = await updatePassword(newPassword);
-    if (result?.error) {
-      // The form will display the error message
-      logger.error('PaceAppLayout', 'Failed to change password', { error: result.error.message });
-      // Convert AuthError to PasswordChangeFormError
+    try {
+      // The form component in UserMenu already checks for matching passwords
+      const result = await updatePassword(newPassword);
+      if (result?.error) {
+        // The form will display the error message
+        logger.error('PaceAppLayout', 'Failed to change password', { error: result.error.message });
+        // Convert AuthError to PasswordChangeFormError
+        return {
+          error: {
+            message: result.error.message,
+            code: result.error.name || 'PASSWORD_UPDATE_ERROR'
+          }
+        };
+      }
+      // The form will handle closing the modal on success
+      return {};
+    } catch (error) {
+      logger.error('PaceAppLayout', 'Failed to change password', { error: error instanceof Error ? error.message : String(error) });
       return {
         error: {
-          message: result.error.message,
-          code: result.error.name || 'PASSWORD_UPDATE_ERROR'
+          message: error instanceof Error ? error.message : 'An unexpected error occurred',
+          code: 'PASSWORD_UPDATE_ERROR'
         }
       };
     }
-    // The form will handle closing the modal on success
-    return {};
   };
 
   // CRITICAL: Wait for organisation context to be ready before proceeding

package/src/components/PaceAppLayout/README.md

@@ -309,7 +309,7 @@ function App() {
 
 ## Dependencies
 
-- React 18+
+- React 19+
 - React Router v6
 - UnifiedAuthProvider
 - Header component

package/src/components/PaceAppLayout/test-setup.tsx

@@ -1,3 +1,4 @@
+/// <reference types="vitest/globals" />
 /**
  * @file Shared Test Setup for PaceAppLayout Tests
  * @package @jmruthers/pace-core
@@ -10,8 +11,6 @@
  * provides the shared mock data and reset functions that can be imported and used
  * in the vi.mock() factory functions.
  */
-
-import { vi } from 'vitest';
 import React from 'react';
 
 // === MOCK DATA ===

package/src/components/PaceLoginPage/PaceLoginPage.tsx

@@ -111,7 +111,7 @@
  * - Automatic redirect prevention loops
  *
  * @dependencies
- * - React 18+ - Hooks and effects
+ * - React 19+ - Hooks and effects
  * - React Router v6 - Navigation
  * - UnifiedAuthProvider - Authentication
  * - LoginForm component
@@ -131,6 +131,9 @@ import { clearPalette } from '../../theming/runtime';
 import { EventServiceContext } from '../../providers/services/EventServiceProvider';
 import { logger } from '../../utils/core/logger';
 
+/**
+ * Props for the PaceLoginPage component.
+ */
 export interface PaceLoginPageProps {
   /** The name of the application to be displayed on the login form. */
   appName: string;