Feature/repeat pages

.circleci/circle_trigger.sh

@@ -58,7 +58,7 @@ PACKAGES=$(ls ${ROOT} -l | grep ^d | awk '{print $9}')
 echo "Searching for changes since commit [${LAST_COMPLETED_BUILD_SHA:0:7}] ..."
 
 ## The CircleCI API parameters object
-PARAMETERS='"trigger":false, "designer":true, "runner":true'
+PARAMETERS='"trigger":false, "designer":true, "runner":true, "engine":true'
 COUNT=2
 
 ## Get the list of workflows in current branch for which the CI is currently in failed state

engine/components/radiosfield.js

@@ -44,20 +44,20 @@ class RadiosField extends ConditionalFormComponent {
             condition: item.condition
           }
 
-        if (options.bold) {
-          itemModel.label = {
-            classes: 'govuk-label--s'
+          if (options.bold) {
+            itemModel.label = {
+              classes: 'govuk-label--s'
+            }
           }
-        }
 
-        if (item.description) {
-          itemModel.hint = {
-            html: this.localisedString(item.description)
+          if (item.description) {
+            itemModel.hint = {
+              html: this.localisedString(item.description)
+            }
           }
-        }
 
-        return super.addConditionalComponents(item, itemModel, formData, errors)
-      })
+          return super.addConditionalComponents(item, itemModel, formData, errors)
+        })
     })
 
     return viewModel

engine/package.json

@@ -10,7 +10,7 @@
     "build": "babel src -d lib --source-maps inline",
     "build:watch": "babel src -d lib --source-maps inline --watch",
     "test-lab": "lab -T node_modules/@xgovformbuilder/lab-babel -S -v -P 'test' test/cases -r console -o stdout -r html -o unit-test.html -I version",
-    "test": "npm run-script lint && npm run-script test-lab"
+    "test": "yarn lint && yarn test-lab"
   },
   "repository": {
     "type": "git",
@@ -42,6 +42,7 @@
     "@hapi/code": "^8.0.1",
     "@hapi/lab": "^22.0.4",
     "@xgovformbuilder/lab-babel": "2.0.0",
+    "babel-eslint": "11.0.0-beta.2",
     "standard": "14.3.3"
   },
   "peerDependencies": {

engine/src/lib.js

@@ -1,6 +1,6 @@
 import findByPostcode from './address-service'
-import ComponentTypes from './component-types'
-import ConditionalComponentTypes from './conditional-component-types'
+import * as ComponentTypes from './component-types'
+import * as ConditionalComponentTypes from './conditional-component-types'
 import * as Helpers from './helpers'
 import Model from './model'
 import Page from './page'

engine/src/model.js

@@ -8,6 +8,7 @@ class Model {
   constructor (def, options) {
     const result = schema.validate(def, { abortEarly: false })
 
+    // TODO:- throw/catch this properly 🤦🏻‍
     if (result.error) {
       throw result.error
     }
@@ -78,11 +79,15 @@ class Model {
 
       if (sectionPages.length > 0) {
         if (section) {
+          const isRepeatable = sectionPages.find(page => page.pageDef.repeatField)
+
           let sectionSchema = joi.object().required()
           sectionPages.forEach(sectionPage => {
             sectionSchema = sectionSchema.concat(sectionPage.stateSchema)
           })
-
+          if (isRepeatable) {
+            sectionSchema = joi.array().items(sectionSchema)
+          }
           schema = schema.append({
             [section.name]: sectionSchema
           })