@ukhomeoffice/cop-react-form-renderer 4.32.2 → 4.32.3

package/dist/utils/CollectionPage/mergeCollectionPages.test.js

@@ -174,26 +174,26 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
       },
       components: [{
         type: 'text',
-        show_when: [{
+        show_when: {
           field: 'field',
           op: '=',
           value: 'value'
-        }]
+        }
       }, {
         type: 'container',
         components: [{
           type: 'date',
-          show_when: [{
+          show_when: {
             field: 'field',
             op: '=',
             value: 'otherValue'
-          }]
+          }
         }],
-        show_when: [{
+        show_when: {
           field: 'field',
           op: '=',
           value: 'otherValue'
-        }]
+        }
       }],
       formData: {}
     });

package/dist/utils/Component/addShowWhen.js

@@ -36,7 +36,7 @@ var addShowWhen = function addShowWhen(component, condition) {
   if (result.show_when) {
     result.show_when = Array.isArray(result.show_when) ? [].concat(result.show_when, [_objectSpread({}, condition)]) : [result.show_when, _objectSpread({}, condition)];
   } else {
-    result.show_when = condition.type === 'or' ? result.show_when = _objectSpread({}, condition) : result.show_when = [_objectSpread({}, condition)];
+    result.show_when = condition;
   }
 
   return result;

package/dist/utils/Component/addShowWhen.test.js

@@ -44,7 +44,27 @@ describe('utils.Component.addShowWhen', function () {
     var result = (0, _addShowWhen.default)(COMPONENT, NEW_SHOW_WHEN);
     expect(result).toEqual({
       alpha: 'bravo',
-      show_when: [NEW_SHOW_WHEN]
+      show_when: NEW_SHOW_WHEN
+    });
+  });
+  it('should add the array type show_when to a component with no existing show_whens', function () {
+    var NEW_ARRAY_SHOW_WHEN = [{
+      field: 'abc',
+      op: '=',
+      value: 'bcd'
+    }, {
+      field: 'cde',
+      op: '=',
+      value: 'efg'
+    }];
+    var COMPONENT = {
+      alpha: 'bravo'
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, NEW_ARRAY_SHOW_WHEN);
+    console.log(result);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: NEW_ARRAY_SHOW_WHEN
     });
   });
   it('should add the show_when to a component with a single show_when', function () {

package/package.json

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