@ukhomeoffice/cop-react-form-renderer 5.89.0 → 5.90.1

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

@@ -2,124 +2,132 @@
 
 var _models = require("../../models");
 var _validateCollection = _interopRequireDefault(require("./validateCollection"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Local imports
-describe('utils.Validate.Collection', function () {
-  var setup = function setup(id, type, label, required, item) {
-    return {
-      id: id,
-      fieldId: id,
-      type: type,
-      label: label,
-      required: required,
-      item: item
-    };
-  };
-  it('should return an empty array when the component is null', function () {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Local imports
+
+describe('utils.Validate.Collection', () => {
+  const setup = (id, type, label, required, item) => ({
+    id,
+    fieldId: id,
+    type,
+    label,
+    required,
+    item
+  });
+  it('should return an empty array when the component is null', () => {
     expect((0, _validateCollection.default)(null, [])).toEqual([]);
   });
-  it('should return an empty array when the collection has an undefined item array', function () {
-    var ID = 'collection';
-    var LABEL = 'field';
-    var COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false, undefined);
+  it('should return an empty array when the collection has an undefined item array', () => {
+    const ID = 'collection';
+    const LABEL = 'field';
+    const COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false, undefined);
     expect((0, _validateCollection.default)(COLLECTION, [])).toEqual([]);
   });
-  it('should return an empty array when the collection has an empty item array', function () {
-    var ID = 'collection';
-    var LABEL = 'field';
-    var COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false, []);
+  it('should return an empty array when the collection has an empty item array', () => {
+    const ID = 'collection';
+    const LABEL = 'field';
+    const COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false, []);
     expect((0, _validateCollection.default)(COLLECTION, [])).toEqual([]);
   });
-  it('should return an empty array when the collection has only valid items', function () {
-    var EMAIL_ID = 'email';
-    var EMAIL_LABEL = 'Email';
-    var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
-    var ID = 'collection';
-    var LABEL = 'field';
-    var COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false, [EMAIL]);
-    var ITEMS = [_defineProperty({}, EMAIL_ID, 'alpha.bravo@homeoffice.gov.uk'), _defineProperty({}, EMAIL_ID, 'charlie.delta@homeoffice.gov.uk')];
+  it('should return an empty array when the collection has only valid items', () => {
+    const EMAIL_ID = 'email';
+    const EMAIL_LABEL = 'Email';
+    const EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+    const ID = 'collection';
+    const LABEL = 'field';
+    const COLLECTION = setup(ID, _models.ComponentTypes.COLLECTION, LABEL, false, [EMAIL]);
+    const ITEMS = [{
+      [EMAIL_ID]: 'alpha.bravo@homeoffice.gov.uk'
+    }, {
+      [EMAIL_ID]: 'charlie.delta@homeoffice.gov.uk'
+    }];
     expect((0, _validateCollection.default)(COLLECTION, ITEMS)).toEqual([]);
   });
-  it('should return an array containing an error when the collection has an invalid first item', function () {
-    var EMAIL_ID = 'email';
-    var EMAIL_LABEL = 'Email';
-    var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
-    var ID = 'container';
-    var LABEL = 'field';
-    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [EMAIL]);
-    var ITEMS = [_defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.com'), _defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.gov.uk')];
+  it('should return an array containing an error when the collection has an invalid first item', () => {
+    const EMAIL_ID = 'email';
+    const EMAIL_LABEL = 'Email';
+    const EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+    const ID = 'container';
+    const LABEL = 'field';
+    const COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [EMAIL]);
+    const ITEMS = [{
+      [EMAIL_ID]: 'alpha.bravo@digital.homeoffice.com'
+    }, {
+      [EMAIL_ID]: 'alpha.bravo@digital.homeoffice.gov.uk'
+    }];
     expect((0, _validateCollection.default)(COLLECTION, ITEMS)).toEqual([{
-      id: "".concat(ID, "[0].").concat(EMAIL_ID),
-      error: "Enter ".concat(EMAIL_LABEL.toLowerCase(), " in the correct format, like jane.doe@homeoffice.gov.uk")
+      id: `${ID}[0].${EMAIL_ID}`,
+      error: `Enter ${EMAIL_LABEL.toLowerCase()} in the correct format, like jane.doe@homeoffice.gov.uk`
     }]);
   });
-  it('should return an array containing an error when the collection has an invalid second item', function () {
-    var EMAIL_ID = 'email';
-    var EMAIL_LABEL = 'Email';
-    var EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
-    var ID = 'container';
-    var LABEL = 'field';
-    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [EMAIL]);
-    var ITEMS = [_defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.gov.uk'), _defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.com')];
+  it('should return an array containing an error when the collection has an invalid second item', () => {
+    const EMAIL_ID = 'email';
+    const EMAIL_LABEL = 'Email';
+    const EMAIL = setup(EMAIL_ID, _models.ComponentTypes.EMAIL, EMAIL_LABEL, false);
+    const ID = 'container';
+    const LABEL = 'field';
+    const COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [EMAIL]);
+    const ITEMS = [{
+      [EMAIL_ID]: 'alpha.bravo@digital.homeoffice.gov.uk'
+    }, {
+      [EMAIL_ID]: 'alpha.bravo@digital.homeoffice.com'
+    }];
     expect((0, _validateCollection.default)(COLLECTION, ITEMS)).toEqual([{
-      id: "".concat(ID, "[1].").concat(EMAIL_ID),
-      error: "Enter ".concat(EMAIL_LABEL.toLowerCase(), " in the correct format, like jane.doe@homeoffice.gov.uk")
+      id: `${ID}[1].${EMAIL_ID}`,
+      error: `Enter ${EMAIL_LABEL.toLowerCase()} in the correct format, like jane.doe@homeoffice.gov.uk`
     }]);
   });
-  it('should correctly interpolate error messages using collection\'s index', function () {
-    var ID = 'container';
-    var LABEL = 'field';
-    var TYPE = 'autocomplete';
-    var ITEM = setup(ID, TYPE, LABEL, true, []);
+  it('should correctly interpolate error messages using collection\'s index', () => {
+    const ID = 'container';
+    const LABEL = 'field';
+    const TYPE = 'autocomplete';
+    const ITEM = setup(ID, TYPE, LABEL, true, []);
     ITEM.custom_errors = [{
       "type": "required",
       // eslint-disable-next-line no-template-curly-in-string
       "message": "Test to check that ${index} is 1"
     }];
-    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
+    const COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
     COLLECTION.countOffset = 0;
     expect((0, _validateCollection.default)(COLLECTION, ITEM.custom_errors)).toEqual([{
-      error: "Test to check that 1 is 1",
-      id: "".concat(ID, "[0].").concat(COLLECTION.type)
+      error: `Test to check that 1 is 1`,
+      id: `${ID}[0].${COLLECTION.type}`
     }]);
   });
-  it('should correctly display firstOnlyMessage error message', function () {
-    var ID = 'container';
-    var LABEL = 'field';
-    var TYPE = 'autocomplete';
-    var ITEM = setup(ID, TYPE, LABEL, true, []);
+  it('should correctly display firstOnlyMessage error message', () => {
+    const ID = 'container';
+    const LABEL = 'field';
+    const TYPE = 'autocomplete';
+    const ITEM = setup(ID, TYPE, LABEL, true, []);
     ITEM.custom_errors = [{
       "type": "required",
       // eslint-disable-next-line no-template-curly-in-string
       "message": "Test to check that ${index} is 1",
       "firstOnlyMessage": "Test for first message"
     }];
-    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
+    const COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
     COLLECTION.countOffset = 0;
     expect((0, _validateCollection.default)(COLLECTION, ITEM.custom_errors)).toEqual([{
-      error: "Test for first message",
-      id: "".concat(ID, "[0].").concat(COLLECTION.type)
+      error: `Test for first message`,
+      id: `${ID}[0].${COLLECTION.type}`
     }]);
   });
-  it('should correctly display message if firstOnlyMessage is undefined', function () {
-    var ID = 'container';
-    var LABEL = 'field';
-    var TYPE = 'autocomplete';
-    var ITEM = setup(ID, TYPE, LABEL, true, []);
+  it('should correctly display message if firstOnlyMessage is undefined', () => {
+    const ID = 'container';
+    const LABEL = 'field';
+    const TYPE = 'autocomplete';
+    const ITEM = setup(ID, TYPE, LABEL, true, []);
     ITEM.custom_errors = [{
       "type": "required",
       // eslint-disable-next-line no-template-curly-in-string
       "message": "Test to check that ${index} is 1",
       "firstOnlyMessage": undefined
     }];
-    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
+    const COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
     COLLECTION.countOffset = 0;
     expect((0, _validateCollection.default)(COLLECTION, ITEM.custom_errors)).toEqual([{
-      error: "Test to check that 1 is 1",
-      id: "".concat(ID, "[0].").concat(COLLECTION.type)
+      error: `Test to check that 1 is 1`,
+      id: `${ID}[0].${COLLECTION.type}`
     }]);
   });
 });

package/dist/utils/Validate/validateComponent.js

@@ -18,13 +18,9 @@ var _validateRegex = _interopRequireDefault(require("./validateRegex"));
 var _validateRequired = _interopRequireDefault(require("./validateRequired"));
 var _validateTextArea = _interopRequireDefault(require("./validateTextArea"));
 var _validateTime = _interopRequireDefault(require("./validateTime"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Local imports
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Local imports
+
 /**
  * Validates a single component.
  * @param {object} component The component to validate.
@@ -32,18 +28,21 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @param {object} formData The data at the top level of the form.
  * @returns The first encountered error with the component.
  */
-var validateComponent = function validateComponent(component, outerData, formData) {
-  var fd = formData || outerData;
-  if (!(0, _showComponent.default)(component, _objectSpread(_objectSpread({}, fd), outerData))) {
+const validateComponent = (component, outerData, formData) => {
+  const fd = formData || outerData;
+  if (!(0, _showComponent.default)(component, {
+    ...fd,
+    ...outerData
+  })) {
     return undefined;
   }
   if (component.type === _models.ComponentTypes.CONTAINER) {
     return (0, _validateContainer.default)(component, outerData, fd);
   }
-  var error;
-  var properties;
-  var data = outerData && _typeof(outerData) === 'object' ? outerData : {};
-  var value = data[component.fieldId];
+  let error;
+  let properties;
+  const data = outerData && typeof outerData === 'object' ? outerData : {};
+  let value = data[component.fieldId];
   if (component.type === _models.ComponentTypes.COLLECTION_SUMMARY) {
     value = (0, _getCollectionPageData.default)(component.collectionName, fd);
   }
@@ -60,10 +59,11 @@ var validateComponent = function validateComponent(component, outerData, formDat
       case _models.ComponentTypes.DATE:
       case _models.ComponentTypes.TIME:
         {
-          var validator = component.type === _models.ComponentTypes.DATE ? _validateDate.default : _validateTime.default;
-          var _validator = validator(value),
-            message = _validator.message,
-            propsInError = _validator.propsInError;
+          const validator = component.type === _models.ComponentTypes.DATE ? _validateDate.default : _validateTime.default;
+          const {
+            message,
+            propsInError
+          } = validator(value);
           properties = propsInError;
           error = message;
           break;
@@ -72,9 +72,8 @@ var validateComponent = function validateComponent(component, outerData, formDat
       case _models.ComponentTypes.CHECKBOXES:
       case _models.ComponentTypes.RADIOS:
         {
-          var _component$data$optio;
-          var nestedErrors = [];
-          (_component$data$optio = component.data.options) === null || _component$data$optio === void 0 || _component$data$optio.forEach(function (option) {
+          let nestedErrors = [];
+          component.data.options?.forEach(option => {
             if (option.nested && (0, _optionIsSelected.default)(formData[component.id], option)) {
               nestedErrors = nestedErrors.concat((0, _validateContainer.default)({
                 components: option.nested
@@ -113,8 +112,8 @@ var validateComponent = function validateComponent(component, outerData, formDat
   if (error) {
     return {
       id: component.full_path || component.id,
-      error: error,
-      properties: properties
+      error,
+      properties
     };
   }
   return undefined;