@jmruthers/pace-core 0.5.142 → 0.5.144

package/dist/{chunk-TUJSIWX6.js → chunk-FC46D3KC.js}

@@ -1152,23 +1152,39 @@ var NavigationMenu = React12.forwardRef(({
   } catch (error) {
     logger.warn("NavigationMenu", "useRBAC not available, permission filtering disabled");
   }
+  const eventLoadingRaw = authContext?.eventLoading;
+  const eventLoading = eventLoadingRaw ?? false;
+  const selectedEvent = authContext?.selectedEvent || null;
+  const orgContextReady = authContext?.isContextReady ?? (authContext?.selectedOrganisation?.id ? true : false);
   const { supabase } = authContext || {};
   const { selectedOrganisation } = authContext || {};
-  const selectedEvent = authContext?.selectedEvent || null;
-  const { resolvedScope, isLoading: scopeLoading } = useResolvedScope({
-    supabase: supabase || null,
-    selectedOrganisationId: selectedOrganisation?.id || null,
-    selectedEventId: selectedEvent?.event_id || null
+  const { resolvedScope, isLoading: scopeLoading, error: scopeError } = useResolvedScope({
+    supabase: filterByPermissions ? supabase || null : null,
+    selectedOrganisationId: filterByPermissions ? selectedOrganisation?.id || null : null,
+    selectedEventId: filterByPermissions ? selectedEvent?.event_id || null : null
   });
   const stableScopeRef = React12.useRef({
     organisationId: "",
     eventId: void 0,
     appId: void 0
   });
-  if (!scopeLoading && resolvedScope?.organisationId) {
-    const newOrgId = resolvedScope.organisationId;
-    const newEventId = resolvedScope.eventId;
-    const newAppId = resolvedScope.appId;
+  const effectiveScope = React12.useMemo(() => {
+    if (!scopeLoading && resolvedScope?.organisationId) {
+      return resolvedScope;
+    } else if (!scopeLoading && selectedOrganisation?.id) {
+      return {
+        organisationId: selectedOrganisation.id,
+        eventId: selectedEvent?.event_id || void 0,
+        appId: void 0
+        // App ID will be resolved by usePermissions if needed
+      };
+    }
+    return null;
+  }, [scopeLoading, resolvedScope, selectedOrganisation?.id, selectedEvent?.event_id]);
+  if (effectiveScope?.organisationId) {
+    const newOrgId = effectiveScope.organisationId;
+    const newEventId = effectiveScope.eventId;
+    const newAppId = effectiveScope.appId;
     if (stableScopeRef.current.organisationId !== newOrgId || stableScopeRef.current.eventId !== newEventId || stableScopeRef.current.appId !== newAppId) {
       stableScopeRef.current = {
         organisationId: newOrgId,
@@ -1176,7 +1192,7 @@ var NavigationMenu = React12.forwardRef(({
         appId: newAppId
       };
     }
-  } else if (!scopeLoading && !resolvedScope) {
+  } else if (!scopeLoading && !effectiveScope) {
     if (stableScopeRef.current.organisationId !== "") {
       stableScopeRef.current = {
         organisationId: "",
@@ -1194,7 +1210,12 @@ var NavigationMenu = React12.forwardRef(({
   const previousFilteredItemsRef = React12.useRef([]);
   const filteredItems = React12.useMemo(() => {
     if (filterByPermissions) {
-      if (!authContext || !rbacContext || scopeLoading || !resolvedScope?.organisationId) {
+      const isOrgContextReady = orgContextReady && selectedOrganisation?.id;
+      const isEventContextReady = eventLoadingRaw === void 0 ? true : !eventLoading;
+      const hasValidContext = isOrgContextReady && isEventContextReady;
+      const shouldWaitForScope = scopeLoading || !hasValidContext;
+      const shouldRetryAfterError = scopeError && hasValidContext && !scopeLoading;
+      if (!authContext || !rbacContext || shouldWaitForScope && !shouldRetryAfterError) {
         return [];
       }
       if (permissionsLoading) {
@@ -1327,24 +1348,32 @@ var NavigationMenu = React12.forwardRef(({
     permissionMap,
     hasAnyPermission,
     scopeLoading,
+    scopeError,
     permissionsLoading,
     resolvedScope,
-    auditLog
+    effectiveScope,
+    auditLog,
+    // Add event context state to dependencies so we re-check permissions when event context becomes available
+    eventLoadingRaw,
+    eventLoading,
+    selectedEvent,
+    orgContextReady,
+    selectedOrganisation?.id
   ]);
   React12.useEffect(() => {
     if (auditLog && authContext) {
+      const currentItem = items?.find((item) => item.href === currentPath || item.id === "navigation-menu");
       logger.debug("NavigationMenu", "Navigation access attempt:", {
-        itemId: "navigation-menu",
-        label: "Navigation Menu",
+        itemId: currentItem?.id || "navigation-menu",
+        label: currentItem?.label || "Navigation Menu",
         href: currentPath,
-        // RBAC properties removed - use useRBAC() hook instead
-        permissions: null,
-        roles: null,
-        accessLevel: null,
+        permissions: currentItem?.permissions || null,
+        roles: currentItem?.roles || null,
+        accessLevel: currentItem?.accessLevel || null,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       });
     }
-  }, [auditLog, authContext, currentPath]);
+  }, [auditLog, authContext, currentPath, items]);
   const handleHierarchicalKeyDown = (event, item) => {
     switch (event.key) {
       case "Enter":
@@ -4553,4 +4582,4 @@ export {
   EventLogoCompact,
   EventLogoLarge
 };
-//# sourceMappingURL=chunk-TUJSIWX6.js.map
+//# sourceMappingURL=chunk-FC46D3KC.js.map