@jmruthers/pace-core 0.5.176 → 0.5.178

package/docs/api/interfaces/UserMenuProps.md

@@ -1,4 +1,4 @@
-[@jmruthers/pace-core - v0.5.176](../README.md) / [Exports](../modules.md) / UserMenuProps
+[@jmruthers/pace-core - v0.5.178](../README.md) / [Exports](../modules.md) / UserMenuProps
 
 # Interface: UserMenuProps
 

package/docs/api/interfaces/UserProfile.md

@@ -1,4 +1,4 @@
-[@jmruthers/pace-core - v0.5.176](../README.md) / [Exports](../modules.md) / UserProfile
+[@jmruthers/pace-core - v0.5.178](../README.md) / [Exports](../modules.md) / UserProfile
 
 # Interface: UserProfile
 

package/docs/api/modules.md

@@ -1,6 +1,6 @@
-[@jmruthers/pace-core - v0.5.176](README.md) / Exports
+[@jmruthers/pace-core - v0.5.178](README.md) / Exports
 
-# @jmruthers/pace-core - v0.5.176
+# @jmruthers/pace-core - v0.5.178
 
 **`File`**
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jmruthers/pace-core",
-  "version": "0.5.176",
+  "version": "0.5.178",
   "description": "Clean, modern React component library with Tailwind v4 styling and native utilities",
   "private": false,
   "publishConfig": {

package/src/components/PaceAppLayout/PaceAppLayout.tsx

@@ -550,12 +550,9 @@ export function PaceAppLayout({
         return;
       }
 
-      // Check if organisation context is available
-      const scope = {
-        organisationId: user.user_metadata?.organisationId || user.app_metadata?.organisationId,
-        eventId: user.user_metadata?.eventId || user.app_metadata?.eventId,
-        appId: user.user_metadata?.appId || user.app_metadata?.appId,
-      };
+      // Use the scope from context (includes selectedOrganisation and selectedEvent)
+      // This is critical for event-based apps where event context comes from EventService, not user metadata
+      const currentScope = scope;
 
       // For super admins, show all items (they bypass permission checks)
       // Gracefully handle RBAC not being initialized (e.g., in tests)
@@ -584,7 +581,7 @@ export function PaceAppLayout({
 
       // If no organisation context yet, show all items until context is ready
       // This prevents navigation from being empty while context loads
-      if (!scope.organisationId) {
+      if (!currentScope.organisationId) {
         if (isMounted) {
           setFilteredMenuItems(baseMenuItems);
         }
@@ -598,7 +595,7 @@ export function PaceAppLayout({
         const { getPermissionMap } = await import('../../rbac/api');
         const permissionMap = await getPermissionMap({
           userId: user.id,
-          scope,
+          scope: currentScope,
         });
 
         // Filter items using the permission map (synchronous, no rate limit issues)
@@ -639,7 +636,7 @@ export function PaceAppLayout({
     return () => {
       isMounted = false;
     };
-  }, [baseMenuItems, filterNavigationByPermissions, pageIdMapping, routePermissions, defaultPermission, can, user?.id, user?.user_metadata, user?.app_metadata]);
+  }, [baseMenuItems, filterNavigationByPermissions, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope]);
 
   // NEW: Phase 2 - Enhanced Routing Features
   // Check route access for role-based routing

package/src/rbac/hooks/useRBAC.ts

@@ -232,7 +232,7 @@ export function useRBAC(pageId?: string): UserRBACContext {
     } finally {
       setIsLoading(false);
     }
-  }, [appName, logger, resetState, selectedEvent, selectedEvent?.event_id, selectedOrganisation, selectedOrganisation?.id, session, user, requiresEvent, eventLoading, appConfig, orgContextReady, orgLoading]);
+  }, [appName, logger, resetState, selectedEvent?.event_id, selectedOrganisation?.id, session, user, requiresEvent, eventLoading, appConfig, orgContextReady, orgLoading]);
 
   const hasGlobalPermission = useCallback(
     (permission: string): boolean => {
@@ -266,6 +266,7 @@ export function useRBAC(pageId?: string): UserRBACContext {
       requiresEvent,
       eventLoading,
       hasSelectedEvent: !!selectedEvent,
+      selectedEventId: selectedEvent?.event_id,
       hasUser: !!user,
       hasSession: !!session,
       hasSelectedOrganisation: !!selectedOrganisation,
@@ -274,7 +275,7 @@ export function useRBAC(pageId?: string): UserRBACContext {
       orgLoading
     });
     loadRBACContext();
-  }, [loadRBACContext, appName, requiresEvent, eventLoading, selectedEvent, user, session, selectedOrganisation, orgContextReady, orgLoading]);
+  }, [loadRBACContext, appName, requiresEvent, eventLoading, selectedEvent?.event_id, user, session, selectedOrganisation?.id, orgContextReady, orgLoading]);
 
   return {
     user,