@ukhomeoffice/cop-react-form-renderer 4.19.0 → 4.19.2-alpha

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,7 +15,11 @@ var _getCYAAction = _interopRequireDefault(require("./getCYAAction"));
 
 var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
 
-var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
+var _showComponentCYA = _interopRequireWildcard(require("./showComponentCYA"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -34,6 +40,30 @@ var getEntryToCollectionRow = function getEntryToCollectionRow(page, onAction) {
   }];
 };
 
+var setupContainerComponentsPath = function setupContainerComponentsPath(container) {
+  return _objectSpread(_objectSpread({}, container), {}, {
+    components: container.components.map(function (component) {
+      if (Array.isArray(component.components)) {
+        return _objectSpread(_objectSpread({}, component), {}, {
+          components: component.components.map(function (c) {
+            if (!_showComponentCYA.EXCLUDE_FROM_CYA.includes(c.type)) {
+              return _objectSpread(_objectSpread({}, c), !c.full_path && {
+                full_path: "".concat(component.full_path || "".concat(container.full_path, ".").concat(component.fieldId), ".").concat(c.fieldId)
+              });
+            }
+
+            return null;
+          }).filter(function (c) {
+            return !!c;
+          })
+        });
+      }
+
+      return component;
+    })
+  });
+};
+
 var getContainerForItem = function getContainerForItem(collection, item, labelCount, full_path) {
   return {
     id: item.id,
@@ -77,6 +107,7 @@ var getCYARowsForCollection = function getCYARowsForCollection(page, collection,
       var labelCount = (collection.countOffset || 0) + index + 1;
       var full_path = "".concat(collection.full_path || collection.fieldId, "[").concat(index, "]");
       var container = getContainerForItem(collection, item, labelCount, full_path);
+      container = setupContainerComponentsPath(container, full_path);
       return [getTitleRowForItem(collection, item, page.id, labelCount, full_path)].concat((0, _getCYARowsForContainer.default)(page, container, item, onAction));
     }).filter(function (r) {
       return !!r;

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.test.js

@@ -196,4 +196,66 @@ describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
       value: 'Bravo'
     });
   });
+  it('should setup the full_path attribute for components within a container in a collection', function () {
+    var FORM_DATA = {
+      collection: [{
+        'test-container': {
+          checkboxes1: 'Bravo',
+          checkboxes2: 'Charlie'
+        }
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT_1 = {
+      id: 'checkboxes1',
+      fieldId: 'checkboxes1',
+      type: 'checkboxes',
+      label: 'Alpha'
+    };
+    var COMPONENT_2 = {
+      id: 'checkboxes2',
+      fieldId: 'checkboxes2',
+      type: 'checkboxes',
+      label: 'Bravo'
+    };
+    var CONTAINER = {
+      id: 'test-container',
+      fieldId: 'test-container',
+      type: 'container',
+      full_path: 'test-container',
+      components: [COMPONENT_1, COMPONENT_2]
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      countOffset: 0,
+      item: [CONTAINER],
+      value: FORM_DATA.collection,
+      formData: FORM_DATA
+    };
+
+    var ON_ACTION = function ON_ACTION() {};
+
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION);
+    expect(ROWS.length).toEqual(3);
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT_1.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(CONTAINER.fieldId, ".").concat(COMPONENT_1.fieldId),
+      key: COMPONENT_1.label,
+      value: 'Bravo'
+    });
+    (0, _setupTests.expectObjectLike)(ROWS[2], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT_2.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(CONTAINER.fieldId, ".").concat(COMPONENT_2.fieldId),
+      key: COMPONENT_2.label,
+      value: 'Charlie'
+    });
+  });
 });

package/dist/utils/CheckYourAnswers/showComponentCYA.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.EXCLUDE_FROM_CYA = void 0;
 
 var _models = require("../../models");
 
@@ -24,6 +24,8 @@ var EXCLUDE_FROM_CYA = [_models.ComponentTypes.HEADING, _models.ComponentTypes.H
  * @returns A boolean true if the component should show; otherwise false.
  */
 
+exports.EXCLUDE_FROM_CYA = EXCLUDE_FROM_CYA;
+
 var showComponentCYA = function showComponentCYA(options, data) {
   if (!options) {
     return false;

package/dist/utils/FormPage/useComponent.js

@@ -19,38 +19,55 @@ var getComponentToUse = function getComponentToUse(toUse, formComponents) {
     return fc.id === firstId;
   }));
 
+  var component = wrapper;
   var parent = wrapper;
 
   var _loop = function _loop() {
     var id = path.shift();
 
-    if (Array.isArray(parent.components)) {
+    if (Array.isArray(component.components)) {
       // Filter the parent components down to just the one referenced
       // by the current id.
+      parent = component;
       parent.components = parent.components.filter(function (c) {
         return c.id === id;
       });
 
       if (parent.components.length > 0) {
         // Make the found child the parent so we can iterate.
-        parent = parent.components[0];
+        component = parent.components[0];
       } else {
         // If no child was found, there can be no parent.
-        parent = undefined;
+        component = undefined;
       }
     } else {
       // We cannot find the child with this id if there are no child
       // components on this parent.
-      parent = undefined;
+      component = undefined;
     }
   };
 
-  while (parent && path.length > 0) {
+  while (component && path.length > 0) {
     _loop();
+  }
+
+  if (component) {
+    component = _objectSpread(_objectSpread(_objectSpread({}, component), toUse), {}, {
+      cya_label: component.label || component.cya_label,
+      fieldId: toUse.fieldId || component.fieldId
+    });
+
+    if (parent && parent.id !== component.id) {
+      parent.components[0] = component;
+    } else {
+      wrapper = component;
+    }
+
+    return wrapper;
   } // If we missed a nested reference along the way, don't return the wrapper.
 
 
-  return parent ? wrapper : undefined;
+  return undefined;
 };
 /**
  * Use an existing component from the formComponents, overriding any properties
@@ -66,11 +83,7 @@ var useComponent = function useComponent(toUse, formComponents) {
     var component = getComponentToUse(toUse, formComponents);
 
     if (component) {
-      var fieldId = toUse.fieldId || component.fieldId;
-      return _objectSpread(_objectSpread(_objectSpread({}, component), toUse), {}, {
-        cya_label: component.label || component.cya_label,
-        fieldId: fieldId
-      });
+      return component;
     }
   }
 

package/dist/utils/FormPage/useComponent.test.js

@@ -142,11 +142,12 @@ describe('utils', function () {
         var TO_USE = {
           use: ID
         };
-        expect((0, _useComponent.default)(TO_USE, FORM_COMPONENTS)).toEqual(_objectSpread(_objectSpread({
-          use: ID
-        }, CONTAINER), {}, {
-          cya_label: CONTAINER.label,
-          components: [ZULU // Foxtrot is not included
+        expect((0, _useComponent.default)(TO_USE, FORM_COMPONENTS)).toEqual(_objectSpread(_objectSpread({}, CONTAINER), {}, {
+          components: [_objectSpread(_objectSpread({
+            use: ID
+          }, ZULU), {}, {
+            cya_label: ZULU.label
+          }) // Foxtrot is not included
           ]
         }));
       });

package/package.json

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