@ukhomeoffice/cop-react-form-renderer 4.70.2 → 4.72.0

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -88,7 +88,10 @@ var getChangeActionForPage = function getChangeActionForPage(page, item, onActio
   };
 };
 var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onAction) {
-  var _page$formData, _page$formData$page$c;
+  var _page$formData, _page$formData$page$c, _page$formData2, _page$formData2$page$;
+  if (!((_page$formData = page.formData) !== null && _page$formData !== void 0 && (_page$formData$page$c = _page$formData[page.collection.name]) !== null && _page$formData$page$c !== void 0 && _page$formData$page$c.length)) {
+    return [];
+  }
   var rows = [];
   if (!page.collection.hideNameFromCYA) {
     rows.push({
@@ -100,7 +103,7 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
       size: 'm'
     });
   }
-  (_page$formData = page.formData) === null || _page$formData === void 0 ? void 0 : (_page$formData$page$c = _page$formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c.forEach(function (item, index) {
+  (_page$formData2 = page.formData) === null || _page$formData2 === void 0 ? void 0 : (_page$formData2$page$ = _page$formData2[page.collection.name]) === null || _page$formData2$page$ === void 0 ? void 0 : _page$formData2$page$.forEach(function (item, index) {
     var _page$collection2;
     var labelCount = index + 1;
     var actionPosition = ((_page$collection2 = page.collection) === null || _page$collection2 === void 0 ? void 0 : _page$collection2.actionPosition) || 'top';

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.test.js

@@ -55,25 +55,39 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     },
     collectionPages: PAGES
   };
-  it('should return just a heading for the collection if it has no entries', function () {
+  it('should return no rows for a collection if it does not exist in formData', function () {
     var FORM_DATA = {};
     var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
       formData: FORM_DATA
     });
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
-    expect(ROWS.length).toEqual(1);
-    expect(ROWS[0].key).toEqual('Collection');
+    expect(ROWS.length).toEqual(0);
+  });
+  it('should return no rows for a collection if it has no entries', function () {
+    var FORM_DATA = {
+      collection: []
+    };
+    var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
+      formData: FORM_DATA
+    });
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    expect(ROWS.length).toEqual(0);
   });
   it('should accept the hideNameFromCYA collection flag', function () {
-    var FORM_DATA = {};
+    var FORM_DATA = {
+      collection: [{
+        testText: 'hello'
+      }]
+    };
     var PAGE = _objectSpread(_objectSpread({}, MASTER_PAGE), {}, {
       formData: FORM_DATA,
       collection: _objectSpread(_objectSpread({}, MASTER_PAGE.collection), {}, {
         hideNameFromCYA: true
       })
     });
+    var TITLE_FIELD_ID = "".concat(PAGE.collection.name, "Title");
     var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
-    expect(ROWS.length).toEqual(0);
+    expect(ROWS[0].fieldId).not.toEqual(TITLE_FIELD_ID);
   });
   it('should format titles correctly when collection.labels.item is specified', function () {
     var FORM_DATA = {

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.2",
+  "version": "4.72.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",