@ukhomeoffice/cop-react-form-renderer 4.32.2 → 4.33.1

package/dist/components/FormRenderer/FormRenderer.js

@@ -509,7 +509,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_CONTINUE && hub === _models.HubFormats.TASK) {
-      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
+      var shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
+      var canSubmit = shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
+
+      if (canSubmit) {
         var _submissionData = _utils.default.Format.form({
           pages: pages,
           components: components
@@ -547,10 +550,11 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
-      var shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
-      var canSubmit = shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
+      var _shouldValidate = !(action.hasOwnProperty('validate') && !action.validate);
 
-      if (canSubmit) {
+      var _canSubmit = _shouldValidate ? _helpers.default.canCYASubmit(currentTask.fullPages, validate.pages) : true;
+
+      if (_canSubmit) {
         var _submissionData3 = _utils.default.Format.form({
           pages: pages,
           components: components

package/dist/utils/CollectionPage/mergeCollectionPages.test.js

@@ -174,26 +174,26 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
       },
       components: [{
         type: 'text',
-        show_when: [{
+        show_when: {
           field: 'field',
           op: '=',
           value: 'value'
-        }]
+        }
       }, {
         type: 'container',
         components: [{
           type: 'date',
-          show_when: [{
+          show_when: {
             field: 'field',
             op: '=',
             value: 'otherValue'
-          }]
+          }
         }],
-        show_when: [{
+        show_when: {
           field: 'field',
           op: '=',
           value: 'otherValue'
-        }]
+        }
       }],
       formData: {}
     });

package/dist/utils/Component/addShowWhen.js

@@ -34,9 +34,13 @@ var addShowWhen = function addShowWhen(component, condition) {
   var result = _objectSpread({}, component);
 
   if (result.show_when) {
-    result.show_when = Array.isArray(result.show_when) ? [].concat(result.show_when, [_objectSpread({}, condition)]) : [result.show_when, _objectSpread({}, condition)];
+    if (Array.isArray(condition)) {
+      result.show_when = Array.isArray(result.show_when) ? [].concat(condition, result.show_when) : [].concat(condition, [result.show_when]);
+    } else {
+      result.show_when = Array.isArray(result.show_when) ? [].concat(result.show_when, [condition]) : [result.show_when, condition];
+    }
   } else {
-    result.show_when = condition.type === 'or' ? result.show_when = _objectSpread({}, condition) : result.show_when = [_objectSpread({}, condition)];
+    result.show_when = condition;
   }
 
   return result;

package/dist/utils/Component/addShowWhen.test.js

@@ -44,7 +44,26 @@ describe('utils.Component.addShowWhen', function () {
     var result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
-      show_when: [NEW_SHOW_WHEN]
+      show_when: NEW_SHOW_WHEN
+    });
+  });
+  it('should add the array type show_when to a component with no existing show_whens', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
+      field: 'abc',
+      op: '=',
+      value: 'bcd'
+    }, {
+      field: 'cde',
+      op: '=',
+      value: 'efg'
+    }];
+    var COMPONENT = {
+      alpha: 'bravo'
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: NEW_ARRAY_SHOW_WHEN
     });
   });
   it('should add the show_when to a component with a single show_when', function () {
@@ -115,4 +134,84 @@ describe('utils.Component.addShowWhen', function () {
       show_when: SHOW_WHEN_OR
     });
   });
+  it('should add an array of show_whens to a component with an array of show_whens', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
+      field: 'hij',
+      op: '=',
+      value: 'klm'
+    }, {
+      field: 'nop',
+      op: '=',
+      value: 'qrs'
+    }];
+    var COMPONENT = {
+      alpha: 'bravo',
+      show_when: [{
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }, {
+        field: 'cde',
+        op: '=',
+        value: 'efg'
+      }]
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: [{
+        field: 'hij',
+        op: '=',
+        value: 'klm'
+      }, {
+        field: 'nop',
+        op: '=',
+        value: 'qrs'
+      }, {
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }, {
+        field: 'cde',
+        op: '=',
+        value: 'efg'
+      }]
+    });
+  });
+  it('should add an array of show_whens to a component with a single show_when', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
+      field: 'hij',
+      op: '=',
+      value: 'klm'
+    }, {
+      field: 'nop',
+      op: '=',
+      value: 'qrs'
+    }];
+    var COMPONENT = {
+      alpha: 'bravo',
+      show_when: {
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: [{
+        field: 'hij',
+        op: '=',
+        value: 'klm'
+      }, {
+        field: 'nop',
+        op: '=',
+        value: 'qrs'
+      }, {
+        field: 'abc',
+        op: '=',
+        value: 'bcd'
+      }]
+    });
+  });
 });

package/dist/utils/FormPage/getPageActions.js

@@ -50,12 +50,6 @@ var getPageActions = function getPageActions(page) {
       }
 
       if (a && _typeof(a) === 'object') {
-        var _PageAction$DEFAULTS$;
-
-        if ((_PageAction$DEFAULTS$ = _models.PageAction.DEFAULTS[a.type]) !== null && _PageAction$DEFAULTS$ !== void 0 && _PageAction$DEFAULTS$.validate) {
-          a.validate = true;
-        }
-
         return standardiseAction(a);
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.32.2",
+  "version": "4.33.1",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",