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

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"));
@@ -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

@@ -244,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": "5.58.1",
+  "version": "5.59.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",