@ukhomeoffice/cop-react-form-renderer 5.88.4 → 5.88.7

package/dist/components/FormRenderer/helpers/cleanHiddenNestedData.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _optionIsSelected = _interopRequireDefault(require("../../../utils/Component/optionIsSelected"));
+var _getCollectionPageActiveId = _interopRequireDefault(require("../../../utils/CollectionPage/getCollectionPageActiveId"));
+var _getCollectionPageData = _interopRequireDefault(require("../../../utils/CollectionPage/getCollectionPageData"));
+var _setCollectionPageData = _interopRequireDefault(require("../../../utils/CollectionPage/setCollectionPageData"));
 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 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; }
@@ -13,6 +16,14 @@ 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); } // Local imports
 var parentComponents = ['radios', 'checkboxes'];
+var getActiveIds = function getActiveIds(collectionName, formData) {
+  var nameParts = collectionName.split('.');
+  var result = {};
+  nameParts.forEach(function (part) {
+    result["".concat(part, "ActiveId")] = formData["".concat(part, "ActiveId")];
+  });
+  return result;
+};
 function getIdsToDelete(component, selectedValue) {
   var _component$data;
   var idsToDelete = [];
@@ -25,29 +36,30 @@ function getIdsToDelete(component, selectedValue) {
   });
   return idsToDelete;
 }
-;
 var cleanHiddenNestedData = function cleanHiddenNestedData(patch, page) {
+  var _patch = patch;
   page.components.forEach(function (component) {
     if (!parentComponents.includes(component.type)) {
       return;
     }
-    var _patch = patch;
     var idsToDelete = getIdsToDelete(component, _patch[component.id]);
     idsToDelete.forEach(function (id) {
       delete _patch[id];
     });
   });
-  if (page.collection && patch[page.collection.name]) {
-    var _page$formData;
-    var activeId = patch["".concat(page.collection.name, "ActiveId")] || ((_page$formData = page.formData) === null || _page$formData === void 0 ? void 0 : _page$formData["".concat(page.collection.name, "ActiveId")]);
-    var _patch = patch;
-    _patch[page.collection.name] = _patch[page.collection.name].map(function (entry) {
-      return entry.id === activeId ? cleanHiddenNestedData(entry, _objectSpread(_objectSpread({}, page), {}, {
-        collection: undefined
-      })) : entry;
-    });
+  if (page.collection) {
+    _patch = _objectSpread(_objectSpread({}, getActiveIds(page.collection.name, page.formData)), _patch);
+    var collectionData = (0, _getCollectionPageData.default)(page.collection.name, _patch);
+    if (collectionData) {
+      var activeId = (0, _getCollectionPageActiveId.default)(page.collection.name, _patch);
+      var modifiedCollection = collectionData.map(function (entry) {
+        return entry.id === activeId ? cleanHiddenNestedData(entry, _objectSpread(_objectSpread({}, page), {}, {
+          collection: undefined
+        })) : entry;
+      });
+      (0, _setCollectionPageData.default)(page.collection.name, modifiedCollection, _patch);
+    }
   }
-  ;
-  return patch;
+  return _patch;
 };
 var _default = exports.default = cleanHiddenNestedData;

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

@@ -78,7 +78,7 @@ describe('components', function () {
           expect(updatedPatchCheckboxes.nested1).toBeFalsy();
           expect(updatedPatchCheckboxes.nested2).toBeTruthy();
         });
-        it('remove data corresponding to hidden nested components within the active collection entry', function () {
+        it('should remove data corresponding to hidden nested components within the active collection entry', function () {
           var patch = {
             collectionNameActiveId: '456',
             collectionName: [{
@@ -100,6 +100,9 @@ describe('components', function () {
             collection: {
               name: 'collectionName'
             },
+            formData: {
+              collectionNameActiveId: '456'
+            },
             components: [{
               id: 'parent',
               type: 'radios',
@@ -126,6 +129,61 @@ describe('components', function () {
           expect(updatedPatch.collectionName[1].nested1).toBeFalsy();
           expect(updatedPatch.collectionName[1].nested2).toBeTruthy();
         });
+        it('should remove data corresponding to hidden nested components when collection is nested within an entity', function () {
+          var patch = {
+            collectionNameActiveId: '456',
+            entities: [{
+              id: '777',
+              collectionName: [{
+                id: '123',
+                parent: 'option1',
+                nested1: 'should be included',
+                nested2: 'should be included'
+              }, {
+                id: '456',
+                parent: 'option2',
+                nested1: 'should not be included',
+                nested2: 'should be included'
+              }]
+            }]
+          };
+          var page = {
+            id: 'page',
+            name: 'page',
+            title: 'Page',
+            collection: {
+              name: 'entities.collectionName'
+            },
+            formData: {
+              collectionNameActiveId: '456',
+              entitiesActiveId: '777'
+            },
+            components: [{
+              id: 'parent',
+              type: 'radios',
+              data: {
+                options: [{
+                  value: 'option1',
+                  nested: [{
+                    id: 'nested1',
+                    fieldId: 'nested1'
+                  }]
+                }, {
+                  value: 'option2',
+                  nested: [{
+                    id: 'nested2',
+                    fieldId: 'nested2'
+                  }]
+                }]
+              }
+            }]
+          };
+          var updatedPatch = (0, _cleanHiddenNestedData.default)(patch, page);
+          expect(updatedPatch.entities[0].collectionName[0].nested1).toBeTruthy();
+          expect(updatedPatch.entities[0].collectionName[0].nested2).toBeTruthy();
+          expect(updatedPatch.entities[0].collectionName[1].nested1).toBeFalsy();
+          expect(updatedPatch.entities[0].collectionName[1].nested2).toBeTruthy();
+        });
       });
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukhomeoffice/cop-react-form-renderer",
-  "version": "5.88.4",
+  "version": "5.88.7",
   "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.24.0",
+    "@ukhomeoffice/cop-react-components": "3.24.1",
     "axios": "^0.23.0",
     "dayjs": "^1.11.0",
     "govuk-frontend": "^4.3.1",
@@ -101,4 +101,4 @@
       "last 1 safari version"
     ]
   }
-}
+}