@jmruthers/pace-core 0.6.1 → 0.6.2

package/dist/{chunk-GLK6VM3F.js → chunk-NECFR5MM.js}

@@ -25,12 +25,13 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-T33XF5ZC.js";
+} from "./chunk-3XC4CPTD.js";
 import {
   useCan,
   usePermissions,
-  useRBAC
-} from "./chunk-XM25TVIE.js";
+  useRBAC,
+  useResolvedScope
+} from "./chunk-XWQCNGTQ.js";
 import {
   createFileReferenceService,
   generateFileUrlsBatch,
@@ -42,27 +43,26 @@ import {
   useFileDisplay,
   usePreventTabReload,
   usePublicFileDisplay
-} from "./chunk-JBKQ3SAO.js";
+} from "./chunk-SFZUDBL5.js";
 import {
   useToast
-} from "./chunk-3QRJFVBR.js";
+} from "./chunk-6SOIHG6Z.js";
 import {
   ErrorBoundary,
   PublicPageContext,
   useAppConfig,
   useEvents,
-  useIsPublicPage,
-  useResolvedScope
-} from "./chunk-3XTALGJF.js";
+  useIsPublicPage
+} from "./chunk-MMZ7JXPU.js";
 import {
   EventServiceContext,
   useOrganisations,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-BYFSK72L.js";
+} from "./chunk-EHMR7VYL.js";
 import {
   isSuperAdmin
-} from "./chunk-KNC55RTG.js";
+} from "./chunk-24UVZUZG.js";
 import {
   assertAppId
 } from "./chunk-QXHPKYJV.js";
@@ -72,13 +72,13 @@ import {
 } from "./chunk-J36DSWQK.js";
 import {
   cn
-} from "./chunk-R77UEZ4E.js";
+} from "./chunk-M43Y4SSO.js";
 import {
   getCurrentAppName
-} from "./chunk-I7PSE6JW.js";
+} from "./chunk-F2IMUDXZ.js";
 import {
   clearPalette
-} from "./chunk-SQGMNID3.js";
+} from "./chunk-L4OXEN46.js";
 import {
   createLogger,
   logger
@@ -423,6 +423,12 @@ function useFileUrl(fileReference, options) {
       setError(null);
       return;
     }
+    if (!supabase) {
+      setUrl(null);
+      setIsLoading(false);
+      setError(new Error("Supabase client is required for URL generation"));
+      return;
+    }
     if (isLoading || url && fileReferenceIdRef.current === fileReference.id) {
       return;
     }
@@ -554,10 +560,14 @@ function FileDisplayContent({
   };
   const handleDeleteConfirm = async () => {
     setDeleteDialogOpen(false);
-    if (onDelete) {
-      await onDelete();
+    try {
+      if (onDelete) {
+        await onDelete();
+      }
+      setImageError(false);
+    } catch (error2) {
+      setImageError(false);
     }
-    setImageError(false);
   };
   const handleImageError = () => {
     setImageError(true);
@@ -971,9 +981,7 @@ function FileDisplayAuthenticated({
   showMetadata
 }) {
   const { supabase } = useUnifiedAuth();
-  if (!supabase) {
-    return /* @__PURE__ */ jsx4("figure", { className, title: "Error", children: /* @__PURE__ */ jsx4("p", { className: getFallbackClasses(fallbackSize || "md"), children: "Supabase client not available in authenticated context" }) });
-  }
+  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState3(null);
   const {
     fileUrl,
     fileReference,
@@ -988,16 +996,15 @@ function FileDisplayAuthenticated({
     record_id,
     organisation_id,
     category,
-    { supabase }
+    { supabase: supabase || null }
   );
-  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState3(null);
   const displayOnlyFileUrlFromMap = displayOnlyFileReference ? fileUrls.get(displayOnlyFileReference.id) : null;
   const displayOnlyFileUrlHook = useFileUrl(
     displayOnlyFileReference && !displayOnlyFileUrlFromMap ? displayOnlyFileReference : null,
     {
-      supabase,
+      supabase: supabase || null,
       organisation_id,
-      autoLoad: !displayOnlyFileUrlFromMap && !!displayOnlyFileReference
+      autoLoad: !displayOnlyFileUrlFromMap && !!displayOnlyFileReference && !!supabase
     }
   );
   const displayOnlyFileUrl = displayOnlyFileUrlFromMap || displayOnlyFileUrlHook.url;
@@ -1012,6 +1019,9 @@ function FileDisplayAuthenticated({
       setDisplayOnlyFileReference(null);
     }
   }, [displayOnly, category, fileReferences, fileUrls]);
+  if (!supabase) {
+    return /* @__PURE__ */ jsx4("figure", { className, title: "Error", children: /* @__PURE__ */ jsx4("p", { className: getFallbackClasses(fallbackSize || "md"), children: "Supabase client not available in authenticated context" }) });
+  }
   const handleDelete = async () => {
   };
   let finalFileReference = fileReference;
@@ -1428,13 +1438,17 @@ function useFileReferenceById(supabase, fileReferenceId, organisationId) {
       return;
     }
     const loadUrl = async () => {
-      const service = createFileReferenceService(supabase);
-      const url = await service.getFileUrl(
-        fileReference.table_name,
-        fileReference.record_id,
-        organisationId
-      );
-      setFileUrl(url);
+      try {
+        const service = createFileReferenceService(supabase);
+        const url = await service.getFileUrl(
+          fileReference.table_name,
+          fileReference.record_id,
+          organisationId
+        );
+        setFileUrl(url);
+      } catch (error2) {
+        setFileUrl(null);
+      }
     };
     loadUrl();
   }, [fileReference, fileReferenceId, organisationId, supabase]);
@@ -1982,7 +1996,7 @@ var Calendar = React7.forwardRef(
             ] })
           );
         }
-        return child;
+        return React7.isValidElement(child) ? React7.cloneElement(child, { key: child.key ?? `calendar-child-${index}` }) : child;
       }) });
     });
     CustomMonth.displayName = "CustomMonth";
@@ -2236,6 +2250,7 @@ function FormField({
                 type,
                 placeholder,
                 "data-testid": testId,
+                "aria-label": label || placeholder || name,
                 className: cn(
                   "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
                   fieldError && "border-destructive focus-visible:ring-destructive"
@@ -2864,9 +2879,10 @@ var UserMenu = React12.memo(function UserMenu2({
         /* @__PURE__ */ jsx16(ChevronDown, { className: "size-4" })
       ] }) }),
       /* @__PURE__ */ jsxs11(SelectContent, { children: [
-        /* @__PURE__ */ jsx16(SelectLabel, { className: "font-normal", children: /* @__PURE__ */ jsxs11("div", { className: "flex flex-col space-y-1", children: [
-          /* @__PURE__ */ jsx16("p", { className: "font-medium", children: userInfo.displayName }),
-          /* @__PURE__ */ jsx16("p", { className: "text-muted-foreground", children: userInfo.email })
+        /* @__PURE__ */ jsx16(SelectLabel, { className: "font-normal", children: /* @__PURE__ */ jsxs11("li", { className: "pt-2", children: [
+          userInfo.displayName,
+          /* @__PURE__ */ jsx16("br", {}),
+          /* @__PURE__ */ jsx16("span", { className: "text-muted-foreground", children: userInfo.email })
         ] }) }),
         /* @__PURE__ */ jsx16(SelectSeparator, {}),
         /* @__PURE__ */ jsx16(DialogTrigger, { asChild: true, children: /* @__PURE__ */ jsxs11(SelectItem, { value: "change-password", children: [
@@ -2901,60 +2917,54 @@ var UserMenu = React12.memo(function UserMenu2({
   ] });
 });
 var UserMenuLoading = React12.memo(function UserMenuLoading2() {
-  return /* @__PURE__ */ jsxs11("div", { className: "relative inline-block text-left", children: [
-    /* @__PURE__ */ jsxs11(
-      "button",
-      {
-        type: "button",
-        disabled: true,
-        className: "flex items-center space-x-2 px-3 py-2 text-sm font-medium text-muted-foreground bg-muted border border-input rounded-md",
-        children: [
-          /* @__PURE__ */ jsx16("div", { className: "w-6 h-6 rounded-full bg-muted animate-pulse" }),
-          /* @__PURE__ */ jsx16("span", { className: "truncate max-w-[150px]", children: "Loading..." }),
-          /* @__PURE__ */ jsx16(ChevronDown, { className: "w-4 h-4 text-muted-foreground" })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsx16("div", { role: "status", "aria-label": "Loading user menu", "aria-live": "polite", className: "w-6 h-6 rounded-full bg-muted animate-pulse" })
-  ] });
+  return /* @__PURE__ */ jsxs11(
+    Button,
+    {
+      type: "button",
+      disabled: true,
+      variant: "outline",
+      className: "flex items-center space-x-2",
+      "aria-label": "Loading user menu",
+      children: [
+        /* @__PURE__ */ jsx16(LoadingSpinner, { size: "sm", className: "inline-block mr-2" }),
+        /* @__PURE__ */ jsx16("span", { className: "truncate max-w-[150px]", children: "Loading..." }),
+        /* @__PURE__ */ jsx16(ChevronDown, { className: "w-4 h-4 text-muted-foreground" })
+      ]
+    }
+  );
 });
 UserMenu.Loading = UserMenuLoading;
 
 // src/components/NavigationMenu/NavigationMenu.tsx
-import * as React13 from "react";
+import * as React14 from "react";
 import { ChevronDown as ChevronDown2 } from "lucide-react";
-import { jsx as jsx17, jsxs as jsxs12 } from "react/jsx-runtime";
-var NavigationMenu = React13.forwardRef(({
+
+// src/components/NavigationMenu/useNavigationFiltering.ts
+import * as React13 from "react";
+function useNavigationFiltering({
   items,
-  mode = "dropdown",
-  currentPath,
-  onNavigate,
-  className,
-  disabled = false,
-  buttonText = "Menu",
-  showIcons = true,
-  navigationLabel = "Main navigation",
-  // NEW: Phase 2 - Enhanced Security Features
-  strictMode = true,
-  auditLog = true,
-  onNavigationAccessDenied,
-  onStrictModeViolation,
   itemsPreFiltered = false,
-  ...props
-}, ref) => {
-  const [expandedItems, setExpandedItems] = React13.useState(/* @__PURE__ */ new Set());
-  const buttonRef = React13.useRef(null);
+  auditLog = true
+}) {
+  const [resolvedAppId, setResolvedAppId] = React13.useState(void 0);
+  const previousFilteredItemsRef = React13.useRef([]);
   let authContext = null;
   try {
     authContext = useUnifiedAuth();
   } catch (error) {
-    logger.warn("NavigationMenu", "useUnifiedAuth not available, running in unauthenticated mode");
+    logger.warn(
+      "NavigationMenu",
+      "useUnifiedAuth not available, running in unauthenticated mode"
+    );
   }
   let rbacContext = null;
   try {
     rbacContext = useRBAC();
   } catch (error) {
-    logger.warn("NavigationMenu", "useRBAC not available, permission filtering disabled");
+    logger.warn(
+      "NavigationMenu",
+      "useRBAC not available, permission filtering disabled"
+    );
   }
   const eventLoadingRaw = authContext?.eventLoading;
   const eventLoading = eventLoadingRaw ?? false;
@@ -2964,11 +2974,9 @@ var NavigationMenu = React13.forwardRef(({
   const { selectedOrganisation } = authContext || {};
   const { resolvedScope, isLoading: scopeLoading, error: scopeError } = useResolvedScope({
     supabase: itemsPreFiltered ? null : supabase || null,
-    // Skip expensive resolution if pre-filtered
     selectedOrganisationId: itemsPreFiltered ? null : selectedOrganisation?.id || null,
     selectedEventId: itemsPreFiltered ? null : selectedEvent?.event_id || null
   });
-  const [resolvedAppId, setResolvedAppId] = React13.useState(void 0);
   React13.useEffect(() => {
     if (!scopeLoading && !resolvedScope?.appId && selectedOrganisation?.id && authContext?.appName && authContext?.user?.id && !resolvedAppId) {
       if (!authContext.user || !authContext.appName) {
@@ -2976,7 +2984,7 @@ var NavigationMenu = React13.forwardRef(({
       }
       const userId2 = authContext.user.id;
       const appName = authContext.appName;
-      import("./api-N774RPUA.js").then(({ resolveAppContext }) => {
+      import("./api-MVVQZLJI.js").then(({ resolveAppContext }) => {
         resolveAppContext({
           userId: userId2,
           appName
@@ -2984,11 +2992,19 @@ var NavigationMenu = React13.forwardRef(({
           if (result?.appId) {
             setResolvedAppId(result.appId);
           }
-        }).catch((error) => {
+        }).catch(() => {
         });
+      }).catch(() => {
       });
     }
-  }, [scopeLoading, resolvedScope?.appId, selectedOrganisation?.id, authContext?.appName, authContext?.user?.id, resolvedAppId]);
+  }, [
+    scopeLoading,
+    resolvedScope?.appId,
+    selectedOrganisation?.id,
+    authContext?.appName,
+    authContext?.user?.id,
+    resolvedAppId
+  ]);
   const effectiveScope = React13.useMemo(() => {
     if (resolvedScope?.organisationId) {
       return resolvedScope;
@@ -3019,17 +3035,17 @@ var NavigationMenu = React13.forwardRef(({
     };
   }, [scopeKey, effectiveScope]);
   const userId = authContext?.user?.id || "";
-  const { permissions: permissionMap, hasAnyPermission, isLoading: permissionsLoading, error: permissionsError } = usePermissions(
+  const {
+    permissions: permissionMap,
+    hasAnyPermission,
+    isLoading: permissionsLoading,
+    error: permissionsError
+  } = usePermissions(
     itemsPreFiltered ? null : userId,
-    // Pass null to trigger early return (empty string would wait 3s)
     itemsPreFiltered ? void 0 : stableScope.organisationId,
-    // Pass undefined to skip timeout
     itemsPreFiltered ? void 0 : stableScope.eventId,
-    // Skip if pre-filtered
     itemsPreFiltered ? void 0 : stableScope.appId
-    // Skip if pre-filtered
   );
-  const previousFilteredItemsRef = React13.useRef([]);
   const filteredItems = React13.useMemo(() => {
     if (itemsPreFiltered && items && items.length > 0) {
       const visibleItems = (items || []).filter((item) => !item.meta?.hidden);
@@ -3059,9 +3075,13 @@ var NavigationMenu = React13.forwardRef(({
       return [];
     }
     if (permissionsError) {
-      logger.warn("NavigationMenu", "Permission check error - showing no items for security", {
-        permissionsError: permissionsError?.message
-      });
+      logger.warn(
+        "NavigationMenu",
+        "Permission check error - showing no items for security",
+        {
+          permissionsError: permissionsError?.message
+        }
+      );
       return [];
     }
     if (!permissionMap || Object.keys(permissionMap).length === 0) {
@@ -3087,7 +3107,7 @@ var NavigationMenu = React13.forwardRef(({
       if (item.permissions && item.permissions.length > 0 && !item.href) {
         const permissions = item.permissions.filter((p) => typeof p === "string").map((p) => p);
         if (permissions.length > 0) {
-          const hasPermission = hasAnyPermission(permissions);
+          const hasPermission = hasAnyPermission?.(permissions);
           if (!hasPermission) {
             return false;
           }
@@ -3119,13 +3139,12 @@ var NavigationMenu = React13.forwardRef(({
         if (typeof item.accessLevel === "string") {
           const accessLevel = item.accessLevel.toLowerCase();
           const userEventRole = rbacContext.eventAppRole;
-          if (rbacContext.isSuperAdmin) {
-          } else {
+          if (!rbacContext.isSuperAdmin) {
             const roleToAccessLevel = {
-              "viewer": "viewer",
-              "participant": "participant",
-              "planner": "planner",
-              "event_admin": "admin"
+              viewer: "viewer",
+              participant: "participant",
+              planner: "planner",
+              event_admin: "admin"
             };
             const userAccessLevel = userEventRole ? roleToAccessLevel[userEventRole] || "viewer" : null;
             const levelHierarchy = {
@@ -3178,7 +3197,6 @@ var NavigationMenu = React13.forwardRef(({
   }, [
     items,
     itemsPreFiltered,
-    // Add itemsPreFiltered to dependencies
     authContext,
     rbacContext,
     permissionMap,
@@ -3189,13 +3207,48 @@ var NavigationMenu = React13.forwardRef(({
     resolvedScope,
     effectiveScope,
     auditLog,
-    // Add event context state to dependencies so we re-check permissions when event context becomes available
     eventLoadingRaw,
     eventLoading,
     selectedEvent,
     orgContextReady,
-    selectedOrganisation?.id
+    selectedOrganisation?.id,
+    permissionsError,
+    stableScope.organisationId,
+    stableScope.eventId,
+    stableScope.appId
   ]);
+  return {
+    authContext,
+    rbacContext,
+    filteredItems,
+    permissionMap,
+    hasAnyPermission: hasAnyPermission || null
+  };
+}
+
+// src/components/NavigationMenu/NavigationMenu.tsx
+import { jsx as jsx17, jsxs as jsxs12 } from "react/jsx-runtime";
+var NavigationMenu = React14.forwardRef(({
+  items,
+  mode = "dropdown",
+  currentPath,
+  onNavigate,
+  className,
+  disabled = false,
+  buttonText = "Menu",
+  showIcons = true,
+  navigationLabel = "Main navigation",
+  // NEW: Phase 2 - Enhanced Security Features
+  strictMode = true,
+  auditLog = true,
+  onNavigationAccessDenied,
+  onStrictModeViolation,
+  itemsPreFiltered = false,
+  ...props
+}, ref) => {
+  const [expandedItems, setExpandedItems] = React14.useState(/* @__PURE__ */ new Set());
+  const buttonRef = React14.useRef(null);
+  const { authContext, rbacContext, filteredItems, permissionMap, hasAnyPermission } = useNavigationFiltering({ items, itemsPreFiltered, auditLog });
   const handleHierarchicalKeyDown = (event, item) => {
     switch (event.key) {
       case "Enter":
@@ -3338,7 +3391,7 @@ var NavigationMenu = React13.forwardRef(({
           id: `submenu-${item.id}`,
           role: "menu",
           "aria-label": `${item.label} submenu`,
-          children: item.children.map((child) => /* @__PURE__ */ jsx17(React13.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
+          children: item.children.map((child) => /* @__PURE__ */ jsx17(React14.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
         }
       )
     ] }) : /* @__PURE__ */ jsx17(
@@ -3400,7 +3453,7 @@ var NavigationMenu = React13.forwardRef(({
       className,
       "aria-label": navigationLabel,
       ...props,
-      children: /* @__PURE__ */ jsx17("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx17(React13.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
+      children: /* @__PURE__ */ jsx17("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx17(React14.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
     }
   );
 });
@@ -3445,7 +3498,7 @@ function Header({
   return /* @__PURE__ */ jsx18("header", { className: cn(
     "w-full border-b border-main-200 h-16 shadow-sm bg-main-100 ",
     className
-  ), role: "banner", children: /* @__PURE__ */ jsxs13("nav", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto flex items-center gap-4 h-full", children: [
+  ), role: "banner", children: /* @__PURE__ */ jsxs13("nav", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto grid grid-cols-[auto_1fr_auto_auto_auto_auto] items-center gap-4 h-full", children: [
     logo ? logoHref ? /* @__PURE__ */ jsx18(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: logo }) : logo : logoUrl ? logoHref ? /* @__PURE__ */ jsx18(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx18(
       "img",
       {
@@ -3486,32 +3539,36 @@ function Header({
         itemsPreFiltered: true
       }
     ),
-    /* @__PURE__ */ jsxs13("div", { className: "flex items-center gap-4 ml-auto", children: [
-      showOrgSelector ? /* @__PURE__ */ jsx18(OrganisationSelectorConditional, {}) : null,
-      showEventSelector ? /* @__PURE__ */ jsx18(
-        EventSelector,
-        {
-          placeholder: "Select event",
-          className: "w-96",
-          "data-testid": "event-selector"
-        }
-      ) : null,
-      actions,
-      showUserMenu && (userMenu ? userMenu : /* @__PURE__ */ jsx18(
-        UserMenu,
-        {
-          user: user || null,
-          onSignOut,
-          onChangePassword,
-          className: "w-70"
-        }
-      ))
-    ] })
+    showOrgSelector ? /* @__PURE__ */ jsx18(OrganisationSelectorConditional, {}) : null,
+    showEventSelector ? /* @__PURE__ */ jsx18(
+      EventSelector,
+      {
+        placeholder: "Select event",
+        className: cn(
+          "w-96",
+          // If both org selector and actions exist, EventSelector uses 1 column
+          // If only one exists, EventSelector spans 2 columns
+          // If neither exists, EventSelector spans 3 columns
+          showOrgSelector && actions ? "col-span-1" : showOrgSelector || actions ? "col-span-2" : "col-span-3"
+        ),
+        "data-testid": "event-selector"
+      }
+    ) : null,
+    actions,
+    showUserMenu && (userMenu ? userMenu : /* @__PURE__ */ jsx18(
+      UserMenu,
+      {
+        user: user || null,
+        onSignOut,
+        onChangePassword,
+        className: "w-70"
+      }
+    ))
   ] }) });
 }
 
 // src/components/Footer/Footer.tsx
-import React14 from "react";
+import React15 from "react";
 import { Fragment as Fragment7, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
 var FooterComponent = ({
   companyName = "Solvera Solutions Pty Ltd",
@@ -3531,11 +3588,11 @@ var FooterComponent = ({
   ] }) });
 };
 FooterComponent.displayName = "Footer";
-var Footer = React14.memo(FooterComponent);
+var Footer = React15.memo(FooterComponent);
 Footer.displayName = "Footer";
 
 // src/components/PaceAppLayout/PaceAppLayout.tsx
-import { useState as useState12, useEffect as useEffect8, useMemo as useMemo9 } from "react";
+import { useState as useState13, useEffect as useEffect8, useMemo as useMemo9 } from "react";
 import { Outlet, useNavigate, useLocation } from "react-router-dom";
 import { Fragment as Fragment8, jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
 var EMPTY_PAGE_ID_MAPPING = {};
@@ -3579,8 +3636,8 @@ function PaceAppLayout({
     isLoading: organisationLoading
   } = useOrganisations();
   const { isSuperAdmin: isSuperAdminFromRBAC, isLoading: rbacLoading } = useRBAC();
-  const [isSuperAdminDirect, setIsSuperAdminDirect] = useState12(false);
-  const [isCheckingSuperAdminDirect, setIsCheckingSuperAdminDirect] = useState12(false);
+  const [isSuperAdminDirect, setIsSuperAdminDirect] = useState13(false);
+  const [isCheckingSuperAdminDirect, setIsCheckingSuperAdminDirect] = useState13(false);
   useEffect8(() => {
     const checkSuperAdminDirect = async () => {
       if (!user?.id) {
@@ -3594,8 +3651,8 @@ function PaceAppLayout({
       }
       setIsCheckingSuperAdminDirect(true);
       try {
-        const superAdminStatus = await isSuperAdmin(user.id);
-        setIsSuperAdminDirect(superAdminStatus);
+        const superAdminStatus2 = await isSuperAdmin(user.id);
+        setIsSuperAdminDirect(superAdminStatus2);
       } catch (error) {
         logger.error("PaceAppLayout", "Error checking super admin status directly", { userId: user?.id, error });
         setIsSuperAdminDirect(false);
@@ -3665,6 +3722,7 @@ function PaceAppLayout({
     return permissionString;
   }, [enforcePermissions, currentRoutePermission, currentPageId]);
   const shouldCheckPermission = enforcePermissions && !!currentPermission && !!currentPageId;
+  const superAdminStatus = isSuperAdminFromRBAC ? true : isCheckingSuperAdminDirect ? null : isSuperAdminDirect;
   const { can: canFromHook, isLoading: isCheckingPermission, error: permissionError } = useCan(
     user?.id || "",
     scope,
@@ -3672,6 +3730,8 @@ function PaceAppLayout({
     shouldCheckPermission ? currentPageId : "",
     true,
     // useCache
+    superAdminStatus,
+    // Pass super admin status to avoid duplicate check
     appName
     // Pass appName for PORTAL/ADMIN special case
   );
@@ -3700,7 +3760,7 @@ function PaceAppLayout({
       onPageAccessDenied(currentPageId, currentRoutePermission);
     }
   }, [enforcePermissions, can, isCheckingPermission, isSuperAdmin2, currentPageId, currentRoutePermission, user?.id, strictMode, auditLog, onPageAccessDenied, onStrictModeViolation]);
-  const [filteredMenuItems, setFilteredMenuItems] = useState12(baseMenuItems);
+  const [filteredMenuItems, setFilteredMenuItems] = useState13(baseMenuItems);
   useEffect8(() => {
     let isMounted = true;
     const filterItems = async () => {
@@ -3727,7 +3787,7 @@ function PaceAppLayout({
         return;
       }
       try {
-        const { isSuperAdmin: checkSuperAdminDynamic } = await import("./api-N774RPUA.js");
+        const { isSuperAdmin: checkSuperAdminDynamic } = await import("./api-MVVQZLJI.js");
         const isSuper = await checkSuperAdminDynamic(user.id);
         if (isSuper) {
           if (isMounted) {
@@ -3742,7 +3802,7 @@ function PaceAppLayout({
         }
       }
       try {
-        const { getPermissionMap } = await import("./api-N774RPUA.js");
+        const { getPermissionMap } = await import("./api-MVVQZLJI.js");
         const permissionScope = {
           organisationId: currentScope.organisationId,
           eventId: currentScope.eventId,
@@ -3798,7 +3858,7 @@ function PaceAppLayout({
       let hasAccess = true;
       if (currentRoute.pageId && currentRoute.permissions && currentRoute.permissions.length > 0) {
         try {
-          const { isPermittedCached } = await import("./api-N774RPUA.js");
+          const { isPermittedCached } = await import("./api-MVVQZLJI.js");
           const hasPagePermission = await isPermittedCached({
             userId: user?.id || "",
             scope,
@@ -3814,7 +3874,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-ATAP5UTR.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-CH6Z342H.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -3845,20 +3905,34 @@ 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, confirmPassword) => {
-    const result = await updatePassword(newPassword);
-    if (result?.error) {
-      logger.error("PaceAppLayout", "Failed to change password", { error: result.error.message });
+    try {
+      const result = await updatePassword(newPassword);
+      if (result?.error) {
+        logger.error("PaceAppLayout", "Failed to change password", { error: result.error.message });
+        return {
+          error: {
+            message: result.error.message,
+            code: result.error.name || "PASSWORD_UPDATE_ERROR"
+          }
+        };
+      }
+      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"
         }
       };
     }
-    return {};
   };
   if (user?.id && organisationLoading && !isSuperAdmin2 && !isCheckingSuperAdminDirect && !rbacLoading && !selectedOrganisationId) {
     return /* @__PURE__ */ jsx20("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs15("div", { className: "text-center", children: [
@@ -3937,7 +4011,7 @@ function PaceAppLayout({
 }
 
 // src/components/PaceLoginPage/PaceLoginPage.tsx
-import { useEffect as useEffect9, useState as useState13, useContext as useContext2 } from "react";
+import { useEffect as useEffect9, useState as useState14, useContext as useContext2 } from "react";
 import { useNavigate as useNavigate2, useLocation as useLocation2 } from "react-router-dom";
 import { jsx as jsx21, jsxs as jsxs16 } from "react/jsx-runtime";
 var PaceLoginPage = ({
@@ -3948,9 +4022,9 @@ var PaceLoginPage = ({
   const { signIn, isAuthenticated, isLoading, authError, user, supabase } = useUnifiedAuth();
   const navigate = useNavigate2();
   const location = useLocation2();
-  const [isSigningIn, setIsSigningIn] = useState13(false);
-  const [accessError, setAccessError] = useState13(null);
-  const [isCheckingAccess, setIsCheckingAccess] = useState13(false);
+  const [isSigningIn, setIsSigningIn] = useState14(false);
+  const [accessError, setAccessError] = useState14(null);
+  const [isCheckingAccess, setIsCheckingAccess] = useState14(false);
   const eventServiceContext = useContext2(EventServiceContext);
   const eventService = eventServiceContext?.eventService || null;
   useEffect9(() => {
@@ -4102,7 +4176,7 @@ var SessionRestorationLoader = ({
   className
 }) => {
   return /* @__PURE__ */ jsxs17(
-    "div",
+    Alert,
     {
       className: cn(
         "flex flex-col items-center justify-center h-screen w-full gap-4 text-center p-4 bg-background",
@@ -4113,19 +4187,18 @@ var SessionRestorationLoader = ({
       "aria-label": message,
       children: [
         /* @__PURE__ */ jsx22(LoadingSpinner, { size: "lg" }),
-        /* @__PURE__ */ jsx22("div", { className: "text-sm text-sec-600", children: message })
+        /* @__PURE__ */ jsx22("span", { className: "text-sm text-sec-600", children: message })
       ]
     }
   );
 };
 
 // src/components/ProtectedRoute/ProtectedRoute.tsx
-import { useMemo as useMemo10, useEffect as useEffect10, useRef as useRef8, useState as useState14 } from "react";
+import { useMemo as useMemo10, useEffect as useEffect10, useRef as useRef9, useState as useState15 } from "react";
 import { Navigate, Outlet as Outlet2 } from "react-router-dom";
 import { jsx as jsx23, jsxs as jsxs18 } from "react/jsx-runtime";
 function ProtectedRoute({
   requireEvent = false,
-  allowSuperAdminBypass = false,
   noEventsFallback,
   loadingFallback,
   loginPath = "/login"
@@ -4137,9 +4210,9 @@ function ProtectedRoute({
   const eventLoading = requireEvent ? eventsContext.isLoading || false : false;
   const sessionRestoration = useSessionRestoration();
   usePreventTabReload({ enabled: true, gracePeriodMs: 2e3 });
-  const wasAuthenticatedRef = useRef8(false);
-  const [shouldRedirect, setShouldRedirect] = useState14(false);
-  const tabJustBecameVisibleRef = useRef8(false);
+  const wasAuthenticatedRef = useRef9(false);
+  const [shouldRedirect, setShouldRedirect] = useState15(false);
+  const tabJustBecameVisibleRef = useRef9(false);
   useEffect10(() => {
     if (isAuthenticated) {
       wasAuthenticatedRef.current = true;
@@ -4253,7 +4326,7 @@ function ProtectedRoute({
 }
 
 // src/components/FileUpload/FileUpload.tsx
-import { useState as useState15, useCallback as useCallback11, useRef as useRef9, useEffect as useEffect11, useMemo as useMemo11 } from "react";
+import { useState as useState16, useCallback as useCallback11, useRef as useRef10, useEffect as useEffect11, useMemo as useMemo11 } from "react";
 import { Fragment as Fragment9, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
 function FileUpload({
   supabase,
@@ -4280,12 +4353,19 @@ function FileUpload({
   onProgress,
   children
 }) {
-  const [isDragging, setIsDragging] = useState15(false);
-  const [uploadStates, setUploadStates] = useState15(/* @__PURE__ */ new Map());
-  const [resolvedAppId, setResolvedAppId] = useState15(app_id || null);
-  const [isResolvingAppId, setIsResolvingAppId] = useState15(!app_id);
-  const [appIdError, setAppIdError] = useState15(null);
-  const fileInputRef = useRef9(null);
+  if (!pageContext) {
+    const errorMsg = "pageContext is required for FileUpload component. This is used for permission checks.";
+    if (import.meta.env.MODE === "development") {
+      console.error("[FileUpload]", errorMsg);
+    }
+    throw new Error(errorMsg);
+  }
+  const [isDragging, setIsDragging] = useState16(false);
+  const [uploadStates, setUploadStates] = useState16(/* @__PURE__ */ new Map());
+  const [resolvedAppId, setResolvedAppId] = useState16(app_id || null);
+  const [isResolvingAppId, setIsResolvingAppId] = useState16(!app_id);
+  const [appIdError, setAppIdError] = useState16(null);
+  const fileInputRef = useRef10(null);
   const { uploadFile, isLoading, error } = useFileReference(supabase);
   useEffect11(() => {
     if (app_id) {
@@ -4447,6 +4527,10 @@ function FileUpload({
           const errorMsg = appIdError || "App ID not available. Please provide app_id prop or set app name.";
           throw new Error(errorMsg);
         }
+        if (!pageContext) {
+          const errorMsg = "pageContext is required for file upload. This is used for permission checks.";
+          throw new Error(errorMsg);
+        }
         const result = await uploadFile({
           table_name,
           record_id,
@@ -4544,7 +4628,7 @@ function FileUpload({
         onUploadError?.(errorMessage, file);
       }
     }
-  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError]);
+  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError, pageContext]);
   const handleDragOver = useCallback11((e) => {
     e.preventDefault();
     e.stopPropagation();
@@ -4616,7 +4700,8 @@ function FileUpload({
                 onChange: handleFileInputChange,
                 className: "hidden",
                 disabled: isDisabled,
-                "data-testid": "file-input"
+                "data-testid": "file-input",
+                "aria-label": accept ? `Upload file${multiple ? "s" : ""} (${accept})` : `Upload file${multiple ? "s" : ""}`
               }
             ),
             /* @__PURE__ */ jsx24("div", { className: "text-sec-600", children: isResolvingAppId ? "Resolving app configuration..." : isDragging ? "Drop files here..." : /* @__PURE__ */ jsxs19(Fragment9, { children: [
@@ -4725,9 +4810,9 @@ function FileUpload({
 }
 
 // src/components/Table/Table.tsx
-import * as React19 from "react";
+import * as React20 from "react";
 import { jsx as jsx25 } from "react/jsx-runtime";
-var Table = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var Table = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "table",
   {
     ref,
@@ -4736,9 +4821,9 @@ var Table = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */
   }
 ));
 Table.displayName = "Table";
-var TableHeader = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25("thead", { ref, className: cn("[&_tr]:border-b", className), ...props }));
+var TableHeader = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25("thead", { ref, className: cn("[&_tr]:border-b", className), ...props }));
 TableHeader.displayName = "TableHeader";
-var TableBody = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableBody = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tbody",
   {
     ref,
@@ -4747,7 +4832,7 @@ var TableBody = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableBody.displayName = "TableBody";
-var TableFooter = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableFooter = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tfoot",
   {
     ref,
@@ -4759,7 +4844,7 @@ var TableFooter = React19.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 TableFooter.displayName = "TableFooter";
-var TableRow = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableRow = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tr",
   {
     ref,
@@ -4771,7 +4856,7 @@ var TableRow = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__
   }
 ));
 TableRow.displayName = "TableRow";
-var TableHead = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableHead = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "th",
   {
     ref,
@@ -4783,7 +4868,7 @@ var TableHead = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableHead.displayName = "TableHead";
-var TableCell = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCell = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "td",
   {
     ref,
@@ -4792,7 +4877,7 @@ var TableCell = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableCell.displayName = "TableCell";
-var TableCaption = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCaption = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "caption",
   {
     ref,
@@ -4882,7 +4967,6 @@ function PublicPageLayout({
   error = null,
   refetch,
   showFooter = true,
-  className = "",
   errorFallback: ErrorFallback,
   loadingFallback: LoadingFallback,
   customHeader,
@@ -4988,4 +5072,4 @@ export {
   PublicPageFooter,
   PublicPageLayout
 };
-//# sourceMappingURL=chunk-GLK6VM3F.js.map
+//# sourceMappingURL=chunk-NECFR5MM.js.map