@ukhomeoffice/cop-react-form-renderer 4.27.0 → 4.29.0-alpha

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -69,7 +69,9 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
       noChangeAction = _ref.noChangeAction,
       groups = _ref.groups,
       sections = _ref.sections,
-      type = _ref.type;
+      type = _ref.type,
+      cysa = _ref.cysa,
+      currentPage = _ref.currentPage;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -86,7 +88,7 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
 
   (0, _react.useEffect)(function () {
     var getRows = function getRows(page, pageIndex) {
-      var rows = _utils.default.CheckYourAnswers.getRows(page, onRowAction);
+      var rows = _utils.default.CheckYourAnswers.getRows(page, onRowAction, currentPage);
 
       return rows.map(function (row, index) {
         return _objectSpread(_objectSpread({}, row), {}, {
@@ -109,8 +111,23 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
     }).filter(function (p) {
       return !!p;
     });
-    setPages(pagesWithRows);
-  }, [_pages, onRowAction, setPages]);
+
+    if (cysa) {
+      var indexOfCurrentPage = pagesWithRows.map(function (object) {
+        return object.id;
+      }).indexOf(currentPage);
+
+      if (indexOfCurrentPage === 0) {
+        setPages(pagesWithRows.slice(0, 1));
+      } else {
+        setPages(pagesWithRows.slice(0, indexOfCurrentPage));
+      }
+    } else {
+      setPages(pagesWithRows);
+    }
+
+    ;
+  }, [_pages, onRowAction, setPages, currentPage, cysa]);
   var listMarginBottom = hide_page_titles ? 0 : DEFAULT_MARGIN_BOTTOM;
 
   var isLastPage = function isLastPage(index) {
@@ -144,11 +161,12 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
     return groupAnswer;
   };
 
+  var cysaTitle = 'Check your saved answers';
   return /*#__PURE__*/_react.default.createElement("div", {
     className: DEFAULT_CLASS
   }, title && !hide_title && /*#__PURE__*/_react.default.createElement(_copReactComponents.LargeHeading, {
     key: "heading"
-  }, title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
+  }, cysa ? cysaTitle : title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
     errors: errors
   }), type === 'task-list-cya' && pages.length > 0 && sections && sections.map(function (section) {
     return section.tasks.map(function (task) {

package/dist/components/FormRenderer/FormRenderer.js

@@ -170,7 +170,17 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   var _useState19 = (0, _react.useState)(false),
       _useState20 = _slicedToArray(_useState19, 2),
       goingBack = _useState20[0],
-      setGoingBack = _useState20[1]; // Set up hooks.
+      setGoingBack = _useState20[1];
+
+  var _useState21 = (0, _react.useState)(false),
+      _useState22 = _slicedToArray(_useState21, 2),
+      continueOnly = _useState22[0],
+      setContinueOnly = _useState22[1];
+
+  var _useState23 = (0, _react.useState)(),
+      _useState24 = _slicedToArray(_useState23, 2),
+      currentTaskListPage = _useState24[0],
+      setCurrentTaskListPage = _useState24[1]; // Set up hooks.
 
 
   var _useHooks = (0, _hooks.useHooks)(),
@@ -183,13 +193,29 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       validate = _useValidation.validate; // Need to set submission data when going back
 
 
-  window.onpopstate = function () {
+  window.onpopstate = function (e) {
     var _formState$page;
 
     if (document.location.hash) {
       return;
     }
 
+    if (e.state && e.state.continueOnly !== undefined) {
+      var _e$state;
+
+      setContinueOnly((_e$state = e.state) === null || _e$state === void 0 ? void 0 : _e$state.continueOnly);
+    }
+
+    if (e.state && e.state.fullPages !== undefined) {
+      setCurrentTask(function (prev) {
+        var _e$state2;
+
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          fullPages: (_e$state2 = e.state) === null || _e$state2 === void 0 ? void 0 : _e$state2.fullPages
+        });
+      });
+    }
+
     setGoingBack(true);
     hooks.onGoingBack();
     clearErrors();
@@ -292,9 +318,10 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   }, [currentTask.fullPages, data, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.sections, hubDetails === null || hubDetails === void 0 ? void 0 : hubDetails.nonSequential]);
 
   var onPageChange = function onPageChange(newPageId) {
+    var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     clearErrors();
     setPageId(newPageId);
-    hooks.onPageChange(newPageId);
+    hooks.onPageChange(newPageId, state);
   };
 
   (0, _react.useEffect)(function () {
@@ -336,8 +363,13 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
             break;
 
           case _models.PageAction.TYPES.SAVE_AND_NAVIGATE:
+            var state = {
+              'continueOnly': false,
+              'fullPages': currentTask.fullPages
+            };
+
             pageUpdate = function pageUpdate() {
-              return _handlers.default.navigate(action, pageId, onPageChange);
+              return _handlers.default.navigate(action, pageId, onPageChange, state);
             };
 
             break;
@@ -450,6 +482,8 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     }
 
     if (page) {
+      setContinueOnly(false);
+
       _handlers.default.cyaAction(page, pageId, onPageChange);
     }
   }; //Kick off a task, gather required pages and move to the correct point
@@ -472,7 +506,18 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         }
       } else if (currentTask.state === _models.TaskStates.TYPES.IN_PROGRESS) {
         var _currentPage = data.formStatus.tasks[currentTask.name].currentPage;
-        onPageChange(_currentPage || currentTask.pages[0]);
+
+        if (currentTask.pages.length > 1 && _currentPage !== _models.FormPages.CYA && _currentPage !== currentTask.pages[0]) {
+          setContinueOnly(true);
+          setCurrentTaskListPage(_currentPage);
+          var state = {
+            'continueOnly': true,
+            'fullPages': currentTask.fullPages
+          };
+          onPageChange(_models.FormPages.CYA, state);
+        } else {
+          onPageChange(_currentPage);
+        }
       } else if (currentTask.firstPage) {
         var _currentPage2 = currentTask.firstPage;
         onPageChange(_currentPage2 || currentTask.pages[0]);
@@ -575,6 +620,12 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
       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.CONTINUE) {
+      var currentPage = data.formStatus.tasks[currentTask.name].currentPage;
+      onPageChange(currentPage || currentTask.pages[0]);
+      setContinueOnly(false);
+    }
+
     if (action.type === _models.PageAction.TYPES.CANCEL) {
       hooks.onCancel();
     }
@@ -583,7 +634,11 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
   var classes = _utils.default.classBuilder(classBlock, classModifiers, className);
 
   if (hub === _models.HubFormats.TASK) {
-    cya.actions = [_models.PageAction.TYPES.SAVE_AND_CONTINUE, _models.PageAction.TYPES.SAVE_AND_RETURN];
+    if (continueOnly) {
+      cya.actions = [_models.PageAction.TYPES.CONTINUE];
+    } else {
+      cya.actions = [_models.PageAction.TYPES.SAVE_AND_CONTINUE, _models.PageAction.TYPES.SAVE_AND_RETURN];
+    }
   }
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -599,7 +654,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
     hide_title: hide_title,
     noChangeAction: noChangeAction,
     sections: typeof hubDetails !== 'undefined' ? hubDetails.sections : [],
-    type: type
+    type: type,
+    cysa: continueOnly,
+    currentPage: currentTaskListPage
   })), hub === _models.HubFormats.TASK && formState.pageId === _models.FormPages.HUB && /*#__PURE__*/_react.default.createElement(_TaskList.default, _extends({}, hubDetails, {
     refNumber: data.businessKey,
     onTaskAction: onTaskAction

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

@@ -36,6 +36,10 @@ var _taskList = _interopRequireDefault(require("../../json/taskList.json"));
 
 var _firstForm = _interopRequireDefault(require("../../json/firstForm.json"));
 
+var _multiQuestionTaskListData = _interopRequireDefault(require("../../json/multiQuestionTaskListData.json"));
+
+var _multiQuestionTaskList = _interopRequireDefault(require("../../json/multiQuestionTaskList.json"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -1002,5 +1006,59 @@ describe('components', function () {
         }
       }, _callee28);
     })));
+    it('should display CYSA page when resuming an in-progress form, with Action buttons replaced with a single Continue button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
+      var ON_SUBMIT, HOOKS, taskList;
+      return regeneratorRuntime.wrap(function _callee30$(_context30) {
+        while (1) {
+          switch (_context30.prev = _context30.next) {
+            case 0:
+              ON_SUBMIT = function ON_SUBMIT(type, payload, onSuccess, onError) {
+                onSuccess();
+              };
+
+              HOOKS = {
+                onSubmit: ON_SUBMIT
+              };
+              _context30.next = 4;
+              return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee29() {
+                return regeneratorRuntime.wrap(function _callee29$(_context29) {
+                  while (1) {
+                    switch (_context29.prev = _context29.next) {
+                      case 0:
+                        (0, _reactDom.render)( /*#__PURE__*/_react2.default.createElement(_FormRenderer.default, _extends({}, _multiQuestionTaskList.default, {
+                          data: _multiQuestionTaskListData.default,
+                          hooks: HOOKS
+                        })), container);
+
+                      case 1:
+                      case "end":
+                        return _context29.stop();
+                    }
+                  }
+                }, _callee29);
+              })));
+
+            case 4:
+              taskList = container.childNodes[0].childNodes[1]; //Resume the first task
+
+              _react.fireEvent.click(taskList.childNodes[5].childNodes[1].childNodes[0].childNodes[0], {}); // Verify the correct title has been rendered, and the Action buttons have been changed to Continue Only
+
+
+              expect(container.childNodes[0].childNodes[0].childNodes[0].textContent).toEqual('Check your saved answers');
+              expect(container.childNodes[0].childNodes[0].childNodes[5].childNodes[0].childNodes[0].textContent).toEqual('Continue'); // Click Continue
+
+              _react.fireEvent.click(container.childNodes[0].childNodes[0].childNodes[5].childNodes[0].childNodes[0], {}); // Verify that Save & Continue / Save and Return Later buttons are restored on the next screen
+
+
+              expect(container.childNodes[0].childNodes[0].childNodes[6].childNodes[0].textContent).toEqual('Save and continue');
+              expect(container.childNodes[0].childNodes[0].childNodes[6].childNodes[1].textContent).toEqual('Save and return later');
+
+            case 11:
+            case "end":
+              return _context30.stop();
+          }
+        }
+      }, _callee30);
+    })));
   });
 });

package/dist/components/FormRenderer/handlers/navigate.js

@@ -16,11 +16,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {string} currentPageId The current pageId.
  * @param {Function} onNavigate The handler to call if the pageId is different to the currentPageId.
  */
-var navigate = function navigate(action, currentPageId, onNavigate) {
+var navigate = function navigate(action, currentPageId, onNavigate, state) {
   var pageId = (0, _getPageId.default)(action, currentPageId);
 
   if (pageId !== currentPageId) {
-    onNavigate(pageId);
+    onNavigate(pageId, state);
   }
 };
 

package/dist/json/multiQuestionTaskList.json

@@ -0,0 +1,275 @@
+{
+  "id": "cop-multiTaskList",
+  "cya": {
+    "actions": [
+      { "type": "saveAndContinue", "label": "save cont", "validate": true }
+    ],
+    "hide_page_titles": false
+  },
+  "hub": {
+    "format": "CYA",
+    "refTitle": "COP reference number",
+    "sections": [
+      {
+        "name": "Add passenger details",
+        "tasks": [
+          {
+            "name": "Passenger 1",
+            "pages": ["officer", "p1Name", "p1details"],
+            "state": "complete"
+          },
+          {
+            "name": "Passenger 2",
+            "pages": ["relationship", "p2Name", "p2details"],
+            "state": "inProgress"
+          }
+        ]
+      },
+      {
+        "name": "Submit form",
+        "tasks": [
+          {
+            "name": "Accept and submit",
+            "pages": ["submitForm"],
+            "state": "inProgress"
+          }
+        ]
+      }
+    ]
+  },
+  "name": "cop-multiTaskList",
+  "type": "task-list",
+  "pages": [
+    {
+      "id": "officer",
+      "name": "officer",
+      "title": "Officer Details",
+      "actions": [
+        { "page": "p1Name", "type": "saveAndNavigate" },
+        "saveAndReturn"
+      ],
+      "cya_link": { "page": "officer", "aria_suffix": "Officer Details" },
+      "components": [{ "use": "officerName" }]
+    },
+    {
+      "id": "p1Name",
+      "name": "p1Name",
+      "title": "Passenger 1 Names",
+      "actions": [
+        { "page": "p1details", "type": "saveAndNavigate" },
+        "saveAndReturn"
+      ],
+      "cya_link": { "page": "p1Name", "aria_suffix": "Passenger 1 name" },
+      "components": [
+        { "use": "passenger1firstname" },
+        { "use": "passenger1surname" }
+      ]
+    },
+    {
+      "id": "p1details",
+      "name": "p1details",
+      "title": "Passenger 1 Details",
+      "actions": [
+        { "page": "cya", "type": "saveAndNavigate" },
+        "saveAndReturn"
+      ],
+      "cya_link": { "page": "p1details", "aria_suffix": "Passenger 1 Details" },
+      "components": [
+        { "use": "dateofarrivalp1" },
+        { "use": "dateofdeparturep1" },
+        { "use": "doesp1havevisa" },
+        { "use": "p1flightNo" },
+        { "use": "p1extraDetails" }
+      ]
+    },
+    {
+      "id": "relationship",
+      "name": "relationship",
+      "title": "Passenger relationship",
+      "actions": [
+        { "page": "p2Name", "type": "saveAndNavigate" },
+        "saveAndReturn"
+      ],
+      "cya_link": {
+        "page": "relationship",
+        "aria_suffix": "Passenger Relationship"
+      },
+      "components": [{ "use": "p2relationship" }]
+    },
+    {
+      "id": "p2Name",
+      "name": "p2Name",
+      "title": "Passenger 2 Names",
+      "actions": [
+        { "page": "p2details", "type": "saveAndNavigate" },
+        "saveAndReturn"
+      ],
+      "cya_link": { "page": "p2Name", "aria_suffix": "Passenger 2 name" },
+      "components": [
+        { "use": "passenger2firstname" },
+        { "use": "passenger2surname" }
+      ]
+    },
+    {
+      "id": "p2details",
+      "name": "p2details",
+      "title": "Passenger 2 Details",
+      "actions": [
+        { "page": "cya", "type": "saveAndNavigate" },
+        "saveAndReturn"
+      ],
+      "cya_link": { "page": "p2details", "aria_suffix": "Passenger 2 Details" },
+      "components": [
+        { "use": "dateofarrivalp2" },
+        { "use": "dateofdeparturep2" },
+        { "use": "doesp2havevisa" },
+        { "use": "p2flightNo" },
+        { "use": "p2extraDetails" }
+      ]
+    },
+    {
+      "id": "submitForm",
+      "name": "submitForm",
+      "title": "Submit",
+      "actions": [
+        { "type": "submit", "label": "Submit", "validate": true },
+        "saveAndReturn"
+      ],
+      "components": []
+    }
+  ],
+  "title": "Task List Multi Question Form",
+  "version": "1",
+  "components": [
+    {
+      "id": "officerName",
+      "type": "text",
+      "label": "Officer name",
+      "fieldId": "officerName",
+      "required": true
+    },
+    {
+      "id": "passenger1firstname",
+      "type": "text",
+      "label": "Passenger 1 first name",
+      "fieldId": "passenger1firstname",
+      "required": true
+    },
+    {
+      "id": "passenger1surname",
+      "type": "text",
+      "label": "Passenger 1 last name",
+      "fieldId": "passenger1surname",
+      "required": true
+    },
+    {
+      "id": "dateofarrivalp1",
+      "type": "date",
+      "label": "Date of Arrival for passenger 1",
+      "fieldId": "dateofarrivalp1",
+      "required": true
+    },
+    {
+      "id": "dateofdeparturep1",
+      "type": "date",
+      "label": "Date of Departure for passenger 1",
+      "fieldId": "dateofdeparturep1",
+      "required": true
+    },
+    {
+      "id": "doesp1havevisa",
+      "data": {
+        "options": [
+          { "label": "Yes, passenger 1 has a valid visa", "value": "yes" },
+          {
+            "label": "No, passenger 1 does not have a valid visa",
+            "value": "no"
+          }
+        ]
+      },
+      "type": "radios",
+      "label": "Valid visa",
+      "fieldId": "doesp1havevisa",
+      "required": true
+    },
+    {
+      "id": "p1flightNo",
+      "type": "text",
+      "label": "Passenger 1 outbound flight number",
+      "fieldId": "p1flightNo",
+      "required": true
+    },
+    {
+      "id": "p2relationship",
+      "type": "text",
+      "label": "What is the relationship of passenger 2 to passenger 1",
+      "fieldId": "p2relationship",
+      "required": true
+    },
+    {
+      "id": "p1extraDetails",
+      "type": "textarea",
+      "label": "Enter any extra details about journey for passenger 1",
+      "fieldId": "p1extraDetails",
+      "required": true
+    },
+    {
+      "id": "passenger2firstname",
+      "type": "text",
+      "label": "Passenger 2 first name",
+      "fieldId": "passenger2firstname",
+      "required": true
+    },
+    {
+      "id": "passenger2surname",
+      "type": "text",
+      "label": "Passenger 2 last name",
+      "fieldId": "passenger2surname",
+      "required": true
+    },
+    {
+      "id": "dateofarrivalp2",
+      "type": "date",
+      "label": "Date of Arrival for passenger 2",
+      "fieldId": "dateofarrivalp2",
+      "required": true
+    },
+    {
+      "id": "dateofdeparturep2",
+      "type": "date",
+      "label": "Date of Departure for passenger 2",
+      "fieldId": "dateofdeparturep2",
+      "required": true
+    },
+    {
+      "id": "doesp2havevisa",
+      "data": {
+        "options": [
+          { "label": "Yes, passenger 2 has a valid visa", "value": "yes" },
+          {
+            "label": "No, passenger 2 does not have a valid visa",
+            "value": "no"
+          }
+        ]
+      },
+      "type": "radios",
+      "label": "Valid visa",
+      "fieldId": "doesp2havevisa",
+      "required": true
+    },
+    {
+      "id": "p2flightNo",
+      "type": "text",
+      "label": "Passenger 2 outbound flight number",
+      "fieldId": "p2flightNo",
+      "required": true
+    },
+    {
+      "id": "p2extraDetails",
+      "type": "textarea",
+      "label": "Enter any extra details about journey for passenger 2",
+      "fieldId": "p2extraDetails",
+      "required": true
+    }
+  ]
+}

package/dist/json/multiQuestionTaskListData.json

@@ -0,0 +1,39 @@
+{
+  "id": "695735b6-7187-11ed-a74f-4a1f833894ff",
+  "businessKey": "DEV-20221201-1250",
+  "officerName": "Bob Smith",
+  "formStatus": {
+    "tasks": {
+      "Passenger 1": { "complete": false, "currentPage": "p1details" }
+    },
+    "taskPage": "p1details"
+  },
+  "links": [
+    {
+      "method": "GET",
+      "href": "https://workflow-service-green.dev.cop.homeoffice.gov.uk/camunda/engine-rest/process-instance/695735b6-7187-11ed-a74f-4a1f833894ff",
+      "rel": "self"
+    }
+  ],
+  "definitionId": "cop-multiTaskList:2:04acd47e-6a95-11ed-89dc-8e447b30f638",
+  "caseInstanceId": null,
+  "ended": false,
+  "suspended": false,
+  "tenantId": null,
+  "passenger1firstname": "James",
+  "passenger1surname": "Jones",
+  "dateofarrivalp1": "1-1-2022",
+  "dateofdeparturep1": "3-2-2022",
+  "doesp1havevisa": "yes",
+  "p1flightNo": "564131946",
+  "p1extraDetails": "N/A",
+  "form": {
+    "formId": "cop-multiTaskList",
+    "formVersionId": "1",
+    "title": "Task List Multi Question Form",
+    "name": "cop-multiTaskList",
+    "submissionDate": "2022-12-01T14:50:58.363Z",
+    "submittedBy": "james.bowers@digital.homeoffice.gov.uk",
+    "draftForm": true
+  }
+}

package/dist/models/PageAction.js

@@ -14,6 +14,7 @@ var TYPE_COLLECTION_ADD = 'collectionAdd';
 var TYPE_COLLECTION_DUPLICATE = 'collectionDuplicate';
 var TYPE_COLLECTION_REMOVE = 'collectionRemove';
 var TYPE_NAVIGATE = 'navigate';
+var TYPE_CONTINUE = 'continue';
 var TYPE_SAVE_AND_CONTINUE = 'saveAndContinue';
 var TYPE_SAVE_AND_NAVIGATE = 'saveAndNavigate';
 var TYPE_SAVE_AND_RETURN = 'saveAndReturn';
@@ -24,6 +25,7 @@ var PageActionTypes = {
   COLLECTION_DUPLICATE: TYPE_COLLECTION_DUPLICATE,
   COLLECTION_REMOVE: TYPE_COLLECTION_REMOVE,
   NAVIGATE: TYPE_NAVIGATE,
+  CONTINUE: TYPE_CONTINUE,
   SAVE_AND_CONTINUE: TYPE_SAVE_AND_CONTINUE,
   SAVE_AND_NAVIGATE: TYPE_SAVE_AND_NAVIGATE,
   SAVE_AND_RETURN: TYPE_SAVE_AND_RETURN,
@@ -35,7 +37,11 @@ var DefaultPageActions = (_DefaultPageActions = {}, _defineProperty(_DefaultPage
   validate: false,
   label: 'Cancel',
   classModifiers: 'secondary'
-}), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_ADD, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_DUPLICATE, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_REMOVE, undefined), _defineProperty(_DefaultPageActions, TYPE_NAVIGATE, undefined), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_CONTINUE, {
+}), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_ADD, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_DUPLICATE, undefined), _defineProperty(_DefaultPageActions, TYPE_COLLECTION_REMOVE, undefined), _defineProperty(_DefaultPageActions, TYPE_NAVIGATE, undefined), _defineProperty(_DefaultPageActions, TYPE_CONTINUE, {
+  type: TYPE_CONTINUE,
+  validate: true,
+  label: 'Continue'
+}), _defineProperty(_DefaultPageActions, TYPE_SAVE_AND_CONTINUE, {
   type: TYPE_SAVE_AND_CONTINUE,
   validate: true,
   label: 'Save and continue'

package/dist/utils/Condition/meetsCondition.js

@@ -67,6 +67,30 @@ var meetsCondition = function meetsCondition(condition, value) {
           return true;
         }
 
+      case '<':
+        {
+          if (!value || !compare) {
+            return false;
+          }
+
+          var valFloat = parseFloat(value.replace(',', ''));
+          var compareFloat = parseFloat(compare.replace(',', ''));
+          return valFloat < compareFloat;
+        }
+
+      case '>':
+        {
+          if (!value || !compare) {
+            return false;
+          }
+
+          var _valFloat = parseFloat(value.replace(',', ''));
+
+          var _compareFloat = parseFloat(compare.replace(',', ''));
+
+          return _valFloat > _compareFloat;
+        }
+
       case 'contains':
         {
           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.

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

@@ -439,6 +439,78 @@ describe('utils.Condition.meetsCondition', function () {
       expect((0, _meetsCondition.default)(CONDITION, FIELD)).toBeFalsy();
     });
   });
+  describe('numerical operators', function () {
+    it('less than should reject when value is null', function () {
+      var CONDITION = {
+        op: '<',
+        value: '100'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, null)).toBeFalsy();
+    });
+    it('less than should reject when condition.value is null', function () {
+      var CONDITION = {
+        op: '<',
+        value: null
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '100')).toBeFalsy();
+    });
+    it('less than should reject when condition.value and value are null', function () {
+      var CONDITION = {
+        op: '<',
+        value: null
+      };
+      expect((0, _meetsCondition.default)(CONDITION, null)).toBeFalsy();
+    });
+    it('less than should reject when value is greater than condition.value', function () {
+      var CONDITION = {
+        op: '<',
+        value: '100'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '101')).toBeFalsy();
+    });
+    it('less than should accept when value is less than condition.value', function () {
+      var CONDITION = {
+        op: '<',
+        value: '100'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '99')).toBeTruthy();
+    });
+    it('greater than should reject when value is null', function () {
+      var CONDITION = {
+        op: '>',
+        value: '100'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, null)).toBeFalsy();
+    });
+    it('greater than should reject when condition.value is null', function () {
+      var CONDITION = {
+        op: '>',
+        value: null
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '100')).toBeFalsy();
+    });
+    it('greater than should reject when condition.value and value are null', function () {
+      var CONDITION = {
+        op: '>',
+        value: null
+      };
+      expect((0, _meetsCondition.default)(CONDITION, null)).toBeFalsy();
+    });
+    it('greater than should reject when value is less than condition.value', function () {
+      var CONDITION = {
+        op: '>',
+        value: '100'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '99')).toBeFalsy();
+    });
+    it('greater than should accept when value is greater than condition.value', function () {
+      var CONDITION = {
+        op: '>',
+        value: '100'
+      };
+      expect((0, _meetsCondition.default)(CONDITION, '101')).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.27.0",
+  "version": "4.29.0-alpha",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",