@ukhomeoffice/cop-react-form-renderer 4.19.4 → 4.20.0

package/dist/utils/Data/setupFormData.js

@@ -9,6 +9,8 @@ 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 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; }
@@ -17,28 +19,35 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var setDefaultDateValue = function setDefaultDateValue(date, data) {
-  if (date.defaultValue === 'today') {
-    data[date.fieldId] = (0, _dayjs.default)().format('DD-MM-YYYY');
-  } else {
-    data[date.fieldId] = date.defaultValue;
-  }
+var setDefaultDateValue = function setDefaultDateValue(date, data, fullPath) {
+  var val = date.defaultValue === 'today' ? (0, _dayjs.default)().format('DD-MM-YYYY') : date.defaultValue;
+  (0, _setDataItem.default)(data, "".concat(fullPath).concat(date.fieldId), val);
 };
 /** 
- * This currently will not work for collections or containers.
+ * This currently will not work for collections.
  * If support is required it will need to be added.
  */
 
 
-var setupDefaultValue = function setupDefaultValue(component, data) {
-  if (component.defaultValue && !data[component.fieldId]) {
+var setupDefaultValue = function setupDefaultValue(component, data, fullPath) {
+  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 && !(0, _getSourceData.default)(data, componentFullPath)) {
     switch (component.type) {
       case 'date':
-        setDefaultDateValue(component, data);
+        setDefaultDateValue(component, data, fullPath);
         break;
 
       default:
-        data[component.fieldId] = component.defaultValue;
+        (0, _setDataItem.default)(data, componentFullPath, component.defaultValue);
     }
   }
 
@@ -53,7 +62,7 @@ var setupDefaultValue = function setupDefaultValue(component, data) {
 
 var setupDefaultValuesForComponents = function setupDefaultValuesForComponents(components, data) {
   components.forEach(function (component) {
-    return setupDefaultValue(component, data);
+    return setupDefaultValue(component, data, '');
   });
 };
 
@@ -62,7 +71,7 @@ var setupPageDefaultValues = function setupPageDefaultValues(pages, data) {
     page.components.filter(function (c) {
       return !c.use;
     }).forEach(function (component) {
-      return setupDefaultValue(component, data);
+      return setupDefaultValue(component, data, '');
     });
   });
 };

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

@@ -271,6 +271,74 @@ describe('utils', function () {
           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'
+            }
+          }
+        });
+      });
     });
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.19.4",
+  "version": "4.20.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -16,7 +16,7 @@
     "post-compile": "rimraf dist/*.test.* dist/**/*.test.* dist/**/*.stories.* dist/docs dist/assets"
   },
   "dependencies": {
-    "@ukhomeoffice/cop-react-components": "2.3.2",
+    "@ukhomeoffice/cop-react-components": "2.3.3",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",