@ukhomeoffice/cop-react-form-renderer 5.0.0-alpha → 5.0.0

package/dist/utils/CheckYourAnswers/getCYARowsForCollection.js

@@ -8,11 +8,15 @@ var _copReactComponents = require("@ukhomeoffice/cop-react-components");
 var _models = require("../../models");
 var _getCYAAction = _interopRequireDefault(require("./getCYAAction"));
 var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+var _setupContainerComponentsPath = _interopRequireDefault(require("../Component/setupContainerComponentsPath"));
 var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 _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; }
+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); }
 var getEntryToCollectionRow = function getEntryToCollectionRow(page, onAction) {
   var _page$components$0$la;
   return [{
@@ -22,30 +26,30 @@ var getEntryToCollectionRow = function getEntryToCollectionRow(page, onAction) {
     action: (0, _getCYAAction.default)(false, page, onAction)
   }];
 };
-var getContainerForItem = function getContainerForItem(collection, item, labelCount, full_path) {
+var getContainerForItem = function getContainerForItem(collection, item, labelCount, fullPath) {
   return {
     id: item.id,
     fieldId: item.id,
     type: _models.ComponentTypes.CONTAINER,
     required: collection.required,
-    full_path: full_path,
+    full_path: fullPath,
     components: collection.item.map(function (component) {
       return _objectSpread(_objectSpread({}, component), {}, {
         label: _copReactComponents.Utils.interpolateString(component.label, _objectSpread(_objectSpread({}, item), {}, {
           index: labelCount
         })),
-        full_path: "".concat(full_path, ".").concat(component.fieldId)
+        full_path: "".concat(fullPath, ".").concat(component.fieldId)
       });
     })
   };
 };
-var getTitleRowForItem = function getTitleRowForItem(collection, item, pageId, labelCount, full_path) {
+var getTitleRowForItem = function getTitleRowForItem(collection, item, pageId, labelCount, fullPath) {
   var labels = _objectSpread(_objectSpread({}, _models.CollectionLabels), collection.labels);
   if (labels.item) {
     return {
       pageId: pageId,
       fieldId: collection.fieldId,
-      full_path: full_path,
+      full_path: fullPath,
       key: _copReactComponents.Utils.interpolateString(labels.item, _objectSpread(_objectSpread({}, item), {}, {
         index: labelCount
       })),
@@ -55,13 +59,14 @@ var getTitleRowForItem = function getTitleRowForItem(collection, item, pageId, l
   }
   return null;
 };
-var getCYARowsForCollection = function getCYARowsForCollection(page, collection, items, onAction) {
+var getCYARowsForCollection = function getCYARowsForCollection(page, collection, items, onAction, fnOverride) {
   if (Array.isArray(items) && items.length && (0, _showComponentCYA.default)(collection, page.formData)) {
     return items.flatMap(function (item, index) {
       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);
-      return [getTitleRowForItem(collection, item, page.id, labelCount, full_path)].concat((0, _getCYARowsForContainer.default)(page, container, item, onAction));
+      var fullPath = "".concat(collection.full_path || collection.fieldId, "[").concat(index, "]");
+      var container = getContainerForItem(collection, item, labelCount, fullPath);
+      container = (0, _setupContainerComponentsPath.default)(container);
+      return [getTitleRowForItem(collection, item, page.id, labelCount, fullPath)].concat((0, _getCYARowsForContainer.default)(page, container, item, onAction, fnOverride));
     }).filter(function (r) {
       return !!r;
     });

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

@@ -0,0 +1,288 @@
+"use strict";
+
+var _models = require("../../models");
+var _setupTests = require("../../setupTests");
+var _getCYARowsForCollection = _interopRequireDefault(require("./getCYARowsForCollection"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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; }
+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); }
+describe('utils.CheckYourAnswers.getCYARowsForCollection', function () {
+  it('should get a single entry point row when there are no items', function () {
+    var FORM_DATA = undefined;
+    var PAGE = {
+      id: 'page',
+      components: [{
+        labels: {
+          add: 'Add'
+        }
+      }],
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      item: [COMPONENT]
+    };
+    var ON_ACTION = function ON_ACTION() {};
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, undefined, ON_ACTION);
+    expect(ROWS.length).toEqual(1);
+  });
+  it('should get an appropriate row for a collection with a single readonly text component', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      countOffset: 22,
+      item: [COMPONENT],
+      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(2); // Item title row + component row
+    (0, _setupTests.expectObjectLike)(ROWS[0], {
+      pageId: PAGE.id,
+      fieldId: COLLECTION.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      key: 'Item 23',
+      // includes countOffset
+      type: 'title',
+      action: null
+    });
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: COMPONENT.label,
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
+      }),
+      value: 'Bravo'
+    });
+  });
+  it('should get an appropriate row for a collection with a single readonly text component where the item label is an empty string', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      labels: {
+        item: ''
+      },
+      countOffset: 22,
+      item: [COMPONENT],
+      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(1); // Just the component row, no title row
+    (0, _setupTests.expectObjectLike)(ROWS[0], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: COMPONENT.label,
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
+      }),
+      value: 'Bravo'
+    });
+  });
+  it('should interpolate a field label appropriately', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    // eslint-disable-next-line no-template-curly-in-string
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha ${index}'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      item: [COMPONENT],
+      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(2); // Title and item row.
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: 'Alpha 1',
+      // no countOffset
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+        label: 'Alpha 1' // no countOffset
+      }),
+
+      value: 'Bravo'
+    });
+  });
+  it('should ignore the result of the override function if it returns nullish', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      countOffset: 22,
+      item: [COMPONENT],
+      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, function () {
+      return null;
+    });
+    expect(ROWS.length).toEqual(2); // Item title row + component row
+    (0, _setupTests.expectObjectLike)(ROWS[0], {
+      pageId: PAGE.id,
+      fieldId: COLLECTION.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      key: 'Item 23',
+      // includes countOffset
+      type: 'title',
+      action: null
+    });
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      pageId: PAGE.id,
+      fieldId: COMPONENT.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId),
+      key: COMPONENT.label,
+      action: null,
+      component: _objectSpread(_objectSpread({}, COMPONENT), {}, {
+        full_path: "".concat(COLLECTION.fieldId, "[0].").concat(COMPONENT.fieldId)
+      }),
+      value: 'Bravo'
+    });
+  });
+  it('should use rows produced by the override function if provided', function () {
+    var FORM_DATA = {
+      collection: [{
+        a: 'Bravo'
+      }]
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var COMPONENT = {
+      type: 'text',
+      readonly: true,
+      id: 'a',
+      fieldId: 'a',
+      label: 'Alpha'
+    };
+    var COLLECTION = {
+      id: 'collection',
+      fieldId: 'collection',
+      type: _models.ComponentTypes.COLLECTION,
+      countOffset: 22,
+      item: [COMPONENT],
+      value: FORM_DATA.collection,
+      formData: FORM_DATA
+    };
+    var ON_ACTION = function ON_ACTION() {};
+    // eslint-disable-next-line arrow-body-style
+    var OVERRIDE = function OVERRIDE(page, comp) {
+      // This will be called for each component in the collection,
+      // returning a custom row object.
+      return {
+        key: "CustomRowFor".concat(comp.label)
+      };
+    };
+    var ROWS = (0, _getCYARowsForCollection.default)(PAGE, COLLECTION, FORM_DATA.collection, ON_ACTION, OVERRIDE);
+    expect(ROWS.length).toEqual(2); // Item title row + component row
+    (0, _setupTests.expectObjectLike)(ROWS[0], {
+      pageId: PAGE.id,
+      fieldId: COLLECTION.fieldId,
+      full_path: "".concat(COLLECTION.fieldId, "[0]"),
+      key: 'Item 23',
+      // includes countOffset
+      type: 'title',
+      action: null
+    });
+    (0, _setupTests.expectObjectLike)(ROWS[1], {
+      key: "CustomRowFor".concat(COMPONENT.label)
+    });
+  });
+});

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -5,79 +5,137 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _copReactComponents = require("@ukhomeoffice/cop-react-components");
-var _elevateNestedComponents = _interopRequireDefault(require("../Component/elevateNestedComponents"));
 var _models = require("../../models");
-var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
+var _addShowWhen = _interopRequireDefault(require("../Component/addShowWhen"));
+var _showFormPageCYA = _interopRequireDefault(require("../FormPage/showFormPageCYA"));
 var _getCYACollectionDeleteAction = _interopRequireDefault(require("./getCYACollectionDeleteAction"));
 var _getCYACollectionChangeAction = _interopRequireDefault(require("./getCYACollectionChangeAction"));
-var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
+var _getCYARowsForContainer = _interopRequireDefault(require("./getCYARowsForContainer"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 getContainerForPage = function getContainerForPage(page, item, labelCount, full_path) {
-  var allComponents = (0, _elevateNestedComponents.default)(page.components, item);
+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; }
+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); }
+var getContainerForPage = function getContainerForPage(page, item, labelCount, fullPath) {
   return {
     id: item.id,
     fieldId: item.id,
     type: _models.ComponentTypes.CONTAINER,
     required: true,
-    full_path: full_path,
-    components: allComponents.map(function (component) {
-      if ((0, _showComponentCYA.default)(component, item)) {
-        return _objectSpread(_objectSpread({}, component), {}, {
-          label: _copReactComponents.Utils.interpolateString(component.label, _objectSpread(_objectSpread({}, item), {}, {
-            index: labelCount
-          })),
-          full_path: "".concat(full_path, ".").concat(component.fieldId)
-        });
-      }
-      return undefined;
-    }).filter(function (c) {
-      return c;
+    full_path: fullPath,
+    components: page.components.map(function (component) {
+      return _objectSpread(_objectSpread({}, component), {}, {
+        label: _copReactComponents.Utils.interpolateString(component.label, _objectSpread(_objectSpread({}, item), {}, {
+          index: labelCount
+        })),
+        full_path: "".concat(fullPath, ".").concat(component.fieldId)
+      });
     })
   };
 };
-var getTitleRowForItem = function getTitleRowForItem(page, item, pageId, labelCount, full_path) {
+var getTitleRowForItem = function getTitleRowForItem(page, item, pageId, labelCount, fullPath) {
   var labels = _objectSpread(_objectSpread({}, _models.CollectionLabels), page.collection.labels);
   return {
     pageId: pageId,
     fieldId: 'Title',
-    full_path: "".concat(full_path, ".Title"),
+    full_path: "".concat(fullPath, ".Title"),
     key: _copReactComponents.Utils.interpolateString(labels.item, _objectSpread(_objectSpread({}, item), {}, {
       index: labelCount
     })),
-    type: 'title'
+    type: 'heading',
+    size: page.collection.titleSize || 's'
+  };
+};
+var getHeadingRow = function getHeadingRow(config, pageId, labelCount) {
+  if (config.text === '') {
+    return null;
+  }
+  return {
+    pageId: pageId,
+    fieldId: "heading".concat(labelCount),
+    full_path: "heading".concat(labelCount),
+    key: config.text,
+    type: 'heading',
+    size: config.size || 's'
   };
 };
 var getActionRows = function getActionRows(page, item, onAction, labelCount) {
   var _page$collection, _page$collection$acti;
-  var actions = (_page$collection = page.collection) === null || _page$collection === void 0 ? void 0 : (_page$collection$acti = _page$collection.actions) === null || _page$collection$acti === void 0 ? void 0 : _page$collection$acti.map(function (action) {
+  return (_page$collection = page.collection) === null || _page$collection === void 0 ? void 0 : (_page$collection$acti = _page$collection.actions) === null || _page$collection$acti === void 0 ? void 0 : _page$collection$acti.map(function (action) {
     if (action.type === 'remove') {
       return (0, _getCYACollectionDeleteAction.default)(page, item, onAction, labelCount, action);
-    } else if (action.type === 'change') {
+    }
+    if (action.type === 'change') {
       return (0, _getCYACollectionChangeAction.default)(page, item, onAction, labelCount, action);
-    } else {
-      return null;
     }
+    return null;
   }).filter(function (action) {
     return !!action;
   });
-  return actions;
 };
-var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onAction) {
-  var _page$formData, _page$formData$page$c;
+
+// eslint-disable-next-line arrow-body-style
+var getChangeActionForPage = function getChangeActionForPage(page, item, onAction) {
+  return function () {
+    var changeCallback = function changeCallback(changeData) {
+      var data = changeData;
+      data["".concat(page.collection.name, "ActiveId")] = item.id;
+      return data;
+    };
+    onAction({
+      pageId: page.id
+    }, changeCallback);
+  };
+};
+var getCYARowsForCollectionPage = function getCYARowsForCollectionPage(page, onAction, fnOverride) {
+  var _page$formData, _page$formData$page$c, _page$formData2, _page$formData2$page$;
+  if (!((_page$formData = page.formData) !== null && _page$formData !== void 0 && (_page$formData$page$c = _page$formData[page.collection.name]) !== null && _page$formData$page$c !== void 0 && _page$formData$page$c.length)) {
+    return [];
+  }
   var rows = [];
-  (_page$formData = page.formData) === null || _page$formData === void 0 ? void 0 : (_page$formData$page$c = _page$formData[page.collection.name]) === null || _page$formData$page$c === void 0 ? void 0 : _page$formData$page$c.forEach(function (item, index) {
+  if (!page.collection.hideNameFromCYA) {
+    rows.push({
+      pageId: page.id,
+      fieldId: "".concat(page.collection.name, "Title"),
+      full_path: "".concat(page.collection.name, "Title"),
+      key: page.collection.name.charAt(0).toUpperCase() + page.collection.name.slice(1),
+      type: 'heading',
+      size: 'm'
+    });
+  }
+  (_page$formData2 = page.formData) === null || _page$formData2 === void 0 ? void 0 : (_page$formData2$page$ = _page$formData2[page.collection.name]) === null || _page$formData2$page$ === void 0 ? void 0 : _page$formData2$page$.forEach(function (item, index) {
+    var _page$collection2;
     var labelCount = index + 1;
-    var full_path = "".concat(page.collection.name, "[").concat(index, "]");
-    var container = getContainerForPage(page, item, labelCount, full_path);
-    var containerRows = (0, _getCYARowsForContainer.default)(page, container, item, undefined);
-    var titleRow = getTitleRowForItem(page, item, page.id, labelCount, full_path);
+    var actionPosition = ((_page$collection2 = page.collection) === null || _page$collection2 === void 0 ? void 0 : _page$collection2.actionPosition) || 'top';
+    var fullPath = "".concat(page.collection.name, "[").concat(index, "]");
+    var titleRow = getTitleRowForItem(page, item, page.id, labelCount, fullPath);
     var actionRows = getActionRows(page, item, onAction, labelCount);
     rows = rows.concat(titleRow);
-    rows = rows.concat(actionRows);
-    rows = rows.concat(containerRows);
+    if (actionPosition === 'top') {
+      rows = rows.concat(actionRows);
+    }
+    page.collectionPages.forEach(function (p) {
+      var collectionPage = p;
+      if (collectionPage.collection.route) {
+        var pageWithRoute = (0, _addShowWhen.default)(collectionPage, p.collection.route);
+        collectionPage = pageWithRoute || collectionPage;
+      }
+      if ((0, _showFormPageCYA.default)(collectionPage, _objectSpread(_objectSpread({}, collectionPage.formData), item))) {
+        if (collectionPage.collection.heading) {
+          var headingRow = getHeadingRow(collectionPage.collection.heading, collectionPage.id, labelCount);
+          rows = rows.concat(headingRow);
+        }
+        var container = getContainerForPage(collectionPage, item, labelCount, fullPath);
+        var rowChangeAction = getChangeActionForPage(collectionPage, item, onAction);
+        var containerRows = (0, _getCYARowsForContainer.default)(collectionPage, container, item, rowChangeAction, fnOverride);
+        rows = rows.concat(containerRows);
+      }
+    });
+    if (actionPosition === 'bottom') {
+      rows = rows.concat(actionRows);
+    }
   });
   return rows.filter(function (row) {
     return !!row;