@ukhomeoffice/cop-react-form-renderer 4.70.1 → 4.71.0

package/dist/utils/Condition/meetsCondition.js

@@ -9,7 +9,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var getComparisonValue = function getComparisonValue(condition, data) {
   var _condition$value;
-  if (['in', 'nin'].includes(condition.op)) {
+  if (['in', 'nin', 'includesAllOf', '!includesAllOf'].includes(condition.op)) {
     return condition.values;
   } else if (typeof condition.value === 'string' && (_condition$value = condition.value) !== null && _condition$value !== void 0 && _condition$value.startsWith('field::')) {
     var comparisonField = condition.value.replace('field::', '');
@@ -107,6 +107,30 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           }
           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 false;
+        }
+      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 true;
+        }
       default:
         return false;
     }

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

@@ -638,6 +638,90 @@ describe('utils.Condition.meetsCondition', function () {
       expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
     });
   });
+  describe('operator includesAllOf', function () {
+    it('should reject when value is not an array', function () {
+      var VALUE = 'Not an array';
+      var CONDITION = {
+        op: 'includesAllOf',
+        values: ['a', 'c']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+    it('should reject when value is an empty array', function () {
+      var VALUE = [];
+      var CONDITION = {
+        op: 'includesAllOf',
+        values: ['a', 'c']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+    it('should accept when the list of values is an empty array', function () {
+      var VALUE = ['a', 'b', 'c'];
+      var CONDITION = {
+        op: 'includesAllOf',
+        values: []
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+    });
+    it('should accept a list of values that are all in field', function () {
+      var VALUE = ['a', 'b', 'c'];
+      var CONDITION = {
+        op: 'includesAllOf',
+        values: ['a', 'c']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+    });
+    it('should reject a list of values if any are missing from field', function () {
+      var VALUE = ['a', 'b', 'c'];
+      var CONDITION = {
+        op: 'includesAllOf',
+        values: ['a', 'd']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+  });
+  describe('operator !includesAllOf', function () {
+    it('should accept when value is not an array', function () {
+      var VALUE = 'Not an array';
+      var CONDITION = {
+        op: '!includesAllOf',
+        values: ['a', 'c']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+    });
+    it('should accept when value is an empty array', function () {
+      var VALUE = [];
+      var CONDITION = {
+        op: '!includesAllOf',
+        values: ['a', 'c']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+    });
+    it('should reject when the list of values is an empty array', function () {
+      var VALUE = ['a', 'b', 'c'];
+      var CONDITION = {
+        op: '!includesAllOf',
+        values: []
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+    it('should reject a list of values that are all in value', function () {
+      var VALUE = ['a', 'b', 'c'];
+      var CONDITION = {
+        op: '!includesAllOf',
+        values: ['a', 'c']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+    it('should accept a list of values if any are missing from value', function () {
+      var VALUE = ['a', 'b', 'c'];
+      var CONDITION = {
+        op: '!includesAllOf',
+        values: ['a', 'd']
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+    });
+  });
   describe('unknown operator', function () {
     var op = 'definitely_not_a_real_operator';
     it('should reject anything regardless of the value', function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.70.1",
+  "version": "4.71.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "^2.14.3",
+    "@ukhomeoffice/cop-react-components": "^2.14.4",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",