@ukhomeoffice/cop-react-form-renderer 4.16.2-alpha → 4.16.3

package/dist/utils/CheckYourAnswers/getCYARowsForCollectionPage.js

@@ -17,6 +17,8 @@ var _getCYACollectionDeleteAction = _interopRequireDefault(require("./getCYAColl
 
 var _getCYACollectionChangeAction = _interopRequireDefault(require("./getCYACollectionChangeAction"));
 
+var _showComponentCYA = _interopRequireDefault(require("./showComponentCYA"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -34,12 +36,18 @@ var getContainerForPage = function getContainerForPage(page, item, labelCount, f
     required: true,
     full_path: full_path,
     components: allComponents.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)
-      });
+      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;
     })
   };
 };

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

@@ -121,4 +121,50 @@ describe('utils.CheckYourAnswers.getCYARowsForCollectionPage', function () {
     expect(ROWS[9].value).toEqual('value');
     expect(ROWS[9].key).toEqual('Test text');
   });
+  it('should exclude components that should not be shown', function () {
+    var FD = {
+      collection: [{
+        id: '01',
+        otherField: 'yes',
+        testText: 'testing'
+      }, {
+        id: '02',
+        otherField: 'no',
+        testText: 'testing'
+      }]
+    };
+    var C = {
+      id: 'testText',
+      fieldId: 'testText',
+      label: 'Test text',
+      type: 'text',
+      show_when: {
+        field: "otherField",
+        op: "!=",
+        value: "no"
+      }
+    };
+    var P = {
+      id: 'page1',
+      collection: {
+        name: 'collection'
+      },
+      title: 'Collection',
+      components: [C]
+    };
+
+    var PAGE = _objectSpread(_objectSpread({}, P), {}, {
+      formData: FD
+    });
+
+    var ROWS = (0, _getCYARowsForCollectionPage.default)(PAGE, null);
+    expect(ROWS.length).toEqual(3); // Title row + single component as other should fail show check
+
+    expect(ROWS[0].type).toEqual('title');
+    expect(ROWS[0].key).toEqual('Item 1');
+    expect(ROWS[1].value).toEqual('testing');
+    expect(ROWS[1].key).toEqual('Test text');
+    expect(ROWS[2].type).toEqual('title');
+    expect(ROWS[2].key).toEqual('Item 2');
+  });
 });

package/dist/utils/Validate/validateContainer.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _elevateErrors = _interopRequireDefault(require("./errors/elevateErrors"));
-
 var _validateComponent = _interopRequireDefault(require("./validateComponent"));
 
 var _additional = _interopRequireDefault(require("./additional"));
@@ -53,9 +51,9 @@ var validateContainer = function validateContainer(container, outerData, formDat
     });
   }
 
-  return (0, _elevateErrors.default)(errors.filter(function (e) {
+  return errors.flat(1).filter(function (e) {
     return !!e;
-  }));
+  });
 };
 
 var _default = validateContainer;

package/package.json

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

package/dist/utils/Validate/errors/elevateErrors.js

@@ -1,79 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-/**
- * Iterates over an array of errors and brings any nested 
- * error that should be displayed into the top level array.
- * 
- * e.g.
- *  [
- *   null,
- *   null,
- *   [
- *      { error },
- *      { error },
- *      { error },
- *    ]
- * ]
- * 
- * This allows us to have containers components, whose components are children 
- * containers and those children container components are also made up of 
- * containers.
- * 
- * e.g.
- *  {
- *    "type": "container",
- *    "components": [
- *     {
- *       "type": "any-type"
- *     },
- *     {
- *       "type": "container",
- *       "components": [
- *         {
- *           "type": "any-type"
- *         },
- *         {
- *           "type": "container",
- *           "components": [
- *             {
- *               "type": "container",
- *               "components":[]
- *             }
- *           ]
- *         }
- *       ]
- *     }
- *   ]
- * }
- * 
- * 
- * @param {*} errors A array of nested arrays containing errors.
- * @returns An array containing error objects or an empty array when no errors are found.
- */
-var elevateErrors = function elevateErrors(errors) {
-  var nestedErrors = [];
-
-  var getError = function getError(errors) {
-    errors.forEach(function (error) {
-      if (error) {
-        if (Array.isArray(error)) {
-          getError(error);
-        } else {
-          // Must be an error if not an array
-          nestedErrors.push(error);
-        }
-      }
-    });
-  };
-
-  getError(errors);
-  return nestedErrors;
-};
-
-var _default = elevateErrors;
-exports.default = _default;

package/dist/utils/Validate/errors/elevateErrors.test.js

@@ -1,34 +0,0 @@
-"use strict";
-
-var _elevateErrors = _interopRequireDefault(require("./elevateErrors"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-describe('utils.Validate.ElevateErrors', function () {
-  it('should get nested errors wrapped within multiple arrays', function () {
-    var nestedErrors = [[undefined, undefined, [[{
-      "type": 'This Alpha error is required'
-    }, [{
-      "type": 'This Bravo error is required'
-    }, [[], {
-      "type": 'This Charlie error is required'
-    }]]]]]];
-    expect((0, _elevateErrors.default)(nestedErrors)).toHaveLength(3);
-    expect((0, _elevateErrors.default)(nestedErrors)).toMatchObject([{
-      "type": 'This Alpha error is required'
-    }, {
-      "type": 'This Bravo error is required'
-    }, {
-      "type": 'This Charlie error is required'
-    }]);
-  });
-  it('should get the single error within an array', function () {
-    var nestedErrors = [[{
-      "type": 'This Alpha error is required'
-    }]];
-    expect((0, _elevateErrors.default)(nestedErrors)).toHaveLength(1);
-    expect((0, _elevateErrors.default)(nestedErrors)).toMatchObject([{
-      "type": 'This Alpha error is required'
-    }]);
-  });
-});

package/dist/utils/Validate/errors/index.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _elevateErrors = _interopRequireDefault(require("./elevateErrors"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var Errors = {
-  elevate: _elevateErrors.default
-};
-var _default = Errors;
-exports.default = _default;