fix(gluwave): Entry input datetime is in past when using previously o…

…pened tab #185
Kalhama · Oct 10, 2024 · 44f1f8c · 44f1f8c
1 parent efe2ed5
commit 44f1f8c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/gluwave/src/components/carbohydrate-dialog.tsx b/gluwave/src/components/carbohydrate-dialog.tsx
@@ -56,14 +56,15 @@ export function CarbohydrateDialog({
   carb,
   children,
 }: PropsWithChildren<Props>) {
+  const defaultValues = {
+    carbs: carb?.carbs ?? 0,
+    timestamp: carb?.timestamp ?? new Date(),
+    decay: carb?.decay ?? 60,
+    id: carb?.id,
+  }
   const form = useForm<z.infer<typeof ZPostCarbohydrateSchema>>({
     resolver: zodResolver(ZPostCarbohydrateSchema),
-    defaultValues: {
-      carbs: carb?.carbs ?? 0,
-      timestamp: carb?.timestamp ?? new Date(),
-      decay: carb?.decay ?? 60,
-      id: carb?.id,
-    },
+    defaultValues,
   })
   const editing = !!carb?.id
 
@@ -91,7 +92,10 @@ export function CarbohydrateDialog({
       open={open}
       onOpenChange={(s) => {
         if (!editing) {
-          form.reset()
+          form.reset({
+            ...defaultValues,
+            timestamp: carb?.timestamp ?? new Date(),
+          })
         }
         setOpenChange(s)
       }}

diff --git a/gluwave/src/components/glucose-dialog.tsx b/gluwave/src/components/glucose-dialog.tsx
@@ -44,13 +44,14 @@ interface Props {
 }
 
 export function GlucoseDialog({ glucose, children }: PropsWithChildren<Props>) {
+  const defaultValues = {
+    value: glucose?.glucose ?? 7,
+    timestamp: glucose?.timestamp ?? new Date(),
+    id: glucose?.id,
+  }
   const form = useForm<z.infer<typeof ZPostGlucoseSchema>>({
     resolver: zodResolver(ZPostGlucoseSchema),
-    defaultValues: {
-      value: glucose?.glucose ?? 7,
-      timestamp: glucose?.timestamp ?? new Date(),
-      id: glucose?.id,
-    },
+    defaultValues,
   })
   const editing = !!glucose?.id
   const post = trpc.glucose.post.useMutation()
@@ -73,7 +74,10 @@ export function GlucoseDialog({ glucose, children }: PropsWithChildren<Props>) {
     <Drawer
       open={open}
       onOpenChange={(s) => {
-        form.reset()
+        form.reset({
+          ...defaultValues,
+          timestamp: glucose?.timestamp ?? new Date(),
+        })
         setOpenChange(s)
       }}
     >

diff --git a/gluwave/src/components/insulin-dialog.tsx b/gluwave/src/components/insulin-dialog.tsx
@@ -44,13 +44,14 @@ interface Props {
 }
 
 export function InsulinDialog({ insulin, children }: PropsWithChildren<Props>) {
+  const defaultValues = {
+    amount: insulin?.amount ?? 0,
+    timestamp: insulin?.timestamp ?? new Date(),
+    id: insulin?.id,
+  }
   const form = useForm<z.infer<typeof ZPostInsulinSchema>>({
     resolver: zodResolver(ZPostInsulinSchema),
-    defaultValues: {
-      amount: insulin?.amount ?? 0,
-      timestamp: insulin?.timestamp ?? new Date(),
-      id: insulin?.id,
-    },
+    defaultValues,
   })
   const editing = !!insulin?.id
 
@@ -76,7 +77,10 @@ export function InsulinDialog({ insulin, children }: PropsWithChildren<Props>) {
     <Drawer
       open={open}
       onOpenChange={(s) => {
-        form.reset()
+        form.reset({
+          ...defaultValues,
+          timestamp: insulin?.timestamp ?? new Date(),
+        })
         setOpenChange(s)
       }}
     >