@ukhomeoffice/cop-react-form-renderer 3.28.0 → 3.31.0

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

@@ -0,0 +1,131 @@
+"use strict";
+
+var _mergeCollectionPages = _interopRequireDefault(require("./mergeCollectionPages"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// Local imports
+describe('utils.CollectionPage.mergeCollectionPages', function () {
+  var TEXT_COMP = {
+    id: 'testText',
+    fieldId: 'testText',
+    type: 'text'
+  };
+  var DATE_COMP = {
+    id: 'testDate',
+    fieldId: 'testDate',
+    type: 'date'
+  };
+  it('should return the same array if no pages belong to collections', function () {
+    var PAGES = [{
+      id: 'page1'
+    }, {
+      id: 'page2'
+    }];
+    expect((0, _mergeCollectionPages.default)(PAGES)).toEqual(PAGES);
+  });
+  it('should merge pages from the same collection into a single page', function () {
+    var PAGES = [{
+      id: 'page1',
+      collection: {
+        name: 'collection'
+      },
+      components: [TEXT_COMP]
+    }, {
+      id: 'page2',
+      collection: {
+        name: 'collection'
+      },
+      components: [DATE_COMP]
+    }];
+    var RESULT = (0, _mergeCollectionPages.default)(PAGES);
+    expect(RESULT.length).toEqual(1);
+    expect(RESULT[0]).toEqual({
+      id: 'page1',
+      title: 'Collection',
+      collection: {
+        name: 'collection'
+      },
+      components: [TEXT_COMP, DATE_COMP],
+      formData: {}
+    });
+  });
+  it('should leave non-collection pages unaffected', function () {
+    var PAGES = [{
+      id: 'page1',
+      collection: {
+        name: 'collection'
+      },
+      components: [TEXT_COMP]
+    }, {
+      id: 'page2',
+      collection: {
+        name: 'collection'
+      },
+      components: [DATE_COMP]
+    }, {
+      id: 'page3'
+    }];
+    var RESULT = (0, _mergeCollectionPages.default)(PAGES);
+    expect(RESULT.length).toEqual(2);
+    expect(RESULT[0]).toEqual({
+      id: 'page1',
+      title: 'Collection',
+      collection: {
+        name: 'collection'
+      },
+      components: [TEXT_COMP, DATE_COMP],
+      formData: {}
+    });
+    expect(RESULT[1]).toEqual({
+      id: 'page3'
+    });
+  });
+  it('should handle multiple collections', function () {
+    var PAGES = [{
+      id: 'page1',
+      collection: {
+        name: 'collection1'
+      },
+      components: []
+    }, {
+      id: 'page2',
+      collection: {
+        name: 'collection1'
+      },
+      components: []
+    }, {
+      id: 'page3',
+      collection: {
+        name: 'collection2'
+      },
+      components: []
+    }, {
+      id: 'page4',
+      collection: {
+        name: 'collection2'
+      },
+      components: []
+    }];
+    var RESULT = (0, _mergeCollectionPages.default)(PAGES);
+    expect(RESULT.length).toEqual(2);
+    expect(RESULT[0]).toEqual({
+      id: 'page1',
+      collection: {
+        name: 'collection1'
+      },
+      title: 'Collection1',
+      components: [],
+      formData: {}
+    });
+    expect(RESULT[1]).toEqual({
+      id: 'page3',
+      collection: {
+        name: 'collection2'
+      },
+      title: 'Collection2',
+      components: [],
+      formData: {}
+    });
+  });
+});

package/dist/utils/Validate/validatePage.js

@@ -9,6 +9,8 @@ var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 
 var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 
+var _CollectionPage = _interopRequireDefault(require("../CollectionPage"));
+
 var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,12 +27,24 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @returns An array containing all of the errors.
  */
 var validatePage = function validatePage(page) {
+  var data = page.formData;
+
+  if (page.collection) {
+    var activeIndex = _CollectionPage.default.getActiveIndex(page.collection.name, page.formData);
+
+    if (activeIndex !== null) {
+      var _page$formData$page$c;
+
+      data = (_page$formData$page$c = page.formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c[activeIndex];
+    }
+  }
+
   if ((0, _showFormPage.default)(page, page.formData) && Array.isArray(page.components)) {
     var errs = page.components.reduce(function (errors, component) {
-      var componentErrors = (0, _validateComponent.default)(component, page.formData, page.formData);
+      var componentErrors = (0, _validateComponent.default)(component, data, data);
       return errors.concat(componentErrors).flat().map(function (err) {
         return !!err ? _objectSpread(_objectSpread({}, err), {}, {
-          error: _copReactComponents.Utils.interpolateString(err.error, page.formData)
+          error: _copReactComponents.Utils.interpolateString(err.error, data)
         }) : err;
       });
     }, []).filter(function (e) {