@ukhomeoffice/cop-react-form-renderer 5.71.0 → 5.71.2

package/dist/components/CollectionPage/CollectionPage.js

@@ -29,7 +29,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // Global
 // Styles
 var DEFAULT_CLASS = exports.DEFAULT_CLASS = _FormPage2.DEFAULT_CLASS;
 var CollectionPage = function CollectionPage(_ref) {
-  var _page$collection, _objectSpread4;
+  var _page$collection, _objectSpread5;
   var page = _ref.page,
     pages = _ref.pages,
     onCollectionChange = _ref.onCollectionChange,
@@ -68,6 +68,9 @@ var CollectionPage = function CollectionPage(_ref) {
   var onTopLevelChange = function onTopLevelChange(_ref3) {
     var target = _ref3.target;
     currentPage.formData[target.name] = target.value;
+    setPatch(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, target.name, target.value));
+    });
   };
   var reportChange = function reportChange(newValue) {
     onPageChange({
@@ -121,7 +124,7 @@ var CollectionPage = function CollectionPage(_ref) {
   }
   return /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: _objectSpread(_objectSpread({}, page), {}, {
-      formData: _objectSpread(_objectSpread(_objectSpread({}, page.formData), data[activeIndex]), {}, (_objectSpread4 = {}, _defineProperty(_objectSpread4, "".concat(currentCollectionName, "ActiveIndex"), activeIndex), _defineProperty(_objectSpread4, "".concat(currentCollectionName, "NumberedIndex"), typeof activeIndex === 'number' ? activeIndex + 1 : null), _objectSpread4)),
+      formData: _objectSpread(_objectSpread(_objectSpread({}, page.formData), data[activeIndex]), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, "".concat(currentCollectionName, "ActiveIndex"), activeIndex), _defineProperty(_objectSpread5, "".concat(currentCollectionName, "NumberedIndex"), typeof activeIndex === 'number' ? activeIndex + 1 : null), _objectSpread5)),
       components: page.components.map(function (component) {
         return _objectSpread(_objectSpread({}, component), {}, {
           pageCollection: _objectSpread({}, page.collection)

package/dist/components/CollectionSummary/SummaryCardDetails.js

@@ -10,6 +10,7 @@ var _utils = _interopRequireDefault(require("../../utils"));
 var _models = require("../../models");
 var _getComponentRowForCYA = _interopRequireDefault(require("../../utils/CheckYourAnswers/getComponentRowForCYA"));
 var _getCYARowsForContainer = _interopRequireDefault(require("../../utils/CheckYourAnswers/getCYARowsForContainer"));
+var _showComponent = _interopRequireDefault(require("../../utils/Component/showComponent"));
 require("./SummaryCardDetails.scss");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -51,7 +52,7 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
         var component = components.find(function (comp) {
           return comp.fieldId === fieldId;
         });
-        if (!component) {
+        if (!component || !(0, _showComponent.default)(component, _objectSpread(_objectSpread({}, childPage.formData), entryData))) {
           return null;
         }
         if (component.type === _models.ComponentTypes.CONTAINER) {

package/dist/components/CollectionSummary/SummaryCardDetails.test.js

@@ -276,6 +276,65 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
     var section2Content = section2Title.parentNode.querySelector(".".concat(classes('section-content')));
     expect(section2Content.querySelectorAll(".".concat(classes('field'))).length).toEqual(1);
   });
+  it('should not render components that fail show_when checks', function () {
+    var CHILD_PAGES = [{
+      summaryLayout: {
+        sections: [{
+          title: 'Section 1',
+          columns: [{
+            fields: ['fieldA']
+          }, {
+            fields: ['fieldB']
+          }]
+        }, {
+          title: 'Section 2',
+          columns: [{
+            fields: ['fieldC']
+          }]
+        }]
+      },
+      components: [{
+        fieldId: 'fieldA'
+      }, {
+        fieldId: 'fieldB',
+        show_when: [{
+          field: 'fieldA',
+          op: '=',
+          value: 'notTheRightValue'
+        }]
+      }, {
+        fieldId: 'fieldC'
+      }]
+    }];
+    var MASTER_PAGE = {
+      childPages: CHILD_PAGES
+    };
+    var _renderWithValidation5 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+        masterPage: MASTER_PAGE,
+        childMasterPages: [],
+        formData: {},
+        entryData: ENTRY
+      })),
+      container = _renderWithValidation5.container;
+
+    // Function to find an element by its text content
+    function getByTextContent(parent, text) {
+      return Array.from(parent.getElementsByClassName(classes('section-title'))).find(function (el) {
+        return el.textContent === text;
+      });
+    }
+
+    // Check for section titles
+    var section1Title = getByTextContent(container, 'Section 1');
+    var section2Title = getByTextContent(container, 'Section 2');
+    expect(section1Title).not.toBeUndefined();
+    expect(section2Title).not.toBeUndefined();
+    var section1Content = section1Title.parentNode.querySelector(".".concat(classes('section-content')));
+    expect(section1Content.querySelectorAll(".".concat(classes('field'))).length).toEqual(1); // Just Field A, Field B should be hidden.
+
+    var section2Content = section2Title.parentNode.querySelector(".".concat(classes('section-content')));
+    expect(section2Content.querySelectorAll(".".concat(classes('field'))).length).toEqual(1);
+  });
   it('should not render sections on pages that fail show_when checks', function () {
     var CHILD_PAGES = [{
       show_when: [{
@@ -317,7 +376,7 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
     var CUSTOM_ENTRY = _objectSpread(_objectSpread({}, ENTRY), {}, {
       showSection1: false
     });
-    var _renderWithValidation5 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+    var _renderWithValidation6 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
         masterPage: MASTER_PAGE,
         childMasterPages: [],
         formData: {
@@ -325,7 +384,7 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
         },
         entryData: CUSTOM_ENTRY
       })),
-      container = _renderWithValidation5.container;
+      container = _renderWithValidation6.container;
 
     // Function to find an element by its text content
     function getByTextContent(parent, text) {
@@ -383,13 +442,13 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
       childPages: [].concat(CHILD_PAGES, CHILD_MASTER_PAGES)
     };
     var CHILD_COLLECTIONS = ['childCollection'];
-    var _renderWithValidation6 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+    var _renderWithValidation7 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
         masterPage: MASTER_PAGE,
         childCollections: CHILD_COLLECTIONS,
         formData: {},
         entryData: ENTRY
       })),
-      container = _renderWithValidation6.container;
+      container = _renderWithValidation7.container;
 
     // Function to find an element by its text content
     function getByTextContent(parent, text) {

package/package.json

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