@ukhomeoffice/cop-react-form-renderer 5.68.1 → 5.69.0

package/dist/components/CollectionSummary/SummaryCard.js

@@ -185,7 +185,8 @@ var SummaryCard = function SummaryCard(_ref) {
       });
     },
     classModifiers: "primary",
-    disabled: quickEdit
+    disabled: quickEdit,
+    name: "QuickEdit"
   }, DEFAULT_EDIT_LABEL), config.changeAction && typeof onFullEdit === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".changeButton"),
     onClick: function onClick() {
@@ -193,21 +194,24 @@ var SummaryCard = function SummaryCard(_ref) {
       return onFullEdit((_config$changeAction = config.changeAction) === null || _config$changeAction === void 0 ? void 0 : _config$changeAction.page, entryData.id);
     },
     classModifiers: ((_config$changeAction2 = config.changeAction) === null || _config$changeAction2 === void 0 ? void 0 : _config$changeAction2.classModifiers) || DEFAULT_CHANGE_BUTTON_CLASS,
-    "aria-label": _utils.default.FormPage.getConditionalText((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.aria_label, entryData)
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$changeAction3 = config.changeAction) === null || _config$changeAction3 === void 0 ? void 0 : _config$changeAction3.aria_label, entryData),
+    name: "Change"
   }, ((_config$changeAction4 = config.changeAction) === null || _config$changeAction4 === void 0 ? void 0 : _config$changeAction4.label) || DEFAULT_CHANGE_BUTTON_LABEL), config.deleteAction && typeof onDelete === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".deleteButton"),
     onClick: function onClick() {
       return onDelete(entryData);
     },
     classModifiers: "secondary",
-    "aria-label": _utils.default.FormPage.getConditionalText((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.aria_label, entryData)
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$deleteAction = config.deleteAction) === null || _config$deleteAction === void 0 ? void 0 : _config$deleteAction.aria_label, entryData),
+    name: "Delete"
   }, ((_config$deleteAction2 = config.deleteAction) === null || _config$deleteAction2 === void 0 ? void 0 : _config$deleteAction2.label) || DEFAULT_DELETE_BUTTON_LABEL), config.duplicateAction && typeof onDuplicate === 'function' && /*#__PURE__*/_react.default.createElement(_copReactComponents.Button, {
     id: "".concat(id, ".duplicateButton"),
     onClick: function onClick() {
       onDuplicate(entryData);
     },
     classModifiers: "secondary",
-    "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData)
+    "aria-label": _utils.default.FormPage.getConditionalText((_config$duplicateActi = config.duplicateAction) === null || _config$duplicateActi === void 0 ? void 0 : _config$duplicateActi.aria_label, entryData),
+    name: "Duplicate"
   }, ((_config$duplicateActi2 = config.duplicateAction) === null || _config$duplicateActi2 === void 0 ? void 0 : _config$duplicateActi2.label) || DEFAULT_DUPLICATE_BUTTON_LABEL))), quickEdit && quickEditPage && /*#__PURE__*/_react.default.createElement(_FormPage.default, {
     page: quickEditPage,
     onAction: function onAction(action, patch) {

package/dist/components/CollectionSummary/SummaryCard.test.js

@@ -278,6 +278,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         headerActionDiv = _checkSetup7.headerActionDiv;
       expect(headerActionDiv.children.length).toEqual(1);
       var changeButton = headerActionDiv.children[0];
+      expect(changeButton.name).toEqual('Change');
       expect(changeButton.tagName).toEqual('BUTTON');
       expect(changeButton.textContent).toEqual(CONFIG.changeAction.label);
       expect(changeButton.getAttribute('aria-label')).toEqual(CONFIG.changeAction.aria_label[0].text);
@@ -389,6 +390,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         headerActionDiv = _checkSetup11.headerActionDiv;
       expect(headerActionDiv.children.length).toEqual(1);
       var deleteButton = headerActionDiv.children[0];
+      expect(deleteButton.name).toEqual('Delete');
       expect(deleteButton.tagName).toEqual('BUTTON');
       expect(deleteButton.textContent).toEqual(CONFIG.deleteAction.label);
       expect(deleteButton.getAttribute('aria-label')).toEqual(CONFIG.deleteAction.aria_label[0].text);
@@ -512,6 +514,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
         headerActionDiv = _checkSetup15.headerActionDiv;
       expect(headerActionDiv.children.length).toEqual(1);
       var duplicateButton = headerActionDiv.children[0];
+      expect(duplicateButton.name).toEqual('Duplicate');
       expect(duplicateButton.tagName).toEqual('BUTTON');
       expect(duplicateButton.textContent).toEqual(CONFIG.duplicateAction.label);
       _react.fireEvent.click(duplicateButton, {});
@@ -625,6 +628,7 @@ describe('components.CollectionSummary.SummaryCard', function () {
 
       // Shows edit button but no quick edit
       var editButton = headerActionDiv.children[0];
+      expect(editButton.name).toEqual('QuickEdit');
       expect(editButton.tagName).toEqual('BUTTON');
       expect(editButton.textContent).toEqual('Quick Edit');
       expect(container.childNodes[0].childNodes.length).toEqual(2); // Quick edit hidden

package/dist/components/FormRenderer/FormRenderer.js

@@ -174,9 +174,9 @@ var InternalFormRenderer = function InternalFormRenderer(_ref2) {
         });
       });
     }
+    clearErrors();
     setGoingBack(true);
     hooks.onGoingBack(e.state ? e.state : null);
-    clearErrors();
     if (components && pages && data && (_formState$page = formState.page) !== null && _formState$page !== void 0 && _formState$page.formData && pagePoint === undefined) {
       var submissionData = _utils.default.Format.form({
         pages: pages,

package/dist/utils/CollectionPage/getQuickEditPage.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _meetsAllConditions = _interopRequireDefault(require("../Condition/meetsAllConditions"));
 var _showFormPage = _interopRequireDefault(require("../FormPage/showFormPage"));
+var _excluded = ["id"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -104,7 +107,10 @@ var getQuickEditPage = function getQuickEditPage(masterPage, entryData) {
   }];
 
   // Need to have the collection data at the top level
-  pageToReturn.formData = _objectSpread(_objectSpread({}, pageToReturn.formData), entryData);
+  // Remove ID to stop overwriting top-level form ID.
+  var id = entryData.id,
+    entryWithNoId = _objectWithoutProperties(entryData, _excluded);
+  pageToReturn.formData = _objectSpread(_objectSpread({}, pageToReturn.formData), entryWithNoId);
   delete pageToReturn.title;
   delete pageToReturn.collection;
   return pageToReturn;

package/dist/utils/Condition/meetsCondition.js

@@ -108,6 +108,15 @@ var meetsCondition = function meetsCondition(condition, value, data) {
           }
           return true;
         }
+      case 'includesObjectProp':
+        {
+          if (Array.isArray(value)) {
+            return value.some(function (v) {
+              return v[condition.key] === compare;
+            });
+          }
+          return false;
+        }
       case 'includesAllOf':
         {
           if (Array.isArray(value)) {

package/dist/utils/Condition/meetsCondition.test.js

@@ -652,6 +652,56 @@ describe('utils.Condition.meetsCondition', function () {
       expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
     });
   });
+  describe('operator includesObjectProp', function () {
+    it('should accept a property that exists within one of the objects in the value', function () {
+      var VALUE = [{
+        id: 1
+      }, {
+        id: 2
+      }, {
+        id: 3
+      }];
+      var CONDITION = {
+        op: 'includesObjectProp',
+        key: 'id',
+        value: 2
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeTruthy();
+    });
+    it('should reject a property that doesnt exist within one of the objects in the value', function () {
+      var VALUE = [{
+        id: 1
+      }, {
+        id: 2
+      }, {
+        id: 3
+      }];
+      var CONDITION = {
+        op: 'includesObjectProp',
+        key: 'id',
+        value: 4
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+    it('should reject a value that is not an array', function () {
+      var VALUE = 'badValue';
+      var CONDITION = {
+        op: 'includesObjectProp',
+        key: 'id',
+        value: 7
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+    it('should reject an empty array', function () {
+      var VALUE = [];
+      var CONDITION = {
+        op: 'includesObjectProp',
+        key: 'id',
+        value: 7
+      };
+      expect((0, _meetsCondition.default)(CONDITION, VALUE)).toBeFalsy();
+    });
+  });
   describe('operator includesAllOf', function () {
     it('should reject when value is not an array', function () {
       var VALUE = 'Not an array';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.68.1",
+  "version": "5.69.0",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",