@jmruthers/pace-core 0.6.11 → 0.6.12

package/dist/{DataTable-EFYP2QLE.js → DataTable-AQAHSFLM.js}

@@ -1,15 +1,16 @@
-export { ActionButtons, BulkOperationsDropdown, ColumnFactory, ColumnVisibilityDropdown, DataTable, DataTableCore, DataTableErrorBoundary, DataTableModals, DataTableToolbar, EditableRow, EmptyState, EnhancedPaginationControls, GroupingDropdown, ImportModal, LoadingState, PaginationControls, SortIndicator, UnifiedTableBody, announce, announceBulkOperation, announceFilterChange, announceLoadingState, announcePaginationChange, announceSearchResults, announceSelectionChange, announceSortChange, average, calculateAllDepths, calculateAllIndentation, calculateIndentation, calculateOptimalPageSize, cleanupLiveRegion, count, createHierarchicalStructure, defaultDataTableFeatures, exportToCSV, exportToCSVWithTableRows, findSelectLabel, generateCSVContent, getAriaSortState, getAriaSortValue, getCellRenderer, getColumnHeaderText, getHierarchicalSortConfig, getPageSizeOptions, getPaginationBinding, getRowDepth, getRowDescription, getRowIdSafe, getSortButtonLabel, groupHierarchicalData, hasValidRowId, initializeLiveRegion, isHierarchicalSortableColumn, max, min, normalizeDataTableFeatures, optionMatchesSearch, shouldShowColumnForRow, sortHierarchicalDataByStructure, sortHierarchicalDataWithSorting, sum, validateHierarchicalData, validatePaginationConfig } from './chunk-2OEVOGGR.js';
-import './chunk-V7FTM2LU.js';
+export { ActionButtons, BulkOperationsDropdown, ColumnFactory, ColumnVisibilityDropdown, DataTable, DataTableCore, DataTableErrorBoundary, DataTableModals, DataTableToolbar, EditableRow, EmptyState, EnhancedPaginationControls, GroupingDropdown, ImportModal, LoadingState, PaginationControls, SortIndicator, UnifiedTableBody, announce, announceBulkOperation, announceFilterChange, announceLoadingState, announcePaginationChange, announceSearchResults, announceSelectionChange, announceSortChange, average, calculateAllDepths, calculateAllIndentation, calculateIndentation, calculateOptimalPageSize, cleanupLiveRegion, count, createHierarchicalStructure, defaultDataTableFeatures, exportToCSV, exportToCSVWithTableRows, findSelectLabel, generateCSVContent, getAriaSortState, getAriaSortValue, getCellRenderer, getColumnHeaderText, getHierarchicalSortConfig, getPageSizeOptions, getPaginationBinding, getRowDepth, getRowDescription, getRowIdSafe, getSortButtonLabel, groupHierarchicalData, hasValidRowId, initializeLiveRegion, isHierarchicalSortableColumn, max, min, normalizeDataTableFeatures, optionMatchesSearch, shouldShowColumnForRow, sortHierarchicalDataByStructure, sortHierarchicalDataWithSorting, sum, validateHierarchicalData, validatePaginationConfig } from './chunk-Y2LWSLLB.js';
+import './chunk-H6RTU4DZ.js';
 export { CircuitBreaker, DEFAULT_FALLBACK_CONFIG, DataChunkManager, DataTableError, DataTableErrorType, ErrorRecoveryManager, MemoryMonitor, SearchIndex, VisibilityTracker, chunkData, debounce, determinePaginationMode, getOptimalPageSizeOptions, safeExecute, throttle, useDataTablePerformance } from './chunk-ENLXB7GP.js';
-import './chunk-L5LFKKLJ.js';
-import './chunk-4R3T5ENU.js';
+import './chunk-2GBDPPUC.js';
+import './chunk-S57OLCLO.js';
 import './chunk-D6BMFMQZ.js';
-import './chunk-7A6IMHH2.js';
+import './chunk-YFGNMB67.js';
 import './chunk-QRYSEPHB.js';
 import './chunk-4SXLQIZO.js';
 import './chunk-DDMPHZ3D.js';
-import './chunk-UZNAFKGW.js';
+import './chunk-VFLR5K2H.js';
 import './chunk-RMLY6KB5.js';
+import './chunk-GHCUP64P.js';
 import './chunk-BTHN5MKC.js';
 import './chunk-44CNXN4P.js';
 import './chunk-CU2BU2MQ.js';

package/dist/{api-BZR2CYXL.js → api-6OQXYT67.js}

@@ -1,5 +1,6 @@
-export { OrganisationContextRequiredError, clearCache, getAccessLevel, getPageScopeType, getPermissionMap, getRoleContext, hasAllPermissions, hasAnyPermission, invalidateAppCache, invalidateEventCache, invalidateOrganisationCache, invalidateUserCache, isEventAdmin, isOrganisationAdmin, isPermitted, isPermittedCached, isRBACInitialized, isSuperAdmin, resolveAppContext, setupRBAC } from './chunk-7A6IMHH2.js';
+export { OrganisationContextRequiredError, clearCache, getAccessLevel, getPageScopeType, getPermissionMap, getRoleContext, hasAllPermissions, hasAnyPermission, invalidateAppCache, invalidateEventCache, invalidateOrganisationCache, invalidateUserCache, isEventAdmin, isOrganisationAdmin, isPermitted, isPermittedCached, isRBACInitialized, isSuperAdmin, resolveAppContext, setupRBAC } from './chunk-YFGNMB67.js';
 import './chunk-QRYSEPHB.js';
+import './chunk-GHCUP64P.js';
 import './chunk-BTHN5MKC.js';
 import './chunk-44CNXN4P.js';
 import './chunk-3RG5ZIWI.js';

package/dist/{chunk-L5LFKKLJ.js → chunk-2GBDPPUC.js}

@@ -1,4 +1,4 @@
-import { UnifiedAuthContext } from './chunk-4R3T5ENU.js';
+import { UnifiedAuthContext } from './chunk-S57OLCLO.js';
 import { createContext, useContext, useMemo } from 'react';
 
 var PublicPageContext = createContext(void 0);

package/dist/{chunk-J2KQK6DG.js → chunk-AP5FG7W4.js}

@@ -1,4 +1,4 @@
-import { EventServiceContext } from './chunk-4R3T5ENU.js';
+import { EventServiceContext } from './chunk-S57OLCLO.js';
 import { clearPalette, parseAndNormalizeEventColours, applyPalette } from './chunk-D6BMFMQZ.js';
 import { assertAppId } from './chunk-4SXLQIZO.js';
 import { fetchPlaceDetails, createAddressFromPlaceResult, getAddressByPlaceId, fetchPlaceAutocomplete, setOrganisationContext } from './chunk-XPFVT3GN.js';
@@ -1316,7 +1316,7 @@ var FileReferenceServiceImpl = class {
   async checkSuperAdminUser(userId) {
     if (!userId) return false;
     try {
-      const { isSuperAdmin } = await import('./api-BZR2CYXL.js');
+      const { isSuperAdmin } = await import('./api-6OQXYT67.js');
       const superResult = await isSuperAdmin(userId);
       if (superResult.ok && superResult.data) {
         log3.debug("Super admin detected - bypassing permission checks", { userId });

package/dist/{chunk-UZNAFKGW.js → chunk-GHCUP64P.js}

@@ -1,12 +1,5 @@
 import { createLogger } from './chunk-BTHN5MKC.js';
 import { __require } from './chunk-3RG5ZIWI.js';
-import { clsx } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-import { jsx } from 'react/jsx-runtime';
-
-function cn(...inputs) {
-  return twMerge(clsx(inputs));
-}
 
 // src/utils/app/appNameResolver.ts
 var log = createLogger("AppNameResolver");
@@ -108,18 +101,5 @@ function setRBACAppName(appName) {
 function getCurrentAppNameWithFallback(fallback = "default-app") {
   return getCurrentAppName() || fallback;
 }
-var LoadingSpinner = ({
-  size = "md",
-  className = ""
-}) => {
-  const sizeClasses = {
-    sm: "size-4",
-    md: "size-6",
-    lg: "size-8"
-  };
-  const validSize = size && size in sizeClasses ? size : "md";
-  const sizeClass = sizeClasses[validSize];
-  return /* @__PURE__ */ jsx("canvas", { className: `inline-block animate-spin rounded-full border-2 border-solid border-current border-r-transparent motion-reduce:animate-[spin_1.5s_linear_infinite] ${sizeClass} ${className}`.trim(), role: "status", children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Loading..." }) });
-};
 
-export { LoadingSpinner, cn, getAppNameFromBuildTime, getAppNameFromEnvironment, getAppNameFromGlobal, getAppNameFromPackageJson, getCurrentAppName, getCurrentAppNameWithFallback, setRBACAppName };
+export { getAppNameFromBuildTime, getAppNameFromEnvironment, getAppNameFromGlobal, getAppNameFromPackageJson, getCurrentAppName, getCurrentAppNameWithFallback, setRBACAppName };

package/dist/{chunk-V7FTM2LU.js → chunk-H6RTU4DZ.js}

@@ -1,6 +1,7 @@
-import { useAppConfig } from './chunk-L5LFKKLJ.js';
-import { OrganisationContextRequiredError, getAccessLevel, getRBACLogger, isPermittedCached, isPermitted, getPermissionMap } from './chunk-7A6IMHH2.js';
-import { cn, getCurrentAppName } from './chunk-UZNAFKGW.js';
+import { useAppConfig } from './chunk-2GBDPPUC.js';
+import { OrganisationContextRequiredError, getAccessLevel, getRBACLogger, isPermittedCached, isPermitted, getRBACConfig, getPermissionMap } from './chunk-YFGNMB67.js';
+import { cn } from './chunk-VFLR5K2H.js';
+import { getCurrentAppName } from './chunk-GHCUP64P.js';
 import { createLogger } from './chunk-BTHN5MKC.js';
 import * as React3 from 'react';
 import { useState, useEffect, useMemo, useCallback, useRef } from 'react';
@@ -340,8 +341,9 @@ function useResolvedScope({
   selectedEventId,
   selectedEventOrganisationId
 }) {
-  const immediateOrganisationId = selectedEventOrganisationId || selectedOrganisationId || void 0;
-  const immediateEventId = selectedEventId || void 0;
+  const rawOrgId = selectedEventOrganisationId || selectedOrganisationId || void 0;
+  const immediateOrganisationId = typeof rawOrgId === "string" && rawOrgId.trim() !== "" ? rawOrgId.trim() : void 0;
+  const immediateEventId = typeof selectedEventId === "string" && selectedEventId.trim() !== "" ? selectedEventId.trim() : void 0;
   const [appId, setAppId] = useState(void 0);
   const [isResolvingAppId, setIsResolvingAppId] = useState(false);
   const [error, setError] = useState(null);
@@ -422,10 +424,11 @@ function useResolvedScope({
   }, [supabase, selectedOrganisationId, selectedEventId]);
   const immediateScope = useMemo(() => {
     if (appName === "PORTAL" || appName === "ADMIN") {
+      if (!appId) return null;
       return {
         organisationId: void 0,
         eventId: void 0,
-        appId: appId || void 0
+        appId
       };
     }
     const scope = {};
@@ -438,7 +441,7 @@ function useResolvedScope({
     if (appId) {
       scope.appId = appId;
     }
-    if (!scope.organisationId && !scope.appId) {
+    if (!scope.organisationId && !scope.eventId && !scope.appId) {
       return null;
     }
     return scope;
@@ -464,7 +467,7 @@ function useAccessLevel(userId, scope) {
     try {
       setIsLoading(true);
       setError(null);
-      const { isSuperAdmin: checkSuperAdmin } = await import('./api-BZR2CYXL.js');
+      const { isSuperAdmin: checkSuperAdmin } = await import('./api-6OQXYT67.js');
       const superResult = await checkSuperAdmin(userId);
       if (!superResult.ok) {
         setError(new Error(superResult.error.message));
@@ -551,14 +554,21 @@ async function runPermissionCheck(params) {
   }
   const isPageName = pageId && typeof pageId === "string" && !UUID_REGEX.test(pageId);
   const needsAppIdForPageName = isPagePermission && !!isPageName;
-  if (needsAppIdForPageName && isEmptyString(appId)) {
+  if (needsAppIdForPageName && isEmptyString(appId) && isEmptyString(eventId)) {
     return { ok: true, data: false };
   }
   const validScope = {
-    ...organisationId ? { organisationId } : {},
-    ...eventId ? { eventId } : {},
-    ...appId ? { appId } : {}
+    ...!isEmptyString(organisationId) && organisationId ? { organisationId } : {},
+    ...!isEmptyString(eventId) && eventId ? { eventId } : {},
+    ...!isEmptyString(appId) && appId ? { appId } : {}
   };
+  if (!validScope.organisationId && !validScope.eventId && !validScope.appId) {
+    return { ok: true, data: false };
+  }
+  const config = getRBACConfig();
+  if (config?.debug || config?.logLevel === "debug") {
+    getRBACLogger().debug("[RBAC] runPermissionCheck", { scope: validScope, permission, pageId, useCache });
+  }
   if (useCache) {
     return isPermittedCached({ userId, scope: validScope, permission, pageId }, appName);
   }
@@ -589,7 +599,7 @@ function useSuperAdminForCan(userId, precomputedSuperAdmin) {
     const checkSuperAdmin = async () => {
       const startTime = Date.now();
       try {
-        const { isSuperAdmin: checkSuperAdminFn } = await import('./api-BZR2CYXL.js');
+        const { isSuperAdmin: checkSuperAdminFn } = await import('./api-6OQXYT67.js');
         const timeoutWarning = setTimeout(() => {
           if (!cancelled) {
             getRBACLogger().warn("[useCan] Super admin check taking longer than 5 seconds", {
@@ -640,7 +650,7 @@ function useCan(userId, scope, permission, pageId, useCache = true, precomputedS
   const [can, setCan] = useState(initialCan);
   const [isLoading, setIsLoading] = useState(initialIsLoading);
   const [error, setError] = useState(null);
-  const isValidScope = scope && typeof scope === "object";
+  const isValidScope = scope != null && typeof scope === "object" && !!(scope.organisationId || scope.eventId || scope.appId);
   const organisationId = isValidScope ? scope.organisationId : void 0;
   const eventId = isValidScope ? scope.eventId : void 0;
   const appId = isValidScope ? scope.appId : void 0;
@@ -802,6 +812,11 @@ function useMultiplePermissions(userId, scope, permissions, useCache = true) {
       setIsLoading(false);
       return;
     }
+    if (scope === null) {
+      setIsLoading(true);
+      setError(null);
+      return;
+    }
     if (isCheckingRef.current) {
       return;
     }
@@ -828,21 +843,24 @@ function useMultiplePermissions(userId, scope, permissions, useCache = true) {
       isCheckingRef.current = false;
     }
   }, [userId, scope, permissions, useCache]);
+  const scopeOrgId = scope?.organisationId;
+  const scopeEventId = scope?.eventId;
+  const scopeAppId = scope?.appId;
   useEffect(() => {
     const permissionsKey = JSON.stringify(permissions);
-    const hasChanged = prevValuesRef.current.userId !== userId || prevValuesRef.current.organisationId !== scope.organisationId || prevValuesRef.current.eventId !== scope.eventId || prevValuesRef.current.appId !== scope.appId || prevValuesRef.current.permissions !== permissionsKey || prevValuesRef.current.useCache !== useCache;
+    const hasChanged = prevValuesRef.current.userId !== userId || prevValuesRef.current.organisationId !== scopeOrgId || prevValuesRef.current.eventId !== scopeEventId || prevValuesRef.current.appId !== scopeAppId || prevValuesRef.current.permissions !== permissionsKey || prevValuesRef.current.useCache !== useCache;
     if (hasChanged) {
       prevValuesRef.current = {
         userId,
-        organisationId: scope.organisationId,
-        eventId: scope.eventId,
-        appId: scope.appId,
+        organisationId: scopeOrgId,
+        eventId: scopeEventId,
+        appId: scopeAppId,
         permissions: permissionsKey,
         useCache
       };
       checkPermissions();
     }
-  }, [userId, scope.organisationId, scope.eventId, scope.appId, permissions, useCache, checkPermissions]);
+  }, [userId, scopeOrgId, scopeEventId, scopeAppId, permissions, useCache, checkPermissions]);
   return useMemo(() => ({
     results,
     isLoading,

package/dist/{chunk-KJXRL3XE.js → chunk-HQTYP6BX.js}

@@ -1,17 +1,18 @@
-import { useRBAC, useSecureSupabase, AccessDenied } from './chunk-PCSHBLPB.js';
-import { Input, Label, Select, SelectTrigger, SelectContent, SelectLabel, SelectSeparator, SelectItem, Dialog, DialogContent, DialogHeader, DialogTitle, SelectValue, DialogBody, DialogFooter, deriveFormKey, useSessionDraft, filterSensitiveFields, isSensitiveField, SelectGroup, Progress } from './chunk-2OEVOGGR.js';
-import { Button, Card, CardHeader, CardTitle, CardDescription, CardContent, Alert, AlertDescription, CardFooter, usePermissions, useResolvedScope, AlertTitle, useCan } from './chunk-V7FTM2LU.js';
-import { useAddressAutocomplete, createFileReferenceService, usePublicFileDisplay, useFileDisplay, uploadFileWithReference, getPublicUrl, getSignedUrl, generateFileUrlsBatch, useEventTheme, usePreventTabReload } from './chunk-J2KQK6DG.js';
-import { useOrganisationSecurity, useEvents, useOptionalEvents } from './chunk-WY6Y7KC3.js';
+import { useRBAC, useSecureSupabase, AccessDenied } from './chunk-NJ7FGQWB.js';
+import { Input, Label, Select, SelectTrigger, SelectContent, SelectLabel, SelectSeparator, SelectItem, Dialog, DialogContent, DialogHeader, DialogTitle, SelectValue, DialogBody, DialogFooter, deriveFormKey, useSessionDraft, filterSensitiveFields, isSensitiveField, SelectGroup, Progress } from './chunk-Y2LWSLLB.js';
+import { Button, Card, CardHeader, CardTitle, CardDescription, CardContent, Alert, AlertDescription, CardFooter, usePermissions, useResolvedScope, AlertTitle, useCan } from './chunk-H6RTU4DZ.js';
+import { useAddressAutocomplete, createFileReferenceService, usePublicFileDisplay, useFileDisplay, uploadFileWithReference, getPublicUrl, getSignedUrl, generateFileUrlsBatch, useEventTheme, usePreventTabReload } from './chunk-AP5FG7W4.js';
+import { useOrganisationSecurity, useEvents, useOptionalEvents } from './chunk-QWIG36BZ.js';
 import { useToast } from './chunk-ENLXB7GP.js';
-import { useIsPublicPage, PublicPageContext, useAppConfig } from './chunk-L5LFKKLJ.js';
-import { useUnifiedAuth, useOrganisations, UnifiedAuthContext, EventServiceContext, useSessionRestoration } from './chunk-4R3T5ENU.js';
+import { useIsPublicPage, PublicPageContext, useAppConfig } from './chunk-2GBDPPUC.js';
+import { useUnifiedAuth, useOrganisations, UnifiedAuthContext, EventServiceContext, useSessionRestoration } from './chunk-S57OLCLO.js';
 import { setupPrintDateTime, clearPalette } from './chunk-D6BMFMQZ.js';
-import { EventContextRequiredError, OrganisationContextRequiredError, isSuperAdmin } from './chunk-7A6IMHH2.js';
+import { EventContextRequiredError, OrganisationContextRequiredError, isSuperAdmin } from './chunk-YFGNMB67.js';
 import { assertAppId } from './chunk-4SXLQIZO.js';
 import { getUserTimeZone, getAppIcon, getAppId, formatFileSize } from './chunk-XOJME5T7.js';
-import { cn, LoadingSpinner, getCurrentAppName } from './chunk-UZNAFKGW.js';
+import { cn, LoadingSpinner } from './chunk-VFLR5K2H.js';
 import { performanceBudgetMonitor } from './chunk-XPFVT3GN.js';
+import { getCurrentAppName } from './chunk-GHCUP64P.js';
 import { createLogger, logger } from './chunk-BTHN5MKC.js';
 import * as React from 'react';
 import React__default, { useState, useRef, useMemo, useCallback, useEffect, createContext, useContext, Component } from 'react';
@@ -3707,7 +3708,7 @@ function useNavigationScope({
     }
     const userId = authContext.user.id;
     const appName = authContext.appName;
-    import('./api-BZR2CYXL.js').then(({ resolveAppContext }) => {
+    import('./api-6OQXYT67.js').then(({ resolveAppContext }) => {
       resolveAppContext({ userId, appName }).then((result) => {
         if (result?.ok && result.data?.appId) {
           setResolvedAppId(result.data.appId);
@@ -4369,7 +4370,7 @@ async function getEarlyReturnItems(user, scope, baseMenuItems) {
   if (!user?.id) return baseMenuItems;
   if (!scope.organisationId) return baseMenuItems;
   try {
-    const { isSuperAdmin: checkSuperAdminDynamic } = await import('./api-BZR2CYXL.js');
+    const { isSuperAdmin: checkSuperAdminDynamic } = await import('./api-6OQXYT67.js');
     const superResult = await checkSuperAdminDynamic(user.id);
     if (superResult.ok && superResult.data) return baseMenuItems;
   } catch (error) {
@@ -4412,6 +4413,13 @@ function applyFilterResults(filtered, baseMenuItems, scope) {
   }
   return accessibleItems;
 }
+function navItemsEqual(a, b) {
+  if (a.length !== b.length) return false;
+  return a.every((item, i) => {
+    const other = b[i];
+    return other && item.id === other.id && item.href === other.href;
+  });
+}
 function useFilteredNavItems(options) {
   const {
     baseMenuItems,
@@ -4429,17 +4437,23 @@ function useFilteredNavItems(options) {
     selectedEventId
   } = options;
   const [filteredMenuItems, setFilteredMenuItems] = useState(baseMenuItems);
+  const runIdRef = useRef(0);
   useEffect(() => {
+    const runId = ++runIdRef.current;
     let isMounted = true;
+    const isStale = () => !isMounted || runIdRef.current !== runId;
     const filterItems = async () => {
+      if (scope === null) {
+        return;
+      }
       const earlyItems = await getEarlyReturnItems(user, scope, baseMenuItems);
       if (earlyItems !== null) {
-        if (isMounted) setFilteredMenuItems(earlyItems);
+        if (!isStale()) setFilteredMenuItems((prev) => navItemsEqual(prev, earlyItems) ? prev : earlyItems);
         return;
       }
       try {
         const currentScope = scope;
-        const { getPermissionMap, getPageScopeType } = await import('./api-BZR2CYXL.js');
+        const { getPermissionMap, getPageScopeType } = await import('./api-6OQXYT67.js');
         const permissionScope = {
           organisationId: currentScope.organisationId,
           eventId: currentScope.eventId,
@@ -4450,7 +4464,7 @@ function useFilteredNavItems(options) {
           scope: permissionScope
         });
         if (!mapResult.ok) {
-          if (isMounted) setFilteredMenuItems(baseMenuItems);
+          if (!isStale()) setFilteredMenuItems((prev) => navItemsEqual(prev, baseMenuItems) ? prev : baseMenuItems);
           return;
         }
         const permissionMap = mapResult.data;
@@ -4467,15 +4481,15 @@ function useFilteredNavItems(options) {
         const filtered = await Promise.all(
           baseMenuItems.map((item) => filterNavItemByPermissionAndScope(item, filterOptions))
         );
-        if (!isMounted) return;
+        if (isStale()) return;
         const itemsToSet = applyFilterResults(filtered, baseMenuItems, currentScope);
-        setFilteredMenuItems(itemsToSet);
+        setFilteredMenuItems((prev) => navItemsEqual(prev, itemsToSet) ? prev : itemsToSet);
       } catch (error) {
         logger.error("PaceAppLayout", "Failed to load permission map for navigation filtering", {
           userId: user?.id,
           error
         });
-        if (isMounted) setFilteredMenuItems(baseMenuItems);
+        if (!isStale()) setFilteredMenuItems((prev) => navItemsEqual(prev, baseMenuItems) ? prev : baseMenuItems);
       }
     };
     filterItems();
@@ -4513,7 +4527,7 @@ function useRoleBasedRouteAccess(options) {
     onRouteStrictModeViolation
   } = options;
   useEffect(() => {
-    if (!roleBasedRouting || routeConfig.length === 0) return;
+    if (!roleBasedRouting || routeConfig.length === 0 || scope === null) return;
     let isMounted = true;
     const checkRouteAccess = async () => {
       const currentRoute = routeConfig.find((route) => route.path === currentPath);
@@ -4533,7 +4547,7 @@ function useRoleBasedRouteAccess(options) {
       let hasAccess = true;
       if (currentRoute.pageId && currentRoute.permissions && currentRoute.permissions.length > 0) {
         try {
-          const { isPermittedCached } = await import('./api-BZR2CYXL.js');
+          const { isPermittedCached } = await import('./api-6OQXYT67.js');
           const hasPagePermission = await isPermittedCached({
             userId: user?.id || "",
             scope,
@@ -4593,8 +4607,6 @@ function useRoleBasedRouteAccess(options) {
     onRouteStrictModeViolation
   ]);
 }
-
-// src/components/PaceAppLayout/usePaceAppLayoutConfig.ts
 var EMPTY_PAGE_ID_MAPPING = {};
 var EMPTY_ROUTE_PERMISSIONS = {};
 function mergePermissionConfig(flat, config) {
@@ -4623,28 +4635,48 @@ function mergeRoutingConfig(flat, config) {
   };
 }
 function usePaceAppLayoutConfig(props) {
-  const flatPerm = {
-    enforcePermissions: props.enforcePermissions ?? false,
-    defaultPermission: props.defaultPermission ?? "read",
-    routePermissions: props.routePermissions ?? EMPTY_ROUTE_PERMISSIONS,
-    permissionFallback: props.permissionFallback,
-    pageIdMapping: props.pageIdMapping ?? EMPTY_PAGE_ID_MAPPING,
-    strictMode: props.strictMode ?? true,
-    enforcePagePermissions: props.enforcePagePermissions ?? false,
-    pagePermissionFallback: props.pagePermissionFallback,
-    onPageAccessDenied: props.onPageAccessDenied,
-    onStrictModeViolation: props.onStrictModeViolation
-  };
-  const flatRoute = {
-    roleBasedRouting: props.roleBasedRouting ?? false,
-    routeConfig: props.routeConfig ?? [],
-    fallbackRoute: props.fallbackRoute ?? "/unauthorized",
-    onRouteAccessDenied: props.onRouteAccessDenied,
-    onRouteStrictModeViolation: props.onRouteStrictModeViolation
-  };
-  const perm = mergePermissionConfig(flatPerm, props.permissionConfig);
-  const route = mergeRoutingConfig(flatRoute, props.routingConfig);
-  return { ...perm, ...route };
+  return useMemo(() => {
+    const flatPerm = {
+      enforcePermissions: props.enforcePermissions ?? false,
+      defaultPermission: props.defaultPermission ?? "read",
+      routePermissions: props.routePermissions ?? EMPTY_ROUTE_PERMISSIONS,
+      permissionFallback: props.permissionFallback,
+      pageIdMapping: props.pageIdMapping ?? EMPTY_PAGE_ID_MAPPING,
+      strictMode: props.strictMode ?? true,
+      enforcePagePermissions: props.enforcePagePermissions ?? false,
+      pagePermissionFallback: props.pagePermissionFallback,
+      onPageAccessDenied: props.onPageAccessDenied,
+      onStrictModeViolation: props.onStrictModeViolation
+    };
+    const flatRoute = {
+      roleBasedRouting: props.roleBasedRouting ?? false,
+      routeConfig: props.routeConfig ?? [],
+      fallbackRoute: props.fallbackRoute ?? "/unauthorized",
+      onRouteAccessDenied: props.onRouteAccessDenied,
+      onRouteStrictModeViolation: props.onRouteStrictModeViolation
+    };
+    const perm = mergePermissionConfig(flatPerm, props.permissionConfig);
+    const route = mergeRoutingConfig(flatRoute, props.routingConfig);
+    return { ...perm, ...route };
+  }, [
+    props.enforcePermissions,
+    props.defaultPermission,
+    props.routePermissions,
+    props.permissionFallback,
+    props.pageIdMapping,
+    props.strictMode,
+    props.enforcePagePermissions,
+    props.pagePermissionFallback,
+    props.onPageAccessDenied,
+    props.onStrictModeViolation,
+    props.roleBasedRouting,
+    props.routeConfig,
+    props.fallbackRoute,
+    props.onRouteAccessDenied,
+    props.onRouteStrictModeViolation,
+    props.permissionConfig,
+    props.routingConfig
+  ]);
 }
 function usePaceAppLayoutPermissions({
   config,
@@ -4848,12 +4880,14 @@ function usePaceAppLayoutScope({
   const scopeEventId = resolvedScope?.eventId || selectedEvent?.event_id || void 0;
   const scopeAppId = resolvedScope?.appId || resolvedAppId || void 0;
   const scope = useMemo(() => {
+    if (scopeLoading || resolvedScope === null) return null;
     const newScope = {};
-    if (scopeOrgId) newScope.organisationId = scopeOrgId;
+    if (scopeOrgId && scopeOrgId.trim() !== "") newScope.organisationId = scopeOrgId;
     if (scopeEventId) newScope.eventId = scopeEventId;
     if (scopeAppId) newScope.appId = scopeAppId;
+    if (!newScope.organisationId && !newScope.eventId && !newScope.appId) return null;
     return newScope;
-  }, [scopeOrgId, scopeEventId, scopeAppId]);
+  }, [scopeLoading, resolvedScope, scopeOrgId, scopeEventId, scopeAppId]);
   const baseMenuItems = useMemo(
     () => navItems ?? DEFAULT_NAV_ITEMS,
     [navItems]

package/dist/{chunk-YFTFFJIV.js → chunk-M7QE7XOA.js}

@@ -1,6 +1,6 @@
-import { useOrganisationSecurity } from './chunk-WY6Y7KC3.js';
-import { usePublicPageContext } from './chunk-L5LFKKLJ.js';
-import { useOrganisations } from './chunk-4R3T5ENU.js';
+import { useOrganisationSecurity } from './chunk-QWIG36BZ.js';
+import { usePublicPageContext } from './chunk-2GBDPPUC.js';
+import { useOrganisations } from './chunk-S57OLCLO.js';
 import { assertOrganisationId } from './chunk-4SXLQIZO.js';
 import { createLogger, logger } from './chunk-BTHN5MKC.js';
 import { useForm } from 'react-hook-form';