@jmruthers/pace-core 0.6.1 → 0.6.3

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

@@ -20,17 +20,19 @@ import {
   Input,
   Select,
   SelectContent,
+  SelectGroup,
   SelectItem,
   SelectLabel,
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-T33XF5ZC.js";
+} from "./chunk-PQBSKX33.js";
 import {
   useCan,
   usePermissions,
-  useRBAC
-} from "./chunk-XM25TVIE.js";
+  useRBAC,
+  useResolvedScope
+} from "./chunk-YDQHOZNA.js";
 import {
   createFileReferenceService,
   generateFileUrlsBatch,
@@ -42,27 +44,26 @@ import {
   useFileDisplay,
   usePreventTabReload,
   usePublicFileDisplay
-} from "./chunk-JBKQ3SAO.js";
+} from "./chunk-2T2IG7T7.js";
 import {
   useToast
-} from "./chunk-3QRJFVBR.js";
+} from "./chunk-6SOIHG6Z.js";
 import {
   ErrorBoundary,
   PublicPageContext,
   useAppConfig,
   useEvents,
-  useIsPublicPage,
-  useResolvedScope
-} from "./chunk-3XTALGJF.js";
+  useIsPublicPage
+} from "./chunk-6Z7LTB3D.js";
 import {
   EventServiceContext,
   useOrganisations,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-BYFSK72L.js";
+} from "./chunk-DWUBLJJM.js";
 import {
   isSuperAdmin
-} from "./chunk-KNC55RTG.js";
+} from "./chunk-RWEBCB47.js";
 import {
   assertAppId
 } from "./chunk-QXHPKYJV.js";
@@ -72,13 +73,13 @@ import {
 } from "./chunk-J36DSWQK.js";
 import {
   cn
-} from "./chunk-R77UEZ4E.js";
+} from "./chunk-M43Y4SSO.js";
 import {
   getCurrentAppName
-} from "./chunk-I7PSE6JW.js";
+} from "./chunk-M7MPQISP.js";
 import {
   clearPalette
-} from "./chunk-SQGMNID3.js";
+} from "./chunk-L4OXEN46.js";
 import {
   createLogger,
   logger
@@ -404,7 +405,7 @@ function Textarea({ className, variant = "default", size = "md", error, ref, ...
 Textarea.displayName = "Textarea";
 
 // src/components/FileDisplay/FileDisplay.tsx
-import { useState as useState3, useEffect as useEffect3, useRef as useRef3, useContext, useMemo } from "react";
+import React3, { useState as useState3, useEffect as useEffect3, useCallback as useCallback3, useRef as useRef3, useContext, useMemo } from "react";
 import { FileText, ExternalLink } from "lucide-react";
 
 // src/hooks/useFileUrl.ts
@@ -423,6 +424,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;
     }
@@ -500,7 +507,7 @@ function defaultGenerateFallbackText(fileName) {
   if (words.length === 0) return "FL";
   return words.map((word) => word.charAt(0).toUpperCase()).join("").substring(0, 3);
 }
-function FileDisplayContent({
+var FileDisplayContent = React3.memo(function FileDisplayContent2({
   isLoading,
   error,
   fileUrl,
@@ -531,6 +538,22 @@ function FileDisplayContent({
   const [internalFileUrls, setInternalFileUrls] = useState3(new Map(fileUrls));
   const [deleteDialogOpen, setDeleteDialogOpen] = useState3(false);
   const fileReferencesRef = useRef3([]);
+  const imgRef = useRef3(null);
+  const currentSrcRef = useRef3(null);
+  const isImageLoadingRef = useRef3(false);
+  const stableFileUrl = useMemo(() => fileUrl, [fileUrl]);
+  const handleImageLoadStart = useCallback3(() => {
+    isImageLoadingRef.current = true;
+    if (stableFileUrl) {
+      currentSrcRef.current = stableFileUrl;
+    }
+  }, [stableFileUrl]);
+  const handleImageLoad = useCallback3(() => {
+    isImageLoadingRef.current = false;
+    if (stableFileUrl) {
+      currentSrcRef.current = stableFileUrl;
+    }
+  }, [stableFileUrl]);
   const computedFallbackText = useMemo(() => {
     if (fallbackText) return fallbackText;
     const sourceText = fallbackSourceText ?? fileReference?.file_metadata?.fileName;
@@ -554,10 +577,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);
@@ -632,27 +659,32 @@ function FileDisplayContent({
       if (imageError && showFallback) {
         return /* @__PURE__ */ jsx4("figure", { className, title: fileReference.file_metadata.fileName || "File", children: /* @__PURE__ */ jsx4("p", { className: fallbackClasses, children: computedFallbackText }) });
       }
-      if (!fileUrl) {
+      if (!stableFileUrl) {
         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 || "", children: /* @__PURE__ */ jsx4(
         "img",
         {
-          src: fileUrl,
+          ref: imgRef,
+          src: stableFileUrl || void 0,
           alt: fileReference.file_metadata.fileName || "File",
           className: imgClassName || "object-cover size-full",
-          onError: handleImageError
-        }
+          onError: handleImageError,
+          onLoadStart: handleImageLoadStart,
+          onLoad: handleImageLoad,
+          loading: "lazy"
+        },
+        fileReference.id
       ) });
     }
-    if (displayOnly && !isImage && fileUrl && fileReference && !showDelete) {
+    if (displayOnly && !isImage && stableFileUrl && fileReference && !showDelete) {
       const fileName = fileReference.file_metadata?.fileName || "Document";
       const ariaLabel = `Open ${fileName} in new tab`;
       return /* @__PURE__ */ jsxs3("figure", { className, children: [
         /* @__PURE__ */ jsxs3(
           "a",
           {
-            href: fileUrl,
+            href: stableFileUrl || void 0,
             target: "_blank",
             rel: "noopener noreferrer",
             "aria-label": ariaLabel,
@@ -674,18 +706,20 @@ function FileDisplayContent({
         ] })
       ] });
     }
-    if (displayOnly && showFallback && (!fileUrl || imageError || !isImage)) {
+    if (displayOnly && showFallback && (!stableFileUrl || imageError || !isImage)) {
       return /* @__PURE__ */ jsx4("figure", { className, title: fileReference.file_metadata.fileName || "File", children: /* @__PURE__ */ jsx4("p", { className: fallbackClasses, children: computedFallbackText }) });
     }
-    return /* @__PURE__ */ jsx4("figure", { className: `relative ${className}`, children: isImage && fileUrl && !imageError ? /* @__PURE__ */ jsxs3(Fragment3, { children: [
+    return /* @__PURE__ */ jsx4("figure", { className: `relative ${className}`, children: isImage && stableFileUrl && !imageError ? /* @__PURE__ */ jsxs3(Fragment3, { children: [
       /* @__PURE__ */ jsx4(
         "img",
         {
-          src: fileUrl,
+          src: stableFileUrl,
           alt: fileReference.file_metadata.fileName || "File",
           className: imgClassName || "object-cover size-full",
-          onError: handleImageError
-        }
+          onError: handleImageError,
+          loading: "lazy"
+        },
+        fileReference.id
       ),
       showDelete && /* @__PURE__ */ jsxs3(Fragment3, { children: [
         /* @__PURE__ */ jsx4(
@@ -778,11 +812,13 @@ function FileDisplayContent({
         isImage && fileUrl2 ? /* @__PURE__ */ jsx4(
           "img",
           {
-            src: fileUrl2,
+            src: fileUrl2 || void 0,
             alt: fileRef.file_metadata.fileName || "File",
             className: imgClassName || "object-cover size-full",
-            onError: handleImageError
-          }
+            onError: handleImageError,
+            loading: "lazy"
+          },
+          fileRef.id
         ) : /* @__PURE__ */ jsx4("span", { className: "text-2xl", children: getFileIcon(fileRef.file_metadata.fileType || "") }),
         showMetadata && /* @__PURE__ */ jsxs3("figcaption", { className: "flex-1 min-w-0", children: [
           /* @__PURE__ */ jsx4("p", { className: "font-medium text-sec-900 truncate", children: fileRef.file_metadata.fileName || "Unknown file" }),
@@ -821,7 +857,7 @@ function FileDisplayContent({
     }),
     children
   ] });
-}
+});
 function FileDisplayPublic({
   table_name,
   record_id,
@@ -971,9 +1007,7 @@ function FileDisplayAuthenticated({
   showMetadata
 }) {
   const { supabase } = useUnifiedAuth();
-  if (!supabase) {
-    return /* @__PURE__ */ jsx4("figure", { className, title: "Error", children: /* @__PURE__ */ jsx4("p", { className: getFallbackClasses(fallbackSize || "md"), children: "Supabase client not available in authenticated context" }) });
-  }
+  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState3(null);
   const {
     fileUrl,
     fileReference,
@@ -988,16 +1022,15 @@ function FileDisplayAuthenticated({
     record_id,
     organisation_id,
     category,
-    { supabase }
+    { supabase: supabase || null }
   );
-  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState3(null);
   const displayOnlyFileUrlFromMap = displayOnlyFileReference ? fileUrls.get(displayOnlyFileReference.id) : null;
   const displayOnlyFileUrlHook = useFileUrl(
     displayOnlyFileReference && !displayOnlyFileUrlFromMap ? displayOnlyFileReference : null,
     {
-      supabase,
+      supabase: supabase || null,
       organisation_id,
-      autoLoad: !displayOnlyFileUrlFromMap && !!displayOnlyFileReference
+      autoLoad: !displayOnlyFileUrlFromMap && !!displayOnlyFileReference && !!supabase
     }
   );
   const displayOnlyFileUrl = displayOnlyFileUrlFromMap || displayOnlyFileUrlHook.url;
@@ -1012,6 +1045,9 @@ function FileDisplayAuthenticated({
       setDisplayOnlyFileReference(null);
     }
   }, [displayOnly, category, fileReferences, fileUrls]);
+  if (!supabase) {
+    return /* @__PURE__ */ jsx4("figure", { className, title: "Error", children: /* @__PURE__ */ jsx4("p", { className: getFallbackClasses(fallbackSize || "md"), children: "Supabase client not available in authenticated context" }) });
+  }
   const handleDelete = async () => {
   };
   let finalFileReference = fileReference;
@@ -1428,13 +1464,17 @@ function useFileReferenceById(supabase, fileReferenceId, organisationId) {
       return;
     }
     const loadUrl = async () => {
-      const service = createFileReferenceService(supabase);
-      const url = await service.getFileUrl(
-        fileReference.table_name,
-        fileReference.record_id,
-        organisationId
-      );
-      setFileUrl(url);
+      try {
+        const service = createFileReferenceService(supabase);
+        const url = await service.getFileUrl(
+          fileReference.table_name,
+          fileReference.record_id,
+          organisationId
+        );
+        setFileUrl(url);
+      } catch (error2) {
+        setFileUrl(null);
+      }
     };
     loadUrl();
   }, [fileReference, fileReferenceId, organisationId, supabase]);
@@ -1982,7 +2022,7 @@ var Calendar = React7.forwardRef(
             ] })
           );
         }
-        return child;
+        return React7.isValidElement(child) ? React7.cloneElement(child, { key: child.key ?? `calendar-child-${index}` }) : child;
       }) });
     });
     CustomMonth.displayName = "CustomMonth";
@@ -2236,6 +2276,7 @@ function FormField({
                 type,
                 placeholder,
                 "data-testid": testId,
+                "aria-label": label || placeholder || name,
                 className: cn(
                   "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
                   fieldError && "border-destructive focus-visible:ring-destructive"
@@ -2356,297 +2397,98 @@ var LoginForm = React9.memo(({
   ] }) });
 });
 
-// src/components/EventSelector/EventSelector.tsx
-import { RefreshCw, AlertCircle, Lock, Calendar as Calendar2, Star } from "lucide-react";
-import { useEffect as useEffect6, useMemo as useMemo5, useRef as useRef6 } from "react";
-import { jsx as jsx13, jsxs as jsxs8 } from "react/jsx-runtime";
-function EventSelector({
-  placeholder = "Select an event",
+// src/components/ContextSelector/ContextSelector.tsx
+import { useMemo as useMemo5 } from "react";
+import { RefreshCw, AlertCircle, Building2, Calendar as Calendar2 } from "lucide-react";
+import { Fragment as Fragment6, jsx as jsx13, jsxs as jsxs8 } from "react/jsx-runtime";
+function ContextSelector({
+  placeholder = "Select organisation or event",
   className,
-  onEventChange,
-  showNoEventsMessage = true,
+  onOrganisationSelect,
+  onEventSelect,
+  showNoItemsMessage = true,
   showRetryButton = true,
-  showEventDetails = true,
-  showNextEventIndicator = true
+  compact = false,
+  disabled = false,
+  showOrganisations = true,
+  showEvents = true
 }) {
+  const {
+    organisations,
+    selectedOrganisation,
+    isLoading: orgLoading,
+    error: orgError,
+    refreshOrganisations
+  } = useOrganisations();
   const {
     events,
     selectedEvent,
-    isLoading,
-    error,
-    setSelectedEvent,
+    isLoading: eventLoading,
+    error: eventError,
     refreshEvents
   } = useEvents();
-  const handleValueChange = (eventId) => {
-    const event = events.find((e) => (e.event_id || e.id) === eventId);
-    if (event) {
-      setSelectedEvent(event);
-      if (onEventChange) {
-        onEventChange(event);
-      }
+  const { isSuperAdmin: isSuperAdmin2 } = useRBAC();
+  const isLoading = showOrganisations && orgLoading || showEvents && eventLoading;
+  const hasError = showOrganisations && orgError || showEvents && eventError;
+  const hasItems = showOrganisations && (organisations?.length || 0) > 0 || showEvents && (events?.length || 0) > 0;
+  const currentValue = useMemo5(() => {
+    if (showEvents && selectedEvent) {
+      return `event:${selectedEvent.event_id || selectedEvent.id}`;
     }
-  };
-  const handleRetry = () => {
-    refreshEvents();
-  };
-  const isNextEvent = (event) => {
-    if (!event.event_date) return false;
-    const now = /* @__PURE__ */ new Date();
-    const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-    const eventDate = new Date(event.event_date);
-    return eventDate >= today;
-  };
-  const formatEventDate = (dateString) => {
-    const date = new Date(dateString);
-    const today = /* @__PURE__ */ new Date();
-    const tomorrow = new Date(today);
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    const normalizeDate = (d) => {
-      const normalized = new Date(d);
-      normalized.setHours(0, 0, 0, 0);
-      return normalized;
-    };
-    const normalizedDate = normalizeDate(date);
-    const normalizedToday = normalizeDate(today);
-    const normalizedTomorrow = normalizeDate(tomorrow);
-    if (normalizedDate.getTime() === normalizedToday.getTime()) {
-      return "Today";
-    } else if (normalizedDate.getTime() === normalizedTomorrow.getTime()) {
-      return "Tomorrow";
-    } else {
-      return date.toLocaleDateString();
+    if (showOrganisations && selectedOrganisation) {
+      return `org:${selectedOrganisation.id}`;
     }
-  };
-  const sortedEvents = useMemo5(() => {
-    const getTime = (e) => e.event_date ? new Date(e.event_date).getTime() : Number.NEGATIVE_INFINITY;
-    return [...events].sort((a, b) => getTime(b) - getTime(a));
-  }, [events]);
-  const prevEventsLengthRef = useRef6(events.length);
-  const prevSelectedEventIdRef = useRef6(selectedEvent?.event_id);
-  const hasAutoSelectedRef = useRef6(false);
-  useEffect6(() => {
-    const eventsLengthChanged = events.length !== prevEventsLengthRef.current;
-    const selectedEventChanged = selectedEvent?.event_id !== prevSelectedEventIdRef.current;
-    if (eventsLengthChanged) {
-      prevEventsLengthRef.current = events.length;
-      if (events.length > 0) {
-        hasAutoSelectedRef.current = false;
+    return "";
+  }, [showOrganisations, showEvents, selectedOrganisation?.id, selectedEvent]);
+  const handleValueChange = (value) => {
+    if (disabled || isLoading) return;
+    if (value.startsWith("org:") && showOrganisations) {
+      const orgId = value.replace("org:", "");
+      const org = organisations?.find((o) => o.id === orgId);
+      if (org && onOrganisationSelect) {
+        onOrganisationSelect(org);
       }
-    }
-    if (selectedEventChanged) {
-      prevSelectedEventIdRef.current = selectedEvent?.event_id;
-      if (selectedEvent) {
-        hasAutoSelectedRef.current = false;
+    } else if (value.startsWith("event:") && showEvents) {
+      const eventId = value.replace("event:", "");
+      const event = events?.find((e) => (e.event_id || e.id) === eventId);
+      if (event && onEventSelect) {
+        onEventSelect(event);
       }
     }
-    if (!selectedEvent && events.length > 0 && !isLoading && eventsLengthChanged && !hasAutoSelectedRef.current) {
-      hasAutoSelectedRef.current = true;
-      autoSelectEvent();
-    }
-    function autoSelectEvent() {
-      const today = /* @__PURE__ */ new Date();
-      const startOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate()).getTime();
-      const next = [...events].filter((e) => e.event_date && new Date(e.event_date).getTime() >= startOfToday).sort((a, b) => new Date(a.event_date).getTime() - new Date(b.event_date).getTime())[0];
-      if (next) {
-        setSelectedEvent(next);
-        if (onEventChange) onEventChange(next);
-      } else {
-        const mostRecentPast = [...events].filter((e) => {
-          if (!e.event_date) return false;
-          const eventDate = new Date(e.event_date);
-          const startOfEventDate = new Date(eventDate.getFullYear(), eventDate.getMonth(), eventDate.getDate()).getTime();
-          return startOfEventDate < startOfToday;
-        }).sort((a, b) => new Date(b.event_date).getTime() - new Date(a.event_date).getTime())[0];
-        if (mostRecentPast) {
-          setSelectedEvent(mostRecentPast);
-          if (onEventChange) onEventChange(mostRecentPast);
-        }
+  };
+  const handleRetry = async () => {
+    try {
+      if (showOrganisations && orgError) {
+        await refreshOrganisations();
+      }
+      if (showEvents && eventError) {
+        await refreshEvents();
       }
+    } catch (error) {
+      logger.error("ContextSelector", "Failed to refresh:", error);
     }
-  }, [events.length, selectedEvent?.event_id, isLoading, setSelectedEvent, onEventChange]);
-  if (isLoading) {
+  };
+  if (isLoading && !hasItems) {
+    const loadingText = compact ? "Loading..." : showOrganisations && showEvents ? "Loading organisations and events..." : showOrganisations ? "Loading organisations..." : "Loading events...";
     return /* @__PURE__ */ jsxs8("div", { className: `flex items-center gap-2 ${className}`, children: [
       /* @__PURE__ */ jsx13(LoadingSpinner, { size: "sm" }),
-      /* @__PURE__ */ jsx13("span", { className: "text-sm text-muted-foreground", children: "Loading events..." })
+      /* @__PURE__ */ jsx13("span", { className: "text-sm text-muted-foreground", children: loadingText })
     ] });
   }
-  if (error) {
-    return /* @__PURE__ */ jsx13("div", { className, children: /* @__PURE__ */ jsxs8(Alert, { variant: "destructive", children: [
-      /* @__PURE__ */ jsx13(Lock, { className: "size-4" }),
-      /* @__PURE__ */ jsxs8(AlertDescription, { className: "flex items-center justify-between", children: [
-        /* @__PURE__ */ jsx13("span", { children: error.message }),
-        showRetryButton && /* @__PURE__ */ jsxs8(
-          Button,
-          {
-            variant: "outline",
-            size: "sm",
-            onClick: handleRetry,
-            className: "ml-2",
-            children: [
-              /* @__PURE__ */ jsx13(RefreshCw, { className: "size-3 mr-1" }),
-              "Retry"
-            ]
-          }
-        )
-      ] })
-    ] }) });
-  }
-  if (events.length === 0) {
-    if (showNoEventsMessage) {
-      return /* @__PURE__ */ jsx13("div", { className, children: /* @__PURE__ */ jsxs8(Alert, { variant: "inline", children: [
-        /* @__PURE__ */ jsx13(AlertCircle, { className: "size-4 text-acc-700" }),
-        /* @__PURE__ */ jsxs8(AlertDescription, { className: "flex items-center justify-between", children: [
-          /* @__PURE__ */ jsx13("span", { children: "No events available." }),
-          showRetryButton && /* @__PURE__ */ jsxs8(
-            Button,
-            {
-              variant: "outline",
-              size: "sm",
-              onClick: handleRetry,
-              className: "ml-2",
-              children: [
-                /* @__PURE__ */ jsx13(RefreshCw, { className: "size-3 mr-1" }),
-                "Refresh"
-              ]
-            }
-          )
-        ] })
-      ] }) });
-    }
-    return null;
-  }
-  return /* @__PURE__ */ jsxs8(
-    Select,
-    {
-      value: selectedEvent ? selectedEvent.event_id || selectedEvent.id : "",
-      onValueChange: handleValueChange,
-      className,
-      children: [
-        /* @__PURE__ */ jsx13(SelectTrigger, { className: "text-left", variant: "outline", children: /* @__PURE__ */ jsx13(SelectValue, { placeholder, children: selectedEvent && /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
-          /* @__PURE__ */ jsx13(Calendar2, { className: "size-4 flex-shrink-0" }),
-          /* @__PURE__ */ jsx13("span", { className: "truncate", children: selectedEvent.event_name }),
-          selectedEvent.event_date && /* @__PURE__ */ jsxs8("span", { className: "text-xs text-muted-foreground flex-shrink-0", children: [
-            "(",
-            formatEventDate(selectedEvent.event_date),
-            ")"
-          ] })
-        ] }) }) }),
-        /* @__PURE__ */ jsx13(SelectContent, { children: sortedEvents.map((event) => {
-          const isNext = isNextEvent(event);
-          const isSelected = selectedEvent && (selectedEvent.event_id === event.event_id || selectedEvent.id === event.id);
-          return /* @__PURE__ */ jsx13(
-            SelectItem,
-            {
-              value: event.event_id || event.id,
-              className: "flex items-center justify-between",
-              children: /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2 w-full", children: [
-                showNextEventIndicator && isNext && /* @__PURE__ */ jsx13(Star, { className: "size-3 text-acc-500" }),
-                /* @__PURE__ */ jsxs8("div", { className: "flex-1", children: [
-                  /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
-                    /* @__PURE__ */ jsx13("span", { className: isSelected ? "font-semibold" : "", children: event.event_name }),
-                    isSelected && /* @__PURE__ */ jsx13("span", { className: "text-xs bg-primary text-primary-foreground px-1 rounded", children: "Current" })
-                  ] }),
-                  showEventDetails && event.event_date && /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-1 text-xs text-muted-foreground", children: [
-                    /* @__PURE__ */ jsx13(Calendar2, { className: "size-3" }),
-                    /* @__PURE__ */ jsx13("span", { children: formatEventDate(event.event_date) }),
-                    showNextEventIndicator && isNext && /* @__PURE__ */ jsx13("span", { className: "text-acc-600 font-medium", children: "(Next)" })
-                  ] }),
-                  showEventDetails && event.event_venue && /* @__PURE__ */ jsxs8("div", { className: "text-xs text-muted-foreground", children: [
-                    "\u{1F4CD} ",
-                    event.event_venue
-                  ] })
-                ] })
-              ] })
-            },
-            event.event_id || event.id
-          );
-        }) })
-      ]
+  if (hasError) {
+    const errorMessages = [];
+    if (showOrganisations && orgError) {
+      errorMessages.push(`Failed to load organisations: ${orgError.message}`);
     }
-  );
-}
-
-// src/components/OrganisationSelector/OrganisationSelector.tsx
-import { useState as useState8, useCallback as useCallback8, useMemo as useMemo6 } from "react";
-import { RefreshCw as RefreshCw2, AlertCircle as AlertCircle2, Building2, Shield } from "lucide-react";
-import { jsx as jsx14, jsxs as jsxs9 } from "react/jsx-runtime";
-function OrganisationSelector({
-  placeholder = "Select organisation",
-  className,
-  onOrganisationChange,
-  showNoOrganisationsMessage = true,
-  showRetryButton = true,
-  showRole = false,
-  compact = false,
-  disabled = false
-}) {
-  const [isLoading, setIsLoading] = useState8(false);
-  const [switchError, setSwitchError] = useState8(null);
-  const {
-    organisations,
-    selectedOrganisation,
-    isLoading: orgLoading,
-    error: orgError,
-    switchOrganisation,
-    getUserRole,
-    validateOrganisationAccess,
-    refreshOrganisations
-  } = useOrganisations();
-  const handleOrganisationChange = useCallback8(async (orgId) => {
-    if (disabled || isLoading) return;
-    setSwitchError(null);
-    setIsLoading(true);
-    try {
-      if (!validateOrganisationAccess(orgId)) {
-        throw new Error("You do not have access to this organisation");
-      }
-      await switchOrganisation(orgId);
-      const newOrganisation = organisations.find((org) => org.id === orgId);
-      if (newOrganisation && onOrganisationChange) {
-        onOrganisationChange(newOrganisation);
-      }
-    } catch (error) {
-      logger.error("OrganisationSelector", "Failed to switch organisation:", error);
-      setSwitchError(error instanceof Error ? error.message : "Failed to switch organisation");
-    } finally {
-      setIsLoading(false);
-    }
-  }, [
-    disabled,
-    isLoading,
-    validateOrganisationAccess,
-    switchOrganisation,
-    organisations,
-    onOrganisationChange
-  ]);
-  const handleRetry = useCallback8(async () => {
-    setIsLoading(true);
-    setSwitchError(null);
-    try {
-      await refreshOrganisations();
-    } catch (error) {
-      logger.error("OrganisationSelector", "Failed to refresh organisations:", error);
-      setSwitchError("Failed to refresh organisations");
-    } finally {
-      setIsLoading(false);
+    if (showEvents && eventError) {
+      errorMessages.push(`Failed to load events: ${eventError.message}`);
     }
-  }, [refreshOrganisations]);
-  if (orgLoading) {
-    return /* @__PURE__ */ jsxs9("div", { className: `flex items-center gap-2 ${className}`, children: [
-      /* @__PURE__ */ jsx14(LoadingSpinner, { size: "sm" }),
-      /* @__PURE__ */ jsx14("span", { className: "text-sm text-muted-foreground", children: compact ? "Loading..." : "Loading organisations..." })
-    ] });
-  }
-  if (orgError) {
-    return /* @__PURE__ */ jsxs9("div", { className: `space-y-2 ${className}`, children: [
-      /* @__PURE__ */ jsxs9(Alert, { variant: "destructive", children: [
-        /* @__PURE__ */ jsx14(AlertCircle2, { className: "size-4" }),
-        /* @__PURE__ */ jsxs9(AlertDescription, { children: [
-          "Failed to load organisations: ",
-          orgError.message
-        ] })
+    return /* @__PURE__ */ jsxs8("div", { className: `space-y-2 ${className}`, children: [
+      /* @__PURE__ */ jsxs8(Alert, { variant: "destructive", children: [
+        /* @__PURE__ */ jsx13(AlertCircle, { className: "size-4" }),
+        /* @__PURE__ */ jsx13(AlertDescription, { children: errorMessages.join(" ") })
       ] }),
-      showRetryButton && /* @__PURE__ */ jsxs9(
+      showRetryButton && /* @__PURE__ */ jsxs8(
         Button,
         {
           variant: "outline",
@@ -2655,21 +2497,22 @@ function OrganisationSelector({
           disabled: isLoading,
           className: "w-full",
           children: [
-            /* @__PURE__ */ jsx14(RefreshCw2, { className: `size-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
+            /* @__PURE__ */ jsx13(RefreshCw, { className: `size-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
             "Retry"
           ]
         }
       )
     ] });
   }
-  if (organisations.length === 0) {
-    if (showNoOrganisationsMessage) {
-      return /* @__PURE__ */ jsxs9("div", { className: `space-y-2 ${className}`, children: [
-        /* @__PURE__ */ jsxs9(Alert, { children: [
-          /* @__PURE__ */ jsx14(Building2, { className: "size-4" }),
-          /* @__PURE__ */ jsx14(AlertDescription, { children: "No organisations available. Please contact your administrator to be added to an organisation." })
+  if (!hasItems) {
+    if (showNoItemsMessage) {
+      const noItemsText = showOrganisations && showEvents ? "No organisations or events available. Please contact your administrator." : showOrganisations ? "No organisations available. Please contact your administrator." : "No events available. Please contact your administrator.";
+      return /* @__PURE__ */ jsxs8("div", { className: `space-y-2 ${className}`, children: [
+        /* @__PURE__ */ jsxs8(Alert, { children: [
+          /* @__PURE__ */ jsx13(AlertCircle, { className: "size-4" }),
+          /* @__PURE__ */ jsx13(AlertDescription, { children: noItemsText })
         ] }),
-        showRetryButton && /* @__PURE__ */ jsxs9(
+        showRetryButton && /* @__PURE__ */ jsxs8(
           Button,
           {
             variant: "outline",
@@ -2678,7 +2521,7 @@ function OrganisationSelector({
             disabled: isLoading,
             className: "w-full",
             children: [
-              /* @__PURE__ */ jsx14(RefreshCw2, { className: `size-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
+              /* @__PURE__ */ jsx13(RefreshCw, { className: `size-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
               "Check Again"
             ]
           }
@@ -2687,74 +2530,103 @@ function OrganisationSelector({
     }
     return null;
   }
-  const switchErrorDisplay = switchError && /* @__PURE__ */ jsxs9(Alert, { variant: "destructive", className: "mt-2", children: [
-    /* @__PURE__ */ jsx14(AlertCircle2, { className: "size-4" }),
-    /* @__PURE__ */ jsx14(AlertDescription, { children: switchError })
-  ] });
-  const isSelectDisabled = disabled || isLoading;
-  const selectValue = useMemo6(() => {
-    return selectedOrganisation?.id || "";
-  }, [selectedOrganisation?.id]);
-  return /* @__PURE__ */ jsxs9("div", { className, children: [
-    /* @__PURE__ */ jsxs9(
-      Select,
-      {
-        value: selectValue,
-        onValueChange: handleOrganisationChange,
-        disabled: isSelectDisabled,
-        children: [
-          /* @__PURE__ */ jsx14(
-            SelectTrigger,
-            {
-              className: "text-left",
-              variant: "outline",
-              children: /* @__PURE__ */ jsx14(SelectValue, { placeholder, children: selectedOrganisation && /* @__PURE__ */ jsxs9("div", { className: "flex items-center gap-2", children: [
-                isLoading ? /* @__PURE__ */ jsx14(LoadingSpinner, { size: "sm" }) : /* @__PURE__ */ jsx14(Building2, { className: "size-4 flex-shrink-0" }),
-                /* @__PURE__ */ jsx14("span", { className: "truncate", children: selectedOrganisation.display_name })
-              ] }) })
-            }
-          ),
-          /* @__PURE__ */ jsx14(SelectContent, { children: organisations.map((org) => {
-            const userRole = getUserRole(org.id);
-            const hasAccess = validateOrganisationAccess(org.id);
-            return /* @__PURE__ */ jsx14(
+  const displayValue = useMemo5(() => {
+    if (showEvents && selectedEvent) {
+      return /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ jsx13(Calendar2, { className: "size-4 flex-shrink-0" }),
+        /* @__PURE__ */ jsx13("span", { className: "truncate", children: selectedEvent.event_name })
+      ] });
+    }
+    if (showOrganisations && selectedOrganisation) {
+      return /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
+        /* @__PURE__ */ jsx13(Building2, { className: "size-4 flex-shrink-0" }),
+        /* @__PURE__ */ jsx13("span", { className: "truncate", children: selectedOrganisation.display_name })
+      ] });
+    }
+    return null;
+  }, [showOrganisations, showEvents, selectedOrganisation, selectedEvent]);
+  const effectivePlaceholder = useMemo5(() => {
+    if (placeholder !== "Select organisation or event") {
+      return placeholder;
+    }
+    if (showOrganisations && showEvents) {
+      return "Select organisation or event";
+    }
+    if (showOrganisations) {
+      return "Select organisation";
+    }
+    if (showEvents) {
+      return "Select event";
+    }
+    return placeholder;
+  }, [placeholder, showOrganisations, showEvents]);
+  return /* @__PURE__ */ jsx13("div", { className, "data-testid": "context-selector", children: /* @__PURE__ */ jsxs8(
+    Select,
+    {
+      value: currentValue,
+      onValueChange: handleValueChange,
+      disabled: disabled || isLoading,
+      children: [
+        /* @__PURE__ */ jsx13(
+          SelectTrigger,
+          {
+            className: "text-left",
+            variant: "outline",
+            children: /* @__PURE__ */ jsx13(SelectValue, { placeholder: effectivePlaceholder, children: displayValue })
+          }
+        ),
+        /* @__PURE__ */ jsxs8(SelectContent, { children: [
+          showOrganisations && organisations && organisations.length > 0 && /* @__PURE__ */ jsxs8(Fragment6, { children: [
+            /* @__PURE__ */ jsxs8(SelectGroup, { children: [
+              /* @__PURE__ */ jsx13(SelectLabel, { children: "Organisations" }),
+              organisations.map((org) => /* @__PURE__ */ jsx13(
+                SelectItem,
+                {
+                  value: `org:${org.id}`,
+                  children: /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
+                    /* @__PURE__ */ jsx13(Building2, { className: "size-4" }),
+                    /* @__PURE__ */ jsxs8("div", { className: "flex flex-col", children: [
+                      /* @__PURE__ */ jsx13("span", { className: "font-medium", children: org.display_name }),
+                      !compact && org.description && /* @__PURE__ */ jsx13("span", { className: "text-xs text-muted-foreground truncate max-w-40", children: org.description })
+                    ] })
+                  ] })
+                },
+                org.id
+              ))
+            ] }),
+            showEvents && events && events.length > 0 && /* @__PURE__ */ jsx13(SelectSeparator, {})
+          ] }),
+          showEvents && events && events.length > 0 && /* @__PURE__ */ jsxs8(SelectGroup, { children: [
+            /* @__PURE__ */ jsx13(SelectLabel, { children: "Events" }),
+            events.map((event) => /* @__PURE__ */ jsx13(
               SelectItem,
               {
-                value: org.id,
-                disabled: !hasAccess,
-                className: !hasAccess ? "opacity-50" : "",
-                children: /* @__PURE__ */ jsxs9("div", { className: "flex items-center justify-between w-full", children: [
-                  /* @__PURE__ */ jsxs9("div", { className: "flex items-center gap-2", children: [
-                    /* @__PURE__ */ jsx14(Building2, { className: "size-4" }),
-                    /* @__PURE__ */ jsxs9("div", { className: "flex flex-col", children: [
-                      /* @__PURE__ */ jsx14("span", { className: "font-medium", children: org.display_name }),
-                      !compact && org.description && /* @__PURE__ */ jsx14("span", { className: "text-xs text-muted-foreground truncate max-w-40", children: org.description })
-                    ] })
-                  ] }),
-                  showRole && /* @__PURE__ */ jsxs9("div", { className: "flex items-center gap-1 ml-4", children: [
-                    /* @__PURE__ */ jsx14(Shield, { className: "size-3 text-muted-foreground" }),
-                    /* @__PURE__ */ jsx14("span", { className: "text-xs text-muted-foreground capitalize", children: userRole?.replace("_", " ") || "No Role" })
+                value: `event:${event.event_id || event.id}`,
+                children: /* @__PURE__ */ jsxs8("div", { className: "flex items-center gap-2", children: [
+                  /* @__PURE__ */ jsx13(Calendar2, { className: "size-4" }),
+                  /* @__PURE__ */ jsxs8("div", { className: "flex flex-col", children: [
+                    /* @__PURE__ */ jsx13("span", { className: "font-medium", children: event.event_name }),
+                    !compact && event.event_date && /* @__PURE__ */ jsx13("span", { className: "text-xs text-muted-foreground", children: new Date(event.event_date).toLocaleDateString() })
                   ] })
                 ] })
               },
-              org.id
-            );
-          }) })
-        ]
-      }
-    ),
-    switchErrorDisplay && /* @__PURE__ */ jsx14("div", { className: "mt-2", children: switchErrorDisplay })
-  ] });
+              event.event_id || event.id
+            ))
+          ] })
+        ] })
+      ]
+    }
+  ) });
 }
 
 // src/components/PasswordChange/PasswordChangeForm.tsx
-import { useState as useState9 } from "react";
-import { jsx as jsx15, jsxs as jsxs10 } from "react/jsx-runtime";
+import { useState as useState8 } from "react";
+import { jsx as jsx14, jsxs as jsxs9 } from "react/jsx-runtime";
 function PasswordChangeForm({ onSubmit, className }) {
-  const [newPassword, setNewPassword] = useState9("");
-  const [confirmPassword, setConfirmPassword] = useState9("");
-  const [error, setError] = useState9(null);
-  const [isSubmitting, setIsSubmitting] = useState9(false);
+  const [newPassword, setNewPassword] = useState8("");
+  const [confirmPassword, setConfirmPassword] = useState8("");
+  const [error, setError] = useState8(null);
+  const [isSubmitting, setIsSubmitting] = useState8(false);
   const handleSubmit = async (e) => {
     e.preventDefault();
     setError(null);
@@ -2779,11 +2651,11 @@ function PasswordChangeForm({ onSubmit, className }) {
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs10("form", { onSubmit: handleSubmit, className: cn("space-y-4", className), children: [
-    error && /* @__PURE__ */ jsx15("div", { role: "alert", children: error }),
-    /* @__PURE__ */ jsxs10("div", { className: "space-y-2", children: [
-      /* @__PURE__ */ jsx15(Label, { htmlFor: "new-password", children: "New Password" }),
-      /* @__PURE__ */ jsx15(
+  return /* @__PURE__ */ jsxs9("form", { onSubmit: handleSubmit, className: cn("space-y-4", className), children: [
+    error && /* @__PURE__ */ jsx14("div", { role: "alert", children: error }),
+    /* @__PURE__ */ jsxs9("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx14(Label, { htmlFor: "new-password", children: "New Password" }),
+      /* @__PURE__ */ jsx14(
         Input,
         {
           id: "new-password",
@@ -2795,9 +2667,9 @@ function PasswordChangeForm({ onSubmit, className }) {
         }
       )
     ] }),
-    /* @__PURE__ */ jsxs10("div", { className: "space-y-2", children: [
-      /* @__PURE__ */ jsx15(Label, { htmlFor: "confirm-password", children: "Confirm Password" }),
-      /* @__PURE__ */ jsx15(
+    /* @__PURE__ */ jsxs9("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx14(Label, { htmlFor: "confirm-password", children: "Confirm Password" }),
+      /* @__PURE__ */ jsx14(
         Input,
         {
           id: "confirm-password",
@@ -2809,7 +2681,7 @@ function PasswordChangeForm({ onSubmit, className }) {
         }
       )
     ] }),
-    /* @__PURE__ */ jsx15(
+    /* @__PURE__ */ jsx14(
       Button,
       {
         type: "submit",
@@ -2822,9 +2694,9 @@ function PasswordChangeForm({ onSubmit, className }) {
 }
 
 // src/components/UserMenu/UserMenu.tsx
-import React12, { useCallback as useCallback9, useMemo as useMemo7, useState as useState10 } from "react";
+import React12, { useCallback as useCallback8, useMemo as useMemo6, useState as useState9 } from "react";
 import { ChevronDown, LogOut, KeyRound } from "lucide-react";
-import { jsx as jsx16, jsxs as jsxs11 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs10 } from "react/jsx-runtime";
 var UserMenu = React12.memo(function UserMenu2({
   user,
   onSignOut,
@@ -2832,8 +2704,8 @@ var UserMenu = React12.memo(function UserMenu2({
   className,
   showAvatar = true
 }) {
-  const [isPasswordDialogOpen, setPasswordDialogOpen] = useState10(false);
-  const userInfo = useMemo7(() => {
+  const [isPasswordDialogOpen, setPasswordDialogOpen] = useState9(false);
+  const userInfo = useMemo6(() => {
     if (!user) return null;
     return {
       email: user.email,
@@ -2842,16 +2714,16 @@ var UserMenu = React12.memo(function UserMenu2({
       initial: (user.user_metadata?.display_name || user.user_metadata?.full_name || user.email || "U").charAt(0).toUpperCase()
     };
   }, [user]);
-  const handleSignOut = useCallback9(async () => {
+  const handleSignOut = useCallback8(async () => {
     if (onSignOut) await onSignOut();
   }, [onSignOut]);
   if (!user || !userInfo) {
     return null;
   }
-  return /* @__PURE__ */ jsxs11(Dialog, { open: isPasswordDialogOpen, onOpenChange: setPasswordDialogOpen, children: [
-    /* @__PURE__ */ jsxs11(Select, { className, children: [
-      /* @__PURE__ */ jsx16(SelectTrigger, { asChild: true, children: /* @__PURE__ */ jsxs11(Button, { variant: "outline", className: "flex items-center gap-2", "aria-label": userInfo.displayName, children: [
-        showAvatar && /* @__PURE__ */ jsx16(
+  return /* @__PURE__ */ jsxs10(Dialog, { open: isPasswordDialogOpen, onOpenChange: setPasswordDialogOpen, children: [
+    /* @__PURE__ */ jsxs10(Select, { className, children: [
+      /* @__PURE__ */ jsx15(SelectTrigger, { asChild: true, children: /* @__PURE__ */ jsxs10(Button, { variant: "outline", className: "flex items-center gap-2", "aria-label": userInfo.displayName, children: [
+        showAvatar && /* @__PURE__ */ jsx15(
           Avatar,
           {
             src: userInfo.avatarUrl,
@@ -2860,29 +2732,30 @@ var UserMenu = React12.memo(function UserMenu2({
             className: "size-7"
           }
         ),
-        /* @__PURE__ */ jsx16("span", { children: userInfo.displayName }),
-        /* @__PURE__ */ jsx16(ChevronDown, { className: "size-4" })
+        /* @__PURE__ */ jsx15("span", { children: userInfo.displayName }),
+        /* @__PURE__ */ jsx15(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__ */ jsxs10(SelectContent, { children: [
+        /* @__PURE__ */ jsx15(SelectLabel, { className: "font-normal", children: /* @__PURE__ */ jsxs10("li", { className: "pt-2", children: [
+          userInfo.displayName,
+          /* @__PURE__ */ jsx15("br", {}),
+          /* @__PURE__ */ jsx15("span", { className: "text-muted-foreground", children: userInfo.email })
         ] }) }),
-        /* @__PURE__ */ jsx16(SelectSeparator, {}),
-        /* @__PURE__ */ jsx16(DialogTrigger, { asChild: true, children: /* @__PURE__ */ jsxs11(SelectItem, { value: "change-password", children: [
-          /* @__PURE__ */ jsx16(KeyRound, { className: "mr-2 size-4" }),
-          /* @__PURE__ */ jsx16("span", { children: "Change Password" })
+        /* @__PURE__ */ jsx15(SelectSeparator, {}),
+        /* @__PURE__ */ jsx15(DialogTrigger, { asChild: true, children: /* @__PURE__ */ jsxs10(SelectItem, { value: "change-password", children: [
+          /* @__PURE__ */ jsx15(KeyRound, { className: "mr-2 size-4" }),
+          /* @__PURE__ */ jsx15("span", { children: "Change Password" })
         ] }) }),
-        /* @__PURE__ */ jsxs11(SelectItem, { value: "sign-out", onClick: handleSignOut, children: [
-          /* @__PURE__ */ jsx16(LogOut, { className: "mr-2 size-4" }),
-          /* @__PURE__ */ jsx16("span", { children: "Sign out" })
+        /* @__PURE__ */ jsxs10(SelectItem, { value: "sign-out", onClick: handleSignOut, children: [
+          /* @__PURE__ */ jsx15(LogOut, { className: "mr-2 size-4" }),
+          /* @__PURE__ */ jsx15("span", { children: "Sign out" })
         ] })
       ] })
     ] }),
-    /* @__PURE__ */ jsx16(DialogOverlay, {}),
-    /* @__PURE__ */ jsxs11(DialogContent, { className, children: [
-      /* @__PURE__ */ jsx16(DialogHeader, { children: /* @__PURE__ */ jsx16(DialogTitle, { children: "Change Password" }) }),
-      /* @__PURE__ */ jsx16(
+    /* @__PURE__ */ jsx15(DialogOverlay, {}),
+    /* @__PURE__ */ jsxs10(DialogContent, { className, children: [
+      /* @__PURE__ */ jsx15(DialogHeader, { children: /* @__PURE__ */ jsx15(DialogTitle, { children: "Change Password" }) }),
+      /* @__PURE__ */ jsx15(
         PasswordChangeForm,
         {
           onSubmit: async ({ newPassword, confirmPassword }) => {
@@ -2901,60 +2774,54 @@ var UserMenu = React12.memo(function UserMenu2({
   ] });
 });
 var UserMenuLoading = React12.memo(function UserMenuLoading2() {
-  return /* @__PURE__ */ jsxs11("div", { className: "relative inline-block text-left", children: [
-    /* @__PURE__ */ jsxs11(
-      "button",
-      {
-        type: "button",
-        disabled: true,
-        className: "flex items-center space-x-2 px-3 py-2 text-sm font-medium text-muted-foreground bg-muted border border-input rounded-md",
-        children: [
-          /* @__PURE__ */ jsx16("div", { className: "w-6 h-6 rounded-full bg-muted animate-pulse" }),
-          /* @__PURE__ */ jsx16("span", { className: "truncate max-w-[150px]", children: "Loading..." }),
-          /* @__PURE__ */ jsx16(ChevronDown, { className: "w-4 h-4 text-muted-foreground" })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsx16("div", { role: "status", "aria-label": "Loading user menu", "aria-live": "polite", className: "w-6 h-6 rounded-full bg-muted animate-pulse" })
-  ] });
+  return /* @__PURE__ */ jsxs10(
+    Button,
+    {
+      type: "button",
+      disabled: true,
+      variant: "outline",
+      className: "flex items-center space-x-2",
+      "aria-label": "Loading user menu",
+      children: [
+        /* @__PURE__ */ jsx15(LoadingSpinner, { size: "sm", className: "inline-block mr-2" }),
+        /* @__PURE__ */ jsx15("span", { className: "truncate max-w-[150px]", children: "Loading..." }),
+        /* @__PURE__ */ jsx15(ChevronDown, { className: "w-4 h-4 text-muted-foreground" })
+      ]
+    }
+  );
 });
 UserMenu.Loading = UserMenuLoading;
 
 // src/components/NavigationMenu/NavigationMenu.tsx
-import * as React13 from "react";
+import * as React14 from "react";
 import { ChevronDown as ChevronDown2 } from "lucide-react";
-import { jsx as jsx17, jsxs as jsxs12 } from "react/jsx-runtime";
-var NavigationMenu = React13.forwardRef(({
+
+// src/components/NavigationMenu/useNavigationFiltering.ts
+import * as React13 from "react";
+function useNavigationFiltering({
   items,
-  mode = "dropdown",
-  currentPath,
-  onNavigate,
-  className,
-  disabled = false,
-  buttonText = "Menu",
-  showIcons = true,
-  navigationLabel = "Main navigation",
-  // NEW: Phase 2 - Enhanced Security Features
-  strictMode = true,
-  auditLog = true,
-  onNavigationAccessDenied,
-  onStrictModeViolation,
   itemsPreFiltered = false,
-  ...props
-}, ref) => {
-  const [expandedItems, setExpandedItems] = React13.useState(/* @__PURE__ */ new Set());
-  const buttonRef = React13.useRef(null);
+  auditLog = true
+}) {
+  const [resolvedAppId, setResolvedAppId] = React13.useState(void 0);
+  const previousFilteredItemsRef = React13.useRef([]);
   let authContext = null;
   try {
     authContext = useUnifiedAuth();
   } catch (error) {
-    logger.warn("NavigationMenu", "useUnifiedAuth not available, running in unauthenticated mode");
+    logger.warn(
+      "NavigationMenu",
+      "useUnifiedAuth not available, running in unauthenticated mode"
+    );
   }
   let rbacContext = null;
   try {
     rbacContext = useRBAC();
   } catch (error) {
-    logger.warn("NavigationMenu", "useRBAC not available, permission filtering disabled");
+    logger.warn(
+      "NavigationMenu",
+      "useRBAC not available, permission filtering disabled"
+    );
   }
   const eventLoadingRaw = authContext?.eventLoading;
   const eventLoading = eventLoadingRaw ?? false;
@@ -2964,11 +2831,9 @@ var NavigationMenu = React13.forwardRef(({
   const { selectedOrganisation } = authContext || {};
   const { resolvedScope, isLoading: scopeLoading, error: scopeError } = useResolvedScope({
     supabase: itemsPreFiltered ? null : supabase || null,
-    // Skip expensive resolution if pre-filtered
     selectedOrganisationId: itemsPreFiltered ? null : selectedOrganisation?.id || null,
     selectedEventId: itemsPreFiltered ? null : selectedEvent?.event_id || null
   });
-  const [resolvedAppId, setResolvedAppId] = React13.useState(void 0);
   React13.useEffect(() => {
     if (!scopeLoading && !resolvedScope?.appId && selectedOrganisation?.id && authContext?.appName && authContext?.user?.id && !resolvedAppId) {
       if (!authContext.user || !authContext.appName) {
@@ -2976,7 +2841,7 @@ var NavigationMenu = React13.forwardRef(({
       }
       const userId2 = authContext.user.id;
       const appName = authContext.appName;
-      import("./api-N774RPUA.js").then(({ resolveAppContext }) => {
+      import("./api-IAGWF3ZG.js").then(({ resolveAppContext }) => {
         resolveAppContext({
           userId: userId2,
           appName
@@ -2984,11 +2849,19 @@ var NavigationMenu = React13.forwardRef(({
           if (result?.appId) {
             setResolvedAppId(result.appId);
           }
-        }).catch((error) => {
+        }).catch(() => {
         });
+      }).catch(() => {
       });
     }
-  }, [scopeLoading, resolvedScope?.appId, selectedOrganisation?.id, authContext?.appName, authContext?.user?.id, resolvedAppId]);
+  }, [
+    scopeLoading,
+    resolvedScope?.appId,
+    selectedOrganisation?.id,
+    authContext?.appName,
+    authContext?.user?.id,
+    resolvedAppId
+  ]);
   const effectiveScope = React13.useMemo(() => {
     if (resolvedScope?.organisationId) {
       return resolvedScope;
@@ -3019,17 +2892,17 @@ var NavigationMenu = React13.forwardRef(({
     };
   }, [scopeKey, effectiveScope]);
   const userId = authContext?.user?.id || "";
-  const { permissions: permissionMap, hasAnyPermission, isLoading: permissionsLoading, error: permissionsError } = usePermissions(
+  const {
+    permissions: permissionMap,
+    hasAnyPermission,
+    isLoading: permissionsLoading,
+    error: permissionsError
+  } = usePermissions(
     itemsPreFiltered ? null : userId,
-    // Pass null to trigger early return (empty string would wait 3s)
     itemsPreFiltered ? void 0 : stableScope.organisationId,
-    // Pass undefined to skip timeout
     itemsPreFiltered ? void 0 : stableScope.eventId,
-    // Skip if pre-filtered
     itemsPreFiltered ? void 0 : stableScope.appId
-    // Skip if pre-filtered
   );
-  const previousFilteredItemsRef = React13.useRef([]);
   const filteredItems = React13.useMemo(() => {
     if (itemsPreFiltered && items && items.length > 0) {
       const visibleItems = (items || []).filter((item) => !item.meta?.hidden);
@@ -3059,9 +2932,13 @@ var NavigationMenu = React13.forwardRef(({
       return [];
     }
     if (permissionsError) {
-      logger.warn("NavigationMenu", "Permission check error - showing no items for security", {
-        permissionsError: permissionsError?.message
-      });
+      logger.warn(
+        "NavigationMenu",
+        "Permission check error - showing no items for security",
+        {
+          permissionsError: permissionsError?.message
+        }
+      );
       return [];
     }
     if (!permissionMap || Object.keys(permissionMap).length === 0) {
@@ -3087,7 +2964,7 @@ var NavigationMenu = React13.forwardRef(({
       if (item.permissions && item.permissions.length > 0 && !item.href) {
         const permissions = item.permissions.filter((p) => typeof p === "string").map((p) => p);
         if (permissions.length > 0) {
-          const hasPermission = hasAnyPermission(permissions);
+          const hasPermission = hasAnyPermission?.(permissions);
           if (!hasPermission) {
             return false;
           }
@@ -3119,13 +2996,12 @@ var NavigationMenu = React13.forwardRef(({
         if (typeof item.accessLevel === "string") {
           const accessLevel = item.accessLevel.toLowerCase();
           const userEventRole = rbacContext.eventAppRole;
-          if (rbacContext.isSuperAdmin) {
-          } else {
+          if (!rbacContext.isSuperAdmin) {
             const roleToAccessLevel = {
-              "viewer": "viewer",
-              "participant": "participant",
-              "planner": "planner",
-              "event_admin": "admin"
+              viewer: "viewer",
+              participant: "participant",
+              planner: "planner",
+              event_admin: "admin"
             };
             const userAccessLevel = userEventRole ? roleToAccessLevel[userEventRole] || "viewer" : null;
             const levelHierarchy = {
@@ -3178,7 +3054,6 @@ var NavigationMenu = React13.forwardRef(({
   }, [
     items,
     itemsPreFiltered,
-    // Add itemsPreFiltered to dependencies
     authContext,
     rbacContext,
     permissionMap,
@@ -3189,13 +3064,48 @@ var NavigationMenu = React13.forwardRef(({
     resolvedScope,
     effectiveScope,
     auditLog,
-    // Add event context state to dependencies so we re-check permissions when event context becomes available
     eventLoadingRaw,
     eventLoading,
     selectedEvent,
     orgContextReady,
-    selectedOrganisation?.id
+    selectedOrganisation?.id,
+    permissionsError,
+    stableScope.organisationId,
+    stableScope.eventId,
+    stableScope.appId
   ]);
+  return {
+    authContext,
+    rbacContext,
+    filteredItems,
+    permissionMap,
+    hasAnyPermission: hasAnyPermission || null
+  };
+}
+
+// src/components/NavigationMenu/NavigationMenu.tsx
+import { jsx as jsx16, jsxs as jsxs11 } 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":
@@ -3317,8 +3227,8 @@ var NavigationMenu = React13.forwardRef(({
     const hasChildren = item.children && item.children.length > 0;
     const isExpanded = expandedItems.has(item.id);
     const itemIsActive = isActiveItem(item);
-    return /* @__PURE__ */ jsx17("li", { role: "none", children: hasChildren ? /* @__PURE__ */ jsxs12("div", { children: [
-      /* @__PURE__ */ jsxs12(
+    return /* @__PURE__ */ jsx16("li", { role: "none", children: hasChildren ? /* @__PURE__ */ jsxs11("div", { children: [
+      /* @__PURE__ */ jsxs11(
         "button",
         {
           onClick: () => toggleExpanded(item.id),
@@ -3327,21 +3237,21 @@ var NavigationMenu = React13.forwardRef(({
           "aria-controls": `submenu-${item.id}`,
           "aria-current": itemIsActive ? "page" : void 0,
           children: [
-            /* @__PURE__ */ jsx17("span", { children: item.label }),
-            /* @__PURE__ */ jsx17(ChevronDown2, { "aria-hidden": "true" })
+            /* @__PURE__ */ jsx16("span", { children: item.label }),
+            /* @__PURE__ */ jsx16(ChevronDown2, { "aria-hidden": "true" })
           ]
         }
       ),
-      isExpanded && item.children && /* @__PURE__ */ jsx17(
+      isExpanded && item.children && /* @__PURE__ */ jsx16(
         "ul",
         {
           id: `submenu-${item.id}`,
           role: "menu",
           "aria-label": `${item.label} submenu`,
-          children: item.children.map((child) => /* @__PURE__ */ jsx17(React13.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
+          children: item.children.map((child) => /* @__PURE__ */ jsx16(React14.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
         }
       )
-    ] }) : /* @__PURE__ */ jsx17(
+    ] }) : /* @__PURE__ */ jsx16(
       "a",
       {
         href: item.href || "#",
@@ -3359,26 +3269,26 @@ var NavigationMenu = React13.forwardRef(({
     ) });
   };
   if (mode === "dropdown") {
-    return /* @__PURE__ */ jsxs12(
+    return /* @__PURE__ */ jsxs11(
       Select,
       {
         onValueChange: handleNavigationSelect,
         className,
         "data-testid": "navigation-menu-root",
         children: [
-          /* @__PURE__ */ jsx17(
+          /* @__PURE__ */ jsx16(
             SelectTrigger,
             {
               ref: buttonRef,
               disabled,
               "aria-label": buttonText,
               "data-testid": "navigation-menu-trigger",
-              children: /* @__PURE__ */ jsx17(SelectValue, { placeholder: buttonText })
+              children: /* @__PURE__ */ jsx16(SelectValue, { placeholder: buttonText })
             }
           ),
-          /* @__PURE__ */ jsx17(SelectContent, { children: filteredItems.map((item) => {
+          /* @__PURE__ */ jsx16(SelectContent, { children: filteredItems.map((item) => {
             const isActive = isActiveItem(item);
-            return /* @__PURE__ */ jsx17(
+            return /* @__PURE__ */ jsx16(
               SelectItem,
               {
                 value: item.id,
@@ -3393,14 +3303,14 @@ var NavigationMenu = React13.forwardRef(({
       }
     );
   }
-  return /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsx16(
     "nav",
     {
       ref,
       className,
       "aria-label": navigationLabel,
       ...props,
-      children: /* @__PURE__ */ jsx17("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx17(React13.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
+      children: /* @__PURE__ */ jsx16("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx16(React14.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
     }
   );
 });
@@ -3408,7 +3318,7 @@ NavigationMenu.displayName = "NavigationMenu";
 
 // src/components/Header/Header.tsx
 import { Link } from "react-router-dom";
-import { jsx as jsx18, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx17, jsxs as jsxs12 } from "react/jsx-runtime";
 function Header({
   logoUrl,
   logoAlt = "Logo",
@@ -3420,54 +3330,43 @@ function Header({
   actions,
   userMenu,
   className,
-  showEventSelector = true,
-  showOrgSelector = false,
+  showContextSelector = true,
+  showOrganisations = true,
+  showEvents = true,
   showUserMenu = true,
   currentPath,
   onNavigate,
   logoHref
 }) {
-  const OrganisationSelectorConditional = () => {
-    const { organisations, isContextReady } = useOrganisations();
-    if (!isContextReady || !organisations || organisations.length === 0) {
-      return null;
-    }
-    return /* @__PURE__ */ jsx18(
-      OrganisationSelector,
-      {
-        placeholder: "Select organisation",
-        className: "w-64",
-        "data-testid": "org-selector",
-        compact: true
-      }
-    );
-  };
-  return /* @__PURE__ */ jsx18("header", { className: cn(
+  const shouldShowContextSelector = showContextSelector !== false;
+  const { switchOrganisation } = useOrganisations();
+  const { events, setSelectedEvent } = useEvents();
+  return /* @__PURE__ */ jsx17("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: [
-    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(
+  ), role: "banner", children: /* @__PURE__ */ jsxs12("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__ */ jsx17(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: logo }) : logo : logoUrl ? logoHref ? /* @__PURE__ */ jsx17(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx17(
       "img",
       {
         src: logoUrl,
         alt: logoAlt || "Logo",
         className: "h-[2.15rem] w-auto max-w-[200px] object-contain rounded-md shadow-md bg-transparent"
       }
-    ) }) : /* @__PURE__ */ jsx18(
+    ) }) : /* @__PURE__ */ jsx17(
       "img",
       {
         src: logoUrl,
         alt: logoAlt || "Logo",
         className: "h-[2.15rem] w-auto max-w-[200px] object-contain rounded-md shadow-md bg-transparent"
       }
-    ) : logoHref ? /* @__PURE__ */ jsx18(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx18(
+    ) : logoHref ? /* @__PURE__ */ jsx17(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx17(
       "img",
       {
         src: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' fill='%23000'/%3E%3Ctext x='16' y='20' text-anchor='middle' fill='white' font-family='Arial' font-size='14' font-weight='bold'%3EL%3C/text%3E%3C/svg%3E",
         alt: logoAlt || "Logo",
         className: "size-8 shadow-md"
       }
-    ) }) : /* @__PURE__ */ jsx18(
+    ) }) : /* @__PURE__ */ jsx17(
       "img",
       {
         src: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' fill='%23000'/%3E%3Ctext x='16' y='20' text-anchor='middle' fill='white' font-family='Arial' font-size='14' font-weight='bold'%3EL%3C/text%3E%3C/svg%3E",
@@ -3475,7 +3374,7 @@ function Header({
         className: "size-8 shadow-md"
       }
     ),
-    navItems && navItems.length > 0 && /* @__PURE__ */ jsx18(
+    navItems && navItems.length > 0 && /* @__PURE__ */ jsx17(
       NavigationMenu,
       {
         items: navItems,
@@ -3486,33 +3385,44 @@ 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"
-        }
-      ))
-    ] })
+    shouldShowContextSelector ? /* @__PURE__ */ jsx17(
+      ContextSelector,
+      {
+        placeholder: "Select organisation or event",
+        className: cn(
+          "w-96",
+          // Adjust width based on whether actions exist
+          actions ? "col-span-1" : "col-span-2"
+        ),
+        showOrganisations,
+        showEvents,
+        onOrganisationSelect: async (org) => {
+          setSelectedEvent(null);
+          await switchOrganisation(org.id);
+        },
+        onEventSelect: (event) => {
+          const fullEvent = events.find((e) => (e.event_id || e.id) === (event.event_id || event.id));
+          setSelectedEvent(fullEvent || event);
+        },
+        compact: true
+      }
+    ) : null,
+    actions,
+    showUserMenu && (userMenu ? userMenu : /* @__PURE__ */ jsx17(
+      UserMenu,
+      {
+        user: user || null,
+        onSignOut,
+        onChangePassword,
+        className: "w-70"
+      }
+    ))
   ] }) });
 }
 
 // src/components/Footer/Footer.tsx
-import React14 from "react";
-import { Fragment as Fragment7, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
+import React15 from "react";
+import { Fragment as Fragment8, jsx as jsx18, jsxs as jsxs13 } from "react/jsx-runtime";
 var FooterComponent = ({
   companyName = "Solvera Solutions Pty Ltd",
   year = (/* @__PURE__ */ new Date()).getFullYear(),
@@ -3523,28 +3433,29 @@ var FooterComponent = ({
   children
 }) => {
   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(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)) })
+  return /* @__PURE__ */ jsx18("footer", { className: cn("mt-8 py-6 flex justify-center border-t border-border bg-main-100", className), children: /* @__PURE__ */ jsxs13("section", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto text-center", children: [
+    logo && /* @__PURE__ */ jsx18("img", { src: logo, alt: "Logo", className: "h-8 w-auto" }),
+    children && /* @__PURE__ */ jsx18(Fragment8, { children }),
+    /* @__PURE__ */ jsx18("span", { className: "text-muted-foreground", children: copyrightText }),
+    links && links.length > 0 && /* @__PURE__ */ jsx18("ul", { className: "flex gap-4 mt-2 md:mt-0", children: links.map((link, index) => /* @__PURE__ */ jsx18("li", { children: /* @__PURE__ */ jsx18("a", { href: link.href, className: "text-muted-foreground hover:text-foreground", children: link.label }) }, index)) })
   ] }) });
 };
 FooterComponent.displayName = "Footer";
-var Footer = React14.memo(FooterComponent);
+var Footer = React15.memo(FooterComponent);
 Footer.displayName = "Footer";
 
 // src/components/PaceAppLayout/PaceAppLayout.tsx
-import { useState as useState12, useEffect as useEffect8, useMemo as useMemo9 } from "react";
+import { useState as useState12, useEffect as useEffect7, useMemo as useMemo8 } from "react";
 import { Outlet, useNavigate, useLocation } from "react-router-dom";
-import { Fragment as Fragment8, jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Fragment as Fragment9, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
 var EMPTY_PAGE_ID_MAPPING = {};
 var EMPTY_ROUTE_PERMISSIONS = {};
 function PaceAppLayout({
   appName,
   navItems,
-  showEventSelector,
-  showOrgSelector,
+  showContextSelector = true,
+  showOrganisations = true,
+  showEvents = true,
   headerActions,
   customLogo,
   logoHref = "/dashboard",
@@ -3581,7 +3492,7 @@ function PaceAppLayout({
   const { isSuperAdmin: isSuperAdminFromRBAC, isLoading: rbacLoading } = useRBAC();
   const [isSuperAdminDirect, setIsSuperAdminDirect] = useState12(false);
   const [isCheckingSuperAdminDirect, setIsCheckingSuperAdminDirect] = useState12(false);
-  useEffect8(() => {
+  useEffect7(() => {
     const checkSuperAdminDirect = async () => {
       if (!user?.id) {
         setIsSuperAdminDirect(false);
@@ -3594,8 +3505,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);
@@ -3624,7 +3535,7 @@ function PaceAppLayout({
   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(() => {
+  const scope = useMemo8(() => {
     const newScope = {};
     if (scopeOrgId) {
       newScope.organisationId = scopeOrgId;
@@ -3637,19 +3548,19 @@ function PaceAppLayout({
     }
     return newScope;
   }, [scopeOrgId, scopeEventId, scopeAppId]);
-  const defaultNavItems = useMemo9(() => [
+  const defaultNavItems = useMemo8(() => [
     { id: "home", label: "Home", href: "/", icon: "Home" },
     { id: "dashboard", label: "Dashboard", href: "/dashboard", icon: "LayoutDashboard" },
     { id: "settings", label: "Settings", href: "/settings", icon: "Settings" },
     { id: "ui-showcase", label: "UI Showcase", href: "/ui-showcase", icon: "Component" },
     { id: "data-table-showcase", label: "DataTable Showcase", href: "/data-table-showcase", icon: "Table" }
   ], []);
-  const baseMenuItems = useMemo9(() => navItems || defaultNavItems, [navItems]);
-  const currentRoutePermission = useMemo9(() => {
+  const baseMenuItems = useMemo8(() => navItems || defaultNavItems, [navItems]);
+  const currentRoutePermission = useMemo8(() => {
     const currentPath = location.pathname;
     return routePermissions[currentPath] || defaultPermission;
   }, [location.pathname, routePermissions, defaultPermission]);
-  const currentPageId = useMemo9(() => {
+  const currentPageId = useMemo8(() => {
     const currentPath = location.pathname;
     if (pageIdMapping[currentPath]) {
       return pageIdMapping[currentPath];
@@ -3657,7 +3568,7 @@ function PaceAppLayout({
     const pathSegments = currentPath.slice(1).split("/").filter(Boolean);
     return pathSegments[0] || "";
   }, [location.pathname, pageIdMapping]);
-  const currentPermission = useMemo9(() => {
+  const currentPermission = useMemo8(() => {
     if (!enforcePermissions || !currentPageId) {
       return "";
     }
@@ -3665,6 +3576,7 @@ function PaceAppLayout({
     return permissionString;
   }, [enforcePermissions, currentRoutePermission, currentPageId]);
   const shouldCheckPermission = enforcePermissions && !!currentPermission && !!currentPageId;
+  const superAdminStatus = isSuperAdminFromRBAC ? true : isCheckingSuperAdminDirect ? null : isSuperAdminDirect;
   const { can: canFromHook, isLoading: isCheckingPermission, error: permissionError } = useCan(
     user?.id || "",
     scope,
@@ -3672,12 +3584,14 @@ function PaceAppLayout({
     shouldCheckPermission ? currentPageId : "",
     true,
     // useCache
+    superAdminStatus,
+    // Pass super admin status to avoid duplicate check
     appName
     // Pass appName for PORTAL/ADMIN special case
   );
   const can = isSuperAdmin2 ? true : canFromHook;
   const hasPermission = enforcePermissions ? can : true;
-  useEffect8(() => {
+  useEffect7(() => {
     if (!enforcePermissions) {
       return;
     }
@@ -3701,7 +3615,7 @@ function PaceAppLayout({
     }
   }, [enforcePermissions, can, isCheckingPermission, isSuperAdmin2, currentPageId, currentRoutePermission, user?.id, strictMode, auditLog, onPageAccessDenied, onStrictModeViolation]);
   const [filteredMenuItems, setFilteredMenuItems] = useState12(baseMenuItems);
-  useEffect8(() => {
+  useEffect7(() => {
     let isMounted = true;
     const filterItems = async () => {
       if (!user?.id) {
@@ -3727,7 +3641,7 @@ function PaceAppLayout({
         return;
       }
       try {
-        const { isSuperAdmin: checkSuperAdminDynamic } = await import("./api-N774RPUA.js");
+        const { isSuperAdmin: checkSuperAdminDynamic } = await import("./api-IAGWF3ZG.js");
         const isSuper = await checkSuperAdminDynamic(user.id);
         if (isSuper) {
           if (isMounted) {
@@ -3742,7 +3656,7 @@ function PaceAppLayout({
         }
       }
       try {
-        const { getPermissionMap } = await import("./api-N774RPUA.js");
+        const { getPermissionMap } = await import("./api-IAGWF3ZG.js");
         const permissionScope = {
           organisationId: currentScope.organisationId,
           eventId: currentScope.eventId,
@@ -3753,16 +3667,80 @@ function PaceAppLayout({
           userId: user.id,
           scope: permissionScope
         });
-        const filtered = baseMenuItems.map((item) => {
-          if (!item.href) return { item, hasAccess: true };
-          const pageId = pageIdMapping[item.href] || (item.href === "/" ? "dashboard" : item.href.slice(1)) || "dashboard";
-          const permission = routePermissions[item.href] || defaultPermission;
-          const fullPermission = permission.includes(":") ? permission : pageId ? `${permission}:page.${pageId}` : permission;
-          const hasAccess = permissionMap["*"] === true || permissionMap[fullPermission] === true;
-          return { item, hasAccess };
-        });
+        const { getPageScopeType } = await import("./api-IAGWF3ZG.js");
+        const effectiveAppId = currentScope.appId || resolvedAppId;
+        const effectiveAppName = appName;
+        const hasEventContext = !!currentScope.eventId;
+        const hasOrgContext = !!currentScope.organisationId;
+        const filtered = await Promise.all(
+          baseMenuItems.map(async (item) => {
+            if (!item.href) return { item, hasAccess: true, matchesScope: true, scopeCheckError: false };
+            const pageId = pageIdMapping[item.href] || (item.href === "/" ? "dashboard" : item.href.slice(1)) || "dashboard";
+            const permission = routePermissions[item.href] || defaultPermission;
+            const fullPermission = permission.includes(":") ? permission : pageId ? `${permission}:page.${pageId}` : permission;
+            const hasAccess = permissionMap["*"] === true || permissionMap[fullPermission] === true;
+            let matchesScope = true;
+            let scopeCheckError = false;
+            if (effectiveAppId || effectiveAppName) {
+              try {
+                const pageScopeType = await getPageScopeType(
+                  pageId,
+                  effectiveAppId,
+                  effectiveAppName
+                );
+                if (hasEventContext) {
+                  matchesScope = pageScopeType === "event" || pageScopeType === "both";
+                } else if (hasOrgContext) {
+                  matchesScope = pageScopeType === "organisation" || pageScopeType === "both";
+                } else {
+                  matchesScope = true;
+                }
+              } catch (error) {
+                scopeCheckError = true;
+                logger.warn("PaceAppLayout", "Failed to get page scope type for navigation filtering", {
+                  pageId,
+                  href: item.href,
+                  contextType: hasEventContext ? "event" : hasOrgContext ? "organisation" : "none",
+                  error: error instanceof Error ? error.message : String(error),
+                  note: "Allowing page to prevent navigation from disappearing - this may indicate missing scope_type in database"
+                });
+                matchesScope = true;
+              }
+            } else {
+              matchesScope = true;
+            }
+            return { item, hasAccess, matchesScope, scopeCheckError };
+          })
+        );
         if (!isMounted) return;
-        const accessibleItems = filtered.filter(({ hasAccess }) => hasAccess).map(({ item }) => item);
+        const accessibleItems = filtered.filter(({ hasAccess, matchesScope }) => hasAccess && matchesScope).map(({ item }) => item);
+        if (accessibleItems.length === 0 && filtered.length > 0) {
+          const itemsWithPermissions = filtered.filter(({ hasAccess }) => hasAccess);
+          const itemsFilteredByScope = filtered.filter(({ hasAccess, matchesScope }) => hasAccess && !matchesScope);
+          const itemsWithScopeErrors = filtered.filter(({ hasAccess, scopeCheckError }) => hasAccess && scopeCheckError);
+          if (itemsWithPermissions.length > 0 && itemsWithScopeErrors.length === itemsWithPermissions.length) {
+            logger.warn("PaceAppLayout", "Scope checking failed for all items - falling back to permission-only filtering", {
+              contextType: hasEventContext ? "event" : hasOrgContext ? "organisation" : "none",
+              totalItems: baseMenuItems.length,
+              itemsWithPermissions: itemsWithPermissions.length,
+              scopeCheckErrorCount: itemsWithScopeErrors.length,
+              note: "Showing items based on permissions only - scope filtering disabled due to errors. This may indicate database issues or missing scope_type values."
+            });
+            const fallbackItems = filtered.filter(({ hasAccess }) => hasAccess).map(({ item }) => item);
+            if (isMounted && fallbackItems.length > 0) {
+              setFilteredMenuItems(fallbackItems);
+              return;
+            }
+          } else if (itemsWithPermissions.length > 0 && itemsFilteredByScope.length === itemsWithPermissions.length) {
+            logger.info("PaceAppLayout", "All navigation items filtered out by scope type", {
+              contextType: hasEventContext ? "event" : hasOrgContext ? "organisation" : "none",
+              totalItems: baseMenuItems.length,
+              itemsWithPermissions: itemsWithPermissions.length,
+              itemsFilteredByScope: itemsFilteredByScope.length,
+              note: "All pages appear to be scoped for a different context type - this is expected behavior. Navigation will be empty until user selects the appropriate context."
+            });
+          }
+        }
         setFilteredMenuItems(accessibleItems);
       } catch (error) {
         logger.error("PaceAppLayout", "Failed to load permission map for navigation filtering", { userId: user?.id, error });
@@ -3775,8 +3753,8 @@ function PaceAppLayout({
     return () => {
       isMounted = false;
     };
-  }, [baseMenuItems, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope, scopeLoading, contextAppId, resolvedScope?.appId, selectedOrganisation?.id]);
-  useEffect8(() => {
+  }, [baseMenuItems, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope, scopeLoading, contextAppId, resolvedScope?.appId, selectedOrganisation?.id, selectedEvent?.event_id, appName]);
+  useEffect7(() => {
     if (!roleBasedRouting || routeConfig.length === 0) return;
     let isMounted = true;
     const checkRouteAccess = async () => {
@@ -3798,7 +3776,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-IAGWF3ZG.js");
           const hasPagePermission = await isPermittedCached({
             userId: user?.id || "",
             scope,
@@ -3814,7 +3792,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-ATAP5UTR.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-KAGUYQ4J.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -3845,53 +3823,67 @@ 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: [
-      /* @__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..." })
+    return /* @__PURE__ */ jsx19("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs14("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx19("div", { className: "animate-spin rounded-full size-8 border-b-2 border-sec-900 mx-auto mb-4" }),
+      /* @__PURE__ */ jsx19("p", { className: "text-sec-600", children: "Loading organisation context..." })
     ] }) });
   }
   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..." })
+    return /* @__PURE__ */ jsx19("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs14("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx19("div", { className: "animate-spin rounded-full size-8 border-b-2 border-sec-900 mx-auto mb-4" }),
+      /* @__PURE__ */ jsx19("p", { className: "text-sec-600", children: "Checking permissions..." })
     ] }) });
   }
   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" })
+    return /* @__PURE__ */ jsx19("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs14("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx19("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Permission Error" }),
+      /* @__PURE__ */ jsx19("p", { className: "text-sec-600 mb-4", children: permissionError.message }),
+      /* @__PURE__ */ jsx19(Button, { onClick: () => navigate("/"), children: "Go Home" })
     ] }) });
   }
   if (enforcePermissions && hasPermission === false && !isCheckingSuperAdminDirect && !isSuperAdmin2) {
     if (enforcePagePermissions && pagePermissionFallback) {
-      return /* @__PURE__ */ jsx20(Fragment8, { children: pagePermissionFallback });
+      return /* @__PURE__ */ jsx19(Fragment9, { children: pagePermissionFallback });
     }
     if (permissionFallback) {
-      return /* @__PURE__ */ jsx20(Fragment8, { children: permissionFallback });
+      return /* @__PURE__ */ jsx19(Fragment9, { 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" }),
-      /* @__PURE__ */ jsx20("p", { className: "text-sec-600 mb-4", children: "You don't have permission to access this page." }),
-      /* @__PURE__ */ jsxs15("div", { className: "flex gap-2 justify-center", children: [
-        /* @__PURE__ */ jsx20(Button, { onClick: () => navigate("/"), children: "Go Home" }),
-        /* @__PURE__ */ jsx20(
+    return /* @__PURE__ */ jsx19("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs14("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx19("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Access Denied" }),
+      /* @__PURE__ */ jsx19("p", { className: "text-sec-600 mb-4", children: "You don't have permission to access this page." }),
+      /* @__PURE__ */ jsxs14("div", { className: "flex gap-2 justify-center", children: [
+        /* @__PURE__ */ jsx19(Button, { onClick: () => navigate("/"), children: "Go Home" }),
+        /* @__PURE__ */ jsx19(
           Button,
           {
             variant: "outline",
@@ -3905,8 +3897,8 @@ function PaceAppLayout({
       ] })
     ] }) });
   }
-  return /* @__PURE__ */ jsxs15(Fragment8, { children: [
-    /* @__PURE__ */ jsx20(
+  return /* @__PURE__ */ jsxs14(Fragment9, { children: [
+    /* @__PURE__ */ jsx19(
       Header,
       {
         logo: customLogo || void 0,
@@ -3925,21 +3917,22 @@ function PaceAppLayout({
             navigate(item.href);
           }
         },
-        showEventSelector,
-        showOrgSelector,
+        showContextSelector,
+        showOrganisations,
+        showEvents,
         showUserMenu,
         className: headerClassName || "sticky top-0 z-[40] w-full"
       }
     ),
-    /* @__PURE__ */ jsx20("main", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: /* @__PURE__ */ jsx20(Outlet, {}) }),
-    /* @__PURE__ */ jsx20(Footer, {})
+    /* @__PURE__ */ jsx19("main", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: /* @__PURE__ */ jsx19(Outlet, {}) }),
+    /* @__PURE__ */ jsx19(Footer, {})
   ] });
 }
 
 // src/components/PaceLoginPage/PaceLoginPage.tsx
-import { useEffect as useEffect9, useState as useState13, useContext as useContext2 } from "react";
+import { useEffect as useEffect8, useState as useState13, 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";
+import { jsx as jsx20, jsxs as jsxs15 } from "react/jsx-runtime";
 var PaceLoginPage = ({
   appName = "Pace",
   onSuccessRedirectPath = "/",
@@ -3953,16 +3946,16 @@ var PaceLoginPage = ({
   const [isCheckingAccess, setIsCheckingAccess] = useState13(false);
   const eventServiceContext = useContext2(EventServiceContext);
   const eventService = eventServiceContext?.eventService || null;
-  useEffect9(() => {
+  useEffect8(() => {
     clearPalette();
   }, []);
-  useEffect9(() => {
+  useEffect8(() => {
     const isOnLoginPage = location.pathname === "/login" || location.pathname.startsWith("/login");
     if (isOnLoginPage) {
       clearPalette();
     }
   }, [location.pathname]);
-  useEffect9(() => {
+  useEffect8(() => {
     const restoreEvent = async () => {
       try {
         const isOnLoginPage = window.location.pathname === "/login" || window.location.pathname.startsWith("/login");
@@ -3977,7 +3970,7 @@ var PaceLoginPage = ({
     }, 100);
     return () => clearTimeout(timeoutId);
   }, [eventService]);
-  useEffect9(() => {
+  useEffect8(() => {
     if (!requireAppAccess || !isAuthenticated || isLoading || !user || !supabase) {
       return;
     }
@@ -4065,8 +4058,8 @@ var PaceLoginPage = ({
       setIsSigningIn(false);
     }
   };
-  return /* @__PURE__ */ jsxs16("main", { className: "min-h-screen grid mx-auto w-fit content-center justify-items-center gap-y-8", "aria-label": `${appName} Login Page`, children: [
-    /* @__PURE__ */ jsx21(
+  return /* @__PURE__ */ jsxs15("main", { className: "min-h-screen grid mx-auto w-fit content-center justify-items-center gap-y-8", "aria-label": `${appName} Login Page`, children: [
+    /* @__PURE__ */ jsx20(
       "img",
       {
         src: `/${appName.toLowerCase()}_logo_square.svg`,
@@ -4074,7 +4067,7 @@ var PaceLoginPage = ({
         className: "h-48"
       }
     ),
-    /* @__PURE__ */ jsx21(
+    /* @__PURE__ */ jsx20(
       LoginForm,
       {
         className: "w-md",
@@ -4088,21 +4081,21 @@ var PaceLoginPage = ({
     ),
     (() => {
       const benign = !!(authError && (authError.name === "AuthSessionMissingError" || /Auth session missing/i.test(authError.message)));
-      return authError && !benign ? /* @__PURE__ */ jsx21("em", { className: "mt-4 text-destructive text-center", children: authError.message }) : null;
+      return authError && !benign ? /* @__PURE__ */ jsx20("em", { className: "mt-4 text-destructive text-center", children: authError.message }) : null;
     })(),
-    accessError && /* @__PURE__ */ jsx21("em", { className: "mt-4 text-destructive text-center", children: accessError }),
-    isCheckingAccess && /* @__PURE__ */ jsx21("em", { className: "mt-4 text-muted-foreground text-center", children: "Checking permissions..." })
+    accessError && /* @__PURE__ */ jsx20("em", { className: "mt-4 text-destructive text-center", children: accessError }),
+    isCheckingAccess && /* @__PURE__ */ jsx20("em", { className: "mt-4 text-muted-foreground text-center", children: "Checking permissions..." })
   ] });
 };
 
 // src/components/SessionRestorationLoader/SessionRestorationLoader.tsx
-import { jsx as jsx22, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs16 } from "react/jsx-runtime";
 var SessionRestorationLoader = ({
   message = "Restoring session...",
   className
 }) => {
-  return /* @__PURE__ */ jsxs17(
-    "div",
+  return /* @__PURE__ */ jsxs16(
+    Alert,
     {
       className: cn(
         "flex flex-col items-center justify-center h-screen w-full gap-4 text-center p-4 bg-background",
@@ -4112,20 +4105,19 @@ var SessionRestorationLoader = ({
       "aria-live": "polite",
       "aria-label": message,
       children: [
-        /* @__PURE__ */ jsx22(LoadingSpinner, { size: "lg" }),
-        /* @__PURE__ */ jsx22("div", { className: "text-sm text-sec-600", children: message })
+        /* @__PURE__ */ jsx21(LoadingSpinner, { size: "lg" }),
+        /* @__PURE__ */ jsx21("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 useMemo9, useEffect as useEffect9, useRef as useRef8, useState as useState14 } from "react";
 import { Navigate, Outlet as Outlet2 } from "react-router-dom";
-import { jsx as jsx23, jsxs as jsxs18 } from "react/jsx-runtime";
+import { jsx as jsx22, jsxs as jsxs17 } from "react/jsx-runtime";
 function ProtectedRoute({
   requireEvent = false,
-  allowSuperAdminBypass = false,
   noEventsFallback,
   loadingFallback,
   loginPath = "/login"
@@ -4140,14 +4132,14 @@ function ProtectedRoute({
   const wasAuthenticatedRef = useRef8(false);
   const [shouldRedirect, setShouldRedirect] = useState14(false);
   const tabJustBecameVisibleRef = useRef8(false);
-  useEffect10(() => {
+  useEffect9(() => {
     if (isAuthenticated) {
       wasAuthenticatedRef.current = true;
       setShouldRedirect(false);
       tabJustBecameVisibleRef.current = false;
     }
   }, [isAuthenticated]);
-  useEffect10(() => {
+  useEffect9(() => {
     if (typeof document === "undefined") return;
     let timeoutId = null;
     let wasHidden = document.hidden;
@@ -4191,13 +4183,13 @@ function ProtectedRoute({
       }
     };
   }, [isAuthenticated]);
-  useEffect10(() => {
+  useEffect9(() => {
     if (isAuthenticated) {
       setShouldRedirect(false);
       tabJustBecameVisibleRef.current = false;
     }
   }, [isAuthenticated]);
-  const isRestoringSession = useMemo10(() => {
+  const isRestoringSession = useMemo9(() => {
     return sessionRestoration.isRestoring && !sessionRestoration.restorationComplete && !sessionRestoration.restorationError && !sessionRestoration.hasTimedOut;
   }, [
     sessionRestoration.isRestoring,
@@ -4206,13 +4198,13 @@ function ProtectedRoute({
     sessionRestoration.hasTimedOut
   ]);
   if (isRestoringSession) {
-    return /* @__PURE__ */ jsx23(SessionRestorationLoader, {});
+    return /* @__PURE__ */ jsx22(SessionRestorationLoader, {});
   }
   if (requireEvent && eventLoading) {
-    return /* @__PURE__ */ jsx23(Outlet2, {});
+    return /* @__PURE__ */ jsx22(Outlet2, {});
   }
   if (isLoading && !sessionRestoration.hasTimedOut) {
-    return loadingFallback || /* @__PURE__ */ jsx23("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx23(LoadingSpinner, {}) });
+    return loadingFallback || /* @__PURE__ */ jsx22("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx22(LoadingSpinner, {}) });
   }
   if (!isAuthenticated) {
     if (sessionRestoration.hasTimedOut || sessionRestoration.restorationError) {
@@ -4220,41 +4212,41 @@ function ProtectedRoute({
         timedOut: sessionRestoration.hasTimedOut,
         error: sessionRestoration.restorationError?.message
       });
-      return /* @__PURE__ */ jsx23(Navigate, { to: loginPath, replace: true });
+      return /* @__PURE__ */ jsx22(Navigate, { to: loginPath, replace: true });
     }
     if (!wasAuthenticatedRef.current) {
-      return /* @__PURE__ */ jsx23(Navigate, { to: loginPath, replace: true });
+      return /* @__PURE__ */ jsx22(Navigate, { to: loginPath, replace: true });
     }
     const isTabVisible = typeof document !== "undefined" && !document.hidden;
     if (tabJustBecameVisibleRef.current || isTabVisible && wasAuthenticatedRef.current && isLoading) {
-      return loadingFallback || /* @__PURE__ */ jsx23("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx23(LoadingSpinner, {}) });
+      return loadingFallback || /* @__PURE__ */ jsx22("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx22(LoadingSpinner, {}) });
     }
     if (shouldRedirect) {
-      return /* @__PURE__ */ jsx23(Navigate, { to: loginPath, replace: true });
+      return /* @__PURE__ */ jsx22(Navigate, { to: loginPath, replace: true });
     }
     if (isLoading) {
-      return loadingFallback || /* @__PURE__ */ jsx23("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx23(LoadingSpinner, {}) });
+      return loadingFallback || /* @__PURE__ */ jsx22("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx22(LoadingSpinner, {}) });
     }
-    return /* @__PURE__ */ jsx23(Navigate, { to: loginPath, replace: true });
+    return /* @__PURE__ */ jsx22(Navigate, { to: loginPath, replace: true });
   }
   if (!requireEvent) {
-    return /* @__PURE__ */ jsx23(Outlet2, {});
+    return /* @__PURE__ */ jsx22(Outlet2, {});
   }
   if (!events || events.length === 0) {
-    return noEventsFallback || /* @__PURE__ */ jsx23("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh", padding: "2rem" }, children: /* @__PURE__ */ jsxs18(Alert, { variant: "destructive", className: "max-w-md", children: [
-      /* @__PURE__ */ jsx23(AlertTitle, { children: "No Events Available" }),
-      /* @__PURE__ */ jsx23(AlertDescription, { children: "You don't have access to any events. Please contact your administrator if you believe this is an error." })
+    return noEventsFallback || /* @__PURE__ */ jsx22("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh", padding: "2rem" }, children: /* @__PURE__ */ jsxs17(Alert, { variant: "destructive", className: "max-w-md", children: [
+      /* @__PURE__ */ jsx22(AlertTitle, { children: "No Events Available" }),
+      /* @__PURE__ */ jsx22(AlertDescription, { children: "You don't have access to any events. Please contact your administrator if you believe this is an error." })
     ] }) });
   }
   if (!selectedEvent) {
-    return /* @__PURE__ */ jsx23(Outlet2, {});
+    return /* @__PURE__ */ jsx22(Outlet2, {});
   }
-  return /* @__PURE__ */ jsx23(Outlet2, {});
+  return /* @__PURE__ */ jsx22(Outlet2, {});
 }
 
 // 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 Fragment9, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
+import { useState as useState15, useCallback as useCallback10, useRef as useRef9, useEffect as useEffect10, useMemo as useMemo10 } from "react";
+import { Fragment as Fragment10, jsx as jsx23, jsxs as jsxs18 } from "react/jsx-runtime";
 function FileUpload({
   supabase,
   table_name,
@@ -4280,6 +4272,13 @@ function FileUpload({
   onProgress,
   children
 }) {
+  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] = useState15(false);
   const [uploadStates, setUploadStates] = useState15(/* @__PURE__ */ new Map());
   const [resolvedAppId, setResolvedAppId] = useState15(app_id || null);
@@ -4287,7 +4286,7 @@ function FileUpload({
   const [appIdError, setAppIdError] = useState15(null);
   const fileInputRef = useRef9(null);
   const { uploadFile, isLoading, error } = useFileReference(supabase);
-  useEffect11(() => {
+  useEffect10(() => {
     if (app_id) {
       setResolvedAppId(app_id);
       setIsResolvingAppId(false);
@@ -4322,15 +4321,15 @@ function FileUpload({
     };
     resolveAppId();
   }, [app_id, supabase]);
-  const isUploading = useMemo11(() => {
+  const isUploading = useMemo10(() => {
     return uploadStates.size > 0 && Array.from(uploadStates.values()).some(
       (state) => state.progress.status === "uploading" || state.progress.status === "processing"
     );
   }, [uploadStates]);
-  const isDisabled = useMemo11(() => {
+  const isDisabled = useMemo10(() => {
     return disabled || isUploading || isResolvingAppId || !resolvedAppId;
   }, [disabled, isUploading, isResolvingAppId, resolvedAppId]);
-  const generatePreview = useCallback11((file) => {
+  const generatePreview = useCallback10((file) => {
     return new Promise((resolve) => {
       if (!file.type.startsWith("image/")) {
         resolve(null);
@@ -4344,7 +4343,7 @@ function FileUpload({
       reader.readAsDataURL(file);
     });
   }, []);
-  const validateFile = useCallback11((file) => {
+  const validateFile = useCallback10((file) => {
     if (file.size > maxSize) {
       return `File "${file.name}" exceeds maximum size of ${Math.round(maxSize / 1024 / 1024)}MB`;
     }
@@ -4368,7 +4367,7 @@ function FileUpload({
     }
     return null;
   }, [accept, maxSize]);
-  const handleFileSelect = useCallback11(async (files) => {
+  const handleFileSelect = useCallback10(async (files) => {
     if (!files || files.length === 0) return;
     const fileArray = Array.from(files);
     const validationErrors = [];
@@ -4447,6 +4446,10 @@ function FileUpload({
           const errorMsg = appIdError || "App ID not available. Please provide app_id prop or set app name.";
           throw new Error(errorMsg);
         }
+        if (!pageContext) {
+          const errorMsg = "pageContext is required for file upload. This is used for permission checks.";
+          throw new Error(errorMsg);
+        }
         const result = await uploadFile({
           table_name,
           record_id,
@@ -4544,20 +4547,20 @@ function FileUpload({
         onUploadError?.(errorMessage, file);
       }
     }
-  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError]);
-  const handleDragOver = useCallback11((e) => {
+  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError, pageContext]);
+  const handleDragOver = useCallback10((e) => {
     e.preventDefault();
     e.stopPropagation();
     if (!isDisabled) {
       setIsDragging(true);
     }
   }, [isDisabled]);
-  const handleDragLeave = useCallback11((e) => {
+  const handleDragLeave = useCallback10((e) => {
     e.preventDefault();
     e.stopPropagation();
     setIsDragging(false);
   }, []);
-  const handleDrop = useCallback11((e) => {
+  const handleDrop = useCallback10((e) => {
     e.preventDefault();
     e.stopPropagation();
     setIsDragging(false);
@@ -4565,13 +4568,13 @@ function FileUpload({
     const files = e.dataTransfer.files;
     handleFileSelect(files);
   }, [isDisabled, handleFileSelect]);
-  const handleFileInputChange = useCallback11((e) => {
+  const handleFileInputChange = useCallback10((e) => {
     handleFileSelect(e.target.files);
     if (e.target) {
       e.target.value = "";
     }
   }, [handleFileSelect]);
-  const handleClick = useCallback11(() => {
+  const handleClick = useCallback10(() => {
     if (!isDisabled && fileInputRef.current) {
       fileInputRef.current.click();
     }
@@ -4585,8 +4588,8 @@ function FileUpload({
   };
   const dragClasses = isDragging ? "border-main-500 bg-main-50" : "border-sec-300 hover:border-sec-400";
   const disabledClasses = isDisabled ? "opacity-50 cursor-not-allowed" : "cursor-pointer hover:bg-sec-50";
-  return /* @__PURE__ */ jsxs19("div", { className: `space-y-4 ${className}`, children: [
-    /* @__PURE__ */ jsxs19(
+  return /* @__PURE__ */ jsxs18("div", { className: `space-y-4 ${className}`, children: [
+    /* @__PURE__ */ jsxs18(
       "div",
       {
         role: "button",
@@ -4605,8 +4608,8 @@ function FileUpload({
           }
         } : void 0,
         children: [
-          children || /* @__PURE__ */ jsxs19("div", { className: "space-y-2", children: [
-            /* @__PURE__ */ jsx24(
+          children || /* @__PURE__ */ jsxs18("div", { className: "space-y-2", children: [
+            /* @__PURE__ */ jsx23(
               "input",
               {
                 ref: fileInputRef,
@@ -4616,67 +4619,68 @@ function FileUpload({
                 onChange: handleFileInputChange,
                 className: "hidden",
                 disabled: isDisabled,
-                "data-testid": "file-input"
+                "data-testid": "file-input",
+                "aria-label": accept ? `Upload file${multiple ? "s" : ""} (${accept})` : `Upload file${multiple ? "s" : ""}`
               }
             ),
-            /* @__PURE__ */ jsx24("div", { className: "text-sec-600", children: isResolvingAppId ? "Resolving app configuration..." : isDragging ? "Drop files here..." : /* @__PURE__ */ jsxs19(Fragment9, { children: [
-              /* @__PURE__ */ jsx24("span", { className: "font-medium", children: "Click to upload" }),
+            /* @__PURE__ */ jsx23("div", { className: "text-sec-600", children: isResolvingAppId ? "Resolving app configuration..." : isDragging ? "Drop files here..." : /* @__PURE__ */ jsxs18(Fragment10, { children: [
+              /* @__PURE__ */ jsx23("span", { className: "font-medium", children: "Click to upload" }),
               " ",
               "or drag and drop"
             ] }) }),
-            /* @__PURE__ */ jsxs19("div", { className: "text-sm text-sec-500", children: [
+            /* @__PURE__ */ jsxs18("div", { className: "text-sm text-sec-500", children: [
               !isResolvingAppId && accept !== "*/*" && `Accepted formats: ${accept}`,
               !isResolvingAppId && maxSize && ` \u2022 Max size: ${Math.round(maxSize / 1024 / 1024)}MB`,
               !isResolvingAppId && multiple && " \u2022 Multiple files allowed"
             ] })
           ] }),
-          isUploading && !showProgress && /* @__PURE__ */ jsx24(
+          isUploading && !showProgress && /* @__PURE__ */ jsx23(
             "div",
             {
               className: "absolute inset-0 bg-white bg-opacity-75 flex items-center justify-center",
               role: "status",
               "aria-live": "polite",
               "aria-label": "Uploading file",
-              children: /* @__PURE__ */ jsx24("div", { className: "animate-spin rounded-full size-8 border-b-2 border-main-500", "aria-hidden": "true" })
+              children: /* @__PURE__ */ jsx23("div", { className: "animate-spin rounded-full size-8 border-b-2 border-main-500", "aria-hidden": "true" })
             }
           )
         ]
       }
     ),
-    showProgress && uploadStates.size > 0 && /* @__PURE__ */ jsx24("div", { className: "space-y-2", children: Array.from(uploadStates.entries()).map(([fileId, uploadState]) => {
+    showProgress && uploadStates.size > 0 && /* @__PURE__ */ jsx23("div", { className: "space-y-2", children: Array.from(uploadStates.entries()).map(([fileId, uploadState]) => {
       const { file, progress, preview, result } = uploadState;
       const isError = progress.status === "error";
       const isCompleted = progress.status === "completed";
       const isUploading2 = progress.status === "uploading" || progress.status === "processing";
-      return /* @__PURE__ */ jsxs19(
+      return /* @__PURE__ */ jsxs18(
         "div",
         {
           className: `flex items-center space-x-3 p-3 rounded-lg border ${isError ? "bg-acc-50 border-acc-200" : isCompleted ? "bg-success-50 border-success-200" : "bg-sec-50 border-sec-200"}`,
           children: [
-            /* @__PURE__ */ jsx24("div", { className: "flex-shrink-0", children: preview ? /* @__PURE__ */ jsx24(
+            /* @__PURE__ */ jsx23("div", { className: "flex-shrink-0", children: preview ? /* @__PURE__ */ jsx23(
               "img",
               {
                 src: preview,
                 alt: file.name,
                 className: "w-12 h-12 object-cover rounded"
               }
-            ) : /* @__PURE__ */ jsx24("div", { className: "w-12 h-12 flex items-center justify-center bg-sec-200 rounded", children: /* @__PURE__ */ jsx24("span", { className: "text-2xl", children: "\u{1F4C4}" }) }) }),
-            /* @__PURE__ */ jsxs19("div", { className: "flex-1 min-w-0", children: [
-              /* @__PURE__ */ jsx24("div", { className: "font-medium text-sec-900 truncate", children: file.name }),
-              /* @__PURE__ */ jsxs19("div", { className: "text-sm text-sec-500", children: [
+            ) : /* @__PURE__ */ jsx23("div", { className: "w-12 h-12 flex items-center justify-center bg-sec-200 rounded", children: /* @__PURE__ */ jsx23("span", { className: "text-2xl", children: "\u{1F4C4}" }) }) }),
+            /* @__PURE__ */ jsxs18("div", { className: "flex-1 min-w-0", children: [
+              /* @__PURE__ */ jsx23("div", { className: "font-medium text-sec-900 truncate", children: file.name }),
+              /* @__PURE__ */ jsxs18("div", { className: "text-sm text-sec-500", children: [
                 formatFileSize(file.size),
                 isCompleted && result && " \u2022 Uploaded",
                 isError && progress.error && ` \u2022 ${progress.error}`
               ] }),
-              showProgress && (isUploading2 || isError) && /* @__PURE__ */ jsxs19("div", { className: "mt-2", children: [
-                /* @__PURE__ */ jsx24("div", { className: "w-full bg-sec-200 rounded-full h-2", children: /* @__PURE__ */ jsx24(
+              showProgress && (isUploading2 || isError) && /* @__PURE__ */ jsxs18("div", { className: "mt-2", children: [
+                /* @__PURE__ */ jsx23("div", { className: "w-full bg-sec-200 rounded-full h-2", children: /* @__PURE__ */ jsx23(
                   "div",
                   {
                     className: `h-2 rounded-full transition-all duration-300 ${isError ? "bg-acc-500" : "bg-main-500"}`,
                     style: { width: `${progress.percentage}%` }
                   }
                 ) }),
-                isUploading2 && /* @__PURE__ */ jsxs19("div", { className: "text-xs text-sec-500 mt-1", children: [
+                isUploading2 && /* @__PURE__ */ jsxs18("div", { className: "text-xs text-sec-500 mt-1", children: [
                   progress.percentage,
                   "% \u2022 ",
                   formatFileSize(progress.loaded),
@@ -4685,10 +4689,10 @@ function FileUpload({
                 ] })
               ] })
             ] }),
-            /* @__PURE__ */ jsxs19("div", { className: "flex-shrink-0", children: [
-              isCompleted && /* @__PURE__ */ jsx24("span", { className: "text-success-500 text-xl", children: "\u2713" }),
-              isError && /* @__PURE__ */ jsx24("span", { className: "text-acc-500 text-xl", children: "\u2715" }),
-              isUploading2 && /* @__PURE__ */ jsx24(
+            /* @__PURE__ */ jsxs18("div", { className: "flex-shrink-0", children: [
+              isCompleted && /* @__PURE__ */ jsx23("span", { className: "text-success-500 text-xl", children: "\u2713" }),
+              isError && /* @__PURE__ */ jsx23("span", { className: "text-acc-500 text-xl", children: "\u2715" }),
+              isUploading2 && /* @__PURE__ */ jsx23(
                 "div",
                 {
                   className: "animate-spin rounded-full size-5 border-b-2 border-main-500",
@@ -4703,7 +4707,7 @@ function FileUpload({
         fileId
       );
     }) }),
-    appIdError && /* @__PURE__ */ jsx24(
+    appIdError && /* @__PURE__ */ jsx23(
       "div",
       {
         className: "p-3 bg-acc-50 border border-acc-200 rounded-lg text-sm text-acc-600",
@@ -4712,7 +4716,7 @@ function FileUpload({
         children: appIdError
       }
     ),
-    error && /* @__PURE__ */ jsx24(
+    error && /* @__PURE__ */ jsx23(
       "div",
       {
         className: "p-3 bg-acc-50 border border-acc-200 rounded-lg text-sm text-acc-600",
@@ -4725,9 +4729,9 @@ function FileUpload({
 }
 
 // src/components/Table/Table.tsx
-import * as React19 from "react";
-import { jsx as jsx25 } from "react/jsx-runtime";
-var Table = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+import * as React20 from "react";
+import { jsx as jsx24 } from "react/jsx-runtime";
+var Table = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "table",
   {
     ref,
@@ -4736,9 +4740,9 @@ var Table = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */
   }
 ));
 Table.displayName = "Table";
-var TableHeader = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25("thead", { ref, className: cn("[&_tr]:border-b", className), ...props }));
+var TableHeader = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24("thead", { ref, className: cn("[&_tr]:border-b", className), ...props }));
 TableHeader.displayName = "TableHeader";
-var TableBody = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableBody = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "tbody",
   {
     ref,
@@ -4747,7 +4751,7 @@ var TableBody = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableBody.displayName = "TableBody";
-var TableFooter = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableFooter = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "tfoot",
   {
     ref,
@@ -4759,7 +4763,7 @@ var TableFooter = React19.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 TableFooter.displayName = "TableFooter";
-var TableRow = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableRow = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "tr",
   {
     ref,
@@ -4771,7 +4775,7 @@ var TableRow = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__
   }
 ));
 TableRow.displayName = "TableRow";
-var TableHead = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableHead = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "th",
   {
     ref,
@@ -4783,7 +4787,7 @@ var TableHead = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableHead.displayName = "TableHead";
-var TableCell = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCell = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "td",
   {
     ref,
@@ -4792,7 +4796,7 @@ var TableCell = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE_
   }
 ));
 TableCell.displayName = "TableCell";
-var TableCaption = React19.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx25(
+var TableCaption = React20.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx24(
   "caption",
   {
     ref,
@@ -4803,7 +4807,7 @@ var TableCaption = React19.forwardRef(({ className, ...props }, ref) => /* @__PU
 TableCaption.displayName = "TableCaption";
 
 // src/components/PublicLayout/PublicPageLayout.tsx
-import { Fragment as Fragment10, jsx as jsx26, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Fragment as Fragment11, jsx as jsx25, jsxs as jsxs19 } from "react/jsx-runtime";
 function PublicPageHeader({
   event,
   eventCode,
@@ -4816,11 +4820,11 @@ function PublicPageHeader({
   customEventLogo
 }) {
   const { appName } = useAppConfig();
-  return /* @__PURE__ */ jsxs20("header", { className: cn(
+  return /* @__PURE__ */ jsxs19("header", { className: cn(
     "w-full px-[max(0rem,calc((100vw-var(--app-width))/2-0.5rem))] grid grid-cols-[auto_1fr_auto] place-items-center gap-2",
     className
   ), children: [
-    showAppLogo && appName && /* @__PURE__ */ jsx26(
+    showAppLogo && appName && /* @__PURE__ */ jsx25(
       "img",
       {
         className: "ml-4 max-w-36 object-contain row-span-2",
@@ -4828,9 +4832,9 @@ function PublicPageHeader({
         alt: appName
       }
     ),
-    event && /* @__PURE__ */ jsxs20(Fragment10, { children: [
-      /* @__PURE__ */ jsx26("h1", { children: event.event_name }),
-      showEventLogo && event && /* @__PURE__ */ jsx26(Fragment10, { children: customEventLogo || /* @__PURE__ */ jsx26(
+    event && /* @__PURE__ */ jsxs19(Fragment11, { children: [
+      /* @__PURE__ */ jsx25("h1", { children: event.event_name }),
+      showEventLogo && event && /* @__PURE__ */ jsx25(Fragment11, { children: customEventLogo || /* @__PURE__ */ jsx25(
         FileDisplay,
         {
           table_name: "event",
@@ -4847,13 +4851,13 @@ function PublicPageHeader({
           }
         }
       ) }),
-      event.event_venue && /* @__PURE__ */ jsx26("h4", { children: event.event_venue })
+      event.event_venue && /* @__PURE__ */ jsx25("h4", { children: event.event_venue })
     ] }),
-    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 })
+    title && /* @__PURE__ */ jsxs19(Fragment11, { children: [
+      /* @__PURE__ */ jsx25("h1", { children: title }),
+      description && /* @__PURE__ */ jsx25("p", { className: "text-lg text-sec-600 max-w-3xl mx-auto", children: description })
     ] }),
-    children && /* @__PURE__ */ jsx26(Fragment10, { children })
+    children && /* @__PURE__ */ jsx25(Fragment11, { children })
   ] });
 }
 function PublicPageFooter({
@@ -4867,11 +4871,11 @@ function PublicPageFooter({
   children
 }) {
   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(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)) })
+  return /* @__PURE__ */ jsx25("footer", { className: cn("mt-8 py-6 flex justify-center", className), children: /* @__PURE__ */ jsxs19("section", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto text-center", children: [
+    logo && /* @__PURE__ */ jsx25("img", { src: logo, alt: "Logo", className: "h-8 w-auto" }),
+    children && /* @__PURE__ */ jsx25(Fragment11, { children }),
+    /* @__PURE__ */ jsx25("span", { className: "text-muted-foreground", children: copyrightText }),
+    links && links.length > 0 && /* @__PURE__ */ jsx25("ul", { className: "flex gap-4 mt-2 md:mt-0", children: links.map((link, index) => /* @__PURE__ */ jsx25("li", { children: /* @__PURE__ */ jsx25("a", { href: link.href, className: "text-muted-foreground hover:text-foreground", children: link.label }) }, index)) })
   ] }) });
 }
 function PublicPageLayout({
@@ -4882,7 +4886,6 @@ function PublicPageLayout({
   error = null,
   refetch,
   showFooter = true,
-  className = "",
   errorFallback: ErrorFallback,
   loadingFallback: LoadingFallback,
   customHeader,
@@ -4895,44 +4898,44 @@ function PublicPageLayout({
   });
   if (isLoading) {
     if (LoadingFallback) {
-      return /* @__PURE__ */ jsx26(LoadingFallback, {});
+      return /* @__PURE__ */ jsx25(LoadingFallback, {});
     }
-    return /* @__PURE__ */ jsx26("div", { className: "min-h-screen bg-background flex items-center justify-center", children: /* @__PURE__ */ jsxs20("div", { className: "max-w-md mx-auto text-center px-4", children: [
-      /* @__PURE__ */ jsx26(LoadingSpinner, { size: "lg", className: "mx-auto mb-4" }),
-      loadingMessage && /* @__PURE__ */ jsx26("p", { className: "text-sec-600", children: loadingMessage })
+    return /* @__PURE__ */ jsx25("div", { className: "min-h-screen bg-background flex items-center justify-center", children: /* @__PURE__ */ jsxs19("div", { className: "max-w-md mx-auto text-center px-4", children: [
+      /* @__PURE__ */ jsx25(LoadingSpinner, { size: "lg", className: "mx-auto mb-4" }),
+      loadingMessage && /* @__PURE__ */ jsx25("p", { className: "text-sec-600", children: loadingMessage })
     ] }) });
   }
   if (error && showValidationErrors) {
     if (ErrorFallback) {
-      return /* @__PURE__ */ jsx26(ErrorFallback, { error, retry: handleRefetch });
+      return /* @__PURE__ */ jsx25(ErrorFallback, { error, retry: handleRefetch });
     }
-    return /* @__PURE__ */ jsxs20("main", { className: "flex flex-col items-center justify-center px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: [
-      /* @__PURE__ */ jsx26("h1", { children: "Event Not Found" }),
-      /* @__PURE__ */ jsxs20("p", { children: [
+    return /* @__PURE__ */ jsxs19("main", { className: "flex flex-col items-center justify-center px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: [
+      /* @__PURE__ */ jsx25("h1", { children: "Event Not Found" }),
+      /* @__PURE__ */ jsxs19("p", { children: [
         'The event code "',
         eventCode,
         '" is invalid or the event is not available for public viewing.'
       ] }),
-      /* @__PURE__ */ jsx26(Button, { onClick: handleRefetch, children: "Try Again" })
+      /* @__PURE__ */ jsx25(Button, { onClick: handleRefetch, children: "Try Again" })
     ] });
   }
   if (!event && showValidationErrors) {
-    return /* @__PURE__ */ jsxs20("main", { className: "flex flex-col items-center justify-center px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: [
-      /* @__PURE__ */ jsx26("h1", { children: "Event Not Available" }),
-      /* @__PURE__ */ jsx26("p", { children: "This event is not available for public viewing." }),
-      handleRefetch && /* @__PURE__ */ jsx26(Button, { onClick: handleRefetch, children: "Try Again" })
+    return /* @__PURE__ */ jsxs19("main", { className: "flex flex-col items-center justify-center px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: [
+      /* @__PURE__ */ jsx25("h1", { children: "Event Not Available" }),
+      /* @__PURE__ */ jsx25("p", { children: "This event is not available for public viewing." }),
+      handleRefetch && /* @__PURE__ */ jsx25(Button, { onClick: handleRefetch, children: "Try Again" })
     ] });
   }
-  return /* @__PURE__ */ jsx26(ErrorBoundary, { componentName: "PublicPageLayout", children: /* @__PURE__ */ jsxs20(Fragment10, { children: [
-    customHeader || /* @__PURE__ */ jsx26(
+  return /* @__PURE__ */ jsx25(ErrorBoundary, { componentName: "PublicPageLayout", children: /* @__PURE__ */ jsxs19(Fragment11, { children: [
+    customHeader || /* @__PURE__ */ jsx25(
       PublicPageHeader,
       {
         event: event || void 0,
         eventCode
       }
     ),
-    /* @__PURE__ */ jsx26("main", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children }),
-    showFooter && event && (customFooter || /* @__PURE__ */ jsx26(PublicPageFooter, { event }))
+    /* @__PURE__ */ jsx25("main", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children }),
+    showFooter && event && (customFooter || /* @__PURE__ */ jsx25(PublicPageFooter, { event }))
   ] }) });
 }
 
@@ -4964,8 +4967,7 @@ export {
   Form,
   FormField,
   LoginForm,
-  EventSelector,
-  OrganisationSelector,
+  ContextSelector,
   PasswordChangeForm,
   UserMenu,
   NavigationMenu,
@@ -4988,4 +4990,4 @@ export {
   PublicPageFooter,
   PublicPageLayout
 };
-//# sourceMappingURL=chunk-GLK6VM3F.js.map
+//# sourceMappingURL=chunk-ZNIWI3UC.js.map