Set defaults in the schema

Author: samejr

apps/webapp/app/routes/resources.preferences.sidemenu.tsx

@@ -3,9 +3,15 @@ import { z } from "zod";
 import { updateSideMenuPreferences } from "~/services/dashboardPreferences.server";
 import { requireUser } from "~/services/session.server";
 
+// Transforms form data string "true"/"false" to boolean, or undefined if not present
+const booleanFromFormData = z
+  .enum(["true", "false"])
+  .transform((val) => val === "true")
+  .optional();
+
 const RequestSchema = z.object({
-  isCollapsed: z.boolean().optional(),
-  manageSectionCollapsed: z.boolean().optional(),
+  isCollapsed: booleanFromFormData,
+  manageSectionCollapsed: booleanFromFormData,
 });
 
 export async function action({ request }: ActionFunctionArgs) {
@@ -14,17 +20,7 @@ export async function action({ request }: ActionFunctionArgs) {
   const formData = await request.formData();
   const rawData = Object.fromEntries(formData);
 
-  // Parse booleans from form data strings
-  const data = {
-    isCollapsed:
-      rawData.isCollapsed !== undefined ? rawData.isCollapsed === "true" : undefined,
-    manageSectionCollapsed:
-      rawData.manageSectionCollapsed !== undefined
-        ? rawData.manageSectionCollapsed === "true"
-        : undefined,
-  };
-
-  const result = RequestSchema.safeParse(data);
+  const result = RequestSchema.safeParse(rawData);
   if (!result.success) {
     return json({ success: false, error: "Invalid request data" }, { status: 400 });
   }

apps/webapp/app/services/dashboardPreferences.server.ts

@@ -4,10 +4,12 @@ import { logger } from "./logger.server";
 import { type UserFromSession } from "./session.server";
 
 const SideMenuPreferences = z.object({
-  isCollapsed: z.boolean(),
-  manageSectionCollapsed: z.boolean(),
+  isCollapsed: z.boolean().default(false),
+  manageSectionCollapsed: z.boolean().default(false),
 });
 
+export const SideMenuPreferencesDefaults = SideMenuPreferences.parse({});
+
 export type SideMenuPreferences = z.infer<typeof SideMenuPreferences>;
 
 const DashboardPreferences = z.object({
@@ -121,10 +123,7 @@ export async function updateSideMenuPreferences({
     return;
   }
 
-  const currentSideMenu = user.dashboardPreferences.sideMenu ?? {
-    isCollapsed: false,
-    manageSectionCollapsed: false,
-  };
+  const currentSideMenu = user.dashboardPreferences.sideMenu ?? SideMenuPreferencesDefaults;
 
   const updatedSideMenu: SideMenuPreferences = {
     isCollapsed: isCollapsed ?? currentSideMenu.isCollapsed,