@ukhomeoffice/cop-react-form-renderer 5.11.0-bravo → 5.11.0

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

@@ -150,7 +150,7 @@ describe('components.CollectionPage', function () {
       expect(input.tagName).toEqual('INPUT');
       expect(input.classList).toContain('govuk-input');
       expect(input.id).toEqual(fieldId);
-      expect(input.dataset.value).toEqual(val);
+      expect(input.value).toEqual(val);
       return input;
     };
     var checkAutoCompleteField = function checkAutoCompleteField(formGroup, fieldId, lbl, hnt, val) {

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

@@ -84,7 +84,7 @@ describe('components.FormComponent.Collection', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
-          expect(input.dataset.value).toEqual(TEXT_VALUE);
+          expect(input.value).toEqual(TEXT_VALUE);
         case 30:
         case "end":
           return _context.stop();
@@ -390,12 +390,11 @@ describe('components.FormComponent.Collection', function () {
           expect(hint.classList).toContain('govuk-hint');
           expect(hint.textContent).toEqual(TEXT_COMPONENT.hint);
           input = formGroup.childNodes[2];
-          _react.screen.debug();
           expect(input.tagName).toEqual('DIV'); // Now readonly, so a DIV.
           expect(input.classList).toContain('hods-readonly'); // Now readonly, so hods-readonly
-          expect(input.dataset.id).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
+          expect(input.id).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
           expect(input.textContent).toEqual(TEXT_VALUE);
-        case 31:
+        case 30:
         case "end":
           return _context9.stop();
       }
@@ -519,7 +518,7 @@ describe('components.FormComponent.Collection', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
-          expect(input.dataset.value).toEqual(TEXT_VALUE);
+          expect(input.value).toEqual(TEXT_VALUE);
 
           // First item component 2
           formGroup = itemContainer.childNodes[1];
@@ -538,7 +537,7 @@ describe('components.FormComponent.Collection', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, "[0].textTwo"));
-          expect(input.dataset.value).toEqual('charlie');
+          expect(input.value).toEqual('charlie');
 
           // Check the second item and confirm there is no hint
           itemTwo = c.childNodes[1];
@@ -565,7 +564,7 @@ describe('components.FormComponent.Collection', function () {
           expect(inputTwo.tagName).toEqual('INPUT');
           expect(inputTwo.classList).toContain('govuk-input');
           expect(inputTwo.id).toEqual("".concat(ID, "[1].").concat(TEXT_ID));
-          expect(inputTwo.dataset.value).toEqual('beta');
+          expect(inputTwo.value).toEqual('beta');
 
           // Second item second component
           formGroupTwo = itemContainerTwo.childNodes[1];
@@ -582,7 +581,7 @@ describe('components.FormComponent.Collection', function () {
           expect(inputTwo.tagName).toEqual('INPUT');
           expect(inputTwo.classList).toContain('govuk-input');
           expect(inputTwo.id).toEqual("".concat(ID, "[1].textTwo"));
-          expect(inputTwo.dataset.value).toEqual('delta');
+          expect(inputTwo.value).toEqual('delta');
         case 87:
         case "end":
           return _context11.stop();
@@ -659,7 +658,7 @@ describe('components.FormComponent.Collection', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, "[0].").concat(TEXT_ID));
-          expect(input.dataset.value).toEqual(TEXT_VALUE);
+          expect(input.value).toEqual(TEXT_VALUE);
 
           // First item component 2
           formGroup = itemContainer.childNodes[1];
@@ -678,7 +677,7 @@ describe('components.FormComponent.Collection', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, "[0].textTwo"));
-          expect(input.dataset.value).toEqual('charlie');
+          expect(input.value).toEqual('charlie');
 
           // Check the second item and confirm there is no hint
           itemTwo = c.childNodes[1];
@@ -705,7 +704,7 @@ describe('components.FormComponent.Collection', function () {
           expect(inputTwo.tagName).toEqual('INPUT');
           expect(inputTwo.classList).toContain('govuk-input');
           expect(inputTwo.id).toEqual("".concat(ID, "[1].").concat(TEXT_ID));
-          expect(inputTwo.dataset.value).toEqual('beta');
+          expect(inputTwo.value).toEqual('beta');
 
           // Second item second component
           formGroupTwo = itemContainerTwo.childNodes[1];
@@ -722,7 +721,7 @@ describe('components.FormComponent.Collection', function () {
           expect(inputTwo.tagName).toEqual('INPUT');
           expect(inputTwo.classList).toContain('govuk-input');
           expect(inputTwo.id).toEqual("".concat(ID, "[1].textTwo"));
-          expect(inputTwo.dataset.value).toEqual('delta');
+          expect(inputTwo.value).toEqual('delta');
         case 89:
         case "end":
           return _context12.stop();

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

@@ -76,7 +76,7 @@ describe('components.FormComponent.Container', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, ".").concat(TEXT_ID));
-          expect(input.dataset.value).toEqual(TEXT_VALUE);
+          expect(input.value).toEqual(TEXT_VALUE);
         case 22:
         case "end":
           return _context.stop();
@@ -130,7 +130,7 @@ describe('components.FormComponent.Container', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(ID, ".").concat(NESTED_ID, ".").concat(TEXT_ID));
-          expect(input.dataset.value).toEqual(NESTED_TEXT_VALUE);
+          expect(input.value).toEqual(NESTED_TEXT_VALUE);
         case 25:
         case "end":
           return _context2.stop();
@@ -359,7 +359,7 @@ describe('components.FormComponent.Container', function () {
           input = formGroup.childNodes[2];
           expect(input.tagName).toEqual('DIV'); // Now readonly, so a DIV.
           expect(input.classList).toContain('hods-readonly'); // Now readonly, so hods-readonly
-          expect(input.dataset.id).toEqual("".concat(ID, ".").concat(TEXT_ID));
+          expect(input.id).toEqual("".concat(ID, ".").concat(TEXT_ID));
           expect(input.textContent).toEqual(TEXT_VALUE);
         case 22:
         case "end":

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

@@ -47,7 +47,7 @@ describe('components', function () {
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual(ID);
-            expect(input.dataset.value).toEqual(VALUE);
+            expect(input.value).toEqual(VALUE);
           case 22:
           case "end":
             return _context.stop();
@@ -80,7 +80,7 @@ describe('components', function () {
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual(ID);
-            expect(input.dataset.value).toEqual(VALUE);
+            expect(input.value).toEqual(VALUE);
           case 10:
           case "end":
             return _context2.stop();
@@ -215,7 +215,7 @@ describe('components', function () {
             expect(input.tagName).toEqual('INPUT');
             expect(input.classList).toContain('govuk-input');
             expect(input.id).toEqual(ID);
-            expect(input.dataset.value).toEqual(VALUE);
+            expect(input.value).toEqual(VALUE);
           case 23:
           case "end":
             return _context6.stop();

package/dist/components/FormPage/FormPage.test.js

@@ -138,7 +138,7 @@ describe('components.FormPage', function () {
       expect(input.tagName).toEqual('INPUT');
       expect(input.classList).toContain('govuk-input');
       expect(input.id).toEqual(fieldId);
-      expect(input.dataset.value).toEqual(val);
+      expect(input.value).toEqual(val);
       return input;
     };
     var checkAutoCompleteField = function checkAutoCompleteField(formGroup, fieldId, lbl, hnt, val) {

package/dist/utils/Component/getComponentTests/getComponent.calculation.test.js

@@ -148,7 +148,7 @@ describe('utils.Component.get', function () {
             expect(formGroup.classList).toContain('govuk-form-group');
             expect(input.tagName).toEqual('DIV');
             expect(input.classList).toContain('hods-readonly');
-            expect(input.dataset.id).toEqual(ID);
+            expect(input.id).toEqual(ID);
             expect("".concat(COMPONENT.formData[FIELD_ID])).toEqual(test.result);
           case 13:
           case "end":
@@ -258,7 +258,7 @@ describe('utils.Component.get', function () {
       expect(formGroup.classList).toContain('govuk-form-group');
       expect(input.tagName).toEqual('DIV');
       expect(input.classList).toContain('hods-readonly');
-      expect(input.dataset.id).toEqual(ID);
+      expect(input.id).toEqual(ID);
       expect(error).toBeCalledTimes(1);
       expect(error).toBeCalledWith(test.error);
     });

package/dist/utils/Component/getComponentTests/getComponent.nested.test.js

@@ -51,7 +51,7 @@ describe('utils.Component.get', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual(ID);
-          expect(input.dataset.value).toEqual(VALUE);
+          expect(input.value).toEqual(VALUE);
           child2 = container.childNodes[1];
           expect(child2.childNodes[0].childNodes.length).toEqual(3);
           expect(child2.classList).toContain('govuk-form-group');
@@ -62,9 +62,9 @@ describe('utils.Component.get', function () {
           expect(input2.tagName).toEqual('DIV');
           expect(input2.classList).toContain('govuk-date-input');
           expect(input2.id).toEqual(ID2);
-          expect(input2.childNodes[0].childNodes[1].dataset.value).toEqual('1');
-          expect(input2.childNodes[1].childNodes[1].dataset.value).toEqual('2');
-          expect(input2.childNodes[2].childNodes[1].dataset.value).toEqual('2022');
+          expect(input2.childNodes[0].childNodes[1].value).toEqual('1');
+          expect(input2.childNodes[1].childNodes[1].value).toEqual('2');
+          expect(input2.childNodes[2].childNodes[1].value).toEqual('2022');
         case 35:
         case "end":
           return _context.stop();
@@ -133,7 +133,7 @@ describe('utils.Component.get', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(CONTAINER_ID, ".").concat(FIELD_ID));
-          expect(input.dataset.value).toEqual(VALUE);
+          expect(input.value).toEqual(VALUE);
         case 19:
         case "end":
           return _context3.stop();
@@ -172,7 +172,7 @@ describe('utils.Component.get', function () {
           expect(input.tagName).toEqual('INPUT');
           expect(input.classList).toContain('govuk-input');
           expect(input.id).toEqual("".concat(COLLECTION_ID, "[0].").concat(FIELD_ID));
-          expect(input.dataset.value).toEqual(VALUE);
+          expect(input.value).toEqual(VALUE);
         case 19:
         case "end":
           return _context4.stop();

package/dist/utils/Component/getDefaultValue.js

@@ -12,10 +12,16 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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) {
-  if (component) {
-    return DEFAULT_VALUES[component.type] || '';
+  if (!component) {
+    return '';
   }
-  return '';
+  if ('defaultValue' in component) {
+    return component.defaultValue;
+  }
+  if ('defaultObjectValue' in component) {
+    return component.defaultObjectValue;
+  }
+  return DEFAULT_VALUES[component.type] || '';
 };
 var _default = getDefaultValue;
 exports.default = _default;

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

@@ -38,6 +38,18 @@ describe('utils.Component.defaultValue', function () {
       type: _models.ComponentTypes.FILE
     })).toEqual({});
   });
+  it('should return defaultValue if the component has defaultValue prop', function () {
+    expect((0, _getDefaultValue.default)({
+      type: _models.ComponentTypes.AUTOCOMPLETE,
+      defaultValue: 'test'
+    })).toEqual('test');
+  });
+  it('should return defaultObjectValue if the component has defaultObjectValue prop', function () {
+    expect((0, _getDefaultValue.default)({
+      type: _models.ComponentTypes.AUTOCOMPLETE,
+      defaultObjectValue: 'test'
+    })).toEqual('test');
+  });
   Object.values(_models.ComponentTypes).forEach(function (value) {
     if (![_models.ComponentTypes.COLLECTION, _models.ComponentTypes.CONTAINER, _models.ComponentTypes.FILE].includes(value)) {
       it("should return an empty object if the component type is '".concat(value, "'"), function () {

package/dist/utils/Data/setupRefDataUrlForComponent.js

@@ -29,6 +29,7 @@ var setupRefDataUrlForComponents = function setupRefDataUrlForComponents(compone
 };
 var setupRefDataUrlForComponent = function setupRefDataUrlForComponent(component, data) {
   if (component) {
+    var _component$data, _component$data2;
     if (component.type === _models.ComponentTypes.CONTAINER) {
       return setupRefDataForContainer(component, data);
     }
@@ -38,7 +39,7 @@ var setupRefDataUrlForComponent = function setupRefDataUrlForComponent(component
     if (component.type === _models.ComponentTypes.SELECT) {
       return component;
     }
-    if (component.data && component.data.url) {
+    if ((_component$data = component.data) !== null && _component$data !== void 0 && _component$data.url && !((_component$data2 = component.data) !== null && _component$data2 !== void 0 && _component$data2.skipUrlInterpolation)) {
       return _objectSpread(_objectSpread({}, component), {}, {
         data: _objectSpread(_objectSpread({}, component.data), {}, {
           url: _copReactComponents.Utils.interpolateString(component.data.url, data)

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

@@ -126,6 +126,24 @@ describe('utils', function () {
           }]
         });
       });
+      it('should not update the component URL when skipUrlInterpolation prop is true', function () {
+        var COMPONENT = {
+          id: 'component',
+          data: {
+            // eslint-disable-next-line no-template-curly-in-string
+            url: '${urls.refData}/v1/teams',
+            skipUrlInterpolation: true
+          }
+        };
+        expect((0, _setupRefDataUrlForComponent.default)(COMPONENT, DATA)).toEqual({
+          id: COMPONENT.id,
+          data: {
+            // eslint-disable-next-line no-template-curly-in-string
+            url: '${urls.refData}/v1/teams',
+            skipUrlInterpolation: true
+          }
+        });
+      });
     });
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.11.0-bravo",
+  "version": "5.11.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": "3.4.0-charlie",
+    "@ukhomeoffice/cop-react-components": "^3.3.1",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",