@ukhomeoffice/cop-react-form-renderer 5.20.1 → 5.23.2

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

@@ -29,7 +29,7 @@ _dayjs.default.extend(_customParseFormat.default);
  * the date/time component can't be found.
  */
 var mustBeEarlierDateTime = function mustBeEarlierDateTime(data, config, container) {
-  var _container$components, _container$components2, _data$container$field, _data$container$field2;
+  var _container$components, _container$components2, _data$container$field, _data$container$field2, _data$container$field3, _data$container$field4;
   var date = (_container$components = container.components) === null || _container$components === void 0 ? void 0 : _container$components.find(function (c) {
     return c.fieldId === config.date;
   });
@@ -39,6 +39,11 @@ var mustBeEarlierDateTime = function mustBeEarlierDateTime(data, config, contain
   if (!date || !time || !data) {
     return false;
   }
+  var dateFromData = (_data$container$field = data[container.fieldId]) === null || _data$container$field === void 0 ? void 0 : _data$container$field[config.date];
+  var timeFromData = (_data$container$field2 = data[container.fieldId]) === null || _data$container$field2 === void 0 ? void 0 : _data$container$field2[config.time];
+  if (!dateFromData || !timeFromData) {
+    return true;
+  }
   // Here we return true if there are errors with the date & time components 
   // individually. This is to allow them to process their errors, and to prevent
   // validation from stopping at the container level.
@@ -48,8 +53,8 @@ var mustBeEarlierDateTime = function mustBeEarlierDateTime(data, config, contain
   if ((0, _validateComponent.default)(time, data[container.fieldId], data[container.fieldId])) {
     return true;
   }
-  var dateStr = (0, _utils.formatString)((_data$container$field = data[container.fieldId]) === null || _data$container$field === void 0 ? void 0 : _data$container$field[config.date]);
-  var timeStr = (0, _utils.formattedTime)((_data$container$field2 = data[container.fieldId]) === null || _data$container$field2 === void 0 ? void 0 : _data$container$field2[config.time]);
+  var dateStr = (0, _utils.formatString)((_data$container$field3 = data[container.fieldId]) === null || _data$container$field3 === void 0 ? void 0 : _data$container$field3[config.date]);
+  var timeStr = (0, _utils.formattedTime)((_data$container$field4 = data[container.fieldId]) === null || _data$container$field4 === void 0 ? void 0 : _data$container$field4[config.time]);
   return (0, _dayjs.default)("".concat(dateStr, " ").concat(timeStr), "".concat(_utils.DATE_FORMAT, " HH:mm")).isBefore((0, _dayjs.default)());
 };
 var _default = mustBeEarlierDateTime;

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

@@ -70,6 +70,27 @@ describe('utils.Validate.additional.mustBeEarlierDateTime', function () {
     var result = (0, _mustBeEarlierDateTime.default)(EDITED_DATA, CONFIG, CONTAINER);
     expect(result).toEqual(true);
   });
+  test('should return true if time value is missing and optional', function () {
+    var EDITED_DATA = {
+      testContainer: {
+        testDate: '01-01-2000'
+      }
+    };
+    var EDITED_CONTAINER = {
+      fieldId: 'testContainer',
+      type: 'container',
+      components: [{
+        fieldId: 'testDate',
+        type: 'date',
+        required: true
+      }, {
+        fieldId: 'testTime',
+        type: 'time'
+      }]
+    };
+    var result = (0, _mustBeEarlierDateTime.default)(EDITED_DATA, CONFIG, EDITED_CONTAINER);
+    expect(result).toEqual(true);
+  });
   test('should return true if date has errors', function () {
     var EDITED_DATA = {
       testContainer: {

package/dist/utils/Validate/validatePage.js

@@ -26,8 +26,8 @@ var validatePage = function validatePage(page) {
   if (page.collection) {
     var activeIndex = _CollectionPage.default.getActiveIndex(page.collection.name, page.formData);
     if (activeIndex !== null) {
-      var _page$formData$page$c;
-      data = _objectSpread(_objectSpread({}, page.formData), (_page$formData$page$c = page.formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c[activeIndex]);
+      var _CollectionPage$getDa;
+      data = _objectSpread(_objectSpread({}, page.formData), (_CollectionPage$getDa = _CollectionPage.default.getData(page.collection.name, page.formData)) === null || _CollectionPage$getDa === void 0 ? void 0 : _CollectionPage$getDa[activeIndex]);
     }
   }
   if ((0, _showFormPage.default)(page, data) && Array.isArray(page.components)) {

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

@@ -100,6 +100,33 @@ describe('utils.Validate.Page', function () {
           error: 'Echo is required'
         });
       });
+      it('should return an error for each required component on a nested 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: 'parent.child'
+          },
+          formData: null
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(4);
+        expect(RESULT).toEqual([{
+          id: 'a',
+          error: 'Alpha is required'
+        }, {
+          id: 'b',
+          error: 'Bravo is required'
+        }, {
+          id: 'd',
+          error: 'Delta is required'
+        }, {
+          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
@@ -124,26 +151,22 @@ describe('utils.Validate.Page', function () {
         };
         var RESULT = (0, _validatePage.default)(PAGE);
         expect(RESULT.length).toEqual(5);
-        expect(RESULT[0]).toEqual({
+        expect(RESULT).toEqual([{
           id: 'a',
           error: "Alpha ".concat(PAGE.formData.tiger, " is required")
-        });
-        expect(RESULT[1]).toEqual({
+        }, {
           id: 'b',
           error: "Bravo ".concat(PAGE.formData.panther, " is required")
-        });
-        expect(RESULT[2]).toEqual({
+        }, {
           id: 'c',
           error: "Charlie ".concat(PAGE.formData.eagle, " is required")
-        });
-        expect(RESULT[3]).toEqual({
+        }, {
           id: 'd',
           error: "Delta ".concat(PAGE.formData.lion, " is required")
-        });
-        expect(RESULT[4]).toEqual({
+        }, {
           id: 'e',
           error: "Echo ".concat(PAGE.formData.zoo, " is required")
-        });
+        }]);
       });
     });
     describe('when the form data is fully valid', function () {
@@ -337,22 +360,19 @@ describe('utils.Validate.Page', function () {
         };
         var RESULT = (0, _validatePage.default)(PAGE);
         expect(RESULT.length).toEqual(4);
-        expect(RESULT[0]).toEqual({
+        expect(RESULT).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),
@@ -469,4 +489,234 @@ describe('utils.Validate.Page', function () {
       });
     });
   });
+  describe('with a nested CollectionPage', function () {
+    var COLLECTION = {
+      name: 'parent.child'
+    };
+    describe('when the form data is fully valid', function () {
+      var DATA = {
+        parentActiveId: '01',
+        childActiveId: '01',
+        parent: [{
+          id: '01',
+          child: [{
+            id: '01',
+            alpha: 'alpha.smith@digital.homeoffice.gov.uk',
+            bravo: 'bravo.jones@digital.homeoffice.gov.uk'
+          }]
+        }]
+      };
+      it('should return no errors when none of the components are required or email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.TEXT, 'Alpha', false), setup('bravo', _models.ComponentTypes.TEXT, 'Bravo', false)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        expect((0, _validatePage.default)(PAGE).length).toEqual(0);
+      });
+      it('should return no errors when all of the components are required but not email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.TEXT, 'Alpha', true), setup('bravo', _models.ComponentTypes.TEXT, 'Bravo', true)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        expect((0, _validatePage.default)(PAGE).length).toEqual(0);
+      });
+      it('should return no errors when none of the components are required but are all email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.EMAIL, 'Alpha', false), setup('bravo', _models.ComponentTypes.EMAIL, 'Bravo', false)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        expect((0, _validatePage.default)(PAGE).length).toEqual(0);
+      });
+      it('should return no errors when all of the components are required and email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.EMAIL, 'Alpha', true), setup('bravo', _models.ComponentTypes.EMAIL, 'Bravo', true)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        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: 'parent.child'
+          },
+          show_when: {
+            field: 'isShown',
+            op: '=',
+            value: true
+          },
+          formData: {
+            parentActiveId: '01',
+            childActiveId: '01',
+            parent: [{
+              id: '01',
+              child: [{
+                id: '01',
+                isShown: true
+              }]
+            }]
+          }
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(4);
+        expect(RESULT).toEqual([{
+          id: 'a',
+          error: 'Alpha is required'
+        }, {
+          id: 'b',
+          error: 'Bravo is required'
+        }, {
+          id: 'd',
+          error: 'Delta is required'
+        }, {
+          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: 'parent.child'
+          },
+          show_when: {
+            field: 'isShown',
+            op: '=',
+            value: true
+          },
+          formData: {
+            parentActiveId: '01',
+            childActiveId: '01',
+            parent: [{
+              id: '01',
+              child: [{
+                id: '01',
+                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 DATA = {
+        parentActiveId: '01',
+        childActiveId: '01',
+        parent: [{
+          id: '01',
+          child: [{
+            id: '01',
+            alpha: 'alpha.smith@digital.homeoffice.gov.uk',
+            bravo: 'bravo.jones@hotmail.com'
+          }]
+        }]
+      };
+      it('should return no errors when none of the components are required or email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.TEXT, 'Alpha', false), setup('bravo', _models.ComponentTypes.TEXT, 'Bravo', false), setup('charlie', _models.ComponentTypes.TEXT, 'Charlie', false)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: null
+        };
+        expect((0, _validatePage.default)(PAGE).length).toEqual(0);
+      });
+      it('should return an error for the missing field when all are required but not email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.TEXT, 'Alpha', true), setup('bravo', _models.ComponentTypes.TEXT, 'Bravo', true), setup('charlie', _models.ComponentTypes.TEXT, 'Charlie', true)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(1);
+        expect(RESULT[0]).toEqual({
+          id: 'charlie',
+          error: 'Charlie is required'
+        });
+      });
+      it('should return an error for the invalid email field when none are required but all email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.EMAIL, 'Alpha', false), setup('bravo', _models.ComponentTypes.EMAIL, 'Bravo', false), setup('charlie', _models.ComponentTypes.EMAIL, 'Charlie', false)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(1);
+        expect(RESULT[0]).toEqual({
+          id: 'bravo',
+          error: 'Enter bravo in the correct format, like jane.doe@homeoffice.gov.uk'
+        });
+      });
+      it('should return an error for both invalid fields when all are required and email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.EMAIL, 'Alpha', true), setup('bravo', _models.ComponentTypes.EMAIL, 'Bravo', true), setup('charlie', _models.ComponentTypes.EMAIL, 'Charlie', true)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: DATA
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(2);
+        expect(RESULT[0]).toEqual({
+          id: 'bravo',
+          error: 'Enter bravo in the correct format, like jane.doe@homeoffice.gov.uk'
+        });
+        expect(RESULT[1]).toEqual({
+          id: 'charlie',
+          error: 'Charlie is required'
+        });
+      });
+      it('should return an interpolated error for both invalid fields when all are required and email types', function () {
+        var COMPONENTS = [setup('alpha', _models.ComponentTypes.EMAIL, 'Alpha', true),
+        // eslint-disable-next-line no-template-curly-in-string
+        setup('bravo', _models.ComponentTypes.EMAIL, 'Bravo ${lion}', true),
+        // eslint-disable-next-line no-template-curly-in-string
+        setup('charlie', _models.ComponentTypes.EMAIL, 'Charlie ${panther}', true)];
+        var PAGE = {
+          collection: COLLECTION,
+          components: COMPONENTS,
+          formData: {
+            parentActiveId: '01',
+            childActiveId: '01',
+            parent: [{
+              id: '01',
+              child: [{
+                id: '01',
+                alpha: 'alpha.smith@digital.homeoffice.gov.uk',
+                bravo: 'bravo.jones@hotmail.com',
+                lion: 'Lion',
+                panther: 'Panther'
+              }]
+            }]
+          }
+        };
+        var RESULT = (0, _validatePage.default)(PAGE);
+        expect(RESULT.length).toEqual(2);
+        expect(RESULT[0]).toEqual({
+          id: 'bravo',
+          error: "Enter bravo Lion in the correct format, like jane.doe@homeoffice.gov.uk"
+        });
+        expect(RESULT[1]).toEqual({
+          id: 'charlie',
+          error: "Charlie Panther is required"
+        });
+      });
+    });
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.20.1",
+  "version": "5.23.2",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -27,7 +27,7 @@
     "@babel/eslint-parser": "^7.19.1",
     "@babel/preset-env": "^7.15.6",
     "@babel/preset-react": "^7.14.5",
-    "@monaco-editor/react": "^4.3.1",
+    "@monaco-editor/react": "4.4.6",
     "@storybook/addon-a11y": "^6.3.8",
     "@storybook/addon-actions": "^6.3.8",
     "@storybook/addon-docs": "^6.3.8",