@ukhomeoffice/cop-react-form-renderer 2.7.3 → 2.8.3

package/dist/utils/CheckYourAnswers/getCYARowsForPage.js

@@ -11,6 +11,8 @@ var _FormPage = _interopRequireDefault(require("../FormPage"));
 
 var _getCYARow = _interopRequireDefault(require("./getCYARow"));
 
+var _getCYARowForGroup2 = _interopRequireDefault(require("./getCYARowForGroup"));
+
 var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
 
 var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
@@ -21,15 +23,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /**
  * Gets an array of row objects, each configured appropriately for a Check your answers component.
- * 
+ *
  * @param {object} page The page to show components for.
  * @param {Function} onAction A function to invoke if the change link on any row is clicked.
- * 
+ *
  * @returns An array of configuration objects for Check your answers rows.
  */
 var getCYARowsForPage = function getCYARowsForPage(page, onAction) {
   if (_FormPage.default.show(page, page.formData)) {
-    return page.components.filter(function (c) {
+    var _page$groups;
+
+    var rows = page.components.filter(function (c) {
       return (0, _showComponentCYA.default)(c, page.formData);
     }).flatMap(function (component) {
       if (component.type === _models.ComponentTypes.CONTAINER) {
@@ -38,6 +42,28 @@ var getCYARowsForPage = function getCYARowsForPage(page, onAction) {
 
       return (0, _getCYARow.default)(page, component, onAction);
     });
+
+    if (((_page$groups = page.groups) === null || _page$groups === void 0 ? void 0 : _page$groups.length) > 0) {
+      page.groups.forEach(function (group) {
+        var _getCYARowForGroup = (0, _getCYARowForGroup2.default)(page, group, rows, onAction),
+            row = _getCYARowForGroup.row,
+            insertAt = _getCYARowForGroup.insertAt;
+
+        if (insertAt > -1) {
+          rows.splice(insertAt, 0, row);
+        } else {
+          rows.push(row);
+        }
+      });
+      var allReplacedIds = page.groups.flatMap(function (g) {
+        return g.components;
+      });
+      return rows.filter(function (r) {
+        return !allReplacedIds.includes(r.id);
+      });
+    }
+
+    return rows;
   }
 
   return [];

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

@@ -1,11 +1,14 @@
 "use strict";
 
+var _react = require("@testing-library/react");
+
 var _models = require("../../models");
 
 var _getCYARowsForPage = _interopRequireDefault(require("./getCYARowsForPage"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// Global imports
 // Local imports
 describe('utils', function () {
   describe('CheckYourAnswers', function () {
@@ -173,6 +176,64 @@ describe('utils', function () {
           });
         });
       });
+      it('Add ability to display answers from multiple fields in a single row', function () {
+        var COMPONENT_ADDRESS = {
+          id: 'firstLineOfTheAddress',
+          fieldId: 'firstLineOfTheAddress',
+          label: 'address',
+          type: 'text'
+        };
+        var COMPONENT_TOWN = {
+          id: 'town',
+          fieldId: 'town',
+          label: 'Town',
+          type: 'text'
+        };
+        var COMPONENT_CITY = {
+          id: 'city',
+          fieldId: 'city',
+          label: 'City',
+          type: 'text'
+        };
+        var COMPONENT_POSTCODE = {
+          id: 'postCode',
+          fieldId: 'postCode',
+          label: 'postCode',
+          type: 'text'
+        };
+        var PAGE = {
+          components: [COMPONENT_ADDRESS, COMPONENT_TOWN, COMPONENT_CITY, COMPONENT_POSTCODE],
+          id: 'addressDetails',
+          fieldId: 'UK address',
+          groups: [{
+            id: 'address',
+            label: 'Address details',
+            components: ['firstLineOfTheAddress', 'town', 'city', 'postCode']
+          }],
+          name: 'address-details',
+          title: 'Address details',
+          formData: {
+            firstLineOfTheAddress: '10 Downing Street',
+            town: 'City of Westminster',
+            city: 'London',
+            postCode: 'SW1A 2AA'
+          }
+        };
+
+        var ON_ACTION = function ON_ACTION() {};
+
+        var _render = (0, _react.render)((0, _getCYARowsForPage.default)(PAGE, ON_ACTION).map(function (row) {
+          return row.value;
+        })),
+            container = _render.container;
+
+        expect(container.childNodes.length).toEqual(4);
+        var addressValues = container.childNodes;
+        expect(addressValues[0].childNodes[0].textContent).toEqual('10 Downing Street');
+        expect(addressValues[1].childNodes[0].textContent).toEqual('City of Westminster');
+        expect(addressValues[2].childNodes[0].textContent).toEqual('London');
+        expect(addressValues[3].childNodes[0].textContent).toEqual('SW1A 2AA');
+      });
     });
   });
 });

package/package.json

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