@ukhomeoffice/cop-react-form-renderer 4.22.4-charlie → 4.22.5

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.js

@@ -24,15 +24,15 @@ 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 getCYARowsForContainer = function getCYARowsForContainer(page, container, formData, onAction) {
-  if ((0, _showComponentCYA.default)(container, page.formData)) {
+  if ((0, _showComponentCYA.default)(container, _objectSpread(_objectSpread({}, page.formData), formData))) {
     var allComponents = (0, _elevateNestedComponents.default)(container.components, formData);
     return allComponents.filter(function (c) {
-      return (0, _showComponentCYA.default)(c, page.formData);
+      return (0, _showComponentCYA.default)(c, _objectSpread(_objectSpread({}, page.formData), formData));
     }).flatMap(function (component) {
       var fd = formData ? formData[component.fieldId] : undefined;
 
       if (component.type === _models.ComponentTypes.CONTAINER) {
-        return getCYARowsForContainer(page, component, fd, onAction);
+        return getCYARowsForContainer(page, component, _objectSpread(_objectSpread({}, fd), formData), onAction);
       }
 
       if (component.type === _models.ComponentTypes.COLLECTION) {

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

@@ -320,6 +320,44 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     checkTitleRow(1, ROWS[2]);
     checkValueRow(1, ROWS[3], 'Charlie');
   });
+  it('should conditionally show an appropriate row for a single text component inside a container belonging to a partial-collection', function () {
+    var OUTER_ID = 'a';
+    var INNER_ID = 'b';
+    var FORM_DATA = {
+      collectionName: [{
+        container: _defineProperty({}, INNER_ID, 'Bravo'),
+        other_data: true
+      }, {
+        container: _defineProperty({}, INNER_ID, 'Charlie'),
+        other_data: false
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {},
+      collection: 'collectionName'
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [{
+        id: INNER_ID,
+        fieldId: INNER_ID,
+        label: INNER_ID,
+        type: 'text'
+      }],
+      formData: FORM_DATA,
+      show_when: {
+        field: 'other_data',
+        op: '=',
+        value: true
+      }
+    };
+    expect((0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.collectionName[0], function () {}).length).toEqual(1);
+    expect((0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.collectionName[1], function () {})).toBeFalsy();
+  });
   it('should get the appropriate number for rows components with nested components inside a container', function () {
     var FORM_DATA = {
       container: {

package/package.json

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