@ukhomeoffice/cop-react-form-renderer 2.6.1 → 2.7.1

package/dist/utils/Data/setDataItem.test.js

@@ -0,0 +1,112 @@
+"use strict";
+
+var _setDataItem = _interopRequireDefault(require("./setDataItem"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('utils.Data.setDataItem', function () {
+  it('should handle a null data object', function () {
+    var DATA = null;
+    var FIELD_ID = 'alpha.bravo.charlie';
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toBeNull();
+    expect(DATA).toBeNull();
+  });
+  it('should handle an undefined data object', function () {
+    var DATA = undefined;
+    var FIELD_ID = 'alpha.bravo.charlie';
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toBeUndefined();
+    expect(DATA).toBeUndefined();
+  });
+  it('should handle a null fieldId', function () {
+    var DATA = {};
+    var FIELD_ID = null;
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toMatchObject({});
+    expect(DATA).toMatchObject({});
+  });
+  it('should handle an undefined fieldId', function () {
+    var DATA = {};
+    var FIELD_ID = undefined;
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toMatchObject({});
+    expect(DATA).toMatchObject({});
+  });
+  it('should handle an empty fieldId', function () {
+    var DATA = {};
+    var FIELD_ID = '';
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toMatchObject({});
+    expect(DATA).toMatchObject({});
+  });
+  it('should appropriately set a nested value', function () {
+    var DATA = {
+      alpha: {}
+    };
+    var FIELD_ID = 'alpha.bravo.charlie';
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toMatchObject({
+      alpha: {
+        bravo: {
+          charlie: VALUE
+        }
+      }
+    });
+    expect(DATA).toMatchObject({
+      alpha: {
+        bravo: {
+          charlie: VALUE
+        }
+      }
+    });
+  });
+  it('should appropriately change a nested value', function () {
+    var DATA = {
+      alpha: {
+        bravo: {
+          charlie: 'echo'
+        }
+      }
+    };
+    var FIELD_ID = 'alpha.bravo.charlie';
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toMatchObject({
+      alpha: {
+        bravo: {
+          charlie: VALUE
+        }
+      }
+    });
+    expect(DATA).toMatchObject({
+      alpha: {
+        bravo: {
+          charlie: VALUE
+        }
+      }
+    });
+  });
+  it('should handle a parent node that is not an object and convert it appropriately', function () {
+    var DATA = {
+      alpha: {
+        bravo: 'echo'
+      }
+    };
+    var FIELD_ID = 'alpha.bravo.charlie';
+    var VALUE = 'delta';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE)).toMatchObject({
+      alpha: {
+        bravo: {
+          charlie: VALUE
+        }
+      }
+    });
+    expect(DATA).toMatchObject({
+      alpha: {
+        bravo: {
+          charlie: VALUE
+        }
+      }
+    });
+  });
+});

package/dist/utils/Validate/validatePage.js

@@ -7,20 +7,21 @@ exports.default = void 0;
 
 var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 
+var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
 
 /**
  * Validate all of the components on a page.
- * @param {Array} components The components to validate.
- * @param {object} formData The data to use that holds this components' values.
+ * @param {object} page The page to validate
  * @returns An array containing all of the errors.
  */
-var validatePage = function validatePage(components, formData) {
-  if (Array.isArray(components)) {
-    return components.reduce(function (errors, component) {
-      return errors.concat((0, _validateComponent.default)(component, formData));
+var validatePage = function validatePage(page) {
+  if ((0, _showFormPage.default)(page, page.formData) && Array.isArray(page.components)) {
+    return page.components.reduce(function (errors, component) {
+      return errors.concat((0, _validateComponent.default)(component, page.formData));
     }, []).filter(function (e) {
       return !!e;
     }).flat();

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

@@ -21,20 +21,36 @@ describe('utils', function () {
       };
 
       it('should return no error when the components array is null', function () {
-        expect((0, _validatePage.default)(null, {}).length).toEqual(0);
+        var PAGE = {
+          components: null,
+          formData: null
+        };
+        expect((0, _validatePage.default)(PAGE).length).toEqual(0);
       });
       it('should return no error when the components array is empty', function () {
-        expect((0, _validatePage.default)([], {}).length).toEqual(0);
+        var PAGE = {
+          components: [],
+          formData: null
+        };
+        expect((0, _validatePage.default)(PAGE).length).toEqual(0);
       });
       describe('when there is no form data', function () {
         it('should return no errors when no components are required', function () {
           var COMPONENTS = [setup('a', _models.ComponentTypes.TEXT, 'Alpha', false), setup('b', _models.ComponentTypes.TEXT, 'Bravo', false)];
-          expect((0, _validatePage.default)(COMPONENTS, null).length).toEqual(0);
+          var PAGE = {
+            components: COMPONENTS,
+            formData: null
+          };
+          expect((0, _validatePage.default)(PAGE).length).toEqual(0);
         });
         it('should return an error for each required component', 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 RESULT = (0, _validatePage.default)(COMPONENTS, null);
+          var PAGE = {
+            components: COMPONENTS,
+            formData: null
+          };
+          var RESULT = (0, _validatePage.default)(PAGE);
           expect(RESULT.length).toEqual(4);
           expect(RESULT[0]).toEqual({
             id: 'a',
@@ -61,19 +77,35 @@ describe('utils', function () {
         };
         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)];
-          expect((0, _validatePage.default)(COMPONENTS, DATA).length).toEqual(0);
+          var PAGE = {
+            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)];
-          expect((0, _validatePage.default)(COMPONENTS, DATA).length).toEqual(0);
+          var PAGE = {
+            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)];
-          expect((0, _validatePage.default)(COMPONENTS, DATA).length).toEqual(0);
+          var PAGE = {
+            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)];
-          expect((0, _validatePage.default)(COMPONENTS, DATA).length).toEqual(0);
+          var PAGE = {
+            components: COMPONENTS,
+            formData: DATA
+          };
+          expect((0, _validatePage.default)(PAGE).length).toEqual(0);
         });
       });
       describe('when the form data has one field missing and includes an invalid email', function () {
@@ -83,11 +115,19 @@ describe('utils', function () {
         };
         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)];
-          expect((0, _validatePage.default)(COMPONENTS, DATA).length).toEqual(0);
+          var PAGE = {
+            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 RESULT = (0, _validatePage.default)(COMPONENTS, DATA);
+          var PAGE = {
+            components: COMPONENTS,
+            formData: DATA
+          };
+          var RESULT = (0, _validatePage.default)(PAGE);
           expect(RESULT.length).toEqual(1);
           expect(RESULT[0]).toEqual({
             id: 'charlie',
@@ -96,7 +136,11 @@ describe('utils', function () {
         });
         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 RESULT = (0, _validatePage.default)(COMPONENTS, DATA);
+          var PAGE = {
+            components: COMPONENTS,
+            formData: DATA
+          };
+          var RESULT = (0, _validatePage.default)(PAGE);
           expect(RESULT.length).toEqual(1);
           expect(RESULT[0]).toEqual({
             id: 'bravo',
@@ -105,7 +149,11 @@ describe('utils', function () {
         });
         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 RESULT = (0, _validatePage.default)(COMPONENTS, DATA);
+          var PAGE = {
+            components: COMPONENTS,
+            formData: DATA
+          };
+          var RESULT = (0, _validatePage.default)(PAGE);
           expect(RESULT.length).toEqual(2);
           expect(RESULT[0]).toEqual({
             id: 'bravo',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "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.2.0",
+    "@ukhomeoffice/cop-react-components": "1.3.0",
     "axios": "^0.21.1",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^3.13.0",