@jmruthers/pace-core 0.5.193 → 0.6.2

package/dist/{chunk-NOAYCWCX 5.js → chunk-NECFR5MM.js}

@@ -25,12 +25,13 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-E3SPN4VZ.js";
+} from "./chunk-3XC4CPTD.js";
 import {
   useCan,
   usePermissions,
-  useRBAC
-} from "./chunk-XNXXZ43G.js";
+  useRBAC,
+  useResolvedScope
+} from "./chunk-XWQCNGTQ.js";
 import {
   createFileReferenceService,
   generateFileUrlsBatch,
@@ -42,43 +43,42 @@ import {
   useFileDisplay,
   usePreventTabReload,
   usePublicFileDisplay
-} from "./chunk-BC4IJKSL.js";
+} from "./chunk-SFZUDBL5.js";
 import {
   useToast
-} from "./chunk-6C4YBBJM.js";
+} from "./chunk-6SOIHG6Z.js";
 import {
   ErrorBoundary,
   PublicPageContext,
   useAppConfig,
   useEvents,
-  useIsPublicPage,
-  useResolvedScope
-} from "./chunk-IIELH4DL.js";
+  useIsPublicPage
+} from "./chunk-MMZ7JXPU.js";
 import {
   EventServiceContext,
   useOrganisations,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-7FLMSG37.js";
+} from "./chunk-EHMR7VYL.js";
 import {
   isSuperAdmin
-} from "./chunk-KNC55RTG.js";
+} from "./chunk-24UVZUZG.js";
 import {
   assertAppId
 } from "./chunk-QXHPKYJV.js";
 import {
   LoadingSpinner,
   getAppId
-} from "./chunk-HW3OVDUF.js";
+} 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
@@ -375,35 +375,32 @@ var Label = React2.forwardRef(({
 Label.displayName = LabelPrimitive.Root.displayName;
 
 // src/components/Textarea/Textarea.tsx
-import * as React3 from "react";
 import { jsx as jsx3 } from "react/jsx-runtime";
-var Textarea = React3.forwardRef(
-  ({ className, variant = "default", size = "md", error, ...props }, ref) => {
-    return /* @__PURE__ */ jsx3(
-      "textarea",
-      {
-        className: cn(
-          // Base styles (matching Input component)
-          "flex w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background 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",
-          // Variant styles
-          {
-            "border-input": variant === "default" && !error,
-            "border-destructive focus-visible:ring-destructive": variant === "destructive" || error
-          },
-          // Size styles
-          {
-            "min-h-[60px] px-2 py-1 text-xs": size === "sm",
-            "min-h-[80px] px-3 py-2 text-sm": size === "md",
-            "min-h-[100px] px-4 py-3 text-base": size === "lg"
-          },
-          className
-        ),
-        ref,
-        ...props
-      }
-    );
-  }
-);
+function Textarea({ className, variant = "default", size = "md", error, ref, ...props }) {
+  return /* @__PURE__ */ jsx3(
+    "textarea",
+    {
+      className: cn(
+        // Base styles (matching Input component)
+        "flex w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background 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",
+        // Variant styles
+        {
+          "border-input": variant === "default" && !error,
+          "border-destructive focus-visible:ring-destructive": variant === "destructive" || error
+        },
+        // Size styles
+        {
+          "min-h-[60px] px-2 py-1 text-xs": size === "sm",
+          "min-h-[80px] px-3 py-2 text-sm": size === "md",
+          "min-h-[100px] px-4 py-3 text-base": size === "lg"
+        },
+        className
+      ),
+      ref,
+      ...props
+    }
+  );
+}
 Textarea.displayName = "Textarea";
 
 // src/components/FileDisplay/FileDisplay.tsx
@@ -426,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;
     }
@@ -557,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);
@@ -974,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,
@@ -991,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;
@@ -1015,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;
@@ -1431,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]);
@@ -1489,7 +1500,7 @@ function useFilesByCategory(supabase, table_name, record_id, category, organisat
 }
 
 // src/components/Avatar/Avatar.tsx
-import * as React5 from "react";
+import * as React4 from "react";
 import { jsx as jsx5 } from "react/jsx-runtime";
 var sizeClasses = {
   xs: "size-4 text-xs",
@@ -1499,7 +1510,7 @@ var sizeClasses = {
   xl: "size-16 text-xl",
   "2xl": "size-20 text-2xl"
 };
-var Avatar = React5.forwardRef(
+var Avatar = React4.forwardRef(
   ({
     table_name,
     record_id,
@@ -1513,7 +1524,7 @@ var Avatar = React5.forwardRef(
     size = "md",
     ...props
   }, ref) => {
-    const [imageError, setImageError] = React5.useState(false);
+    const [imageError, setImageError] = React4.useState(false);
     const { supabase } = useUnifiedAuth();
     const canFetchFileId = Boolean(fileId && organisation_id && supabase);
     const { fileReference, fileUrl: fileIdUrl, isLoading: fileIdLoading } = useFileReferenceById(
@@ -1530,10 +1541,10 @@ var Avatar = React5.forwardRef(
     const fallbackClasses = "size-full grid place-items-center text-center text-sec-50 bg-sec-500";
     const imageClasses = "object-cover size-full";
     const containerClasses = cn(baseClasses, className);
-    const handleImageError = React5.useCallback(() => {
+    const handleImageError = React4.useCallback(() => {
       setImageError(true);
     }, []);
-    React5.useEffect(() => {
+    React4.useEffect(() => {
       if (src) {
         setImageError(false);
       }
@@ -1592,7 +1603,6 @@ var Avatar = React5.forwardRef(
 Avatar.displayName = "Avatar";
 
 // src/components/Badge/Badge.tsx
-import * as React6 from "react";
 import { jsx as jsx6 } from "react/jsx-runtime";
 var shadeConfig = {
   muted: {
@@ -1658,42 +1668,40 @@ function getBadgeClasses(variant = "solid-main-normal") {
   const baseClasses = "text-balance rounded-2xl px-3 py-1 mr-1 text-xs font-medium transition-colors box-border";
   return `${baseClasses} ${variantClassesMap[variant]}`;
 }
-var Badge = React6.forwardRef(
-  ({ className, variant = "solid-main-normal", ...props }, ref) => {
-    const isSoftVariant = variant.startsWith("soft-");
-    if (isSoftVariant) {
-      const variantClasses = getBadgeClasses(variant);
-      const shadowColorMatch = variantClasses.match(/\bshadow-(\w+)-(\d+)\b/);
-      const shadowColorClass = shadowColorMatch ? shadowColorMatch[0] : "";
-      const classesWithoutShadows = variantClasses.replace(/\bshadow-badge-soft\b/g, "").replace(/\bshadow-\w+-\d+\b/g, "").replace(/\s+/g, " ").trim();
-      const mergedClasses = cn(classesWithoutShadows, className);
-      const finalClasses = `${mergedClasses} shadow-badge-soft ${shadowColorClass}`.trim();
-      return /* @__PURE__ */ jsx6(
-        "span",
-        {
-          ref,
-          className: finalClasses,
-          ...props
-        }
-      );
-    }
+function Badge({ className, variant = "solid-main-normal", ref, ...props }) {
+  const isSoftVariant = variant.startsWith("soft-");
+  if (isSoftVariant) {
+    const variantClasses = getBadgeClasses(variant);
+    const shadowColorMatch = variantClasses.match(/\bshadow-(\w+)-(\d+)\b/);
+    const shadowColorClass = shadowColorMatch ? shadowColorMatch[0] : "";
+    const classesWithoutShadows = variantClasses.replace(/\bshadow-badge-soft\b/g, "").replace(/\bshadow-\w+-\d+\b/g, "").replace(/\s+/g, " ").trim();
+    const mergedClasses = cn(classesWithoutShadows, className);
+    const finalClasses = `${mergedClasses} shadow-badge-soft ${shadowColorClass}`.trim();
     return /* @__PURE__ */ jsx6(
       "span",
       {
         ref,
-        className: cn(getBadgeClasses(variant), className),
+        className: finalClasses,
         ...props
       }
     );
   }
-);
+  return /* @__PURE__ */ jsx6(
+    "span",
+    {
+      ref,
+      className: cn(getBadgeClasses(variant), className),
+      ...props
+    }
+  );
+}
 Badge.displayName = "Badge";
 
 // src/components/Switch/Switch.tsx
-import * as React7 from "react";
+import * as React5 from "react";
 import * as SwitchPrimitive from "@radix-ui/react-switch";
 import { jsx as jsx7 } from "react/jsx-runtime";
-var Switch = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx7(
+var Switch = React5.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx7(
   SwitchPrimitive.Root,
   {
     className: cn(
@@ -1736,12 +1744,12 @@ var Switch = React7.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */
 Switch.displayName = SwitchPrimitive.Root.displayName;
 
 // src/components/Tabs/Tabs.tsx
-import * as React8 from "react";
+import * as React6 from "react";
 import * as TabsPrimitive from "@radix-ui/react-tabs";
 import { jsx as jsx8 } from "react/jsx-runtime";
-var Tabs = React8.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx8(TabsPrimitive.Root, { asChild: true, ...props, children: /* @__PURE__ */ jsx8("section", { ref, className, children }) }));
+var Tabs = React6.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx8(TabsPrimitive.Root, { asChild: true, ...props, children: /* @__PURE__ */ jsx8("section", { ref, className, children }) }));
 Tabs.displayName = TabsPrimitive.Root.displayName || "Tabs";
-var TabsList = React8.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx8(TabsPrimitive.List, { asChild: true, ...props, children: /* @__PURE__ */ jsx8(
+var TabsList = React6.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx8(TabsPrimitive.List, { asChild: true, ...props, children: /* @__PURE__ */ jsx8(
   "nav",
   {
     ref,
@@ -1753,7 +1761,7 @@ var TabsList = React8.forwardRef(({ className, children, ...props }, ref) => /*
   }
 ) }));
 TabsList.displayName = TabsPrimitive.List.displayName || "TabsList";
-var TabsTrigger = React8.forwardRef(({ className, variant, size, children, ...props }, ref) => {
+var TabsTrigger = React6.forwardRef(({ className, variant, size, children, ...props }, ref) => {
   return /* @__PURE__ */ jsx8(TabsPrimitive.Trigger, { asChild: true, ...props, children: /* @__PURE__ */ jsx8(
     Button,
     {
@@ -1772,7 +1780,7 @@ var TabsTrigger = React8.forwardRef(({ className, variant, size, children, ...pr
   ) });
 });
 TabsTrigger.displayName = TabsPrimitive.Trigger.displayName || "TabsTrigger";
-var TabsContent = React8.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx8(TabsPrimitive.Content, { asChild: true, ...props, children: /* @__PURE__ */ jsx8(
+var TabsContent = React6.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsx8(TabsPrimitive.Content, { asChild: true, ...props, children: /* @__PURE__ */ jsx8(
   "aside",
   {
     ref,
@@ -1786,7 +1794,7 @@ var TabsContent = React8.forwardRef(({ className, children, ...props }, ref) =>
 TabsContent.displayName = TabsPrimitive.Content.displayName || "TabsContent";
 
 // src/components/Calendar/Calendar.tsx
-import * as React9 from "react";
+import * as React7 from "react";
 import {
   DayPicker,
   useDayPicker
@@ -1803,10 +1811,10 @@ var assignToRef = (ref, value) => {
   }
   ref.current = value;
 };
-var Calendar = React9.forwardRef(
+var Calendar = React7.forwardRef(
   ({ className, classNames, mode, components, locale, month: controlledMonth, onMonthChange: controlledOnMonthChange, onSelect, ...props }, ref) => {
-    const tableRef = React9.useRef(null);
-    const setForwardedRef = React9.useCallback(
+    const tableRef = React7.useRef(null);
+    const setForwardedRef = React7.useCallback(
       (node) => {
         tableRef.current = node;
         if (!ref) {
@@ -1820,14 +1828,14 @@ var Calendar = React9.forwardRef(
       },
       [ref]
     );
-    const rootPropsRef = React9.useRef(null);
+    const rootPropsRef = React7.useRef(null);
     const selected = props.selected;
     const isMonthControlled = controlledMonth !== void 0;
-    const [internalMonth, setInternalMonth] = React9.useState(() => {
+    const [internalMonth, setInternalMonth] = React7.useState(() => {
       const now = /* @__PURE__ */ new Date();
       return new Date(now.getFullYear(), now.getMonth(), 1);
     });
-    const month = React9.useMemo(() => {
+    const month = React7.useMemo(() => {
       const monthToUse = isMonthControlled ? controlledMonth : internalMonth;
       if (!monthToUse) {
         const now = /* @__PURE__ */ new Date();
@@ -1836,16 +1844,16 @@ var Calendar = React9.forwardRef(
       const normalized = new Date(monthToUse.getFullYear(), monthToUse.getMonth(), 1);
       return normalized;
     }, [isMonthControlled, controlledMonth, internalMonth]);
-    const handleMonthChange = React9.useCallback((newMonth) => {
+    const handleMonthChange = React7.useCallback((newMonth) => {
       if (!isMonthControlled) {
         setInternalMonth(newMonth);
       }
       controlledOnMonthChange?.(newMonth);
     }, [isMonthControlled, controlledOnMonthChange]);
-    const wrappedHandleMonthChange = React9.useCallback((newMonth) => {
+    const wrappedHandleMonthChange = React7.useCallback((newMonth) => {
       handleMonthChange(newMonth);
     }, [handleMonthChange]);
-    const CustomRoot = React9.memo(({ children, rootRef: dayPickerRootRef, ...rootProps }) => {
+    const CustomRoot = React7.memo(({ children, rootRef: dayPickerRootRef, ...rootProps }) => {
       const {
         className: rootClassName,
         style: rootStyle,
@@ -1861,29 +1869,29 @@ var Calendar = React9.forwardRef(
       return /* @__PURE__ */ jsx9(Fragment4, { children });
     });
     CustomRoot.displayName = "CustomRoot";
-    const CustomMonths = React9.memo(({ children }) => {
+    const CustomMonths = React7.memo(({ children }) => {
       return /* @__PURE__ */ jsx9(Fragment4, { children });
     });
     CustomMonths.displayName = "CustomMonths";
-    const CustomMonthGrid = React9.forwardRef((props2, forwardedRef) => {
+    const CustomMonthGrid = React7.forwardRef((props2, forwardedRef) => {
       return /* @__PURE__ */ jsx9("table", { ref: forwardedRef, ...props2 });
     });
     CustomMonthGrid.displayName = "CustomMonthGrid";
-    const CustomMonth = React9.memo(({ calendarMonth, displayIndex, className: className2, children }) => {
+    const CustomMonth = React7.memo(({ calendarMonth, displayIndex, className: className2, children }) => {
       const { formatters, components: components2, labels, classNames: classNames2, previousMonth, nextMonth, goToMonth } = useDayPicker();
       const caption = formatters.formatCaption(calendarMonth.date, {});
       const Chevron = components2?.Chevron;
-      const childrenArray = React9.Children.toArray(children);
+      const childrenArray = React7.Children.toArray(children);
       const monthGridIndex = childrenArray.findIndex((child) => {
-        if (!React9.isValidElement(child)) return false;
+        if (!React7.isValidElement(child)) return false;
         const childType = child.type;
         return typeof childType === "function" && childType.displayName === "MonthGrid" || child.type === "table";
       });
       return /* @__PURE__ */ jsx9(Fragment4, { children: childrenArray.map((child, index) => {
-        if (React9.isValidElement(child) && child.type?.displayName === "MonthCaption") {
+        if (React7.isValidElement(child) && child.type?.displayName === "MonthCaption") {
           return null;
         }
-        if (index === monthGridIndex && React9.isValidElement(child)) {
+        if (index === monthGridIndex && React7.isValidElement(child)) {
           const monthGridChild = child;
           const applyRootProps = displayIndex === 0 && index === monthGridIndex;
           const storedRootProps = applyRootProps ? rootPropsRef.current : null;
@@ -1933,7 +1941,7 @@ var Calendar = React9.forwardRef(
             }
             assignToRef(monthGridElement.ref, node);
           } : void 0;
-          return React9.cloneElement(
+          return React7.cloneElement(
             monthGridElement,
             {
               key: child.key ?? `month-grid-${displayIndex}`,
@@ -1988,15 +1996,15 @@ var Calendar = React9.forwardRef(
             ] })
           );
         }
-        return child;
+        return React7.isValidElement(child) ? React7.cloneElement(child, { key: child.key ?? `calendar-child-${index}` }) : child;
       }) });
     });
     CustomMonth.displayName = "CustomMonth";
-    const CustomWeekdays = React9.memo(({ className: className2, children, ...props2 }) => {
+    const CustomWeekdays = React7.memo(({ className: className2, children, ...props2 }) => {
       return /* @__PURE__ */ jsx9("thead", { children: /* @__PURE__ */ jsx9("tr", { className: cn("text-xs text-sec-500", className2), ...props2, children }) });
     });
     CustomWeekdays.displayName = "CustomWeekdays";
-    const defaultComponents = React9.useMemo(() => ({
+    const defaultComponents = React7.useMemo(() => ({
       Root: CustomRoot,
       Months: CustomMonths,
       Month: CustomMonth,
@@ -2084,12 +2092,12 @@ var Calendar = React9.forwardRef(
 Calendar.displayName = "Calendar";
 
 // src/components/Toast/Toast.tsx
-import * as React10 from "react";
+import * as React8 from "react";
 import * as ToastPrimitives from "@radix-ui/react-toast";
 import { X } from "lucide-react";
 import { jsx as jsx10, jsxs as jsxs5 } from "react/jsx-runtime";
 var ToastProvider = ToastPrimitives.Provider;
-var ToastViewport = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
+var ToastViewport = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
   ToastPrimitives.Viewport,
   {
     ref,
@@ -2102,7 +2110,7 @@ var ToastViewport = React10.forwardRef(({ className, ...props }, ref) => /* @__P
   }
 ));
 ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
-var Toast = React10.forwardRef(({ className, ...props }, ref) => {
+var Toast = React8.forwardRef(({ className, ...props }, ref) => {
   return /* @__PURE__ */ jsx10(
     ToastPrimitives.Root,
     {
@@ -2117,7 +2125,7 @@ var Toast = React10.forwardRef(({ className, ...props }, ref) => {
   );
 });
 Toast.displayName = ToastPrimitives.Root.displayName;
-var ToastAction = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
+var ToastAction = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
   ToastPrimitives.Action,
   {
     ref,
@@ -2130,7 +2138,7 @@ var ToastAction = React10.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 ToastAction.displayName = ToastPrimitives.Action.displayName;
-var ToastClose = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
+var ToastClose = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
   ToastPrimitives.Close,
   {
     ref,
@@ -2145,7 +2153,7 @@ var ToastClose = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE
   }
 ));
 ToastClose.displayName = ToastPrimitives.Close.displayName;
-var ToastTitle = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
+var ToastTitle = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
   ToastPrimitives.Title,
   {
     ref,
@@ -2155,7 +2163,7 @@ var ToastTitle = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE
   }
 ));
 ToastTitle.displayName = ToastPrimitives.Title.displayName;
-var ToastDescription = React10.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
+var ToastDescription = React8.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx10(
   ToastPrimitives.Description,
   {
     ref,
@@ -2184,7 +2192,7 @@ function Toaster() {
 // src/components/Form/Form.tsx
 import { useForm, FormProvider, useFormContext, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { jsx as jsx11, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx11, jsxs as jsxs6 } from "react/jsx-runtime";
 function Form({
   schema,
   defaultValues,
@@ -2197,7 +2205,8 @@ function Form({
   const methods = useForm({
     resolver: schema ? zodResolver(schema) : void 0,
     defaultValues,
-    mode
+    mode,
+    shouldUnregister: false
   });
   const handleSubmit = methods.handleSubmit(onSubmit, onError);
   return /* @__PURE__ */ jsx11(FormProvider, { ...methods, children: /* @__PURE__ */ jsx11("form", { onSubmit: handleSubmit, className: cn("space-y-4", className), children: typeof children === "function" ? children(methods) : children }) });
@@ -2213,9 +2222,7 @@ function FormField({
   "data-testid": testId,
   className
 }) {
-  const { control, formState: { errors } } = useFormContext();
-  const fieldError = errors[name];
-  const errorMessage = fieldError && typeof fieldError === "object" && "message" in fieldError ? String(fieldError.message) : void 0;
+  const { control } = useFormContext();
   return /* @__PURE__ */ jsxs6("div", { className: cn("space-y-2", className), children: [
     label && /* @__PURE__ */ jsxs6(Label, { htmlFor: name, children: [
       label,
@@ -2228,35 +2235,41 @@ function FormField({
         control,
         rules: validation,
         render: (props) => {
+          const { field, fieldState } = props;
+          const fieldError = fieldState.error;
+          const errorMessage = fieldError && typeof fieldError === "object" && "message" in fieldError ? String(fieldError.message) : void 0;
           if (render) {
             return render(props);
           }
-          return /* @__PURE__ */ jsx11(
-            "input",
-            {
-              ...props.field,
-              id: name,
-              type,
-              placeholder,
-              "data-testid": testId,
-              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"
-              ),
-              ...inputProps
-            }
-          );
+          return /* @__PURE__ */ jsxs6(Fragment5, { children: [
+            /* @__PURE__ */ jsx11(
+              "input",
+              {
+                ...field,
+                id: name,
+                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"
+                ),
+                ...inputProps
+              }
+            ),
+            errorMessage && /* @__PURE__ */ jsx11("p", { className: "text-destructive", role: "alert", children: errorMessage })
+          ] });
         }
       }
-    ),
-    errorMessage && /* @__PURE__ */ jsx11("p", { className: "text-destructive", role: "alert", children: errorMessage })
+    )
   ] });
 }
 
 // src/components/LoginForm/LoginForm.tsx
-import React11, { useState as useState7, useCallback as useCallback7, useMemo as useMemo4 } from "react";
+import React9, { useState as useState7, useCallback as useCallback7, useMemo as useMemo4 } from "react";
 import { jsx as jsx12, jsxs as jsxs7 } from "react/jsx-runtime";
-var LoginForm = React11.memo(({
+var LoginForm = React9.memo(({
   onSignIn,
   onSuccess,
   onError,
@@ -2273,12 +2286,12 @@ var LoginForm = React11.memo(({
   const isFormValid = useMemo4(() => {
     return formData.email.length > 0 && formData.password.length > 0;
   }, [formData.email, formData.password]);
-  const handleEmailChange = useCallback7((e) => {
+  const handleEmailChange = (e) => {
     setFormData((prev) => ({ ...prev, email: e.target.value }));
-  }, []);
-  const handlePasswordChange = useCallback7((e) => {
+  };
+  const handlePasswordChange = (e) => {
     setFormData((prev) => ({ ...prev, password: e.target.value }));
-  }, []);
+  };
   const handleSubmit = useCallback7(async (e) => {
     e.preventDefault();
     setError(null);
@@ -2292,9 +2305,9 @@ var LoginForm = React11.memo(({
       onError?.(err instanceof Error ? err : new Error(errorMessage));
     }
   }, [formData, isFormValid, isLoading, onSignIn, onSuccess, onError]);
-  const handleSignUpClick = useCallback7(() => {
+  const handleSignUpClick = () => {
     onSignUp?.();
-  }, [onSignUp]);
+  };
   const displayTitle = useMemo4(() => title || (appName ? `Sign in to ${appName}` : "Sign In"), [title, appName]);
   const displaySubtitle = useMemo4(() => subtitle || "Enter your credentials to continue.", [subtitle]);
   return /* @__PURE__ */ jsx12(Card, { className: cn("w-full max-w-md mx-auto", className), children: /* @__PURE__ */ jsxs7("form", { onSubmit: handleSubmit, "data-testid": "login-form", children: [
@@ -2824,10 +2837,10 @@ function PasswordChangeForm({ onSubmit, className }) {
 }
 
 // src/components/UserMenu/UserMenu.tsx
-import React14, { useCallback as useCallback9, useMemo as useMemo7, useState as useState10 } from "react";
+import React12, { useCallback as useCallback9, useMemo as useMemo7, useState as useState10 } from "react";
 import { ChevronDown, LogOut, KeyRound } from "lucide-react";
 import { jsx as jsx16, jsxs as jsxs11 } from "react/jsx-runtime";
-var UserMenu = React14.memo(function UserMenu2({
+var UserMenu = React12.memo(function UserMenu2({
   user,
   onSignOut,
   onChangePassword,
@@ -2866,9 +2879,10 @@ var UserMenu = React14.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: [
@@ -2902,61 +2916,55 @@ var UserMenu = React14.memo(function UserMenu2({
     ] })
   ] });
 });
-var UserMenuLoading = React14.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" })
-  ] });
+var UserMenuLoading = React12.memo(function UserMenuLoading2() {
+  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 React15 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 = React15.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] = React15.useState(/* @__PURE__ */ new Set());
-  const buttonRef = React15.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;
@@ -2966,19 +2974,17 @@ var NavigationMenu = React15.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] = React15.useState(void 0);
-  React15.useEffect(() => {
+  React13.useEffect(() => {
     if (!scopeLoading && !resolvedScope?.appId && selectedOrganisation?.id && authContext?.appName && authContext?.user?.id && !resolvedAppId) {
       if (!authContext.user || !authContext.appName) {
         return;
       }
       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
@@ -2986,12 +2992,20 @@ var NavigationMenu = React15.forwardRef(({
           if (result?.appId) {
             setResolvedAppId(result.appId);
           }
-        }).catch((error) => {
+        }).catch(() => {
         });
+      }).catch(() => {
       });
     }
-  }, [scopeLoading, resolvedScope?.appId, selectedOrganisation?.id, authContext?.appName, authContext?.user?.id, resolvedAppId]);
-  const effectiveScope = React15.useMemo(() => {
+  }, [
+    scopeLoading,
+    resolvedScope?.appId,
+    selectedOrganisation?.id,
+    authContext?.appName,
+    authContext?.user?.id,
+    resolvedAppId
+  ]);
+  const effectiveScope = React13.useMemo(() => {
     if (resolvedScope?.organisationId) {
       return resolvedScope;
     }
@@ -3006,7 +3020,7 @@ var NavigationMenu = React15.forwardRef(({
     return null;
   }, [resolvedScope, selectedOrganisation?.id, selectedEvent?.event_id, resolvedAppId]);
   const scopeKey = effectiveScope ? `${effectiveScope.organisationId || ""}-${effectiveScope.eventId || ""}-${effectiveScope.appId || ""}` : "empty";
-  const stableScope = React15.useMemo(() => {
+  const stableScope = React13.useMemo(() => {
     if (effectiveScope?.organisationId) {
       return {
         organisationId: effectiveScope.organisationId,
@@ -3021,18 +3035,18 @@ var NavigationMenu = React15.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 = React15.useRef([]);
-  const filteredItems = React15.useMemo(() => {
+  const filteredItems = React13.useMemo(() => {
     if (itemsPreFiltered && items && items.length > 0) {
       const visibleItems = (items || []).filter((item) => !item.meta?.hidden);
       previousFilteredItemsRef.current = visibleItems;
@@ -3061,9 +3075,13 @@ var NavigationMenu = React15.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) {
@@ -3089,7 +3107,7 @@ var NavigationMenu = React15.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;
           }
@@ -3121,13 +3139,12 @@ var NavigationMenu = React15.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 = {
@@ -3180,7 +3197,6 @@ var NavigationMenu = React15.forwardRef(({
   }, [
     items,
     itemsPreFiltered,
-    // Add itemsPreFiltered to dependencies
     authContext,
     rbacContext,
     permissionMap,
@@ -3191,13 +3207,48 @@ var NavigationMenu = React15.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":
@@ -3340,7 +3391,7 @@ var NavigationMenu = React15.forwardRef(({
           id: `submenu-${item.id}`,
           role: "menu",
           "aria-label": `${item.label} submenu`,
-          children: item.children.map((child) => /* @__PURE__ */ jsx17(React15.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(
@@ -3402,7 +3453,7 @@ var NavigationMenu = React15.forwardRef(({
       className,
       "aria-label": navigationLabel,
       ...props,
-      children: /* @__PURE__ */ jsx17("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx17(React15.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)) })
     }
   );
 });
@@ -3447,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",
       {
@@ -3488,33 +3539,37 @@ 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 React16 from "react";
-import { Fragment as Fragment6, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
+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",
   year = (/* @__PURE__ */ new Date()).getFullYear(),
@@ -3527,19 +3582,19 @@ var FooterComponent = ({
   const copyrightText = copyright || `\xA9 Copyright 2022\u2013${year} all rights reserved, ${companyName}.`;
   return /* @__PURE__ */ jsx19("footer", { className: cn("mt-8 py-6 flex justify-center border-t border-border bg-main-100", className), children: /* @__PURE__ */ jsxs14("section", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto text-center", children: [
     logo && /* @__PURE__ */ jsx19("img", { src: logo, alt: "Logo", className: "h-8 w-auto" }),
-    children && /* @__PURE__ */ jsx19(Fragment6, { children }),
+    children && /* @__PURE__ */ jsx19(Fragment7, { children }),
     /* @__PURE__ */ jsx19("span", { className: "text-muted-foreground", children: copyrightText }),
     links && links.length > 0 && /* @__PURE__ */ jsx19("ul", { className: "flex gap-4 mt-2 md:mt-0", children: links.map((link, index) => /* @__PURE__ */ jsx19("li", { children: /* @__PURE__ */ jsx19("a", { href: link.href, className: "text-muted-foreground hover:text-foreground", children: link.label }) }, index)) })
   ] }) });
 };
 FooterComponent.displayName = "Footer";
-var Footer = React16.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 Fragment7, jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
 var EMPTY_PAGE_ID_MAPPING = {};
 var EMPTY_ROUTE_PERMISSIONS = {};
 function PaceAppLayout({
@@ -3581,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) {
@@ -3596,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);
@@ -3667,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,
@@ -3674,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
   );
@@ -3702,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 () => {
@@ -3729,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) {
@@ -3744,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,
@@ -3800,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,
@@ -3816,7 +3874,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-RGJTDE2C.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-CH6Z342H.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -3847,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: [
@@ -3883,10 +3955,10 @@ function PaceAppLayout({
   }
   if (enforcePermissions && hasPermission === false && !isCheckingSuperAdminDirect && !isSuperAdmin2) {
     if (enforcePagePermissions && pagePermissionFallback) {
-      return /* @__PURE__ */ jsx20(Fragment7, { children: pagePermissionFallback });
+      return /* @__PURE__ */ jsx20(Fragment8, { children: pagePermissionFallback });
     }
     if (permissionFallback) {
-      return /* @__PURE__ */ jsx20(Fragment7, { children: permissionFallback });
+      return /* @__PURE__ */ jsx20(Fragment8, { children: permissionFallback });
     }
     return /* @__PURE__ */ jsx20("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs15("div", { className: "text-center", children: [
       /* @__PURE__ */ jsx20("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Access Denied" }),
@@ -3907,7 +3979,7 @@ function PaceAppLayout({
       ] })
     ] }) });
   }
-  return /* @__PURE__ */ jsxs15(Fragment7, { children: [
+  return /* @__PURE__ */ jsxs15(Fragment8, { children: [
     /* @__PURE__ */ jsx20(
       Header,
       {
@@ -3939,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 = ({
@@ -3950,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(() => {
@@ -4104,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",
@@ -4115,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"
@@ -4139,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;
@@ -4255,8 +4326,8 @@ 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 { Fragment as Fragment8, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
+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,
   table_name,
@@ -4282,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) {
@@ -4449,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,
@@ -4546,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();
@@ -4618,10 +4700,11 @@ 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(Fragment8, { children: [
+            /* @__PURE__ */ jsx24("div", { className: "text-sec-600", children: isResolvingAppId ? "Resolving app configuration..." : isDragging ? "Drop files here..." : /* @__PURE__ */ jsxs19(Fragment9, { children: [
               /* @__PURE__ */ jsx24("span", { className: "font-medium", children: "Click to upload" }),
               " ",
               "or drag and drop"
@@ -4727,9 +4810,9 @@ function FileUpload({
 }
 
 // src/components/Table/Table.tsx
-import * as React21 from "react";
+import * as React20 from "react";
 import { jsx as jsx25 } from "react/jsx-runtime";
-var Table = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var Table = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "table",
   {
     ref,
@@ -4738,9 +4821,9 @@ var Table = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */
   }
 ));
 Table.displayName = "Table";
-var TableHeader = React21.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 = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableBody = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tbody",
   {
     ref,
@@ -4749,7 +4832,7 @@ var TableBody = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableBody.displayName = "TableBody";
-var TableFooter = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableFooter = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tfoot",
   {
     ref,
@@ -4761,7 +4844,7 @@ var TableFooter = React21.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 TableFooter.displayName = "TableFooter";
-var TableRow = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableRow = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tr",
   {
     ref,
@@ -4773,7 +4856,7 @@ var TableRow = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__
   }
 ));
 TableRow.displayName = "TableRow";
-var TableHead = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableHead = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "th",
   {
     ref,
@@ -4785,7 +4868,7 @@ var TableHead = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableHead.displayName = "TableHead";
-var TableCell = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCell = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "td",
   {
     ref,
@@ -4794,7 +4877,7 @@ var TableCell = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableCell.displayName = "TableCell";
-var TableCaption = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCaption = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "caption",
   {
     ref,
@@ -4805,7 +4888,7 @@ var TableCaption = React21.forwardRef(({ className, ...props }, ref) => /* @__PU
 TableCaption.displayName = "TableCaption";
 
 // src/components/PublicLayout/PublicPageLayout.tsx
-import { Fragment as Fragment9, jsx as jsx26, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Fragment as Fragment10, jsx as jsx26, jsxs as jsxs20 } from "react/jsx-runtime";
 function PublicPageHeader({
   event,
   eventCode,
@@ -4830,9 +4913,9 @@ function PublicPageHeader({
         alt: appName
       }
     ),
-    event && /* @__PURE__ */ jsxs20(Fragment9, { children: [
+    event && /* @__PURE__ */ jsxs20(Fragment10, { children: [
       /* @__PURE__ */ jsx26("h1", { children: event.event_name }),
-      showEventLogo && event && /* @__PURE__ */ jsx26(Fragment9, { children: customEventLogo || /* @__PURE__ */ jsx26(
+      showEventLogo && event && /* @__PURE__ */ jsx26(Fragment10, { children: customEventLogo || /* @__PURE__ */ jsx26(
         FileDisplay,
         {
           table_name: "event",
@@ -4851,11 +4934,11 @@ function PublicPageHeader({
       ) }),
       event.event_venue && /* @__PURE__ */ jsx26("h4", { children: event.event_venue })
     ] }),
-    title && /* @__PURE__ */ jsxs20(Fragment9, { children: [
+    title && /* @__PURE__ */ jsxs20(Fragment10, { children: [
       /* @__PURE__ */ jsx26("h1", { children: title }),
       description && /* @__PURE__ */ jsx26("p", { className: "text-lg text-sec-600 max-w-3xl mx-auto", children: description })
     ] }),
-    children && /* @__PURE__ */ jsx26(Fragment9, { children })
+    children && /* @__PURE__ */ jsx26(Fragment10, { children })
   ] });
 }
 function PublicPageFooter({
@@ -4871,7 +4954,7 @@ function PublicPageFooter({
   const copyrightText = copyright || `\xA9 Copyright 2022\u2013${year} all rights reserved, ${companyName}.`;
   return /* @__PURE__ */ jsx26("footer", { className: cn("mt-8 py-6 flex justify-center", className), children: /* @__PURE__ */ jsxs20("section", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto text-center", children: [
     logo && /* @__PURE__ */ jsx26("img", { src: logo, alt: "Logo", className: "h-8 w-auto" }),
-    children && /* @__PURE__ */ jsx26(Fragment9, { children }),
+    children && /* @__PURE__ */ jsx26(Fragment10, { children }),
     /* @__PURE__ */ jsx26("span", { className: "text-muted-foreground", children: copyrightText }),
     links && links.length > 0 && /* @__PURE__ */ jsx26("ul", { className: "flex gap-4 mt-2 md:mt-0", children: links.map((link, index) => /* @__PURE__ */ jsx26("li", { children: /* @__PURE__ */ jsx26("a", { href: link.href, className: "text-muted-foreground hover:text-foreground", children: link.label }) }, index)) })
   ] }) });
@@ -4884,7 +4967,6 @@ function PublicPageLayout({
   error = null,
   refetch,
   showFooter = true,
-  className = "",
   errorFallback: ErrorFallback,
   loadingFallback: LoadingFallback,
   customHeader,
@@ -4925,7 +5007,7 @@ function PublicPageLayout({
       handleRefetch && /* @__PURE__ */ jsx26(Button, { onClick: handleRefetch, children: "Try Again" })
     ] });
   }
-  return /* @__PURE__ */ jsx26(ErrorBoundary, { componentName: "PublicPageLayout", children: /* @__PURE__ */ jsxs20(Fragment9, { children: [
+  return /* @__PURE__ */ jsx26(ErrorBoundary, { componentName: "PublicPageLayout", children: /* @__PURE__ */ jsxs20(Fragment10, { children: [
     customHeader || /* @__PURE__ */ jsx26(
       PublicPageHeader,
       {
@@ -4990,4 +5072,4 @@ export {
   PublicPageFooter,
   PublicPageLayout
 };
-//# sourceMappingURL=chunk-NOAYCWCX.js.map
+//# sourceMappingURL=chunk-NECFR5MM.js.map