feat(besitz): edit&back returns to overview

Co-Authored-By: Pram Gurusinga <9930966+pgurusinga@users.noreply.github.com>
digitalservicebund · Feb 12, 2024 · af2e5eb · af2e5eb
1 parent b77f4bf
commit af2e5eb
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/app/models/flows/beratungshilfeFormular/finanzielleAngaben/flow.json b/app/models/flows/beratungshilfeFormular/finanzielleAngaben/flow.json
@@ -207,7 +207,13 @@
           "id": "bankkonten",
           "on": {
             "SUBMIT": "weiteres-bankkonto",
-            "BACK": "bankkonten-frage"
+            "BACK": [
+              {
+                "cond": "hasAdditionalBankkontoNo",
+                "target": "zusammenfassung"
+              },
+              "bankkonten-frage"
+            ]
           }
         },
         "weiteres-bankkonto": {
@@ -243,7 +249,13 @@
           "id": "kraftfahrzeuge",
           "on": {
             "SUBMIT": "weiteres-kraftfahrzeug",
-            "BACK": "kraftfahrzeuge-frage"
+            "BACK": [
+              {
+                "cond": "hasAdditionalKraftfahrzeugNo",
+                "target": "zusammenfassung"
+              },
+              "kraftfahrzeuge-frage"
+            ]
           }
         },
         "weiteres-kraftfahrzeug": {
@@ -282,7 +294,13 @@
           "id": "geldanlagen",
           "on": {
             "SUBMIT": "weitere-geldanlage",
-            "BACK": "geldanlagen-frage"
+            "BACK": [
+              {
+                "cond": "hasAdditionalGeldanlageNo",
+                "target": "zusammenfassung"
+              },
+              "geldanlagen-frage"
+            ]
           }
         },
         "weitere-geldanlage": {
@@ -315,7 +333,13 @@
           "id": "grundeigentum",
           "on": {
             "SUBMIT": "weiteres-grundeigentum",
-            "BACK": "grundeigentum-frage"
+            "BACK": [
+              {
+                "cond": "hasAdditionalGrundeigentumNo",
+                "target": "zusammenfassung"
+              },
+              "grundeigentum-frage"
+            ]
           }
         },
         "weiteres-grundeigentum": {
@@ -348,7 +372,13 @@
           "id": "wertsachen",
           "on": {
             "SUBMIT": "weitere-wertsache",
-            "BACK": "wertsachen-frage"
+            "BACK": [
+              {
+                "cond": "hasAdditionalWertsacheNo",
+                "target": "zusammenfassung"
+              },
+              "wertsachen-frage"
+            ]
           }
         },
         "weitere-wertsache": {

diff --git a/app/routes/shared/step.server.ts b/app/routes/shared/step.server.ts
@@ -175,11 +175,6 @@ export const loader = async ({
     previousStepUrl: flowController.getPrevious(stepId)?.url,
   });
 
-  // TODO: fix (Inside an array, we need to patch the back & submit button to return to the overview)
-  if (arrayIndex !== undefined) {
-    buttonNavigationProps.back.destination = `${pathname}/../../zusammenfassung`;
-  }
-
   return json(
     {
       csrf,