@ukhomeoffice/cop-react-form-renderer 3.0.3 → 3.2.2

package/dist/utils/Container/showContainer.test.js

@@ -125,4 +125,55 @@ describe('utils.Container.showContainer', function () {
     };
     expect((0, _showContainer.default)(CONTAINER, DATA)).toBeTruthy();
   });
+  it('SHOULD be shown when the container has multiple show_when conditions, with type "or" provided and ALL are matched', function () {
+    var CONTAINER = {
+      show_when: {
+        "type": "or",
+        "conditions": [{
+          field: 'alpha',
+          op: '=',
+          value: 'Alpha'
+        }, {
+          field: 'bravo',
+          op: '=',
+          value: 'Bravo'
+        }]
+      }
+    };
+    expect((0, _showContainer.default)(CONTAINER, DATA)).toBeTruthy();
+  });
+  it('SHOULD be shown when the container has multiple show_when conditions, with type "or" provided and at least ONE is matched', function () {
+    var CONTAINER = {
+      show_when: {
+        "type": "or",
+        "conditions": [{
+          field: 'alpha',
+          op: '=',
+          value: 'Alpha'
+        }, {
+          field: 'charlie',
+          op: '=',
+          value: 'Charlie'
+        }]
+      }
+    };
+    expect((0, _showContainer.default)(CONTAINER, DATA)).toBeTruthy();
+  });
+  it('should NOT be shown when the container has multiple show_when conditions, with type "or" provided and NONE are matched', function () {
+    var CONTAINER = {
+      show_when: {
+        "type": "or",
+        "conditions": [{
+          field: 'alpha',
+          op: '!=',
+          value: 'Alpha'
+        }, {
+          field: 'charlie',
+          op: '=',
+          value: 'Charlie'
+        }]
+      }
+    };
+    expect((0, _showContainer.default)(CONTAINER, DATA)).toBeFalsy();
+  });
 });

package/dist/utils/FormPage/showFormPage.js

@@ -41,6 +41,10 @@ var showFormPage = function showFormPage(page, data) {
 
 
   if (page.show_when) {
+    if (page.show_when.type === "or") {
+      return _Condition.default.meetsOne(page, data);
+    }
+
     return _Condition.default.meetsAll(page, data);
   } // If the page itself doesn't have a show_when, we need to make sure that if it
   // contains ANY editable components, at least one of them is shown.

package/dist/utils/FormPage/showFormPage.test.js

@@ -126,6 +126,57 @@ describe('utils', function () {
         };
         expect((0, _showFormPage.default)(PAGE, DATA)).toBeTruthy();
       });
+      it('SHOULD be shown when the page has multiple show_when conditions, with type "or" provided and ALL are matched', function () {
+        var PAGE = {
+          show_when: {
+            "type": "or",
+            "conditions": [{
+              field: 'alpha',
+              op: '=',
+              value: 'Alpha'
+            }, {
+              field: 'bravo',
+              op: '=',
+              value: 'Bravo'
+            }]
+          }
+        };
+        expect((0, _showFormPage.default)(PAGE, DATA)).toBeTruthy();
+      });
+      it('SHOULD be shown when the page has multiple show_when conditions, with type "or" provided and at least ONE is matched', function () {
+        var PAGE = {
+          show_when: {
+            "type": "or",
+            "conditions": [{
+              field: 'alpha',
+              op: '=',
+              value: 'Alpha'
+            }, {
+              field: 'charlie',
+              op: '=',
+              value: 'Charlie'
+            }]
+          }
+        };
+        expect((0, _showFormPage.default)(PAGE, DATA)).toBeTruthy();
+      });
+      it('should NOT be shown when the page has multiple show_when conditions, with type "or" provided and NONE are matched', function () {
+        var PAGE = {
+          show_when: {
+            "type": "or",
+            "conditions": [{
+              field: 'alpha',
+              op: '!=',
+              value: 'Alpha'
+            }, {
+              field: 'charlie',
+              op: '=',
+              value: 'Charlie'
+            }]
+          }
+        };
+        expect((0, _showFormPage.default)(PAGE, DATA)).toBeFalsy();
+      });
     });
   });
 });

package/dist/utils/Validate/validateComponent.js

@@ -50,7 +50,6 @@ var validateComponent = function validateComponent(component, outerData, formDat
   }
 
   var error = undefined;
-  var nestedId = undefined;
   var properties = undefined;
   var data = outerData && _typeof(outerData) === 'object' ? outerData : {};
   var value = data[component.fieldId];
@@ -81,21 +80,15 @@ var validateComponent = function validateComponent(component, outerData, formDat
         break;
 
       case _models.ComponentTypes.RADIOS:
-        (_component$data$optio = component.data.options) === null || _component$data$optio === void 0 ? void 0 : _component$data$optio.some(function (option) {
-          var nestedError;
-
-          if (option.nested && option.nested.shown) {
-            nestedError = validateComponent(option.nested, outerData, fd);
-
-            if (nestedError) {
-              error = nestedError.error;
-              nestedId = nestedError.id;
-            }
+        var nestedErrors = [];
+        (_component$data$optio = component.data.options) === null || _component$data$optio === void 0 ? void 0 : _component$data$optio.forEach(function (option) {
+          if (option.nested && formData[component.id] === option.value) {
+            nestedErrors = nestedErrors.concat((0, _validateContainer.default)({
+              components: option.nested
+            }, formData));
           }
-
-          return nestedError;
         });
-        break;
+        return nestedErrors;
 
       default:
         break;
@@ -120,7 +113,7 @@ var validateComponent = function validateComponent(component, outerData, formDat
 
   if (error) {
     return {
-      id: nestedId || component.full_path || component.id,
+      id: component.full_path || component.id,
       error: error,
       properties: properties
     };

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

@@ -211,17 +211,16 @@ describe('utils.Validate.Component', function () {
         id: 'a',
         data: {
           options: [{
-            nested: {
+            nested: [{
               type: 'text',
               fieldId: NESTED_ID,
               id: NESTED_ID,
-              required: true,
-              shown: true
-            }
+              required: true
+            }]
           }]
         }
       };
-      expect((0, _validateComponent.default)(COMPONENT, FORMDATA)).toBeUndefined();
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toEqual([]);
     });
     it('should return an error when the radio component contains nested components with errors', function () {
       var NESTED_ID = 'nestedId';
@@ -231,20 +230,19 @@ describe('utils.Validate.Component', function () {
         id: 'a',
         data: {
           options: [{
-            nested: {
+            nested: [{
               type: 'text',
               fieldId: NESTED_ID,
               id: NESTED_ID,
-              required: true,
-              shown: true
-            }
+              required: true
+            }]
           }]
         }
       };
-      expect((0, _validateComponent.default)(COMPONENT, FORMDATA)).toEqual({
+      expect((0, _validateComponent.default)(COMPONENT, undefined, FORMDATA)).toEqual([{
         id: NESTED_ID,
         error: "Field is required"
-      });
+      }]);
     });
     it('should return no error when a non selected radio component contains nested components with errors', function () {
       var NESTED_ID = 'nestedId';
@@ -253,16 +251,17 @@ describe('utils.Validate.Component', function () {
         id: 'a',
         data: {
           options: [{
-            nested: {
+            value: 'optionValue',
+            nested: [{
               type: 'text',
               fieldId: NESTED_ID,
               id: NESTED_ID,
               required: true
-            }
+            }]
           }]
         }
       };
-      expect((0, _validateComponent.default)(COMPONENT, {})).toBeUndefined();
+      expect((0, _validateComponent.default)(COMPONENT, undefined, {})).toEqual([]);
     });
   });
 });

package/package.json

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