@ukhomeoffice/cop-react-form-renderer 6.11.1 → 6.12.1

package/dist/utils/Validate/additional/index.test.js

@@ -58,6 +58,72 @@ describe('utils', function () {
         var VALUE = (0, _dayjs.default)().add(150, 'day').format(_utils.DATE_FORMAT);
         expect((0, _index.default)(COMPONENT, VALUE)).toEqual(undefined);
       });
+      it('should apply optional validators that fail when the value is an object', function () {
+        var COMPONENT = {
+          fieldId: 'container',
+          components: [{
+            id: 'eventDate',
+            fieldId: 'eventDate'
+          }, {
+            id: 'eventTime',
+            fieldId: 'eventTime'
+          }],
+          additionalValidation: [{
+            function: 'mustBeEarlierDateTime',
+            date: 'eventDate',
+            time: 'eventTime',
+            message: 'The date and time cannot be in the future'
+          }]
+        };
+        var VALUE = {
+          container: {
+            eventDate: '01-07-4024',
+            eventTime: '1:1'
+          }
+        };
+        expect((0, _index.default)(COMPONENT, VALUE)).toEqual('The date and time cannot be in the future');
+      });
+      it('should apply optional validators that pass when the value is an object', function () {
+        var COMPONENT = {
+          fieldId: 'container',
+          components: [{
+            id: 'eventDate',
+            fieldId: 'eventDate'
+          }, {
+            id: 'eventTime',
+            fieldId: 'eventTime'
+          }],
+          additionalValidation: [{
+            function: 'mustBeEarlierDateTime',
+            date: 'eventDate',
+            time: 'eventTime',
+            message: 'The date and time cannot be in the future'
+          }]
+        };
+        var VALUE = {
+          container: {
+            eventDate: '01-07-1024',
+            eventTime: '1:1'
+          }
+        };
+        expect((0, _index.default)(COMPONENT, VALUE)).toEqual(undefined);
+      });
+      it('should apply optional validators when the value is within an object', function () {
+        var COMPONENT = {
+          additionalValidation: [{
+            function: 'mustBeAfter',
+            value: 3,
+            unit: 'day',
+            objectValueToUse: "date",
+            message: 'Date must be more than 3 days in the future'
+          }]
+        };
+        var VALUE = {
+          testValue: "",
+          date: (0, _dayjs.default)().add(1, 'day').format(_utils.DATE_FORMAT)
+        };
+        expect((0, _index.default)(COMPONENT, VALUE)).toEqual('Date must be more than 3 days in the future');
+      });
     });
   });
 });

package/dist/utils/Validate/additional/mustBeOneOf.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+/**
+ * Function returns true if the string parameter is contained in the passed in array.
+ * @param {string} string - the string to check.
+ * @param {array} config.array - the array that the string will be checked against. 
+ * @returns true if string is contained in config.array, false if not.
+ */
+var mustBeOneOf = function mustBeOneOf(string, config) {
+  if (!string) {
+    // null, undefined and empty strings should be picked up by the required flag
+    // and not considered here as they would be valid for optional fields.
+    return true;
+  }
+  return config.array.includes(string);
+};
+var _default = exports.default = mustBeOneOf;

package/dist/utils/Validate/additional/mustBeOneOf.test.js

@@ -0,0 +1,36 @@
+"use strict";
+
+var _mustBeOneOf = _interopRequireDefault(require("./mustBeOneOf"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustBeShorterThan', function () {
+        test('should return true given the string is in the array', function () {
+          var result = (0, _mustBeOneOf.default)('test2', {
+            array: ["test1", "test2", "test3", "test4"]
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return false given the string is not in the array', function () {
+          var result = (0, _mustBeOneOf.default)('test5', {
+            array: ["test1", "test2", "test3", "test4"]
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return false given the array is empty', function () {
+          var result = (0, _mustBeOneOf.default)('test1', {
+            array: []
+          });
+          expect(result).toEqual(false);
+        });
+        test('should return false when only the partial string is in the array', function () {
+          var result = (0, _mustBeOneOf.default)('test', {
+            array: ["test1", "test2", "test3", "test4"]
+          });
+          expect(result).toEqual(false);
+        });
+      });
+    });
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "6.11.1",
+  "version": "6.12.1",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,11 +16,12 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "^4.0.0",
+    "@ukhomeoffice/cop-react-components": "4.7.2",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^5.0.0",
-    "web-vitals": "^1.0.1"
+    "web-vitals": "^1.0.1",
+    "uuid": "^8.1.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",