@ukhomeoffice/cop-react-form-renderer 5.75.0 → 5.77.1

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -56,7 +56,7 @@ var getTitleRowForItem = function getTitleRowForItem(page, item, pageId, labelCo
     size: page.collection.titleSize || 's'
   };
 };
-var getHeadingRow = function getHeadingRow(config, pageId, labelCount, changeAction) {
+var getHeadingRow = function getHeadingRow(config, pageId, labelCount, changeAction, item) {
   if (config.text === '') {
     return null;
   }
@@ -64,7 +64,7 @@ var getHeadingRow = function getHeadingRow(config, pageId, labelCount, changeAct
     pageId: pageId,
     fieldId: "heading".concat(labelCount),
     full_path: "heading".concat(labelCount),
-    key: config.text,
+    key: _copReactComponents.Utils.interpolateString(config.text, item),
     type: changeAction === null ? 'heading' : 'headingWithAction',
     size: config.size || 's',
     action: changeAction === null ? null : {
@@ -73,14 +73,18 @@ var getHeadingRow = function getHeadingRow(config, pageId, labelCount, changeAct
     }
   };
 };
-var getCollectionNameHeading = function getCollectionNameHeading(page, titleName) {
+var getCollectionNameHeading = function getCollectionNameHeading(page, titleName, config, changeAction) {
   return {
     pageId: page.id,
     fieldId: "".concat(page.collection.name, "Title"),
     full_path: "".concat(page.collection.name, "Title"),
-    key: titleName.charAt(0).toUpperCase() + titleName.slice(1),
-    type: 'heading',
-    size: 'm'
+    key: (config === null || config === void 0 ? void 0 : config.text) || titleName.charAt(0).toUpperCase() + titleName.slice(1),
+    type: changeAction == null ? 'heading' : 'headingWithAction',
+    size: (config === null || config === void 0 ? void 0 : config.size) || 'm',
+    action: changeAction === null ? null : {
+      onAction: changeAction,
+      label: 'Change'
+    }
   };
 };
 var getActionRows = function getActionRows(page, item, onAction, labelCount) {
@@ -159,7 +163,7 @@ var getCYARowsForChildPages = function getCYARowsForChildPages(childPages, item,
         var changeAction = getChangeActionForPage(childPage, onAction, activeIds);
         if (childPage.collection.heading) {
           var headingAction = childPage.collection.heading.changeLink ? changeAction : null;
-          var headingRow = getHeadingRow(childPage.collection.heading, childPage.id, labelCount, headingAction);
+          var headingRow = getHeadingRow(childPage.collection.heading, childPage.id, labelCount, headingAction, item);
           rows = rows.concat(headingRow);
         }
         var container = getContainerForPage(childPage, item, labelCount, fullPath);
@@ -191,7 +195,11 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
   }
   var rows = [];
   if (!page.collection.hideNameFromCYA) {
-    rows.push(getCollectionNameHeading(page, collectionName));
+    var _page$collection$coll;
+    var headingChangeAction = (_page$collection$coll = page.collection.collectionHeading) !== null && _page$collection$coll !== void 0 && _page$collection$coll.changeLinkPage ? getChangeActionForPage({
+      id: page.collection.collectionHeading.changeLinkPage
+    }, onAction, activeIds) : null;
+    rows.push(getCollectionNameHeading(page, collectionName, page.collection.collectionHeading, headingChangeAction));
   }
   var itemIndex = 0;
   var result = Array.isArray(page.collection.onlyShowActiveEntryOnCYA) ? (0, _meetsAllConditions.default)(page.collection.onlyShowActiveEntryOnCYA, data) : page.collection.onlyShowActiveEntryOnCYA;

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

@@ -415,6 +415,75 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test text'
     });
   });
+  it('should allow interpolation of custom headings', function () {
+    var FORM_DATA = {
+      collection: [{
+        id: '01',
+        testText: 'value'
+      }]
+    };
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      formData: FORM_DATA,
+      childPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        collection: _objectSpread(_objectSpread({}, PAGES[0].collection), {}, {
+          // eslint-disable-next-line no-template-curly-in-string
+          heading: {
+            size: 'm',
+            text: 'interpolated text: ${testText}'
+          }
+        })
+      })]
+    });
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, null, FORM_DATA);
+    expect(ROWS.length).toEqual(7);
+    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({
+      type: 'heading',
+      key: 'interpolated text: value',
+      size: 'm'
+    });
+    expect(ROWS[6]).toMatchObject({
+      value: 'value',
+      key: 'Test text'
+    });
+  });
+  it('should alow configuration of collection name headings', function () {
+    var FORM_DATA = {
+      collection: [{
+        id: '01',
+        testText: 'value'
+      }]
+    };
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      formData: FORM_DATA,
+      collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
+        collectionHeading: {
+          text: 'Custom collection heading',
+          size: 'm',
+          changeLinkPage: PAGES[0].id
+        }
+      }),
+      childPages: [_objectSpread(_objectSpread({}, PAGES[0]), {}, {
+        collection: _objectSpread({}, PAGES[0].collection)
+      })]
+    });
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null, null, FORM_DATA);
+    expect(ROWS.length).toEqual(6);
+    expect(ROWS[0]).toMatchObject({
+      type: 'headingWithAction',
+      key: 'Custom collection heading'
+    });
+  });
   it('should default to a title size of small if one is not specified', function () {
     var FORM_DATA = {
       collection: [{

package/dist/utils/Component/elevateNestedComponents.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Data = _interopRequireDefault(require("../Data"));
+var _optionIsSelected = _interopRequireDefault(require("./optionIsSelected"));
 var _showComponent = _interopRequireDefault(require("./showComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -45,7 +46,7 @@ var elevateNestedComponents = function elevateNestedComponents(components, data)
         // selected, then add its nested components to the array.
         var sourceData = (data === null || data === void 0 ? void 0 : data[component.id]) || _Data.default.getSource(data, component.full_path);
         // If the specific option wasn't shown we shouldn't elevate anything nested under it
-        if (Array.isArray(option.nested) && sourceData === option.value && (0, _showComponent.default)(option, data)) {
+        if (Array.isArray(option.nested) && (0, _optionIsSelected.default)(sourceData, option) && (0, _showComponent.default)(option, data)) {
           allComponents = allComponents.concat(option.nested);
         }
       });

package/dist/utils/Component/elevateNestedComponents.test.js

@@ -263,4 +263,42 @@ describe('utils.Component.elevateNestedComponents', function () {
     };
     expect((0, _elevateNestedComponents.default)(COMPONENTS, DATA)).toEqual([].concat(COMPONENTS));
   });
+  it('should return the original array with elevated nested components that are defined using refdata_match when they are visible', function () {
+    var COMPONENTS = [{
+      id: 'textComp'
+    }, {
+      id: 'checkboxComp',
+      data: {
+        options: [{
+          label: 'Yes',
+          value: 'yes',
+          id: 99
+        }, {
+          label: 'No',
+          value: 'no',
+          id: 100
+        }, {
+          nested: [{
+            id: 'nestedOne'
+          }, {
+            id: 'nestedTwo'
+          }],
+          refdata_match: {
+            id: 99
+          }
+        }]
+      }
+    }];
+    var DATA = {
+      checkboxComp: [{
+        value: 'yes',
+        id: 99
+      }]
+    };
+    expect((0, _elevateNestedComponents.default)(COMPONENTS, DATA)).toEqual([].concat(COMPONENTS, [{
+      id: 'nestedOne'
+    }, {
+      id: 'nestedTwo'
+    }]));
+  });
 });

package/package.json

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