@ukhomeoffice/cop-react-form-renderer 5.73.0 → 5.74.0

package/dist/components/CollectionSummary/CollectionSummary.js

@@ -293,7 +293,10 @@ var CollectionSummary = function CollectionSummary(_ref) {
       label: config.addButton.label || DEFAULT_ADD_BUTTON_LABEL,
       page: config.addButton.page,
       type: _PageAction.PageActionTypes.COLLECTION_ADD,
-      classModifiers: ['secondary']
+      classModifiers: ['secondary'],
+      customAction: {
+        type: config.addButton.customAction
+      }
     },
     onAction: onAction
   }));
@@ -305,7 +308,10 @@ CollectionSummary.propTypes = {
     collectionName: _propTypes.default.string.isRequired,
     addButton: _propTypes.default.shape({
       label: _propTypes.default.string,
-      page: _propTypes.default.string.isRequired
+      page: _propTypes.default.string.isRequired,
+      customAction: _propTypes.default.shape({
+        type: _propTypes.default.string
+      })
     }),
     card: _propTypes.default.shape({
       banners: _propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.shape({})])),

package/dist/components/CollectionSummary/SummaryCardDetails.js

@@ -11,6 +11,7 @@ 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"));
+var _Condition = _interopRequireDefault(require("../../utils/Condition"));
 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; }
@@ -45,18 +46,38 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
   }, [masterPage, childCollections]);
   var getSectionContent = function getSectionContent(section, components, childPage) {
     var columnIndex = 0;
-    return section.columns.flatMap(function (column, index) {
+    return section.columns.filter(function (column) {
+      return _Condition.default.meetsAll(column, _objectSpread(_objectSpread({}, childPage.formData), entryData));
+    }).flatMap(function (column, index) {
       var _column$fields;
       var rowIndex = 0;
       var columnContent = (_column$fields = column.fields) === null || _column$fields === void 0 ? void 0 : _column$fields.flatMap(function (fieldId) {
-        var component = components.find(function (comp) {
+        var componentMatches = components.filter(function (comp) {
           return comp.fieldId === fieldId;
         });
-        if (!component || !(0, _showComponent.default)(component, _objectSpread(_objectSpread({}, childPage.formData), entryData))) {
-          return null;
-        }
-        if (component.type === _models.ComponentTypes.CONTAINER) {
-          var containerRows = (0, _getCYARowsForContainer.default)(childPage, component, entryData);
+        return componentMatches.map(function (component) {
+          if (!component || !(0, _showComponent.default)(component, _objectSpread(_objectSpread({}, childPage.formData), entryData))) {
+            return null;
+          }
+          if (component.type === _models.ComponentTypes.CONTAINER) {
+            var containerRows = (0, _getCYARowsForContainer.default)(childPage, component, entryData);
+            rowIndex += 1;
+            return /*#__PURE__*/_react.default.createElement("div", {
+              key: fieldId,
+              className: classes('field'),
+              style: {
+                '--column': columnIndex + 1,
+                '--row': rowIndex
+              }
+            }, containerRows.map(function (subComponent) {
+              var _entryData$component$;
+              // Put value for current subcomponent at top level
+              var modEntry = _objectSpread(_objectSpread({}, entryData), _defineProperty({}, subComponent.fieldId, (_entryData$component$ = entryData[component.fieldId]) === null || _entryData$component$ === void 0 ? void 0 : _entryData$component$[subComponent.fieldId]));
+              return (0, _getComponentRowForCYA.default)(childPage, _objectSpread(_objectSpread({}, subComponent), {
+                label: subComponent.key
+              }), classes, modEntry);
+            }));
+          }
           rowIndex += 1;
           return /*#__PURE__*/_react.default.createElement("div", {
             key: fieldId,
@@ -65,24 +86,8 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
               '--column': columnIndex + 1,
               '--row': rowIndex
             }
-          }, containerRows.map(function (subComponent) {
-            var _entryData$component$;
-            // Put value for current subcomponent at top level
-            var modEntry = _objectSpread(_objectSpread({}, entryData), _defineProperty({}, subComponent.fieldId, (_entryData$component$ = entryData[component.fieldId]) === null || _entryData$component$ === void 0 ? void 0 : _entryData$component$[subComponent.fieldId]));
-            return (0, _getComponentRowForCYA.default)(childPage, _objectSpread(_objectSpread({}, subComponent), {
-              label: subComponent.key
-            }), classes, modEntry);
-          }));
-        }
-        rowIndex += 1;
-        return /*#__PURE__*/_react.default.createElement("div", {
-          key: fieldId,
-          className: classes('field'),
-          style: {
-            '--column': columnIndex + 1,
-            '--row': rowIndex
-          }
-        }, (0, _getComponentRowForCYA.default)(childPage, component, classes, entryData));
+          }, (0, _getComponentRowForCYA.default)(childPage, component, classes, entryData));
+        });
       }).filter(function (e) {
         return !!e;
       });

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

@@ -464,4 +464,61 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
     var childFields = container.querySelectorAll(".".concat(classes('section')));
     expect(childFields.length).toEqual(2); // One for each entry in the child collection.
   });
+
+  it('should render components if a component with the same ID has already failed a show_when', function () {
+    var CHILD_PAGES = [{
+      summaryLayout: {
+        sections: [{
+          title: 'Section 1',
+          columns: [{
+            fields: ['fieldA']
+          }, {
+            fields: ['fieldB']
+          }]
+        }]
+      },
+      components: [{
+        fieldId: 'fieldA'
+      }, {
+        fieldId: 'fieldB',
+        label: 'first',
+        show_when: [{
+          field: 'fieldA',
+          op: '=',
+          value: 'notTheRightValue'
+        }]
+      }, {
+        fieldId: 'fieldB',
+        label: 'second',
+        show_when: [{
+          field: 'fieldA',
+          op: '!=',
+          value: 'notTheRightValue'
+        }]
+      }]
+    }];
+    var MASTER_PAGE = {
+      childPages: CHILD_PAGES
+    };
+    var _renderWithValidation8 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+        masterPage: MASTER_PAGE,
+        childMasterPages: [],
+        formData: {},
+        entryData: _objectSpread(_objectSpread({}, ENTRY), {}, {
+          fieldA: 'notTheRightValue'
+        })
+      })),
+      container = _renderWithValidation8.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;
+      });
+    }
+    var section1Title = getByTextContent(container, 'Section 1');
+    expect(section1Title).not.toBeUndefined();
+    var section1Content = section1Title.parentNode.querySelector(".".concat(classes('section-content')));
+    expect(section1Content.querySelectorAll(".".concat(classes('field'))).length).toEqual(2);
+  });
 });

package/package.json

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