@ukhomeoffice/cop-react-form-renderer 4.65.0 → 4.66.0

package/dist/utils/Condition/meetsAllConditions.js

@@ -29,7 +29,7 @@ var meetsAllConditions = function meetsAllConditions(options, data) {
     return arr.every(function (condition) {
       var sourceDataValue = _Data.default.getSource(data, condition.field);
 
-      return (0, _meetsCondition.default)(condition, sourceDataValue);
+      return (0, _meetsCondition.default)(condition, sourceDataValue, data);
     });
   }
 

package/dist/utils/Condition/meetsCondition.js

@@ -5,11 +5,20 @@ 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(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) {
+var getComparisonValue = function getComparisonValue(condition, data) {
+  var _condition$value;
+
   if (['in', 'nin'].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::', '');
+    return _Data.default.getSource(data, comparisonField);
   }
 
   return condition.value;
@@ -28,9 +37,9 @@ var getComparisonValue = function getComparisonValue(condition) {
  */
 
 
-var meetsCondition = function meetsCondition(condition, value) {
+var meetsCondition = function meetsCondition(condition, value, data) {
   if (condition && _typeof(condition) === 'object') {
-    var compare = getComparisonValue(condition);
+    var compare = getComparisonValue(condition, data);
 
     switch (condition.op) {
       case '=':

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

@@ -64,6 +64,16 @@ describe('utils.Condition.meetsCondition', function () {
           var VALUE = false;
           var CONDITION = getCondition(op, false);
           expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+        });
+        it('should match environmentContext value with data object', function () {
+          var VALUE = 'Bob';
+          var DATA = {
+            environmentContext: {
+              currentUser: 'Bob'
+            }
+          };
+          var CONDITION = getCondition(op, 'field::environmentContext.currentUser');
+          expect((0, _meetsCondition.default)(CONDITION, VALUE, DATA)).toBeTruthy();
         }); // Should reject...
 
         it('should reject a null and undefined', function () {
@@ -147,6 +157,16 @@ describe('utils.Condition.meetsCondition', function () {
           var VALUE = false;
           var CONDITION = getCondition(op, false);
           expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+        });
+        it('should reject environmentContext value with data object', function () {
+          var VALUE = 'Bob';
+          var DATA = {
+            environmentContext: {
+              currentUser: 'Bob'
+            }
+          };
+          var CONDITION = getCondition(op, 'field::environmentContext.currentUser');
+          expect((0, _meetsCondition.default)(CONDITION, VALUE, DATA)).toBeFalsy();
         }); // Should match...
 
         it('should match a null and undefined', function () {

package/dist/utils/Condition/meetsOneCondition.js

@@ -29,7 +29,7 @@ var meetsOneCondition = function meetsOneCondition(options, data) {
     return arr.some(function (condition) {
       var sourceDataValue = _Data.default.getSource(data, condition.field);
 
-      return (0, _meetsCondition.default)(condition, sourceDataValue);
+      return (0, _meetsCondition.default)(condition, sourceDataValue, data);
     });
   }
 

package/package.json

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