@ukhomeoffice/cop-react-form-renderer 6.0.1-peter → 6.0.4-peter

package/dist/components/FormComponent/FormComponent.js

@@ -166,6 +166,7 @@ var FormComponent = function FormComponent(_ref) {
     options: options,
     value: value,
     onChange: onComponentChangeExtended,
+    onTopLevelChange: onTopLevelChange,
     formData: formData,
     onAction: onAction,
     submitting: submitting

package/dist/components/FormRenderer/helpers/clearOutUncompletedRoutes.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _showComponent = _interopRequireDefault(require("../../../utils/Component/showComponent"));
 var _mergeCollectionPages = _interopRequireDefault(require("../../../utils/CollectionPage/mergeCollectionPages"));
 var _deleteNodeByPath = _interopRequireDefault(require("./deleteNodeByPath"));
+var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-param-reassign */
 
@@ -18,6 +19,19 @@ var recurseCheckForHiddenComponents = function recurseCheckForHiddenComponents(c
       (_component$components = component.components) === null || _component$components === void 0 || _component$components.forEach(function (c) {
         recurseCheckForHiddenComponents(c, formData, path, candidateComponentForDeletion);
       });
+    } else if ((0, _showComponent.default)(component, formData)) {
+      var _component$data;
+      if (component !== null && component !== void 0 && (_component$data = component.data) !== null && _component$data !== void 0 && _component$data.options) {
+        var _component$data2;
+        component === null || component === void 0 || (_component$data2 = component.data) === null || _component$data2 === void 0 || (_component$data2 = _component$data2.options) === null || _component$data2 === void 0 || _component$data2.forEach(function (option) {
+          if (!(0, _optionIsSelected.default)(formData[component.id], option) && option.nested) {
+            option.nested.forEach(function (nested) {
+              path = nested.fieldId;
+              candidateComponentForDeletion.set(path, component);
+            });
+          }
+        });
+      }
     } else if (!(0, _showComponent.default)(component, formData)) {
       candidateComponentForDeletion.set(path, component);
     }
@@ -106,19 +120,24 @@ var clearOutUncompletedRoutes = function clearOutUncompletedRoutes(form, formDat
   var componentsUsedInVisiblePagesIds = [];
   condensedPages === null || condensedPages === void 0 || condensedPages.forEach(function (page) {
     var _page$collection;
-    if ((_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name) {
-      formData[page.collection.name].forEach(function (collectionData) {
-        /* eslint-disable consistent-return */
-        page.childPages.forEach(function (childPage) {
-          if (childPage.deleteCollectionWhenHidden) {
-            if (childPage && !(0, _showComponent.default)(childPage, collectionData) || childPage && !(0, _showComponent.default)(childPage, formData)) {
-              delete formData[childPage.collection.name];
-              return false;
+    if (page !== null && page !== void 0 && (_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name) {
+      var _page$collection2;
+      var collectionDatas = formData[page === null || page === void 0 || (_page$collection2 = page.collection) === null || _page$collection2 === void 0 ? void 0 : _page$collection2.name];
+      if (collectionDatas) {
+        collectionDatas.forEach(function (collectionData) {
+          var _page$childPages;
+          /* eslint-disable consistent-return */
+          (_page$childPages = page.childPages) === null || _page$childPages === void 0 || _page$childPages.forEach(function (childPage) {
+            if (childPage.deleteCollectionWhenHidden) {
+              if (childPage && !(0, _showComponent.default)(childPage, collectionData) || childPage && !(0, _showComponent.default)(childPage, formData)) {
+                delete formData[childPage.collection.name];
+                return false;
+              }
             }
-          }
-          deleteHiddenComponent(childPage, form, collectionData, formData);
+            deleteHiddenComponent(childPage, form, collectionData, formData);
+          });
         });
-      });
+      }
     } else {
       markComponentsForDeletion(page, form, formData, candidateComponentForDeletion, componentsUsedInVisiblePagesIds);
     }

package/dist/components/FormRenderer/onPageAction.js

@@ -56,7 +56,6 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
       _handlers.default.navigate(action, pageId, onPageChange);
       setSubmitting(false);
     } else {
-      var baseData = _objectSpread(_objectSpread(_objectSpread({}, data), patch), formState.page.formData);
       var pageUpdate = function pageUpdate(next) {
         return onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, next));
       };
@@ -108,12 +107,14 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
         setData(submissionData);
       }
       ;
+      var formPagesAndComponents = {
+        pages: pages,
+        components: components
+      };
       if (action.type === _models.PageAction.TYPES.SUBMIT) {
-        _helpers.default.clearOutUncompletedRoutes({
-          pages: pages,
-          components: components
-        }, submissionData);
+        _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
       }
+
       // In case of hub-and-spoke if patchLabel has changed then
       // save name and value to variables for call to onSubmit hook
       var changedFieldName;

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _models = require("../../models");
 var _addShowWhen = _interopRequireDefault(require("../Component/addShowWhen"));
+var _meetsAllConditions = _interopRequireDefault(require("../Condition/meetsAllConditions"));
 var _showFormPageCYA = _interopRequireDefault(require("../FormPage/showFormPageCYA"));
 var _getCYACollectionDeleteAction = _interopRequireDefault(require("./getCYACollectionDeleteAction"));
 var _getCYACollectionChangeAction = _interopRequireDefault(require("./getCYACollectionChangeAction"));
@@ -157,7 +158,7 @@ var getCYARowsForChildPages = function getCYARowsForChildPages(childPages, item,
         }
         var container = getContainerForPage(childPage, item, labelCount, fullPath);
         var rowChangeAction = getChangeActionForPage(childPage, onAction, activeIds);
-        var containerRows = (0, _getCYARowsForContainer.default)(childPage, container, item, rowChangeAction, fnOverride);
+        var containerRows = (0, _getCYARowsForContainer.default)(childPage, container, _objectSpread(_objectSpread({}, childPage.formData), item), rowChangeAction, fnOverride);
         rows = rows.concat(containerRows);
       }
     }
@@ -188,7 +189,8 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
     rows.push(getCollectionNameHeading(page, collectionName));
   }
   var itemIndex = 0;
-  if (page.collection.onlyShowActiveEntryOnCYA) {
+  var result = Array.isArray(page.collection.onlyShowActiveEntryOnCYA) ? (0, _meetsAllConditions.default)(page.collection.onlyShowActiveEntryOnCYA, data) : page.collection.onlyShowActiveEntryOnCYA;
+  if (result) {
     var activeEntry = collectionData.find(function (entry, index) {
       itemIndex = index;
       return entry.id === activeId;

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.test.js

@@ -170,6 +170,41 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test date'
     });
   });
+  it('should use values from top-level formData if they don\'t exist in the item', function () {
+    var FORM_DATA = {
+      testText: 'value',
+      collection: [{
+        id: '01'
+      }]
+    };
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      childPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        formData: FORM_DATA
+      }), PAGES[1]],
+      formData: FORM_DATA
+    });
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, null, FORM_DATA);
+    expect(ROWS.length).toEqual(7); // Title row + component row for each item
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Collection entry 1'
+    });
+    expect(ROWS[2].action.label).toEqual('Change');
+    expect(ROWS[3].action.label).toEqual('custom remove label');
+    expect(ROWS[4].action.label).toEqual('custom change label');
+    expect(ROWS[5]).toMatchObject({
+      value: 'value',
+      key: 'Test text'
+    });
+    expect(ROWS[6]).toMatchObject({
+      value: '',
+      key: 'Test date'
+    });
+  });
   it('should return correctly formatted rows for only the active entry when page.collection.onlyShowActiveEntryOnCYA is defined', function () {
     var FORM_DATA = {
       collectionActiveId: '02',
@@ -209,6 +244,50 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test date'
     });
   });
+  it('should return correctly formatted rows for only the active entry when page.collection.onlyShowActiveEntryOnCYA is an array', function () {
+    var FORM_DATA = {
+      text: 'blue',
+      collectionActiveId: '02',
+      collection: [{
+        id: '01',
+        testText: 'value'
+      }, {
+        id: '02',
+        testText: 'value'
+      }]
+    };
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+        onlyShowActiveEntryOnCYA: [{
+          field: 'text',
+          op: 'eq',
+          value: 'blue'
+        }]
+      }),
+      formData: FORM_DATA
+    });
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, null, FORM_DATA);
+    expect(ROWS.length).toEqual(7); // Title row + component row for only the active item.
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Collection entry 2'
+    });
+    expect(ROWS[2].action.label).toEqual('Change');
+    expect(ROWS[3].action.label).toEqual('custom remove label');
+    expect(ROWS[4].action.label).toEqual('custom change label');
+    expect(ROWS[5]).toMatchObject({
+      value: 'value',
+      key: 'Test text'
+    });
+    expect(ROWS[6]).toMatchObject({
+      value: '',
+      key: 'Test date'
+    });
+  });
   it('should exclude components that should not be shown', function () {
     var FD = {
       collection: [{

package/package.json

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