@ukhomeoffice/cop-react-form-renderer 4.69.2 → 4.70.1

package/dist/components/FormComponent/Collection.js

@@ -86,6 +86,12 @@ var Collection = function Collection(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  (0, _react.useEffect)(function () {
+    if (config.minimumEntries && !value.length) {
+      onAddAnother();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps  
+  }, [config.minimumEntries, value.length]);
   var onRemoveItem = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -123,7 +129,7 @@ var Collection = function Collection(_ref) {
     var removeLabel = _utils.default.interpolateString(labels.remove, _objectSpread(_objectSpread({}, item), {}, {
       index: labelCount
     }));
-    var removeStyle = config.disableAddAndRemove ? '' : (_config$removeLocatio = config.removeLocation) !== null && _config$removeLocatio !== void 0 ? _config$removeLocatio : 'start';
+    var removeStyle = config.disableAddAndRemove || index === 0 && config.minimumEntries ? '' : (_config$removeLocatio = config.removeLocation) !== null && _config$removeLocatio !== void 0 ? _config$removeLocatio : 'start';
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(classes('item')),
       key: item.id

package/dist/components/FormComponent/Collection.test.js

@@ -398,4 +398,57 @@ describe('components.FormComponent.Collection', function () {
       }
     }, _callee9);
   })));
+  it('should render a collection component with minimumEntries appropriately', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+    var COLLECTION, _renderWithValidation6, container, c, item, _item$childNodes3, title, itemContainer, formGroup, label, hint, input;
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
+        case 0:
+          COLLECTION = {
+            id: ID,
+            fieldId: ID,
+            type: _models.ComponentTypes.COLLECTION,
+            item: [TEXT_COMPONENT],
+            minimumEntries: 1
+          };
+          _renderWithValidation6 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react2.default.createElement(_FormComponent.default, {
+            component: COLLECTION,
+            value: [],
+            formData: {}
+          })), container = _renderWithValidation6.container; // Check the container itself.
+          c = container.childNodes[0];
+          expect(c.tagName).toEqual('DIV');
+          expect(c.classList).toContain(_Collection.DEFAULT_CLASS);
+
+          // And now check the single text component within it.
+          item = c.childNodes[0];
+          expect(item.tagName).toEqual('DIV');
+          expect(item.classList).toContain("".concat(_Collection.DEFAULT_CLASS, "__item"));
+          _item$childNodes3 = _slicedToArray(item.childNodes, 2), title = _item$childNodes3[0], itemContainer = _item$childNodes3[1];
+          expect(title.tagName).toEqual('LABEL');
+          expect(title.classList).toContain("".concat(_Collection.DEFAULT_CLASS, "__item-title"));
+          expect(itemContainer.tagName).toEqual('DIV');
+          expect(itemContainer.classList).toContain(_Container.DEFAULT_CLASS);
+          formGroup = itemContainer.childNodes[0];
+          expect(formGroup.tagName).toEqual('DIV');
+          expect(formGroup.classList).toContain('govuk-form-group');
+          label = formGroup.childNodes[0].childNodes[0].childNodes[0];
+          expect(label.tagName).toEqual('LABEL');
+          expect(label.classList).toContain('govuk-label');
+          expect(label.textContent).toEqual("".concat(TEXT_COMPONENT.label, " (optional)"));
+          expect(label.getAttribute('for')).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
+          hint = formGroup.childNodes[0].childNodes[1];
+          expect(hint.tagName).toEqual('DIV');
+          expect(hint.classList).toContain('govuk-hint');
+          expect(hint.textContent).toEqual(TEXT_COMPONENT.hint);
+          input = formGroup.childNodes[0].childNodes[2];
+          expect(input.tagName).toEqual('INPUT');
+          expect(input.classList).toContain('govuk-input');
+          expect(input.id).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
+          expect(input.value).toEqual('');
+        case 30:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  })));
 });

package/dist/components/TaskList/TaskList.js

@@ -13,7 +13,7 @@ var _models = require("../../models");
 var _Task = _interopRequireDefault(require("./Task"));
 var _showComponent = _interopRequireDefault(require("../../utils/Component/showComponent"));
 require("./TaskList.scss");
-var _excluded = ["refTitle", "refNumber", "notes", "incompleteTitle", "sections", "fieldId", "onTaskAction", "classBlock", "classModifiers", "className"];
+var _excluded = ["id", "refTitle", "refNumber", "notes", "incompleteTitle", "sections", "fieldId", "onTaskAction", "classBlock", "classModifiers", "className", "formData"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -31,7 +31,8 @@ exports.DEFAULT_CLASS = DEFAULT_CLASS;
 var DEFAULT_INCOMPLETE_TITLE = 'Incomplete form';
 exports.DEFAULT_INCOMPLETE_TITLE = DEFAULT_INCOMPLETE_TITLE;
 var TaskList = function TaskList(_ref) {
-  var refTitle = _ref.refTitle,
+  var id = _ref.id,
+    refTitle = _ref.refTitle,
     refNumber = _ref.refNumber,
     notes = _ref.notes,
     incompleteTitle = _ref.incompleteTitle,
@@ -41,6 +42,7 @@ var TaskList = function TaskList(_ref) {
     classBlock = _ref.classBlock,
     classModifiers = _ref.classModifiers,
     className = _ref.className,
+    formData = _ref.formData,
     attrs = _objectWithoutProperties(_ref, _excluded);
   var classes = _copReactComponents.Utils.classBuilder(classBlock, classModifiers, className);
 
@@ -58,7 +60,7 @@ var TaskList = function TaskList(_ref) {
     _sections$filter$redu2 = _slicedToArray(_sections$filter$redu, 2),
     completeSections = _sections$filter$redu2[0],
     totalSections = _sections$filter$redu2[1];
-  var notesId = "".concat(attrs.id, "Notes");
+  var notesId = "".concat(id, "Notes");
   var _ref2 = notes ? notes : {},
     notesTitle = _ref2.title,
     notesText = _ref2.text;
@@ -67,7 +69,9 @@ var TaskList = function TaskList(_ref) {
       onTaskAction(task);
     }
   };
-  return /*#__PURE__*/_react.default.createElement("div", _extends({}, attrs, {
+  return /*#__PURE__*/_react.default.createElement("div", _extends({
+    id: id
+  }, attrs, {
     className: classes()
   }), refNumber && refTitle && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-0"
@@ -81,15 +85,15 @@ var TaskList = function TaskList(_ref) {
     className: "tasklist-summary"
   }, incompleteTitle)), /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-7"
-  }, "You have completed ".concat(completeSections, " of ").concat(totalSections, " sections")), notesTitle && notesText && (0, _showComponent.default)(notes, attrs.formData) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
+  }, "You have completed ".concat(completeSections, " of ").concat(totalSections, " sections")), notesTitle && notesText && (0, _showComponent.default)(notes, formData) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
     className: "govuk-body govuk-!-margin-bottom-0"
   }, /*#__PURE__*/_react.default.createElement("strong", {
     className: "tasklist-summary"
-  }, _copReactComponents.Utils.interpolateString(notesTitle, attrs.formData))), /*#__PURE__*/_react.default.createElement(_copReactComponents.TextArea, {
+  }, _copReactComponents.Utils.interpolateString(notesTitle, formData))), /*#__PURE__*/_react.default.createElement(_copReactComponents.TextArea, {
     id: notesId,
     fieldId: notesId,
     readOnly: true,
-    value: _copReactComponents.Utils.interpolateString(notesText, attrs.formData)
+    value: _copReactComponents.Utils.interpolateString(notesText, formData)
   })), sections.filter(function (section) {
     return !section.skipped;
   }).map(function (section, index) {
@@ -111,6 +115,7 @@ var TaskList = function TaskList(_ref) {
   }));
 };
 TaskList.propTypes = {
+  id: _propTypes.default.string,
   refTitle: _propTypes.default.string,
   refNumber: _propTypes.default.string,
   notes: _propTypes.default.shape({
@@ -130,7 +135,8 @@ TaskList.propTypes = {
   })).isRequired,
   classBlock: _propTypes.default.string,
   classModifiers: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
-  className: _propTypes.default.string
+  className: _propTypes.default.string,
+  formData: _propTypes.default.shape({})
 };
 TaskList.defaultProps = {
   classBlock: DEFAULT_CLASS,

package/dist/components/TaskList/TaskList.test.js

@@ -326,10 +326,11 @@ describe('components', function () {
         container = _render6.container;
       var childNodes = container.childNodes;
       expect(childNodes.length).toEqual(1);
-      expect(childNodes[0].childNodes.length).toEqual(4);
-      expect(childNodes[0].childNodes[0].textContent).toEqual(INCOMPLETE_TITLE);
-      expect(childNodes[0].childNodes[1].textContent).toEqual('You have completed 1 of 3 sections');
-      expect(childNodes[0].childNodes[2].textContent).toEqual("1. ".concat(sections[1].name));
+      var children = childNodes[0].childNodes;
+      expect(children.length).toEqual(4);
+      expect(children[0].textContent).toEqual(INCOMPLETE_TITLE);
+      expect(children[1].textContent).toEqual('You have completed 1 of 3 sections');
+      expect(children[2].textContent).toEqual("1. ".concat(sections[1].name));
     });
   });
   it('should pass the selected task to the given onTaskAction function', function () {

package/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -13,6 +13,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var createMasterPage = function createMasterPage(page) {
   return {
     id: page.id,
+    name: page.name,
     collection: _objectSpread({
       masterPage: true
     }, page.collection),

package/package.json

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