@ukhomeoffice/cop-react-form-renderer 6.0.6-peter → 6.7.0-alpha

package/dist/utils/Component/showComponent.test.js

@@ -4,56 +4,56 @@ var _showComponent = _interopRequireDefault(require("./showComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('utils', function () {
-  describe('Component', function () {
-    describe('show', function () {
-      it('should not show when there are no options', function () {
+describe('utils', () => {
+  describe('Component', () => {
+    describe('show', () => {
+      it('should not show when there are no options', () => {
         expect((0, _showComponent.default)(null, null)).toBeFalsy();
       });
-      it('should not show when hidden and disabled', function () {
+      it('should not show when hidden and disabled', () => {
         expect((0, _showComponent.default)({
           hidden: true,
           disabled: true
         }, null)).toBeFalsy();
       });
-      it('should show when hidden but not disabled', function () {
+      it('should show when hidden but not disabled', () => {
         expect((0, _showComponent.default)({
           hidden: true
         }, null)).toBeTruthy();
       });
-      it('should show when disabled but not hidden', function () {
+      it('should show when disabled but not hidden', () => {
         expect((0, _showComponent.default)({
           disabled: true
         }, null)).toBeTruthy();
       });
-      it('should show when a single show_when condition is met', function () {
-        var COMPONENT = {
+      it('should show when a single show_when condition is met', () => {
+        const COMPONENT = {
           show_when: {
             field: 'alpha',
             op: 'eq',
             value: 'bravo'
           }
         };
-        var DATA = {
+        const DATA = {
           alpha: 'bravo'
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeTruthy();
       });
-      it('should not show when a single show_when condition is not met', function () {
-        var COMPONENT = {
+      it('should not show when a single show_when condition is not met', () => {
+        const COMPONENT = {
           show_when: {
             field: 'alpha',
             op: 'eq',
             value: 'bravo'
           }
         };
-        var DATA = {
+        const DATA = {
           alpha: 'charlie'
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeFalsy();
       });
-      it('should show when multiple show_when conditions are met', function () {
-        var COMPONENT = {
+      it('should show when multiple show_when conditions are met', () => {
+        const COMPONENT = {
           show_when: [{
             field: 'alpha',
             op: 'eq',
@@ -64,14 +64,14 @@ describe('utils', function () {
             value: 'delta'
           }]
         };
-        var DATA = {
+        const DATA = {
           alpha: 'bravo',
           charlie: 'delta'
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeTruthy();
       });
-      it('should not show when one of multiple show_when conditions is not met', function () {
-        var COMPONENT = {
+      it('should not show when one of multiple show_when conditions is not met', () => {
+        const COMPONENT = {
           show_when: [{
             field: 'alpha',
             op: 'eq',
@@ -82,14 +82,14 @@ describe('utils', function () {
             value: 'delta'
           }]
         };
-        var DATA = {
+        const DATA = {
           alpha: 'bravo',
           charlie: 'echo'
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeFalsy();
       });
-      it('SHOULD be shown when the component has multiple show_when conditions, with type "or" provided and ALL are matched', function () {
-        var COMPONENT = {
+      it('SHOULD be shown when the component has multiple show_when conditions, with type "or" provided and ALL are matched', () => {
+        const COMPONENT = {
           show_when: {
             "type": "or",
             "conditions": [{
@@ -103,14 +103,14 @@ describe('utils', function () {
             }]
           }
         };
-        var DATA = {
+        const DATA = {
           alpha: 'Alpha',
           bravo: 'Bravo'
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeTruthy();
       });
-      it('SHOULD be shown when the component has multiple show_when conditions, with type "or" provided and at least ONE is matched', function () {
-        var COMPONENT = {
+      it('SHOULD be shown when the component has multiple show_when conditions, with type "or" provided and at least ONE is matched', () => {
+        const COMPONENT = {
           show_when: {
             "type": "or",
             "conditions": [{
@@ -124,14 +124,14 @@ describe('utils', function () {
             }]
           }
         };
-        var DATA = {
+        const DATA = {
           alpha: 'Alpha',
           bravo: 'Bravo'
         };
         expect((0, _showComponent.default)(COMPONENT, DATA)).toBeTruthy();
       });
-      it('should NOT be shown when the component has multiple show_when conditions, with type "or" provided and NONE are matched', function () {
-        var COMPONENT = {
+      it('should NOT be shown when the component has multiple show_when conditions, with type "or" provided and NONE are matched', () => {
+        const COMPONENT = {
           show_when: {
             "type": "or",
             "conditions": [{
@@ -145,7 +145,7 @@ describe('utils', function () {
             }]
           }
         };
-        var DATA = {
+        const DATA = {
           alpha: 'Alpha',
           bravo: 'Bravo'
         };

package/dist/utils/Component/wrapInFormGroup.js

@@ -10,8 +10,8 @@ var _cleanAttributes = _interopRequireDefault(require("./cleanAttributes"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); } // Global imports
 // Local imports
-var wrapInFormGroup = function wrapInFormGroup(config, children) {
-  var attrs = (0, _cleanAttributes.default)(config, ['fieldId', 'displayMenu', 'showCharacterCount', 'readonly']);
+const wrapInFormGroup = (config, children) => {
+  const attrs = (0, _cleanAttributes.default)(config, ['fieldId', 'displayMenu', 'showCharacterCount', 'readonly']);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.FormGroup, _extends({}, attrs, {
     onChange: null
   }), children);

package/dist/utils/Condition/index.js

@@ -8,7 +8,7 @@ var _meetsAllConditions = _interopRequireDefault(require("./meetsAllConditions")
 var _meetsCondition = _interopRequireDefault(require("./meetsCondition"));
 var _meetsOneCondition = _interopRequireDefault(require("./meetsOneCondition"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var Condition = {
+const Condition = {
   meetsOne: _meetsOneCondition.default,
   meetsAll: _meetsAllConditions.default,
   met: _meetsCondition.default

package/dist/utils/Condition/meetsAllConditions.js

@@ -13,15 +13,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // Local imports
 
-var testConditions = function testConditions(conditions, data) {
-  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'and';
-  var arr = Array.isArray(conditions) ? conditions : [conditions];
-  var testCallback = function testCallback(condition) {
+const testConditions = function (conditions, data) {
+  let type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'and';
+  const arr = Array.isArray(conditions) ? conditions : [conditions];
+  const testCallback = condition => {
     if (Array.isArray(condition.conditions)) {
       return testConditions(condition.conditions, data, condition.type);
     }
-    var field = condition.field.startsWith('interpolate::') ? _copReactComponents.Utils.interpolateString(condition.field, data).replace('interpolate::', '') : condition.field;
-    var sourceDataValue = _Data.default.getSource(data, field);
+    const field = condition.field.startsWith('interpolate::') ? _copReactComponents.Utils.interpolateString(condition.field, data).replace('interpolate::', '') : condition.field;
+    const sourceDataValue = _Data.default.getSource(data, field);
     return (0, _meetsCondition.default)(condition, sourceDataValue, data);
   };
   return type === 'and' ? arr.every(testCallback) : arr.some(testCallback);
@@ -33,8 +33,8 @@ var testConditions = function testConditions(conditions, data) {
  * @param {object} data The top-level form data.
  * @returns Boolean true if all conditions are met; false otherwise.
  */
-var meetsAllConditions = function meetsAllConditions(options, data) {
-  var conditions = (0, _setupConditions.default)(options);
+const meetsAllConditions = (options, data) => {
+  const conditions = (0, _setupConditions.default)(options);
   if (conditions) {
     return testConditions(conditions, data);
   }

package/dist/utils/Condition/meetsAllConditions.test.js

@@ -4,38 +4,38 @@ var _meetsAllConditions = _interopRequireDefault(require("./meetsAllConditions")
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
-describe('utils.Condition.meetsAllConditions', function () {
-  var DATA = {
+describe('utils.Condition.meetsAllConditions', () => {
+  const DATA = {
     alpha: 'bravo',
     charlie: 'delta'
   };
-  it('should evaluate to true when conditions are null', function () {
+  it('should evaluate to true when conditions are null', () => {
     expect((0, _meetsAllConditions.default)(null, DATA)).toBeTruthy();
   });
-  it('should evaluate to true when conditions are undefined', function () {
+  it('should evaluate to true when conditions are undefined', () => {
     expect((0, _meetsAllConditions.default)(undefined, DATA)).toBeTruthy();
   });
-  it('should evaluate to true when conditions is an empty array', function () {
+  it('should evaluate to true when conditions is an empty array', () => {
     expect((0, _meetsAllConditions.default)([], DATA)).toBeTruthy();
   });
-  it('should evaluate to true when a single condition is met', function () {
-    var CONDITION = {
+  it('should evaluate to true when a single condition is met', () => {
+    const CONDITION = {
       field: 'alpha',
       op: 'eq',
       value: 'bravo'
     };
     expect((0, _meetsAllConditions.default)(CONDITION, DATA)).toBeTruthy();
   });
-  it('should evaluate to false when a single condition is not met', function () {
-    var CONDITION = {
+  it('should evaluate to false when a single condition is not met', () => {
+    const CONDITION = {
       field: 'alpha',
       op: 'ne',
       value: 'bravo'
     };
     expect((0, _meetsAllConditions.default)(CONDITION, DATA)).toBeFalsy();
   });
-  it('should evaluate to true when all conditions are met', function () {
-    var CONDITIONS = [{
+  it('should evaluate to true when all conditions are met', () => {
+    const CONDITIONS = [{
       field: 'alpha',
       op: 'eq',
       value: 'bravo'
@@ -46,8 +46,8 @@ describe('utils.Condition.meetsAllConditions', function () {
     }];
     expect((0, _meetsAllConditions.default)(CONDITIONS, DATA)).toBeTruthy();
   });
-  it('should evaluate to false when one of the conditions is not met', function () {
-    var CONDITIONS = [{
+  it('should evaluate to false when one of the conditions is not met', () => {
+    const CONDITIONS = [{
       field: 'alpha',
       op: 'eq',
       value: 'bravo'
@@ -58,18 +58,18 @@ describe('utils.Condition.meetsAllConditions', function () {
     }];
     expect((0, _meetsAllConditions.default)(CONDITIONS, DATA)).toBeFalsy();
   });
-  it('should handle nested conditions', function () {
-    var VALID_DATA = {
+  it('should handle nested conditions', () => {
+    const VALID_DATA = {
       shouldBeAlpha: 'alpha',
       shouldBeBravo: 'bravo',
       canBeCharlieOrDelta: 'charlie'
     };
-    var INVALID_DATA = {
+    const INVALID_DATA = {
       shouldBeAlpha: 'alpha',
       shouldBeBravo: 'bravo',
       canBeCharlieOrDelta: 'echo'
     };
-    var CONDITIONS = [{
+    const CONDITIONS = [{
       type: 'or',
       conditions: [{
         field: 'canBeCharlieOrDelta',
@@ -92,12 +92,12 @@ describe('utils.Condition.meetsAllConditions', function () {
     expect((0, _meetsAllConditions.default)(CONDITIONS, VALID_DATA)).toBeTruthy();
     expect((0, _meetsAllConditions.default)(CONDITIONS, INVALID_DATA)).toBeFalsy();
   });
-  it('should evaluate conditions correctly using interpolated fields', function () {
-    var NEW_DATA = {
+  it('should evaluate conditions correctly using interpolated fields', () => {
+    const NEW_DATA = {
       role: 'admin',
       'admin_status': 'active'
     };
-    var CONDITION = {
+    const CONDITION = {
       // eslint-disable-next-line no-template-curly-in-string
       field: 'interpolate::${role}_status',
       op: 'eq',

package/dist/utils/Condition/meetsCondition.js

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _Data = _interopRequireDefault(require("../Data"));
 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); } // Local imports
-var getComparisonValue = function getComparisonValue(condition, data) {
+// Local imports
+
+const getComparisonValue = (condition, data) => {
   var _condition$value;
   if (['in', 'nin', 'includesAllOf', '!includesAllOf'].includes(condition.op)) {
     return condition.values;
   }
   if (typeof condition.value === 'string' && (_condition$value = condition.value) !== null && _condition$value !== void 0 && _condition$value.startsWith('field::')) {
-    var comparisonField = condition.value.replace('field::', '');
+    const comparisonField = condition.value.replace('field::', '');
     return _Data.default.getSource(data, comparisonField);
   }
   return condition.value;
@@ -31,9 +32,9 @@ var getComparisonValue = function getComparisonValue(condition, data) {
  * 
  * @returns A boolean indicating whether the value meets the condition.
  */
-var meetsCondition = function meetsCondition(condition, value, data) {
-  if (condition && _typeof(condition) === 'object') {
-    var compare = getComparisonValue(condition, data);
+const meetsCondition = (condition, value, data) => {
+  if (condition && typeof condition === 'object') {
+    const compare = getComparisonValue(condition, data);
     switch (condition.op) {
       case '=':
       case 'eq':
@@ -68,8 +69,8 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           if (!value || !compare) {
             return false;
           }
-          var valFloat = parseFloat(value.replace(',', ''));
-          var compareFloat = parseFloat(compare.replace(',', ''));
+          const valFloat = parseFloat(value.replace(',', ''));
+          const compareFloat = parseFloat(compare.replace(',', ''));
           return valFloat < compareFloat;
         }
       case '>':
@@ -77,23 +78,21 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           if (!value || !compare) {
             return false;
           }
-          var _valFloat = parseFloat(value.replace(/,/g, ''));
-          var _compareFloat = parseFloat(compare.replace(/,/g, ''));
-          return _valFloat > _compareFloat;
+          const valFloat = parseFloat(value.replace(/,/g, ''));
+          const compareFloat = parseFloat(compare.replace(/,/g, ''));
+          return valFloat > compareFloat;
         }
       case 'contains':
         {
           return value === null || value === void 0 ? void 0 : value.toString().toLowerCase().includes(compare);
           // If no value is provided, the field cannot contain it, so it must fail the condition.
         }
-
       case '!contains':
         {
           var _value$toString$toLow;
           return (_value$toString$toLow = !(value !== null && value !== void 0 && value.toString().toLowerCase().includes(compare))) !== null && _value$toString$toLow !== void 0 ? _value$toString$toLow : true;
           // If no value is provided, the field cannot contain it, so it must meet the condition.
         }
-
       case 'includes':
         {
           if (Array.isArray(value)) {
@@ -108,15 +107,27 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           }
           return true;
         }
+      case 'includesObjectProp':
+        {
+          if (Array.isArray(value)) {
+            return value.some(v => v[condition.key] === compare);
+          }
+          return false;
+        }
+      case '!includesObjectProp':
+        {
+          if (Array.isArray(value)) {
+            return !value.some(v => v[condition.key] === compare);
+          }
+          return true;
+        }
       case 'includesAllOf':
         {
           if (Array.isArray(value)) {
             // This will break if compare is not an array, meaning
             // the form JSON has been written incorrectly. Seemed silly
             // to try and hide the configuration error with type checking.
-            return compare.every(function (entry) {
-              return value.includes(entry);
-            });
+            return compare.every(entry => value.includes(entry));
           }
           return false;
         }
@@ -126,9 +137,7 @@ var meetsCondition = function meetsCondition(condition, value, data) {
             // This will break if compare is not an array, meaning
             // the form JSON has been written incorrectly. Seemed silly
             // to try and hide the configuration error with type checking.
-            return !compare.every(function (entry) {
-              return value.includes(entry);
-            });
+            return !compare.every(entry => value.includes(entry));
           }
           return true;
         }