@ukhomeoffice/cop-react-form-renderer 5.19.1 → 5.20.0

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -137,7 +137,9 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
   }, title), errors && errors.length > 0 && /*#__PURE__*/_react.default.createElement(_copReactComponents.ErrorSummary, {
     errors: errors
   }), type === _models.FormTypes.TASK_CYA && pages.length > 0 && sections && sections.map(function (section) {
-    return section.tasks.map(function (task, taskIndex) {
+    return section.tasks.filter(function (task) {
+      return task.state !== _models.TaskStates.TYPES.SKIPPED;
+    }).map(function (task, taskIndex) {
       var filterPages = pages.filter(function (page) {
         return task.pages.some(function (p) {
           return p === page.name;

package/dist/components/CheckYourAnswers/CheckYourAnswers.test.js

@@ -548,5 +548,57 @@ describe('components', function () {
         }
       }, _callee22);
     })));
+    it('should show task list in CYA style and hide pages from skipped tasks', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+      var sections, taskHeading1, namesPageHeading;
+      return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+        while (1) switch (_context24.prev = _context24.next) {
+          case 0:
+            sections = [{
+              name: 'These are your tasks',
+              tasks: [{
+                name: 'Task 1',
+                state: 'complete',
+                pages: ['names']
+              }, {
+                name: 'Task 2',
+                state: 'skipped',
+                pages: ['grade']
+              }]
+            }];
+            _context24.next = 3;
+            return (0, _testUtils.act)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+              return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+                while (1) switch (_context23.prev = _context23.next) {
+                  case 0:
+                    (0, _setupTests.renderDomWithValidation)( /*#__PURE__*/_react.default.createElement(_CheckYourAnswers.default, {
+                      pages: PAGES,
+                      onRowAction: ON_ROW_ACTION,
+                      onAction: ON_ACTION,
+                      hide_title: true,
+                      sections: sections,
+                      type: "task-list-cya"
+                    }), container);
+                  case 1:
+                  case "end":
+                    return _context23.stop();
+                }
+              }, _callee23);
+            })));
+          case 3:
+            taskHeading1 = container.childNodes[0].childNodes[0];
+            expect(taskHeading1.tagName).toEqual('H2');
+            expect(taskHeading1.textContent).toEqual('Task 1');
+            expect(taskHeading1.classList).toContain("govuk-heading-m");
+            namesPageHeading = container.childNodes[0].childNodes[1];
+            expect(namesPageHeading.tagName).toEqual('DIV');
+            expect(namesPageHeading.textContent).toContain('John');
+            expect(namesPageHeading.classList).toContain("group-of-rows");
+            expect(container.childNodes[0].childNodes.length).toEqual(2); // second task skipped so not shown 
+          case 12:
+          case "end":
+            return _context24.stop();
+        }
+      }, _callee24);
+    })));
   });
 });

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

@@ -17,6 +17,7 @@ var _mustBeLessThan = _interopRequireDefault(require("./mustBeLessThan"));
 var _mustBeNumbersOnly = _interopRequireDefault(require("./mustBeNumbersOnly"));
 var _mustEnterAtLeastOne = _interopRequireDefault(require("./mustEnterAtLeastOne"));
 var _mustHaveLessThanDecimalPlaces = _interopRequireDefault(require("./mustHaveLessThanDecimalPlaces"));
+var _mustNotContainSql = _interopRequireDefault(require("./mustNotContainSql"));
 var _mustSelectOnlyOne = _interopRequireDefault(require("./mustSelectOnlyOne"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
@@ -26,15 +27,16 @@ var functions = {
   mustBeAfter: _mustBeAfter.default,
   mustBeBefore: _mustBeBefore.default,
   mustBeEarlierDateTime: _mustBeEarlierDateTime.default,
-  mustBeInThePast: _mustBeInThePast.default,
+  mustBeGreaterThan: _mustBeGreaterThan.default,
   mustBeInTheFuture: _mustBeInTheFuture.default,
+  mustBeInThePast: _mustBeInThePast.default,
+  mustBeLessThan: _mustBeLessThan.default,
   mustBeLongerThan: _mustBeLongerThan.default,
+  mustBeNumbersOnly: _mustBeNumbersOnly.default,
   mustBeShorterThan: _mustBeShorterThan.default,
   mustEnterAtLeastOne: _mustEnterAtLeastOne.default,
-  mustBeNumbersOnly: _mustBeNumbersOnly.default,
-  mustBeLessThan: _mustBeLessThan.default,
-  mustBeGreaterThan: _mustBeGreaterThan.default,
   mustHaveLessThanDecimalPlaces: _mustHaveLessThanDecimalPlaces.default,
+  mustNotContainSql: _mustNotContainSql.default,
   mustSelectOnlyOne: _mustSelectOnlyOne.default
 };
 var additionalValidation = function additionalValidation(value, config, component) {

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

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+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); }
+// NOTE: SQL RegEx reference:
+// http://www.symantec.com/connect/articles/detection-sql-injection-and-cross-site-scripting-attacks
+var SQL_COMBINED = /(%27)|(')|(--)|(%23)|(#)|((%3D)|(=))[^\n]*((%27)|(')|(--)|(%3B)|(;))|w*((%27)|('))((%6F)|o|(%4F))((%72)|r|(%52))|((%27)|('))union/i;
+var mustNotContainSql = function mustNotContainSql(value) {
+  // eslint-disable-next-line no-extra-boolean-cast
+  if (!!value) {
+    var string = _typeof(value) === 'object' ? JSON.stringify(value) : String(value);
+    return !SQL_COMBINED.test(string);
+  }
+  return false;
+};
+var _default = mustNotContainSql;
+exports.default = _default;

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

@@ -0,0 +1,32 @@
+"use strict";
+
+var _mustNotContainSql = _interopRequireDefault(require("./mustNotContainSql"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe('utils', function () {
+  describe('Validate', function () {
+    describe('additional', function () {
+      describe('mustNotContainSql', function () {
+        test('should return true given a string not containing sql characters', function () {
+          var result = (0, _mustNotContainSql.default)('test');
+          expect(result).toEqual(true);
+        });
+        test('should return true given non-string datatype is converted to string', function () {
+          var result = (0, _mustNotContainSql.default)(123);
+          expect(result).toEqual(true);
+        });
+        test('should return false given a string containing sql characters', function () {
+          var result = (0, _mustNotContainSql.default)("test' OR '1'='1'");
+          expect(result).toEqual(false);
+        });
+        test('should return false given string is null', function () {
+          var result = (0, _mustNotContainSql.default)(null);
+          expect(result).toEqual(false);
+        });
+        test('should return false given string is not defined', function () {
+          var result = (0, _mustNotContainSql.default)(undefined);
+          expect(result).toEqual(false);
+        });
+      });
+    });
+  });
+});

package/package.json

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