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

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

@@ -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.textContent).toEqual(TEXT_VALUE);
-        case 31:
+        case 30:
         case "end":
           return _context9.stop();
       }

package/dist/components/FormRenderer/FormRenderer.test.js

@@ -552,13 +552,9 @@ describe('components', function () {
             })));
           case 7:
             taskList = container.childNodes[0].childNodes[1];
-            taskList.childNodes.forEach(function (child) {
-              // eslint-disable-next-line no-console
-              console.log("taskList, child = ".concat(JSON.stringify(child.textContent)));
-            });
             expect(taskList.childNodes[5].textContent).not.toEqual("test text");
             expect(taskList.childNodes[5].classList).not.toContain('govuk-textarea');
-          case 11:
+          case 10:
           case "end":
             return _context22.stop();
         }

package/dist/utils/CheckYourAnswers/showComponentCYA.js

@@ -9,7 +9,6 @@ var _Component = _interopRequireDefault(require("../Component"));
 var _Container = _interopRequireDefault(require("../Container"));
 var _getSourceData = _interopRequireDefault(require("../Data/getSourceData"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* eslint-disable no-console */
 // Local imports
 
 var EXCLUDE_FROM_CYA = [_models.ComponentTypes.ALERT, _models.ComponentTypes.HEADING, _models.ComponentTypes.HTML, _models.ComponentTypes.INSET_TEXT];

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.12.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.4.0",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",