@ukhomeoffice/cop-react-form-renderer 4.22.4 → 4.22.6

package/dist/components/FormRenderer/FormRenderer.js

@@ -103,7 +103,7 @@ var DEFAULT_CLASS = 'hods-form';
 exports.DEFAULT_CLASS = DEFAULT_CLASS;
 
 var InternalFormRenderer = function InternalFormRenderer(_ref2) {
-  var _formState$page4;
+  var _formState$page5;
 
   var title = _ref2.title,
       type = _ref2.type,
@@ -261,7 +261,11 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
 
     if (pages) {
       pages.forEach(function (page) {
-        page.formData = data;
+        if (page) {
+          page.formData = data;
+        }
+
+        ;
       });
       setCurrentTask(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, {
@@ -413,11 +417,13 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
   }; // Handle navigation from "Check your answers".
   // Passing a dataCallback allows changes to formData from the
-  // CYA screen. This is necessary to alow changing the active
+  // CYA screen. This is necessary to allow changing the active
   // entry in page collections.
 
 
   var onCYARowAction = function onCYARowAction(page, dataCallback) {
+    var _formState$page3;
+
     if (typeof dataCallback === 'function') {
       var newData = dataCallback(_objectSpread({}, data));
 
@@ -426,6 +432,19 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       }
     }
 
+    if (((_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.type) === _models.FormPages.PARTIAL_CYA) {
+      hubDetails.sections.every(function (section) {
+        return section.tasks.every(function (task) {
+          if (task.pages.includes(page.pageId) && task.name !== currentTask.name) {
+            onTaskAction(task);
+            return false;
+          }
+
+          return true;
+        });
+      });
+    }
+
     if (page) {
       _handlers.default.cyaAction(page, pageId, onPageChange);
     }
@@ -501,16 +520,37 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       }
     }
 
-    if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
+    if (action.type === _models.PageAction.TYPES.SUBMIT && hub === _models.HubFormats.TASK) {
+      setPagePoint('submit');
+
       if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
+        // Submit.
         var _submissionData2 = _utils.default.Format.form({
           pages: pages,
           components: components
         }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
 
-        _submissionData2.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData2, currentTask);
-        setData(_submissionData2);
+        _submissionData2.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData2, currentTask, true);
+        setData(_submissionData2); // Now submit the data to the backend...
+
         hooks.onSubmit(action.type, _submissionData2, function () {
+          return hooks.onFormComplete();
+        }, function (errors) {
+          return _handlers.default.submissionError(errors, addErrors);
+        });
+      }
+    }
+
+    if (action.type === _models.PageAction.TYPES.SAVE_AND_RETURN) {
+      if (_helpers.default.canCYASubmit(currentTask.fullPages, validate.pages)) {
+        var _submissionData3 = _utils.default.Format.form({
+          pages: pages,
+          components: components
+        }, _objectSpread({}, data), _models.EventTypes.SUBMIT);
+
+        _submissionData3.formStatus = _helpers.default.getSubmissionStatus(type, pages, pageId, action, _submissionData3, currentTask);
+        setData(_submissionData3);
+        hooks.onSubmit(action.type, _submissionData3, function () {
           if (type === _models.FormTypes.TASK) {
             onPageChange(undefined);
           } else {
@@ -523,9 +563,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (action.type === _models.PageAction.TYPES.NAVIGATE) {
-      var _formState$page3;
+      var _formState$page4;
 
-      onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, (_formState$page3 = formState.page) === null || _formState$page3 === void 0 ? void 0 : _formState$page3.formData));
+      onPageChange(_helpers.default.getNextPageId(type, pages, pageId, action, (_formState$page4 = formState.page) === null || _formState$page4 === void 0 ? void 0 : _formState$page4.formData));
     }
 
     if (action.type === _models.PageAction.TYPES.CANCEL) {
@@ -543,7 +583,7 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     className: classes()
   }, title && !hide_title && pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, null, title), formState.cya && /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, _extends({
     pages: _helpers.default.getRelevantPages(formState, pages, currentTask.fullPages)
-  }, cya, ((_formState$page4 = formState.page) === null || _formState$page4 === void 0 ? void 0 : _formState$page4.type) === _models.FormPages.PARTIAL_CYA && {
+  }, cya, ((_formState$page5 = formState.page) === null || _formState$page5 === void 0 ? void 0 : _formState$page5.type) === _models.FormPages.PARTIAL_CYA && {
     actions: formState.page.actions
   }, formState.cya, {
     onAction: onCYAAction,

package/dist/components/FormRenderer/helpers/getRelevantPages.js

@@ -9,7 +9,7 @@ var _models = require("../../../models");
 
 var slicePages = function slicePages(pages, currentPageId) {
   return pages.slice(0, pages.findIndex(function (p) {
-    return p.id === currentPageId;
+    return (p === null || p === void 0 ? void 0 : p.id) === currentPageId ? true : false;
   }));
 };
 

package/dist/components/FormRenderer/helpers/getSubmissionStatus.js

@@ -29,12 +29,12 @@ var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentP
           section.tasks.forEach(function (task) {
             var lastPage = task.pages[task.pages.length - 1];
 
-            if ((lastPage === currentPageId || lastPage.id === currentPageId) && isCompleted) {
+            if ((lastPage === currentPageId || lastPage.id === currentPageId) && isCompleted && (task === null || task === void 0 ? void 0 : task.type) === 'pre-task-list') {
               formStatus.tasks[task.name] = {
                 complete: isCompleted,
                 currentPage: currentPageId
               };
-            } else if (task.pages.includes(currentPageId)) {
+            } else if (task.pages.includes(currentPageId) && (task === null || task === void 0 ? void 0 : task.type) === 'pre-task-list') {
               formStatus.tasks[task.name] = {
                 complete: false,
                 currentPage: currentPageId

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

@@ -255,7 +255,7 @@ describe('components', function () {
               })
             });
           });
-          it("should mark the current task as complete if the current task is 'undefined' i.e. it is a pre-task-list task", function () {
+          it("should mark the current task as complete if the current task is a pre-task-list task", function () {
             var CURRENT_PAGE_ID = PAGES[PAGES.length - 1].id;
             var TASK_NAME = undefined;
             var CURRENT_TASK = {
@@ -265,6 +265,7 @@ describe('components', function () {
               complete: true
             };
             var TASKS = [{
+              type: 'pre-task-list',
               pages: PAGES
             }];
             var SECTIONS = [{

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.js

@@ -24,15 +24,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var getCYARowsForContainer = function getCYARowsForContainer(page, container, formData, onAction) {
-  if ((0, _showComponentCYA.default)(container, page.formData)) {
+  if ((0, _showComponentCYA.default)(container, _objectSpread(_objectSpread({}, page.formData), formData))) {
     var allComponents = (0, _elevateNestedComponents.default)(container.components, formData);
     return allComponents.filter(function (c) {
-      return (0, _showComponentCYA.default)(c, page.formData);
+      return (0, _showComponentCYA.default)(c, _objectSpread(_objectSpread({}, page.formData), formData));
     }).flatMap(function (component) {
       var fd = formData ? formData[component.fieldId] : undefined;
 
       if (component.type === _models.ComponentTypes.CONTAINER) {
-        return getCYARowsForContainer(page, component, fd, onAction);
+        return getCYARowsForContainer(page, component, _objectSpread(_objectSpread({}, fd), formData), onAction);
       }
 
       if (component.type === _models.ComponentTypes.COLLECTION) {

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

@@ -320,6 +320,44 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
     checkTitleRow(1, ROWS[2]);
     checkValueRow(1, ROWS[3], 'Charlie');
   });
+  it('should conditionally show an appropriate row for a single text component inside a container belonging to a partial-collection', function () {
+    var OUTER_ID = 'a';
+    var INNER_ID = 'b';
+    var FORM_DATA = {
+      collectionName: [{
+        container: _defineProperty({}, INNER_ID, 'Bravo'),
+        other_data: true
+      }, {
+        container: _defineProperty({}, INNER_ID, 'Charlie'),
+        other_data: false
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {},
+      collection: 'collectionName'
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [{
+        id: INNER_ID,
+        fieldId: INNER_ID,
+        label: INNER_ID,
+        type: 'text'
+      }],
+      formData: FORM_DATA,
+      show_when: {
+        field: 'other_data',
+        op: '=',
+        value: true
+      }
+    };
+    expect((0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.collectionName[0], function () {}).length).toEqual(1);
+    expect((0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.collectionName[1], function () {})).toBeFalsy();
+  });
   it('should get the appropriate number for rows components with nested components inside a container', function () {
     var FORM_DATA = {
       container: {

package/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -44,7 +44,7 @@ var mergeCollectionPages = function mergeCollectionPages(pages) {
   return pages.map(function (page) {
     var _page$collection;
 
-    if ((_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name && (0, _showFormPageCYA.default)(page, page.formData)) {
+    if (page !== null && page !== void 0 && (_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name && (0, _showFormPageCYA.default)(page, page.formData)) {
       if (!masterPages[page.collection.name]) {
         // If no master page exists for this collection.name, then
         // we kick one off using this page as a template.

package/dist/utils/Condition/meetsCondition.js

@@ -72,6 +72,13 @@ var meetsCondition = function meetsCondition(condition, value) {
           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.
+        }
+
       default:
         return false;
     }

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

@@ -350,6 +350,95 @@ describe('utils.Condition.meetsCondition', function () {
       expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
     });
   });
+  describe('operator !contains', function () {
+    var op = '!contains'; // Should match...
+
+    it('should match a string that is not in the field array', function () {
+      var FIELD = ['alpha', 'bravo', 'charlie'];
+      var VALUE = 'delta';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match any value if the field array is empty', function () {
+      var FIELD = [];
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match any field when the value is null', function () {
+      var FIELD = ['alpha', 'bravo', 'charlie'];
+      var VALUE = null;
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match any field when the value is undefined', function () {
+      var FIELD = ['alpha', 'bravo', 'charlie'];
+      var VALUE = undefined;
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match any value when the field is an empty string', function () {
+      var FIELD = '';
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match a number that is missing from the field array', function () {
+      var FIELD = [1, 2, 3];
+      var VALUE = 4;
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match a substring that is missing from the field string', function () {
+      var FIELD = 'alphabravocharlie';
+      var VALUE = 'delta';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match any value when the field is null', function () {
+      var FIELD = null;
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    });
+    it('should match any value when the field is undefined', function () {
+      var FIELD = undefined;
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeTruthy();
+    }); // Should reject...
+
+    it('should reject a string that is in the field array', function () {
+      var FIELD = ['alpha', 'bravo', 'charlie'];
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
+    });
+    it('should reject a sub-string that is in the field array', function () {
+      var FIELD = ['alpha', 'bravo', 'charlie'];
+      var VALUE = 'alp';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
+    });
+    it('should reject a number that is in the field array', function () {
+      var FIELD = [1, 2, 3];
+      var VALUE = 1;
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
+    });
+    it('should reject a sub-string that is in the field string', function () {
+      var FIELD = 'alphabravocharlie';
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
+    });
+    it('should reject a string that is in the field array regardless of case', function () {
+      var FIELD = ['Alpha', 'bravo', 'charlie'];
+      var VALUE = 'alpha';
+      var CONDITION = getCondition(op, VALUE);
+      expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
+    });
+  });
   describe('unknown operator', function () {
     var op = 'definitely_not_a_real_operator';
     it('should reject anything regardless of the value', function () {

package/dist/utils/Validate/validatePage.js

@@ -35,7 +35,7 @@ var validatePage = function validatePage(page) {
     if (activeIndex !== null) {
       var _page$formData$page$c;
 
-      data = (_page$formData$page$c = page.formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c[activeIndex];
+      data = _objectSpread(_objectSpread({}, page.formData), (_page$formData$page$c = page.formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c[activeIndex]);
     }
   }
 

package/package.json

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