@ukhomeoffice/cop-react-form-renderer 5.91.0 → 5.92.0

package/dist/utils/Data/getOptions.js

@@ -39,13 +39,44 @@ var interpolateOptions = function interpolateOptions(config, options) {
     return n;
   });
 };
+
+/**
+ * Returns a list of options templated from a collection specified. 
+ * config requires a item field with the templated options  e.g 
+ * "item": {
+ * "value": "${id}"
+ * "label": "${name}"
+ * "hint": "Select a person name"
+ * }
+ * @param {*} config 
+ * @param {*} collectionName 
+ * @returns 
+ */
+var getCollectionOptions = function getCollectionOptions(config, collectionName) {
+  var collectionOptions = config.formData[collectionName].map(function (collection) {
+    return {
+      value: _copReactComponents.Utils.interpolateString(config.item.value, collection),
+      label: _copReactComponents.Utils.interpolateString(config.item.label, collection),
+      hint: _copReactComponents.Utils.interpolateString(config.item.hint, collection)
+    };
+  });
+  if (config.data.options) {
+    return [].concat(collectionOptions, config.data.options);
+  }
+  return collectionOptions;
+};
 var getOptions = function getOptions(config, callback) {
   if (config) {
-    var _config$data, _config$data2;
-    if (config.options && config !== null && config !== void 0 && (_config$data = config.data) !== null && _config$data !== void 0 && _config$data.options && config !== null && config !== void 0 && (_config$data2 = config.data) !== null && _config$data2 !== void 0 && _config$data2.url) {
-      var combinedOptions = (0, _nestInRefdataOptions.default)(config.options, config.data.options);
+    var _config$data, _config$data3, _config$data4;
+    if (config !== null && config !== void 0 && (_config$data = config.data) !== null && _config$data !== void 0 && _config$data.collection && config !== null && config !== void 0 && config.item) {
+      var _config$data2;
+      var combinedOptions = getCollectionOptions(config, config === null || config === void 0 || (_config$data2 = config.data) === null || _config$data2 === void 0 ? void 0 : _config$data2.collection);
       return callback(interpolateOptions(config, combinedOptions));
     }
+    if (config.options && config !== null && config !== void 0 && (_config$data3 = config.data) !== null && _config$data3 !== void 0 && _config$data3.options && config !== null && config !== void 0 && (_config$data4 = config.data) !== null && _config$data4 !== void 0 && _config$data4.url) {
+      var _combinedOptions = (0, _nestInRefdataOptions.default)(config.options, config.data.options);
+      return callback(interpolateOptions(config, _combinedOptions));
+    }
     if (config.options) {
       return callback(interpolateOptions(config, config.options));
     }

package/dist/utils/Data/getOptions.test.js

@@ -46,6 +46,44 @@ describe('utils', function () {
           expect(options).toEqual(CONFIG.data.options);
         });
       });
+      it('should get options from form data collection', function () {
+        var CONFIG = {
+          data: {
+            collection: "people"
+          },
+          item: {
+            /* eslint-disable no-template-curly-in-string */
+            label: "${name}",
+            value: "${name}",
+            hint: "${name}"
+            /* eslint-enable no-template-curly-in-string */
+          },
+
+          formData: {
+            people: [{
+              "name": "test"
+            }]
+          }
+        };
+        (0, _getOptions.default)(CONFIG, function (options) {
+          expect(options[0].hint).toEqual("test");
+        });
+      });
+      it('should not show options if there is collection but not item data', function () {
+        var CONFIG = {
+          data: {
+            collection: "people"
+          },
+          formData: {
+            people: [{
+              "name": "test"
+            }]
+          }
+        };
+        (0, _getOptions.default)(CONFIG, function (options) {
+          expect(options).toEqual([]);
+        });
+      });
       it('should use the top-level options over those in the data property', function () {
         var CONFIG = {
           options: [{

package/dist/utils/Validate/validateEmail.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 // eslint-disable-next-line no-control-regex
 // const EMAIL_REGEX = /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/i;
 var HODS_EMAIL_REGEX = /^[a-z0-9._\-']+@(digital\.)?homeoffice.gov.uk$/i;
+var JMSC_EMAIL_REGEX = /^[a-z0-9._\-']+@jmsc.gov.uk$/i;
 
 /**
  * Validates an email address, ensuring it is in the correct domain and
@@ -26,7 +27,7 @@ var validateEmail = function validateEmail(value) {
   if (!!value) {
     var name = label ? label.toLowerCase() : 'email address';
     if (typeof value === 'string') {
-      if (HODS_EMAIL_REGEX.test(value)) {
+      if (HODS_EMAIL_REGEX.test(value) || JMSC_EMAIL_REGEX.test(value)) {
         return undefined;
       }
     }

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

@@ -14,6 +14,9 @@ describe('utils', function () {
       it('should return no error when the value is a valid .gov.uk address', function () {
         expect((0, _validateEmail.default)('alpha@homeoffice.gov.uk', LABEL)).toBeUndefined();
       });
+      it('should return no error when the value is a valid jmsc.gov.uk address', function () {
+        expect((0, _validateEmail.default)('alpha@jmsc.gov.uk', LABEL)).toBeUndefined();
+      });
       it('should return no error when the value is a capitalised digital.homeoffice.gov.uk address', function () {
         expect((0, _validateEmail.default)('ALPHA.BRAVO@DIGITAL.HOMEOFFICE.GOV.UK', LABEL)).toBeUndefined();
       });

package/package.json

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