@ukhomeoffice/cop-react-form-renderer 5.49.0 → 5.49.2

package/dist/components/FormComponent/FormComponent.test.js

@@ -1,9 +1,11 @@
 "use strict";
 
 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); }
+var _userEvent = _interopRequireDefault(require("@testing-library/user-event"));
 var _react = _interopRequireDefault(require("react"));
 var _setupTests = require("../../setupTests");
 var _FormComponent = _interopRequireDefault(require("./FormComponent"));
+var _models = require("../../models");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -347,5 +349,78 @@ describe('components', function () {
         }
       }, _callee9);
     })));
+    it('should correctly handle a nested file input on change event within a nested container', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var ID, NESTED_CONTAINER_ID, NESTED_ID, COMPONENT, DATA, ON_CHANGE_ARGS, ON_CHANGE_COUNT, ON_CHANGE, _renderWithValidation10, container, c, formGroup, fieldSet, input, FILE_EXTENSION, FILE_NAME, FILE_TYPE, str, blob, FILE;
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
+          case 0:
+            ID = 'component';
+            NESTED_CONTAINER_ID = 'nested-container-component';
+            NESTED_ID = 'nested-component';
+            COMPONENT = {
+              id: ID,
+              fieldId: ID,
+              type: _models.ComponentTypes.CHECKBOXES,
+              label: 'Checkboxes component',
+              data: {
+                options: [{
+                  value: 'EPSILON',
+                  label: 'Epsilon Label'
+                }, {
+                  value: 'GAMMA',
+                  label: 'Gamma Label',
+                  nested: [{
+                    id: NESTED_CONTAINER_ID,
+                    fieldId: NESTED_CONTAINER_ID,
+                    type: _models.ComponentTypes.CONTAINER,
+                    components: [{
+                      id: NESTED_ID,
+                      fieldId: NESTED_ID,
+                      label: 'File upload',
+                      type: _models.ComponentTypes.FILE
+                    }]
+                  }]
+                }]
+              }
+            };
+            DATA = {
+              component: 'GAMMA'
+            };
+            ON_CHANGE_ARGS = [];
+            ON_CHANGE_COUNT = 0;
+            ON_CHANGE = function ON_CHANGE(_ref13) {
+              var target = _ref13.target;
+              ON_CHANGE_ARGS.push(target);
+              ON_CHANGE_COUNT += 1;
+            };
+            _renderWithValidation10 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              value: DATA[ID],
+              onChange: ON_CHANGE,
+              formData: DATA
+            })), container = _renderWithValidation10.container; // Get hold of the file input.
+            c = container.childNodes[0];
+            formGroup = c.childNodes[0];
+            fieldSet = formGroup.childNodes[2];
+            input = fieldSet.childNodes[2].childNodes[0].childNodes[0].childNodes[2].childNodes[0];
+            FILE_EXTENSION = 'json';
+            FILE_NAME = "test.".concat(FILE_EXTENSION);
+            FILE_TYPE = 'application/JSON';
+            str = JSON.stringify({
+              alpha: 'bravo'
+            });
+            blob = new Blob([str]);
+            FILE = new File([blob], FILE_NAME, {
+              type: FILE_TYPE
+            });
+            _userEvent.default.upload(input, FILE);
+            expect(ON_CHANGE_COUNT).toEqual(3);
+          case 21:
+          case "end":
+            return _context10.stop();
+        }
+      }, _callee10);
+    })));
   });
 });

package/dist/utils/Component/getComponent.js

@@ -253,6 +253,7 @@ var getChildJsx = function getChildJsx(parent, paramChild) {
     component: child,
     value: child.value,
     onChange: parent.onChange,
+    onTopLevelChange: parent.onChange,
     key: child.key,
     formData: parent.formData
   });

package/dist/utils/Component/getDefaultValueFromConfig.js

@@ -79,7 +79,7 @@ var setupDefaultObjectValue = function setupDefaultObjectValue(defaultObject, da
   // be used as field names to get values from data.
   if (defaultObj.sourced) {
     var _result;
-    (_result = result) !== null && _result !== void 0 ? _result : result = {};
+    result = (_result = result) !== null && _result !== void 0 ? _result : {};
     Object.keys(defaultObj.sourced).every(function (key) {
       var sourcedValue = typeof defaultObj.sourced[key] === 'string' && (0, _getSourceData.default)(data, defaultObj.sourced[key]);
       if (sourcedValue === undefined && defaultObj.skipIfSourceInvalid) {

package/dist/utils/Validate/validateDate.js

@@ -31,7 +31,7 @@ var maxMonthDays = exports.maxMonthDays = function maxMonthDays(month, year) {
 };
 /**
  * Checks if a date passed is a valid date.
- * This will validate for 'leap years', missing components, invalid day, monnth or year components.
+ * This will validate for 'leap years', missing components, invalid day, month or year components.
  * EXAMPLE USE : const { message, propsInError } = validateDate('2-11-2020')
  * 
  * Note that an empty string is not considered invalid. You should use
@@ -56,53 +56,47 @@ var validateDate = function validateDate(date) {
     year = _formattedDate$split2[2];
   var intDay = parseInt(day, 10);
   var intMonth = parseInt(month, 10);
+  var badProps = [];
+  var messages = [];
   if (year.length === 0) {
-    return {
-      message: 'Date must include a year',
-      propsInError: {
-        year: true
-      }
-    };
-  }
-  if (year.length !== 4) {
-    return {
-      message: 'Year must be 4 numbers',
-      propsInError: {
-        year: true
-      }
-    };
+    badProps.push('year');
+    messages.push('Date must include a year');
+  } else if (year.length !== 4) {
+    badProps.push('year');
+    messages.push('Year must be 4 numbers');
   }
   if (month.length === 0) {
-    return {
-      message: 'Date must include a month',
-      propsInError: {
-        month: true
-      }
-    };
-  }
-  if (intMonth > 12 || intMonth < 1) {
-    return {
-      message: 'Month must be between 1 and 12',
-      propsInError: {
-        month: true
-      }
-    };
+    badProps.push('month');
+    messages.push('Date must include a month');
+  } else if (intMonth > 12 || intMonth < 1) {
+    badProps.push('month');
+    messages.push('Month must be between 1 and 12');
   }
   if (day.length === 0) {
-    return {
-      message: 'Date must include a day',
-      propsInError: {
-        day: true
-      }
-    };
+    badProps.push('day');
+    messages.push('Date must include a day');
+  } else {
+    var maxDays = maxMonthDays(month, year);
+    if (intDay > maxDays || intDay < 1) {
+      badProps.push('day');
+      messages.push("Day must be between 1 and ".concat(maxDays));
+    }
   }
-  var maxDays = maxMonthDays(month, year);
-  if (intDay > maxDays || intDay < 1) {
+  if (badProps.length > 0) {
+    // return single error or generic error if multiple problem
+    var propsInError = {};
+    if (badProps.includes('day')) {
+      propsInError.day = true;
+    }
+    if (badProps.includes('month')) {
+      propsInError.month = true;
+    }
+    if (badProps.includes('year')) {
+      propsInError.year = true;
+    }
     return {
-      message: "Day must be between 1 and ".concat(maxDays),
-      propsInError: {
-        day: true
-      }
+      message: badProps.length === 1 ? messages[0] : 'Enter a valid date',
+      propsInError: propsInError
     };
   }
   if ((0, _dayjs.default)(formattedDate, _utils.DATE_FORMAT).format(_utils.DATE_FORMAT) !== formattedDate) {

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

@@ -55,7 +55,8 @@ describe('utils', function () {
         });
       });
       test('should return an error if the year contains more than 4 numbers', function () {
-        var output = (0, _validateDate.default)('29-02-20202', 'DD-MM-YYYY');
+        // 20202 is not a leap year,so 29th Feb not valid
+        var output = (0, _validateDate.default)('28-02-20202', 'DD-MM-YYYY');
         expect(output).toEqual({
           message: 'Year must be 4 numbers',
           propsInError: {
@@ -99,6 +100,25 @@ describe('utils', function () {
           }
         });
       });
+      test('should handle multiple errors', function () {
+        var output = (0, _validateDate.default)('45-13-2020', 'DD-MM-YYYY');
+        expect(output).toEqual({
+          message: 'Enter a valid date',
+          propsInError: {
+            day: true,
+            month: true
+          }
+        });
+        var output2 = (0, _validateDate.default)('45-13-', 'DD-MM-YYYY');
+        expect(output2).toEqual({
+          message: 'Enter a valid date',
+          propsInError: {
+            day: true,
+            month: true,
+            year: true
+          }
+        });
+      });
       test('should correctly identify the maximum numbers of days in a given month and year', function () {
         var max = (0, _validateDate.maxMonthDays)('02', '2024');
         expect(max).toEqual(29);

package/dist/utils/Validate/validateTime.js

@@ -37,36 +37,33 @@ var validateTime = function validateTime(time) {
     minute = _formattedDate$split2[1];
   var intHour = parseInt(hour, 10);
   var intMinute = parseInt(minute, 10);
+  var badProps = [];
+  var messages = [];
   if (hour.length === 0) {
-    return {
-      message: 'Time must include a hour',
-      propsInError: {
-        hour: true
-      }
-    };
-  }
-  if (intHour > 23 || intHour < 0) {
-    return {
-      message: 'Hour must be between 0 and 23',
-      propsInError: {
-        hour: true
-      }
-    };
+    badProps.push('hour');
+    messages.push('Time must include a hour');
+  } else if (intHour > 23 || intHour < 0) {
+    badProps.push('hour');
+    messages.push('Hour must be between 0 and 23');
   }
   if (minute.length === 0) {
-    return {
-      message: 'Time must include a minute',
-      propsInError: {
-        minute: true
-      }
-    };
+    badProps.push('minute');
+    messages.push('Time must include a minute');
+  } else if (intMinute > 59 || intMinute < 0) {
+    badProps.push('minute');
+    messages.push('Minute must be between 0 and 59');
   }
-  if (intMinute > 59 || intMinute < 0) {
+  if (badProps.length > 0) {
+    var propsInError = {};
+    if (badProps.includes('hour')) {
+      propsInError.hour = true;
+    }
+    if (badProps.includes('minute')) {
+      propsInError.minute = true;
+    }
     return {
-      message: 'Minute must be between 0 and 59',
-      propsInError: {
-        minute: true
-      }
+      message: badProps.length > 1 ? 'Enter a valid time' : messages[0],
+      propsInError: propsInError
     };
   }
   return {

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

@@ -54,6 +54,16 @@ describe('utils', function () {
           }
         });
       });
+      test('should report multiple errors', function () {
+        var output = (0, _validateTime.default)('24:75');
+        expect(output).toEqual({
+          message: 'Enter a valid time',
+          propsInError: {
+            hour: true,
+            minute: true
+          }
+        });
+      });
     });
   });
 });

package/package.json

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