@ukhomeoffice/cop-react-form-renderer 4.51.0 → 4.52.0

package/dist/components/FormRenderer/FormRenderer.js

@@ -103,7 +103,7 @@ var DEFAULT_CLASS = 'hods-form';
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
 
 var InternalFormRenderer = function InternalFormRenderer(_ref2) {
-  var _formState$page5;
+  var _formState$page5, _formState$page$actio;
 
   var title = _ref2.title,
       type = _ref2.type,
@@ -605,7 +605,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, title && !hide_title && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
     pages: _helpers.default.getRelevantPages(formState, pages, currentTask.fullPages)
   }, cya, ((_formState$page5 = formState.page) === null || _formState$page5 === void 0 ? void 0 : _formState$page5.type) === _models.FormPages.PARTIAL_CYA && {
-    actions: formState.page.actions
+    actions: (_formState$page$actio = formState.page.actions) === null || _formState$page$actio === void 0 ? void 0 : _formState$page$actio.filter(function (action) {
+      return _utils.default.Component.show(action, data);
+    })
   }, formState.cya, {
     onAction: onCYAAction,
     onRowAction: onCYARowAction,

package/dist/utils/Validate/validatePage.js

@@ -39,7 +39,7 @@ var validatePage = function validatePage(page) {
     }
   }
 
-  if ((0, _showFormPage.default)(page, page.formData) && Array.isArray(page.components)) {
+  if ((0, _showFormPage.default)(page, data) && Array.isArray(page.components)) {
     var errs = page.components.reduce(function (errors, component) {
       var componentErrors = (0, _validateComponent.default)(component, data, data);
       return errors.concat(componentErrors).flat().map(function (err) {

package/dist/utils/Validate/validatePage.test.js

@@ -73,6 +73,35 @@ describe('utils.Validate.Page', function () {
           error: 'Echo is required'
         });
       });
+      it('should return an error for each required component on a collection page', function () {
+        var COMPONENTS = [setup('a', _models.ComponentTypes.TEXT, 'Alpha', true), setup('b', _models.ComponentTypes.TEXT, 'Bravo', true), setup('c', _models.ComponentTypes.TEXT, 'Charlie', false), // The only unrequired one
+        setup('d', _models.ComponentTypes.TEXT, 'Delta', true), setup('e', _models.ComponentTypes.TEXT, 'Echo', true)];
+        var PAGE = {
+          components: COMPONENTS,
+          collection: {
+            name: 'testCollection'
+          },
+          formData: null
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(4);
+        expect(RESULT[0]).toEqual({
+          id: 'a',
+          error: 'Alpha is required'
+        });
+        expect(RESULT[1]).toEqual({
+          id: 'b',
+          error: 'Bravo is required'
+        });
+        expect(RESULT[2]).toEqual({
+          id: 'd',
+          error: 'Delta is required'
+        });
+        expect(RESULT[3]).toEqual({
+          id: 'e',
+          error: 'Echo is required'
+        });
+      });
       it('should return an error for each required component with interpolated label', function () {
         var COMPONENTS = [// eslint-disable-next-line no-template-curly-in-string
         setup('a', _models.ComponentTypes.TEXT, 'Alpha ${tiger}', true), // eslint-disable-next-line no-template-curly-in-string
@@ -291,6 +320,70 @@ describe('utils.Validate.Page', function () {
         };
         expect((0, _validatePage.default)(PAGE).length).toEqual(0);
       });
+      it('should return an error for each required component on a collection page with a show_when that is true', function () {
+        var COMPONENTS = [setup('a', _models.ComponentTypes.TEXT, 'Alpha', true), setup('b', _models.ComponentTypes.TEXT, 'Bravo', true), setup('c', _models.ComponentTypes.TEXT, 'Charlie', false), // The only unrequired one
+        setup('d', _models.ComponentTypes.TEXT, 'Delta', true), setup('e', _models.ComponentTypes.TEXT, 'Echo', true)];
+        var PAGE = {
+          components: COMPONENTS,
+          collection: {
+            name: 'testCollection'
+          },
+          show_when: {
+            field: 'isShown',
+            op: '=',
+            value: true
+          },
+          formData: {
+            testCollectionActiveId: 123,
+            testCollection: [{
+              id: 123,
+              isShown: true
+            }]
+          }
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(4);
+        expect(RESULT[0]).toEqual({
+          id: 'a',
+          error: 'Alpha is required'
+        });
+        expect(RESULT[1]).toEqual({
+          id: 'b',
+          error: 'Bravo is required'
+        });
+        expect(RESULT[2]).toEqual({
+          id: 'd',
+          error: 'Delta is required'
+        });
+        expect(RESULT[3]).toEqual({
+          id: 'e',
+          error: 'Echo is required'
+        });
+      });
+      it('should return no errors on a collection page with a show_when that is false', function () {
+        var COMPONENTS = [setup('a', _models.ComponentTypes.TEXT, 'Alpha', true), setup('b', _models.ComponentTypes.TEXT, 'Bravo', true), setup('c', _models.ComponentTypes.TEXT, 'Charlie', false), // The only unrequired one
+        setup('d', _models.ComponentTypes.TEXT, 'Delta', true), setup('e', _models.ComponentTypes.TEXT, 'Echo', true)];
+        var PAGE = {
+          components: COMPONENTS,
+          collection: {
+            name: 'testCollection'
+          },
+          show_when: {
+            field: 'isShown',
+            op: '=',
+            value: true
+          },
+          formData: {
+            testCollectionActiveId: 123,
+            testCollection: [{
+              id: 123,
+              isShown: false
+            }]
+          }
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(0);
+      });
     });
     describe('when the form data has one field missing and includes an invalid email', function () {
       var _DATA2;

package/package.json

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