@ukhomeoffice/cop-react-form-renderer 6.6.1 → 6.11.1

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

@@ -0,0 +1,56 @@
+"use strict";
+
+var _getSummaryListRowForDetails = _interopRequireDefault(require("./getSummaryListRowForDetails"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+describe('utils.CheckYourAnswers.getSummaryListRowForDetails', function () {
+  var COMPONENT_A = {
+    type: 'text',
+    id: 'a',
+    fieldId: 'a',
+    label: 'Alpha'
+  };
+  var TITLE = {
+    type: 'title',
+    key: 'Bravo'
+  };
+  var PAGE = {
+    id: 'page',
+    components: [COMPONENT_A],
+    formData: {
+      a: 'Alpha Value'
+    }
+  };
+  it('should get a summary list row for a component', function () {
+    var row = (0, _getSummaryListRowForDetails.default)(PAGE, COMPONENT_A, null, {});
+    expect(row.props.row.key).toEqual(COMPONENT_A.label);
+    expect(row.props.row.value.props).toMatchObject({
+      component: COMPONENT_A,
+      value: PAGE.formData[COMPONENT_A.fieldId]
+    });
+  });
+  it('should get a summary list title row for a component with a type of title', function () {
+    var row = (0, _getSummaryListRowForDetails.default)(PAGE, TITLE, null, {});
+    expect(row.props.title).toEqual(TITLE.key);
+  });
+  it('should use a placeholder value for empty optional fields if one is provided', function () {
+    var CUSTOM_PAGE = _objectSpread(_objectSpread({}, PAGE), {}, {
+      components: [{
+        type: 'text',
+        fieldId: 'componentA',
+        label: 'Component A',
+        required: false
+      }]
+    });
+    var summaryListRow = (0, _getSummaryListRowForDetails.default)(CUSTOM_PAGE, CUSTOM_PAGE.components[0], null, {}, 'Not entered');
+    expect(summaryListRow.props.row.key).toEqual('Component A');
+    expect(summaryListRow.props.row.value.props).toMatchObject({
+      placeholder: 'Not entered'
+    });
+  });
+});

package/dist/utils/CollectionPage/getQuickEditPage.js

@@ -55,6 +55,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @returns Page suitble for rendering in a QuickEdit
  */
 var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData) {
+  var _masterPage$collectio;
   if (!masterPage) {
     return null;
   }
@@ -113,7 +114,7 @@ var getQuickEditPage = function getQuickEditPage(masterPage, formData, entryData
   // Remove ID to stop overwriting top-level form ID.
   var id = entryData.id,
     entryWithNoId = _objectWithoutProperties(entryData, _excluded);
-  pageToReturn.formData = _objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId);
+  pageToReturn.formData = _objectSpread(_objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId), {}, _defineProperty({}, "".concat((_masterPage$collectio = masterPage.collection) === null || _masterPage$collectio === void 0 || (_masterPage$collectio = _masterPage$collectio.name) === null || _masterPage$collectio === void 0 ? void 0 : _masterPage$collectio.split('.').pop(), "ActiveId"), entryData.id));
   delete pageToReturn.title;
   delete pageToReturn.collection;
   return pageToReturn;

package/dist/utils/CollectionPage/getQuickEditPage.test.js

@@ -19,6 +19,9 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     }]
   };
   var MASTER_PAGE = {
+    collection: {
+      name: 'entries'
+    },
     childPages: [{
       id: 'firstPage',
       name: 'firstPage',
@@ -132,4 +135,9 @@ describe('Utils.CollectionPage.getQuickEditPage', function () {
     var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, CUSTOM_ENTRY_DATA);
     expect(createdPage).toMatchObject(CUSTOM_OUTPUT);
   });
+  it('should return a quick edit page with the activeId for the current collection correctly set', function () {
+    var createdPage = (0, _getQuickEditPage.default)(MASTER_PAGE, FORM_DATA, ENTRY_DATA);
+    expect(createdPage.formData.entriesActiveId).toEqual('123');
+    expect(createdPage).toMatchObject(EXPECTED_OUTPUT);
+  });
 });

package/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -32,6 +32,7 @@ var createMasterPage = function createMasterPage(page) {
   return {
     id: page.id,
     name: page.name,
+    orderInForm: page.orderInForm,
     collection: _objectSpread({
       masterPage: true
     }, page.collection),
@@ -68,6 +69,12 @@ var nestUnderParent = function nestUnderParent(childPage, masterPages) {
     return false;
   }
   parentPage.childPages.push(childPage);
+
+  // Sort the pages to make sure they're in the same order
+  // they were in on the form.
+  parentPage.childPages.sort(function (a, b) {
+    return a.orderInForm - b.orderInForm;
+  });
   return true;
 };
 
@@ -84,8 +91,9 @@ var nestUnderParent = function nestUnderParent(childPage, masterPages) {
  */
 var mergeCollectionPages = function mergeCollectionPages(pages) {
   var masterPages = {};
-  var pagesWithMasters = pages.map(function (page) {
+  var pagesWithMasters = pages.map(function (page, index) {
     var _page$collection;
+    page.orderInForm = index;
     if (page !== null && page !== void 0 && (_page$collection = page.collection) !== null && _page$collection !== void 0 && _page$collection.name) {
       if (!masterPages[page.collection.name]) {
         // If no master page exists for this collection.name, then
@@ -104,6 +112,7 @@ var mergeCollectionPages = function mergeCollectionPages(pages) {
   }).filter(function (page) {
     return !!page;
   });
+
   // We nest any child master pages under their parents here to 
   // ensure that all parent master pages have been created by the
   // above code first.

package/dist/utils/CollectionPage/mergeCollectionPages.test.js

@@ -131,7 +131,7 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
         masterPage: true
       },
       formData: {},
-      childPages: [PAGES[2], PAGES[3], {
+      childPages: [{
         id: 'page1',
         collection: {
           name: 'parent.child',
@@ -139,7 +139,7 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
         },
         formData: {},
         childPages: [PAGES[0], PAGES[1]]
-      }]
+      }, PAGES[2], PAGES[3]]
     });
   });
   it('should leave non-collection pages unaffected', function () {
@@ -160,7 +160,7 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
     }];
     var RESULT = (0, _mergeCollectionPages.default)(PAGES);
     expect(RESULT.length).toEqual(2);
-    expect(RESULT[0]).toEqual({
+    expect(RESULT[0]).toMatchObject({
       id: 'page1',
       collection: {
         name: 'collection',
@@ -169,7 +169,7 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
       formData: {},
       childPages: [PAGES[0], PAGES[1]]
     });
-    expect(RESULT[1]).toEqual({
+    expect(RESULT[1]).toMatchObject({
       id: 'page3'
     });
   });
@@ -201,7 +201,7 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
     }];
     var RESULT = (0, _mergeCollectionPages.default)(PAGES);
     expect(RESULT.length).toEqual(2);
-    expect(RESULT[0]).toEqual({
+    expect(RESULT[0]).toMatchObject({
       id: 'page1',
       collection: {
         name: 'collection1',
@@ -210,7 +210,7 @@ describe('utils.CollectionPage.mergeCollectionPages', function () {
       formData: {},
       childPages: [PAGES[0], PAGES[1]]
     });
-    expect(RESULT[1]).toEqual({
+    expect(RESULT[1]).toMatchObject({
       id: 'page3',
       collection: {
         name: 'collection2',

package/dist/utils/Component/elevateNestedComponents.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Data = _interopRequireDefault(require("../Data"));
+var _optionIsSelected = _interopRequireDefault(require("./optionIsSelected"));
 var _showComponent = _interopRequireDefault(require("./showComponent"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
@@ -45,7 +46,7 @@ var elevateNestedComponents = function elevateNestedComponents(components, data)
         // selected, then add its nested components to the array.
         var sourceData = (data === null || data === void 0 ? void 0 : data[component.id]) || _Data.default.getSource(data, component.full_path);
         // If the specific option wasn't shown we shouldn't elevate anything nested under it
-        if (Array.isArray(option.nested) && sourceData === option.value && (0, _showComponent.default)(option, data)) {
+        if (Array.isArray(option.nested) && (0, _optionIsSelected.default)(sourceData, option) && (0, _showComponent.default)(option, data)) {
           allComponents = allComponents.concat(option.nested);
         }
       });

package/dist/utils/Component/elevateNestedComponents.test.js

@@ -263,4 +263,42 @@ describe('utils.Component.elevateNestedComponents', function () {
     };
     expect((0, _elevateNestedComponents.default)(COMPONENTS, DATA)).toEqual([].concat(COMPONENTS));
   });
+  it('should return the original array with elevated nested components that are defined using refdata_match when they are visible', function () {
+    var COMPONENTS = [{
+      id: 'textComp'
+    }, {
+      id: 'checkboxComp',
+      data: {
+        options: [{
+          label: 'Yes',
+          value: 'yes',
+          id: 99
+        }, {
+          label: 'No',
+          value: 'no',
+          id: 100
+        }, {
+          nested: [{
+            id: 'nestedOne'
+          }, {
+            id: 'nestedTwo'
+          }],
+          refdata_match: {
+            id: 99
+          }
+        }]
+      }
+    }];
+    var DATA = {
+      checkboxComp: [{
+        value: 'yes',
+        id: 99
+      }]
+    };
+    expect((0, _elevateNestedComponents.default)(COMPONENTS, DATA)).toEqual([].concat(COMPONENTS, [{
+      id: 'nestedOne'
+    }, {
+      id: 'nestedTwo'
+    }]));
+  });
 });

package/dist/utils/Component/optionIsSelected.js

@@ -14,6 +14,11 @@ exports.default = void 0;
  */
 var optionIsSelected = function optionIsSelected(componentValue, option) {
   if (Array.isArray(componentValue)) {
+    if (option.refdata_match) {
+      return componentValue.some(function (v) {
+        return v.id === option.refdata_match.id;
+      });
+    }
     return componentValue.includes(option.value);
   }
   return componentValue === option.value;

package/dist/utils/Component/optionIsSelected.test.js

@@ -11,6 +11,20 @@ describe('utils.Component.isSelected', function () {
     value: SELECTED_VALUE
   }, {
     value: NOT_SELECTED_VALUE
+  }, {
+    refdata_match: {
+      id: 99
+    },
+    nested: {
+      value: true
+    }
+  }, {
+    refdata_match: {
+      id: 100
+    },
+    nested: {
+      value: true
+    }
   }];
   var COMPONENT = {
     id: 'a',
@@ -29,6 +43,18 @@ describe('utils.Component.isSelected', function () {
     expect((0, _optionIsSelected.default)(PAGE.formData[COMPONENT.id], OPTIONS[0])).toEqual(true);
     expect((0, _optionIsSelected.default)(PAGE.formData[COMPONENT.id], OPTIONS[1])).toEqual(false);
   });
+  it('should properly identify which option is selected for checkboxes using refdata_match', function () {
+    var PAGE = {
+      formData: {
+        a: [{
+          id: 99
+        }]
+      }
+    };
+    COMPONENT.type = 'checkboxes';
+    expect((0, _optionIsSelected.default)(PAGE.formData[COMPONENT.id], OPTIONS[2])).toEqual(true);
+    expect((0, _optionIsSelected.default)(PAGE.formData[COMPONENT.id], OPTIONS[3])).toEqual(false);
+  });
   it('should properly identify which option is selected for radios', function () {
     var PAGE = {
       formData: {

package/dist/utils/Operate/getLength.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _copReactComponents = require("@ukhomeoffice/cop-react-components");
+var _getCollectionPageActiveIndex = _interopRequireDefault(require("../CollectionPage/getCollectionPageActiveIndex"));
+var _getSourceData = _interopRequireDefault(require("../Data/getSourceData"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Global imports.
+
+// Local imports.
+
+/**
+ * Finds a field within data and returns its length
+ * @param {object} config The config of the operation.
+ * @param {string} config.target The path to the target field. If the path
+ * goes through a collection this can be specified as 'collectionName[]'
+ * and this function will use the active entry within that collection.
+ * @param {object} data A page's formData.
+ * @returns The length of a field if found or 0
+ */
+var getLength = function getLength(config, data) {
+  if (!config || !data) {
+    return null;
+  }
+
+  // Replace any instances of 'collectionName[]' with 'collectionName[activeIndex]'
+  var pathParts = config.target.split('.');
+  var updatedPath = '';
+  pathParts.forEach(function (part) {
+    if (updatedPath !== '') {
+      updatedPath += '.';
+    }
+    if (part.slice(-2) === '[]') {
+      var collectionName = part.slice(0, -2);
+      var activeIndex = (0, _getCollectionPageActiveIndex.default)(collectionName, data);
+      updatedPath += "".concat(collectionName, "[").concat(activeIndex, "]");
+    } else {
+      updatedPath += part;
+    }
+  });
+
+  // Get the field and return its length
+  var targetPath = _copReactComponents.Utils.interpolateString(updatedPath, data);
+  var target = (0, _getSourceData.default)(data, targetPath);
+  return (target === null || target === void 0 ? void 0 : target.length) || 0;
+};
+var _default = exports.default = getLength;

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

@@ -0,0 +1,89 @@
+"use strict";
+
+var _getLength = _interopRequireDefault(require("./getLength"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe('Utils.Operate.getLength', function () {
+  it('returns null if config is not defined', function () {
+    expect((0, _getLength.default)(null, {})).toEqual(null);
+  });
+  it('returns null if data is not defined', function () {
+    expect((0, _getLength.default)({}, null)).toEqual(null);
+  });
+  it('returns the length of a top level string', function () {
+    var CONFIG = {
+      target: 'alpha'
+    };
+    var DATA = {
+      alpha: 'abcdef'
+    };
+    expect((0, _getLength.default)(CONFIG, DATA)).toEqual(6);
+  });
+  it('returns the length of a top level array', function () {
+    var CONFIG = {
+      target: 'alpha'
+    };
+    var DATA = {
+      alpha: [{
+        test: 'test'
+      }, {
+        test: 'test'
+      }, {
+        test: 'test'
+      }, {
+        test: 'test'
+      }]
+    };
+    expect((0, _getLength.default)(CONFIG, DATA)).toEqual(4);
+  });
+  it('returns 0 if the field cannot be found', function () {
+    var CONFIG = {
+      target: 'alpha'
+    };
+    var DATA = {
+      beta: [{
+        test: 'test'
+      }, {
+        test: 'test'
+      }, {
+        test: 'test'
+      }, {
+        test: 'test'
+      }]
+    };
+    expect((0, _getLength.default)(CONFIG, DATA)).toEqual(0);
+  });
+  it('returns the length of a field not on the top level', function () {
+    var CONFIG = {
+      target: 'alpha.beta'
+    };
+    var DATA = {
+      alphaActiveId: 3,
+      alpha: {
+        beta: 'qwerty'
+      }
+    };
+    expect((0, _getLength.default)(CONFIG, DATA)).toEqual(6);
+  });
+  it('returns the length of an array nested under an array', function () {
+    var CONFIG = {
+      target: 'alpha[].beta'
+    };
+    var DATA = {
+      alphaActiveId: 3,
+      alpha: [{
+        id: 1,
+        beta: ['test']
+      }, {
+        id: 2,
+        beta: ['test', 'test']
+      }, {
+        id: 3,
+        beta: ['test', 'test', 'test']
+      }, {
+        id: 4,
+        beta: ['test', 'test', 'test', 'test']
+      }]
+    };
+    expect((0, _getLength.default)(CONFIG, DATA)).toEqual(3);
+  });
+});

package/dist/utils/Operate/runPageOperations.js

@@ -12,6 +12,7 @@ var _setValueInFormData = _interopRequireDefault(require("./setValueInFormData")
 var _shouldRun = _interopRequireDefault(require("./shouldRun"));
 var _setDataItem = _interopRequireDefault(require("../Data/setDataItem"));
 var _getFirstOf = _interopRequireDefault(require("./getFirstOf"));
+var _getLength = _interopRequireDefault(require("./getLength"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Global imports.
 
@@ -22,6 +23,7 @@ var functions = {
   getIndexOfMatchingValueIn: _getIndexOfMatchingValueIn.default,
   persistValueInFormData: _persistValueInFormData.default,
   setValueInFormData: _setValueInFormData.default,
+  getLength: _getLength.default,
   getFirstOf: _getFirstOf.default
 };
 var doOperation = function doOperation(config, data, onChange) {

package/dist/utils/Validate/validateComponent.js

@@ -19,7 +19,12 @@ var _validateRequired = _interopRequireDefault(require("./validateRequired"));
 var _validateTextArea = _interopRequireDefault(require("./validateTextArea"));
 var _validateTime = _interopRequireDefault(require("./validateTime"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); } // Local imports
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // Local imports
 /**
  * Validates a single component.
  * @param {object} component The component to validate.
@@ -29,7 +34,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  */
 var validateComponent = function validateComponent(component, outerData, formData) {
   var fd = formData || outerData;
-  if (!(0, _showComponent.default)(component, fd)) {
+  if (!(0, _showComponent.default)(component, _objectSpread(_objectSpread({}, fd), outerData))) {
     return undefined;
   }
   if (component.type === _models.ComponentTypes.CONTAINER) {

package/dist/utils/Validate/validateComponent.test.js

@@ -182,6 +182,37 @@ describe('utils.Validate.Component', function () {
       var DATA = _defineProperty({}, ID, _defineProperty({}, EMAIL_ID, 'alpha.bravo@digital.homeoffice.gov.uk'));
       expect((0, _validateComponent.default)(CONTAINER, DATA)).toEqual([]);
     });
+    it('should return an empty array when the container has only valid components', function () {
+      var TEXT_COMPONENT = {
+        id: 'one',
+        fieldId: 'one',
+        type: _models.ComponentTypes.TEXT,
+        label: 'Text component one'
+      };
+      var TEXT_COMPONENT_TWO = {
+        id: 'two',
+        fieldId: 'two',
+        type: _models.ComponentTypes.TEXT,
+        label: 'Text component two',
+        required: true,
+        show_when: {
+          field: 'one',
+          op: '=',
+          value: 'other'
+        }
+      };
+      var ID = 'container';
+      var LABEL = 'field';
+      var CONTAINER = setup(ID, _models.ComponentTypes.CONTAINER, LABEL, false);
+      CONTAINER.components = [TEXT_COMPONENT, TEXT_COMPONENT_TWO];
+      var DATA = _defineProperty({}, ID, {
+        one: 'other'
+      });
+      var errors = (0, _validateComponent.default)(CONTAINER, DATA, {
+        colour: 'blue'
+      });
+      expect(errors.length).toEqual(1);
+    });
   });
   describe('when the component is a collection', function () {
     it('should return an empty array when the collection has only valid items', function () {

package/dist/utils/Validate/validateTime.js

@@ -39,6 +39,11 @@ var validateTime = function validateTime(time) {
   var intMinute = parseInt(minute, 10);
   var badProps = [];
   var messages = [];
+  var numericRegex = /^\d{0,2}:\d{0,2}$/;
+  if (!numericRegex.test(time)) {
+    badProps.push('invalid');
+    messages.push('Enter a valid time');
+  }
   if (hour.length === 0) {
     badProps.push('hour');
     messages.push('Time must include a hour');
@@ -61,6 +66,9 @@ var validateTime = function validateTime(time) {
     if (badProps.includes('minute')) {
       propsInError.minute = true;
     }
+    if (badProps.includes('invalid')) {
+      propsInError.invalid = true;
+    }
     return {
       message: badProps.length > 1 ? 'Enter a valid time' : messages[0],
       propsInError: propsInError

package/dist/utils/Validate/validateTime.test.js

@@ -64,6 +64,52 @@ describe('utils', function () {
           }
         });
       });
+      test('should return an error if the time string contains non-numeric characters', function () {
+        var output = (0, _validateTime.default)('14:3A');
+        expect(output).toEqual({
+          message: 'Enter a valid time',
+          propsInError: {
+            invalid: true,
+            minute: true
+          }
+        });
+      });
+      test('should return an error if the time string contains more than two digits in hour', function () {
+        var output = (0, _validateTime.default)('144:30');
+        expect(output).toEqual({
+          message: 'Enter a valid time',
+          propsInError: {
+            invalid: true,
+            hour: true
+          }
+        });
+      });
+      test('should return an error if the time string contains more than two digits in minute', function () {
+        var output = (0, _validateTime.default)('14:309');
+        expect(output).toEqual({
+          message: 'Enter a valid time',
+          propsInError: {
+            invalid: true,
+            minute: true
+          }
+        });
+      });
+      test('should return an error if there is an additional colon in the time string', function () {
+        var output = (0, _validateTime.default)('14:30:');
+        expect(output).toEqual({
+          message: 'Enter a valid time',
+          propsInError: {
+            invalid: true
+          }
+        });
+      });
+      test('should return no error if there is a single digit for both hour and minute', function () {
+        var output = (0, _validateTime.default)('1:1');
+        expect(output).toEqual({
+          message: undefined,
+          propsInError: undefined
+        });
+      });
     });
   });
 });

package/package.json

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

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

@@ -1,41 +0,0 @@
-"use strict";
-
-var _getCYARowsForPage = _interopRequireDefault(require("./getCYARowsForPage"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-describe('utils.CheckYourAnswers.getCYARowsForPage', function () {
-  var COMPONENT_A = {
-    type: 'text',
-    id: 'a',
-    fieldId: 'a',
-    label: 'Alpha'
-  };
-  var COMPONENT_B = {
-    type: 'text',
-    id: 'b',
-    fieldId: 'b',
-    label: 'Bravo'
-  };
-  var PAGE = {
-    id: 'page',
-    components: [COMPONENT_A, COMPONENT_B],
-    formData: {
-      a: 'Alpha Value',
-      b: 'Bravo Value'
-    }
-  };
-  var ON_ACTION = function ON_ACTION() {};
-  it('should get rows for a page with readonly text components', function () {
-    var rows = (0, _getCYARowsForPage.default)(PAGE, ON_ACTION);
-    expect(rows.length).toEqual(2);
-    expect(rows[0]).toEqual(expect.objectContaining({
-      fieldId: COMPONENT_A.fieldId,
-      key: COMPONENT_A.label,
-      value: 'Alpha Value'
-    }));
-    expect(rows[1]).toEqual(expect.objectContaining({
-      fieldId: COMPONENT_B.fieldId,
-      key: COMPONENT_B.label,
-      value: 'Bravo Value'
-    }));
-  });
-});