@jmruthers/pace-core 0.5.184 → 0.5.186

package/dist/{chunk-NQPMQGS2.js → chunk-HDCUMOOI.js}

@@ -25,16 +25,16 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-QUVSNGIP.js";
+} from "./chunk-HGPQUCBC.js";
 import {
   useCan,
   usePermissions,
   useRBAC,
   useResolvedScope
-} from "./chunk-RA3JUFMW.js";
+} from "./chunk-445GEP27.js";
 import {
   isSuperAdmin
-} from "./chunk-M7W4CP3M.js";
+} from "./chunk-U6WNSFX5.js";
 import {
   ErrorBoundary,
   PublicPageContext,
@@ -46,27 +46,28 @@ import {
   useEventTheme,
   useFileDisplay,
   useIsPublicPage,
+  usePreventTabReload,
   usePublicFileDisplay
-} from "./chunk-MI7HBHN3.js";
+} from "./chunk-TC7D3CR3.js";
 import {
   useToast
 } from "./chunk-6C4YBBJM.js";
 import {
   useEvents,
   useOrganisations
-} from "./chunk-QCDXODCA.js";
+} from "./chunk-XAUHJD3L.js";
 import {
   EventServiceContext,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-FUEYYMX5.js";
+} from "./chunk-FXFJRTKI.js";
 import {
   assertAppId
 } from "./chunk-QXHPKYJV.js";
 import {
   LoadingSpinner,
   getAppId
-} from "./chunk-KUEN3HFB.js";
+} from "./chunk-THRPYOFK.js";
 import {
   cn
 } from "./chunk-R77UEZ4E.js";
@@ -980,14 +981,185 @@ function EventSelector({
   );
 }
 
-// src/components/PasswordChange/PasswordChangeForm.tsx
-import { useState as useState2 } from "react";
+// src/components/OrganisationSelector/OrganisationSelector.tsx
+import { useState as useState2, useCallback as useCallback2 } from "react";
+import { RefreshCw as RefreshCw2, AlertCircle as AlertCircle2, Building2, Shield } from "lucide-react";
 import { jsx as jsx12, jsxs as jsxs6 } from "react/jsx-runtime";
+function OrganisationSelector({
+  placeholder = "Select organisation",
+  className,
+  onOrganisationChange,
+  showNoOrganisationsMessage = true,
+  showRetryButton = true,
+  showRole = false,
+  compact = false,
+  disabled = false
+}) {
+  const [isLoading, setIsLoading] = useState2(false);
+  const [switchError, setSwitchError] = useState2(null);
+  const {
+    organisations,
+    selectedOrganisation,
+    isLoading: orgLoading,
+    error: orgError,
+    switchOrganisation,
+    getUserRole,
+    validateOrganisationAccess,
+    refreshOrganisations
+  } = useOrganisations();
+  const handleOrganisationChange = useCallback2(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);
+      }
+      logger.debug("OrganisationSelector", "Successfully switched to organisation:", orgId);
+    } catch (error) {
+      logger.error("OrganisationSelector", "Failed to switch organisation:", error);
+      setSwitchError(error instanceof Error ? error.message : "Failed to switch organisation");
+    } finally {
+      setIsLoading(false);
+    }
+  }, [
+    disabled,
+    isLoading,
+    validateOrganisationAccess,
+    switchOrganisation,
+    organisations,
+    onOrganisationChange
+  ]);
+  const handleRetry = useCallback2(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);
+    }
+  }, [refreshOrganisations]);
+  if (orgLoading) {
+    return /* @__PURE__ */ jsxs6("div", { className: `flex items-center gap-2 ${className}`, children: [
+      /* @__PURE__ */ jsx12(LoadingSpinner, { size: "sm" }),
+      /* @__PURE__ */ jsx12("span", { className: "text-sm text-muted-foreground", children: compact ? "Loading..." : "Loading organisations..." })
+    ] });
+  }
+  if (orgError) {
+    return /* @__PURE__ */ jsxs6("div", { className: `space-y-2 ${className}`, children: [
+      /* @__PURE__ */ jsxs6(Alert, { variant: "destructive", children: [
+        /* @__PURE__ */ jsx12(AlertCircle2, { className: "h-4 w-4" }),
+        /* @__PURE__ */ jsxs6(AlertDescription, { children: [
+          "Failed to load organisations: ",
+          orgError.message
+        ] })
+      ] }),
+      showRetryButton && /* @__PURE__ */ jsxs6(
+        Button,
+        {
+          variant: "outline",
+          size: "sm",
+          onClick: handleRetry,
+          disabled: isLoading,
+          className: "w-full",
+          children: [
+            /* @__PURE__ */ jsx12(RefreshCw2, { className: `h-4 w-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
+            "Retry"
+          ]
+        }
+      )
+    ] });
+  }
+  if (organisations.length === 0) {
+    if (showNoOrganisationsMessage) {
+      return /* @__PURE__ */ jsxs6("div", { className: `space-y-2 ${className}`, children: [
+        /* @__PURE__ */ jsxs6(Alert, { children: [
+          /* @__PURE__ */ jsx12(Building2, { className: "h-4 w-4" }),
+          /* @__PURE__ */ jsx12(AlertDescription, { children: "No organisations available. Please contact your administrator to be added to an organisation." })
+        ] }),
+        showRetryButton && /* @__PURE__ */ jsxs6(
+          Button,
+          {
+            variant: "outline",
+            size: "sm",
+            onClick: handleRetry,
+            disabled: isLoading,
+            className: "w-full",
+            children: [
+              /* @__PURE__ */ jsx12(RefreshCw2, { className: `h-4 w-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
+              "Check Again"
+            ]
+          }
+        )
+      ] });
+    }
+    return null;
+  }
+  const switchErrorDisplay = switchError && /* @__PURE__ */ jsxs6(Alert, { variant: "destructive", className: "mt-2", children: [
+    /* @__PURE__ */ jsx12(AlertCircle2, { className: "h-4 w-4" }),
+    /* @__PURE__ */ jsx12(AlertDescription, { children: switchError })
+  ] });
+  return /* @__PURE__ */ jsxs6("div", { className: `space-y-2 ${className}`, children: [
+    /* @__PURE__ */ jsxs6(
+      Select,
+      {
+        value: selectedOrganisation?.id || "",
+        onValueChange: handleOrganisationChange,
+        disabled: disabled || isLoading || !selectedOrganisation,
+        children: [
+          /* @__PURE__ */ jsx12(SelectTrigger, { className: `${isLoading ? "opacity-50" : ""}`, children: /* @__PURE__ */ jsxs6("div", { className: "flex items-center gap-2", children: [
+            isLoading ? /* @__PURE__ */ jsx12(LoadingSpinner, { size: "sm" }) : /* @__PURE__ */ jsx12(Building2, { className: "h-4 w-4 text-muted-foreground" }),
+            /* @__PURE__ */ jsx12(SelectValue, { placeholder })
+          ] }) }),
+          /* @__PURE__ */ jsx12(SelectContent, { children: organisations.map((org) => {
+            const userRole = getUserRole(org.id);
+            const hasAccess = validateOrganisationAccess(org.id);
+            return /* @__PURE__ */ jsx12(
+              SelectItem,
+              {
+                value: org.id,
+                disabled: !hasAccess,
+                className: !hasAccess ? "opacity-50" : "",
+                children: /* @__PURE__ */ jsxs6("div", { className: "flex items-center justify-between w-full", children: [
+                  /* @__PURE__ */ jsxs6("div", { className: "flex items-center gap-2", children: [
+                    /* @__PURE__ */ jsx12(Building2, { className: "h-4 w-4" }),
+                    /* @__PURE__ */ jsxs6("div", { className: "flex flex-col", children: [
+                      /* @__PURE__ */ jsx12("span", { className: "font-medium", children: org.display_name }),
+                      !compact && org.description && /* @__PURE__ */ jsx12("span", { className: "text-xs text-muted-foreground truncate max-w-40", children: org.description })
+                    ] })
+                  ] }),
+                  showRole && /* @__PURE__ */ jsxs6("div", { className: "flex items-center gap-1 ml-4", children: [
+                    /* @__PURE__ */ jsx12(Shield, { className: "h-3 w-3 text-muted-foreground" }),
+                    /* @__PURE__ */ jsx12("span", { className: "text-xs text-muted-foreground capitalize", children: userRole?.replace("_", " ") || "No Role" })
+                  ] })
+                ] })
+              },
+              org.id
+            );
+          }) })
+        ]
+      }
+    ),
+    switchErrorDisplay
+  ] });
+}
+
+// src/components/PasswordChange/PasswordChangeForm.tsx
+import { useState as useState3 } from "react";
+import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
 function PasswordChangeForm({ onSubmit, className }) {
-  const [newPassword, setNewPassword] = useState2("");
-  const [confirmPassword, setConfirmPassword] = useState2("");
-  const [error, setError] = useState2(null);
-  const [isSubmitting, setIsSubmitting] = useState2(false);
+  const [newPassword, setNewPassword] = useState3("");
+  const [confirmPassword, setConfirmPassword] = useState3("");
+  const [error, setError] = useState3(null);
+  const [isSubmitting, setIsSubmitting] = useState3(false);
   const handleSubmit = async (e) => {
     e.preventDefault();
     setError(null);
@@ -1012,11 +1184,11 @@ function PasswordChangeForm({ onSubmit, className }) {
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs6("form", { onSubmit: handleSubmit, className: cn("space-y-4", className), children: [
-    error && /* @__PURE__ */ jsx12("div", { role: "alert", children: error }),
-    /* @__PURE__ */ jsxs6("div", { className: "space-y-2", children: [
-      /* @__PURE__ */ jsx12(Label, { htmlFor: "new-password", children: "New Password" }),
-      /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsxs7("form", { onSubmit: handleSubmit, className: cn("space-y-4", className), children: [
+    error && /* @__PURE__ */ jsx13("div", { role: "alert", children: error }),
+    /* @__PURE__ */ jsxs7("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx13(Label, { htmlFor: "new-password", children: "New Password" }),
+      /* @__PURE__ */ jsx13(
         Input,
         {
           id: "new-password",
@@ -1028,9 +1200,9 @@ function PasswordChangeForm({ onSubmit, className }) {
         }
       )
     ] }),
-    /* @__PURE__ */ jsxs6("div", { className: "space-y-2", children: [
-      /* @__PURE__ */ jsx12(Label, { htmlFor: "confirm-password", children: "Confirm Password" }),
-      /* @__PURE__ */ jsx12(
+    /* @__PURE__ */ jsxs7("div", { className: "space-y-2", children: [
+      /* @__PURE__ */ jsx13(Label, { htmlFor: "confirm-password", children: "Confirm Password" }),
+      /* @__PURE__ */ jsx13(
         Input,
         {
           id: "confirm-password",
@@ -1042,7 +1214,7 @@ function PasswordChangeForm({ onSubmit, className }) {
         }
       )
     ] }),
-    /* @__PURE__ */ jsx12(
+    /* @__PURE__ */ jsx13(
       Button,
       {
         type: "submit",
@@ -1055,17 +1227,17 @@ function PasswordChangeForm({ onSubmit, className }) {
 }
 
 // src/components/UserMenu/UserMenu.tsx
-import React11, { useCallback as useCallback2, useMemo as useMemo3, useState as useState3 } from "react";
+import React12, { useCallback as useCallback3, useMemo as useMemo3, useState as useState4 } from "react";
 import { ChevronDown, LogOut, KeyRound } from "lucide-react";
-import { jsx as jsx13, jsxs as jsxs7 } from "react/jsx-runtime";
-var UserMenu = React11.memo(function UserMenu2({
+import { jsx as jsx14, jsxs as jsxs8 } from "react/jsx-runtime";
+var UserMenu = React12.memo(function UserMenu2({
   user,
   onSignOut,
   onChangePassword,
   className,
   showAvatar = true
 }) {
-  const [isPasswordDialogOpen, setPasswordDialogOpen] = useState3(false);
+  const [isPasswordDialogOpen, setPasswordDialogOpen] = useState4(false);
   const userInfo = useMemo3(() => {
     if (!user) return null;
     return {
@@ -1075,42 +1247,42 @@ var UserMenu = React11.memo(function UserMenu2({
       initial: (user.user_metadata?.display_name || user.user_metadata?.full_name || user.email || "U").charAt(0).toUpperCase()
     };
   }, [user]);
-  const handleSignOut = useCallback2(async () => {
+  const handleSignOut = useCallback3(async () => {
     if (onSignOut) await onSignOut();
   }, [onSignOut]);
   if (!user || !userInfo) {
     return null;
   }
-  return /* @__PURE__ */ jsxs7(Dialog, { open: isPasswordDialogOpen, onOpenChange: setPasswordDialogOpen, children: [
-    /* @__PURE__ */ jsxs7(Select, { className, children: [
-      /* @__PURE__ */ jsx13(SelectTrigger, { asChild: true, children: /* @__PURE__ */ jsxs7(Button, { variant: "outline", className: "flex items-center gap-2", "aria-label": userInfo.displayName, children: [
-        showAvatar && /* @__PURE__ */ jsxs7(Avatar, { className: "size-7", children: [
-          /* @__PURE__ */ jsx13(AvatarImage, { src: userInfo.avatarUrl, alt: userInfo.displayName }),
-          /* @__PURE__ */ jsx13(AvatarFallback, { children: userInfo.initial })
+  return /* @__PURE__ */ jsxs8(Dialog, { open: isPasswordDialogOpen, onOpenChange: setPasswordDialogOpen, children: [
+    /* @__PURE__ */ jsxs8(Select, { className, children: [
+      /* @__PURE__ */ jsx14(SelectTrigger, { asChild: true, children: /* @__PURE__ */ jsxs8(Button, { variant: "outline", className: "flex items-center gap-2", "aria-label": userInfo.displayName, children: [
+        showAvatar && /* @__PURE__ */ jsxs8(Avatar, { className: "size-7", children: [
+          /* @__PURE__ */ jsx14(AvatarImage, { src: userInfo.avatarUrl, alt: userInfo.displayName }),
+          /* @__PURE__ */ jsx14(AvatarFallback, { children: userInfo.initial })
         ] }),
-        /* @__PURE__ */ jsx13("span", { children: userInfo.displayName }),
-        /* @__PURE__ */ jsx13(ChevronDown, { className: "h-4 w-4" })
+        /* @__PURE__ */ jsx14("span", { children: userInfo.displayName }),
+        /* @__PURE__ */ jsx14(ChevronDown, { className: "h-4 w-4" })
       ] }) }),
-      /* @__PURE__ */ jsxs7(SelectContent, { children: [
-        /* @__PURE__ */ jsx13(SelectLabel, { className: "font-normal", children: /* @__PURE__ */ jsxs7("div", { className: "flex flex-col space-y-1", children: [
-          /* @__PURE__ */ jsx13("p", { className: "font-medium", children: userInfo.displayName }),
-          /* @__PURE__ */ jsx13("p", { className: "text-muted-foreground", children: userInfo.email })
+      /* @__PURE__ */ jsxs8(SelectContent, { children: [
+        /* @__PURE__ */ jsx14(SelectLabel, { className: "font-normal", children: /* @__PURE__ */ jsxs8("div", { className: "flex flex-col space-y-1", children: [
+          /* @__PURE__ */ jsx14("p", { className: "font-medium", children: userInfo.displayName }),
+          /* @__PURE__ */ jsx14("p", { className: "text-muted-foreground", children: userInfo.email })
         ] }) }),
-        /* @__PURE__ */ jsx13(SelectSeparator, {}),
-        /* @__PURE__ */ jsx13(DialogTrigger, { asChild: true, children: /* @__PURE__ */ jsxs7(SelectItem, { value: "change-password", children: [
-          /* @__PURE__ */ jsx13(KeyRound, { className: "mr-2 h-4 w-4" }),
-          /* @__PURE__ */ jsx13("span", { children: "Change Password" })
+        /* @__PURE__ */ jsx14(SelectSeparator, {}),
+        /* @__PURE__ */ jsx14(DialogTrigger, { asChild: true, children: /* @__PURE__ */ jsxs8(SelectItem, { value: "change-password", children: [
+          /* @__PURE__ */ jsx14(KeyRound, { className: "mr-2 h-4 w-4" }),
+          /* @__PURE__ */ jsx14("span", { children: "Change Password" })
         ] }) }),
-        /* @__PURE__ */ jsxs7(SelectItem, { value: "sign-out", onClick: handleSignOut, children: [
-          /* @__PURE__ */ jsx13(LogOut, { className: "mr-2 h-4 w-4" }),
-          /* @__PURE__ */ jsx13("span", { children: "Sign out" })
+        /* @__PURE__ */ jsxs8(SelectItem, { value: "sign-out", onClick: handleSignOut, children: [
+          /* @__PURE__ */ jsx14(LogOut, { className: "mr-2 h-4 w-4" }),
+          /* @__PURE__ */ jsx14("span", { children: "Sign out" })
         ] })
       ] })
     ] }),
-    /* @__PURE__ */ jsx13(DialogOverlay, {}),
-    /* @__PURE__ */ jsxs7(DialogContent, { className, children: [
-      /* @__PURE__ */ jsx13(DialogHeader, { children: /* @__PURE__ */ jsx13(DialogTitle, { children: "Change Password" }) }),
-      /* @__PURE__ */ jsx13(
+    /* @__PURE__ */ jsx14(DialogOverlay, {}),
+    /* @__PURE__ */ jsxs8(DialogContent, { className, children: [
+      /* @__PURE__ */ jsx14(DialogHeader, { children: /* @__PURE__ */ jsx14(DialogTitle, { children: "Change Password" }) }),
+      /* @__PURE__ */ jsx14(
         PasswordChangeForm,
         {
           onSubmit: async ({ newPassword, confirmPassword }) => {
@@ -1128,31 +1300,31 @@ var UserMenu = React11.memo(function UserMenu2({
     ] })
   ] });
 });
-var UserMenuLoading = React11.memo(function UserMenuLoading2() {
-  return /* @__PURE__ */ jsxs7("div", { className: "relative inline-block text-left", children: [
-    /* @__PURE__ */ jsxs7(
+var UserMenuLoading = React12.memo(function UserMenuLoading2() {
+  return /* @__PURE__ */ jsxs8("div", { className: "relative inline-block text-left", children: [
+    /* @__PURE__ */ jsxs8(
       "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__ */ jsx13("div", { className: "w-6 h-6 rounded-full bg-muted animate-pulse" }),
-          /* @__PURE__ */ jsx13("span", { className: "truncate max-w-[150px]", children: "Loading..." }),
-          /* @__PURE__ */ jsx13(ChevronDown, { className: "w-4 h-4 text-muted-foreground" })
+          /* @__PURE__ */ jsx14("div", { className: "w-6 h-6 rounded-full bg-muted animate-pulse" }),
+          /* @__PURE__ */ jsx14("span", { className: "truncate max-w-[150px]", children: "Loading..." }),
+          /* @__PURE__ */ jsx14(ChevronDown, { className: "w-4 h-4 text-muted-foreground" })
         ]
       }
     ),
-    /* @__PURE__ */ jsx13("div", { role: "status", "aria-label": "Loading user menu", "aria-live": "polite", className: "w-6 h-6 rounded-full bg-muted animate-pulse" })
+    /* @__PURE__ */ jsx14("div", { role: "status", "aria-label": "Loading user menu", "aria-live": "polite", className: "w-6 h-6 rounded-full bg-muted animate-pulse" })
   ] });
 });
 UserMenu.Loading = UserMenuLoading;
 
 // src/components/NavigationMenu/NavigationMenu.tsx
-import * as React12 from "react";
+import * as React13 from "react";
 import { ChevronDown as ChevronDown2 } from "lucide-react";
-import { jsx as jsx14, jsxs as jsxs8 } from "react/jsx-runtime";
-var NavigationMenu = React12.forwardRef(({
+import { jsx as jsx15, jsxs as jsxs9 } from "react/jsx-runtime";
+var NavigationMenu = React13.forwardRef(({
   items,
   mode = "dropdown",
   currentPath,
@@ -1170,8 +1342,8 @@ var NavigationMenu = React12.forwardRef(({
   itemsPreFiltered = false,
   ...props
 }, ref) => {
-  const [expandedItems, setExpandedItems] = React12.useState(/* @__PURE__ */ new Set());
-  const buttonRef = React12.useRef(null);
+  const [expandedItems, setExpandedItems] = React13.useState(/* @__PURE__ */ new Set());
+  const buttonRef = React13.useRef(null);
   let authContext = null;
   try {
     authContext = useUnifiedAuth();
@@ -1196,15 +1368,15 @@ var NavigationMenu = React12.forwardRef(({
     selectedOrganisationId: itemsPreFiltered ? null : selectedOrganisation?.id || null,
     selectedEventId: itemsPreFiltered ? null : selectedEvent?.event_id || null
   });
-  const [resolvedAppId, setResolvedAppId] = React12.useState(void 0);
-  React12.useEffect(() => {
+  const [resolvedAppId, setResolvedAppId] = React13.useState(void 0);
+  React13.useEffect(() => {
     if (!scopeLoading && !resolvedScope?.appId && selectedOrganisation?.id && authContext?.appName && authContext?.user?.id && !resolvedAppId) {
       if (!authContext.user || !authContext.appName) {
         return;
       }
       const userId2 = authContext.user.id;
       const appName = authContext.appName;
-      import("./api-ROMBCNKU.js").then(({ resolveAppContext }) => {
+      import("./api-BMFCXVQX.js").then(({ resolveAppContext }) => {
         resolveAppContext({
           userId: userId2,
           appName
@@ -1218,7 +1390,7 @@ var NavigationMenu = React12.forwardRef(({
       });
     }
   }, [scopeLoading, resolvedScope?.appId, selectedOrganisation?.id, authContext?.appName, authContext?.user?.id, resolvedAppId]);
-  const effectiveScope = React12.useMemo(() => {
+  const effectiveScope = React13.useMemo(() => {
     if (resolvedScope?.organisationId) {
       return resolvedScope;
     }
@@ -1233,7 +1405,7 @@ var NavigationMenu = React12.forwardRef(({
     return null;
   }, [resolvedScope, selectedOrganisation?.id, selectedEvent?.event_id, resolvedAppId]);
   const scopeKey = effectiveScope ? `${effectiveScope.organisationId || ""}-${effectiveScope.eventId || ""}-${effectiveScope.appId || ""}` : "empty";
-  const stableScope = React12.useMemo(() => {
+  const stableScope = React13.useMemo(() => {
     if (effectiveScope?.organisationId) {
       return {
         organisationId: effectiveScope.organisationId,
@@ -1258,8 +1430,8 @@ var NavigationMenu = React12.forwardRef(({
     itemsPreFiltered ? void 0 : stableScope.appId
     // Skip if pre-filtered
   );
-  const previousFilteredItemsRef = React12.useRef([]);
-  const filteredItems = React12.useMemo(() => {
+  const previousFilteredItemsRef = React13.useRef([]);
+  const filteredItems = React13.useMemo(() => {
     if (itemsPreFiltered && items && items.length > 0) {
       const visibleItems = (items || []).filter((item) => !item.meta?.hidden);
       previousFilteredItemsRef.current = visibleItems;
@@ -1555,8 +1727,8 @@ var NavigationMenu = React12.forwardRef(({
     const hasChildren = item.children && item.children.length > 0;
     const isExpanded = expandedItems.has(item.id);
     const itemIsActive = isActiveItem(item);
-    return /* @__PURE__ */ jsx14("li", { role: "none", children: hasChildren ? /* @__PURE__ */ jsxs8("div", { children: [
-      /* @__PURE__ */ jsxs8(
+    return /* @__PURE__ */ jsx15("li", { role: "none", children: hasChildren ? /* @__PURE__ */ jsxs9("div", { children: [
+      /* @__PURE__ */ jsxs9(
         "button",
         {
           onClick: () => toggleExpanded(item.id),
@@ -1565,21 +1737,21 @@ var NavigationMenu = React12.forwardRef(({
           "aria-controls": `submenu-${item.id}`,
           "aria-current": itemIsActive ? "page" : void 0,
           children: [
-            /* @__PURE__ */ jsx14("span", { children: item.label }),
-            /* @__PURE__ */ jsx14(ChevronDown2, { "aria-hidden": "true" })
+            /* @__PURE__ */ jsx15("span", { children: item.label }),
+            /* @__PURE__ */ jsx15(ChevronDown2, { "aria-hidden": "true" })
           ]
         }
       ),
-      isExpanded && item.children && /* @__PURE__ */ jsx14(
+      isExpanded && item.children && /* @__PURE__ */ jsx15(
         "ul",
         {
           id: `submenu-${item.id}`,
           role: "menu",
           "aria-label": `${item.label} submenu`,
-          children: item.children.map((child) => /* @__PURE__ */ jsx14(React12.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
+          children: item.children.map((child) => /* @__PURE__ */ jsx15(React13.Fragment, { children: renderHierarchicalItem(child, level + 1) }, child.id))
         }
       )
-    ] }) : /* @__PURE__ */ jsx14(
+    ] }) : /* @__PURE__ */ jsx15(
       "a",
       {
         href: item.href || "#",
@@ -1597,26 +1769,26 @@ var NavigationMenu = React12.forwardRef(({
     ) });
   };
   if (mode === "dropdown") {
-    return /* @__PURE__ */ jsxs8(
+    return /* @__PURE__ */ jsxs9(
       Select,
       {
         onValueChange: handleNavigationSelect,
         className,
         "data-testid": "navigation-menu-root",
         children: [
-          /* @__PURE__ */ jsx14(
+          /* @__PURE__ */ jsx15(
             SelectTrigger,
             {
               ref: buttonRef,
               disabled,
               "aria-label": buttonText,
               "data-testid": "navigation-menu-trigger",
-              children: /* @__PURE__ */ jsx14(SelectValue, { placeholder: buttonText })
+              children: /* @__PURE__ */ jsx15(SelectValue, { placeholder: buttonText })
             }
           ),
-          /* @__PURE__ */ jsx14(SelectContent, { children: filteredItems.map((item) => {
+          /* @__PURE__ */ jsx15(SelectContent, { children: filteredItems.map((item) => {
             const isActive = isActiveItem(item);
-            return /* @__PURE__ */ jsx14(
+            return /* @__PURE__ */ jsx15(
               SelectItem,
               {
                 value: item.id,
@@ -1631,14 +1803,14 @@ var NavigationMenu = React12.forwardRef(({
       }
     );
   }
-  return /* @__PURE__ */ jsx14(
+  return /* @__PURE__ */ jsx15(
     "nav",
     {
       ref,
       className,
       "aria-label": navigationLabel,
       ...props,
-      children: /* @__PURE__ */ jsx14("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx14(React12.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
+      children: /* @__PURE__ */ jsx15("ul", { role: "menubar", children: filteredItems.map((item) => /* @__PURE__ */ jsx15(React13.Fragment, { children: renderHierarchicalItem(item, 0) }, item.id)) })
     }
   );
 });
@@ -1646,7 +1818,7 @@ NavigationMenu.displayName = "NavigationMenu";
 
 // src/components/Header/Header.tsx
 import { Link } from "react-router-dom";
-import { jsx as jsx15, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx16, jsxs as jsxs10 } from "react/jsx-runtime";
 function Header({
   logoUrl,
   logoAlt = "Logo",
@@ -1659,37 +1831,38 @@ function Header({
   userMenu,
   className,
   showEventSelector = true,
+  showOrgSelector = false,
   showUserMenu = true,
   currentPath,
   onNavigate,
   logoHref
 }) {
-  return /* @__PURE__ */ jsx15("header", { className: cn(
+  return /* @__PURE__ */ jsx16("header", { className: cn(
     "w-full border-b border-main-200 h-16 shadow-sm bg-main-100 ",
     className
-  ), role: "banner", children: /* @__PURE__ */ jsxs9("nav", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto grid grid-cols-[auto_auto_1fr_auto] gap-4 h-full items-center", children: [
-    logo ? logoHref ? /* @__PURE__ */ jsx15(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: logo }) : logo : logoUrl ? logoHref ? /* @__PURE__ */ jsx15(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx15(
+  ), role: "banner", children: /* @__PURE__ */ jsxs10("nav", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto flex items-center gap-4 h-full", children: [
+    logo ? logoHref ? /* @__PURE__ */ jsx16(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: logo }) : logo : logoUrl ? logoHref ? /* @__PURE__ */ jsx16(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx16(
       "img",
       {
         src: logoUrl,
         alt: logoAlt || "Logo",
         className: "h-[2.15rem] w-auto max-w-[200px] object-contain rounded-md shadow-md bg-transparent"
       }
-    ) }) : /* @__PURE__ */ jsx15(
+    ) }) : /* @__PURE__ */ jsx16(
       "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__ */ jsx15(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx15(
+    ) : logoHref ? /* @__PURE__ */ jsx16(Link, { to: logoHref, className: "cursor-pointer hover:opacity-80 transition-opacity", children: /* @__PURE__ */ jsx16(
       "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: "h-8 w-8 shadow-md"
       }
-    ) }) : /* @__PURE__ */ jsx15(
+    ) }) : /* @__PURE__ */ jsx16(
       "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",
@@ -1697,7 +1870,7 @@ function Header({
         className: "h-8 w-8 shadow-md"
       }
     ),
-    navItems && navItems.length > 0 && /* @__PURE__ */ jsx15(
+    navItems && navItems.length > 0 && /* @__PURE__ */ jsx16(
       NavigationMenu,
       {
         items: navItems,
@@ -1708,30 +1881,41 @@ function Header({
         itemsPreFiltered: true
       }
     ),
-    showEventSelector ? /* @__PURE__ */ jsx15(
-      EventSelector,
-      {
-        placeholder: "Select event",
-        className: "justify-self-end w-96",
-        "data-testid": "event-selector"
-      }
-    ) : /* @__PURE__ */ jsx15("del", { className: "justify-self-end invisible", children: "Event Selector N/A" }),
-    actions,
-    showUserMenu && (userMenu ? userMenu : /* @__PURE__ */ jsx15(
-      UserMenu,
-      {
-        user: user || null,
-        onSignOut,
-        onChangePassword,
-        className: "w-70"
-      }
-    ))
+    /* @__PURE__ */ jsxs10("div", { className: "flex items-center gap-4 ml-auto", children: [
+      showOrgSelector ? /* @__PURE__ */ jsx16(
+        OrganisationSelector,
+        {
+          placeholder: "Select organisation",
+          className: "w-64",
+          "data-testid": "org-selector",
+          compact: true
+        }
+      ) : null,
+      showEventSelector ? /* @__PURE__ */ jsx16(
+        EventSelector,
+        {
+          placeholder: "Select event",
+          className: "w-96",
+          "data-testid": "event-selector"
+        }
+      ) : null,
+      actions,
+      showUserMenu && (userMenu ? userMenu : /* @__PURE__ */ jsx16(
+        UserMenu,
+        {
+          user: user || null,
+          onSignOut,
+          onChangePassword,
+          className: "w-70"
+        }
+      ))
+    ] })
   ] }) });
 }
 
 // src/components/Footer/Footer.tsx
-import React13 from "react";
-import { Fragment as Fragment3, jsx as jsx16, jsxs as jsxs10 } from "react/jsx-runtime";
+import React14 from "react";
+import { Fragment as Fragment3, jsx as jsx17, jsxs as jsxs11 } from "react/jsx-runtime";
 var FooterComponent = ({
   companyName = "Solvera Solutions Pty Ltd",
   year = (/* @__PURE__ */ new Date()).getFullYear(),
@@ -1742,27 +1926,28 @@ var FooterComponent = ({
   children
 }) => {
   const copyrightText = copyright || `\xA9 Copyright 2022\u2013${year} all rights reserved, ${companyName}.`;
-  return /* @__PURE__ */ jsx16("footer", { className: cn("mt-8 py-6 flex justify-center border-t border-border bg-main-100", className), children: /* @__PURE__ */ jsxs10("section", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto text-center", children: [
-    logo && /* @__PURE__ */ jsx16("img", { src: logo, alt: "Logo", className: "h-8 w-auto" }),
-    children && /* @__PURE__ */ jsx16(Fragment3, { children }),
-    /* @__PURE__ */ jsx16("span", { className: "text-muted-foreground", children: copyrightText }),
-    links && links.length > 0 && /* @__PURE__ */ jsx16("ul", { className: "flex gap-4 mt-2 md:mt-0", children: links.map((link, index) => /* @__PURE__ */ jsx16("li", { children: /* @__PURE__ */ jsx16("a", { href: link.href, className: "text-muted-foreground hover:text-foreground", children: link.label }) }, index)) })
+  return /* @__PURE__ */ jsx17("footer", { className: cn("mt-8 py-6 flex justify-center border-t border-border bg-main-100", className), children: /* @__PURE__ */ jsxs11("section", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto text-center", children: [
+    logo && /* @__PURE__ */ jsx17("img", { src: logo, alt: "Logo", className: "h-8 w-auto" }),
+    children && /* @__PURE__ */ jsx17(Fragment3, { children }),
+    /* @__PURE__ */ jsx17("span", { className: "text-muted-foreground", children: copyrightText }),
+    links && links.length > 0 && /* @__PURE__ */ jsx17("ul", { className: "flex gap-4 mt-2 md:mt-0", children: links.map((link, index) => /* @__PURE__ */ jsx17("li", { children: /* @__PURE__ */ jsx17("a", { href: link.href, className: "text-muted-foreground hover:text-foreground", children: link.label }) }, index)) })
   ] }) });
 };
 FooterComponent.displayName = "Footer";
-var Footer = React13.memo(FooterComponent);
+var Footer = React14.memo(FooterComponent);
 Footer.displayName = "Footer";
 
 // src/components/PaceAppLayout/PaceAppLayout.tsx
-import { useState as useState5, useEffect as useEffect3, useMemo as useMemo5 } from "react";
+import { useState as useState6, useEffect as useEffect3, useMemo as useMemo5 } from "react";
 import { Outlet, useNavigate, useLocation } from "react-router-dom";
-import { Fragment as Fragment4, jsx as jsx17, jsxs as jsxs11 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx18, jsxs as jsxs12 } from "react/jsx-runtime";
 var EMPTY_PAGE_ID_MAPPING = {};
 var EMPTY_ROUTE_PERMISSIONS = {};
 function PaceAppLayout({
   appName,
   navItems,
   showEventSelector,
+  showOrgSelector,
   headerActions,
   customLogo,
   logoHref = "/dashboard",
@@ -1849,8 +2034,8 @@ function PaceAppLayout({
     const permissionString = `${currentRoutePermission}:page.${currentPageId}`;
     return permissionString;
   }, [enforcePermissions, currentRoutePermission, currentPageId]);
-  const [isSuperAdminUser, setIsSuperAdminUser] = useState5(false);
-  const [isCheckingSuperAdmin, setIsCheckingSuperAdmin] = useState5(false);
+  const [isSuperAdminUser, setIsSuperAdminUser] = useState6(false);
+  const [isCheckingSuperAdmin, setIsCheckingSuperAdmin] = useState6(false);
   useEffect3(() => {
     const checkSuperAdminStatus = async () => {
       if (!user?.id) {
@@ -1904,7 +2089,7 @@ function PaceAppLayout({
       onPageAccessDenied(currentPageId, currentRoutePermission);
     }
   }, [enforcePermissions, can, isCheckingPermission, isCheckingSuperAdmin, isSuperAdminUser, currentPageId, currentRoutePermission, user?.id, strictMode, auditLog, onPageAccessDenied, onStrictModeViolation]);
-  const [filteredMenuItems, setFilteredMenuItems] = useState5(baseMenuItems);
+  const [filteredMenuItems, setFilteredMenuItems] = useState6(baseMenuItems);
   useEffect3(() => {
     let isMounted = true;
     const filterItems = async () => {
@@ -1918,15 +2103,20 @@ function PaceAppLayout({
       const hasAppId = currentScope.appId || resolvedAppId;
       const hasOrganisationContext = currentScope.organisationId;
       const hasUser = !!user?.id;
-      if (hasUser && hasOrganisationContext) {
-      } else if (!hasUser || !hasOrganisationContext) {
+      if (!hasUser) {
         if (isMounted) {
-          setFilteredMenuItems([]);
+          setFilteredMenuItems(baseMenuItems);
+        }
+        return;
+      }
+      if (!hasOrganisationContext) {
+        if (isMounted) {
+          setFilteredMenuItems(baseMenuItems);
         }
         return;
       }
       try {
-        const { isSuperAdmin: isSuperAdmin2 } = await import("./api-ROMBCNKU.js");
+        const { isSuperAdmin: isSuperAdmin2 } = await import("./api-BMFCXVQX.js");
         const isSuper = await isSuperAdmin2(user.id);
         if (isSuper) {
           if (isMounted) {
@@ -1940,14 +2130,8 @@ function PaceAppLayout({
           throw error;
         }
       }
-      if (!currentScope.organisationId) {
-        if (isMounted) {
-          setFilteredMenuItems(baseMenuItems);
-        }
-        return;
-      }
       try {
-        const { getPermissionMap } = await import("./api-ROMBCNKU.js");
+        const { getPermissionMap } = await import("./api-BMFCXVQX.js");
         const permissionScope = {
           organisationId: currentScope.organisationId,
           eventId: currentScope.eventId,
@@ -1960,7 +2144,7 @@ function PaceAppLayout({
         });
         const filtered = baseMenuItems.map((item) => {
           if (!item.href) return { item, hasAccess: true };
-          const pageId = pageIdMapping[item.href] || item.href.slice(1) || "home";
+          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;
@@ -1980,7 +2164,7 @@ function PaceAppLayout({
     return () => {
       isMounted = false;
     };
-  }, [baseMenuItems, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope, scopeLoading, contextAppId, resolvedScope?.appId]);
+  }, [baseMenuItems, pageIdMapping, routePermissions, defaultPermission, can, user?.id, scope, scopeLoading, contextAppId, resolvedScope?.appId, selectedOrganisation?.id]);
   useEffect3(() => {
     if (!roleBasedRouting || routeConfig.length === 0) return;
     let isMounted = true;
@@ -2003,7 +2187,7 @@ function PaceAppLayout({
       let hasAccess = true;
       if (currentRoute.pageId && currentRoute.permissions && currentRoute.permissions.length > 0) {
         try {
-          const { isPermittedCached } = await import("./api-ROMBCNKU.js");
+          const { isPermittedCached } = await import("./api-BMFCXVQX.js");
           const hasPagePermission = await isPermittedCached({
             userId: user?.id || "",
             scope,
@@ -2019,7 +2203,7 @@ function PaceAppLayout({
         }
       }
       if (hasAccess && currentRoute.roles && currentRoute.roles.length > 0 && user?.id) {
-        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-7F6T4B6K.js");
+        const { useUnifiedAuth: useUnifiedAuth2 } = await import("./UnifiedAuthProvider-A4BCQRJY.js");
         hasAccess = true;
       }
       if (!isMounted) return;
@@ -2066,31 +2250,31 @@ function PaceAppLayout({
     return {};
   };
   if (enforcePermissions && (isCheckingSuperAdmin || isCheckingPermission)) {
-    return /* @__PURE__ */ jsx17("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs11("div", { className: "text-center", children: [
-      /* @__PURE__ */ jsx17("div", { className: "animate-spin rounded-full h-8 w-8 border-b-2 border-sec-900 mx-auto mb-4" }),
-      /* @__PURE__ */ jsx17("p", { className: "text-sec-600", children: "Checking permissions..." })
+    return /* @__PURE__ */ jsx18("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs12("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx18("div", { className: "animate-spin rounded-full h-8 w-8 border-b-2 border-sec-900 mx-auto mb-4" }),
+      /* @__PURE__ */ jsx18("p", { className: "text-sec-600", children: "Checking permissions..." })
     ] }) });
   }
   if (enforcePermissions && permissionError && !isSuperAdminUser) {
-    return /* @__PURE__ */ jsx17("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs11("div", { className: "text-center", children: [
-      /* @__PURE__ */ jsx17("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Permission Error" }),
-      /* @__PURE__ */ jsx17("p", { className: "text-sec-600 mb-4", children: permissionError.message }),
-      /* @__PURE__ */ jsx17(Button, { onClick: () => navigate("/"), children: "Go Home" })
+    return /* @__PURE__ */ jsx18("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs12("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx18("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Permission Error" }),
+      /* @__PURE__ */ jsx18("p", { className: "text-sec-600 mb-4", children: permissionError.message }),
+      /* @__PURE__ */ jsx18(Button, { onClick: () => navigate("/"), children: "Go Home" })
     ] }) });
   }
   if (enforcePermissions && hasPermission === false && !isCheckingSuperAdmin && !isSuperAdminUser) {
     if (enforcePagePermissions && pagePermissionFallback) {
-      return /* @__PURE__ */ jsx17(Fragment4, { children: pagePermissionFallback });
+      return /* @__PURE__ */ jsx18(Fragment4, { children: pagePermissionFallback });
     }
     if (permissionFallback) {
-      return /* @__PURE__ */ jsx17(Fragment4, { children: permissionFallback });
+      return /* @__PURE__ */ jsx18(Fragment4, { children: permissionFallback });
     }
-    return /* @__PURE__ */ jsx17("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs11("div", { className: "text-center", children: [
-      /* @__PURE__ */ jsx17("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Access Denied" }),
-      /* @__PURE__ */ jsx17("p", { className: "text-sec-600 mb-4", children: "You don't have permission to access this page." }),
-      /* @__PURE__ */ jsxs11("div", { className: "flex gap-2 justify-center", children: [
-        /* @__PURE__ */ jsx17(Button, { onClick: () => navigate("/"), children: "Go Home" }),
-        /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsx18("div", { className: "flex items-center justify-center min-h-screen", children: /* @__PURE__ */ jsxs12("div", { className: "text-center", children: [
+      /* @__PURE__ */ jsx18("h2", { className: "text-xl font-semibold text-acc-600 mb-2", children: "Access Denied" }),
+      /* @__PURE__ */ jsx18("p", { className: "text-sec-600 mb-4", children: "You don't have permission to access this page." }),
+      /* @__PURE__ */ jsxs12("div", { className: "flex gap-2 justify-center", children: [
+        /* @__PURE__ */ jsx18(Button, { onClick: () => navigate("/"), children: "Go Home" }),
+        /* @__PURE__ */ jsx18(
           Button,
           {
             variant: "outline",
@@ -2104,8 +2288,8 @@ function PaceAppLayout({
       ] })
     ] }) });
   }
-  return /* @__PURE__ */ jsxs11(Fragment4, { children: [
-    /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs12(Fragment4, { children: [
+    /* @__PURE__ */ jsx18(
       Header,
       {
         logo: customLogo || void 0,
@@ -2125,19 +2309,20 @@ function PaceAppLayout({
           }
         },
         showEventSelector,
+        showOrgSelector,
         showUserMenu,
         className: headerClassName || "sticky top-0 z-[40] w-full"
       }
     ),
-    /* @__PURE__ */ jsx17("main", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: /* @__PURE__ */ jsx17(Outlet, {}) }),
-    /* @__PURE__ */ jsx17(Footer, {})
+    /* @__PURE__ */ jsx18("main", { className: "px-4 w-[min(var(--app-width),100%)] mx-auto py-8", children: /* @__PURE__ */ jsx18(Outlet, {}) }),
+    /* @__PURE__ */ jsx18(Footer, {})
   ] });
 }
 
 // src/components/PaceLoginPage/PaceLoginPage.tsx
-import { useEffect as useEffect4, useState as useState6, useContext } from "react";
+import { useEffect as useEffect4, useState as useState7, useContext } from "react";
 import { useNavigate as useNavigate2, useLocation as useLocation2 } from "react-router-dom";
-import { jsx as jsx18, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx19, jsxs as jsxs13 } from "react/jsx-runtime";
 var PaceLoginPage = ({
   appName = "Pace",
   onSuccessRedirectPath = "/",
@@ -2146,9 +2331,9 @@ var PaceLoginPage = ({
   const { signIn, isAuthenticated, isLoading, authError, user, supabase } = useUnifiedAuth();
   const navigate = useNavigate2();
   const location = useLocation2();
-  const [isSigningIn, setIsSigningIn] = useState6(false);
-  const [accessError, setAccessError] = useState6(null);
-  const [isCheckingAccess, setIsCheckingAccess] = useState6(false);
+  const [isSigningIn, setIsSigningIn] = useState7(false);
+  const [accessError, setAccessError] = useState7(null);
+  const [isCheckingAccess, setIsCheckingAccess] = useState7(false);
   const eventServiceContext = useContext(EventServiceContext);
   const eventService = eventServiceContext?.eventService || null;
   useEffect4(() => {
@@ -2268,8 +2453,8 @@ var PaceLoginPage = ({
       setIsSigningIn(false);
     }
   };
-  return /* @__PURE__ */ jsxs12("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__ */ jsx18(
+  return /* @__PURE__ */ jsxs13("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__ */ jsx19(
       "img",
       {
         src: `/${appName.toLowerCase()}_logo_square.svg`,
@@ -2277,7 +2462,7 @@ var PaceLoginPage = ({
         className: "h-48"
       }
     ),
-    /* @__PURE__ */ jsx18(
+    /* @__PURE__ */ jsx19(
       LoginForm,
       {
         className: "w-md",
@@ -2291,20 +2476,20 @@ var PaceLoginPage = ({
     ),
     (() => {
       const benign = !!(authError && (authError.name === "AuthSessionMissingError" || /Auth session missing/i.test(authError.message)));
-      return authError && !benign ? /* @__PURE__ */ jsx18("em", { className: "mt-4 text-destructive text-center", children: authError.message }) : null;
+      return authError && !benign ? /* @__PURE__ */ jsx19("em", { className: "mt-4 text-destructive text-center", children: authError.message }) : null;
     })(),
-    accessError && /* @__PURE__ */ jsx18("em", { className: "mt-4 text-destructive text-center", children: accessError }),
-    isCheckingAccess && /* @__PURE__ */ jsx18("em", { className: "mt-4 text-muted-foreground text-center", children: "Checking permissions..." })
+    accessError && /* @__PURE__ */ jsx19("em", { className: "mt-4 text-destructive text-center", children: accessError }),
+    isCheckingAccess && /* @__PURE__ */ jsx19("em", { className: "mt-4 text-muted-foreground text-center", children: "Checking permissions..." })
   ] });
 };
 
 // src/components/SessionRestorationLoader/SessionRestorationLoader.tsx
-import { jsx as jsx19, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx20, jsxs as jsxs14 } from "react/jsx-runtime";
 var SessionRestorationLoader = ({
   message = "Restoring session...",
   className
 }) => {
-  return /* @__PURE__ */ jsxs13(
+  return /* @__PURE__ */ jsxs14(
     "div",
     {
       className: cn(
@@ -2315,27 +2500,91 @@ var SessionRestorationLoader = ({
       "aria-live": "polite",
       "aria-label": message,
       children: [
-        /* @__PURE__ */ jsx19(LoadingSpinner, { size: "lg" }),
-        /* @__PURE__ */ jsx19("div", { className: "text-sm text-sec-600", children: message })
+        /* @__PURE__ */ jsx20(LoadingSpinner, { size: "lg" }),
+        /* @__PURE__ */ jsx20("div", { className: "text-sm text-sec-600", children: message })
       ]
     }
   );
 };
 
 // src/components/ProtectedRoute/ProtectedRoute.tsx
-import { useMemo as useMemo6 } from "react";
+import { useMemo as useMemo6, useEffect as useEffect5, useRef as useRef3, useState as useState8 } from "react";
 import { Navigate, Outlet as Outlet2 } from "react-router-dom";
-import { jsx as jsx20, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx21, jsxs as jsxs15 } from "react/jsx-runtime";
 function ProtectedRoute({
-  requireEvent = true,
+  requireEvent = false,
   allowSuperAdminBypass = false,
   noEventsFallback,
   loadingFallback,
   loginPath = "/login"
 }) {
-  const { isAuthenticated, authLoading } = useUnifiedAuth();
-  const { selectedEvent, events, isLoading: eventLoading } = useEvents();
+  const { isAuthenticated, isLoading } = useUnifiedAuth();
+  const eventsContext = useEvents();
+  const selectedEvent = requireEvent ? eventsContext.selectedEvent : null;
+  const events = requireEvent ? eventsContext.events || [] : [];
+  const eventLoading = requireEvent ? eventsContext.isLoading || false : false;
   const sessionRestoration = useSessionRestoration();
+  usePreventTabReload({ enabled: true, gracePeriodMs: 2e3 });
+  const wasAuthenticatedRef = useRef3(false);
+  const [shouldRedirect, setShouldRedirect] = useState8(false);
+  const tabJustBecameVisibleRef = useRef3(false);
+  useEffect5(() => {
+    if (isAuthenticated) {
+      wasAuthenticatedRef.current = true;
+      setShouldRedirect(false);
+      tabJustBecameVisibleRef.current = false;
+    }
+  }, [isAuthenticated]);
+  useEffect5(() => {
+    if (typeof document === "undefined") return;
+    let timeoutId = null;
+    let wasHidden = document.hidden;
+    const handleVisibilityChange = () => {
+      const isNowVisible = !document.hidden;
+      if (isNowVisible && wasHidden) {
+        if (!isAuthenticated && wasAuthenticatedRef.current) {
+          tabJustBecameVisibleRef.current = true;
+          setShouldRedirect(false);
+          if (timeoutId) {
+            clearTimeout(timeoutId);
+          }
+          timeoutId = setTimeout(() => {
+            tabJustBecameVisibleRef.current = false;
+            setShouldRedirect((prev) => {
+              return prev;
+            });
+          }, 2e3);
+        }
+      } else if (!isNowVisible) {
+        tabJustBecameVisibleRef.current = false;
+        if (timeoutId) {
+          clearTimeout(timeoutId);
+          timeoutId = null;
+        }
+      }
+      wasHidden = !isNowVisible;
+    };
+    if (!document.hidden && !isAuthenticated && wasAuthenticatedRef.current) {
+      tabJustBecameVisibleRef.current = true;
+      setShouldRedirect(false);
+      timeoutId = setTimeout(() => {
+        tabJustBecameVisibleRef.current = false;
+      }, 2e3);
+    }
+    document.addEventListener("visibilitychange", handleVisibilityChange);
+    return () => {
+      document.removeEventListener("visibilitychange", handleVisibilityChange);
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    };
+  }, [isAuthenticated]);
+  useEffect5(() => {
+    if (isAuthenticated) {
+      setShouldRedirect(false);
+      tabJustBecameVisibleRef.current = false;
+    }
+  }, [isAuthenticated]);
   const isRestoringSession = useMemo6(() => {
     return sessionRestoration.isRestoring && !sessionRestoration.restorationComplete && !sessionRestoration.restorationError && !sessionRestoration.hasTimedOut;
   }, [
@@ -2345,13 +2594,13 @@ function ProtectedRoute({
     sessionRestoration.hasTimedOut
   ]);
   if (isRestoringSession) {
-    return /* @__PURE__ */ jsx20(SessionRestorationLoader, {});
+    return /* @__PURE__ */ jsx21(SessionRestorationLoader, {});
   }
   if (requireEvent && eventLoading) {
-    return /* @__PURE__ */ jsx20(Outlet2, {});
+    return /* @__PURE__ */ jsx21(Outlet2, {});
   }
-  if (authLoading && !sessionRestoration.hasTimedOut) {
-    return loadingFallback || /* @__PURE__ */ jsx20("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx20(LoadingSpinner, {}) });
+  if (isLoading && !sessionRestoration.hasTimedOut) {
+    return loadingFallback || /* @__PURE__ */ jsx21("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx21(LoadingSpinner, {}) });
   }
   if (!isAuthenticated) {
     if (sessionRestoration.hasTimedOut || sessionRestoration.restorationError) {
@@ -2359,202 +2608,45 @@ function ProtectedRoute({
         timedOut: sessionRestoration.hasTimedOut,
         error: sessionRestoration.restorationError?.message
       });
+      return /* @__PURE__ */ jsx21(Navigate, { to: loginPath, replace: true });
     }
-    return /* @__PURE__ */ jsx20(Navigate, { to: loginPath, replace: true });
+    if (!wasAuthenticatedRef.current) {
+      return /* @__PURE__ */ jsx21(Navigate, { to: loginPath, replace: true });
+    }
+    const isTabVisible = typeof document !== "undefined" && !document.hidden;
+    if (tabJustBecameVisibleRef.current || isTabVisible && wasAuthenticatedRef.current && isLoading) {
+      return loadingFallback || /* @__PURE__ */ jsx21("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx21(LoadingSpinner, {}) });
+    }
+    if (shouldRedirect) {
+      return /* @__PURE__ */ jsx21(Navigate, { to: loginPath, replace: true });
+    }
+    if (isLoading) {
+      return loadingFallback || /* @__PURE__ */ jsx21("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", height: "100vh" }, children: /* @__PURE__ */ jsx21(LoadingSpinner, {}) });
+    }
+    return /* @__PURE__ */ jsx21(Navigate, { to: loginPath, replace: true });
   }
   if (!requireEvent) {
-    return /* @__PURE__ */ jsx20(Outlet2, {});
+    return /* @__PURE__ */ jsx21(Outlet2, {});
   }
   if (!events || events.length === 0) {
-    return noEventsFallback || /* @__PURE__ */ jsx20("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh", padding: "2rem" }, children: /* @__PURE__ */ jsxs14(Alert, { variant: "destructive", className: "max-w-md", children: [
-      /* @__PURE__ */ jsx20(AlertTitle, { children: "No Events Available" }),
-      /* @__PURE__ */ jsx20(AlertDescription, { children: "You don't have access to any events. Please contact your administrator if you believe this is an error." })
+    return noEventsFallback || /* @__PURE__ */ jsx21("div", { style: { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh", padding: "2rem" }, children: /* @__PURE__ */ jsxs15(Alert, { variant: "destructive", className: "max-w-md", children: [
+      /* @__PURE__ */ jsx21(AlertTitle, { children: "No Events Available" }),
+      /* @__PURE__ */ jsx21(AlertDescription, { children: "You don't have access to any events. Please contact your administrator if you believe this is an error." })
     ] }) });
   }
   if (!selectedEvent) {
     logger.debug("ProtectedRoute", "Events available but none selected - allowing render so selector is visible");
-    return /* @__PURE__ */ jsx20(Outlet2, {});
+    return /* @__PURE__ */ jsx21(Outlet2, {});
   }
-  return /* @__PURE__ */ jsx20(Outlet2, {});
-}
-
-// src/components/OrganisationSelector/OrganisationSelector.tsx
-import { useState as useState7, useCallback as useCallback4 } from "react";
-import { RefreshCw as RefreshCw2, AlertCircle as AlertCircle2, Building2, Shield } from "lucide-react";
-import { jsx as jsx21, jsxs as jsxs15 } from "react/jsx-runtime";
-function OrganisationSelector({
-  placeholder = "Select organisation",
-  className,
-  onOrganisationChange,
-  showNoOrganisationsMessage = true,
-  showRetryButton = true,
-  showRole = false,
-  compact = false,
-  disabled = false
-}) {
-  const [isLoading, setIsLoading] = useState7(false);
-  const [switchError, setSwitchError] = useState7(null);
-  const {
-    organisations,
-    selectedOrganisation,
-    isLoading: orgLoading,
-    error: orgError,
-    switchOrganisation,
-    getUserRole,
-    validateOrganisationAccess,
-    refreshOrganisations
-  } = useOrganisations();
-  const handleOrganisationChange = useCallback4(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);
-      }
-      logger.debug("OrganisationSelector", "Successfully switched to organisation:", orgId);
-    } catch (error) {
-      logger.error("OrganisationSelector", "Failed to switch organisation:", error);
-      setSwitchError(error instanceof Error ? error.message : "Failed to switch organisation");
-    } finally {
-      setIsLoading(false);
-    }
-  }, [
-    disabled,
-    isLoading,
-    validateOrganisationAccess,
-    switchOrganisation,
-    organisations,
-    onOrganisationChange
-  ]);
-  const handleRetry = useCallback4(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);
-    }
-  }, [refreshOrganisations]);
-  if (orgLoading) {
-    return /* @__PURE__ */ jsxs15("div", { className: `flex items-center gap-2 ${className}`, children: [
-      /* @__PURE__ */ jsx21(LoadingSpinner, { size: "sm" }),
-      /* @__PURE__ */ jsx21("span", { className: "text-sm text-muted-foreground", children: compact ? "Loading..." : "Loading organisations..." })
-    ] });
-  }
-  if (orgError) {
-    return /* @__PURE__ */ jsxs15("div", { className: `space-y-2 ${className}`, children: [
-      /* @__PURE__ */ jsxs15(Alert, { variant: "destructive", children: [
-        /* @__PURE__ */ jsx21(AlertCircle2, { className: "h-4 w-4" }),
-        /* @__PURE__ */ jsxs15(AlertDescription, { children: [
-          "Failed to load organisations: ",
-          orgError.message
-        ] })
-      ] }),
-      showRetryButton && /* @__PURE__ */ jsxs15(
-        Button,
-        {
-          variant: "outline",
-          size: "sm",
-          onClick: handleRetry,
-          disabled: isLoading,
-          className: "w-full",
-          children: [
-            /* @__PURE__ */ jsx21(RefreshCw2, { className: `h-4 w-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
-            "Retry"
-          ]
-        }
-      )
-    ] });
-  }
-  if (organisations.length === 0) {
-    if (showNoOrganisationsMessage) {
-      return /* @__PURE__ */ jsxs15("div", { className: `space-y-2 ${className}`, children: [
-        /* @__PURE__ */ jsxs15(Alert, { children: [
-          /* @__PURE__ */ jsx21(Building2, { className: "h-4 w-4" }),
-          /* @__PURE__ */ jsx21(AlertDescription, { children: "No organisations available. Please contact your administrator to be added to an organisation." })
-        ] }),
-        showRetryButton && /* @__PURE__ */ jsxs15(
-          Button,
-          {
-            variant: "outline",
-            size: "sm",
-            onClick: handleRetry,
-            disabled: isLoading,
-            className: "w-full",
-            children: [
-              /* @__PURE__ */ jsx21(RefreshCw2, { className: `h-4 w-4 mr-2 ${isLoading ? "animate-spin" : ""}` }),
-              "Check Again"
-            ]
-          }
-        )
-      ] });
-    }
-    return null;
-  }
-  const switchErrorDisplay = switchError && /* @__PURE__ */ jsxs15(Alert, { variant: "destructive", className: "mt-2", children: [
-    /* @__PURE__ */ jsx21(AlertCircle2, { className: "h-4 w-4" }),
-    /* @__PURE__ */ jsx21(AlertDescription, { children: switchError })
-  ] });
-  return /* @__PURE__ */ jsxs15("div", { className: `space-y-2 ${className}`, children: [
-    /* @__PURE__ */ jsxs15(
-      Select,
-      {
-        value: selectedOrganisation?.id || "",
-        onValueChange: handleOrganisationChange,
-        disabled: disabled || isLoading || !selectedOrganisation,
-        children: [
-          /* @__PURE__ */ jsx21(SelectTrigger, { className: `${isLoading ? "opacity-50" : ""}`, children: /* @__PURE__ */ jsxs15("div", { className: "flex items-center gap-2", children: [
-            isLoading ? /* @__PURE__ */ jsx21(LoadingSpinner, { size: "sm" }) : /* @__PURE__ */ jsx21(Building2, { className: "h-4 w-4 text-muted-foreground" }),
-            /* @__PURE__ */ jsx21(SelectValue, { placeholder })
-          ] }) }),
-          /* @__PURE__ */ jsx21(SelectContent, { children: organisations.map((org) => {
-            const userRole = getUserRole(org.id);
-            const hasAccess = validateOrganisationAccess(org.id);
-            return /* @__PURE__ */ jsx21(
-              SelectItem,
-              {
-                value: org.id,
-                disabled: !hasAccess,
-                className: !hasAccess ? "opacity-50" : "",
-                children: /* @__PURE__ */ jsxs15("div", { className: "flex items-center justify-between w-full", children: [
-                  /* @__PURE__ */ jsxs15("div", { className: "flex items-center gap-2", children: [
-                    /* @__PURE__ */ jsx21(Building2, { className: "h-4 w-4" }),
-                    /* @__PURE__ */ jsxs15("div", { className: "flex flex-col", children: [
-                      /* @__PURE__ */ jsx21("span", { className: "font-medium", children: org.display_name }),
-                      !compact && org.description && /* @__PURE__ */ jsx21("span", { className: "text-xs text-muted-foreground truncate max-w-40", children: org.description })
-                    ] })
-                  ] }),
-                  showRole && /* @__PURE__ */ jsxs15("div", { className: "flex items-center gap-1 ml-4", children: [
-                    /* @__PURE__ */ jsx21(Shield, { className: "h-3 w-3 text-muted-foreground" }),
-                    /* @__PURE__ */ jsx21("span", { className: "text-xs text-muted-foreground capitalize", children: userRole?.replace("_", " ") || "No Role" })
-                  ] })
-                ] })
-              },
-              org.id
-            );
-          }) })
-        ]
-      }
-    ),
-    switchErrorDisplay
-  ] });
+  return /* @__PURE__ */ jsx21(Outlet2, {});
 }
 
 // src/hooks/useFileReference.ts
-import { useState as useState8, useCallback as useCallback5, useEffect as useEffect5, useRef as useRef3, useMemo as useMemo7 } from "react";
+import { useState as useState9, useCallback as useCallback5, useEffect as useEffect6, useRef as useRef4, useMemo as useMemo7 } from "react";
 var log = createLogger("useFileReference");
 function useFileReference(supabase) {
-  const [isLoading, setIsLoading] = useState8(false);
-  const [error, setError] = useState8(null);
+  const [isLoading, setIsLoading] = useState9(false);
+  const [error, setError] = useState9(null);
   const service = useMemo7(() => createFileReferenceService(supabase), [supabase]);
   const uploadFile = useCallback5(async (options, file) => {
     setIsLoading(true);
@@ -2718,11 +2810,11 @@ function useFileReferenceForRecord(supabase, table_name, record_id, organisation
     getFileCount,
     clearError
   } = useFileReference(supabase);
-  const [fileUrl, setFileUrl] = useState8(null);
-  const [fileReference, setFileReference] = useState8(null);
-  const [fileReferences, setFileReferences] = useState8([]);
-  const [fileCount, setFileCount] = useState8(0);
-  const urlRefreshIntervalRef = useRef3(null);
+  const [fileUrl, setFileUrl] = useState9(null);
+  const [fileReference, setFileReference] = useState9(null);
+  const [fileReferences, setFileReferences] = useState9([]);
+  const [fileCount, setFileCount] = useState9(0);
+  const urlRefreshIntervalRef = useRef4(null);
   const loadFileReference = useCallback5(async () => {
     const reference = await getFileReference(table_name, record_id, organisation_id);
     setFileReference(reference);
@@ -2752,7 +2844,7 @@ function useFileReferenceForRecord(supabase, table_name, record_id, organisation
     }
     return success;
   }, [deleteFileReference, table_name, record_id, organisation_id, loadFileCount]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (!fileReference || fileReference.is_public) {
       if (urlRefreshIntervalRef.current) {
         clearInterval(urlRefreshIntervalRef.current);
@@ -2793,8 +2885,8 @@ function useFileReferenceById(supabase, fileReferenceId, organisationId) {
     getFileReferenceById,
     clearError
   } = useFileReference(supabase);
-  const [fileReference, setFileReference] = useState8(null);
-  const [fileUrl, setFileUrl] = useState8(null);
+  const [fileReference, setFileReference] = useState9(null);
+  const [fileUrl, setFileUrl] = useState9(null);
   const loadFileReference = useCallback5(async () => {
     if (!fileReferenceId || !organisationId) {
       setFileReference(null);
@@ -2805,10 +2897,10 @@ function useFileReferenceById(supabase, fileReferenceId, organisationId) {
     setFileReference(reference);
     return reference;
   }, [getFileReferenceById, fileReferenceId, organisationId]);
-  useEffect5(() => {
+  useEffect6(() => {
     loadFileReference();
   }, [loadFileReference]);
-  useEffect5(() => {
+  useEffect6(() => {
     if (!fileReference || !fileReferenceId || !organisationId) {
       setFileUrl(null);
       return;
@@ -2840,8 +2932,8 @@ function useFilesByCategory(supabase, table_name, record_id, category, organisat
     getFilesByCategory,
     clearError
   } = useFileReference(supabase);
-  const [fileReferences, setFileReferences] = useState8([]);
-  const [fileUrls, setFileUrls] = useState8(/* @__PURE__ */ new Map());
+  const [fileReferences, setFileReferences] = useState9([]);
+  const [fileUrls, setFileUrls] = useState9(/* @__PURE__ */ new Map());
   const loadFiles = useCallback5(async () => {
     if (!category || !organisation_id) {
       setFileReferences([]);
@@ -2874,7 +2966,7 @@ function useFilesByCategory(supabase, table_name, record_id, category, organisat
     setFileUrls(urlMap);
     return files;
   }, [table_name, record_id, category, organisation_id, supabase, getFilesByCategory]);
-  useEffect5(() => {
+  useEffect6(() => {
     loadFiles();
   }, [loadFiles]);
   return {
@@ -2888,7 +2980,7 @@ function useFilesByCategory(supabase, table_name, record_id, category, organisat
 }
 
 // src/components/FileUpload/FileUpload.tsx
-import { useState as useState9, useCallback as useCallback6, useRef as useRef4, useEffect as useEffect6, useMemo as useMemo8 } from "react";
+import { useState as useState10, useCallback as useCallback6, useRef as useRef5, useEffect as useEffect7, useMemo as useMemo8 } from "react";
 import { Fragment as Fragment5, jsx as jsx22, jsxs as jsxs16 } from "react/jsx-runtime";
 function FileUpload({
   supabase,
@@ -2897,6 +2989,9 @@ function FileUpload({
   organisation_id,
   app_id,
   category,
+  folder,
+  pageContext,
+  event_id,
   accept = "*/*",
   maxSize = 10 * 1024 * 1024,
   // 10MB default
@@ -2911,14 +3006,14 @@ function FileUpload({
   onProgress,
   children
 }) {
-  const [isDragging, setIsDragging] = useState9(false);
-  const [uploadStates, setUploadStates] = useState9(/* @__PURE__ */ new Map());
-  const [resolvedAppId, setResolvedAppId] = useState9(app_id || null);
-  const [isResolvingAppId, setIsResolvingAppId] = useState9(!app_id);
-  const [appIdError, setAppIdError] = useState9(null);
-  const fileInputRef = useRef4(null);
+  const [isDragging, setIsDragging] = useState10(false);
+  const [uploadStates, setUploadStates] = useState10(/* @__PURE__ */ new Map());
+  const [resolvedAppId, setResolvedAppId] = useState10(app_id || null);
+  const [isResolvingAppId, setIsResolvingAppId] = useState10(!app_id);
+  const [appIdError, setAppIdError] = useState10(null);
+  const fileInputRef = useRef5(null);
   const { uploadFile, isLoading, error } = useFileReference(supabase);
-  useEffect6(() => {
+  useEffect7(() => {
     if (app_id) {
       setResolvedAppId(app_id);
       setIsResolvingAppId(false);
@@ -3084,6 +3179,9 @@ function FileUpload({
           organisation_id,
           app_id: resolvedAppId ? assertAppId(resolvedAppId) : assertAppId(""),
           category,
+          folder,
+          pageContext,
+          event_id,
           is_public: isPublic
         }, file);
         clearInterval(progressInterval);
@@ -3170,7 +3268,7 @@ function FileUpload({
         onUploadError?.(errorMessage, file);
       }
     }
-  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError]);
+  }, [uploadFile, table_name, record_id, organisation_id, resolvedAppId, category, folder, isPublic, maxSize, onUploadSuccess, onUploadError, onProgress, validateFile, generatePreview, showPreview, appIdError]);
   const handleDragOver = useCallback6((e) => {
     e.preventDefault();
     e.stopPropagation();
@@ -3351,17 +3449,17 @@ function FileUpload({
 }
 
 // src/components/FileDisplay/FileDisplay.tsx
-import { useState as useState11, useEffect as useEffect8, useRef as useRef6, useContext as useContext2, useMemo as useMemo9 } from "react";
+import { useState as useState12, useEffect as useEffect9, useRef as useRef7, useContext as useContext2, useMemo as useMemo9 } from "react";
 
 // src/hooks/useFileUrl.ts
-import { useState as useState10, useEffect as useEffect7, useCallback as useCallback7, useRef as useRef5 } from "react";
+import { useState as useState11, useEffect as useEffect8, useCallback as useCallback7, useRef as useRef6 } from "react";
 var log2 = createLogger("useFileUrl");
 function useFileUrl(fileReference, options) {
   const { organisation_id, supabase, autoLoad = true } = options;
-  const [url, setUrl] = useState10(null);
-  const [isLoading, setIsLoading] = useState10(false);
-  const [error, setError] = useState10(null);
-  const fileReferenceIdRef = useRef5(null);
+  const [url, setUrl] = useState11(null);
+  const [isLoading, setIsLoading] = useState11(false);
+  const [error, setError] = useState11(null);
+  const fileReferenceIdRef = useRef6(null);
   const loadUrl = useCallback7(async () => {
     if (!fileReference) {
       setUrl(null);
@@ -3404,7 +3502,7 @@ function useFileUrl(fileReference, options) {
     setIsLoading(false);
     fileReferenceIdRef.current = null;
   }, []);
-  useEffect7(() => {
+  useEffect8(() => {
     if (autoLoad) {
       if (fileReferenceIdRef.current !== fileReference?.id) {
         setUrl(null);
@@ -3464,10 +3562,10 @@ function FileDisplayContent({
   fallbackText,
   fallbackSize = "md"
 }) {
-  const [imageError, setImageError] = useState11(false);
-  const [internalFileUrls, setInternalFileUrls] = useState11(new Map(fileUrls));
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState11(false);
-  const fileReferencesRef = useRef6([]);
+  const [imageError, setImageError] = useState12(false);
+  const [internalFileUrls, setInternalFileUrls] = useState12(new Map(fileUrls));
+  const [deleteDialogOpen, setDeleteDialogOpen] = useState12(false);
+  const fileReferencesRef = useRef7([]);
   const computedFallbackText = useMemo9(() => {
     if (fallbackText) return fallbackText;
     const fileName = fileReference?.file_metadata?.fileName;
@@ -3478,7 +3576,7 @@ function FileDisplayContent({
     const baseClasses = "flex items-center justify-center bg-sec-100 text-sec-600 font-semibold rounded";
     return `${baseClasses} ${sizeClass} ${className}`.trim();
   }, [fallbackSize, className]);
-  useEffect8(() => {
+  useEffect9(() => {
     const currentIds = fileReferences.map((f) => f.id).join(",");
     const prevIds = fileReferencesRef.current.map((f) => f.id).join(",");
     if (currentIds !== prevIds) {
@@ -3868,7 +3966,7 @@ function FileDisplayAuthenticated({
     category,
     { supabase }
   );
-  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState11(null);
+  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState12(null);
   const displayOnlyFileUrlFromMap = displayOnlyFileReference ? fileUrls.get(displayOnlyFileReference.id) : null;
   const displayOnlyFileUrlHook = useFileUrl(
     displayOnlyFileReference && !displayOnlyFileUrlFromMap ? displayOnlyFileReference : null,
@@ -3879,7 +3977,7 @@ function FileDisplayAuthenticated({
     }
   );
   const displayOnlyFileUrl = displayOnlyFileUrlFromMap || displayOnlyFileUrlHook.url;
-  useEffect8(() => {
+  useEffect9(() => {
     if (displayOnly && !category && fileReferences.length > 0) {
       const imageFiles = fileReferences.filter(
         (f) => f.file_metadata.fileType?.startsWith("image/")
@@ -4231,6 +4329,7 @@ export {
   FormField,
   LoginForm,
   EventSelector,
+  OrganisationSelector,
   PasswordChangeForm,
   UserMenu,
   NavigationMenu,
@@ -4240,7 +4339,6 @@ export {
   PaceLoginPage,
   SessionRestorationLoader,
   ProtectedRoute,
-  OrganisationSelector,
   useFileReference,
   useFileReferenceForRecord,
   useFileReferenceById,
@@ -4259,4 +4357,4 @@ export {
   PublicPageFooter,
   PublicPageLayout
 };
-//# sourceMappingURL=chunk-NQPMQGS2.js.map
+//# sourceMappingURL=chunk-HDCUMOOI.js.map