Revert "feat(pageData): Add subflowDoneStates to evaluate in guards (#3099)"

This reverts commit 659e46f.

Author: chohner

app/domains/beratungshilfe/formular/abgabe/guards.ts

@@ -0,0 +1,18 @@
+import { beratungshilfePersoenlicheDatenDone } from "~/domains/beratungshilfe/formular/persoenlicheDaten/doneFunctions";
+import type { BeratungshilfeFormularUserData } from "~/domains/beratungshilfe/formular/userData";
+import type { Guards } from "../../../guards.server";
+import { anwaltlicheVertretungDone } from "../anwaltlicheVertretung/guards";
+import { grundvoraussetzungDone } from "../grundvoraussetzung/grundvoraussetzungDone";
+import { rechtsproblemDone } from "../rechtsproblem/rechtsproblemDone";
+import { beratungshilfeFinanzielleAngabeDone } from "../finanzielleAngaben/doneFunctions";
+
+export const beratungshilfeAbgabeGuards = {
+  readyForAbgabe: ({ context }) =>
+    grundvoraussetzungDone({ context }) &&
+    anwaltlicheVertretungDone({ context }) &&
+    rechtsproblemDone({ context }) &&
+    beratungshilfeFinanzielleAngabeDone({ context }) &&
+    beratungshilfePersoenlicheDatenDone({ context }),
+  abgabeOnline: ({ context }) => context.abgabeArt == "online",
+  abgabeAusdrucken: ({ context }) => context.abgabeArt == "ausdrucken",
+} satisfies Guards<BeratungshilfeFormularUserData>;

app/domains/beratungshilfe/formular/abgabe/xstateConfig.ts

@@ -1,8 +1,9 @@
 import { xStateTargetsFromPagesConfig } from "~/domains/pageSchemas";
 import type { Config } from "~/services/flow/server/types";
 import { isFeatureFlagEnabled } from "~/services/isFeatureFlagEnabled.server";
+import { beratungshilfeAbgabeGuards } from "./guards";
 import { berHAntragAbgabePages } from "./pages";
-import { type BeratungshilfeFormularUserData } from "~/domains/beratungshilfe/formular/userData";
+import { type BeratungshilfeAbgabeUserData } from "./userData";
 
 const steps = xStateTargetsFromPagesConfig(berHAntragAbgabePages);
 const showFileUpload = await isFeatureFlagEnabled("showFileUpload");
@@ -24,9 +25,7 @@ export const abgabeXstateConfig = {
       on: { BACK: "#weitere-angaben" },
       meta: { triggerValidation: true },
       always: {
-        guard: ({ context }): boolean =>
-          !!context.pageData?.subflowDoneStates &&
-          Object.values(context.pageData.subflowDoneStates).every(Boolean),
+        guard: beratungshilfeAbgabeGuards.readyForAbgabe,
         target: showAutoSummary
           ? steps.zusammenfassung.relative
           : steps.art.relative,
@@ -46,17 +45,17 @@ export const abgabeXstateConfig = {
       on: {
         BACK: showAutoSummary
           ? steps.zusammenfassung.relative
-          : "#weitere-angaben",
+          : steps.art.relative,
         SUBMIT: [
           {
             target: showFileUpload
               ? steps.dokumente.relative
               : steps.online.relative,
-            guard: ({ context }) => context.abgabeArt == "online",
+            guard: beratungshilfeAbgabeGuards.abgabeOnline,
           },
           {
             target: steps.ausdrucken.relative,
-            guard: ({ context }) => context.abgabeArt == "ausdrucken",
+            guard: beratungshilfeAbgabeGuards.abgabeAusdrucken,
           },
         ],
       },
@@ -86,4 +85,4 @@ export const abgabeXstateConfig = {
       },
     },
   },
-} satisfies Config<BeratungshilfeFormularUserData>;
+} satisfies Config<BeratungshilfeAbgabeUserData>;

app/domains/beratungshilfe/formular/userData.ts

@@ -5,7 +5,6 @@ import { type BeratungshilfeFinanzielleAngabenUserData } from "./finanzielleAnga
 import { type BeratungshilfeGrundvoraussetzungenUserData } from "./grundvoraussetzung/userData";
 import { type BeratungshilfeRechtsproblemUserData } from "./rechtsproblem/userData";
 import { type BeratungshilfeWeitereAngabenUserData } from "./weitereAngaben/userData";
-import type { PageData } from "~/services/flow/pageDataSchema";
 
 export type BeratungshilfeFormularUserData =
   BeratungshilfeGrundvoraussetzungenUserData &
@@ -15,5 +14,7 @@ export type BeratungshilfeFormularUserData =
     BeratungshilfePersoenlicheDatenUserData &
     BeratungshilfeWeitereAngabenUserData &
     BeratungshilfeAbgabeUserData & {
-      pageData?: PageData;
+      pageData?: {
+        arrayIndexes: number[];
+      };
     };

app/domains/shared/formular/stringReplacements.ts

@@ -1,11 +1,10 @@
 import { type BeratungshilfeFormularUserData } from "~/domains/beratungshilfe/formular/userData";
 import type { ProzesskostenhilfeFormularUserData } from "../../prozesskostenhilfe/formular/userData";
-import { firstArrayIndex } from "~/services/flow/pageDataSchema";
 
 export const getKinderStrings = (
   context: BeratungshilfeFormularUserData | ProzesskostenhilfeFormularUserData,
 ) => {
-  const arrayIndex = firstArrayIndex(context.pageData);
+  const arrayIndex = context.pageData?.arrayIndexes.at(0);
   if (
     arrayIndex === undefined ||
     !context.kinder ||
@@ -22,7 +21,7 @@ export const getKinderStrings = (
 export const getArrayIndexStrings = (
   context: BeratungshilfeFormularUserData | ProzesskostenhilfeFormularUserData,
 ) => {
-  const arrayIndex = firstArrayIndex(context.pageData);
+  const arrayIndex = context.pageData?.arrayIndexes.at(0);
   return arrayIndex === undefined
     ? {}
     : { "array#index": String(arrayIndex + 1) };

app/routes/shared/__test__/formular.test.ts

@@ -16,7 +16,6 @@ import {
   isResponse,
 } from "~/routes/__test__/isResponse";
 import invariant from "tiny-invariant";
-import { fluggastrechtFlow } from "~/domains/fluggastrechte/formular";
 
 vi.mock("~/services/security/csrf/validatedSession.server", () => ({
   validatedSession: vi.fn(),
@@ -26,6 +25,7 @@ vi.mock("~/services/logging", () => ({
   logWarning: vi.fn(),
 }));
 
+vi.mock("~/services/flow/server/buildFlowController");
 vi.mock("~/services/upload/fileUploadHelpers.server");
 vi.mock("~/services/session.server");
 vi.mock("~/services/flow/userFlowAction/validateFormUserData");
@@ -146,30 +146,7 @@ describe("formular.server", () => {
         expect(response.data.repopulateFields).toEqual({ name: "" });
       });
 
-      it("should save both valid userdata and pageData including subflowDoneStates", async () => {
-        const subflowDoneStates = Object.fromEntries(
-          Object.keys(fluggastrechtFlow.config.states).map(
-            (subflowName, idx) => ["/" + subflowName, idx !== 1], // only second entry /grundvoraussetzungen isnt done
-          ),
-        );
-
-        const userData = { name: "Valid Name" };
-        const expectedPageData = { subflowDoneStates };
-
-        vi.mocked(validateFormUserData).mockResolvedValue(
-          Result.ok({ userData, migrationData: undefined }),
-        );
-
-        await action(mockRouteArgsFromRequest(mockDefaultRequest));
-
-        expect(updateSession).toHaveBeenCalledTimes(1);
-        expect(updateSession).toHaveBeenCalledWith(
-          expect.anything(),
-          expect.objectContaining({ ...userData, pageData: expectedPageData }),
-        );
-      });
-
-      it("should update session with migration data when form validation succeeds", async () => {
+      it("should update session twice when form validation succeeds with migration data", async () => {
         vi.mocked(validateFormUserData).mockResolvedValue(
           Result.ok({
             userData: { name: "Valid Name" },
@@ -179,13 +156,14 @@ describe("formular.server", () => {
 
         await action(mockRouteArgsFromRequest(mockDefaultRequest));
 
-        expect(updateSession).toHaveBeenCalledTimes(1);
-        expect(updateSession).toHaveBeenCalledWith(
-          expect.anything(),
-          expect.objectContaining({
-            name: "Migration Name",
-          }),
-        );
+        expect(updateSession).toHaveBeenCalledTimes(2);
+        expect(updateSession).toHaveBeenCalledWith(expect.anything(), {
+          name: "Valid Name",
+        });
+
+        expect(updateSession).toHaveBeenCalledWith(expect.anything(), {
+          name: "Migration Name",
+        });
       });
 
       it("should call postValidationFormUserData once when form validation succeeds", async () => {

app/routes/shared/formular.ts

@@ -2,6 +2,7 @@ import { parseFormData } from "@remix-run/form-data-parser";
 import { validationError } from "@rvf/react-router";
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router";
 import { data, redirectDocument } from "react-router";
+import { parsePathname } from "~/domains/flowIds";
 import { retrieveContentData } from "~/services/flow/formular/contentData/retrieveContentData";
 import { setUserVisitedValidationPage } from "~/services/flow/formular/contentData/setUserVisitedValidationPage";
 import { isFileUploadOrDeleteAction } from "~/services/flow/formular/fileUpload/isFileUploadOrDeleteAction";
@@ -14,7 +15,6 @@ import { validatedSession } from "~/services/security/csrf/validatedSession.serv
 import { getSessionManager, updateSession } from "~/services/session.server";
 import { updateMainSession } from "~/services/session.server/updateSessionInHeader";
 import type { SummaryItem } from "~/services/summary/types";
-import merge from "lodash/merge";
 import {
   deleteUserFile,
   uploadUserFile,
@@ -25,9 +25,6 @@ import { shouldShowReportProblem } from "../../components/reportProblem/showRepo
 import { generateSummaryFromUserData } from "~/services/summary/autoGenerateSummary";
 import { isFeatureFlagEnabled } from "~/services/isFeatureFlagEnabled.server";
 import { pruneIrrelevantData } from "~/services/flow/pruner/pruner";
-import { buildFlowController } from "~/services/flow/server/buildFlowController";
-import { getPageAndFlowDataFromPathname } from "~/services/flow/getPageAndFlowDataFromPathname";
-import { stepStatesToSubflowDoneStates } from "~/services/navigation/stepStatesToSubflowDoneStates";
 
 export const loader = async ({ params, request }: LoaderFunctionArgs) => {
   const resultUserAndFlow = await getUserDataAndFlow(request);
@@ -127,7 +124,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
   }
 
   const { pathname } = new URL(request.url);
-  const { flowId, currentFlow } = getPageAndFlowDataFromPathname(pathname);
+  const { flowId } = parsePathname(pathname);
   const { getSession, commitSession } = getSessionManager(flowId);
   const cookieHeader = request.headers.get("Cookie");
   const flowSession = await getSession(cookieHeader);
@@ -182,25 +179,13 @@ export const action = async ({ request }: ActionFunctionArgs) => {
     );
   }
 
-  const updatedUserData = merge(
-    {},
-    flowSession.data,
-    resultFormUserData.value.userData,
-    resultFormUserData.value.migrationData,
-  );
+  updateSession(flowSession, resultFormUserData.value.userData);
 
-  const subflowDoneStates = stepStatesToSubflowDoneStates(
-    buildFlowController({
-      config: currentFlow.config,
-      data: updatedUserData,
-      guards: "guards" in currentFlow ? currentFlow.guards : {},
-    }).stepStates(),
-  );
+  if (resultFormUserData.value.migrationData) {
+    updateSession(flowSession, resultFormUserData.value.migrationData);
+  }
 
-  const pageData = { pageData: { subflowDoneStates } };
-  const userDataToSave = merge({}, updatedUserData, pageData);
-  updateSession(flowSession, userDataToSave);
-  const { prunedData } = pruneIrrelevantData(userDataToSave, flowId);
+  const { prunedData } = pruneIrrelevantData(flowSession.data, flowId);
 
   await postValidationFlowAction(request, prunedData);
 

app/services/flow/pageDataSchema.ts

@@ -2,7 +2,6 @@ import { z } from "zod";
 
 export const pageDataSchema = z.object({
   arrayIndexes: z.array(z.number()),
-  subflowDoneStates: z.record(z.string(), z.boolean()).optional(),
 });
 
 export type PageData = z.infer<typeof pageDataSchema>;

app/services/flow/pruner/__test__/pruner.test.ts

@@ -121,7 +121,6 @@ describe("pruner", () => {
             eigentuemer: "partner",
           },
         ],
-        pageData: { arrayIndexes: [1] },
       });
     });
   });

app/services/flow/pruner/pruner.ts

@@ -26,10 +26,7 @@ export function pruneIrrelevantData(data: UserData, flowId: FlowId) {
 
   const validFlowPaths = getValidFlowPaths(formFields, formPaths);
 
-  return {
-    prunedData: pick(data, validFormFields, "pageData"),
-    validFlowPaths,
-  };
+  return { prunedData: pick(data, validFormFields), validFlowPaths };
 }
 
 export function filterFormFields(