@ukhomeoffice/cop-react-form-renderer 3.0.1 → 3.0.2

package/dist/utils/Validate/validateCollection.js

@@ -15,7 +15,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-var validateCollection = function validateCollection(collection, items) {
+/**
+ * Validates all of the items within a collection.
+ * @param {object} collection The collection to validate.
+ * @param {object} items The data items in the collection.
+ * @param {object} formData The data at the top level of the form.
+ * @returns Errors for all components for all items within the collection.
+ */
+var validateCollection = function validateCollection(collection, items, formData) {
   var errors = [];
 
   if (collection && Array.isArray(collection.item) && Array.isArray(items)) {
@@ -29,7 +36,7 @@ var validateCollection = function validateCollection(collection, items) {
           });
         })
       };
-      errors.push((0, _validateContainer.default)(container, item));
+      errors.push((0, _validateContainer.default)(container, item, formData));
     });
   }
 

package/dist/utils/Validate/validateComponent.js

@@ -32,25 +32,27 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 /**
  * Validates a single component.
  * @param {object} component The component to validate.
- * @param {object} formData The data to use that holds this component's value.
+ * @param {object} outerData The data to use that holds this component's value.
+ * @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, formData) {
+var validateComponent = function validateComponent(component, outerData, formData) {
   var _component$data$optio;
 
-  if (!(0, _showComponent.default)(component, formData)) {
+  var fd = formData || outerData;
+
+  if (!(0, _showComponent.default)(component, fd)) {
     return undefined;
   }
 
-  var error = undefined;
-  var nestedId = undefined;
-  var propertiesInError = undefined;
-  var data = formData && _typeof(formData) === 'object' ? formData : {};
-
   if (component.type === _models.ComponentTypes.CONTAINER) {
-    return (0, _validateContainer.default)(component, formData);
+    return (0, _validateContainer.default)(component, outerData, fd);
   }
 
+  var error = undefined;
+  var nestedId = undefined;
+  var properties = undefined;
+  var data = outerData && _typeof(outerData) === 'object' ? outerData : {};
   var value = data[component.fieldId];
 
   if (component.required) {
@@ -60,7 +62,7 @@ var validateComponent = function validateComponent(component, formData) {
   if (!error) {
     switch (component.type) {
       case _models.ComponentTypes.COLLECTION:
-        return (0, _validateCollection.default)(component, value);
+        return (0, _validateCollection.default)(component, value, fd);
 
       case _models.ComponentTypes.EMAIL:
         error = (0, _validateEmail.default)(value, component.label);
@@ -74,7 +76,7 @@ var validateComponent = function validateComponent(component, formData) {
             message = _validator.message,
             propsInError = _validator.propsInError;
 
-        propertiesInError = propsInError;
+        properties = propsInError;
         error = message;
         break;
 
@@ -83,12 +85,10 @@ var validateComponent = function validateComponent(component, formData) {
           var nestedError;
 
           if (option.nested && option.nested.shown) {
-            var _nestedError;
-
-            nestedError = validateComponent(option.nested, formData);
-            error = (_nestedError = nestedError) === null || _nestedError === void 0 ? void 0 : _nestedError.error;
+            nestedError = validateComponent(option.nested, outerData, fd);
 
             if (nestedError) {
+              error = nestedError.error;
               nestedId = nestedError.id;
             }
           }
@@ -109,7 +109,7 @@ var validateComponent = function validateComponent(component, formData) {
       error = (0, _additional.default)(component, value);
 
       if (component.type === _models.ComponentTypes.DATE && error) {
-        propertiesInError = {
+        properties = {
           day: true,
           month: true,
           year: true
@@ -122,7 +122,7 @@ var validateComponent = function validateComponent(component, formData) {
     return {
       id: nestedId || component.full_path || component.id,
       error: error,
-      properties: propertiesInError
+      properties: properties
     };
   }
 

package/dist/utils/Validate/validateContainer.js

@@ -10,13 +10,22 @@ var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Local imports
-var validateContainer = function validateContainer(container, formData) {
+
+/**
+ * Validates all components within a container.
+ * @param {object} container The container to validate.
+ * @param {object} outerData The data to use that holds this component's value.
+ * @param {object} formData The data at the top level of the form.
+ * @returns Errors for all components within the container.
+ */
+var validateContainer = function validateContainer(container, outerData, formData) {
+  var fd = formData || outerData;
   var errors = [];
 
   if (container && Array.isArray(container.components)) {
-    var fd = formData && container.fieldId ? formData[container.fieldId] : formData;
+    var containerData = outerData && container.fieldId ? outerData[container.fieldId] : outerData;
     container.components.forEach(function (component) {
-      errors.push((0, _validateComponent.default)(component, fd));
+      errors.push((0, _validateComponent.default)(component, containerData, fd));
     });
   }
 

package/dist/utils/Validate/validatePage.js

@@ -21,7 +21,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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));
+      return errors.concat((0, _validateComponent.default)(component, page.formData, page.formData));
     }, []).filter(function (e) {
       return !!e;
     }).flat();

package/package.json

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