@jmruthers/pace-core 0.5.94 → 0.5.95

package/dist/{chunk-O6GASC4Q.js → chunk-V5CTX4FR.js}

@@ -10,7 +10,9 @@ import {
   CardHeader,
   CardTitle,
   Dialog,
+  DialogBody,
   DialogContent,
+  DialogFooter,
   DialogHeader,
   DialogOverlay,
   DialogTitle,
@@ -23,7 +25,7 @@ import {
   SelectSeparator,
   SelectTrigger,
   SelectValue
-} from "./chunk-PRM6EYO3.js";
+} from "./chunk-EPKHU5SS.js";
 import {
   isPermitted,
   isSuperAdmin
@@ -3002,9 +3004,81 @@ function FileUpload({
 }
 
 // src/components/FileDisplay/FileDisplay.tsx
-import { useState as useState11, useEffect as useEffect7, useRef as useRef4, useContext } from "react";
+import { useState as useState12, useEffect as useEffect8, useRef as useRef5, useContext } from "react";
+
+// src/hooks/useFileUrl.ts
+import { useState as useState11, useEffect as useEffect7, useCallback as useCallback7, useRef as useRef4 } from "react";
+function useFileUrl(fileReference, options) {
+  const { organisation_id, supabase, autoLoad = true } = options;
+  const [url, setUrl] = useState11(null);
+  const [isLoading, setIsLoading] = useState11(false);
+  const [error, setError] = useState11(null);
+  const fileReferenceIdRef = useRef4(null);
+  const loadUrl = useCallback7(async () => {
+    if (!fileReference) {
+      setUrl(null);
+      setIsLoading(false);
+      setError(null);
+      return;
+    }
+    if (isLoading || url && fileReferenceIdRef.current === fileReference.id) {
+      return;
+    }
+    setIsLoading(true);
+    setError(null);
+    fileReferenceIdRef.current = fileReference.id;
+    try {
+      let generatedUrl = null;
+      if (fileReference.is_public) {
+        generatedUrl = getPublicUrl(supabase, fileReference.file_path, true);
+      } else {
+        const signedUrlResult = await getSignedUrl(supabase, fileReference.file_path, {
+          appName: "file-reference",
+          orgId: organisation_id,
+          expiresIn: 3600
+        });
+        generatedUrl = signedUrlResult?.url || null;
+      }
+      setUrl(generatedUrl);
+      setError(null);
+    } catch (err) {
+      const error2 = err instanceof Error ? err : new Error("Failed to generate file URL");
+      setError(error2);
+      setUrl(null);
+      console.error("[useFileUrl] Error generating URL:", error2);
+    } finally {
+      setIsLoading(false);
+    }
+  }, [fileReference, supabase, organisation_id, isLoading, url]);
+  const clear = useCallback7(() => {
+    setUrl(null);
+    setError(null);
+    setIsLoading(false);
+    fileReferenceIdRef.current = null;
+  }, []);
+  useEffect7(() => {
+    if (autoLoad) {
+      if (fileReferenceIdRef.current !== fileReference?.id) {
+        setUrl(null);
+        setError(null);
+      }
+      if (fileReference && !url && !isLoading) {
+        loadUrl();
+      }
+    }
+  }, [fileReference?.id, autoLoad, loadUrl, url, isLoading]);
+  return {
+    url,
+    isLoading,
+    error,
+    loadUrl,
+    clear
+  };
+}
+
+// src/components/FileDisplay/FileDisplay.tsx
 init_UnifiedAuthProvider();
-import { jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx22, jsxs as jsxs18 } from "react/jsx-runtime";
 function FileDisplayContent({
   isLoading,
   error,
@@ -3022,17 +3096,20 @@ function FileDisplayContent({
   clearError,
   supabase,
   organisation_id,
-  loadingUrls = /* @__PURE__ */ new Set()
+  loadingUrls = /* @__PURE__ */ new Set(),
+  loadingComponent: LoadingComponent,
+  errorComponent: ErrorComponent
 }) {
-  const [imageError, setImageError] = useState11(false);
-  const [internalFileUrls, setInternalFileUrls] = useState11(new Map(fileUrls));
-  const loadedFilesRef = useRef4(/* @__PURE__ */ new Set());
-  const loadingUrlsRef = useRef4(new Set(loadingUrls));
-  const fileReferencesRef = useRef4([]);
-  useEffect7(() => {
+  const [imageError, setImageError] = useState12(false);
+  const [internalFileUrls, setInternalFileUrls] = useState12(new Map(fileUrls));
+  const [deleteDialogOpen, setDeleteDialogOpen] = useState12(false);
+  const loadedFilesRef = useRef5(/* @__PURE__ */ new Set());
+  const loadingUrlsRef = useRef5(new Set(loadingUrls));
+  const fileReferencesRef = useRef5([]);
+  useEffect8(() => {
     setInternalFileUrls(new Map(fileUrls));
   }, [fileUrls]);
-  useEffect7(() => {
+  useEffect8(() => {
     const currentIds = fileReferences.map((f) => f.id).join(",");
     const prevIds = fileReferencesRef.current.map((f) => f.id).join(",");
     if (currentIds !== prevIds) {
@@ -3041,7 +3118,7 @@ function FileDisplayContent({
       setInternalFileUrls(/* @__PURE__ */ new Map());
     }
   }, [fileReferences]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!supabase || category || fileReferences.length === 0) return;
     const loadFileUrls = async () => {
       const urlsToLoad = fileReferences.filter((fileRef) => {
@@ -3079,13 +3156,15 @@ function FileDisplayContent({
     };
     loadFileUrls();
   }, [category, fileReferences.map((f) => f.id).join(","), supabase, organisation_id]);
-  const handleDelete = async () => {
-    if (window.confirm("Are you sure you want to delete this file?")) {
-      if (onDelete) {
-        await onDelete();
-      }
-      setImageError(false);
+  const handleDeleteClick = () => {
+    setDeleteDialogOpen(true);
+  };
+  const handleDeleteConfirm = async () => {
+    setDeleteDialogOpen(false);
+    if (onDelete) {
+      await onDelete();
     }
+    setImageError(false);
   };
   const handleImageError = () => {
     setImageError(true);
@@ -3108,9 +3187,15 @@ function FileDisplayContent({
     return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
   };
   if (isLoading) {
+    if (LoadingComponent) {
+      return /* @__PURE__ */ jsx22(LoadingComponent, {});
+    }
     return /* @__PURE__ */ jsx22("div", { className: `flex items-center justify-center p-4 ${className}`, children: /* @__PURE__ */ jsx22("div", { className: "animate-spin rounded-full h-8 w-8 border-b-2 border-main-500" }) });
   }
   if (error) {
+    if (ErrorComponent) {
+      return /* @__PURE__ */ jsx22(ErrorComponent, { error, retry: clearError });
+    }
     return /* @__PURE__ */ jsxs18("div", { className: `p-4 bg-acc-50 border border-acc-200 rounded-lg ${className}`, children: [
       /* @__PURE__ */ jsxs18("div", { className: "text-acc-600", children: [
         "Error loading file: ",
@@ -3134,7 +3219,10 @@ function FileDisplayContent({
   }
   if ((category || displayOnly) && fileReference) {
     const isImage = fileReference.file_metadata.fileType?.startsWith("image/");
-    if (displayOnly && isImage && fileUrl && !imageError && !showDelete) {
+    if (displayOnly && isImage && !imageError && !showDelete) {
+      if (!fileUrl) {
+        return /* @__PURE__ */ jsx22("div", { className: `bg-sec-100 rounded animate-pulse ${className || "max-w-full h-48"}`, children: /* @__PURE__ */ jsx22("div", { className: "w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsx22("div", { className: "animate-spin rounded-full h-8 w-8 border-b-2 border-main-500" }) }) });
+      }
       return /* @__PURE__ */ jsx22(
         "img",
         {
@@ -3156,16 +3244,26 @@ function FileDisplayContent({
             onError: handleImageError
           }
         ),
-        showDelete && /* @__PURE__ */ jsx22(
-          "button",
-          {
-            onClick: handleDelete,
-            className: "absolute top-2 right-2 bg-acc-500 text-white rounded-full w-6 h-6 flex items-center justify-center text-sm hover:bg-acc-600",
-            title: "Delete file",
-            "aria-label": "Delete file",
-            children: "\xD7"
-          }
-        )
+        showDelete && /* @__PURE__ */ jsxs18(Fragment6, { children: [
+          /* @__PURE__ */ jsx22(
+            "button",
+            {
+              onClick: handleDeleteClick,
+              className: "absolute top-2 right-2 bg-acc-500 text-white rounded-full w-6 h-6 flex items-center justify-center text-sm hover:bg-acc-600",
+              title: "Delete file",
+              "aria-label": "Delete file",
+              children: "\xD7"
+            }
+          ),
+          /* @__PURE__ */ jsx22(Dialog, { open: deleteDialogOpen, onOpenChange: setDeleteDialogOpen, children: /* @__PURE__ */ jsxs18(DialogContent, { size: "sm", children: [
+            /* @__PURE__ */ jsx22(DialogHeader, { children: /* @__PURE__ */ jsx22(DialogTitle, { children: "Confirm Delete" }) }),
+            /* @__PURE__ */ jsx22(DialogBody, { children: /* @__PURE__ */ jsx22("p", { children: "Are you sure you want to delete this file? This action cannot be undone." }) }),
+            /* @__PURE__ */ jsxs18(DialogFooter, { children: [
+              /* @__PURE__ */ jsx22(Button, { variant: "outline", onClick: () => setDeleteDialogOpen(false), children: "Cancel" }),
+              /* @__PURE__ */ jsx22(Button, { variant: "destructive", onClick: handleDeleteConfirm, children: "Delete" })
+            ] })
+          ] }) })
+        ] })
       ] }) : /* @__PURE__ */ jsxs18("div", { className: "flex items-center space-x-3 p-3 bg-sec-50 rounded-lg border border-sec-200", children: [
         /* @__PURE__ */ jsx22("span", { className: "text-2xl", children: getFileIcon(fileReference.file_metadata.fileType || "") }),
         /* @__PURE__ */ jsxs18("div", { className: "flex-1 min-w-0", children: [
@@ -3175,16 +3273,26 @@ function FileDisplayContent({
             fileReference.file_metadata.fileType && ` \u2022 ${fileReference.file_metadata.fileType}`
           ] })
         ] }),
-        showDelete && /* @__PURE__ */ jsx22(
-          "button",
-          {
-            onClick: handleDelete,
-            className: "text-acc-500 hover:text-acc-700 p-1",
-            title: "Delete file",
-            "aria-label": "Delete file",
-            children: "\xD7"
-          }
-        )
+        showDelete && /* @__PURE__ */ jsxs18(Fragment6, { children: [
+          /* @__PURE__ */ jsx22(
+            "button",
+            {
+              onClick: handleDeleteClick,
+              className: "text-acc-500 hover:text-acc-700 p-1",
+              title: "Delete file",
+              "aria-label": "Delete file",
+              children: "\xD7"
+            }
+          ),
+          /* @__PURE__ */ jsx22(Dialog, { open: deleteDialogOpen, onOpenChange: setDeleteDialogOpen, children: /* @__PURE__ */ jsxs18(DialogContent, { size: "sm", children: [
+            /* @__PURE__ */ jsx22(DialogHeader, { children: /* @__PURE__ */ jsx22(DialogTitle, { children: "Confirm Delete" }) }),
+            /* @__PURE__ */ jsx22(DialogBody, { children: /* @__PURE__ */ jsx22("p", { children: "Are you sure you want to delete this file? This action cannot be undone." }) }),
+            /* @__PURE__ */ jsxs18(DialogFooter, { children: [
+              /* @__PURE__ */ jsx22(Button, { variant: "outline", onClick: () => setDeleteDialogOpen(false), children: "Cancel" }),
+              /* @__PURE__ */ jsx22(Button, { variant: "destructive", onClick: handleDeleteConfirm, children: "Delete" })
+            ] })
+          ] }) })
+        ] })
       ] }),
       children
     ] });
@@ -3196,7 +3304,7 @@ function FileDisplayContent({
       const isLoadingUrl = loadingUrlsRef.current.has(fileRef.id);
       const canDownload = !isImage && fileUrl2;
       return /* @__PURE__ */ jsxs18("div", { className: "flex items-center space-x-3 p-3 bg-sec-50 rounded-lg border border-sec-200", children: [
-        isLoadingUrl ? /* @__PURE__ */ jsx22("div", { className: "w-12 h-12 flex items-center justify-center", children: /* @__PURE__ */ jsx22("div", { className: "animate-spin rounded-full h-6 w-6 border-b-2 border-main-500" }) }) : isImage && fileUrl2 ? /* @__PURE__ */ jsx22(
+        isLoadingUrl ? /* @__PURE__ */ jsx22("div", { className: "w-12 h-12 flex items-center justify-center bg-sec-100 rounded animate-pulse", children: /* @__PURE__ */ jsx22("div", { className: "animate-spin rounded-full h-6 w-6 border-b-2 border-main-500" }) }) : isImage && fileUrl2 ? /* @__PURE__ */ jsx22(
           "img",
           {
             src: fileUrl2,
@@ -3227,11 +3335,10 @@ function FileDisplayContent({
           showDelete && onDelete && /* @__PURE__ */ jsx22(
             "button",
             {
-              onClick: () => {
-                onDelete();
-              },
+              onClick: handleDeleteClick,
               className: "text-acc-500 hover:text-acc-700 p-1",
               title: "Delete file",
+              "aria-label": "Delete file",
               children: "\xD7"
             }
           )
@@ -3251,7 +3358,9 @@ function FileDisplayBackwardsCompat({
   showUpload = false,
   showDelete = false,
   className = "",
-  children
+  children,
+  loadingComponent,
+  errorComponent
 }) {
   const {
     isLoading: isLoadingForRecord,
@@ -3272,35 +3381,27 @@ function FileDisplayBackwardsCompat({
     isLoading: isLoadingCategory,
     error: errorCategory
   } = useFileReference(supabase);
-  const [categoryFileReference, setCategoryFileReference] = useState11(null);
-  const [categoryFileUrl, setCategoryFileUrl] = useState11(null);
-  const [categoryFileReferences, setCategoryFileReferences] = useState11([]);
-  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState11(null);
-  const [displayOnlyFileUrl, setDisplayOnlyFileUrl] = useState11(null);
-  useEffect7(() => {
+  const [categoryFileReferences, setCategoryFileReferences] = useState12([]);
+  const categoryFileReference = categoryFileReferences[0] || null;
+  const categoryFileUrlHook = useFileUrl(categoryFileReference, {
+    supabase,
+    organisation_id,
+    autoLoad: !!categoryFileReference
+  });
+  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState12(null);
+  const displayOnlyFileUrlHook = useFileUrl(displayOnlyFileReference, {
+    supabase,
+    organisation_id,
+    autoLoad: !!displayOnlyFileReference
+  });
+  useEffect8(() => {
     if (category) {
       const loadCategoryFiles = async () => {
         try {
           const files = await getFilesByCategory(table_name, record_id, category, organisation_id);
           setCategoryFileReferences(files);
-          if (files.length > 0) {
-            const firstFile = files[0];
-            setCategoryFileReference(firstFile);
-            let url = null;
-            if (firstFile.is_public) {
-              url = getPublicUrl(supabase, firstFile.file_path, true);
-            } else {
-              const signedUrlResult = await getSignedUrl(supabase, firstFile.file_path, {
-                appName: "file-reference",
-                orgId: organisation_id,
-                expiresIn: 3600
-              });
-              url = signedUrlResult?.url || null;
-            }
-            setCategoryFileUrl(url);
-          } else {
-            setCategoryFileReference(null);
-            setCategoryFileUrl(null);
+          if (files.length === 0) {
+            setCategoryFileReferences([]);
           }
         } catch (err) {
           console.error("[FileDisplayBackwardsCompat] Error loading files by category:", err);
@@ -3308,57 +3409,33 @@ function FileDisplayBackwardsCompat({
       };
       loadCategoryFiles();
     } else {
-      setCategoryFileReference(null);
-      setCategoryFileUrl(null);
       setCategoryFileReferences([]);
     }
   }, [category, table_name, record_id, organisation_id, supabase, getFilesByCategory]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!category) {
       loadFileCount();
       loadFileReferences();
     }
   }, [loadFileCount, loadFileReferences, category]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (!category && fileReference) {
       loadFileUrl();
     }
   }, [category, fileReference, loadFileUrl]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (displayOnly && !category && fileReferences.length > 0) {
-      const loadDisplayOnlyFile = async () => {
-        try {
-          const imageFiles = fileReferences.filter(
-            (f) => f.file_metadata.fileType?.startsWith("image/")
-          );
-          const targetFile = imageFiles.length > 0 ? imageFiles[0] : fileReferences[0];
-          setDisplayOnlyFileReference(targetFile);
-          let url = null;
-          if (targetFile.is_public) {
-            url = getPublicUrl(supabase, targetFile.file_path, true);
-          } else {
-            const signedUrlResult = await getSignedUrl(supabase, targetFile.file_path, {
-              appName: "file-reference",
-              orgId: organisation_id,
-              expiresIn: 3600
-            });
-            url = signedUrlResult?.url || null;
-          }
-          setDisplayOnlyFileUrl(url);
-        } catch (err) {
-          console.error("[FileDisplayBackwardsCompat] Error loading displayOnly file:", err);
-        }
-      };
-      loadDisplayOnlyFile();
-    } else if (!displayOnly || category) {
+      const imageFiles = fileReferences.filter(
+        (f) => f.file_metadata.fileType?.startsWith("image/")
+      );
+      const targetFile = imageFiles.length > 0 ? imageFiles[0] : fileReferences[0];
+      setDisplayOnlyFileReference(targetFile);
+    } else {
       setDisplayOnlyFileReference(null);
-      setDisplayOnlyFileUrl(null);
     }
-  }, [displayOnly, category, fileReferences, supabase, organisation_id]);
+  }, [displayOnly, category, fileReferences]);
   const handleDelete = async () => {
-    if (window.confirm("Are you sure you want to delete this file?")) {
-      await deleteFile(true);
-    }
+    await deleteFile(true);
   };
   let finalFileReference = null;
   let finalFileUrl = null;
@@ -3368,18 +3445,18 @@ function FileDisplayBackwardsCompat({
   let finalError = null;
   if (category) {
     finalFileReference = categoryFileReference;
-    finalFileUrl = categoryFileUrl;
+    finalFileUrl = categoryFileUrlHook.url;
     finalFileReferences = categoryFileReferences;
     finalFileCount = categoryFileReferences.length;
-    finalIsLoading = isLoadingCategory;
-    finalError = errorCategory;
+    finalIsLoading = isLoadingCategory || categoryFileUrlHook.isLoading;
+    finalError = errorCategory || categoryFileUrlHook.error;
   } else if (displayOnly) {
     finalFileReference = displayOnlyFileReference;
-    finalFileUrl = displayOnlyFileUrl;
+    finalFileUrl = displayOnlyFileUrlHook.url;
     finalFileReferences = displayOnlyFileReference ? [displayOnlyFileReference] : [];
     finalFileCount = displayOnlyFileReference ? 1 : 0;
-    finalIsLoading = isLoadingForRecord;
-    finalError = errorForRecord;
+    finalIsLoading = isLoadingForRecord || displayOnlyFileUrlHook.isLoading;
+    finalError = errorForRecord || displayOnlyFileUrlHook.error;
   } else {
     finalFileReference = fileReference;
     finalFileUrl = fileUrl;
@@ -3407,7 +3484,9 @@ function FileDisplayBackwardsCompat({
       clearError,
       supabase,
       organisation_id,
-      loadingUrls: /* @__PURE__ */ new Set()
+      loadingUrls: /* @__PURE__ */ new Set(),
+      loadingComponent,
+      errorComponent
     }
   );
 }
@@ -3420,7 +3499,9 @@ function FileDisplayPublic({
   showUpload = false,
   showDelete = false,
   className = "",
-  children
+  children,
+  loadingComponent,
+  errorComponent
 }) {
   const publicPageContext = useContext(PublicPageContext);
   const supabase = publicPageContext?.supabase ?? null;
@@ -3477,7 +3558,9 @@ function FileDisplayPublic({
       children,
       onDelete: showDelete ? handleDelete : void 0,
       supabase,
-      organisation_id
+      organisation_id,
+      loadingComponent,
+      errorComponent
     }
   );
 }
@@ -3490,7 +3573,9 @@ function FileDisplayAuthenticated({
   showUpload = false,
   showDelete = false,
   className = "",
-  children
+  children,
+  loadingComponent,
+  errorComponent
 }) {
   const { supabase } = useUnifiedAuth();
   if (!supabase) {
@@ -3512,44 +3597,28 @@ function FileDisplayAuthenticated({
     category,
     { supabase }
   );
-  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState11(null);
-  const [displayOnlyFileUrl, setDisplayOnlyFileUrl] = useState11(null);
-  useEffect7(() => {
+  const [displayOnlyFileReference, setDisplayOnlyFileReference] = useState12(null);
+  const displayOnlyFileUrlFromMap = displayOnlyFileReference ? fileUrls.get(displayOnlyFileReference.id) : null;
+  const displayOnlyFileUrlHook = useFileUrl(
+    displayOnlyFileReference && !displayOnlyFileUrlFromMap ? displayOnlyFileReference : null,
+    {
+      supabase,
+      organisation_id,
+      autoLoad: !displayOnlyFileUrlFromMap && !!displayOnlyFileReference
+    }
+  );
+  const displayOnlyFileUrl = displayOnlyFileUrlFromMap || displayOnlyFileUrlHook.url;
+  useEffect8(() => {
     if (displayOnly && !category && fileReferences.length > 0) {
-      const loadDisplayOnlyFile = async () => {
-        try {
-          const imageFiles = fileReferences.filter(
-            (f) => f.file_metadata.fileType?.startsWith("image/")
-          );
-          const targetFile = imageFiles.length > 0 ? imageFiles[0] : fileReferences[0];
-          setDisplayOnlyFileReference(targetFile);
-          const existingUrl = fileUrls.get(targetFile.id);
-          if (existingUrl) {
-            setDisplayOnlyFileUrl(existingUrl);
-            return;
-          }
-          let url = null;
-          if (targetFile.is_public) {
-            url = getPublicUrl(supabase, targetFile.file_path, true);
-          } else {
-            const signedUrlResult = await getSignedUrl(supabase, targetFile.file_path, {
-              appName: "file-reference",
-              orgId: organisation_id,
-              expiresIn: 3600
-            });
-            url = signedUrlResult?.url || null;
-          }
-          setDisplayOnlyFileUrl(url);
-        } catch (err) {
-          console.error("[FileDisplayAuthenticated] Error loading displayOnly file:", err);
-        }
-      };
-      loadDisplayOnlyFile();
-    } else if (!displayOnly || category) {
+      const imageFiles = fileReferences.filter(
+        (f) => f.file_metadata.fileType?.startsWith("image/")
+      );
+      const targetFile = imageFiles.length > 0 ? imageFiles[0] : fileReferences[0];
+      setDisplayOnlyFileReference(targetFile);
+    } else {
       setDisplayOnlyFileReference(null);
-      setDisplayOnlyFileUrl(null);
     }
-  }, [displayOnly, category, fileReferences, fileUrls, supabase, organisation_id]);
+  }, [displayOnly, category, fileReferences, fileUrls]);
   const handleDelete = async () => {
     console.warn("[FileDisplay] Delete operation needs to be implemented via FileReferenceService");
   };
@@ -3557,17 +3626,23 @@ function FileDisplayAuthenticated({
   let finalFileUrl = fileUrl;
   let finalFileReferences = fileReferences;
   let finalFileCount = fileCount;
+  let finalIsLoading = isLoading;
+  let finalError = error;
   if (displayOnly && !category) {
     finalFileReference = displayOnlyFileReference;
     finalFileUrl = displayOnlyFileUrl;
     finalFileReferences = displayOnlyFileReference ? [displayOnlyFileReference] : [];
     finalFileCount = displayOnlyFileReference ? 1 : 0;
+    if (!displayOnlyFileUrlFromMap) {
+      finalIsLoading = isLoading || displayOnlyFileUrlHook.isLoading;
+      finalError = error || displayOnlyFileUrlHook.error;
+    }
   }
   return /* @__PURE__ */ jsx22(
     FileDisplayContent,
     {
-      isLoading,
-      error,
+      isLoading: finalIsLoading,
+      error: finalError,
       fileUrl: finalFileUrl,
       fileReference: finalFileReference,
       fileReferences: finalFileReferences,
@@ -3580,7 +3655,9 @@ function FileDisplayAuthenticated({
       children,
       onDelete: showDelete ? handleDelete : void 0,
       supabase,
-      organisation_id
+      organisation_id,
+      loadingComponent,
+      errorComponent
     }
   );
 }
@@ -3594,7 +3671,9 @@ function FileDisplay({
   showUpload = false,
   showDelete = false,
   className = "",
-  children
+  children,
+  loadingComponent,
+  errorComponent
 }) {
   if (supabase) {
     return /* @__PURE__ */ jsx22(
@@ -3609,7 +3688,9 @@ function FileDisplay({
         showUpload,
         showDelete,
         className,
-        children
+        children,
+        loadingComponent,
+        errorComponent
       }
     );
   }
@@ -3626,7 +3707,9 @@ function FileDisplay({
         showUpload,
         showDelete,
         className,
-        children
+        children,
+        loadingComponent,
+        errorComponent
       }
     );
   }
@@ -3641,13 +3724,15 @@ function FileDisplay({
       showUpload,
       showDelete,
       className,
-      children
+      children,
+      loadingComponent,
+      errorComponent
     }
   );
 }
 
 // src/hooks/useEventLogo.ts
-import { useState as useState12, useEffect as useEffect8, useCallback as useCallback8, useMemo as useMemo9 } from "react";
+import { useState as useState13, useEffect as useEffect9, useCallback as useCallback9, useMemo as useMemo10 } from "react";
 function defaultGenerateFallbackText(eventName) {
   if (!eventName) return "EV";
   return eventName.split(" ").map((word) => word.charAt(0).toUpperCase()).join("").substring(0, 3);
@@ -3676,13 +3761,13 @@ function useEventLogo(supabase, eventId, eventName, organisationId, options = {}
     validateImage = true,
     generateFallbackText = defaultGenerateFallbackText
   } = options;
-  const [logoUrl, setLogoUrl] = useState12(null);
-  const [isLoading, setIsLoading] = useState12(false);
-  const [error, setError] = useState12(null);
-  const fallbackText = useMemo9(() => {
+  const [logoUrl, setLogoUrl] = useState13(null);
+  const [isLoading, setIsLoading] = useState13(false);
+  const [error, setError] = useState13(null);
+  const fallbackText = useMemo10(() => {
     return eventName ? generateFallbackText(eventName) : "EV";
   }, [eventName, generateFallbackText]);
-  const fetchLogo = useCallback8(async () => {
+  const fetchLogo = useCallback9(async () => {
     if (!eventId || !organisationId || !supabase) {
       setLogoUrl(null);
       setIsLoading(false);
@@ -3766,7 +3851,7 @@ function useEventLogo(supabase, eventId, eventName, organisationId, options = {}
       setIsLoading(false);
     }
   }, [eventId, organisationId, supabase, cacheTtl, enableCache, validateImage, generateFallbackText]);
-  useEffect8(() => {
+  useEffect9(() => {
     if (eventId && organisationId && supabase) {
       fetchLogo();
     } else {
@@ -3775,7 +3860,7 @@ function useEventLogo(supabase, eventId, eventName, organisationId, options = {}
       setError(null);
     }
   }, [eventId, organisationId, supabase, cacheTtl, enableCache, validateImage, generateFallbackText]);
-  const refetch = useCallback8(async () => {
+  const refetch = useCallback9(async () => {
     if (!eventId || !organisationId || !supabase) return;
     if (enableCache) {
       const cacheKey = `event_logo_${eventId}_${organisationId}`;
@@ -3885,7 +3970,7 @@ var TableCaption = React19.forwardRef(({ className, ...props }, ref) => /* @__PU
 TableCaption.displayName = "TableCaption";
 
 // src/components/PublicLayout/PublicPageHeader.tsx
-import { Fragment as Fragment6, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
+import { Fragment as Fragment7, jsx as jsx24, jsxs as jsxs19 } from "react/jsx-runtime";
 function PublicPageHeader({
   event,
   eventCode,
@@ -3925,7 +4010,7 @@ function PublicPageHeader({
       ) })
     ] }),
     /* @__PURE__ */ jsx24("div", { className: "pb-4", children: /* @__PURE__ */ jsxs19("div", { className: "text-center", children: [
-      event && /* @__PURE__ */ jsxs19(Fragment6, { children: [
+      event && /* @__PURE__ */ jsxs19(Fragment7, { children: [
         /* @__PURE__ */ jsx24("h1", { className: "text-3xl font-bold text-gray-900 mb-2", children: event.event_name }),
         event.event_venue && /* @__PURE__ */ jsx24("p", { className: "text-md text-gray-500 mb-4", children: event.event_venue })
       ] }),
@@ -3939,7 +4024,7 @@ function PublicPageHeader({
 }
 
 // src/components/PublicLayout/PublicPageFooter.tsx
-import { Fragment as Fragment7, jsx as jsx25, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx25, jsxs as jsxs20 } from "react/jsx-runtime";
 function PublicPageFooter({
   event,
   companyName = "Solvera Solutions Pty Ltd",
@@ -3953,7 +4038,7 @@ function PublicPageFooter({
   const copyrightText = copyright || `\xA9 Copyright 2022\u2013${year} all rights reserved, ${companyName}.`;
   return /* @__PURE__ */ jsx25("footer", { className: cn("mt-8 py-6 flex justify-center border-t border-border bg-main-100", className), children: /* @__PURE__ */ jsxs20("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(Fragment7, { children }),
+    children && /* @__PURE__ */ jsx25(Fragment8, { 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)) })
   ] }) });
@@ -4049,7 +4134,7 @@ function PublicLoadingSkeleton({
 }
 
 // src/components/PublicLayout/PublicPageLayout.tsx
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo11 } from "react";
 import { jsx as jsx27, jsxs as jsxs22 } from "react/jsx-runtime";
 function PublicPageLayout({
   eventCode,
@@ -4067,7 +4152,7 @@ function PublicPageLayout({
   const error = null;
   const refetch = async () => {
   };
-  const layoutClasses = useMemo10(() => {
+  const layoutClasses = useMemo11(() => {
     const baseClasses = "min-h-screen bg-white flex flex-col";
     return `${baseClasses} ${className}`.trim();
   }, [className]);
@@ -4132,10 +4217,10 @@ function usePublicPageContext2() {
 }
 
 // src/components/PublicLayout/PublicPageDebugger.tsx
-import { useEffect as useEffect9 } from "react";
+import { useEffect as useEffect10 } from "react";
 import { jsx as jsx28, jsxs as jsxs23 } from "react/jsx-runtime";
 function PublicPageDebugger({ enabled = true, label = "PublicPage" }) {
-  useEffect9(() => {
+  useEffect10(() => {
     if (!enabled) return;
     console.log(`[${label}] Component mounted`);
     try {
@@ -4193,10 +4278,10 @@ function PublicPageDebugger({ enabled = true, label = "PublicPage" }) {
 }
 
 // src/components/PublicLayout/PublicPageDiagnostic.tsx
-import { useEffect as useEffect10, useState as useState13 } from "react";
+import { useEffect as useEffect11, useState as useState14 } from "react";
 import { jsx as jsx29, jsxs as jsxs24 } from "react/jsx-runtime";
 function PublicPageDiagnostic({ enabled = true, label = "PublicPage" }) {
-  const [diagnostics, setDiagnostics] = useState13({
+  const [diagnostics, setDiagnostics] = useState14({
     hasPublicPageContext: false,
     hasAuthContext: false,
     hasOrgContext: false,
@@ -4204,7 +4289,7 @@ function PublicPageDiagnostic({ enabled = true, label = "PublicPage" }) {
     hasEnvironmentVars: false,
     routeParams: null
   });
-  useEffect10(() => {
+  useEffect11(() => {
     if (!enabled) return;
     const runDiagnostics = () => {
       const newDiagnostics = {
@@ -4318,10 +4403,10 @@ function PublicPageDiagnostic({ enabled = true, label = "PublicPage" }) {
 }
 
 // src/components/PublicLayout/PublicPageContextChecker.tsx
-import { useEffect as useEffect11 } from "react";
+import { useEffect as useEffect12 } from "react";
 import { jsx as jsx30, jsxs as jsxs25 } from "react/jsx-runtime";
 function PublicPageContextChecker({ enabled = true, label = "PublicPage" }) {
-  useEffect11(() => {
+  useEffect12(() => {
     if (!enabled) return;
     console.group(`\u{1F6A8} [${label}] PUBLIC PAGE CONTEXT CHECK`);
     try {
@@ -4404,7 +4489,7 @@ function PublicPageContextChecker({ enabled = true, label = "PublicPage" }) {
 }
 
 // src/components/PublicLayout/EventLogo.tsx
-import { useMemo as useMemo11, useContext as useContext2 } from "react";
+import { useMemo as useMemo12, useContext as useContext2 } from "react";
 init_UnifiedAuthProvider();
 import { jsx as jsx31 } from "react/jsx-runtime";
 var sizeClasses2 = {
@@ -4455,8 +4540,8 @@ function EventLogoPublic({
       supabase
     }
   );
-  const sizeClass = useMemo11(() => sizeClasses2[size || "md"], [size]);
-  const combinedClasses = useMemo11(() => {
+  const sizeClass = useMemo12(() => sizeClasses2[size || "md"], [size]);
+  const combinedClasses = useMemo12(() => {
     const baseClasses = "flex items-center justify-center bg-gray-100 text-gray-600 font-semibold rounded";
     return `${baseClasses} ${sizeClass} ${className}`.trim();
   }, [sizeClass, className]);
@@ -4537,8 +4622,8 @@ function EventLogoAuthenticated({
       generateFallbackText
     }
   );
-  const sizeClass = useMemo11(() => sizeClasses2[size || "md"], [size]);
-  const combinedClasses = useMemo11(() => {
+  const sizeClass = useMemo12(() => sizeClasses2[size || "md"], [size]);
+  const combinedClasses = useMemo12(() => {
     const baseClasses = "flex items-center justify-center bg-gray-100 text-gray-600 font-semibold rounded";
     return `${baseClasses} ${sizeClass} ${className}`.trim();
   }, [sizeClass, className]);
@@ -4714,4 +4799,4 @@ export {
   EventLogoCompact,
   EventLogoLarge
 };
-//# sourceMappingURL=chunk-O6GASC4Q.js.map
+//# sourceMappingURL=chunk-V5CTX4FR.js.map