@ukhomeoffice/cop-react-form-renderer 5.77.1 → 5.77.3

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -167,7 +167,9 @@ var getCYARowsForChildPages = function getCYARowsForChildPages(childPages, item,
           rows = rows.concat(headingRow);
         }
         var container = getContainerForPage(childPage, item, labelCount, fullPath);
-        var containerRows = (0, _getCYARowsForContainer.default)(childPage, container, _objectSpread(_objectSpread({}, childPage.formData), item), changeAction, fnOverride);
+        var containerRows = (0, _getCYARowsForContainer.default)(_objectSpread(_objectSpread({}, childPage), {}, {
+          formData: _objectSpread(_objectSpread({}, childPage.formData), item)
+        }), container, _objectSpread(_objectSpread({}, childPage.formData), item), changeAction, fnOverride);
         rows = rows.concat(containerRows);
       }
     }

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

@@ -681,4 +681,80 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
       key: 'Test text'
     });
   });
+  it('should create rows for the Collection component correctly', function () {
+    var FORM_DATA = {
+      collection: [{
+        id: '01',
+        testCollection: [{
+          testText: 'collection value'
+        }],
+        otherComp: 'one'
+      }]
+    };
+    var COLLECTION_COMP = {
+      id: 'testCollection',
+      fieldId: 'testCollection',
+      label: 'Test collection',
+      type: 'collection',
+      item: [{
+        id: 'testText',
+        fieldId: 'testText',
+        type: 'text',
+        label: 'Some nice text'
+      }],
+      show_when: [{
+        field: 'otherComp',
+        op: 'eq',
+        value: 'one'
+      }]
+    };
+    var MASTER_PAGE_WITH_COLLECTION = {
+      id: 'page1',
+      collection: {
+        name: 'collection',
+        labels: {
+          // eslint-disable-next-line no-template-curly-in-string
+          item: 'Collection entry ${index}'
+        },
+        actions: [{
+          type: 'change'
+        }, {
+          type: 'remove',
+          label: 'custom remove label'
+        }, {
+          type: 'change',
+          label: 'custom change label',
+          page: 'confirmDelete'
+        }]
+      },
+      childPages: [{
+        id: 'page1',
+        collection: {
+          name: 'collection'
+        },
+        components: [COLLECTION_COMP]
+      }],
+      formData: FORM_DATA
+    };
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(MASTER_PAGE_WITH_COLLECTION, null, null, FORM_DATA);
+    expect(ROWS.length).toEqual(7); // Title row + component row for each item
+    expect(ROWS[0]).toMatchObject({
+      type: 'heading',
+      key: 'Collection'
+    });
+    expect(ROWS[1]).toMatchObject({
+      type: 'heading',
+      key: 'Collection entry 1'
+    });
+    expect(ROWS[2].action.label).toEqual('Change');
+    expect(ROWS[3].action.label).toEqual('custom remove label');
+    expect(ROWS[4].action.label).toEqual('custom change label');
+    expect(ROWS[5]).toMatchObject({
+      key: 'Item 1'
+    });
+    expect(ROWS[6]).toMatchObject({
+      value: 'collection value',
+      key: 'Some nice text'
+    });
+  });
 });

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": "5.77.1",
+  "version": "5.77.3",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",