summary does not error, dont rely on null value for summary.js..!

XGovFormBuilder · Jul 1, 2020 · 0298514 · 0298514
1 parent 4349bfa
commit 0298514
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/engine/src/model.js b/engine/src/model.js
@@ -79,14 +79,22 @@ class Model {
 
       if (sectionPages.length > 0) {
         if (section) {
-          let sectionSchema = joi.object().required()
+          const isRepeatable = sectionPages.find(page => page.pageDef.repeatField)
+          let sectionSchema
+
+          sectionSchema = joi.object().required()
           sectionPages.forEach(sectionPage => {
             sectionSchema = sectionSchema.concat(sectionPage.stateSchema)
           })
-
-          schema = schema.append({
-            [section.name]: sectionSchema
-          })
+          if(isRepeatable) {
+            sectionSchema = joi.array().items(sectionSchema)
+          }
+
+          if(!isRepeatable ||( isRepeatable && !schema[section.name])) {
+            schema = schema.append({
+              [section.name]: sectionSchema
+            })
+          }
         } else {
           sectionPages.forEach(sectionPage => {
             schema = schema.concat(sectionPage.stateSchema)

diff --git a/runner/src/server/plugins/builder/pages/summary.js b/runner/src/server/plugins/builder/pages/summary.js
@@ -14,10 +14,8 @@ class SummaryViewModel {
     let endPage = null
 
     let nextPage = model.startPage
-    while (nextPage !== null) {
-      if (nextPage.hasFormComponents) {
-        relevantPages.push(nextPage)
-      }
+    while (nextPage?.hasFormComponents) {
+      relevantPages.push(nextPage)
       nextPage = nextPage.getNextPage(state)
     }