@jmruthers/pace-core 0.5.191 → 0.6.1

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

@@ -25,12 +25,12 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-ULHIJK66.js";
+} from "./chunk-T33XF5ZC.js";
 import {
   useCan,
   usePermissions,
   useRBAC
-} from "./chunk-VRGWKHDB.js";
+} from "./chunk-XM25TVIE.js";
 import {
   createFileReferenceService,
   generateFileUrlsBatch,
@@ -42,10 +42,10 @@ import {
   useFileDisplay,
   usePreventTabReload,
   usePublicFileDisplay
-} from "./chunk-XNYQOL3Z.js";
+} from "./chunk-JBKQ3SAO.js";
 import {
   useToast
-} from "./chunk-6C4YBBJM.js";
+} from "./chunk-3QRJFVBR.js";
 import {
   ErrorBoundary,
   PublicPageContext,
@@ -53,23 +53,23 @@ import {
   useEvents,
   useIsPublicPage,
   useResolvedScope
-} from "./chunk-OETXORNB.js";
+} from "./chunk-3XTALGJF.js";
 import {
   EventServiceContext,
   useOrganisations,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-6LTQQAT6.js";
+} from "./chunk-BYFSK72L.js";
 import {
   isSuperAdmin
-} from "./chunk-ROXMHMY2.js";
+} from "./chunk-KNC55RTG.js";
 import {
   assertAppId
 } from "./chunk-QXHPKYJV.js";
 import {
   LoadingSpinner,
   getAppId
-} from "./chunk-HW3OVDUF.js";
+} from "./chunk-J36DSWQK.js";
 import {
   cn
 } from "./chunk-R77UEZ4E.js";
@@ -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
@@ -515,6 +512,7 @@ function FileDisplayContent({
   displayOnly,
   showDelete,
   className,
+  imgClassName,
   children,
   onDelete,
   clearError,
@@ -637,12 +635,12 @@ function FileDisplayContent({
       if (!fileUrl) {
         return /* @__PURE__ */ jsx4("figure", { className: className || "max-w-full h-48", title: "Loading", children: /* @__PURE__ */ jsx4("p", { className: fallbackClasses, children: /* @__PURE__ */ jsx4(LoadingSpinner, {}) }) });
       }
-      return /* @__PURE__ */ jsx4("figure", { className: className || "max-w-full h-auto", children: /* @__PURE__ */ jsx4(
+      return /* @__PURE__ */ jsx4("figure", { className: className || "", children: /* @__PURE__ */ jsx4(
         "img",
         {
           src: fileUrl,
           alt: fileReference.file_metadata.fileName || "File",
-          className: "max-w-full h-auto",
+          className: imgClassName || "object-cover size-full",
           onError: handleImageError
         }
       ) });
@@ -685,7 +683,7 @@ function FileDisplayContent({
         {
           src: fileUrl,
           alt: fileReference.file_metadata.fileName || "File",
-          className: "max-w-full h-auto",
+          className: imgClassName || "object-cover size-full",
           onError: handleImageError
         }
       ),
@@ -782,7 +780,7 @@ function FileDisplayContent({
           {
             src: fileUrl2,
             alt: fileRef.file_metadata.fileName || "File",
-            className: "w-12 h-12 object-cover rounded",
+            className: imgClassName || "object-cover size-full",
             onError: handleImageError
           }
         ) : /* @__PURE__ */ jsx4("span", { className: "text-2xl", children: getFileIcon(fileRef.file_metadata.fileType || "") }),
@@ -832,6 +830,7 @@ function FileDisplayPublic({
   displayOnly = false,
   showDelete = false,
   className = "",
+  imgClassName,
   children,
   loadingComponent,
   errorComponent,
@@ -861,6 +860,7 @@ function FileDisplayPublic({
           displayOnly,
           showDelete: false,
           className,
+          imgClassName,
           children,
           onDelete: void 0,
           organisation_id,
@@ -934,6 +934,7 @@ function FileDisplayPublic({
       displayOnly,
       showDelete: false,
       className,
+      imgClassName,
       children,
       onDelete: showDelete ? handleDelete : void 0,
       organisation_id,
@@ -957,6 +958,7 @@ function FileDisplayAuthenticated({
   displayOnly = false,
   showDelete = false,
   className = "",
+  imgClassName,
   children,
   loadingComponent,
   errorComponent,
@@ -1042,6 +1044,7 @@ function FileDisplayAuthenticated({
       displayOnly,
       showDelete,
       className,
+      imgClassName,
       children,
       onDelete: showDelete ? handleDelete : void 0,
       clearError: refetch,
@@ -1066,6 +1069,7 @@ function FileDisplay({
   displayOnly = false,
   showDelete = false,
   className = "",
+  imgClassName,
   children,
   loadingComponent,
   errorComponent,
@@ -1089,6 +1093,7 @@ function FileDisplay({
         displayOnly,
         showDelete,
         className,
+        imgClassName,
         children,
         loadingComponent,
         errorComponent,
@@ -1112,6 +1117,7 @@ function FileDisplay({
       displayOnly,
       showDelete,
       className,
+      imgClassName,
       children,
       loadingComponent,
       errorComponent,
@@ -1480,7 +1486,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",
@@ -1490,7 +1496,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,
@@ -1504,7 +1510,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(
@@ -1521,10 +1527,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);
       }
@@ -1583,7 +1589,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: {
@@ -1649,42 +1654,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(
@@ -1727,12 +1730,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,
@@ -1744,7 +1747,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,
     {
@@ -1763,7 +1766,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,
@@ -1777,7 +1780,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
@@ -1794,10 +1797,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) {
@@ -1811,14 +1814,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();
@@ -1827,16 +1830,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,
@@ -1852,29 +1855,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;
@@ -1924,7 +1927,7 @@ var Calendar = React9.forwardRef(
             }
             assignToRef(monthGridElement.ref, node);
           } : void 0;
-          return React9.cloneElement(
+          return React7.cloneElement(
             monthGridElement,
             {
               key: child.key ?? `month-grid-${displayIndex}`,
@@ -1983,11 +1986,11 @@ var Calendar = React9.forwardRef(
       }) });
     });
     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,
@@ -2075,12 +2078,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,
@@ -2093,7 +2096,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,
     {
@@ -2108,7 +2111,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,
@@ -2121,7 +2124,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,
@@ -2136,7 +2139,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,
@@ -2146,7 +2149,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,
@@ -2175,7 +2178,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,
@@ -2188,7 +2191,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 }) });
@@ -2204,9 +2208,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,
@@ -2219,35 +2221,40 @@ 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,
+                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,
@@ -2264,12 +2271,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);
@@ -2283,9 +2290,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: [
@@ -2598,7 +2605,6 @@ function OrganisationSelector({
       if (newOrganisation && onOrganisationChange) {
         onOrganisationChange(newOrganisation);
       }
-      logger.debug("OrganisationSelector", "Successfully switched to organisation:", orgId);
     } catch (error) {
       logger.error("OrganisationSelector", "Failed to switch organisation:", error);
       setSwitchError(error instanceof Error ? error.message : "Failed to switch organisation");
@@ -2816,10 +2822,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,
@@ -2894,7 +2900,7 @@ var UserMenu = React14.memo(function UserMenu2({
     ] })
   ] });
 });
-var UserMenuLoading = React14.memo(function UserMenuLoading2() {
+var UserMenuLoading = React12.memo(function UserMenuLoading2() {
   return /* @__PURE__ */ jsxs11("div", { className: "relative inline-block text-left", children: [
     /* @__PURE__ */ jsxs11(
       "button",
@@ -2915,10 +2921,10 @@ var UserMenuLoading = React14.memo(function UserMenuLoading2() {
 UserMenu.Loading = UserMenuLoading;
 
 // src/components/NavigationMenu/NavigationMenu.tsx
-import * as React15 from "react";
+import * as React13 from "react";
 import { ChevronDown as ChevronDown2 } from "lucide-react";
 import { jsx as jsx17, jsxs as jsxs12 } from "react/jsx-runtime";
-var NavigationMenu = React15.forwardRef(({
+var NavigationMenu = React13.forwardRef(({
   items,
   mode = "dropdown",
   currentPath,
@@ -2936,8 +2942,8 @@ var NavigationMenu = React15.forwardRef(({
   itemsPreFiltered = false,
   ...props
 }, ref) => {
-  const [expandedItems, setExpandedItems] = React15.useState(/* @__PURE__ */ new Set());
-  const buttonRef = React15.useRef(null);
+  const [expandedItems, setExpandedItems] = React13.useState(/* @__PURE__ */ new Set());
+  const buttonRef = React13.useRef(null);
   let authContext = null;
   try {
     authContext = useUnifiedAuth();
@@ -2962,15 +2968,15 @@ var NavigationMenu = React15.forwardRef(({
     selectedOrganisationId: itemsPreFiltered ? null : selectedOrganisation?.id || null,
     selectedEventId: itemsPreFiltered ? null : selectedEvent?.event_id || null
   });
-  const [resolvedAppId, setResolvedAppId] = React15.useState(void 0);
-  React15.useEffect(() => {
+  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) {
         return;
       }
       const userId2 = authContext.user.id;
       const appName = authContext.appName;
-      import("./api-IHKALJZD.js").then(({ resolveAppContext }) => {
+      import("./api-N774RPUA.js").then(({ resolveAppContext }) => {
         resolveAppContext({
           userId: userId2,
           appName
@@ -2979,12 +2985,11 @@ var NavigationMenu = React15.forwardRef(({
             setResolvedAppId(result.appId);
           }
         }).catch((error) => {
-          logger.debug("NavigationMenu", "Failed to resolve appId", error);
         });
       });
     }
   }, [scopeLoading, resolvedScope?.appId, selectedOrganisation?.id, authContext?.appName, authContext?.user?.id, resolvedAppId]);
-  const effectiveScope = React15.useMemo(() => {
+  const effectiveScope = React13.useMemo(() => {
     if (resolvedScope?.organisationId) {
       return resolvedScope;
     }
@@ -2999,7 +3004,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,
@@ -3024,8 +3029,8 @@ var NavigationMenu = React15.forwardRef(({
     itemsPreFiltered ? void 0 : stableScope.appId
     // Skip if pre-filtered
   );
-  const previousFilteredItemsRef = React15.useRef([]);
-  const filteredItems = React15.useMemo(() => {
+  const previousFilteredItemsRef = React13.useRef([]);
+  const filteredItems = React13.useMemo(() => {
     if (itemsPreFiltered && items && items.length > 0) {
       const visibleItems = (items || []).filter((item) => !item.meta?.hidden);
       previousFilteredItemsRef.current = visibleItems;
@@ -3220,15 +3225,6 @@ var NavigationMenu = React15.forwardRef(({
   };
   const handleItemClick = (item) => {
     if (auditLog) {
-      logger.debug("NavigationMenu", "Navigation access attempt:", {
-        itemId: item.id,
-        label: item.label,
-        href: item.href,
-        permissions: item.permissions,
-        roles: item.roles,
-        accessLevel: item.accessLevel,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-      });
     }
     if (!authContext) {
       if (onNavigate) {
@@ -3342,7 +3338,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(React13.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
         }
       )
     ] }) : /* @__PURE__ */ jsx17(
@@ -3404,7 +3400,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(React13.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
     }
   );
 });
@@ -3515,8 +3511,8 @@ function Header({
 }
 
 // src/components/Footer/Footer.tsx
-import React16 from "react";
-import { Fragment as Fragment6, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
+import React14 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(),
@@ -3529,19 +3525,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 = React14.memo(FooterComponent);
 Footer.displayName = "Footer";
 
 // src/components/PaceAppLayout/PaceAppLayout.tsx
 import { useState as useState12, 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({
@@ -3574,7 +3570,7 @@ function PaceAppLayout({
   onRouteAccessDenied,
   onRouteStrictModeViolation
 }) {
-  const { user, signOut, updatePassword, supabase, appId: contextAppId } = useUnifiedAuth();
+  const { user, signOut, updatePassword, supabase, appId: contextAppId, selectedOrganisationId } = useUnifiedAuth();
   const {
     selectedOrganisation,
     isContextReady,
@@ -3582,6 +3578,34 @@ function PaceAppLayout({
     ensureOrganisationContext,
     isLoading: organisationLoading
   } = useOrganisations();
+  const { isSuperAdmin: isSuperAdminFromRBAC, isLoading: rbacLoading } = useRBAC();
+  const [isSuperAdminDirect, setIsSuperAdminDirect] = useState12(false);
+  const [isCheckingSuperAdminDirect, setIsCheckingSuperAdminDirect] = useState12(false);
+  useEffect8(() => {
+    const checkSuperAdminDirect = async () => {
+      if (!user?.id) {
+        setIsSuperAdminDirect(false);
+        setIsCheckingSuperAdminDirect(false);
+        return;
+      }
+      if (isSuperAdminFromRBAC) {
+        setIsCheckingSuperAdminDirect(false);
+        return;
+      }
+      setIsCheckingSuperAdminDirect(true);
+      try {
+        const superAdminStatus = await isSuperAdmin(user.id);
+        setIsSuperAdminDirect(superAdminStatus);
+      } catch (error) {
+        logger.error("PaceAppLayout", "Error checking super admin status directly", { userId: user?.id, error });
+        setIsSuperAdminDirect(false);
+      } finally {
+        setIsCheckingSuperAdminDirect(false);
+      }
+    };
+    checkSuperAdminDirect();
+  }, [user?.id, isSuperAdminFromRBAC]);
+  const isSuperAdmin2 = isSuperAdminFromRBAC || isSuperAdminDirect;
   const navigate = useNavigate();
   const location = useLocation();
   useEventTheme();
@@ -3597,23 +3621,22 @@ function PaceAppLayout({
     selectedEventId: selectedEvent?.event_id || null
   });
   const resolvedAppId = contextAppId || resolvedScope?.appId;
+  const scopeOrgId = resolvedScope?.organisationId || selectedOrganisation?.id || "";
+  const scopeEventId = resolvedScope?.eventId || selectedEvent?.event_id || void 0;
+  const scopeAppId = resolvedScope?.appId || resolvedAppId || void 0;
   const scope = useMemo9(() => {
-    if (resolvedScope?.organisationId) {
-      return resolvedScope;
+    const newScope = {};
+    if (scopeOrgId) {
+      newScope.organisationId = scopeOrgId;
     }
-    if (selectedOrganisation?.id) {
-      return {
-        organisationId: selectedOrganisation.id,
-        eventId: selectedEvent?.event_id || void 0,
-        appId: resolvedAppId || resolvedScope?.appId || void 0
-      };
+    if (scopeEventId) {
+      newScope.eventId = scopeEventId;
     }
-    return {
-      organisationId: selectedOrganisation?.id || "",
-      eventId: selectedEvent?.event_id || void 0,
-      appId: resolvedAppId || resolvedScope?.appId || void 0
-    };
-  }, [resolvedScope, selectedOrganisation?.id, selectedEvent?.event_id, resolvedAppId]);
+    if (scopeAppId) {
+      newScope.appId = scopeAppId;
+    }
+    return newScope;
+  }, [scopeOrgId, scopeEventId, scopeAppId]);
   const defaultNavItems = useMemo9(() => [
     { id: "home", label: "Home", href: "/", icon: "Home" },
     { id: "dashboard", label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard" },
@@ -3632,72 +3655,51 @@ function PaceAppLayout({
       return pageIdMapping[currentPath];
     }
     const pathSegments = currentPath.slice(1).split("/").filter(Boolean);
-    return pathSegments[0] || "home";
+    return pathSegments[0] || "";
   }, [location.pathname, pageIdMapping]);
   const currentPermission = useMemo9(() => {
-    if (!enforcePermissions) {
-      return "read:page.home";
+    if (!enforcePermissions || !currentPageId) {
+      return "";
     }
     const permissionString = `${currentRoutePermission}:page.${currentPageId}`;
     return permissionString;
   }, [enforcePermissions, currentRoutePermission, currentPageId]);
-  const [isSuperAdminUser, setIsSuperAdminUser] = useState12(false);
-  const [isCheckingSuperAdmin, setIsCheckingSuperAdmin] = useState12(false);
-  useEffect8(() => {
-    const checkSuperAdminStatus = async () => {
-      if (!user?.id) {
-        setIsSuperAdminUser(false);
-        setIsCheckingSuperAdmin(false);
-        return;
-      }
-      setIsCheckingSuperAdmin(true);
-      try {
-        const superAdminStatus = await isSuperAdmin(user.id);
-        setIsSuperAdminUser(superAdminStatus);
-      } catch (error) {
-        logger.error("PaceAppLayout", "Error checking super admin status", { userId: user?.id, error });
-        setIsSuperAdminUser(false);
-      } finally {
-        setIsCheckingSuperAdmin(false);
-      }
-    };
-    checkSuperAdminStatus();
-  }, [user?.id]);
+  const shouldCheckPermission = enforcePermissions && !!currentPermission && !!currentPageId;
   const { can: canFromHook, isLoading: isCheckingPermission, error: permissionError } = useCan(
     user?.id || "",
     scope,
-    currentPermission,
-    currentPageId,
+    shouldCheckPermission ? currentPermission : "",
+    shouldCheckPermission ? currentPageId : "",
     true,
     // useCache
     appName
     // Pass appName for PORTAL/ADMIN special case
   );
-  const can = isSuperAdminUser ? true : canFromHook;
+  const can = isSuperAdmin2 ? true : canFromHook;
   const hasPermission = enforcePermissions ? can : true;
   useEffect8(() => {
     if (!enforcePermissions) {
       return;
     }
-    if (isCheckingSuperAdmin || isCheckingPermission) {
+    if (isCheckingPermission) {
       return;
     }
-    if (strictMode && !isSuperAdminUser && !can) {
+    if (strictMode && !isSuperAdmin2 && !can) {
       logger.error("PaceAppLayout", "STRICT MODE VIOLATION: User attempted to access protected page without permission", {
         pageName: currentPageId,
         operation: currentRoutePermission,
         userId: user?.id,
-        isSuperAdmin: isSuperAdminUser,
+        isSuperAdmin: isSuperAdmin2,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       });
       if (onStrictModeViolation) {
         onStrictModeViolation(currentPageId, currentRoutePermission);
       }
     }
-    if (!isSuperAdminUser && !can && onPageAccessDenied) {
+    if (!isSuperAdmin2 && !can && onPageAccessDenied) {
       onPageAccessDenied(currentPageId, currentRoutePermission);
     }
-  }, [enforcePermissions, can, isCheckingPermission, isCheckingSuperAdmin, isSuperAdminUser, currentPageId, currentRoutePermission, user?.id, strictMode, auditLog, onPageAccessDenied, onStrictModeViolation]);
+  }, [enforcePermissions, can, isCheckingPermission, isSuperAdmin2, currentPageId, currentRoutePermission, user?.id, strictMode, auditLog, onPageAccessDenied, onStrictModeViolation]);
   const [filteredMenuItems, setFilteredMenuItems] = useState12(baseMenuItems);
   useEffect8(() => {
     let isMounted = true;
@@ -3725,8 +3727,8 @@ function PaceAppLayout({
         return;
       }
       try {
-        const { isSuperAdmin: isSuperAdmin2 } = await import("./api-IHKALJZD.js");
-        const isSuper = await isSuperAdmin2(user.id);
+        const { isSuperAdmin: checkSuperAdminDynamic } = await import("./api-N774RPUA.js");
+        const isSuper = await checkSuperAdminDynamic(user.id);
         if (isSuper) {
           if (isMounted) {
             setFilteredMenuItems(baseMenuItems);
@@ -3740,7 +3742,7 @@ function PaceAppLayout({
         }
       }
       try {
-        const { getPermissionMap } = await import("./api-IHKALJZD.js");
+        const { getPermissionMap } = await import("./api-N774RPUA.js");
         const permissionScope = {
           organisationId: currentScope.organisationId,
           eventId: currentScope.eventId,
@@ -3796,7 +3798,7 @@ function PaceAppLayout({
       let hasAccess = true;
       if (currentRoute.pageId && currentRoute.permissions && currentRoute.permissions.length > 0) {
         try {
-          const { isPermittedCached } = await import("./api-IHKALJZD.js");
+          const { isPermittedCached } = await import("./api-N774RPUA.js");
           const hasPagePermission = await isPermittedCached({
             userId: user?.id || "",
             scope,
@@ -3812,7 +3814,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-FTSG5XH7.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-ATAP5UTR.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -3858,31 +3860,31 @@ function PaceAppLayout({
     }
     return {};
   };
-  if (user?.id && organisationLoading) {
+  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: [
       /* @__PURE__ */ jsx20("div", { className: "animate-spin rounded-full size-8 border-b-2 border-sec-900 mx-auto mb-4" }),
       /* @__PURE__ */ jsx20("p", { className: "text-sec-600", children: "Loading organisation context..." })
     ] }) });
   }
-  if (enforcePermissions && (isCheckingSuperAdmin || isCheckingPermission)) {
+  if (enforcePermissions && isCheckingPermission) {
     return /* @__PURE__ */ jsx20("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs15("div", { className: "text-center", children: [
       /* @__PURE__ */ jsx20("div", { className: "animate-spin rounded-full size-8 border-b-2 border-sec-900 mx-auto mb-4" }),
       /* @__PURE__ */ jsx20("p", { className: "text-sec-600", children: "Checking permissions..." })
     ] }) });
   }
-  if (enforcePermissions && permissionError && !isSuperAdminUser) {
+  if (enforcePermissions && permissionError && !isSuperAdmin2) {
     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: "Permission Error" }),
       /* @__PURE__ */ jsx20("p", { className: "text-sec-600 mb-4", children: permissionError.message }),
       /* @__PURE__ */ jsx20(Button, { onClick: () => navigate("/"), children: "Go Home" })
     ] }) });
   }
-  if (enforcePermissions && hasPermission === false && !isCheckingSuperAdmin && !isSuperAdminUser) {
+  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" }),
@@ -3903,7 +3905,7 @@ function PaceAppLayout({
       ] })
     ] }) });
   }
-  return /* @__PURE__ */ jsxs15(Fragment7, { children: [
+  return /* @__PURE__ */ jsxs15(Fragment8, { children: [
     /* @__PURE__ */ jsx20(
       Header,
       {
@@ -3968,7 +3970,6 @@ var PaceLoginPage = ({
           await eventService.restorePersistedEvent();
         }
       } catch (error) {
-        logger.debug("PaceLoginPage", "Could not restore persisted event (service may not be ready):", error);
       }
     };
     const timeoutId = setTimeout(() => {
@@ -4002,7 +4003,6 @@ var PaceLoginPage = ({
         }
         const { data: pagesData, error: pagesError } = await supabase.from("rbac_app_pages").select("id, page_name").eq("app_id", appData.id);
         if (pagesError || !pagesData || pagesData.length === 0) {
-          logger.debug("PaceLoginPage", "No pages configured for app:", appName);
           setAccessError(`You do not have permission to access ${appName}. This application is currently unavailable. Please contact your administrator if you believe you should have access.`);
           setIsCheckingAccess(false);
           return;
@@ -4010,7 +4010,6 @@ var PaceLoginPage = ({
         const { data: orgRow } = await supabase.from("rbac_organisation_roles").select("organisation_id").eq("user_id", userId).eq("status", "active").is("revoked_at", null).limit(1).maybeSingle();
         const organisationId = orgRow?.organisation_id;
         if (!organisationId) {
-          logger.debug("PaceLoginPage", "User has no organisation access");
           setAccessError(`You do not have permission to access ${appName}. You are not assigned to any organisation. Please contact your administrator.`);
           setIsCheckingAccess(false);
           return;
@@ -4027,19 +4026,16 @@ var PaceLoginPage = ({
             p_page_id: page.page_name
             // Page name to resolve to UUID
           });
-          logger.debug("PaceLoginPage", "Permission check for page:", { pageName: page.page_name, hasPermission, error: permError });
           if (!permError && hasPermission === true) {
             hasAnyAccess = true;
             break;
           }
         }
         if (hasAnyAccess) {
-          logger.debug("PaceLoginPage", "User has access to app");
           setIsCheckingAccess(false);
           navigate(onSuccessRedirectPath, { replace: true });
           return;
         }
-        logger.debug("PaceLoginPage", "Access denied - no permissions");
         setAccessError(`You do not have permission to access ${appName}. This application is restricted to authorized users only. Please contact your administrator if you believe you should have access.`);
         setIsCheckingAccess(false);
       } catch (error) {
@@ -4251,7 +4247,6 @@ function ProtectedRoute({
     ] }) });
   }
   if (!selectedEvent) {
-    logger.debug("ProtectedRoute", "Events available but none selected - allowing render so selector is visible");
     return /* @__PURE__ */ jsx23(Outlet2, {});
   }
   return /* @__PURE__ */ jsx23(Outlet2, {});
@@ -4259,7 +4254,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 { Fragment as Fragment8, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
+import { Fragment as Fragment9, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
 function FileUpload({
   supabase,
   table_name,
@@ -4624,7 +4619,7 @@ function FileUpload({
                 "data-testid": "file-input"
               }
             ),
-            /* @__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"
@@ -4730,9 +4725,9 @@ function FileUpload({
 }
 
 // src/components/Table/Table.tsx
-import * as React21 from "react";
+import * as React19 from "react";
 import { jsx as jsx25 } from "react/jsx-runtime";
-var Table = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var Table = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "table",
   {
     ref,
@@ -4741,9 +4736,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 = React19.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 = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tbody",
   {
     ref,
@@ -4752,7 +4747,7 @@ var TableBody = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableBody.displayName = "TableBody";
-var TableFooter = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableFooter = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tfoot",
   {
     ref,
@@ -4764,7 +4759,7 @@ var TableFooter = React21.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 TableFooter.displayName = "TableFooter";
-var TableRow = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableRow = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "tr",
   {
     ref,
@@ -4776,7 +4771,7 @@ var TableRow = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__
   }
 ));
 TableRow.displayName = "TableRow";
-var TableHead = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableHead = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "th",
   {
     ref,
@@ -4788,7 +4783,7 @@ var TableHead = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableHead.displayName = "TableHead";
-var TableCell = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCell = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "td",
   {
     ref,
@@ -4797,7 +4792,7 @@ var TableCell = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableCell.displayName = "TableCell";
-var TableCaption = React21.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCaption = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
   "caption",
   {
     ref,
@@ -4808,7 +4803,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,
@@ -4833,9 +4828,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",
@@ -4854,11 +4849,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({
@@ -4874,7 +4869,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)) })
   ] }) });
@@ -4928,7 +4923,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,
       {
@@ -4993,4 +4988,4 @@ export {
   PublicPageFooter,
   PublicPageLayout
 };
-//# sourceMappingURL=chunk-VKB2CO4Z.js.map
+//# sourceMappingURL=chunk-GLK6VM3F.js.map