@ukhomeoffice/cop-react-form-renderer 3.23.4 → 3.25.0

package/dist/components/FormComponent/FormComponent.js

@@ -17,6 +17,8 @@ var _models = require("../../models");
 
 var _utils = _interopRequireDefault(require("../../utils"));
 
+var _wrapInFormGroup = _interopRequireDefault(require("../../utils/Component/wrapInFormGroup"));
+
 var _Collection = _interopRequireDefault(require("./Collection"));
 
 var _Container = _interopRequireDefault(require("./Container"));
@@ -97,13 +99,19 @@ var FormComponent = function FormComponent(_ref) {
   };
 
   if (component.type === _models.ComponentTypes.CONTAINER) {
-    return /*#__PURE__*/_react.default.createElement(_Container.default, _extends({}, attrs, {
+    var container = /*#__PURE__*/_react.default.createElement(_Container.default, _extends({}, attrs, {
       container: component,
       wrap: wrap,
       onChange: onComponentChange,
       value: value || _utils.default.Component.defaultValue(component),
       formData: formData
     }));
+
+    if (component.additionalValidation) {
+      container = (0, _wrapInFormGroup.default)(_objectSpread(_objectSpread({}, component), (0, _helpers.getComponentError)(component, validation === null || validation === void 0 ? void 0 : validation.errors)), container);
+    }
+
+    return container;
   }
 
   if (component.type === _models.ComponentTypes.COLLECTION) {

package/dist/components/SummaryList/helpers/getGroupActionAttributes.js

@@ -11,7 +11,13 @@ var getGroupActionAttributes = function getGroupActionAttributes(groupRow) {
       return {
         onClick: function onClick() {
           return groupRow.action.onAction(groupRow);
-        }
+        },
+        onKeyPress: function onKeyPress(event) {
+          if (event.key === 'Enter') {
+            groupRow.action.onAction(groupRow);
+          }
+        },
+        tabIndex: '0'
       };
     } else if (groupRow.action.page) {
       return {

package/dist/utils/Validate/additional/index.js

@@ -17,6 +17,8 @@ var _mustBeLongerThan = _interopRequireDefault(require("./mustBeLongerThan"));
 
 var _mustBeShorterThan = _interopRequireDefault(require("./mustBeShorterThan"));
 
+var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
@@ -26,14 +28,15 @@ var functions = {
   mustBeInThePast: _mustBeInThePast.default,
   mustBeInTheFuture: _mustBeInTheFuture.default,
   mustBeLongerThan: _mustBeLongerThan.default,
-  mustBeShorterThan: _mustBeShorterThan.default
+  mustBeShorterThan: _mustBeShorterThan.default,
+  mustEnterAtLeastOne: _mustEnterAtLeastOne.default
 };
 
-var additionalValidation = function additionalValidation(value, config) {
+var additionalValidation = function additionalValidation(value, config, component) {
   var fn = functions[config.function];
 
   if (typeof fn === 'function') {
-    return fn(value, config) ? undefined : config.message;
+    return fn(value, config, component) ? undefined : config.message;
   }
 
   return undefined;
@@ -47,7 +50,7 @@ var runAdditionalComponentValidation = function runAdditionalComponentValidation
       component.additionalValidation.forEach(function (config) {
         // If we've already encountered an error, don't run any more validators.
         if (!error) {
-          error = additionalValidation(value, config);
+          error = additionalValidation(value, config, component);
         }
       });
       return error;

package/dist/utils/Validate/additional/mustEnterAtLeastOne.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+/**
+ * Additional validator for the Container component type.
+ * @param {*} data the form data
+ * @param {*} component the container component
+ * @returns true if the user has entered data into at least one component within the collection
+ * otherwise returns false
+ */
+var mustEnterAtLeastOne = function mustEnterAtLeastOne(data, _, component) {
+  var _component$components;
+
+  return (_component$components = component.components) === null || _component$components === void 0 ? void 0 : _component$components.some(function (inner) {
+    var _data$component$id;
+
+    if ((_data$component$id = data[component.id]) !== null && _data$component$id !== void 0 && _data$component$id[inner.id]) {
+      return true;
+    }
+
+    return false;
+  });
+};
+
+var _default = mustEnterAtLeastOne;
+exports.default = _default;

package/dist/utils/Validate/additional/mustEnterAtLeastOne.test.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustEnterAtLeastOne', function () {
+        var CONTAINER_ID = 'containerId';
+        var COMPONENT = {
+          id: CONTAINER_ID,
+          type: 'container',
+          components: [{
+            id: 'alpha'
+          }, {
+            id: 'bravo'
+          }, {
+            id: 'charlie'
+          }]
+        };
+        test('should return false if all components are empty', function () {
+          var DATA = {};
+          expect((0, _mustEnterAtLeastOne.default)(DATA, {}, COMPONENT)).toEqual(false);
+        });
+        test('should return true if one component has data', function () {
+          var DATA = _defineProperty({}, CONTAINER_ID, {
+            alpha: 'text'
+          });
+
+          expect((0, _mustEnterAtLeastOne.default)(DATA, {}, COMPONENT)).toEqual(true);
+        });
+      });
+    });
+  });
+});

package/dist/utils/Validate/validateContainer.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 
+var _additional = _interopRequireDefault(require("./additional"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
@@ -19,10 +21,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @returns Errors for all components within the container.
  */
 var validateContainer = function validateContainer(container, outerData, formData) {
+  if (!container) {
+    return [];
+  }
+
   var fd = formData || outerData;
+  var error = (0, _additional.default)(container, fd);
+
+  if (error) {
+    return {
+      id: container.id,
+      error: error
+    };
+  }
+
   var errors = [];
 
-  if (container && Array.isArray(container.components)) {
+  if (Array.isArray(container.components)) {
     var containerData = outerData && container.fieldId ? outerData[container.fieldId] : outerData;
     container.components.forEach(function (component) {
       errors.push((0, _validateComponent.default)(component, containerData, fd));

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

@@ -65,4 +65,17 @@ describe('utils.Validate.Container', function () {
       error: "Enter ".concat(EMAIL_LABEL.toLowerCase(), " in the correct format, like jane.doe@homeoffice.gov.uk")
     }]);
   });
+  it('should apply optional validators when specified', function () {
+    var ID = 'container';
+    var DATA = {};
+    var ADDITIONAL_VALIDATION = [{
+      function: 'mustEnterAtLeastOne',
+      message: 'Must enter at least one'
+    }];
+    var COMPONENT = setup(ID, _models.ComponentTypes.DATE, null, false, ADDITIONAL_VALIDATION);
+    expect((0, _validateContainer.default)(COMPONENT, DATA)).toEqual({
+      error: 'Must enter at least one',
+      id: ID
+    });
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "3.23.4",
+  "version": "3.25.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "1.13.3",
+    "@ukhomeoffice/cop-react-components": "1.13.4",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^3.13.0",