@ukhomeoffice/cop-react-form-renderer 6.13.2 → 6.14.1

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

@@ -1,19 +1,19 @@
 "use strict";
 
 var _getOptions = _interopRequireDefault(require("./getOptions"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Local imports
 
-describe('utils', function () {
-  describe('Data', function () {
-    describe('getOptions', function () {
-      it('should handle a null config', function () {
-        (0, _getOptions.default)(null, function (options) {
+describe('utils', () => {
+  describe('Data', () => {
+    describe('getOptions', () => {
+      it('should handle a null config', () => {
+        (0, _getOptions.default)(null, options => {
           expect(options).toEqual([]);
         });
       });
-      it('should get any specified options from the config', function () {
-        var CONFIG = {
+      it('should get any specified options from the config', () => {
+        const CONFIG = {
           options: [{
             value: 'a',
             label: 'Alpha',
@@ -24,12 +24,22 @@ describe('utils', function () {
             hint: ''
           }]
         };
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options).toEqual(CONFIG.options);
         });
       });
-      it('should get any specified options from the data property of the config', function () {
-        var CONFIG = {
+      it('should handle stings in option and if no value is supplied treat it as a string', () => {
+        const CONFIG = {
+          options: ["or", {
+            label: "and"
+          }]
+        };
+        (0, _getOptions.default)(CONFIG, options => {
+          expect(options).toEqual(["or", "and"]);
+        });
+      });
+      it('should get any specified options from the data property of the config', () => {
+        const CONFIG = {
           data: {
             options: [{
               value: 'a',
@@ -42,12 +52,49 @@ describe('utils', function () {
             }]
           }
         };
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options).toEqual(CONFIG.data.options);
         });
       });
-      it('should use the top-level options over those in the data property', function () {
-        var CONFIG = {
+      it('should get options from form data collection', () => {
+        const 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, options => {
+          expect(options[0].hint).toEqual("test");
+        });
+      });
+      it('should not show options if there is collection but not item data', () => {
+        const CONFIG = {
+          data: {
+            collection: "people"
+          },
+          formData: {
+            people: [{
+              "name": "test"
+            }]
+          }
+        };
+        (0, _getOptions.default)(CONFIG, options => {
+          expect(options).toEqual([]);
+        });
+      });
+      it('should use the top-level options over those in the data property', () => {
+        const CONFIG = {
           options: [{
             value: 'a',
             label: 'Alpha',
@@ -67,12 +114,12 @@ describe('utils', function () {
             }]
           }
         };
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options).toEqual(CONFIG.options);
         });
       });
-      it('should exclude options from the config that fail show_when checks', function () {
-        var CONFIG = {
+      it('should exclude options from the config that fail show_when checks', () => {
+        const CONFIG = {
           id: 'test',
           options: [{
             value: 'a',
@@ -97,12 +144,12 @@ describe('utils', function () {
             other: 'c'
           }
         };
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options).toEqual([CONFIG.options[0]]);
         });
       });
-      it('should exclude options from the config that fail or type show_when checks', function () {
-        var CONFIG = {
+      it('should exclude options from the config that fail or type show_when checks', () => {
+        const CONFIG = {
           id: 'test',
           options: [{
             value: 'a',
@@ -141,12 +188,12 @@ describe('utils', function () {
             other: 'c'
           }
         };
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options).toEqual([CONFIG.options[0]]);
         });
       });
-      it('should should use both data from refdata url and options if both present', function () {
-        var CONFIG = {
+      it('should should use both data from refdata url and options if both present', () => {
+        const CONFIG = {
           data: {
             options: [{
               refdata_match: {
@@ -179,7 +226,7 @@ describe('utils', function () {
             label: 'Third label'
           }]
         };
-        var MERGED_CONFIG = [{
+        const MERGED_CONFIG = [{
           id: 1,
           description: 'First refdata item',
           hint: '',
@@ -202,12 +249,12 @@ describe('utils', function () {
           value: 'thirdValue',
           label: 'Third label'
         }];
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options).toEqual(MERGED_CONFIG);
         });
       });
-      it('should override the hint if specified in the config', function () {
-        var CONFIG = {
+      it('should override the hint if specified in the config', () => {
+        const CONFIG = {
           alternativeHintField: 'description',
           options: [{
             value: 'a',
@@ -221,7 +268,7 @@ describe('utils', function () {
             hint: ''
           }]
         };
-        (0, _getOptions.default)(CONFIG, function (options) {
+        (0, _getOptions.default)(CONFIG, options => {
           expect(options[0].hint).toEqual(CONFIG.options[0].description);
           expect(options[1].hint).toEqual(CONFIG.options[1].description);
         });

package/dist/utils/Data/getSourceData.js

@@ -4,24 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var getItemInArray = function getItemInArray(arr, index) {
+const getItemInArray = (arr, index) => {
   if (Array.isArray(arr)) {
     return arr[parseInt(index, 10)];
   }
   return undefined;
 };
-var isArrayProp = function isArrayProp(prop) {
-  return prop.includes('[');
-};
-var getPropertyAndIndex = function getPropertyAndIndex(prop) {
-  return prop.replace(']', '').split('[');
-};
+const isArrayProp = prop => prop.includes('[');
+const getPropertyAndIndex = prop => prop.replace(']', '').split('[');
 
 /**
  * Gets the value of a field within the top-level JSON form data,
@@ -38,16 +28,13 @@ var getPropertyAndIndex = function getPropertyAndIndex(prop) {
  * @param {string} fieldId The dot-separated path to the field.
  * @returns The value of the field specified.
  */
-var getSourceData = function getSourceData(data, fieldId) {
+const getSourceData = (data, fieldId) => {
   if (!fieldId) {
     return undefined;
   }
-  return fieldId.split('.').reduce(function (obj, prop) {
+  return fieldId.split('.').reduce((obj, prop) => {
     if (obj && isArrayProp(prop)) {
-      var _getPropertyAndIndex = getPropertyAndIndex(prop),
-        _getPropertyAndIndex2 = _slicedToArray(_getPropertyAndIndex, 2),
-        actualProp = _getPropertyAndIndex2[0],
-        index = _getPropertyAndIndex2[1];
+      const [actualProp, index] = getPropertyAndIndex(prop);
       return getItemInArray(obj[actualProp], index);
     }
     return obj ? obj[prop] : undefined;

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

@@ -1,50 +1,54 @@
 "use strict";
 
 var _getSourceData = _interopRequireDefault(require("./getSourceData"));
-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 _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); } // Local imports
-describe('utils', function () {
-  describe('Data', function () {
-    describe('getSourceData', function () {
-      it('should return the value at the top level', function () {
-        var FIELD_ID = 'field';
-        var VALUE = 'value';
-        var DATA = _defineProperty({}, FIELD_ID, VALUE);
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Local imports
+
+describe('utils', () => {
+  describe('Data', () => {
+    describe('getSourceData', () => {
+      it('should return the value at the top level', () => {
+        const FIELD_ID = 'field';
+        const VALUE = 'value';
+        const DATA = {
+          [FIELD_ID]: VALUE
+        };
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toEqual(VALUE);
       });
-      it('should handle boolean true', function () {
-        var FIELD_ID = 'field';
-        var VALUE = true;
-        var DATA = _defineProperty({}, FIELD_ID, VALUE);
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+      it('should handle boolean true', () => {
+        const FIELD_ID = 'field';
+        const VALUE = true;
+        const DATA = {
+          [FIELD_ID]: VALUE
+        };
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toStrictEqual(true);
       });
-      it('should handle boolean false', function () {
-        var FIELD_ID = 'field';
-        var VALUE = false;
-        var DATA = _defineProperty({}, FIELD_ID, VALUE);
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+      it('should handle boolean false', () => {
+        const FIELD_ID = 'field';
+        const VALUE = false;
+        const DATA = {
+          [FIELD_ID]: VALUE
+        };
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toStrictEqual(false);
       });
-      it('should return a nested value', function () {
-        var FIELD_ID = 'field.nested';
-        var VALUE = 'nested value';
-        var DATA = {
+      it('should return a nested value', () => {
+        const FIELD_ID = 'field.nested';
+        const VALUE = 'nested value';
+        const DATA = {
           field: {
             nested: VALUE
           }
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toEqual(VALUE);
       });
-      it('should return a deeply nested value', function () {
-        var FIELD_ID = 'field.nested.and.even.further.down';
-        var VALUE = 'deeply nested value';
-        var DATA = {
+      it('should return a deeply nested value', () => {
+        const FIELD_ID = 'field.nested.and.even.further.down';
+        const VALUE = 'deeply nested value';
+        const DATA = {
           field: {
             nested: {
               and: {
@@ -57,95 +61,95 @@ describe('utils', function () {
             }
           }
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toEqual(VALUE);
       });
-      it('should handle null data', function () {
-        var FIELD_ID = 'field.nested';
-        var value = (0, _getSourceData.default)(null, FIELD_ID);
+      it('should handle null data', () => {
+        const FIELD_ID = 'field.nested';
+        const value = (0, _getSourceData.default)(null, FIELD_ID);
         expect(value).toBeUndefined();
       });
-      it('should handle undefined data', function () {
-        var FIELD_ID = 'field.nested';
-        var value = (0, _getSourceData.default)(undefined, FIELD_ID);
+      it('should handle undefined data', () => {
+        const FIELD_ID = 'field.nested';
+        const value = (0, _getSourceData.default)(undefined, FIELD_ID);
         expect(value).toBeUndefined();
       });
-      it('should handle missing value', function () {
-        var FIELD_ID = 'field.nested';
-        var VALUE = 'other value';
-        var DATA = {
+      it('should handle missing value', () => {
+        const FIELD_ID = 'field.nested';
+        const VALUE = 'other value';
+        const DATA = {
           field: {
             other: VALUE
           }
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toBeUndefined();
       });
-      it('should handle null fieldId', function () {
-        var VALUE = 'value';
-        var DATA = {
+      it('should handle null fieldId', () => {
+        const VALUE = 'value';
+        const DATA = {
           field: VALUE
         };
-        var value = (0, _getSourceData.default)(DATA, null);
+        const value = (0, _getSourceData.default)(DATA, null);
         expect(value).toBeUndefined();
       });
-      it('should handle undefined fieldId', function () {
-        var VALUE = 'value';
-        var DATA = {
+      it('should handle undefined fieldId', () => {
+        const VALUE = 'value';
+        const DATA = {
           field: VALUE
         };
-        var value = (0, _getSourceData.default)(DATA, undefined);
+        const value = (0, _getSourceData.default)(DATA, undefined);
         expect(value).toBeUndefined();
       });
-      it('should handle empty fieldId', function () {
-        var VALUE = 'value';
-        var DATA = {
+      it('should handle empty fieldId', () => {
+        const VALUE = 'value';
+        const DATA = {
           field: VALUE
         };
-        var value = (0, _getSourceData.default)(DATA, '');
+        const value = (0, _getSourceData.default)(DATA, '');
         expect(value).toBeUndefined();
       });
-      it('should handle fieldId with trailing dot', function () {
-        var FIELD_ID = 'field.';
-        var VALUE = 'value';
-        var DATA = {
+      it('should handle fieldId with trailing dot', () => {
+        const FIELD_ID = 'field.';
+        const VALUE = 'value';
+        const DATA = {
           field: VALUE
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toBeUndefined();
       });
-      it('should handle fieldId with leading dot', function () {
-        var FIELD_ID = '.field';
-        var VALUE = 'value';
-        var DATA = {
+      it('should handle fieldId with leading dot', () => {
+        const FIELD_ID = '.field';
+        const VALUE = 'value';
+        const DATA = {
           field: VALUE
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toBeUndefined();
       });
-      it('should handle fieldId that is just a dot', function () {
-        var FIELD_ID = '.';
-        var VALUE = 'value';
-        var DATA = {
+      it('should handle fieldId that is just a dot', () => {
+        const FIELD_ID = '.';
+        const VALUE = 'value';
+        const DATA = {
           field: VALUE
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toBeUndefined();
       });
-      it('should handle a reference to an array item', function () {
-        var FIELD_ID = 'items[1]';
-        var ALPHA = 'alpha';
-        var BETA = 'beta';
-        var DATA = {
+      it('should handle a reference to an array item', () => {
+        const FIELD_ID = 'items[1]';
+        const ALPHA = 'alpha';
+        const BETA = 'beta';
+        const DATA = {
           items: [ALPHA, BETA]
         };
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toEqual(BETA);
       });
-      it('should handle a reference to an array that does not exist', function () {
-        var FIELD_ID = 'items[1]';
-        var DATA = {};
-        var value = (0, _getSourceData.default)(DATA, FIELD_ID);
+      it('should handle a reference to an array that does not exist', () => {
+        const FIELD_ID = 'items[1]';
+        const DATA = {};
+        const value = (0, _getSourceData.default)(DATA, FIELD_ID);
         expect(value).toBeUndefined();
       });
     });

package/dist/utils/Data/index.js

@@ -14,10 +14,10 @@ var _deleteValues = _interopRequireDefault(require("./deleteValues"));
 var _setDataItem = _interopRequireDefault(require("./setDataItem"));
 var _setupFormData = _interopRequireDefault(require("./setupFormData"));
 var _setupRefDataUrlForComponent = _interopRequireDefault(require("./setupRefDataUrlForComponent"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Local imports
 
-var Data = {
+const Data = {
   applyFormula: _applyFormula.default,
   getAutocompleteSource: _getAutocompleteSource.default,
   getDataPath: _getDataPath.default,

package/dist/utils/Data/nestInRefdataOptions.js

@@ -4,12 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-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); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /**
  * Combines refdata options with custom options with the use of `from_refdata` in the custom option
  * Allowing for nesting of components within refdata lists of checkboxes or radios
@@ -18,15 +17,13 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @param {Array} options The list of options being defined in the form
  * @returns A combined list of refdata options and custom options to be rendered
  */
-var nestInRefdataOptions = function nestInRefdataOptions(refdataOptions, options) {
-  var nestedRefdataOptions = refdataOptions;
-  options.forEach(function (option, index) {
+const nestInRefdataOptions = (refdataOptions, options) => {
+  const nestedRefdataOptions = refdataOptions;
+  options.forEach((option, index) => {
     if (option.refdata_match) {
-      var refdataMatch = option.refdata_match;
-      var refdataKey = Object.keys(refdataMatch)[0];
-      var refdataIndex = refdataOptions.findIndex(function (refdataOption) {
-        return refdataOption[refdataKey] === refdataMatch[refdataKey];
-      });
+      const refdataMatch = option.refdata_match;
+      const refdataKey = Object.keys(refdataMatch)[0];
+      const refdataIndex = refdataOptions.findIndex(refdataOption => refdataOption[refdataKey] === refdataMatch[refdataKey]);
       if (refdataIndex >= 0) {
         nestedRefdataOptions[refdataIndex] = _objectSpread(_objectSpread({}, refdataOptions[refdataIndex]), {}, {
           nested: option.nested

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

@@ -1,10 +1,10 @@
 "use strict";
 
 var _nestInRefdataOptions = _interopRequireDefault(require("./nestInRefdataOptions"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('utils.Data.combineOptions', function () {
-  it('should combine refdata options with a custom option', function () {
-    var refdataOptions = [{
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+describe('utils.Data.combineOptions', () => {
+  it('should combine refdata options with a custom option', () => {
+    const refdataOptions = [{
       id: 1,
       description: 'First refdata item',
       value: 'firstValue',
@@ -20,7 +20,7 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue',
       label: 'Third label'
     }];
-    var customOptions = [{
+    const customOptions = [{
       refdata_match: {
         id: 2
       },
@@ -54,8 +54,8 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue'
     }]);
   });
-  it('should not combine options if it can`t find a matching refdata option', function () {
-    var refdataOptions = [{
+  it('should not combine options if it can`t find a matching refdata option', () => {
+    const refdataOptions = [{
       id: 1,
       description: 'First refdata item',
       value: 'firstValue',
@@ -71,7 +71,7 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue',
       label: 'Third label'
     }];
-    var customOptions = [{
+    const customOptions = [{
       refdata_match: {
         id: 4
       },
@@ -99,8 +99,8 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue'
     }]);
   });
-  it('should append refdata options with a custom option when `combineWithRefdata` flag is set', function () {
-    var refdataOptions = [{
+  it('should append refdata options with a custom option when `combineWithRefdata` flag is set', () => {
+    const refdataOptions = [{
       id: 1,
       description: 'First refdata item',
       value: 'firstValue',
@@ -116,7 +116,7 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue',
       label: 'Third label'
     }];
-    var customOptions = [{
+    const customOptions = [{
       combineWithRefdata: true,
       id: 'otherComponent',
       fieldId: 'otherComponent',
@@ -146,8 +146,8 @@ describe('utils.Data.combineOptions', function () {
       label: 'Other Component'
     }]);
   });
-  it('should not append refdata options with a custom option when `combineWithRefdata` flag is not set', function () {
-    var refdataOptions = [{
+  it('should not append refdata options with a custom option when `combineWithRefdata` flag is not set', () => {
+    const refdataOptions = [{
       id: 1,
       description: 'First refdata item',
       value: 'firstValue',
@@ -163,7 +163,7 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue',
       label: 'Third label'
     }];
-    var customOptions = [{
+    const customOptions = [{
       id: 'otherComponent',
       fieldId: 'otherComponent',
       type: 'text',
@@ -186,8 +186,8 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue'
     }]);
   });
-  it('should append refdata options with a string when `combineWithRefdata` flag is set and custom option comes after string', function () {
-    var refdataOptions = [{
+  it('should append refdata options with a string when `combineWithRefdata` flag is set and custom option comes after string', () => {
+    const refdataOptions = [{
       id: 1,
       description: 'First refdata item',
       value: 'firstValue',
@@ -203,7 +203,7 @@ describe('utils.Data.combineOptions', function () {
       value: 'thirdValue',
       label: 'Third label'
     }];
-    var customOptions = ["or", {
+    const customOptions = ["or", {
       combineWithRefdata: true,
       id: 'otherComponent',
       fieldId: 'otherComponent',