Merge branch 'main' into add-new-flow-for-annulierung-klage

app/components/BoxWithImage.tsx

@@ -29,7 +29,7 @@ const BoxWithImage = ({
   content,
 }: BoxWithImageProps) => {
   const shouldWrapByDefault = variant === "XL" || variant === "XXL";
-  const hasTextContent = Boolean(heading || content);
+  const hasTextContent = Boolean(heading ?? content);
   return (
     <div
       id={identifier}

app/components/LinkListBox.tsx

@@ -9,7 +9,7 @@ export type LinkListBoxProps = {
   identifier?: string;
   label?: HeadingProps;
   heading?: HeadingProps;
-  links?: { text?: string; url?: string }[];
+  links?: Array<{ text?: string; url?: string }>;
   buttons?: ButtonProps[];
 };
 

app/components/PageContent.tsx

@@ -93,7 +93,7 @@ function cmsToReact(strapiContent: StrapiContentComponent) {
 }
 
 type PageContentProps = {
-  readonly content: Array<StrapiContentComponent>;
+  readonly content: StrapiContentComponent[];
   readonly fullScreen?: boolean;
   readonly className?: string;
 };

app/components/__test__/MigrationDataOverview.test.tsx

@@ -30,7 +30,7 @@ describe("MigrationDataOverview", () => {
     );
 
     expect(container).not.toBeEmptyDOMElement();
-    expect(getByText(translations["bereich"])).toBeInTheDocument();
+    expect(getByText(translations.bereich)).toBeInTheDocument();
     expect(getByText(translations["bereich.verspaetet"])).toBeInTheDocument();
   });
 
@@ -52,7 +52,7 @@ describe("MigrationDataOverview", () => {
     );
 
     expect(container).not.toBeEmptyDOMElement();
-    expect(getByText(translations["startAirport"])).toBeInTheDocument();
+    expect(getByText(translations.startAirport)).toBeInTheDocument();
     expect(getByText(translations["startAirport.value"])).toBeInTheDocument();
   });
 
@@ -77,19 +77,15 @@ describe("MigrationDataOverview", () => {
     );
 
     expect(container).not.toBeEmptyDOMElement();
+    expect(getByText(translations.zustaendigesAmtsgericht)).toBeInTheDocument();
     expect(
-      getByText(translations["zustaendigesAmtsgericht"]),
+      getByText(migrationUserData.zustaendigesAmtsgericht.bezeichnung),
     ).toBeInTheDocument();
     expect(
-      getByText(migrationUserData["zustaendigesAmtsgericht"].bezeichnung),
+      getByText(migrationUserData.zustaendigesAmtsgericht.strasseMitHausnummer),
     ).toBeInTheDocument();
     expect(
-      getByText(
-        migrationUserData["zustaendigesAmtsgericht"].strasseMitHausnummer,
-      ),
-    ).toBeInTheDocument();
-    expect(
-      getByText(migrationUserData["zustaendigesAmtsgericht"].plzUndStadt),
+      getByText(migrationUserData.zustaendigesAmtsgericht.plzUndStadt),
     ).toBeInTheDocument();
   });
 
@@ -118,15 +114,15 @@ describe("MigrationDataOverview", () => {
     );
 
     expect(queryAllByTestId("migration-field-value")[0].textContent).toEqual(
-      translations["startAirport"],
+      translations.startAirport,
     );
 
     expect(queryAllByTestId("migration-field-value")[1].textContent).toEqual(
-      translations["endAirport"],
+      translations.endAirport,
     );
 
     expect(queryAllByTestId("migration-field-value")[2].textContent).toEqual(
-      translations["bereich"],
+      translations.bereich,
     );
   });
 
@@ -155,15 +151,15 @@ describe("MigrationDataOverview", () => {
     );
 
     expect(queryAllByTestId("migration-field-value")[0].textContent).toEqual(
-      translations["bereich"],
+      translations.bereich,
     );
 
     expect(queryAllByTestId("migration-field-value")[1].textContent).toEqual(
-      translations["startAirport"],
+      translations.startAirport,
     );
 
     expect(queryAllByTestId("migration-field-value")[2].textContent).toEqual(
-      translations["endAirport"],
+      translations.endAirport,
     );
   });
 

app/components/form/ButtonNavigation.tsx

@@ -6,10 +6,10 @@ type NavigationButton = {
   label: string;
 };
 
-export interface ButtonNavigationProps {
+export type ButtonNavigationProps = {
   readonly back?: NavigationButton;
   readonly next?: NavigationButton;
-}
+};
 
 export function ButtonNavigation({ back, next }: ButtonNavigationProps) {
   return (

app/components/form/ProgressBar.tsx

@@ -1,9 +1,9 @@
-interface ProgressBarProps {
+type ProgressBarProps = {
   readonly progress?: number;
   readonly max?: number;
   readonly fallback?: string;
   readonly label?: string;
-}
+};
 
 export function ProgressBar({
   progress,

app/components/form/__test__/ValidatedFlowForm.test.tsx

@@ -402,7 +402,9 @@ describe("ValidatedFlowForm", () => {
   });
 });
 
-function renderValidatedFlowForm(formElements: Partial<StrapiFormComponent>[]) {
+function renderValidatedFlowForm(
+  formElements: Array<Partial<StrapiFormComponent>>,
+) {
   const router = createMemoryRouter([
     {
       path: "/",

app/components/inputs/HiddenInput.tsx

@@ -1,9 +1,9 @@
 import { useField } from "remix-validated-form";
 
-interface Props {
+type Props = {
   name: string;
   formId?: string;
-}
+};
 
 const HiddenInput = ({ formId, name }: Props) => {
   const { getInputProps } = useField(name, { formId });

app/components/inputs/RadioGroup.tsx

@@ -6,10 +6,10 @@ import Radio from "./Radio";
 
 type RadioGroupProps = Readonly<{
   name: string;
-  options: {
+  options: Array<{
     value: string;
     text?: ReactNode;
-  }[];
+  }>;
   label?: ReactNode;
   altLabel?: string;
   errorMessages?: ErrorMessageProps[];

app/components/inputs/Select.tsx

@@ -8,7 +8,7 @@ import { widthClassname } from "./width";
 
 export type SelectProps = {
   name: string;
-  options: { value: string; text: string }[];
+  options: Array<{ value: string; text: string }>;
   label?: ReactNode;
   altLabel?: string;
   placeholder?: string;

app/components/userFeedback/FeedbackFormBox.tsx

@@ -35,11 +35,11 @@ export const feedbackValidator = withZod(
   }),
 );
 
-export interface FeedbackBoxProps {
+export type FeedbackBoxProps = {
   readonly destination: string;
   readonly shouldFocus: boolean;
   readonly onSubmit: () => void;
-}
+};
 
 export const FeedbackFormBox = ({
   destination,

app/components/userFeedback/PostSubmissionBox.tsx

@@ -3,9 +3,9 @@ import { useFeedbackTranslations } from "./feedbackTranslations";
 import Heading from "../Heading";
 import RichText from "../RichText";
 
-interface Props {
+type Props = {
   readonly shouldFocus: boolean;
-}
+};
 
 export const PostSubmissionBox = ({ shouldFocus }: Props) => {
   const feedbackTranslations = useFeedbackTranslations();

app/components/userFeedback/RatingBox.tsx

@@ -9,11 +9,11 @@ import Heading from "../Heading";
 
 export const userRatingFieldname = "wasHelpful";
 
-export interface RatingBoxProps {
+export type RatingBoxProps = {
   readonly heading: string;
   readonly url: string;
   readonly onSubmit: () => void;
-}
+};
 
 export const RatingBox = ({ heading, url, onSubmit }: RatingBoxProps) => {
   const ratingFetcher = useFetcher();

app/domains/__test__/TestCases.ts

@@ -13,4 +13,4 @@ export type TestCases<
     | FluggastrechtVorabcheckContext
     | FluggastrechtContext
     | ProzesskostenhilfeFormularContext,
-> = Readonly<Array<Readonly<[T, Readonly<Array<string>>]>>>;
+> = Readonly<Array<Readonly<[T, readonly string[]]>>>;

app/domains/__test__/flows.test.ts

@@ -47,7 +47,7 @@ function getEnabledSteps({
   machine: FlowStateMachine;
   context: Context;
   transitionType: "SUBMIT" | "BACK";
-  steps: Readonly<Array<string>>;
+  steps: readonly string[];
 }) {
   const initialStep = steps[0];
   const reachableSteps = steps.slice(0, -1).map((step) => {

app/domains/beratungshilfe/formular/persoenlicheDaten/context.ts

@@ -6,7 +6,7 @@ import {
 } from "~/domains/shared/formular/persoenlicheDaten/context";
 
 export const beratungshilfePersoenlicheDaten = {
-  ...omit(persoenlicheDaten, ["anrede", "title"]),
+  ...omit(persoenlicheDaten, ["title"]),
   geburtsdatum,
 };
 

app/domains/beratungshilfe/vorabcheck/isIncomeTooHigh.ts

@@ -10,7 +10,9 @@ export const isIncomeTooHigh: GenericGuard<BeratungshilfeVorabcheckContext> = ({
   const miete = moneyToCents(context.miete) ?? 0;
   const zahlungen = moneyToCents(context.weitereZahlungenSumme) ?? 0;
   const unterhalt =
-    (context.unterhalt == "yes" && moneyToCents(context.unterhaltSumme)) || 0;
+    context.unterhalt == "yes"
+      ? (moneyToCents(context.unterhaltSumme) ?? 0)
+      : 0;
 
   const calculatedFreibetrag = calculateFreibetrag({
     working: context.erwerbstaetigkeit === "yes",

app/domains/fluggastrechte/formular/persoenlicheDaten/__test__/testcases.ts

@@ -13,7 +13,7 @@ const machine: FlowStateMachine = createMachine(
 const cases = [
   [
     {
-      anrede: "mr",
+      anrede: "herr",
       vorname: "test",
       nachname: "test",
       strasseHausnummer: "test",
@@ -31,7 +31,7 @@ const cases = [
   ],
   [
     {
-      anrede: "mr",
+      anrede: "herr",
       vorname: "test",
       nachname: "test",
       strasseHausnummer: "test",
@@ -49,7 +49,7 @@ const cases = [
   ],
   [
     {
-      anrede: "mr",
+      anrede: "herr",
       vorname: "test",
       nachname: "test",
       strasseHausnummer: "test",
@@ -58,7 +58,7 @@ const cases = [
       isWeiterePersonen: "yes",
       weiterePersonen: [
         {
-          anrede: "mr",
+          anrede: "herr",
           vorname: "test",
           nachname: "test",
           strasseHausnummer: "test",
@@ -78,7 +78,7 @@ const cases = [
   ],
   [
     {
-      anrede: "mr",
+      anrede: "herr",
       vorname: "test",
       nachname: "test",
       strasseHausnummer: "test",
@@ -87,7 +87,7 @@ const cases = [
       isWeiterePersonen: "yes",
       weiterePersonen: [
         {
-          anrede: "mr",
+          anrede: "herr",
           vorname: "test",
           nachname: "test",
           strasseHausnummer: "test",

app/domains/fluggastrechte/formular/persoenlicheDaten/context.ts

@@ -7,20 +7,27 @@ import { optionalOrSchema } from "~/services/validation/optionalOrSchema";
 import { stringOptionalSchema } from "~/services/validation/stringOptional";
 import { YesNoAnswer } from "~/services/validation/YesNoAnswer";
 
+const anredeSchema = z.enum(["herr", "frau", "none"]);
+
+export const persoenlicheDatenSchema = {
+  anrede: anredeSchema,
+  ...persoenlicheDaten,
+};
+
 export const paymentDetailsSchema = {
   iban: optionalOrSchema(ibanSchema),
   kontoinhaber: stringOptionalSchema,
 };
 
 export const fluggastrechtePersoenlichDaten = {
-  ...persoenlicheDaten,
+  ...persoenlicheDatenSchema,
   isWeiterePersonen: YesNoAnswer,
   hasZeugen: YesNoAnswer,
   ...paymentDetailsSchema,
   weiterePersonen: z.array(
     z
       .object({
-        ...persoenlicheDaten,
+        ...persoenlicheDatenSchema,
         buchungsnummer: optionalOrSchema(bookingNumberFlightSchema),
       })
       .partial(),

app/domains/fluggastrechte/services/pdf/__test__/userDataMock.ts

@@ -21,7 +21,7 @@ export const userDataMock = {
   ersatzFlugAnkunftsZeit: "10:10",
   zusaetzlicheAngaben:
     "Lorem Ipsum is simply dummy text of the printing and typesetting industry.",
-  anrede: "Fr.",
+  anrede: "herr",
   title: "",
   vorname: "Test-Test",
   nachname: "Test",

app/domains/fluggastrechte/services/pdf/sections/__test__/getFullPlaintiffName.test.ts

@@ -20,8 +20,14 @@ describe("getFullPlaintiffName", () => {
   });
 
   it("should return the full plaintiff name given the anrede, vorname and nachname", () => {
-    const actual = getFullPlaintiffName("Herr", undefined, "Test", "Test");
+    const actual = getFullPlaintiffName("herr", undefined, "Test", "Test");
 
     expect(actual).toEqual("Herr Test Test");
   });
+
+  it("should return the full plaintiff name without anrede if anrede is none, vorname and nachname", () => {
+    const actual = getFullPlaintiffName("none", undefined, "Test", "Test");
+
+    expect(actual).toEqual("Test Test");
+  });
 });

app/domains/fluggastrechte/services/pdf/sections/firstPage/claimData/__test__/addPlaintiffDetails.test.ts

@@ -21,7 +21,7 @@ describe("addPlaintiffDetails", () => {
 
     expect(mockDoc.fontSize).toHaveBeenCalledWith(10);
     expect(mockDoc.font).toHaveBeenCalledWith(FONTS_BUNDESSANS_BOLD);
-    expect(mockDoc.text).toHaveBeenCalledWith("Fr. Test-test Test", {
+    expect(mockDoc.text).toHaveBeenCalledWith("Herr Test-test Test", {
       continued: true,
     });
     expect(mockDoc.font).toHaveBeenCalledWith(FONTS_BUNDESSANS_REGULAR);

app/domains/fluggastrechte/services/pdf/sections/getFullPlaintiffName.ts

@@ -7,9 +7,10 @@ export const getFullPlaintiffName = (
   nachname?: string,
 ) => {
   const mappedTitle = title === "dr" ? "Dr." : title;
+  const salutation = anrede !== "none" ? capitalize(anrede) : "";
   const capitalizedVorname = capitalize(vorname);
 
-  return [anrede, mappedTitle, capitalizedVorname, nachname]
+  return [salutation, mappedTitle, capitalizedVorname, nachname]
     .filter(Boolean)
     .join(" ");
 };

app/domains/fluggastrechte/services/pdf/sections/reason/legalAssessment/__test__/createLegalAssessment.test.ts

@@ -59,7 +59,7 @@ describe("createLegalAssessment", () => {
     const mockDoc = mockPdfKitDocument(mockStruct);
     createLegalAssessment(mockDoc, mockStruct, userDataMock);
 
-    expect(mockDoc.text).toHaveBeenCalledWith("Fr. Test-test Test");
+    expect(mockDoc.text).toHaveBeenCalledWith("Herr Test-test Test");
   });
 
   it("should call function addNewPageInCaseMissingVerticalSpace twice", () => {