From 9ef99bd1b17ac8af303ffad31987f2908fd32f34 Mon Sep 17 00:00:00 2001
From: chris <christoph.hohnerlein@digitalservice.bund.de>
Date: Fri, 17 Nov 2023 18:26:30 +0100
Subject: [PATCH] feat(validation): return submittedData to client

---
 app/routes/beratungshilfe.zustaendiges-gericht.suche.tsx | 2 +-
 app/routes/kitchensink._index.tsx                        | 2 +-
 app/routes/shared/step.tsx                               | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/routes/beratungshilfe.zustaendiges-gericht.suche.tsx b/app/routes/beratungshilfe.zustaendiges-gericht.suche.tsx
index 88f1fce25..a4d46ed52 100644
--- a/app/routes/beratungshilfe.zustaendiges-gericht.suche.tsx
+++ b/app/routes/beratungshilfe.zustaendiges-gericht.suche.tsx
@@ -46,7 +46,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
 
 export async function action({ request }: ActionFunctionArgs) {
   const result = await validatorServer.validate(await request.formData());
-  if (result.error) return validationError(result.error);
+  if (result.error) return validationError(result.error, result.submittedData);
   const { pathname } = new URL(request.url);
   const urlStem = pathname.substring(0, pathname.lastIndexOf("/"));
   return redirect(`${urlStem}/ergebnis/${result.data?.postcode}`);
diff --git a/app/routes/kitchensink._index.tsx b/app/routes/kitchensink._index.tsx
index dc017b28f..83ef5d030 100644
--- a/app/routes/kitchensink._index.tsx
+++ b/app/routes/kitchensink._index.tsx
@@ -37,7 +37,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
 export const action = async ({ request }: DataFunctionArgs) => {
   const data = await validator.validate(await request.formData());
-  if (data.error) return validationError(data.error);
+  if (data.error) return validationError(data.error, data.submittedData);
   return json(data.data);
 };
 
diff --git a/app/routes/shared/step.tsx b/app/routes/shared/step.tsx
index 316653bff..de992a67d 100644
--- a/app/routes/shared/step.tsx
+++ b/app/routes/shared/step.tsx
@@ -159,7 +159,11 @@ export const action = async ({ params, request }: ActionFunctionArgs) => {
     Object.keys(relevantFormData),
   );
   const validationResult = await validator.validate(relevantFormData);
-  if (validationResult.error) return validationError(validationResult.error);
+  if (validationResult.error)
+    return validationError(
+      validationResult.error,
+      validationResult.submittedData,
+    );
 
   updateSession(flowSession, validationResult.data);