@ukhomeoffice/cop-react-form-renderer 5.96.0 → 5.97.1

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

@@ -13,7 +13,6 @@ var _getNextPageId = _interopRequireDefault(require("./getNextPageId"));
 var _getPage = _interopRequireDefault(require("./getPage"));
 var _getSubmissionStatus = _interopRequireDefault(require("./getSubmissionStatus"));
 var _getUpdatedSectionStates = _interopRequireDefault(require("./getUpdatedSectionStates"));
-var _clearOutUncompletedRoutes = _interopRequireDefault(require("./clearOutUncompletedRoutes"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Local imports
 
@@ -26,7 +25,6 @@ var helpers = {
   getNextPageId: _getNextPageId.default,
   getPage: _getPage.default,
   getSubmissionStatus: _getSubmissionStatus.default,
-  getUpdatedSectionStates: _getUpdatedSectionStates.default,
-  clearOutUncompletedRoutes: _clearOutUncompletedRoutes.default
+  getUpdatedSectionStates: _getUpdatedSectionStates.default
 };
 var _default = exports.default = helpers;

package/dist/components/FormRenderer/onPageAction.js

@@ -116,13 +116,6 @@ var onPageAction = function onPageAction(action, patch, patchLabel, hooks, data,
         setData(submissionData);
       }
       ;
-      var formPagesAndComponents = {
-        pages: pages,
-        components: components
-      };
-      if (action.type === _models.PageAction.TYPES.SUBMIT) {
-        _helpers.default.clearOutUncompletedRoutes(formPagesAndComponents, submissionData);
-      }
 
       // In case of hub-and-spoke if patchLabel has changed then 
       // save name and value to variables for call to onSubmit hook

package/dist/components/FormRenderer/onPageAction.test.js

@@ -50,11 +50,6 @@ jest.mock('./helpers', function () {
       this.cleanHiddenNestedDataCalls += 1;
       return patch;
     },
-    clearOutUncompletedRoutesCalls: 0,
-    clearOutUncompletedRoutes: function clearOutUncompletedRoutes(pages, allComponents, formData) {
-      this.clearOutUncompletedRoutesCalls += 1;
-      return formData;
-    },
     getNextPageIdCalls: 0,
     getNextPageId: function getNextPageId() {
       this.getNextPageIdCalls += 1;

package/dist/utils/CheckYourAnswers/getCYARowsForContainer.js

@@ -18,7 +18,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 getCYARowsForContainer = function getCYARowsForContainer(page, container, formData, onAction, fnOverride) {
   if ((0, _showComponentCYA.default)(container, _objectSpread(_objectSpread({}, page.formData), formData))) {
-    var allComponents = (0, _elevateNestedComponents.default)(container.components, formData);
+    var allComponents = (0, _elevateNestedComponents.default)(container.components.filter(function (component) {
+      return component.show_on_cya === undefined || component.show_on_cya;
+    }), formData);
     return allComponents.filter(function (c) {
       return (0, _showComponentCYA.default)(c, _objectSpread(_objectSpread({}, page.formData), formData));
     }).flatMap(function (component) {

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

@@ -151,6 +151,48 @@ describe('utils.CheckYourAnswers.getCYARowsForContainer', function () {
       });
     });
   });
+  it('should not display nested input components when passed a value of false for "show_on_cya" at the parent component level', function () {
+    var FORM_DATA = {
+      container: {
+        topLevelInput: 'A',
+        nestedInput: 'Bravo'
+      }
+    };
+    var PAGE = {
+      id: 'page',
+      formData: FORM_DATA,
+      cya_link: {}
+    };
+    var NESTED_COMPONENT = {
+      type: 'text',
+      id: 'nestedInput',
+      fieldId: 'nestedInput',
+      label: 'Nested input',
+      value: 'Bravo'
+    };
+    var COMPONENT = {
+      type: 'checkboxes',
+      id: 'topLevelInput',
+      fieldId: 'topLevelInput',
+      label: 'Top level input',
+      show_on_cya: false,
+      options: [{
+        value: 'A',
+        label: 'Option Alpha',
+        nested: [NESTED_COMPONENT]
+      }]
+    };
+    var CONTAINER = {
+      id: 'container',
+      fieldId: 'container',
+      type: _models.ComponentTypes.CONTAINER,
+      components: [COMPONENT],
+      value: FORM_DATA
+    };
+    var ON_ACTION = function ON_ACTION() {};
+    var ROWS = (0, _getCYARowsForContainer.default)(PAGE, CONTAINER, FORM_DATA.container, ON_ACTION);
+    expect(ROWS.length).toEqual(0);
+  });
   it('should get an appropriate row for a container with a single readonly text component inside a nested container', function () {
     var FORM_DATA = {
       container: {

package/dist/utils/CollectionPage/mergeCollectionPages.js

@@ -33,7 +33,6 @@ var createMasterPage = function createMasterPage(page) {
     id: page.id,
     name: page.name,
     orderInForm: page.orderInForm,
-    deleteCollectionWhenHidden: page.deleteCollectionWhenHidden,
     collection: _objectSpread({
       masterPage: true
     }, page.collection),

package/dist/utils/FormPage/useComponent.js

@@ -53,6 +53,17 @@ var getComponentToUse = function getComponentToUse(toUse, formComponents) {
     } else {
       wrapper = component;
     }
+
+    // this allows us to have the 'use: component' functionality inside item array
+    if (component.item && Array.isArray(component.item)) {
+      component.item = component.item.map(function (item) {
+        if (item.use) {
+          // eslint-disable-next-line no-use-before-define
+          return useComponent(item, formComponents);
+        }
+        return item;
+      });
+    }
     return wrapper;
   }
 

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

@@ -175,6 +175,42 @@ describe('utils', function () {
           label: TO_USE.label
         }));
       });
+      it('should handle nested use references within item', function () {
+        var SEARCH_METHOD = {
+          id: 'searchMethod',
+          label: 'Search Method',
+          type: _models.ComponentTypes.TEXT
+        };
+        var SEARCH_TECHNIQUES = {
+          id: 'searchTechniques',
+          label: 'Search Techniques',
+          type: _models.ComponentTypes.CONTAINER,
+          item: [{
+            use: 'searchMethod',
+            data: {
+              url: 'https://api.example.com/searchtype'
+            }
+          }]
+        };
+        var EXTENDED_FORM_COMPONENTS = [].concat(FORM_COMPONENTS, [SEARCH_METHOD, SEARCH_TECHNIQUES]);
+        var TO_USE = {
+          use: 'searchTechniques'
+        };
+        var expectedComponent = _objectSpread(_objectSpread({
+          use: 'searchTechniques'
+        }, SEARCH_TECHNIQUES), {}, {
+          cya_label: SEARCH_TECHNIQUES.label,
+          item: [_objectSpread(_objectSpread({
+            use: 'searchMethod'
+          }, SEARCH_METHOD), {}, {
+            cya_label: SEARCH_METHOD.label,
+            data: {
+              url: 'https://api.example.com/searchtype'
+            }
+          })]
+        });
+        expect((0, _useComponent.default)(TO_USE, EXTENDED_FORM_COMPONENTS)).toEqual(expectedComponent);
+      });
     });
   });
 });

package/package.json

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

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/component-used-in-multiple-pages-data.json

@@ -1,4 +0,0 @@
-{
-  "componentA": "show",
-  "componentB": "hide"
-}

package/dist/components/FormRenderer/clear-uncompleted-routes/test-data/component-used-in-multiple-pages-form.json

@@ -1,61 +0,0 @@
-{
-  "components": [
-    {
-      "id": "componentA",
-      "type": "radios",
-      "label": "Field A",
-      "fieldId": "fieldA",
-      "required": true
-    },
-    {
-      "id": "componentB",
-      "type": "collection",
-      "label": "Component B",
-      "fieldId": "componentB"
-    }
-  ],
-  "pages": [
-    {
-      "id": "pageA",
-      "show_when": {
-        "op": "=",
-        "field": "componentA",
-        "value": "hide"
-      },
-      "components": [
-        {
-          "id": "componentB",
-          "use": "componentB"
-        }
-      ]
-    },
-    {
-      "id": "pageB",
-      "show_when": {
-        "op": "=",
-        "field": "componentA",
-        "value": "show"
-      },
-      "components": [
-        {
-          "id": "componentB",
-          "use": "componentB"
-        }
-      ]
-    },
-    {
-      "id": "pageC",
-      "show_when": {
-        "op": "=",
-        "field": "componentA",
-        "value": "hide"
-      },
-      "components": [
-        {
-          "id": "componentB",
-          "use": "componentB"
-        }
-      ]
-    }
-  ]
-}