Merge pull request #3390 from AtlasOfLivingAustralia/feature/issue3369

Allow pre-pop to override saved data in RCS form #3369
AtlasOfLivingAustralia · Dec 12, 2024 · e6eacbd · e6eacbd
2 parents d76a959 + d56cc3e
commit e6eacbd
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 38 deletions.
diff --git a/forms/other/regionalCapacityServicesReportV1.json b/forms/other/regionalCapacityServicesReportV1.json
@@ -27,7 +27,12 @@
                 "target": "targetIndigenousParticipationPercentage",
                 "source-path": "periodTargets.targetIndigenousParticipationPercentage"
               }
-            ]
+            ],
+            "merge": {
+              "targetIndigenousParticipationPercentage": {
+                "replaceExisting": true
+              }
+            }
           },
           {
             "source": {
@@ -38,7 +43,12 @@
                 "target": "targetIndigenousProcurementPercentage",
                 "source-path": "periodTargets.targetIndigenousProcurementPercentage"
               }
-            ]
+            ],
+            "merge": {
+              "targetIndigenousProcurementPercentage": {
+                "replaceExisting": true
+              }
+            }
           },
           {
             "source": {
@@ -49,7 +59,12 @@
                 "target": "organisationPanelProjectValue",
                 "source-path": "totalContractValue"
               }
-            ]
+            ],
+            "merge": {
+              "organisationPanelProjectValue": {
+                "replaceExisting": true
+              }
+            }
           }
         ],
         "dataModel": [

diff --git a/forms/other/regionalCapacityServicesReportV2.json b/forms/other/regionalCapacityServicesReportV2.json
@@ -27,7 +27,12 @@
                 "target": "targetIndigenousParticipationPercentage",
                 "source-path": "periodTargets.targetIndigenousParticipationPercentage"
               }
-            ]
+            ],
+            "merge": {
+              "targetIndigenousParticipationPercentage": {
+                "replaceExisting": true
+              }
+            }
           },
           {
             "source": {
@@ -38,7 +43,12 @@
                 "target": "targetIndigenousProcurementPercentage",
                 "source-path": "periodTargets.targetIndigenousProcurementPercentage"
               }
-            ]
+            ],
+            "merge": {
+              "targetIndigenousProcurementPercentage": {
+                "replaceExisting": true
+              }
+            }
           },
           {
             "source": {
@@ -49,7 +59,12 @@
                 "target": "organisationPanelProjectValue",
                 "source-path": "totalContractValue"
               }
-            ]
+            ],
+            "merge": {
+              "organisationPanelProjectValue": {
+                "replaceExisting": true
+              }
+            }
           }
         ],
         "dataModel": [

diff --git a/forms/other/regionalCapacityServicesReportV3.json b/forms/other/regionalCapacityServicesReportV3.json
@@ -9,41 +9,56 @@
       "collapsedByDefault": false,
       "templateName": "regionalCapacityServicesReport",
       "template": {
-          "pre-populate": [
-            {
-              "source": {
-                "context-path": "owner"
-              },
-              "mapping": [
-                {
-                  "target": "targetIndigenousParticipationPercentage",
-                  "source-path": "periodTargets.targetIndigenousParticipationPercentage"
-                }
-              ]
+        "pre-populate": [
+          {
+            "source": {
+              "context-path": "owner"
             },
-            {
-              "source": {
-                "context-path": "owner"
-              },
-              "mapping": [
-                {
-                  "target": "targetIndigenousProcurementPercentage",
-                  "source-path": "periodTargets.targetIndigenousProcurementPercentage"
-                }
-              ]
+            "mapping": [
+              {
+                "target": "targetIndigenousParticipationPercentage",
+                "source-path": "periodTargets.targetIndigenousParticipationPercentage"
+              }
+            ],
+            "merge": {
+              "targetIndigenousParticipationPercentage": {
+                "replaceExisting": true
+              }
+            }
+          },
+          {
+            "source": {
+              "context-path": "owner"
             },
-            {
-              "source": {
-                "context-path": "owner"
-              },
-              "mapping": [
-                {
-                  "target": "organisationPanelProjectValue",
-                  "source-path": "totalContractValue"
-                }
-              ]
+            "mapping": [
+              {
+                "target": "targetIndigenousProcurementPercentage",
+                "source-path": "periodTargets.targetIndigenousProcurementPercentage"
+              }
+            ],
+            "merge": {
+              "targetIndigenousProcurementPercentage": {
+                "replaceExisting": true
+              }
+            }
+          },
+          {
+            "source": {
+              "context-path": "owner"
+            },
+            "mapping": [
+              {
+                "target": "organisationPanelProjectValue",
+                "source-path": "totalContractValue"
+              }
+            ],
+            "merge": {
+              "organisationPanelProjectValue": {
+                "replaceExisting": true
+              }
             }
-          ],
+          }
+        ],
         "dataModel": [
           {
             "name": "governanceAndFinancialFrameworksOnTrack",