set seconds to zero when validatng

Author: devksingh4

src/common/types/roomRequest.ts

@@ -156,6 +156,10 @@ export const roomRequestDataSchema = roomRequestBaseSchema.extend({
   eventStart: z.coerce.date({
     required_error: "Event start date and time is required",
     invalid_type_error: "Event start must be a valid date and time",
+  }).transform((date) => {
+    const d = new Date(date);
+    d.setSeconds(0, 0);
+    return d;
   }),
   eventEnd: z.coerce.date({
     required_error: "Event end date and time is required",
@@ -164,6 +168,10 @@ export const roomRequestDataSchema = roomRequestBaseSchema.extend({
   theme: z.enum(eventThemeOptions, {
     required_error: "Event theme must be provided",
     invalid_type_error: "Event theme must be provided",
+  }).transform((date) => {
+    const d = new Date(date);
+    d.setSeconds(0, 0);
+    return d;
   }),
   description: z
     .string()
@@ -199,7 +207,7 @@ export const roomRequestDataSchema = roomRequestBaseSchema.extend({
 export const roomRequestSchema = roomRequestDataSchema
   .refine(
     (data) => {
-      return data.eventEnd.getTime() > data.eventStart.getTime();
+      return data.eventEnd > data.eventStart;
     },
     {
       message: "End date/time must be after start date/time",

src/ui/package.json

@@ -43,7 +43,8 @@
     "react-qr-reader": "^3.0.0-beta-1",
     "react-router-dom": "^7.5.2",
     "zod": "^3.24.3",
-    "zod-openapi": "^4.2.4"
+    "zod-openapi": "^4.2.4",
+    "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.8",

src/ui/pages/roomRequest/NewRoomRequest.tsx

@@ -30,6 +30,8 @@ import {
 } from "@common/types/roomRequest";
 import { useNavigate } from "react-router-dom";
 import { notifications } from "@mantine/notifications";
+import { fromError } from "zod-validation-error";
+import { ZodError } from "zod";
 
 // Component for yes/no questions with conditional content
 interface ConditionalFieldProps {
@@ -208,7 +210,6 @@ const NewRoomRequest: React.FC<NewRoomRequestProps> = ({
       // Get all validation errors from zod, which returns ReactNode
       const allErrors: Record<string, React.ReactNode> =
         zodResolver(roomRequestSchema)(values);
-
       // If in view mode, return no errors
       if (viewOnly) {
         return {};
@@ -310,7 +311,7 @@ const NewRoomRequest: React.FC<NewRoomRequestProps> = ({
   }, [form.values.isRecurring]);
 
   const handleSubmit = async () => {
-    if (viewOnly) {
+    if (viewOnly || isSubmitting) {
       return;
     }
     const apiFormValues = { ...form.values };
@@ -331,19 +332,24 @@ const NewRoomRequest: React.FC<NewRoomRequestProps> = ({
       try {
         values = await roomRequestSchema.parseAsync(apiFormValues);
       } catch (e) {
+        let message = "Check the browser console for more details.";
+        if (e instanceof ZodError) {
+          message = fromError(e).toString();
+        }
         notifications.show({
           title: "Submission failed to validate",
-          message: "Check the browser console for more details.",
+          message,
+          color: "red",
         });
-        throw e;
+        setIsSubmitting(false);
+        return;
       }
       const response = await createRoomRequest(values);
+      await navigate("/roomRequests");
       notifications.show({
         title: "Room Request Submitted",
         message: `The request ID is ${response.id}.`,
       });
-      setIsSubmitting(false);
-      navigate("/roomRequests");
     } catch (e) {
       notifications.show({
         color: "red",