@ukhomeoffice/cop-react-form-renderer 5.24.2 → 5.25.0-beta

package/dist/components/CollectionPage/CollectionPage.js

@@ -41,16 +41,9 @@ var CollectionPage = function CollectionPage(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     patch = _useState2[0],
     setPatch = _useState2[1];
-  var _useState3 = (0, _react.useState)(_utils.default.CollectionPage.getData(page.collection.name, page.formData) || []),
-    _useState4 = _slicedToArray(_useState3, 2),
-    data = _useState4[0],
-    setData = _useState4[1];
+  var data = _utils.default.CollectionPage.getData(page.collection.name, page.formData) || [];
   var currentCollectionName = page.collection.name.split('.').pop();
   var activeIndex = _utils.default.CollectionPage.getActiveIndex(page.collection.name, page.formData);
-  (0, _react.useEffect)(function () {
-    // This makes sure that the page is correctly populated on a refresh.
-    setData(_utils.default.CollectionPage.getData(page.collection.name, page.formData) || []);
-  }, [page.formData]);
 
   /**
    * Handle the state of the data directly within the page.
@@ -61,7 +54,7 @@ var CollectionPage = function CollectionPage(_ref) {
   var onPageChange = function onPageChange(_ref2) {
     var target = _ref2.target;
     _utils.default.CollectionPage.setData(currentPage.collection.name, target.value, page.formData);
-    setData(target.value);
+    data = target.value;
     var parentCollection = page.collection.name.split('.').shift();
     // Because of the way that patch is applied to the submission data
     // later (in onPageAction.js), we have to record the entire top-level
@@ -86,6 +79,10 @@ var CollectionPage = function CollectionPage(_ref) {
     }
   };
   var reportActiveIdChange = function reportActiveIdChange(newActiveId) {
+    // Manually set activeIndex here as if we receive rapid onChange events
+    // from several components then it's possible activeIndex does not update
+    // in time.
+    activeIndex = data.length;
     onTopLevelChange({
       target: {
         name: "".concat(currentCollectionName, "ActiveId"),

package/dist/components/FormComponent/FormComponent.js

@@ -72,13 +72,26 @@ var FormComponent = function FormComponent(_ref) {
     }
     return false;
   };
+  (0, _react.useEffect)(function () {
+    var defaultValue = _utils.default.Component.defaultValue(component, formData);
+    if (!value && defaultValue) {
+      if (typeof onComponentChange === 'function') {
+        onComponentChange({
+          target: {
+            name: component.fieldId,
+            value: defaultValue
+          }
+        });
+      }
+    }
+  }, []);
   if (component.type === _models.ComponentTypes.CONTAINER) {
     var container = /*#__PURE__*/_react.default.createElement(_Container.default, _extends({}, attrs, {
       container: component,
       wrap: wrap,
       onChange: onComponentChange,
       onTopLevelChange: onTopLevelChange,
-      value: value || _utils.default.Component.defaultValue(component),
+      value: value || _utils.default.Component.defaultValue(component, formData),
       formData: formData
     }));
     if (component.additionalValidation) {
@@ -92,7 +105,7 @@ var FormComponent = function FormComponent(_ref) {
       wrap: wrap,
       onChange: onComponentChange,
       onTopLevelChange: onTopLevelChange,
-      value: value || _utils.default.Component.defaultValue(component),
+      value: value || _utils.default.Component.defaultValue(component, formData),
       formData: formData
     }));
   }
@@ -138,7 +151,7 @@ var FormComponent = function FormComponent(_ref) {
     cya_label: _utils.default.interpolateString(component.cya_label, formData),
     suffix: _utils.default.interpolateString(component.suffix, formData),
     options: options,
-    value: value || _utils.default.Component.defaultValue(component),
+    value: value,
     onChange: onComponentChangeExtended,
     formData: formData
   }), wrap, hooks.onGetComponent);

package/dist/components/FormComponent/FormComponent.test.js

@@ -223,5 +223,97 @@ describe('components', function () {
         }
       }, _callee6);
     })));
+    it('should correctly handle a component\'s default value when it has no existing value', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var ID, COMPONENT, DATA, ON_CHANGE_ARGS, ON_CHANGE_COUNT, ON_CHANGE, _renderWithValidation7, container, rerender, formGroup, input;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            ID = 'component';
+            COMPONENT = {
+              id: ID,
+              fieldId: ID,
+              type: 'text',
+              label: 'Text component',
+              defaultValue: 'default text'
+            };
+            DATA = {};
+            ON_CHANGE_ARGS = [];
+            ON_CHANGE_COUNT = 0;
+            ON_CHANGE = function ON_CHANGE(_ref8) {
+              var target = _ref8.target;
+              ON_CHANGE_ARGS.push(target);
+              ON_CHANGE_COUNT += 1;
+              DATA[target.name] = target.value;
+            };
+            _renderWithValidation7 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              value: DATA[ID],
+              onChange: ON_CHANGE,
+              formData: DATA
+            })), container = _renderWithValidation7.container, rerender = _renderWithValidation7.rerender;
+            expect(ON_CHANGE_COUNT).toEqual(1);
+            expect(ON_CHANGE_ARGS[0]).toMatchObject({
+              name: 'component',
+              value: COMPONENT.defaultValue
+            });
+            formGroup = container.childNodes[0];
+            input = formGroup.childNodes[2];
+            (0, _setupTests.rerenderWithValidation)(rerender, /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              value: DATA[ID],
+              onChange: ON_CHANGE,
+              formData: DATA
+            }));
+            // Input should only be updated once the changes caused
+            // by onChange have had another render to propagate down.
+            expect(input.value).toEqual(COMPONENT.defaultValue);
+          case 13:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    })));
+    it('should correctly handle a component\'s default value when it has an existing value', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var ID, COMPONENT, DATA, ON_CHANGE_ARGS, ON_CHANGE_COUNT, ON_CHANGE, _renderWithValidation8, container, formGroup, input;
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            ID = 'component';
+            COMPONENT = {
+              id: ID,
+              fieldId: ID,
+              type: 'text',
+              label: 'Text component',
+              defaultValue: 'default text'
+            };
+            DATA = {
+              component: 'existing value'
+            };
+            ON_CHANGE_ARGS = [];
+            ON_CHANGE_COUNT = 0;
+            ON_CHANGE = function ON_CHANGE(_ref10) {
+              var target = _ref10.target;
+              ON_CHANGE_ARGS.push(target);
+              ON_CHANGE_COUNT += 1;
+            };
+            _renderWithValidation8 = (0, _setupTests.renderWithValidation)( /*#__PURE__*/_react.default.createElement(_FormComponent.default, {
+              "data-testid": ID,
+              component: COMPONENT,
+              value: DATA[ID],
+              onChange: ON_CHANGE,
+              formData: DATA
+            })), container = _renderWithValidation8.container;
+            expect(ON_CHANGE_COUNT).toEqual(0);
+            formGroup = container.childNodes[0];
+            input = formGroup.childNodes[2];
+            expect(input.value).toEqual(DATA[ID]);
+          case 11:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8);
+    })));
   });
 });

package/dist/setupTests.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.renderWithValidation = exports.renderHookWithProvider = exports.renderDomWithValidation = exports.expectObjectLike = void 0;
+exports.rerenderWithValidation = exports.renderWithValidation = exports.renderHookWithProvider = exports.renderDomWithValidation = exports.expectObjectLike = void 0;
 var _react = require("@testing-library/react");
 var _reactHooks = require("@testing-library/react-hooks");
 var _reactDom = require("react-dom");
@@ -16,6 +16,14 @@ var renderWithValidation = function renderWithValidation(ui, options) {
   }, ui)), options);
 };
 exports.renderWithValidation = renderWithValidation;
+var rerenderWithValidation = function rerenderWithValidation(rerenderCallback, ui, options) {
+  return rerenderCallback( /*#__PURE__*/React.createElement(_context.HooksContextProvider, {
+    overrides: options === null || options === void 0 ? void 0 : options.hooks
+  }, /*#__PURE__*/React.createElement(_context.ValidationContextProvider, {
+    key: "vcp"
+  }, ui)), options);
+};
+exports.rerenderWithValidation = rerenderWithValidation;
 var renderDomWithValidation = function renderDomWithValidation(ui, container, options) {
   return (0, _reactDom.render)( /*#__PURE__*/React.createElement(_context.HooksContextProvider, {
     overrides: options === null || options === void 0 ? void 0 : options.hooks

package/dist/utils/Component/getDefaultValue.js

@@ -5,23 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _models = require("../../models");
+var _getDefaultValueFromConfig = _interopRequireDefault(require("./getDefaultValueFromConfig"));
 var _DEFAULT_VALUES;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 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); }
 var DEFAULT_VALUES = (_DEFAULT_VALUES = {}, _defineProperty(_DEFAULT_VALUES, _models.ComponentTypes.COLLECTION, []), _defineProperty(_DEFAULT_VALUES, _models.ComponentTypes.CONTAINER, {}), _defineProperty(_DEFAULT_VALUES, _models.ComponentTypes.FILE, {}), _DEFAULT_VALUES);
-var getDefaultValue = function getDefaultValue(component) {
+var getDefaultValue = function getDefaultValue(component, formData) {
   if (!component) {
     return '';
   }
-  if ('defaultValue' in component) {
-    return component.defaultValue;
-  }
-  if ('defaultObjectValue' in component) {
-    return component.defaultObjectValue;
-  }
-  return DEFAULT_VALUES[component.type] || '';
+  var defaultValue = (0, _getDefaultValueFromConfig.default)(component, formData);
+  return defaultValue || DEFAULT_VALUES[component.type] || '';
 };
 var _default = getDefaultValue;
 exports.default = _default;

package/dist/utils/Component/getDefaultValueFromConfig.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _getSourceData = _interopRequireDefault(require("../Data/getSourceData"));
+var _models = require("../../models");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Global imports.
+
+// Local imports.
+
+var hasDefaultValue = function hasDefaultValue(component) {
+  return component.defaultValue || component.defaultObjectValue;
+};
+var getDefaultForDate = function getDefaultForDate(date) {
+  var dateFormat = /^(\d{1,2})-\d{1,2}-(\d{4})$/;
+  var defaultDate = dateFormat.test(date.defaultValue) ? date.defaultValue : null;
+  return date.defaultValue === 'today' ? (0, _dayjs.default)().format('DD-MM-YYYY') : defaultDate;
+};
+var getDefaultValueFromConfig = function getDefaultValueFromConfig(component, data) {
+  if (!hasDefaultValue(component)) {
+    return null;
+  }
+  switch (component.type) {
+    case _models.ComponentTypes.DATE:
+      return getDefaultForDate(component, data);
+    default:
+      {
+        if (component.defaultObjectValue) {
+          Object.keys(component.defaultObjectValue).forEach(function (value) {
+            if (typeof component.defaultObjectValue[value] === 'string' && (0, _getSourceData.default)(data, component.defaultObjectValue[value]) !== undefined) {
+              // eslint-disable-next-line no-param-reassign
+              component.defaultObjectValue[value] = (0, _getSourceData.default)(data, component.defaultObjectValue[value]);
+            }
+          });
+        }
+        return component.defaultObjectValue ? component.defaultObjectValue : component.defaultValue;
+      }
+  }
+};
+var _default = getDefaultValueFromConfig;
+exports.default = _default;

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

@@ -0,0 +1,86 @@
+"use strict";
+
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _models = require("../../models");
+var _getDefaultValueFromConfig = _interopRequireDefault(require("./getDefaultValueFromConfig"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Global imports.
+
+// Local imports.
+
+describe('utils.component.defaultValueFromConfig', function () {
+  it('should return null if a component has no default value defined', function () {
+    var result = (0, _getDefaultValueFromConfig.default)({}, {});
+    expect(result).toEqual(null);
+  });
+  it('should return a normal default value if one is defined', function () {
+    var COMPONENT = {
+      defaultValue: 'value'
+    };
+    var result = (0, _getDefaultValueFromConfig.default)(COMPONENT, {});
+    expect(result).toEqual('value');
+  });
+  it('should return an object default value if one is defined', function () {
+    var COMPONENT = {
+      defaultObjectValue: {
+        alpha: 'one',
+        bravo: 'two'
+      }
+    };
+    var result = (0, _getDefaultValueFromConfig.default)(COMPONENT, {});
+    expect(result).toEqual({
+      alpha: 'one',
+      bravo: 'two'
+    });
+  });
+  it('should return the defaultObjectValue if both defaultObjectValue and defaultValue are defined', function () {
+    var COMPONENT = {
+      defaultValue: 'zero',
+      defaultObjectValue: {
+        alpha: 'one',
+        bravo: 'two'
+      }
+    };
+    var result = (0, _getDefaultValueFromConfig.default)(COMPONENT, {});
+    expect(result).toEqual({
+      alpha: 'one',
+      bravo: 'two'
+    });
+  });
+  it('should return an object default with interpolated fields if applicable', function () {
+    var COMPONENT = {
+      defaultObjectValue: {
+        alpha: 'testObject.testText',
+        bravo: 'testObject.testText'
+      }
+    };
+    var DATA = {
+      testObject: {
+        testText: 'value'
+      }
+    };
+    var result = (0, _getDefaultValueFromConfig.default)(COMPONENT, DATA);
+    expect(result).toEqual({
+      alpha: 'value',
+      bravo: 'value'
+    });
+  });
+  describe('for a date component', function () {
+    it('should return a normal default value', function () {
+      var COMPONENT = {
+        type: _models.ComponentTypes.DATE,
+        defaultValue: '01-01-2000'
+      };
+      var result = (0, _getDefaultValueFromConfig.default)(COMPONENT, {});
+      expect(result).toEqual('01-01-2000');
+    });
+    it('should handle specific default values for date', function () {
+      var COMPONENT = {
+        type: _models.ComponentTypes.DATE,
+        defaultValue: 'today'
+      };
+      var result = (0, _getDefaultValueFromConfig.default)(COMPONENT, {});
+      expect(result).toEqual((0, _dayjs.default)().format('DD-MM-YYYY'));
+    });
+  });
+});

package/dist/utils/Component/index.js

@@ -8,6 +8,7 @@ var _cleanAttributes = _interopRequireDefault(require("./cleanAttributes"));
 var _elevateNestedComponents = _interopRequireDefault(require("./elevateNestedComponents"));
 var _getComponent = _interopRequireDefault(require("./getComponent"));
 var _getDefaultValue = _interopRequireDefault(require("./getDefaultValue"));
+var _getDefaultValueFromConfig = _interopRequireDefault(require("./getDefaultValueFromConfig"));
 var _isEditable = _interopRequireDefault(require("./isEditable"));
 var _setupContainerComponentsPath = _interopRequireDefault(require("./setupContainerComponentsPath"));
 var _showComponent = _interopRequireDefault(require("./showComponent"));
@@ -16,6 +17,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var Component = {
   clean: _cleanAttributes.default,
   defaultValue: _getDefaultValue.default,
+  defaultValueFromConfig: _getDefaultValueFromConfig.default,
   editable: _isEditable.default,
   elevateNested: _elevateNestedComponents.default,
   get: _getComponent.default,

package/dist/utils/Data/setupFormData.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _dayjs = _interopRequireDefault(require("dayjs"));
 var _getSourceData = _interopRequireDefault(require("./getSourceData"));
-var _setDataItem = _interopRequireDefault(require("./setDataItem"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -14,70 +12,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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
-var setDefaultDateValue = function setDefaultDateValue(date, data, fullPath) {
-  var dateFormat = /^(\d{1,2})-\d{1,2}-(\d{4})$/;
-  var defaultDate = dateFormat.test(date.defaultValue) ? date.defaultValue : (0, _getSourceData.default)(data, date.defaultValue);
-  var val = date.defaultValue === 'today' ? (0, _dayjs.default)().format('DD-MM-YYYY') : defaultDate;
-  (0, _setDataItem.default)(data, "".concat(fullPath).concat(date.fieldId), val);
-};
-
-/** 
- * This currently will not work for collections.
- * If support is required it will need to be added.
- */
-var setupDefaultValue = function setupDefaultValue(component, data, fullPath) {
-  var thisComponent = component;
-  var componentFullPath = "".concat(fullPath).concat(component.fieldId);
-  if (component.type === 'container') {
-    var _component$components;
-    (_component$components = component.components) === null || _component$components === void 0 ? void 0 : _component$components.forEach(function (comp) {
-      setupDefaultValue(comp, data, "".concat(componentFullPath, "."));
-    });
-  }
-  if ((component.defaultValue || component.defaultObjectValue) && !(0, _getSourceData.default)(data, componentFullPath)) {
-    switch (component.type) {
-      case 'date':
-        setDefaultDateValue(component, data, fullPath);
-        break;
-      default:
-        // defaultValue is expected to be a string, default object value is an object. Keeping defaultValue
-        // as a string is required for consuming apps using FormIO, this restriction could be removed in the future. 
-        {
-          if (component.defaultObjectValue) {
-            Object.keys(component.defaultObjectValue).forEach(function (value) {
-              if (typeof component.defaultObjectValue[value] === 'string' && (0, _getSourceData.default)(data, component.defaultObjectValue[value]) !== undefined) {
-                thisComponent.defaultObjectValue[value] = (0, _getSourceData.default)(data, component.defaultObjectValue[value]);
-              }
-            });
-          }
-          var defaultToUse = component.defaultObjectValue ? component.defaultObjectValue : component.defaultValue;
-          (0, _setDataItem.default)(data, componentFullPath, defaultToUse);
-          delete thisComponent.defaultObjectValue;
-        }
-    }
-  }
-  if (component.defaultValue) {
-    // Some components will throw warnings when having 
-    // both a 'value' and 'defaultValue' prop set. 
-    // defaultValue is safe to delete once we've tried
-    // to use it.
-    delete thisComponent.defaultValue;
-  }
-};
-var setupDefaultValuesForComponents = function setupDefaultValuesForComponents(components, data) {
-  components.forEach(function (component) {
-    return setupDefaultValue(component, data, '');
-  });
-};
-var setupPageDefaultValues = function setupPageDefaultValues(pages, data) {
-  pages.forEach(function (page) {
-    page.components.filter(function (c) {
-      return !c.use;
-    }).forEach(function (component) {
-      return setupDefaultValue(component, data, '');
-    });
-  });
-};
 var setupComponentSourceData = function setupComponentSourceData(component, data) {
   var componentSourceData = data;
   if (component.source) {
@@ -100,11 +34,8 @@ var setupPageSourceData = function setupPageSourceData(pages, data) {
 };
 
 /**
- * This populates an object with data either from a specified default
- * value or from a source field. If both are specified, data from a
- * source field will take priority.
- * Note that in the case of source fields, this doesn't currently 
- * support sequenced dependencies:
+ * This populates an object with data from a source field.
+ * Note that this doesn't currently support sequenced dependencies:
  *    0: fieldA: source.field = fieldB
  *    1: fieldB: source.field = fieldC
  *    2: fieldC: 'value'
@@ -117,8 +48,6 @@ var setupPageSourceData = function setupPageSourceData(pages, data) {
  */
 var setupFormData = function setupFormData(pages, components, baseData) {
   var data = _objectSpread({}, baseData);
-  setupDefaultValuesForComponents(components, data);
-  setupPageDefaultValues(pages, data);
   setupSourceDataForComponents(components, data);
   setupPageSourceData(pages, data);
   return data;

package/dist/utils/Data/setupFormData.test.js

@@ -208,226 +208,6 @@ describe('utils', function () {
           delegateEmails: _userProfileData.default.userDetails.delegateEmails
         }));
       });
-      it('should handle a default value field', function () {
-        var PAGES = [];
-        var COMPONENTS = [{
-          fieldId: 'testField',
-          type: 'text',
-          defaultValue: 'VALUE'
-        }];
-        var DATA = {};
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT).toEqual({
-          testField: 'VALUE'
-        });
-      });
-      it('should handle a default value field with defaultObjectValue', function () {
-        var PAGES = [];
-        var COMPONENTS = [{
-          fieldId: 'testField',
-          type: 'autocomplete',
-          defaultObjectValue: {
-            id: 4,
-            name: 'Algeria',
-            value: '4',
-            label: 'Algeria'
-          }
-        }];
-        var DATA = {};
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT.testField).toMatchObject({
-          id: 4,
-          name: 'Algeria',
-          value: '4',
-          label: 'Algeria'
-        });
-      });
-      it('should handle a default value field with defaultObjectValue if dot-separated field identifier exists within the data', function () {
-        var PAGES = [];
-        var COMPONENTS = [{
-          fieldId: 'testField',
-          type: 'autocomplete',
-          defaultObjectValue: {
-            id: 'country.id',
-            name: 'country.name',
-            value: 'country.value',
-            label: 'country.name'
-          }
-        }];
-        var DATA = {
-          'country': {
-            'id': 4,
-            'name': 'Algeria',
-            'value': '4'
-          }
-        };
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT.testField).toMatchObject({
-          id: 4,
-          name: 'Algeria',
-          value: '4',
-          label: 'Algeria'
-        });
-      });
-      it('should ignore the default value field with defaultObjectValue if dot-separated field identifier doesn\'t exists within the data', function () {
-        var PAGES = [];
-        var COMPONENTS = [{
-          fieldId: 'testField',
-          type: 'autocomplete',
-          defaultObjectValue: {
-            id: 'country.id',
-            name: 'country.name',
-            value: 'country.value',
-            label: 'country.name'
-          }
-        }];
-        var DATA = {};
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT.testField).toMatchObject({
-          id: 'country.id',
-          name: 'country.name',
-          value: 'country.value',
-          label: 'country.name'
-        });
-      });
-      it('should ignore a default value when a value already exists in data', function () {
-        var PAGES = [];
-        var COMPONENTS = [{
-          fieldId: 'testField',
-          type: 'text',
-          defaultValue: 'VALUE'
-        }];
-        var DATA = {
-          testField: 'EXISTING_VALUE'
-        };
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT).toEqual({
-          testField: 'EXISTING_VALUE'
-        });
-      });
-      it('should handle default values within pages', function () {
-        var PAGES = [{
-          components: [{
-            fieldId: 'pageField',
-            type: 'text',
-            defaultValue: 'VALUE'
-          }]
-        }];
-        var COMPONENTS = [];
-        var DATA = {};
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT).toEqual({
-          pageField: 'VALUE'
-        });
-      });
-      it('should ignore default values within pages when a value already exists in data', function () {
-        var PAGES = [{
-          components: [{
-            fieldId: 'pageField',
-            type: 'text',
-            defaultValue: 'VALUE'
-          }]
-        }];
-        var COMPONENTS = [];
-        var DATA = {
-          pageField: 'EXISTING_VALUE'
-        };
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT).toEqual({
-          pageField: 'EXISTING_VALUE'
-        });
-      });
-      it('should handle default values of components within containers', function () {
-        var PAGES = [{
-          components: [{
-            fieldId: 'firstContainer',
-            type: 'container',
-            components: [{
-              fieldId: 'firstDate',
-              type: 'date',
-              defaultValue: '01-01-1999'
-            }, {
-              fieldId: 'secondContainer',
-              type: 'container',
-              components: [{
-                fieldId: 'secondDate',
-                type: 'date',
-                defaultValue: '01-01-2000'
-              }]
-            }]
-          }]
-        }];
-        var RESULT = (0, _setupFormData.default)(PAGES, [], {});
-        expect(RESULT).toEqual({
-          firstContainer: {
-            firstDate: '01-01-1999',
-            secondContainer: {
-              secondDate: '01-01-2000'
-            }
-          }
-        });
-      });
-      it('should ignore default values of components within containers when they already have a value in data', function () {
-        var PAGES = [{
-          components: [{
-            fieldId: 'firstContainer',
-            type: 'container',
-            components: [{
-              fieldId: 'firstDate',
-              type: 'date',
-              defaultValue: '01-01-1999'
-            }, {
-              fieldId: 'secondContainer',
-              type: 'container',
-              components: [{
-                fieldId: 'secondDate',
-                type: 'date',
-                defaultValue: '01-01-2000'
-              }]
-            }]
-          }]
-        }];
-        var DATA = {
-          firstContainer: {
-            firstDate: '01-01-1000',
-            secondContainer: {
-              secondDate: '01-01-1000'
-            }
-          }
-        };
-        var RESULT = (0, _setupFormData.default)(PAGES, [], DATA);
-        expect(RESULT).toEqual({
-          firstContainer: {
-            firstDate: '01-01-1000',
-            secondContainer: {
-              secondDate: '01-01-1000'
-            }
-          }
-        });
-      });
-      it('should handle default values given it is a date with a dot-separated field identifier within pages', function () {
-        var PAGES = [{
-          components: [{
-            fieldId: 'pageFieldA',
-            type: 'date',
-            defaultValue: 'test.a'
-          }, {
-            fieldId: 'pageFieldB',
-            type: 'date',
-            defaultValue: 'test.b'
-          }]
-        }];
-        var COMPONENTS = [];
-        var DATA = {
-          'test': {
-            'a': '11-04-2023',
-            'b': '12-5-2023'
-          }
-        };
-        var RESULT = (0, _setupFormData.default)(PAGES, COMPONENTS, DATA);
-        expect(RESULT.pageFieldA).toEqual('11-04-2023');
-        expect(RESULT.pageFieldB).toEqual('12-5-2023');
-      });
     });
   });
 });

package/package.json

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