chore(formData): refactor filterFormData + tests

app/routes/shared/formular.server.ts

@@ -40,6 +40,7 @@ import { updateMainSession } from "~/services/session.server/updateSessionInHead
 import { validateFormData } from "~/services/validation/validateFormData.server";
 import { getButtonNavigationProps } from "~/util/buttonProps";
 import { interpolateDeep } from "~/util/fillTemplate";
+import { filterFormData } from "~/util/filterFormData";
 
 const structureCmsContent = (
   formPageContent: z.infer<CollectionSchemas["form-flow-pages"]>,
@@ -214,11 +215,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
   const cookieHeader = request.headers.get("Cookie");
   const flowSession = await getSession(cookieHeader);
   const formData = await request.formData();
-
-  // Note: This also reduces same-named fields to the last entry
-  const relevantFormData = Object.fromEntries(
-    Array.from(formData.entries()).filter(([key]) => !key.startsWith("_")),
-  );
+  const relevantFormData = filterFormData(formData);
 
   if (formData.get("_action") === "delete") {
     try {

app/routes/shared/vorabcheck.server.ts

@@ -27,6 +27,7 @@ import { updateMainSession } from "~/services/session.server/updateSessionInHead
 import { validateFormData } from "~/services/validation/validateFormData.server";
 import { getButtonNavigationProps } from "~/util/buttonProps";
 import { interpolateDeep } from "~/util/fillTemplate";
+import { filterFormData } from "~/util/filterFormData";
 
 export const loader = async ({
   params,
@@ -135,11 +136,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
   const flowSession = await sessionManager.getSession(cookieHeader);
   const formData = await request.formData();
 
-  // Note: This also reduces same-named fields to the last entry
-  const relevantFormData = Object.fromEntries(
-    Array.from(formData.entries()).filter(([key]) => !key.startsWith("_")),
-  );
-
+  const relevantFormData = filterFormData(formData);
   const validationResult = await validateFormData(flowId, relevantFormData);
   if (validationResult.error)
     return validationError(

app/util/__test__/filterFormData.test.ts

@@ -0,0 +1,24 @@
+import { filterFormData } from "../filterFormData";
+
+describe("filterFormData", () => {
+  it("creates a object with data", () => {
+    const formData = new FormData();
+    formData.append("a", "1");
+    formData.append("b", "2");
+    expect(filterFormData(formData)).toEqual({ a: "1", b: "2" });
+  });
+
+  it("filters out entries starting with underscore", () => {
+    const formData = new FormData();
+    formData.append("a", "1");
+    formData.append("_b", "2");
+    expect(filterFormData(formData)).toEqual({ a: "1" });
+  });
+
+  it("filters out repeated entries", () => {
+    const formData = new FormData();
+    formData.append("a", "1");
+    formData.append("a", "2");
+    expect(filterFormData(formData)).toEqual({ a: "2" });
+  });
+});

app/util/filterFormData.ts

@@ -0,0 +1,5 @@
+export const filterFormData = (formData: FormData) =>
+  // Note: fromEntries() reduces same-named form fields to the last one
+  Object.fromEntries(
+    Array.from(formData.entries()).filter(([key]) => !key.startsWith("_")),
+  );