From ccc7976b395a4b8f1f2f530ac3c4bba9e9290eab Mon Sep 17 00:00:00 2001
From: Dominik Hryshaiev <domhryshaiev@gmail.com>
Date: Fri, 25 Oct 2024 13:37:21 +0200
Subject: [PATCH 1/2] fix(occurrences): fetch on range change

---
 src/components/Providers.tsx                  |  2 +-
 src/components/calendar/CalendarCell.tsx      | 68 ++++++++++---------
 src/components/calendar/CalendarMonthGrid.tsx |  2 +-
 src/components/calendar/OccurrenceChip.tsx    | 13 +---
 src/components/common/Snackbars/Snackbars.tsx |  2 +-
 src/stores/occurrences.store.ts               |  9 ++-
 6 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/src/components/Providers.tsx b/src/components/Providers.tsx
index a9e8527..6bd6e0c 100644
--- a/src/components/Providers.tsx
+++ b/src/components/Providers.tsx
@@ -15,7 +15,7 @@ const LowerProviders = ({ children }: ProviderProps) => {
   return <NextUIProvider navigate={navigate}>{children}</NextUIProvider>;
 };
 
-const PotentialSupabaseProvider = ({ children }: { children: ReactNode }) => {
+const PotentialSupabaseProvider = ({ children }: ProviderProps) => {
   if (!Object.keys(supabaseClient).length) {
     return children;
   }
diff --git a/src/components/calendar/CalendarCell.tsx b/src/components/calendar/CalendarCell.tsx
index b994130..1fa0ed8 100644
--- a/src/components/calendar/CalendarCell.tsx
+++ b/src/components/calendar/CalendarCell.tsx
@@ -4,16 +4,16 @@ import { useOccurrencesStore } from '@stores';
 import { useUser } from '@supabase/auth-helpers-react';
 import clsx from 'clsx';
 import { format } from 'date-fns';
-import { motion } from 'framer-motion';
+import { AnimatePresence, motion } from 'framer-motion';
 import React from 'react';
 
 import OccurrenceChip from './OccurrenceChip';
 
 type CalendarCellProps = {
   dateNumber: number;
-  monthIndex: number;
+  monthNumber: number;
   fullYear: number;
-  onClick: (dateNumber: number, monthIndex: number, fullYear: number) => void;
+  onClick: (dateNumber: number, monthNumber: number, fullYear: number) => void;
   onNavigateBack?: () => void;
   onNavigateForward?: () => void;
   rangeStatus: 'below-range' | 'in-range' | 'above-range';
@@ -21,7 +21,7 @@ type CalendarCellProps = {
 
 const CalendarCell = ({
   dateNumber,
-  monthIndex,
+  monthNumber,
   fullYear,
   onNavigateBack,
   onNavigateForward,
@@ -35,11 +35,11 @@ const CalendarCell = ({
   const today = new Date();
   const isToday =
     today.getDate() === dateNumber &&
-    today.getMonth() + 1 === monthIndex &&
+    today.getMonth() + 1 === monthNumber &&
     today.getFullYear() === fullYear;
   const screenSize = useScreenSize();
   const date = format(
-    new Date(fullYear, monthIndex - 1, dateNumber),
+    new Date(fullYear, monthNumber - 1, dateNumber),
     'yyyy-MM-dd'
   );
   const occurrences = occurrencesByDate[date] || [];
@@ -47,7 +47,7 @@ const CalendarCell = ({
   const groupedOccurrences = Object.groupBy(occurrences, (o) => o.habitId);
 
   const handleClick = React.useCallback(() => {
-    if (fetchingOccurrences || !user?.id) {
+    if (fetchingOccurrences || !user) {
       return null;
     }
 
@@ -61,18 +61,18 @@ const CalendarCell = ({
       }
     }
 
-    return onClick(dateNumber, monthIndex, fullYear);
+    return onClick(dateNumber, monthNumber, fullYear);
   }, [
     isToday,
     dateNumber,
     fetchingOccurrences,
     fullYear,
-    monthIndex,
+    monthNumber,
     onClick,
     onNavigateBack,
     onNavigateForward,
     rangeStatus,
-    user?.id,
+    user,
   ]);
 
   React.useEffect(() => {
@@ -120,7 +120,9 @@ const CalendarCell = ({
   const cellRootClassName = clsx(
     'flex h-28 flex-1 flex-col border-r-3 border-neutral-500 last-of-type:border-r-0 hover:bg-neutral-200 dark:border-neutral-400 dark:hover:bg-neutral-800',
     rangeStatus === 'below-range' && 'cursor-w-resize',
-    rangeStatus === 'above-range' && 'cursor-e-resize'
+    rangeStatus === 'above-range' && 'cursor-e-resize',
+    isToday &&
+      'bg-neutral-200 hover:bg-neutral-300 dark:bg-neutral-800 dark:hover:bg-neutral-700'
   );
 
   const cellHeaderClassName = clsx(
@@ -132,10 +134,6 @@ const CalendarCell = ({
     <div
       className={cellRootClassName}
       ref={cellRef}
-      data-is-within-active-month={rangeStatus === 'in-range'}
-      data-is-within-prev-month={rangeStatus === 'below-range'}
-      data-is-within-next-month={rangeStatus === 'above-range'}
-      data-is-today={isToday}
       onClick={handleClick}
       tabIndex={0}
       role="button"
@@ -145,23 +143,29 @@ const CalendarCell = ({
         {renderToday()}
       </div>
       <div className="flex flex-wrap gap-1 overflow-auto px-2 py-0.5 pb-1">
-        {Object.entries(groupedOccurrences).map(
-          ([habitId, habitOccurrences]) => {
-            return (
-              <motion.div
-                key={habitId}
-                initial={{ opacity: 0 }}
-                animate={{ opacity: 1 }}
-                exit={{ opacity: 0 }}
-              >
-                <OccurrenceChip
-                  occurrences={habitOccurrences!}
-                  onDelete={handleOccurrenceDelete}
-                />
-              </motion.div>
-            );
-          }
-        )}
+        <AnimatePresence mode="sync">
+          {Object.entries(groupedOccurrences).map(
+            ([habitId, habitOccurrences]) => {
+              if (!habitOccurrences) {
+                return null;
+              }
+
+              return (
+                <motion.div
+                  key={habitId}
+                  initial={{ opacity: 0 }}
+                  animate={{ opacity: 1 }}
+                  exit={{ opacity: 0 }}
+                >
+                  <OccurrenceChip
+                    occurrences={habitOccurrences}
+                    onDelete={handleOccurrenceDelete}
+                  />
+                </motion.div>
+              );
+            }
+          )}
+        </AnimatePresence>
       </div>
     </div>
   );
diff --git a/src/components/calendar/CalendarMonthGrid.tsx b/src/components/calendar/CalendarMonthGrid.tsx
index 52b6d60..c860432 100644
--- a/src/components/calendar/CalendarMonthGrid.tsx
+++ b/src/components/calendar/CalendarMonthGrid.tsx
@@ -52,7 +52,7 @@ const Month = (
                 <CalendarCell
                   key={dayKey}
                   dateNumber={day}
-                  monthIndex={month}
+                  monthNumber={month}
                   fullYear={year}
                   onClick={onDayModalDialogOpen}
                   rangeStatus={rangeStatus}
diff --git a/src/components/calendar/OccurrenceChip.tsx b/src/components/calendar/OccurrenceChip.tsx
index b29b17f..2d3e5f3 100644
--- a/src/components/calendar/OccurrenceChip.tsx
+++ b/src/components/calendar/OccurrenceChip.tsx
@@ -1,8 +1,7 @@
 import { useScreenSize } from '@hooks';
 import type { Occurrence } from '@models';
-import { Spinner, Chip, Button, Tooltip, Badge } from '@nextui-org/react';
+import { Chip, Button, Tooltip, Badge } from '@nextui-org/react';
 import { X } from '@phosphor-icons/react';
-import { useOccurrencesStore } from '@stores';
 import { getHabitIconUrl } from '@utils';
 import React from 'react';
 
@@ -20,15 +19,12 @@ const OccurrenceChip = ({
   onDelete,
   colorOverride,
 }: OccurrenceChipProps) => {
-  const { occurrenceIdBeingDeleted } = useOccurrencesStore();
-  const [{ id, habit }] = occurrences;
+  const [{ habit }] = occurrences;
   const { name: habitName, iconPath, trait } = habit || {};
   const { color: traitColor } = trait || {};
   const screenSize = useScreenSize();
   const iconUrl = getHabitIconUrl(iconPath);
 
-  const isBeingDeleted = occurrenceIdBeingDeleted === id;
-
   const chipStyle = {
     backgroundColor: colorOverride || traitColor,
   };
@@ -42,10 +38,6 @@ const OccurrenceChip = ({
       return null;
     }
 
-    if (isBeingDeleted) {
-      return <Spinner size="sm" role="habit-chip-delete-loader" />;
-    }
-
     return (
       <Button
         isIconOnly
@@ -70,7 +62,6 @@ const OccurrenceChip = ({
         size="sm"
         role="habit-chip"
         startContent={startContent}
-        isDisabled={isBeingDeleted}
         endContent={getEndContent()}
       />
     );
diff --git a/src/components/common/Snackbars/Snackbars.tsx b/src/components/common/Snackbars/Snackbars.tsx
index 30acd98..9add0db 100644
--- a/src/components/common/Snackbars/Snackbars.tsx
+++ b/src/components/common/Snackbars/Snackbars.tsx
@@ -9,7 +9,7 @@ const Snackbars = () => {
 
   return (
     <div className="fixed bottom-2 left-2 z-[99] flex flex-col gap-2">
-      <AnimatePresence mode="wait">
+      <AnimatePresence mode="sync">
         {snackbars.map(({ id, message, options }) => {
           const {
             action,
diff --git a/src/stores/occurrences.store.ts b/src/stores/occurrences.store.ts
index 6e4640d..018bfc2 100644
--- a/src/stores/occurrences.store.ts
+++ b/src/stores/occurrences.store.ts
@@ -24,7 +24,6 @@ type OccurrencesState = {
   allOccurrences: Occurrence[];
   occurrences: Occurrence[];
   occurrencesByDate: OccurrencesDateMap;
-  occurrenceIdBeingDeleted: number;
   filteredBy: OccurrenceFilters;
   range: [number, number];
   fetchOccurrences: () => Promise<void>;
@@ -53,7 +52,6 @@ const useOccurrencesStore = create<OccurrencesState>((set, get) => {
     allOccurrences: [],
     occurrences: [],
     occurrencesByDate: {},
-    occurrenceIdBeingDeleted: 0,
     filteredBy: {
       habitIds: new Set(habits.map((habit) => habit.id.toString())),
       traitIds: new Set(traits.map((trait) => trait.id.toString())),
@@ -118,7 +116,6 @@ const useOccurrencesStore = create<OccurrencesState>((set, get) => {
     removeOccurrence: async (id: number) => {
       const { range } = get();
       try {
-        set({ occurrenceIdBeingDeleted: id });
         await destroyOccurrence(id);
         set((state) => ({
           allOccurrences: state.allOccurrences.filter(
@@ -139,8 +136,6 @@ const useOccurrencesStore = create<OccurrencesState>((set, get) => {
           }
         );
         console.error(error);
-      } finally {
-        set({ occurrenceIdBeingDeleted: 0 });
       }
     },
     removeOccurrencesByHabitId: (habitId: number) => {
@@ -213,6 +208,10 @@ useOccurrencesStore.subscribe((state, prevState) => {
   ) {
     state.updateOccurrences(state.allOccurrences, state.filteredBy);
   }
+
+  if (prevState.range !== state.range) {
+    void state.fetchOccurrences();
+  }
 });
 
 export default useOccurrencesStore;

From ae195b65cb27e5095a88140a2541d0955cb6d5b3 Mon Sep 17 00:00:00 2001
From: Dominik Hryshaiev <domhryshaiev@gmail.com>
Date: Fri, 25 Oct 2024 13:41:11 +0200
Subject: [PATCH 2/2] fix test

---
 .../calendar/OccurrenceChip.test.tsx          | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/components/calendar/OccurrenceChip.test.tsx b/src/components/calendar/OccurrenceChip.test.tsx
index 94b57fe..40b943b 100644
--- a/src/components/calendar/OccurrenceChip.test.tsx
+++ b/src/components/calendar/OccurrenceChip.test.tsx
@@ -1,5 +1,4 @@
 import { useScreenSize } from '@hooks';
-import { useOccurrencesStore } from '@stores';
 import { render, waitFor } from '@testing-library/react';
 import { makeTestOccurrence } from '@tests';
 import { getHabitIconUrl } from '@utils';
@@ -23,9 +22,6 @@ describe(OccurrenceChip.name, () => {
   };
 
   it('should render img with habit icon', async () => {
-    (useOccurrencesStore as unknown as jest.Mock).mockReturnValue({
-      occurrenceIdBeingDeleted: null,
-    });
     const { getByAltText } = render(<OccurrenceChip {...props} />);
     const img = getByAltText('Test Habit Name icon');
     expect(img).toBeInTheDocument();
@@ -38,30 +34,13 @@ describe(OccurrenceChip.name, () => {
   });
 
   it('should call onDelete when delete button is clicked', () => {
-    (useOccurrencesStore as unknown as jest.Mock).mockReturnValue({
-      occurrenceIdBeingDeleted: null,
-    });
     const { getByRole } = render(<OccurrenceChip {...props} />);
     const deleteButton = getByRole('habit-chip-delete-button');
     deleteButton.click();
     expect(mockOnDelete).toHaveBeenCalledWith(1, expect.anything());
   });
 
-  it('should render CircularProgress when occurrence is being deleted', () => {
-    (useOccurrencesStore as unknown as jest.Mock).mockReturnValue({
-      occurrenceIdBeingDeleted: 1,
-    });
-    const { getByRole, queryByRole } = render(<OccurrenceChip {...props} />);
-    const loader = getByRole('habit-chip-delete-loader');
-    const chipDelete = queryByRole('habit-chip-delete-button');
-    expect(loader).toBeInTheDocument();
-    expect(chipDelete).toBeNull();
-  });
-
   it('should not render delete button on small screens', () => {
-    (useOccurrencesStore as unknown as jest.Mock).mockReturnValue({
-      occurrenceIdBeingDeleted: null,
-    });
     (useScreenSize as jest.Mock).mockReturnValue(1024);
     const { queryByRole } = render(<OccurrenceChip {...props} />);
     const chipDelete = queryByRole('habit-chip-delete-button');