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

package/dist/components/CollectionSummary/SummaryCard.js

@@ -61,6 +61,17 @@ var SummaryCard = function SummaryCard(_ref) {
     formData = _ref.formData,
     masterPage = _ref.masterPage,
     hideDetails = _ref.hideDetails;
+  var summaryCardRef = (0, _react.useRef)(null);
+  var handleDuplicateAndScroll = function handleDuplicateAndScroll() {
+    onDuplicate(entryData);
+    var currentSummaryCard = summaryCardRef.current;
+    if (currentSummaryCard && currentSummaryCard.nextSibling) {
+      currentSummaryCard.nextSibling.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start'
+      });
+    }
+  };
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     quickEdit = _useState2[0],
@@ -159,6 +170,7 @@ var SummaryCard = function SummaryCard(_ref) {
     });
   }
   return /*#__PURE__*/_react.default.createElement("div", {
+    ref: summaryCardRef,
     className: classes(),
     id: id
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -207,7 +219,7 @@ var SummaryCard = function SummaryCard(_ref) {
   }, ((_config$deleteAction2 = config.deleteAction) === null || _config$deleteAction2 === void 0 ? void 0 : _config$deleteAction2.label) || DEFAULT_DELETE_BUTTON_LABEL), config.duplicateAction && typeof onDuplicate === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".duplicateButton"),
     onClick: function onClick() {
-      onDuplicate(entryData);
+      handleDuplicateAndScroll();
     },
     classModifiers: "secondary",
     "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData),

package/dist/components/CollectionSummary/SummaryCardDetails.js

@@ -44,11 +44,9 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
       return !!e;
     });
   }, [masterPage, childCollections]);
-  var getSectionContent = function getSectionContent(section, components, childPage) {
+  var getSectionContent = function getSectionContent(columns, components, childPage) {
     var columnIndex = 0;
-    return section.columns.filter(function (column) {
-      return _Condition.default.meetsAll(column, _objectSpread(_objectSpread({}, childPage.formData), entryData));
-    }).flatMap(function (column, index) {
+    return columns.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) {
@@ -95,7 +93,7 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
       // then we stick a divider on it's right side. The divider isn't
       // passed rowIndex as it spans all rows. columnIndex is incremented
       // twice to account for the divider column too.
-      var lastColumn = index === section.columns.length - 1;
+      var lastColumn = index === columns.length - 1;
       if (!lastColumn && columnContent.length !== 0) {
         columnIndex += 2;
         return [].concat(columnContent, [/*#__PURE__*/_react.default.createElement("div", {
@@ -140,6 +138,9 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
         }
         return null;
       }
+      var columns = section.columns.filter(function (column) {
+        return _Condition.default.meetsAll(column, _objectSpread(_objectSpread({}, childPage.formData), entryData));
+      });
       return /*#__PURE__*/_react.default.createElement("div", {
         key: section.title,
         className: classes('section')
@@ -148,9 +149,9 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
       }, section.title), /*#__PURE__*/_react.default.createElement("div", {
         className: classes('section-content'),
         style: {
-          '--dividers': section.columns.length - 1
+          '--dividers': columns.length - 1
         }
-      }, getSectionContent(section, allPageComponents, childPage)));
+      }, getSectionContent(columns, allPageComponents, childPage)));
     });
   }).filter(function (e) {
     return !!e;

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

@@ -399,6 +399,57 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
     expect(section1Title).toBeUndefined();
     expect(section2Title).toBeUndefined();
   });
+  it('should not render columns that fail show_when checks', function () {
+    var CHILD_PAGES = [{
+      summaryLayout: {
+        sections: [{
+          title: 'Section 1',
+          columns: [{
+            fields: ['fieldA'],
+            show_when: [{
+              field: 'showSection1',
+              op: '=',
+              value: true
+            }]
+          }, {
+            fields: ['fieldB']
+          }]
+        }]
+      },
+      components: [{
+        fieldId: 'fieldA',
+        label: 'fieldA'
+      }, {
+        fieldId: 'fieldB',
+        label: 'fieldB'
+      }]
+    }];
+    var MASTER_PAGE = {
+      childPages: CHILD_PAGES
+    };
+    var _renderWithValidation7 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+        masterPage: MASTER_PAGE,
+        childMasterPages: [],
+        formData: {
+          testField: false
+        },
+        entryData: ENTRY
+      })),
+      container = _renderWithValidation7.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');
+    expect(section1Title).toBeDefined();
+    var section1Content = section1Title.parentNode.querySelector(".".concat(classes('section-content')));
+    expect(section1Content.querySelectorAll(".".concat(classes('field'))).length).toEqual(1);
+  });
   it('should render child collections', function () {
     var CHILD_MASTER_PAGES = [{
       collection: {
@@ -442,13 +493,13 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
       childPages: [].concat(CHILD_PAGES, CHILD_MASTER_PAGES)
     };
     var CHILD_COLLECTIONS = ['childCollection'];
-    var _renderWithValidation7 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+    var _renderWithValidation8 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
         masterPage: MASTER_PAGE,
         childCollections: CHILD_COLLECTIONS,
         formData: {},
         entryData: ENTRY
       })),
-      container = _renderWithValidation7.container;
+      container = _renderWithValidation8.container;
 
     // Function to find an element by its text content
     function getByTextContent(parent, text) {
@@ -500,7 +551,7 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
     var MASTER_PAGE = {
       childPages: CHILD_PAGES
     };
-    var _renderWithValidation8 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
+    var _renderWithValidation9 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_SummaryCardDetails.default, {
         masterPage: MASTER_PAGE,
         childMasterPages: [],
         formData: {},
@@ -508,7 +559,7 @@ describe('components.CollectionSummary.SummaryCardDetails', function () {
           fieldA: 'notTheRightValue'
         })
       })),
-      container = _renderWithValidation8.container;
+      container = _renderWithValidation9.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.74.0",
+  "version": "5.74.2",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",