Bugfix: Fix delayed event display after addEvent/deleteEvent (#3235)

Author: vhpx

apps/db/supabase/migrations/20250707043640_remote_schema.sql

@@ -4,8 +4,6 @@ alter table "public"."workspace_quiz_attempt_answers" enable row level security;
 
 alter table "public"."workspace_quiz_attempts" enable row level security;
 
-drop extension if exists "pg_trgm";
-
 set check_function_bodies = off;
 
 CREATE OR REPLACE FUNCTION public.get_user_tasks(_board_id uuid)

packages/ui/src/hooks/use-calendar-sync.tsx

@@ -92,7 +92,6 @@ type CalendarCache = {
     googleEvents: WorkspaceCalendarEvent[];
     dbLastUpdated: number;
     googleLastUpdated: number;
-    isForced: boolean;
   };
 };
 
@@ -102,7 +101,6 @@ type CacheUpdate = {
   googleEvents?: WorkspaceCalendarEvent[];
   dbLastUpdated?: number;
   googleLastUpdated?: number;
-  isForced?: boolean;
 };
 
 export const CalendarSyncProvider = ({
@@ -132,6 +130,7 @@ export const CalendarSyncProvider = ({
   const [isSyncing, setIsSyncing] = useState(false);
   const prevGoogleDataRef = useRef<string>('');
   const prevDatesRef = useRef<string>('');
+  const isForcedRef = useRef<boolean>(false);
   const queryClient = useQueryClient();
 
   // Helper to generate cache key from dates
@@ -192,18 +191,15 @@ export const CalendarSyncProvider = ({
         googleEvents: [],
         dbLastUpdated: 0,
         googleLastUpdated: 0,
-        isForced: false,
       };
 
       return {
         ...prev,
         [cacheKey]: {
-          dbEvents: update.dbEvents || existing.dbEvents,
-          googleEvents: update.googleEvents || existing.googleEvents,
-          dbLastUpdated: update.dbLastUpdated || existing.dbLastUpdated,
-          googleLastUpdated:
-            update.googleLastUpdated || existing.googleLastUpdated,
-          isForced: update.isForced || existing.isForced,
+          dbEvents: update.dbEvents !== undefined ? update.dbEvents : existing.dbEvents,
+          googleEvents: update.googleEvents !== undefined ? update.googleEvents : existing.googleEvents,
+          dbLastUpdated: update.dbLastUpdated !== undefined ? update.dbLastUpdated : existing.dbLastUpdated,
+          googleLastUpdated: update.googleLastUpdated !== undefined ? update.googleLastUpdated : existing.googleLastUpdated,
         },
       };
     });
@@ -224,7 +220,7 @@ export const CalendarSyncProvider = ({
         cachedData?.dbEvents &&
         cachedData.dbEvents.length > 0 &&
         !isCacheStaleEnhanced(cachedData.dbLastUpdated, dates) &&
-        !cachedData.isForced
+        !isForcedRef.current
       ) {
         setData(cachedData.dbEvents);
         return cachedData.dbEvents;
@@ -251,9 +247,11 @@ export const CalendarSyncProvider = ({
       // Update cache with new data and reset isForced flag
       updateCache(cacheKey, {
         dbEvents: fetchedData,
-        dbLastUpdated: Date.now(),
-        isForced: false, // Reset isForced after successful fetch
+        dbLastUpdated: Date.now()
       });
+      
+      // Reset the ref immediately (synchronous)
+      isForcedRef.current = false;
 
       setData(fetchedData);
       return fetchedData;
@@ -592,11 +590,13 @@ export const CalendarSyncProvider = ({
     const isCurrentWeek = includesCurrentWeek(dates);
 
     if (cacheData) {
-      cacheData.isForced = true;
+      isForcedRef.current = true;
       // For current week, also reset the cache timestamp to force refresh
       if (isCurrentWeek) {
-        cacheData.dbLastUpdated = 0;
-        cacheData.googleLastUpdated = 0;
+        updateCache(cacheKey, {
+          dbLastUpdated: 0,
+          googleLastUpdated: 0,
+        });
       }
     }
 
@@ -694,7 +694,8 @@ export const CalendarSyncProvider = ({
           // If events were deleted, refresh to get updated data
           if (deletionPerformed) {
             queryClient.invalidateQueries({
-              queryKey: ['calendarEvents', wsId],
+              queryKey: ['databaseCalendarEvents', wsId],
+              exact: false,
             });
           }
         } catch (err) {
@@ -723,17 +724,12 @@ export const CalendarSyncProvider = ({
     const cacheKey = getCacheKey(dates);
     if (!cacheKey) return null;
 
-
-    // Use updateCache instead of direct mutation
-    updateCache(cacheKey, {
-      isForced: true,
-      dbLastUpdated: 0,
-    });
+    isForcedRef.current = true;
 
     queryClient.invalidateQueries({
       queryKey: ['databaseCalendarEvents', wsId, getCacheKey(dates)],
     });
-  }, [queryClient, wsId, calendarCache, dates, updateCache]);
+  }, [queryClient, wsId, dates]);
 
   const eventsWithoutAllDays = useMemo(() => {
     // Process events immediately when they change