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

package/dist/components/FormRenderer/FormRenderer.js

@@ -500,8 +500,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
       if (currentTask.state === _models.TaskStates.TYPES.COMPLETE) {
         if (hubDetails !== null && hubDetails !== void 0 && hubDetails.noTaskCYAs) {
+          // If the task is complete and there are no CYA's then show user first page
           var currentPage = data.formStatus.tasks[currentTask.name].currentPage;
-          onPageChange(currentPage || currentTask.pages[0]);
+          onPageChange(currentTask.pages[0] || currentPage);
         } else if (currentTask.customCYA) {
           onPageChange(currentTask.customCYA);
         } else {

package/dist/components/FormRenderer/FormRenderer.test.js

@@ -990,7 +990,7 @@ describe('components', function () {
         }
       }, _callee28);
     })));
-    it('should go to the last page of a complete task if noTaskCYAs specified', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
+    it('should go to the first page of a complete task if noTaskCYAs specified', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
       var ON_SUBMIT, HOOKS, TASK_LIST_WITH_NO_TASK_CYAS, taskList, newPage;
       return regeneratorRuntime.wrap(function _callee30$(_context30) {
         while (1) {
@@ -1066,10 +1066,10 @@ describe('components', function () {
               _react.fireEvent.click(newPage.childNodes[2].childNodes[0], {}); // Launch same task again
 
 
-              _react.fireEvent.click(container.childNodes[0].childNodes[1].childNodes[3].childNodes[1].childNodes[0].childNodes[0], {}); // Should be on the second page
+              _react.fireEvent.click(container.childNodes[0].childNodes[1].childNodes[3].childNodes[1].childNodes[0].childNodes[0], {}); // Should be on the first page
 
 
-              expect(container.childNodes[0].childNodes[0].childNodes[0].textContent).toEqual('Event Mode');
+              expect(container.childNodes[0].childNodes[0].childNodes[0].textContent).toEqual('Event Date');
 
             case 19:
             case "end":

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/dist/utils/Operate/getFirstOf.js

@@ -14,9 +14,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Global imports.
 // Local imports.
 var getFirstOf = function getFirstOf(config, data) {
-  var fieldValue;
-
   if (config !== null && config !== void 0 && config.fields) {
+    var fieldValue;
     config.fields.find(function (field) {
       var fieldPath = _copReactComponents.Utils.interpolateString(field, data);
 
@@ -29,7 +28,7 @@ var getFirstOf = function getFirstOf(config, data) {
 
       return false;
     });
-    return fieldValue || '';
+    return fieldValue || (config.fallback ? _copReactComponents.Utils.interpolateString(config.fallback, data) : '');
   }
 
   return (config === null || config === void 0 ? void 0 : config.value) || null;

package/dist/utils/Operate/getFirstOf.test.js

@@ -29,6 +29,15 @@ describe('Utils.Operate.addToFormData', function () {
     var result = (0, _getFirstOf.default)(CONFIG, DATA);
     expect(result).toEqual(CONFIG.value);
   });
+  it('Should return the fallback if the requested fields are not found', function () {
+    var CONFIG = {
+      value: '2',
+      fields: ['nonExistent'],
+      fallback: "Test ${name}"
+    };
+    var result = (0, _getFirstOf.default)(CONFIG, DATA);
+    expect(result).toEqual("Test ".concat(DATA.name));
+  });
   it('Should return the value of the passportNumber field given in config', function () {
     var CONFIG = {
       fields: ['passportNumber', 'anotherMadeUpId', 'otherIdDoc']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.64.0",
+  "version": "4.66.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.11.0",
+    "@ukhomeoffice/cop-react-components": "^2.11.2",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",