@ukhomeoffice/cop-react-form-renderer 5.58.0 → 5.58.1

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -157,7 +157,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);
       }
     }

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',

package/package.json

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