@ukhomeoffice/cop-react-form-renderer 5.77.2 → 5.77.4

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/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.2",
+  "version": "5.77.4",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",