@ukhomeoffice/cop-react-form-renderer 6.0.6-peter → 6.7.0-alpha

package/dist/components/CollectionSummary/SummaryCardDetails.js

@@ -7,66 +7,134 @@ exports.default = exports.DEFAULT_CLASS = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 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; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (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 && {}.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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Global imports.
+// Global imports.
+
 // Local imports.
+
 // Styles.
-var DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form-summary-card-details';
-var SummaryCardDetails = function SummaryCardDetails(_ref) {
+
+const DEFAULT_CLASS = exports.DEFAULT_CLASS = 'hods-form-summary-card-details';
+const SummaryCardDetails = _ref => {
   var _masterPage$childPage;
-  var masterPage = _ref.masterPage,
-    childCollections = _ref.childCollections,
-    formData = _ref.formData,
-    entryData = _ref.entryData,
-    classModifiers = _ref.classModifiers,
-    hideChildSectionTitles = _ref.hideChildSectionTitles;
-  var classes = _utils.default.classBuilder(DEFAULT_CLASS, classModifiers);
-  var childMasterPages = (0, _react.useMemo)(function () {
-    return childCollections.map(function (childName) {
-      return masterPage.childPages.find(function (page) {
-        var _page$collection;
-        return ((_page$collection = page.collection) === null || _page$collection === void 0 ? void 0 : _page$collection.name) === childName;
-      });
-    }).filter(function (e) {
-      return !!e;
-    });
-  }, [masterPage, childCollections]);
-  return (masterPage === null || masterPage === void 0 || (_masterPage$childPage = masterPage.childPages) === null || _masterPage$childPage === void 0 ? void 0 : _masterPage$childPage.filter(function (p) {
-    return _utils.default.FormPage.show(p, _objectSpread(_objectSpread({}, formData), entryData));
-  }).map(function (childPage) {
+  let {
+    masterPage,
+    childCollections,
+    formData,
+    entryData,
+    classModifiers,
+    hideChildSectionTitles
+  } = _ref;
+  const classes = _utils.default.classBuilder(DEFAULT_CLASS, classModifiers);
+  const childMasterPages = (0, _react.useMemo)(() => childCollections.map(childName => masterPage.childPages.find(page => {
+    var _page$collection;
+    return ((_page$collection = page.collection) === null || _page$collection === void 0 ? void 0 : _page$collection.name) === childName;
+  })).filter(e => !!e), [masterPage, childCollections]);
+  const getSectionContent = (section, components, childPage) => {
+    let columnIndex = 0;
+    return section.columns.flatMap((column, index) => {
+      var _column$fields;
+      let rowIndex = 0;
+      const columnContent = (_column$fields = column.fields) === null || _column$fields === void 0 ? void 0 : _column$fields.flatMap(fieldId => {
+        const component = components.find(comp => comp.fieldId === fieldId);
+        if (!component || !(0, _showComponent.default)(component, {
+          ...childPage.formData,
+          ...entryData
+        })) {
+          return null;
+        }
+        if (component.type === _models.ComponentTypes.CONTAINER) {
+          const 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(subComponent => {
+            var _entryData$component$;
+            // Put value for current subcomponent at top level
+            const modEntry = {
+              ...entryData,
+              ...{
+                [subComponent.fieldId]: (_entryData$component$ = entryData[component.fieldId]) === null || _entryData$component$ === void 0 ? void 0 : _entryData$component$[subComponent.fieldId]
+              }
+            };
+            return (0, _getComponentRowForCYA.default)(childPage, {
+              ...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));
+      }).filter(e => !!e);
+      // If the column that's just been generated has anything in it
+      // 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.
+      const lastColumn = index === section.columns.length - 1;
+      if (!lastColumn && columnContent.length !== 0) {
+        columnIndex += 2;
+        return [].concat(columnContent, [/*#__PURE__*/_react.default.createElement("div", {
+          key: "divider".concat(columnIndex),
+          className: classes('divider'),
+          style: {
+            '--column': columnIndex
+          }
+        })]);
+      }
+      return columnContent;
+    }).filter(e => !!e);
+  };
+  return (masterPage === null || masterPage === void 0 || (_masterPage$childPage = masterPage.childPages) === null || _masterPage$childPage === void 0 ? void 0 : _masterPage$childPage.filter(p => _utils.default.FormPage.show(p, {
+    ...formData,
+    ...entryData
+  })).map(childPage => {
     var _childPage$summaryLay;
-    var allPageComponents = _utils.default.Component.elevateNested(childPage === null || childPage === void 0 ? void 0 : childPage.components, entryData);
-    return (_childPage$summaryLay = childPage.summaryLayout) === null || _childPage$summaryLay === void 0 ? void 0 : _childPage$summaryLay.sections.map(function (section) {
-      var _section$fields;
-      if (section.show_when && !_utils.default.Condition.meetsAll(section.show_when, _objectSpread(_objectSpread({}, formData), entryData))) {
+    const allPageComponents = _utils.default.Component.elevateNested(childPage === null || childPage === void 0 ? void 0 : childPage.components, entryData);
+    return (_childPage$summaryLay = childPage.summaryLayout) === null || _childPage$summaryLay === void 0 ? void 0 : _childPage$summaryLay.sections.map(section => {
+      if (section.show_when && !_utils.default.Condition.meetsAll(section.show_when, {
+        ...formData,
+        ...entryData
+      })) {
         return null;
       }
       if (section.type === 'childCollection') {
-        var childMasterPage = childMasterPages.find(function (p) {
-          return p.collection.name === section.collectionName;
-        });
-        var childFormData = entryData[section.collectionName.split('.').pop()] || [];
+        const childMasterPage = childMasterPages.find(p => p.collection.name === section.collectionName);
+        const childFormData = entryData[section.collectionName.split('.').pop()] || [];
         if (childMasterPage && childFormData.length > 0) {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("h3", {
             className: classes('section-title')
-          }, section.title), childFormData.map(function (entry) {
-            return /*#__PURE__*/_react.default.createElement(SummaryCardDetails, {
-              masterPage: childMasterPage,
-              childMasterPages: [],
-              formData: _objectSpread(_objectSpread(_objectSpread({}, formData), entryData), entry),
-              entryData: entry,
-              hideChildSectionTitles: true
-            });
-          }));
+          }, section.title), childFormData.map(entry => /*#__PURE__*/_react.default.createElement(SummaryCardDetails, {
+            masterPage: childMasterPage,
+            childMasterPages: [],
+            formData: {
+              ...formData,
+              ...entryData,
+              ...entry
+            },
+            entryData: entry,
+            hideChildSectionTitles: true
+          })));
         }
         return null;
       }
@@ -76,23 +144,13 @@ var SummaryCardDetails = function SummaryCardDetails(_ref) {
       }, !hideChildSectionTitles && /*#__PURE__*/_react.default.createElement("h3", {
         className: classes('section-title')
       }, section.title), /*#__PURE__*/_react.default.createElement("div", {
-        className: classes('section-content', "columns-".concat(section.columns))
-      }, (_section$fields = section.fields) === null || _section$fields === void 0 ? void 0 : _section$fields.map(function (fieldId) {
-        var component = allPageComponents.find(function (comp) {
-          return comp.fieldId === fieldId;
-        });
-        if (!component) {
-          return null;
+        className: classes('section-content'),
+        style: {
+          '--dividers': section.columns.length - 1
         }
-        return /*#__PURE__*/_react.default.createElement("div", {
-          key: fieldId,
-          className: classes('field')
-        }, (0, _getComponentRowForCYA.default)(childPage, component, classes, entryData));
-      })));
+      }, getSectionContent(section, allPageComponents, childPage)));
     });
-  }).filter(function (e) {
-    return !!e;
-  })) || null;
+  }).filter(e => !!e)) || null;
 };
 SummaryCardDetails.propTypes = {
   childCollections: _propTypes.default.arrayOf(_propTypes.default.string),

package/dist/components/CollectionSummary/SummaryCardDetails.scss

@@ -36,9 +36,12 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
     border-bottom: 2px solid #E9EBED;
 
     &-content {
-      display: flex;
-      flex-wrap: wrap;
+      display: grid;
+      grid-template-columns: repeat(var(--dividers), 1fr 2px) 1fr;
+      grid-auto-rows: minmax(100px, 1fr);
       gap: govuk-spacing(2);
+      position: relative;
+      margin-bottom: govuk-spacing(1);
 
       .hods-form-summary-card__field {
         box-sizing: border-box;
@@ -61,6 +64,7 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
         }
       }
 
+      /*
       &--columns-1,
       &--columns-2,
       &--columns-3 {
@@ -79,6 +83,9 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
       }
 
       &--columns-2 {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
         &::after {
           content: "";
           position: absolute;
@@ -89,12 +96,13 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
           left: 50%;
         }
 
-        .hods-form-summary-card-details__field {
-          flex: 0 0 calc(50% - 10px);
-        }
+
       }
 
       &--columns-3 {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+
         &::after {
           content: "";
           position: absolute;
@@ -106,7 +114,10 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
         }
 
         .hods-form-summary-card-details__field {
-          flex: 0 0 calc(33.333% - 10px);
+          grid-column-start: var("--column");
+          grid-column-end: var("--column");
+          grid-row-start: var("--row");
+          grid-row-end: var("--row");
 
           &:nth-child(2)::after {
             content: "";
@@ -119,6 +130,23 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
           }
         }
       }
+      */
+
+      .hods-form-summary-card-details__field {
+        grid-column-start: var(--column);
+        grid-column-end: var(--column);
+        grid-row-start: var(--row);
+        grid-row-end: var(--row);
+      }
+
+      .hods-form-summary-card-details__divider {
+        position: absolute;
+        height: 100%;
+        width: 100%;
+        background-color: #E9EBED;
+        grid-column-start: var(--column);
+        grid-column-end: var(--column);
+      }
     }
   }
 }
@@ -137,6 +165,15 @@ $govuk-font-family: 'Roboto', arial, sans-serif;
           display: none;
         }
 
+        .hods-form-summary-card-details__divider {
+          position: absolute;
+          height: 0%;
+          width: 0%;
+          background-color: #E9EBED;
+          grid-column-start: var(--column);
+          grid-column-end: var(--column);
+        }
+
         &--columns-2,
         &--columns-3 {
           position: relative;