@ukhomeoffice/cop-react-form-renderer 4.56.0 → 4.58.0

package/dist/components/TaskList/TaskList.js

@@ -70,16 +70,18 @@ var TaskList = function TaskList(_ref) {
   var classes = _copReactComponents.Utils.classBuilder(classBlock, classModifiers, className); //TODO state will be retrieved from a document in S3 rather than given in the component definition, covered under COP-9885
 
 
-  var _sections$reduce = sections.reduce(function (acc, current) {
+  var _sections$filter$redu = sections.filter(function (section) {
+    return !section.skipped;
+  }).reduce(function (acc, current) {
     var _current$tasks$filter, _current$tasks, _current$tasks$length, _current$tasks2;
 
     return [acc[0] + ((_current$tasks$filter = (_current$tasks = current.tasks) === null || _current$tasks === void 0 ? void 0 : _current$tasks.filter(function (t) {
       return t.state === _models.TaskStates.TYPES.COMPLETE;
     }).length) !== null && _current$tasks$filter !== void 0 ? _current$tasks$filter : 0), acc[1] + ((_current$tasks$length = (_current$tasks2 = current.tasks) === null || _current$tasks2 === void 0 ? void 0 : _current$tasks2.length) !== null && _current$tasks$length !== void 0 ? _current$tasks$length : 0)];
   }, [0, 0]),
-      _sections$reduce2 = _slicedToArray(_sections$reduce, 2),
-      completeSections = _sections$reduce2[0],
-      totalSections = _sections$reduce2[1];
+      _sections$filter$redu2 = _slicedToArray(_sections$filter$redu, 2),
+      completeSections = _sections$filter$redu2[0],
+      totalSections = _sections$filter$redu2[1];
 
   var notesId = "".concat(attrs.id, "Notes");
 

package/dist/components/TaskList/TaskList.test.js

@@ -309,6 +309,56 @@ describe('components', function () {
       var incompleteForm = childNodes[0].childNodes[0];
       expect(incompleteForm.textContent).toEqual(INCOMPLETE_TITLE);
     });
+    it('should not show skipped sections', function () {
+      var INCOMPLETE_TITLE = 'Alpha Bravo';
+      var COP_REF = '123';
+      var sections = [{
+        name: 'These are your tasks',
+        skipped: true,
+        tasks: [{
+          name: 'Nice task',
+          state: 'complete',
+          pages: ['pageOne']
+        }, {
+          name: 'Ok task',
+          state: 'inProgress',
+          pages: ['pageTwo']
+        }, {
+          name: 'Terrible task',
+          state: 'notStarted',
+          pages: ['pageThree']
+        }]
+      }, {
+        name: 'These are your extra bonus tasks',
+        tasks: [{
+          name: 'Nice task',
+          state: 'complete',
+          pages: ['pageFour']
+        }, {
+          name: 'Ok task',
+          state: 'cannotStartYet',
+          pages: ['pageFive']
+        }, {
+          name: 'Terrible task',
+          state: 'cannotStartYet',
+          pages: ['pageSix']
+        }]
+      }];
+
+      var _render6 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskList.default, {
+        refNumber: COP_REF,
+        sections: sections,
+        incompleteTitle: INCOMPLETE_TITLE
+      })),
+          container = _render6.container;
+
+      var childNodes = container.childNodes;
+      expect(childNodes.length).toEqual(1);
+      expect(childNodes[0].childNodes.length).toEqual(4);
+      expect(childNodes[0].childNodes[0].textContent).toEqual(INCOMPLETE_TITLE);
+      expect(childNodes[0].childNodes[1].textContent).toEqual('You have completed 1 of 3 sections');
+      expect(childNodes[0].childNodes[2].textContent).toEqual("1. ".concat(sections[1].name));
+    });
   });
   it('should pass the selected task to the given onTaskAction function', function () {
     var COP_REF = '123';
@@ -336,13 +386,13 @@ describe('components', function () {
       }]
     }];
 
-    var _render6 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskList.default, {
+    var _render7 = (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_TaskList.default, {
       refNumber: COP_REF,
       refTitle: REF_TITLE,
       sections: sections,
       onTaskAction: ON_CLICK
     })),
-        container = _render6.container;
+        container = _render7.container;
 
     var taskList = container.childNodes[0].childNodes[5].childNodes;
     var firstTask = taskList[1].childNodes[0].childNodes[0];

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -92,6 +92,19 @@ var getActionRows = function getActionRows(page, item, onAction, labelCount) {
   return actions;
 };
 
+var getChangeActionForPage = function getChangeActionForPage(page, item, onAction) {
+  return function () {
+    var changeCallback = function changeCallback(data) {
+      data["".concat(page.collection.name, "ActiveId")] = item.id;
+      return data;
+    };
+
+    onAction({
+      pageId: page.id
+    }, changeCallback);
+  };
+};
+
 var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onAction) {
   var _page$formData, _page$formData$page$c;
 
@@ -135,7 +148,8 @@ var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onA
         }
 
         var container = getContainerForPage(p, item, labelCount, full_path);
-        var containerRows = (0, _getCYARowsForContainer.default)(p, container, item, undefined);
+        var rowChangeAction = getChangeActionForPage(p, item, onAction);
+        var containerRows = (0, _getCYARowsForContainer.default)(p, container, item, rowChangeAction);
         rows = rows.concat(containerRows);
       }
     });

package/dist/utils/Validate/additional/index.js

@@ -21,11 +21,13 @@ var _mustBeLongerThan = _interopRequireDefault(require("./mustBeLongerThan"));
 
 var _mustBeShorterThan = _interopRequireDefault(require("./mustBeShorterThan"));
 
-var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
+var _mustBeGreaterThan = _interopRequireDefault(require("./mustBeGreaterThan"));
+
+var _mustBeLessThan = _interopRequireDefault(require("./mustBeLessThan"));
 
 var _mustBeNumbersOnly = _interopRequireDefault(require("./mustBeNumbersOnly"));
 
-var _mustBeLessThan = _interopRequireDefault(require("./mustBeLessThan"));
+var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
 
 var _mustHaveLessThanDecimalPlaces = _interopRequireDefault(require("./mustHaveLessThanDecimalPlaces"));
 
@@ -46,6 +48,7 @@ var functions = {
   mustEnterAtLeastOne: _mustEnterAtLeastOne.default,
   mustBeNumbersOnly: _mustBeNumbersOnly.default,
   mustBeLessThan: _mustBeLessThan.default,
+  mustBeGreaterThan: _mustBeGreaterThan.default,
   mustHaveLessThanDecimalPlaces: _mustHaveLessThanDecimalPlaces.default,
   mustSelectOnlyOne: _mustSelectOnlyOne.default
 };

package/dist/utils/Validate/additional/mustBeGreaterThan.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+/**
+ * @param {string} string - the string to check value.
+ * @param {number} config.value - the string.value must be greater than config.value. 
+ * @returns true if string value is greater than config.value, false if not.
+ */
+var mustBeGreaterThan = function mustBeGreaterThan(string, config) {
+  if (!string) {
+    // null, undefined and empty strings should be picked up by the required flag
+    // and not considered here as they would be valid for optional fields.
+    return true;
+  }
+
+  return parseFloat(string) > config.value;
+};
+
+var _default = mustBeGreaterThan;
+exports.default = _default;

package/dist/utils/Validate/additional/mustBeGreaterThan.test.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _mustBeGreaterThan = _interopRequireDefault(require("./mustBeGreaterThan"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustBeGreaterThan', function () {
+        test('should return true given a number greater than 10', function () {
+          var result = (0, _mustBeGreaterThan.default)('11', {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return false if provided value less than or equal to 10', function () {
+          var result1 = (0, _mustBeGreaterThan.default)('9', {
+            value: 10
+          });
+          expect(result1).toBeFalsy();
+          var result2 = (0, _mustBeGreaterThan.default)('10', {
+            value: 10
+          });
+          expect(result2).toBeFalsy();
+        });
+        test('should return true when string is undefined', function () {
+          var result = (0, _mustBeGreaterThan.default)(undefined, {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is empty', function () {
+          var result = (0, _mustBeGreaterThan.default)('', {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+        test('should return true when string is null', function () {
+          var result = (0, _mustBeGreaterThan.default)(null, {
+            value: 10
+          });
+          expect(result).toEqual(true);
+        });
+      });
+    });
+  });
+});

package/package.json

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