@ukhomeoffice/cop-react-form-renderer 4.14.3 → 4.15.1-alpha

package/dist/components/FormComponent/FormComponent.js

@@ -131,7 +131,7 @@ var FormComponent = function FormComponent(_ref) {
     onTopLevelChange({
       target: {
         name: _utils.default.Meta.name,
-        value: _utils.default.Meta.documents.setForField(document, formData, component.full_path)
+        value: _utils.default.Meta.documents.setForField(document, formData, component.full_path, component.allowMultiple)
       }
     });
   };

package/dist/utils/Component/getComponent.js

@@ -55,16 +55,22 @@ var getCheckboxes = function getCheckboxes(config) {
 };
 
 var getCalculation = function getCalculation(config) {
-  var calculatedValue = _Data.default.applyFormula(config);
-
-  if (!!calculatedValue) {
-    config.value = calculatedValue;
-    config.formData[config.fieldId] = "" + calculatedValue;
+  var value = _Data.default.applyFormula(config);
+
+  if (typeof config.onChange === 'function') {
+    if (value !== config.value) {
+      config.onChange({
+        target: {
+          name: config.fieldId,
+          value: value
+        }
+      });
+    }
   }
 
   var attrs = (0, _cleanAttributes.default)(config, ['formula']);
   return /*#__PURE__*/_react.default.createElement(_copReactComponents.TextInput, _extends({}, attrs, {
-    readOnly: true
+    readonly: true
   }));
 };
 

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

@@ -26,6 +26,10 @@ 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; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 describe('utils.Component.get', function () {
   var ID = 'test-id';
   var FIELD_ID = 'field-id';
@@ -134,28 +138,39 @@ describe('utils.Component.get', function () {
     },
     result: '266.67'
   }].forEach(function (test) {
-    it("should render 'calculation' component with formula to given calculated value: ".concat(test.result), function () {
-      var _render = (0, _react.render)((0, _getComponent.default)(_objectSpread(_objectSpread({}, COMPONENT), test.config))),
-          container = _render.container;
+    test.config.onChange = function (_ref) {
+      var target = _ref.target;
+      COMPONENT.formData[target.name] = target.value;
+    };
 
-      var _getAllByTestId = (0, _react.getAllByTestId)(container, ID),
-          _getAllByTestId2 = _slicedToArray(_getAllByTestId, 2),
-          formGroup = _getAllByTestId2[0],
-          input = _getAllByTestId2[1];
+    it("should render 'calculation' component with formula to given calculated value: ".concat(test.result), /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var _render, container, _getAllByTestId, _getAllByTestId2, formGroup, input, label;
 
-      expect(formGroup.tagName).toEqual('DIV');
-      expect(formGroup.classList).toContain('govuk-form-group');
-      var label = formGroup.childNodes[0];
-      expect(label.tagName).toEqual('LABEL');
-      expect(label.classList).toContain('govuk-label');
-      expect(label.textContent).toContain(LABEL);
-      expect(formGroup.classList).toContain('govuk-form-group');
-      expect(input.tagName).toEqual('INPUT');
-      expect(input.classList).toContain('govuk-input');
-      expect(input.id).toEqual(ID);
-      expect(input.getAttribute('readonly')).not.toBeNull();
-      expect(input.getAttribute('value')).toEqual(test.result);
-    });
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _render = (0, _react.render)((0, _getComponent.default)(_objectSpread(_objectSpread({}, COMPONENT), test.config))), container = _render.container;
+              _getAllByTestId = (0, _react.getAllByTestId)(container, ID), _getAllByTestId2 = _slicedToArray(_getAllByTestId, 2), formGroup = _getAllByTestId2[0], input = _getAllByTestId2[1];
+              expect(formGroup.tagName).toEqual('DIV');
+              expect(formGroup.classList).toContain('govuk-form-group');
+              label = formGroup.childNodes[0];
+              expect(label.tagName).toEqual('LABEL');
+              expect(label.classList).toContain('govuk-label');
+              expect(label.textContent).toContain(LABEL);
+              expect(formGroup.classList).toContain('govuk-form-group');
+              expect(input.tagName).toEqual('DIV');
+              expect(input.classList).toContain('hods-readonly');
+              expect(input.id).toEqual(ID);
+              expect("".concat(COMPONENT.formData[FIELD_ID])).toEqual(test.result);
+
+            case 13:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    })));
   });
   /**
    * Iteratively test collction of negative test data objects each containing:
@@ -258,10 +273,9 @@ describe('utils.Component.get', function () {
       expect(label.classList).toContain('govuk-label');
       expect(label.textContent).toContain(LABEL);
       expect(formGroup.classList).toContain('govuk-form-group');
-      expect(input.tagName).toEqual('INPUT');
-      expect(input.classList).toContain('govuk-input');
+      expect(input.tagName).toEqual('DIV');
+      expect(input.classList).toContain('hods-readonly');
       expect(input.id).toEqual(ID);
-      expect(input.getAttribute('readonly')).not.toBeNull();
       expect(error).toBeCalledTimes(1);
       expect(error).toBeCalledWith(test.error);
     });

package/dist/utils/Meta/documents/setDocumentForField.js

@@ -17,10 +17,14 @@ 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 setDocumentForField = function setDocumentForField(document, formData, field) {
-  var documents = (0, _getDocuments.default)(formData).filter(function (d) {
-    return d.field !== field;
-  });
+var setDocumentForField = function setDocumentForField(document, formData, field, allowMultiple) {
+  var documents = (0, _getDocuments.default)(formData);
+
+  if (!allowMultiple) {
+    documents = documents.filter(function (d) {
+      return d.field !== field;
+    });
+  }
 
   if (document) {
     documents.push(_objectSpread(_objectSpread({}, document), {}, {

package/dist/utils/Meta/documents/setDocumentForField.test.js

@@ -36,6 +36,17 @@ describe('Utils.Meta.documents.add', function () {
 
     expect((0, _setDocumentForField.default)(NEW_ALPHA, FORM_DATA, NEW_ALPHA.field)).toEqual(_defineProperty({}, _constants.META_DOCUMENTS_PROPERTY, [NEW_ALPHA]));
   });
+  it('should add a document with the same field if allowMultiple is true', function () {
+    var NEW_URL = 'http://replacement.com/files/alpha';
+    var NEW_ALPHA = {
+      field: ALPHA_DOCUMENT.field,
+      url: NEW_URL
+    };
+
+    var FORM_DATA = _defineProperty({}, _constants.META_PROPERTY, _defineProperty({}, _constants.META_DOCUMENTS_PROPERTY, [ALPHA_DOCUMENT]));
+
+    expect((0, _setDocumentForField.default)(NEW_ALPHA, FORM_DATA, NEW_ALPHA.field, true)).toEqual(_defineProperty({}, _constants.META_DOCUMENTS_PROPERTY, [ALPHA_DOCUMENT, NEW_ALPHA]));
+  });
   it('should handle a null document being passed where a document with that field already exists', function () {
     var FORM_DATA = _defineProperty({}, _constants.META_PROPERTY, _defineProperty({}, _constants.META_DOCUMENTS_PROPERTY, [ALPHA_DOCUMENT]));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "4.14.3",
+  "version": "4.15.1-alpha",
   "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.2.3",
+    "@ukhomeoffice/cop-react-components": "2.2.4",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",