@ukhomeoffice/cop-react-form-renderer 4.87.0 → 4.88.0

package/dist/utils/Component/getComponent.js

@@ -22,7 +22,6 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 var LIST_CLASS = 'govuk-list';
 var BODY_CLASS = 'govuk-body';
-var INPUT_CLASS = 'govuk-input';
 
 /**
  * Separate function for each component type for the sake of
@@ -159,13 +158,7 @@ var getTextArea = function getTextArea(config) {
 };
 var getTextInput = function getTextInput(config) {
   var attrs = (0, _cleanAttributes.default)(config);
-  var classModifiers = attrs.fixedWidth ? [attrs.fixedWidth] : [];
-  var className = attrs.fluidWidth ? [attrs.fluidWidth] : undefined;
-  return /*#__PURE__*/_react.default.createElement(_copReactComponents.TextInput, _extends({}, attrs, {
-    classBlock: INPUT_CLASS,
-    classModifiers: classModifiers,
-    className: className
-  }));
+  return /*#__PURE__*/_react.default.createElement(_copReactComponents.TextInput, attrs);
 };
 var getTime = function getTime(config) {
   var attrs = (0, _cleanAttributes.default)(config);

package/dist/utils/Validate/validateCollection.js

@@ -32,10 +32,10 @@ var validateCollection = function validateCollection(collection, items, formData
           var newComponent = _objectSpread(_objectSpread({}, component), {}, {
             full_path: "".concat(fullPath, ".").concat(component.fieldId)
           });
-          if (Array.isArray(component.custom_errors)) {
+          if (component.custom_errors && Array.isArray(component.custom_errors)) {
             newComponent.custom_errors = component.custom_errors.map(function (error) {
               return _objectSpread(_objectSpread({}, error), {}, {
-                message: _copReactComponents.Utils.interpolateString(error.message, {
+                message: _copReactComponents.Utils.interpolateString(index === 0 && error.firstOnlyMessage ? error.firstOnlyMessage : error.message, {
                   index: labelCount
                 })
               });

package/dist/utils/Validate/validateCollection.test.js

@@ -86,4 +86,40 @@ describe('utils.Validate.Collection', function () {
       id: "".concat(ID, "[0].").concat(COLLECTION.type)
     }]);
   });
+  it('should correctly display firstOnlyMessage error message', function () {
+    var ID = 'container';
+    var LABEL = 'field';
+    var TYPE = 'autocomplete';
+    var ITEM = setup(ID, TYPE, LABEL, true, []);
+    ITEM.custom_errors = [{
+      "type": "required",
+      // eslint-disable-next-line no-template-curly-in-string
+      "message": "Test to check that ${index} is 1",
+      "firstOnlyMessage": "Test for first message"
+    }];
+    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
+    COLLECTION.countOffset = 0;
+    expect((0, _validateCollection.default)(COLLECTION, ITEM.custom_errors)).toEqual([{
+      error: "Test for first message",
+      id: "".concat(ID, "[0].").concat(COLLECTION.type)
+    }]);
+  });
+  it('should correctly display message if firstOnlyMessage is undefined', function () {
+    var ID = 'container';
+    var LABEL = 'field';
+    var TYPE = 'autocomplete';
+    var ITEM = setup(ID, TYPE, LABEL, true, []);
+    ITEM.custom_errors = [{
+      "type": "required",
+      // eslint-disable-next-line no-template-curly-in-string
+      "message": "Test to check that ${index} is 1",
+      "firstOnlyMessage": undefined
+    }];
+    var COLLECTION = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false, [ITEM]);
+    COLLECTION.countOffset = 0;
+    expect((0, _validateCollection.default)(COLLECTION, ITEM.custom_errors)).toEqual([{
+      error: "Test to check that 1 is 1",
+      id: "".concat(ID, "[0].").concat(COLLECTION.type)
+    }]);
+  });
 });

package/package.json

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