fix(runs): fix bug where setting the time to 0 did not work after eve…

…nts are loaded from the server again
benji6 · Jul 22, 2024 · 58bcc7f · 58bcc7f
1 parent 90eebd8
commit 58bcc7f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/client/src/components/pages/Run/EditRun.tsx b/client/src/components/pages/Run/EditRun.tsx
@@ -71,7 +71,8 @@ export default function EditRun() {
 
         const payload = { id } as UpdateRun;
         if (formMeters !== event.meters) payload.meters = formMeters;
-        if (formSeconds !== event.seconds) payload.seconds = formSeconds;
+        if (formSeconds !== event.seconds)
+          payload.seconds = formSeconds ?? null;
 
         dispatch(
           eventsSlice.actions.add({
@@ -95,7 +96,7 @@ export default function EditRun() {
         <Select
           {...FIELDS.runMinutes}
           defaultValue={
-            event.seconds === undefined
+            event.seconds == null
               ? undefined
               : Math.floor(event.seconds / TIME.secondsPerMinute)
           }
@@ -110,7 +111,7 @@ export default function EditRun() {
         <Select
           {...FIELDS.runSeconds}
           defaultValue={
-            event.seconds === undefined
+            event.seconds == null
               ? undefined
               : event.seconds % TIME.secondsPerMinute
           }

diff --git a/client/src/components/shared/RunCard.tsx b/client/src/components/shared/RunCard.tsx
@@ -22,7 +22,7 @@ export default function RunCard({ id }: Props) {
           </b>
         )}
         {event.meters !== undefined && event.seconds !== undefined && <br />}
-        {event.seconds !== undefined && (
+        {event.seconds != undefined && (
           <b data-test-id={TEST_IDS.runCardTime}>
             {formatSecondsAsTime(event.seconds)}
           </b>

diff --git a/client/src/store/eventsSlice.test.ts b/client/src/store/eventsSlice.test.ts
@@ -923,7 +923,7 @@ describe("eventsSlice", () => {
             payload: {
               id: "2024-07-22T08:00:00.000Z",
               meters: 1e3,
-              seconds: undefined,
+              seconds: null,
             },
           }),
         );
@@ -932,6 +932,7 @@ describe("eventsSlice", () => {
           byId: {
             "2024-07-22T08:00:00.000Z": {
               meters: 1e3,
+              seconds: null,
               updatedAt: "2024-07-22T09:00:00.000Z",
             },
           },

diff --git a/client/src/store/eventsSlice.ts b/client/src/store/eventsSlice.ts
@@ -169,11 +169,23 @@ const trackedCategoriesSelector = createSelector(
 
           // for reasons that are beyond my energy to investigate there is
           // a runtime error if you try to update the data object directly
-          all.byId[payload.id] = {
-            ...all.byId[payload.id],
-            ...rest,
-            updatedAt: event.createdAt,
-          };
+          const previousEventVersion = all.byId[payload.id];
+          if (previousEventVersion.type === "meditations")
+            all.byId[payload.id] = {
+              ...previousEventVersion,
+              // meditations have a `second` property which cannot be `null`
+              // but runs have a `seconds` property which can
+              // TypeScript doesn't know that `rest` cannot have `null` `seconds` and apply to a meditation simultaneously
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              ...(rest as any),
+              updatedAt: event.createdAt,
+            };
+          else
+            all.byId[payload.id] = {
+              ...previousEventVersion,
+              ...rest,
+              updatedAt: event.createdAt,
+            };
           normalizedCategory.byId[payload.id] = {
             ...normalizedCategory.byId[payload.id],
             ...rest,

diff --git a/client/src/types.ts b/client/src/types.ts
@@ -79,24 +79,24 @@ export type Run =
   | {
       location?: DeviceGeolocation;
       meters: number;
-      seconds?: number;
+      seconds?: number | null;
     }
   | {
       location?: DeviceGeolocation;
       meters?: number;
-      seconds: number;
+      seconds: number | null;
     };
 
 export type UpdateRun =
   | {
       id: string;
       meters: number;
-      seconds?: number;
+      seconds?: number | null;
     }
   | {
       id: string;
       meters?: number;
-      seconds: number;
+      seconds: number | null;
     };
 
 interface ValueAndLocationEvent {

diff --git a/scripts/cloudformation/lambdas/events_get.py b/scripts/cloudformation/lambdas/events_get.py
@@ -77,7 +77,7 @@ def handler(event, context):
                         k: float(v) if isinstance(v, Decimal) else v
                         for k, v in payload["location"].items()
                     }
-                if "seconds" in payload:
+                if isinstance(payload.get("seconds"), Decimal):
                     payload["seconds"] = int(payload["seconds"])
                 for k, v in payload.items():
                     if isinstance(v, Decimal):