feat: required stepId

digitalservicebund · Jan 10, 2025 · c810cc6 · c810cc6
1 parent 9546f3d
commit c810cc6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/app/services/cms/models/StrapiFormFlowPage.ts b/app/services/cms/models/StrapiFormFlowPage.ts
@@ -8,7 +8,7 @@ import { StrapiFormComponentSchema } from "./StrapiFormComponent";
 export const StrapiFormFlowPageSchema = z
   .object({
     heading: z.string(),
-    stepId: z.string().nullable(),
+    stepId: z.string(),
     flow_ids: z.array(StrapiFlowIdSchema),
     preHeading: z.string().nullable(),
     nextButtonLabel: z.string().nullable(),

diff --git a/app/services/cms/models/StrapiResultPage.ts b/app/services/cms/models/StrapiResultPage.ts
@@ -12,7 +12,7 @@ import { StrapiResultPageTypeSchema } from "./StrapiResultPageType";
 
 export const StrapiResultPageSchema = z
   .object({
-    stepId: z.string().nullable(),
+    stepId: z.string(),
     flow_ids: z.array(StrapiFlowIdSchema),
     pageType: StrapiResultPageTypeSchema,
     heading: StrapiHeadingSchema,

diff --git a/app/services/cms/models/StrapiVorabCheckPage.ts b/app/services/cms/models/StrapiVorabCheckPage.ts
@@ -7,7 +7,7 @@ import { StrapiFormComponentSchema } from "./StrapiFormComponent";
 
 export const StrapiVorabCheckPageSchema = z
   .object({
-    stepId: z.string().nullable(),
+    stepId: z.string(),
     flow_ids: z.array(StrapiFlowIdSchema),
     pre_form: z.array(StrapiContentComponentSchema),
     form: z.array(StrapiFormComponentSchema),

diff --git a/app/services/flowNavigation.server.ts b/app/services/flowNavigation.server.ts
@@ -29,7 +29,7 @@ export function navItemsFromStepStates(
 
     return {
       destination: stepState.url,
-      label: translations[stepState.stepId ?? ""] ?? stepState.stepId,
+      label: translations[stepState.stepId] ?? stepState.stepId,
       subflows: subNavItems,
       state: navState({ isCurrent, isDone, isReachable }),
     };

diff --git a/tests/factories/cmsModels/strapiFlowPage.ts b/tests/factories/cmsModels/strapiFlowPage.ts
@@ -3,15 +3,16 @@ import { type StrapiFormComponent } from "~/services/cms/models/StrapiFormCompon
 import { type StrapiFormFlowPage } from "~/services/cms/models/StrapiFormFlowPage";
 
 export function getStrapiFlowPage(
-  params: Partial<Pick<StrapiFormFlowPage, "stepId" | "form" | "locale">>,
+  params: Pick<StrapiFormFlowPage, "stepId" | "form"> &
+    Partial<Pick<StrapiFormFlowPage, "locale">>,
 ): StrapiFormFlowPage {
   return {
     heading: faker.lorem.words(5),
     preHeading: faker.lorem.words(5),
     nextButtonLabel: null,
     backButtonLabel: null,
-    form: params.form ?? [],
-    stepId: params.stepId ?? faker.lorem.word(),
+    form: params.form,
+    stepId: params.stepId,
     flow_ids: [{ flowId: "/beratungshilfe/antrag" }],
     pre_form: [],
     post_form: [],