feat(forderung): add templated subheading

Co-Authored-By: Frederike Ramin <[email protected]> Co-Authored-By: SannyNguyenHung <[email protected]>
digitalservicebund · Oct 16, 2023 · 574dae4 · 574dae4
1 parent 9847abc
commit 574dae4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/app/routes/geld-einklagen.formular.$.tsx b/app/routes/geld-einklagen.formular.$.tsx
@@ -13,6 +13,7 @@ import {
 import { buildStepValidator } from "~/models/flows/common";
 import { CSRFKey } from "~/services/security/csrfKey";
 import Heading from "~/components/Heading";
+import { fillTemplate } from "~/util/fillTemplate";
 export { action, loader } from "~/routes/shared/step";
 
 export default function Step() {
@@ -21,6 +22,7 @@ export default function Step() {
     defaultValues,
     commonContent,
     heading,
+    preHeading,
     content,
     formContent,
     isLast,
@@ -43,6 +45,14 @@ export default function Step() {
         <Container paddingTop="24">
           <div className="ds-stack-16">
             <div className="ds-stack-40">
+              {preHeading && (
+                <p>
+                  {fillTemplate({
+                    template: preHeading,
+                    replacements: templateReplacements,
+                  })}
+                </p>
+              )}
               <Heading text={heading} look="ds-heading-02-reg" />
               <PageContent
                 content={content}

diff --git a/app/routes/shared/step.tsx b/app/routes/shared/step.tsx
@@ -56,9 +56,20 @@ export const loader = async ({
     getVerfuegbaresEinkommenFreibetrag(data);
   const gerichtskostenvorschuss = getGerichtskostenvorschuss(data);
 
+  const forderungReplacements =
+    "forderung" in data
+      ? {
+          forderung1Betrag: data.forderung.forderung1.betrag,
+          forderung1Title: data.forderung.forderung1.title,
+          forderung2Betrag: data.forderung.forderung2.betrag,
+          forderung2Title: data.forderung.forderung2.title,
+        }
+      : {};
+
   const templateReplacements = {
     verfuegbaresEinkommenFreibetrag: verfuegbaresEinkommenFreibetrag.toString(),
     gerichtskostenvorschuss: gerichtskostenvorschuss.toString(),
+    ...forderungReplacements,
   };
 
   const [commonContent, formPageContent, parentMeta] = await Promise.all([
@@ -107,6 +118,10 @@ export const loader = async ({
       commonContent,
       heading:
         "heading" in formPageContent ? formPageContent.heading : undefined,
+      preHeading:
+        "preHeading" in formPageContent
+          ? formPageContent.preHeading
+          : undefined,
       content: formPageContent.pre_form,
       formContent: formPageContent.form,
       meta,

diff --git a/app/services/cms/models/StrapiFormFlowPage.ts b/app/services/cms/models/StrapiFormFlowPage.ts
@@ -10,6 +10,7 @@ import { HasStrapiTimestampsSchema } from "./HasStrapiTimestamps";
 export const StrapiFormFlowPageSchema = z
   .object({
     heading: z.string(),
+    preHeading: z.string().nullable(),
     // eslint-disable-next-line camelcase
     pre_form: z.array(StrapiContentSchema),
     form: z.array(StrapiFormComponentSchema),