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

package/dist/components/FormComponent/Collection.scss

@@ -5,7 +5,8 @@
     margin-bottom: 0.75rem;
   }
   &__item {
-    margin-top: 0;
+    margin-top: 15px;
+    margin-bottom: 15px;
     position: relative;
   }
   &__item-title {

package/dist/components/FormRenderer/FormRenderer.test.js

@@ -584,7 +584,7 @@ describe('components', function () {
       }, _callee18);
     })));
     it('should handle navigating between task list pages', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
-      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, taskList, firstTaskStatus, secondTaskStatus, firstTask, newPage, continueButton, cyaPageChange, modeChangeLink, changePage, cyaPage, finalSubmit;
+      var ON_SUBMIT_CALLS, ON_SUBMIT, HOOKS, taskList, firstTaskStatus, secondTaskStatus, firstTask, newPage, continueButton, seaButton, cyaPageChange, modeChangeLink, changePage, airButton, cyaPage, finalSubmit;
       return regeneratorRuntime.wrap(function _callee20$(_context20) {
         while (1) {
           switch (_context20.prev = _context20.next) {
@@ -662,8 +662,10 @@ describe('components', function () {
 
               newPage = container.childNodes[0].childNodes[0];
               expect(newPage.childNodes[0].textContent).toEqual('Event Mode');
+              seaButton = newPage.childNodes[1].childNodes[0].childNodes[2].childNodes[0];
+              expect(seaButton.textContent).toEqual('Sea');
 
-              _react.fireEvent.click(newPage.childNodes[1].childNodes[0].childNodes[1], {});
+              _react.fireEvent.click(seaButton.childNodes[0], {});
 
               continueButton = newPage.childNodes[2].childNodes[0];
 
@@ -671,17 +673,23 @@ describe('components', function () {
 
 
               cyaPageChange = container.childNodes[0].childNodes[0];
-              modeChangeLink = cyaPageChange.childNodes[0].childNodes[1].childNodes[0].childNodes[0];
+              expect(cyaPageChange.childNodes[0].textContent).toEqual('Check your answers');
+              modeChangeLink = cyaPageChange.childNodes[4].childNodes[0].childNodes[0].childNodes[2].childNodes[0];
+              expect(modeChangeLink.textContent).toEqual('Change Event Mode');
 
               _react.fireEvent.click(modeChangeLink, {});
 
               changePage = container.childNodes[0].childNodes[0];
-              expect(changePage.childNodes[1].textContent).toEqual('Event Mode'); // Click on radio for 'Air'
+              expect(changePage.childNodes[0].textContent).toEqual('Event Mode'); // Click on radio for 'Air'
 
-              _react.fireEvent.click(changePage.childNodes[2].childNodes[0].childNodes[3].childNodes[1].childNodes[0]); // Continue again to CYA page
+              airButton = changePage.childNodes[1].childNodes[0].childNodes[2].childNodes[1];
+              expect(airButton.textContent).toEqual('Air');
 
+              _react.fireEvent.click(airButton.childNodes[0]); // Continue again to CYA page
 
-              continueButton = changePage.childNodes[3].childNodes[0];
+
+              expect(changePage.childNodes[2].childNodes[0].textContent).toEqual('Save and continue');
+              continueButton = changePage.childNodes[2].childNodes[0];
 
               _react.fireEvent.click(continueButton, {}); //Continue on from CYA page
 
@@ -706,7 +714,7 @@ describe('components', function () {
               expect(finalSubmit.mode).toEqual('air');
               expect(finalSubmit.formStatus.tasks['Date, location and mode details'].complete).toEqual(true);
 
-            case 47:
+            case 54:
             case "end":
               return _context20.stop();
           }

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 = [_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 () {
@@ -93,4 +113,26 @@ describe('utils.Component.addShowWhen', function () {
       }, NEW_SHOW_WHEN]
     });
   });
+  it('should add the or type show_when to a component with no existing show_whens in an object not an array', function () {
+    var COMPONENT = {
+      alpha: 'bravo'
+    };
+    var SHOW_WHEN_OR = {
+      type: 'or',
+      condition: [{
+        field: 'field1',
+        op: '=',
+        values: 1
+      }, {
+        field: 'field2',
+        op: '=',
+        value: 2
+      }]
+    };
+    var result = (0, _addShowWhen.default)(COMPONENT, SHOW_WHEN_OR);
+    expect(result).toEqual({
+      alpha: 'bravo',
+      show_when: SHOW_WHEN_OR
+    });
+  });
 });

package/package.json

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