@jmruthers/pace-core 0.5.110 → 0.5.111

package/dist/{AuthService-DrHrvXNZ.d.ts → AuthService-CVgsgtaZ.d.ts}

@@ -76,6 +76,7 @@ interface IEventService {
     setSelectedEvent(event: Event | null): void;
     refreshEvents(): Promise<void>;
     loadPersistedEvent(events: Event[]): Promise<boolean>;
+    restorePersistedEvent(): Promise<boolean>;
     persistEventSelection(eventId: string): void;
     autoSelectNextEvent(events: Event[]): void;
     initialize(): Promise<void>;
@@ -116,6 +117,13 @@ declare class EventService extends BaseService implements IEventService {
     setSelectedEvent(event: Event | null): void;
     refreshEvents(): Promise<void>;
     loadPersistedEvent(events: Event[]): Promise<boolean>;
+    /**
+     * Restore persisted event after login screen has rendered
+     * This should be called explicitly from login page component
+     *
+     * @returns Promise<boolean> - true if event was successfully restored, false otherwise
+     */
+    restorePersistedEvent(): Promise<boolean>;
     persistEventSelection(eventId: string): void;
     clearEventSelection(): void;
     autoSelectNextEvent(events: Event[]): void;

package/dist/{DataTable-D3BK2FCN.js → DataTable-5W2HVLLV.js}

@@ -54,10 +54,10 @@ import {
   sortHierarchicalDataWithSorting,
   validateHierarchicalData,
   validatePaginationConfig
-} from "./chunk-HGZSO43Y.js";
-import "./chunk-HADXAZT3.js";
-import "./chunk-XRSP3H52.js";
-import "./chunk-Q7APDV6H.js";
+} from "./chunk-TD4BXGPE.js";
+import "./chunk-UGVU7L7N.js";
+import "./chunk-PXXS26G5.js";
+import "./chunk-IWJYNWXN.js";
 import {
   CircuitBreaker,
   DEFAULT_FALLBACK_CONFIG,
@@ -76,9 +76,9 @@ import {
   throttle,
   useDataTablePerformance
 } from "./chunk-4OX5PXHX.js";
-import "./chunk-EZ64QG2I.js";
-import "./chunk-EYSXQ756.js";
-import "./chunk-AUXS7XSO.js";
+import "./chunk-I5YM5BGS.js";
+import "./chunk-TDFBX7KJ.js";
+import "./chunk-MW73E7SP.js";
 import "./chunk-PYUXFQJ3.js";
 import "./chunk-JCQZ6LA7.js";
 import "./chunk-BDZUMRBD.js";
@@ -157,4 +157,4 @@ export {
   validateHierarchicalData,
   validatePaginationConfig
 };
-//# sourceMappingURL=DataTable-D3BK2FCN.js.map
+//# sourceMappingURL=DataTable-5W2HVLLV.js.map

package/dist/{UnifiedAuthProvider-A7I23UCN.js → UnifiedAuthProvider-LUM3QLS5.js}

@@ -1,10 +1,10 @@
 import {
   init_UnifiedAuthProvider
-} from "./chunk-EYSXQ756.js";
+} from "./chunk-TDFBX7KJ.js";
 import {
   UnifiedAuthProvider,
   useUnifiedAuth
-} from "./chunk-AUXS7XSO.js";
+} from "./chunk-MW73E7SP.js";
 import "./chunk-BDZUMRBD.js";
 import "./chunk-SMJZMKYN.js";
 import "./chunk-PLDDJCW6.js";
@@ -13,4 +13,4 @@ export {
   UnifiedAuthProvider,
   useUnifiedAuth
 };
-//# sourceMappingURL=UnifiedAuthProvider-A7I23UCN.js.map
+//# sourceMappingURL=UnifiedAuthProvider-LUM3QLS5.js.map

package/dist/{api-PIE4JRFS.js → api-SIZPFBFX.js}

@@ -1,4 +1,5 @@
 import {
+  OrganisationContextRequiredError,
   clearCache,
   getAccessLevel,
   getAppConfig,
@@ -19,10 +20,11 @@ import {
   isSuperAdmin,
   resolveAppContext,
   setupRBAC
-} from "./chunk-XRSP3H52.js";
-import "./chunk-Q7APDV6H.js";
+} from "./chunk-PXXS26G5.js";
+import "./chunk-IWJYNWXN.js";
 import "./chunk-PLDDJCW6.js";
 export {
+  OrganisationContextRequiredError,
   clearCache,
   getAccessLevel,
   getAppConfig,
@@ -44,4 +46,4 @@ export {
   resolveAppContext,
   setupRBAC
 };
-//# sourceMappingURL=api-PIE4JRFS.js.map
+//# sourceMappingURL=api-SIZPFBFX.js.map

package/dist/{audit-65VNHEV2.js → audit-5JI5T3SL.js}

@@ -4,7 +4,7 @@ import {
   emitAuditEvent,
   getGlobalAuditManager,
   setGlobalAuditManager
-} from "./chunk-Q7APDV6H.js";
+} from "./chunk-IWJYNWXN.js";
 import "./chunk-PLDDJCW6.js";
 export {
   RBACAuditManager,
@@ -13,4 +13,4 @@ export {
   getGlobalAuditManager,
   setGlobalAuditManager
 };
-//# sourceMappingURL=audit-65VNHEV2.js.map
+//# sourceMappingURL=audit-5JI5T3SL.js.map

package/dist/{chunk-3J5N2T2N.js → chunk-2BIDKXQU.js}

@@ -25,16 +25,16 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-HGZSO43Y.js";
+} from "./chunk-TD4BXGPE.js";
 import {
+  useCan,
   usePermissions,
   useRBAC,
   useResolvedScope
-} from "./chunk-HADXAZT3.js";
+} from "./chunk-UGVU7L7N.js";
 import {
-  isPermitted,
   isSuperAdmin
-} from "./chunk-XRSP3H52.js";
+} from "./chunk-PXXS26G5.js";
 import {
   OrganisationProvider_exports,
   PublicErrorBoundary,
@@ -49,18 +49,19 @@ import {
   useIsPublicPage,
   usePublicFileDisplay,
   usePublicPageContext
-} from "./chunk-2W4WKJVF.js";
+} from "./chunk-X7SPKHYZ.js";
 import {
   useToast
 } from "./chunk-4OX5PXHX.js";
 import {
+  init_useOrganisations,
   useEvents,
   useOrganisations
-} from "./chunk-EZ64QG2I.js";
+} from "./chunk-I5YM5BGS.js";
 import {
   UnifiedAuthProvider_exports,
   init_UnifiedAuthProvider as init_UnifiedAuthProvider2
-} from "./chunk-EYSXQ756.js";
+} from "./chunk-TDFBX7KJ.js";
 import {
   EventServiceContext,
   EventServiceProvider,
@@ -70,7 +71,7 @@ import {
   useEventService,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-AUXS7XSO.js";
+} from "./chunk-MW73E7SP.js";
 import {
   LoadingSpinner
 } from "./chunk-CDQ3PX7L.js";
@@ -1372,7 +1373,8 @@ Footer.displayName = "Footer";
 
 // src/components/PaceAppLayout/PaceAppLayout.tsx
 init_UnifiedAuthProvider2();
-import { useState as useState5, useEffect as useEffect3, useMemo as useMemo5, useCallback as useCallback3 } from "react";
+init_useOrganisations();
+import { useState as useState5, useEffect as useEffect3, useMemo as useMemo5 } from "react";
 import { Outlet, useNavigate, useLocation } from "react-router-dom";
 import { Fragment as Fragment4, jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
 var EMPTY_PAGE_ID_MAPPING = {};
@@ -1407,48 +1409,31 @@ function PaceAppLayout({
   onRouteAccessDenied,
   onRouteStrictModeViolation
 }) {
-  const { user, signOut, updatePassword } = useUnifiedAuth();
+  const { user, signOut, updatePassword, supabase } = useUnifiedAuth();
+  const { selectedOrganisation } = useOrganisations();
   const navigate = useNavigate();
   const location = useLocation();
-  const checkPermission = useCallback3(async (permission, pageId) => {
-    try {
-      if (!user?.id) return false;
-      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
+  let selectedEvent = null;
+  try {
+    const eventsContext = useEvents();
+    selectedEvent = eventsContext.selectedEvent;
+  } catch (error) {
+  }
+  const { resolvedScope } = useResolvedScope({
+    supabase: supabase || null,
+    selectedOrganisationId: selectedOrganisation?.id || null,
+    selectedEventId: selectedEvent?.event_id || null
+  });
+  const scope = useMemo5(() => {
+    if (!resolvedScope?.organisationId) {
+      return {
+        organisationId: selectedOrganisation?.id || "",
+        eventId: selectedEvent?.event_id || void 0,
+        appId: void 0
       };
-      try {
-        const { isSuperAdmin: isSuperAdmin2 } = await import("./api-PIE4JRFS.js");
-        const isSuper = await isSuperAdmin2(user.id);
-        if (isSuper) {
-          return true;
-        }
-      } catch (error) {
-        if (error && typeof error === "object" && "code" in error && error.code === "RBAC_NOT_INITIALIZED") {
-        } else {
-          throw error;
-        }
-      }
-      if (!scope.organisationId) {
-        console.warn("No organisation context available for permission check, denying access");
-        return false;
-      }
-      const fullPermission = permission.includes(":") ? permission : pageId ? `${permission}:page.${pageId}` : permission;
-      return await isPermitted({
-        userId: user.id,
-        scope,
-        permission: fullPermission,
-        pageId
-      });
-    } catch (error) {
-      console.error("Permission check failed:", error);
-      throw error;
     }
-  }, [user?.id]);
-  const [hasPermission, setHasPermission] = useState5(null);
-  const [isCheckingPermission, setIsCheckingPermission] = useState5(false);
-  const [permissionError, setPermissionError] = useState5(null);
+    return resolvedScope;
+  }, [resolvedScope, selectedOrganisation?.id, selectedEvent?.event_id]);
   const defaultNavItems = useMemo5(() => [
     { id: "home", label: "Home", href: "/", icon: "Home" },
     { id: "dashboard", label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard" },
@@ -1465,60 +1450,54 @@ function PaceAppLayout({
     const currentPath = location.pathname;
     return pageIdMapping[currentPath] || currentPath.slice(1) || "home";
   }, [location.pathname, pageIdMapping]);
+  const currentPermission = useMemo5(() => {
+    if (!enforcePermissions) {
+      return "read:page.home";
+    }
+    const permissionString = `${currentRoutePermission}:page.${currentPageId}`;
+    return permissionString;
+  }, [enforcePermissions, currentRoutePermission, currentPageId]);
+  const { can, isLoading: isCheckingPermission, error: permissionError } = useCan(
+    user?.id || "",
+    scope,
+    currentPermission,
+    currentPageId,
+    true
+    // useCache
+  );
+  const hasPermission = enforcePermissions ? can : true;
   useEffect3(() => {
     if (!enforcePermissions) {
-      setHasPermission(true);
       return;
     }
-    let isMounted = true;
-    const checkRoutePermission = async () => {
-      if (!isMounted) return;
-      setIsCheckingPermission(true);
-      setPermissionError(null);
-      try {
-        const hasAccess = await checkPermission(currentRoutePermission, currentPageId);
-        if (!isMounted) return;
-        setHasPermission(hasAccess);
-        if (auditLog) {
-          console.log(`[PaceAppLayout] Page access attempt:`, {
-            pageName: currentPageId,
-            operation: currentRoutePermission,
-            userId: user?.id,
-            allowed: hasAccess,
-            strictMode,
-            timestamp: (/* @__PURE__ */ new Date()).toISOString()
-          });
-        }
-        if (strictMode && !hasAccess) {
-          console.error(`[PaceAppLayout] STRICT MODE VIOLATION: User attempted to access protected page without permission`, {
-            pageName: currentPageId,
-            operation: currentRoutePermission,
-            userId: user?.id,
-            timestamp: (/* @__PURE__ */ new Date()).toISOString()
-          });
-          if (onStrictModeViolation) {
-            onStrictModeViolation(currentPageId, currentRoutePermission);
-          }
-        }
-        if (!hasAccess && onPageAccessDenied) {
-          onPageAccessDenied(currentPageId, currentRoutePermission);
-        }
-      } catch (error) {
-        if (!isMounted) return;
-        console.error(`[PaceAppLayout] Permission check failed for ${currentPageId}:`, error);
-        setPermissionError(error instanceof Error ? error : new Error("Permission check failed"));
-        setHasPermission(false);
-      } finally {
-        if (isMounted) {
-          setIsCheckingPermission(false);
-        }
+    if (isCheckingPermission) {
+      return;
+    }
+    if (auditLog) {
+      console.log(`[PaceAppLayout] Page access attempt:`, {
+        pageName: currentPageId,
+        operation: currentRoutePermission,
+        userId: user?.id,
+        allowed: can,
+        strictMode,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
+    if (strictMode && !can) {
+      console.error(`[PaceAppLayout] STRICT MODE VIOLATION: User attempted to access protected page without permission`, {
+        pageName: currentPageId,
+        operation: currentRoutePermission,
+        userId: user?.id,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      if (onStrictModeViolation) {
+        onStrictModeViolation(currentPageId, currentRoutePermission);
       }
-    };
-    checkRoutePermission();
-    return () => {
-      isMounted = false;
-    };
-  }, [enforcePermissions, currentRoutePermission, currentPageId, strictMode, user?.id]);
+    }
+    if (!can && onPageAccessDenied) {
+      onPageAccessDenied(currentPageId, currentRoutePermission);
+    }
+  }, [enforcePermissions, can, isCheckingPermission, currentPageId, currentRoutePermission, user?.id, strictMode, auditLog, onPageAccessDenied, onStrictModeViolation]);
   const [filteredMenuItems, setFilteredMenuItems] = useState5(baseMenuItems);
   useEffect3(() => {
     if (!filterNavigationByPermissions) {
@@ -1533,13 +1512,13 @@ function PaceAppLayout({
         }
         return;
       }
-      const scope = {
+      const scope2 = {
         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
       };
       try {
-        const { isSuperAdmin: isSuperAdmin2 } = await import("./api-PIE4JRFS.js");
+        const { isSuperAdmin: isSuperAdmin2 } = await import("./api-SIZPFBFX.js");
         const isSuper = await isSuperAdmin2(user.id);
         if (isSuper) {
           if (isMounted) {
@@ -1553,17 +1532,17 @@ function PaceAppLayout({
           throw error;
         }
       }
-      if (!scope.organisationId) {
+      if (!scope2.organisationId) {
         if (isMounted) {
           setFilteredMenuItems(baseMenuItems);
         }
         return;
       }
       try {
-        const { getPermissionMap } = await import("./api-PIE4JRFS.js");
+        const { getPermissionMap } = await import("./api-SIZPFBFX.js");
         const permissionMap = await getPermissionMap({
           userId: user.id,
-          scope
+          scope: scope2
         });
         const filtered = baseMenuItems.map((item) => {
           if (!item.href) return { item, hasAccess: true };
@@ -1596,7 +1575,7 @@ function PaceAppLayout({
     return () => {
       isMounted = false;
     };
-  }, [baseMenuItems, filterNavigationByPermissions, pageIdMapping, routePermissions, defaultPermission, checkPermission, user?.id, user?.user_metadata, user?.app_metadata]);
+  }, [baseMenuItems, filterNavigationByPermissions, pageIdMapping, routePermissions, defaultPermission, can, user?.id, user?.user_metadata, user?.app_metadata]);
   useEffect3(() => {
     if (!roleBasedRouting || routeConfig.length === 0) return;
     let isMounted = true;
@@ -1619,7 +1598,13 @@ function PaceAppLayout({
       let hasAccess = true;
       if (currentRoute.pageId && currentRoute.permissions && currentRoute.permissions.length > 0) {
         try {
-          const hasPagePermission = await checkPermission(currentRoute.permissions[0], currentRoute.pageId);
+          const { isPermittedCached } = await import("./api-SIZPFBFX.js");
+          const hasPagePermission = await isPermittedCached({
+            userId: user?.id || "",
+            scope,
+            permission: currentRoute.permissions[0],
+            pageId: currentRoute.pageId
+          });
           if (!isMounted) return;
           hasAccess = hasPagePermission;
         } catch (error) {
@@ -1629,7 +1614,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-A7I23UCN.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-LUM3QLS5.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -1669,7 +1654,7 @@ function PaceAppLayout({
     return () => {
       isMounted = false;
     };
-  }, [roleBasedRouting, routeConfig, location.pathname, strictMode, user?.id, fallbackRoute, checkPermission, navigate, auditLog, onRouteAccessDenied, onRouteStrictModeViolation]);
+  }, [roleBasedRouting, routeConfig, location.pathname, strictMode, user?.id, fallbackRoute, scope, navigate, auditLog, onRouteAccessDenied, onRouteStrictModeViolation]);
   const handleSignOut = async () => {
     await signOut();
   };
@@ -1737,9 +1722,10 @@ function PaceAppLayout({
 }
 
 // src/components/PaceLoginPage/PaceLoginPage.tsx
-import { useEffect as useEffect4, useState as useState6 } from "react";
+import { useEffect as useEffect4, useState as useState6, useContext } from "react";
 import { useNavigate as useNavigate2 } from "react-router-dom";
 init_runtime();
+init_EventServiceProvider();
 import { jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
 var PaceLoginPage = ({
   appName = "Pace",
@@ -1751,9 +1737,27 @@ var PaceLoginPage = ({
   const [isSigningIn, setIsSigningIn] = useState6(false);
   const [accessError, setAccessError] = useState6(null);
   const [isCheckingAccess, setIsCheckingAccess] = useState6(false);
+  const eventServiceContext = useContext(EventServiceContext);
+  const eventService = eventServiceContext?.eventService || null;
   useEffect4(() => {
     clearPalette();
   }, []);
+  useEffect4(() => {
+    const restoreEvent = async () => {
+      try {
+        const isOnLoginPage = window.location.pathname === "/login" || window.location.pathname.startsWith("/login");
+        if (isOnLoginPage && eventService) {
+          await eventService.restorePersistedEvent();
+        }
+      } catch (error) {
+        console.debug("[PaceLoginPage] Could not restore persisted event (service may not be ready):", error);
+      }
+    };
+    const timeoutId = setTimeout(() => {
+      restoreEvent();
+    }, 100);
+    return () => clearTimeout(timeoutId);
+  }, [eventService]);
   useEffect4(() => {
     if (!requireAppAccess || !isAuthenticated || isLoading || !user || !supabase) {
       return;
@@ -2990,13 +2994,6 @@ function FileUpload({
           };
           onProgress?.(finalProgress);
           onUploadSuccess?.(result);
-          setTimeout(() => {
-            setUploadStates((prev) => {
-              const updated = new Map(prev);
-              updated.delete(fileId);
-              return updated;
-            });
-          }, 3e3);
         } else {
           setUploadStates((prev) => {
             const updated = new Map(prev);
@@ -3191,7 +3188,7 @@ function FileUpload({
 }
 
 // src/components/FileDisplay/FileDisplay.tsx
-import { useState as useState12, useEffect as useEffect8, useRef as useRef5, useContext, useMemo as useMemo9 } from "react";
+import { useState as useState12, useEffect as useEffect8, useRef as useRef5, useContext as useContext2, useMemo as useMemo9 } from "react";
 
 // src/hooks/useFileUrl.ts
 import { useState as useState11, useEffect as useEffect7, useCallback as useCallback7, useRef as useRef4 } from "react";
@@ -3571,7 +3568,7 @@ function FileDisplayPublic({
   fallbackText,
   fallbackSize
 }) {
-  const publicPageContext = useContext(PublicPageContext);
+  const publicPageContext = useContext2(PublicPageContext);
   const supabase = publicPageContext?.supabase ?? null;
   if (!supabase) {
     return /* @__PURE__ */ jsx22("div", { className: `text-sec-500 text-center p-4 ${className}`, children: "Supabase client not available in public context" });
@@ -4453,4 +4450,4 @@ export {
   PublicPageDiagnostic,
   PublicPageContextChecker
 };
-//# sourceMappingURL=chunk-3J5N2T2N.js.map
+//# sourceMappingURL=chunk-2BIDKXQU.js.map