- {currentIndex + 1} of {photos.length} + {safeIndex + 1} of {photos.length}
)} @@ -111,7 +123,7 @@ export function PhotoModal({ photos, initialIndex, isOpen, onClose }: PhotoModal
{query.length === 0 && showRecentSearches && suggestions.length > 0 && (
@@ -316,7 +316,7 @@ export function AutocompleteSearch({
)}
- {displayItems.map((item, index) => (
+ {displayItems.length > 0 && displayItems.map((item, index) => (
{
- const uploadedImages: UploadedImage[] = [];
-
- for (const image of images) {
- if (image.isLocal && image.file) {
- try {
- // Get upload URL from Cloudflare
- const { data: uploadData, error: uploadError } = await fetch('/api/upload-image', {
- method: 'POST',
- }).then(res => res.json());
-
- if (uploadError) {
- throw new Error('Failed to get upload URL');
- }
-
- // Upload to Cloudflare
- const formData = new FormData();
- formData.append('file', image.file);
-
- const uploadResponse = await fetch(uploadData.uploadURL, {
- method: 'POST',
- body: formData,
- });
-
- if (!uploadResponse.ok) {
- throw new Error('Failed to upload image');
- }
-
- const result = await uploadResponse.json();
-
- // Return uploaded image with Cloudflare data
- uploadedImages.push({
- url: result.result.variants[0],
- cloudflare_id: result.result.id,
- caption: image.caption,
- });
- } catch (error) {
- console.error('Error uploading image:', error);
- throw error;
- }
- } else {
- // Already uploaded, keep as is
- uploadedImages.push(image);
- }
- }
-
- return uploadedImages;
-}
diff --git a/src/hooks/useEntityVersions.ts b/src/hooks/useEntityVersions.ts
index 290ae63e..4820d71c 100644
--- a/src/hooks/useEntityVersions.ts
+++ b/src/hooks/useEntityVersions.ts
@@ -67,8 +67,18 @@ export function useEntityVersions(entityType: string, entityId: string) {
// Only continue if this is still the latest request
if (currentRequestId !== requestCounterRef.current) return;
+ // Safety check: verify data is an array before processing
+ if (!Array.isArray(data)) {
+ if (isMountedRef.current && currentRequestId === requestCounterRef.current) {
+ setVersions([]);
+ setCurrentVersion(null);
+ setLoading(false);
+ }
+ return;
+ }
+
// Fetch profiles separately
- const userIds = [...new Set(data?.map(v => v.changed_by).filter(Boolean) || [])];
+ const userIds = [...new Set(data.map(v => v.changed_by).filter(Boolean))];
const { data: profiles } = await supabase
.from('profiles')
.select('user_id, username, avatar_url')
@@ -77,8 +87,11 @@ export function useEntityVersions(entityType: string, entityId: string) {
// Check again if this is still the latest request
if (currentRequestId !== requestCounterRef.current) return;
- const versionsWithProfiles = data?.map(v => {
- const profile = profiles?.find(p => p.user_id === v.changed_by);
+ // Safety check: verify profiles array exists before filtering
+ const profilesArray = Array.isArray(profiles) ? profiles : [];
+
+ const versionsWithProfiles = data.map(v => {
+ const profile = profilesArray.find(p => p.user_id === v.changed_by);
return {
...v,
changer_profile: profile || {
@@ -90,14 +103,16 @@ export function useEntityVersions(entityType: string, entityId: string) {
// Only update state if component is still mounted and this is still the latest request
if (isMountedRef.current && currentRequestId === requestCounterRef.current) {
- setVersions(versionsWithProfiles || []);
- setCurrentVersion(versionsWithProfiles?.find(v => v.is_current) || null);
+ setVersions(versionsWithProfiles);
+ setCurrentVersion(versionsWithProfiles.find(v => v.is_current) || null);
setLoading(false);
}
} catch (error: any) {
console.error('Error fetching versions:', error);
if (isMountedRef.current) {
- toast.error('Failed to load version history');
+ // Safe error message access with fallback
+ const errorMessage = error?.message || 'Failed to load version history';
+ toast.error(errorMessage);
setLoading(false);
}
}
@@ -114,12 +129,15 @@ export function useEntityVersions(entityType: string, entityId: string) {
if (error) throw error;
if (isMountedRef.current) {
- setFieldHistory(data as FieldChange[] || []);
+ // Safety check: ensure data is an array
+ const fieldChanges = Array.isArray(data) ? data as FieldChange[] : [];
+ setFieldHistory(fieldChanges);
}
} catch (error: any) {
console.error('Error fetching field history:', error);
if (isMountedRef.current) {
- toast.error('Failed to load field history');
+ const errorMessage = error?.message || 'Failed to load field history';
+ toast.error(errorMessage);
}
}
};
@@ -137,7 +155,8 @@ export function useEntityVersions(entityType: string, entityId: string) {
} catch (error: any) {
console.error('Error comparing versions:', error);
if (isMountedRef.current) {
- toast.error('Failed to compare versions');
+ const errorMessage = error?.message || 'Failed to compare versions';
+ toast.error(errorMessage);
}
return null;
}
@@ -166,7 +185,8 @@ export function useEntityVersions(entityType: string, entityId: string) {
} catch (error: any) {
console.error('Error rolling back version:', error);
if (isMountedRef.current) {
- toast.error('Failed to rollback version');
+ const errorMessage = error?.message || 'Failed to rollback version';
+ toast.error(errorMessage);
}
return null;
}
@@ -195,7 +215,8 @@ export function useEntityVersions(entityType: string, entityId: string) {
} catch (error: any) {
console.error('Error creating version:', error);
if (isMountedRef.current) {
- toast.error('Failed to create version');
+ const errorMessage = error?.message || 'Failed to create version';
+ toast.error(errorMessage);
}
return null;
}
diff --git a/src/hooks/useSidebar.ts b/src/hooks/useSidebar.ts
new file mode 100644
index 00000000..035997ea
--- /dev/null
+++ b/src/hooks/useSidebar.ts
@@ -0,0 +1,11 @@
+import { useContext } from "react";
+import { SidebarContext } from "@/components/ui/sidebar-context";
+
+export function useSidebar() {
+ const context = useContext(SidebarContext);
+ if (!context) {
+ throw new Error("useSidebar must be used within a SidebarProvider.");
+ }
+
+ return context;
+}
diff --git a/src/lib/imageUploadHelper.ts b/src/lib/imageUploadHelper.ts
index 5c3549f9..9f58abba 100644
--- a/src/lib/imageUploadHelper.ts
+++ b/src/lib/imageUploadHelper.ts
@@ -23,13 +23,16 @@ export async function uploadPendingImages(images: UploadedImage[]): Promise => {
if (image.isLocal && image.file) {
+ const fileName = image.file.name;
+
// Step 1: Get upload URL from our Supabase Edge Function
const { data: uploadUrlData, error: urlError } = await supabase.functions.invoke('upload-image', {
body: { action: 'get-upload-url' }
});
if (urlError || !uploadUrlData?.uploadURL) {
- throw new Error(`Failed to get upload URL for image ${index + 1}: ${urlError?.message || 'Unknown error'}`);
+ console.error(`imageUploadHelper.uploadPendingImages: Failed to get upload URL for "${fileName}":`, urlError);
+ throw new Error(`Failed to get upload URL for "${fileName}": ${urlError?.message || 'Unknown error'}`);
}
// Step 2: Upload file directly to Cloudflare
@@ -43,13 +46,15 @@ export async function uploadPendingImages(images: UploadedImage[]): Promise 0) {
if (newlyUploadedImageIds.length > 0) {
- console.error(`Some uploads failed. Cleaning up ${newlyUploadedImageIds.length} newly uploaded images...`);
+ console.error(`imageUploadHelper.uploadPendingImages: Some uploads failed. Cleaning up ${newlyUploadedImageIds.length} newly uploaded images...`);
// Attempt cleanup in parallel but don't throw if it fails
await Promise.allSettled(
@@ -107,7 +112,7 @@ export async function uploadPendingImages(images: UploadedImage[]): Promise {
- console.error(`Failed to cleanup image ${imageId}:`, cleanupError);
+ console.error(`imageUploadHelper.uploadPendingImages: Failed to cleanup image ${imageId}:`, cleanupError);
})
)
);
handleResultClick(item)}
@@ -364,10 +364,11 @@ export function AutocompleteSearch({
{loading && (
);
}
-
-// Helper function to upload all local files
-export async function uploadPendingImages(images: UploadedImage[]): Promise
+ Searching...
)}
- {query.length > 0 && results.length > 0 && (
+ {query.length > 0 && results.length > 0 && !loading && (
<>