@ukhomeoffice/cop-react-form-renderer 5.2.1 → 5.5.0

package/dist/components/CollectionPage/CollectionPage.js

@@ -92,7 +92,12 @@ var CollectionPage = function CollectionPage(_ref) {
   };
   return /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: _objectSpread(_objectSpread({}, page), {}, {
-      formData: _objectSpread(_objectSpread(_objectSpread({}, page.formData), data[activeIndex]), {}, _defineProperty({}, "".concat(page.collection.name, "ActiveIndex"), activeIndex))
+      formData: _objectSpread(_objectSpread(_objectSpread({}, page.formData), data[activeIndex]), {}, _defineProperty({}, "".concat(page.collection.name, "ActiveIndex"), activeIndex)),
+      components: page.components.map(function (component) {
+        return _objectSpread(_objectSpread({}, component), {}, {
+          full_path: "".concat(page.collection.name, "[").concat(activeIndex, "].").concat(component.full_path || component.fieldId)
+        });
+      })
     }),
     onAction: onInnerPageAction,
     onWrapperChange: onInnerPageChange,

package/dist/components/CollectionPage/CollectionPage.test.js

@@ -141,7 +141,7 @@ describe('components.CollectionPage', function () {
       expect(label.tagName).toEqual('LABEL');
       expect(label.classList).toContain('govuk-label');
       expect(label.textContent).toEqual(lbl);
-      expect(label.getAttribute('for')).toEqual(fieldId);
+      expect(label.getAttribute('for')).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
       var hint = formGroup.childNodes[1];
       expect(hint.tagName).toEqual('DIV');
       expect(hint.classList).toContain('govuk-hint');
@@ -149,7 +149,7 @@ describe('components.CollectionPage', function () {
       var input = formGroup.childNodes[2];
       expect(input.tagName).toEqual('INPUT');
       expect(input.classList).toContain('govuk-input');
-      expect(input.id).toEqual(fieldId);
+      expect(input.id).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
       expect(input.value).toEqual(val);
       return input;
     };
@@ -160,7 +160,7 @@ describe('components.CollectionPage', function () {
       expect(label.tagName).toEqual('LABEL');
       expect(label.classList).toContain('govuk-label');
       expect(label.textContent).toEqual(lbl);
-      expect(label.getAttribute('for')).toEqual(fieldId);
+      expect(label.getAttribute('for')).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
       var hint = formGroup.childNodes[1];
       expect(hint.tagName).toEqual('DIV');
       expect(hint.classList).toContain('govuk-hint');
@@ -174,7 +174,7 @@ describe('components.CollectionPage', function () {
       })[0];
       expect(input.classList).toContain('hods-autocomplete__input');
       expect(input.tagName).toEqual('INPUT');
-      expect(input.id).toEqual(fieldId);
+      expect(input.id).toEqual("".concat(COLLECTION_NAME, "[0].").concat(fieldId));
       expect(input.value).toEqual(val);
       return input;
     };

package/dist/utils/Data/setDataItem.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 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); }
 var setDataItem = function setDataItem(data, fieldId, value) {
+  var handleArrayIndices = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   if (fieldId && data) {
-    var parts = fieldId.split('.');
+    var parts = handleArrayIndices ?
+    // Replace all occurrences of '[' with '.' and ']' with ''.
+    fieldId.replace(/\[/g, '.').replace(/\]/g, '').split('.') : fieldId.split('.');
     var leaf = parts.pop();
     var node = data;
     parts.forEach(function (part) {

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

@@ -107,4 +107,29 @@ describe('utils.Data.setDataItem', function () {
       }
     });
   });
+  it('should handle array indices in fieldPath if handleArrayIndices is true', function () {
+    var DATA = {
+      alpha: {
+        bravo: [{
+          charlie: '123'
+        }]
+      }
+    };
+    var FIELD_ID = 'alpha.bravo[0].charlie';
+    var VALUE = '456';
+    expect((0, _setDataItem.default)(DATA, FIELD_ID, VALUE, true)).toMatchObject({
+      alpha: {
+        bravo: [{
+          charlie: VALUE
+        }]
+      }
+    });
+    expect(DATA).toMatchObject({
+      alpha: {
+        bravo: [{
+          charlie: VALUE
+        }]
+      }
+    });
+  });
 });

package/dist/utils/Data/setupFormData.js

@@ -15,7 +15,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 setDefaultDateValue = function setDefaultDateValue(date, data, fullPath) {
-  var val = date.defaultValue === 'today' ? (0, _dayjs.default)().format('DD-MM-YYYY') : date.defaultValue;
+  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);
 };
 

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

@@ -405,6 +405,29 @@ describe('utils', function () {
           }
         });
       });
+      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.2.1",
+  "version": "5.5.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",