@ukhomeoffice/cop-react-form-renderer 4.84.0 → 4.86.0

package/dist/components/CheckYourAnswers/CheckYourAnswers.js

@@ -143,15 +143,11 @@ var CheckYourAnswers = function CheckYourAnswers(_ref) {
       });
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
         key: taskIndex
-      }, /*#__PURE__*/_react.default.createElement("h3", {
-        className: "govuk-heading-m govuk-!-margin-top-8 govuk-!-margin-bottom-0"
-      }, filterPages.length > 0 && task.name), filterPages.map(function (page, pageIndex) {
+      }, /*#__PURE__*/_react.default.createElement(_copReactComponents.MediumHeading, null, filterPages.length > 0 && task.name), filterPages.map(function (page, pageIndex) {
         var hideActionButtons = isGroup(page.id) || noChangeAction;
         return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
           key: pageIndex
-        }, !hide_page_titles && page.title && !isGroup(page.id) && /*#__PURE__*/_react.default.createElement("h4", {
-          className: "govuk-heading-m govuk-!-margin-top-6 govuk-!-margin-bottom-5"
-        }, _utils.default.interpolateString(page.title, page.formData)), /*#__PURE__*/_react.default.createElement(_SummaryList.default, {
+        }, !hide_page_titles && page.title && !isGroup(page.id) && /*#__PURE__*/_react.default.createElement(_copReactComponents.SmallHeading, null, _utils.default.interpolateString(page.title, page.formData)), /*#__PURE__*/_react.default.createElement(_SummaryList.default, {
           rows: page.rows,
           classModifiers: summaryListClassModifiers,
           noChangeAction: hideActionButtons,

package/dist/components/CheckYourAnswers/CheckYourAnswers.test.js

@@ -334,25 +334,22 @@ describe('components', function () {
             })));
           case 3:
             taskHeading1 = container.childNodes[0].childNodes[0];
-            expect(taskHeading1.tagName).toEqual('H3');
+            expect(taskHeading1.tagName).toEqual('H2');
             expect(taskHeading1.textContent).toEqual('Task 1');
-            expect(taskHeading1.classList).toContain("govuk-!-margin-top-8");
-            expect(taskHeading1.classList).toContain("govuk-!-margin-bottom-0");
+            expect(taskHeading1.classList).toContain("govuk-heading-m");
             namesPageHeading = container.childNodes[0].childNodes[1];
             expect(namesPageHeading.tagName).toEqual('DIV');
             expect(namesPageHeading.textContent).toContain('John');
             expect(namesPageHeading.classList).toContain("group-of-rows");
             taskHeading2 = container.childNodes[0].childNodes[2];
-            expect(taskHeading2.tagName).toEqual('H3');
+            expect(taskHeading2.tagName).toEqual('H2');
             expect(taskHeading2.textContent).toEqual('Task 2');
-            expect(taskHeading2.classList).toContain("govuk-!-margin-top-8");
-            expect(taskHeading2.classList).toContain("govuk-!-margin-bottom-0");
+            expect(taskHeading2.classList).toContain("govuk-heading-m");
             gradePageHeading = container.childNodes[0].childNodes[3];
-            expect(gradePageHeading.tagName).toEqual('H4');
+            expect(gradePageHeading.tagName).toEqual('H3');
             expect(gradePageHeading.textContent).toEqual("What's your grade?");
-            expect(gradePageHeading.classList).toContain("govuk-!-margin-top-6");
-            expect(gradePageHeading.classList).toContain("govuk-!-margin-bottom-5");
-          case 22:
+            expect(gradePageHeading.classList).toContain("govuk-heading-s");
+          case 19:
           case "end":
             return _context14.stop();
         }

package/dist/utils/CheckYourAnswers/showComponentCYA.js

@@ -9,6 +9,7 @@ var _Component = _interopRequireDefault(require("../Component"));
 var _Container = _interopRequireDefault(require("../Container"));
 var _getSourceData = _interopRequireDefault(require("../Data/getSourceData"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/* eslint-disable no-console */
 // Local imports
 
 var EXCLUDE_FROM_CYA = [_models.ComponentTypes.ALERT, _models.ComponentTypes.HEADING, _models.ComponentTypes.HTML, _models.ComponentTypes.INSET_TEXT];
@@ -32,10 +33,17 @@ var showComponentCYA = function showComponentCYA(options, data) {
   if (Object.prototype.hasOwnProperty.call(options, 'show_on_cya') && !options.show_on_cya) {
     return false;
   }
-  if (options.hideOnCyaWhenEmpty && options.type === _models.ComponentTypes.COLLECTION) {
-    var itemCollectionsData = (0, _getSourceData.default)(data, options.full_path);
-    if (!(itemCollectionsData !== null && itemCollectionsData !== void 0 && itemCollectionsData.length)) {
-      return false;
+  if (options.hideOnCyaWhenEmpty) {
+    if (options.type === _models.ComponentTypes.COLLECTION) {
+      var itemCollectionsData = (0, _getSourceData.default)(data, options.full_path);
+      if (!(itemCollectionsData !== null && itemCollectionsData !== void 0 && itemCollectionsData.length)) {
+        return false;
+      }
+    } else {
+      var value = (0, _getSourceData.default)(data, options.fieldId);
+      if (!value && value !== false && value !== 0) {
+        return false;
+      }
     }
   }
   if (options.type === _models.ComponentTypes.CONTAINER) {

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

@@ -57,9 +57,9 @@ describe('utils', function () {
           type: _models.ComponentTypes.TEXT
         }, null)).toBeTruthy();
       });
-      it('should show when hideOnCyaWhenEmpty is defined and truthy', function () {
+      it('should show when hideOnCyaWhenEmpty is defined and falsy', function () {
         expect((0, _showComponentCYA.default)({
-          hideOnCyaWhenEmpty: true
+          hideOnCyaWhenEmpty: false
         })).toBeTruthy();
       });
       it('should show collection when hideOnCyaWhenEmpty is not defined', function () {
@@ -73,11 +73,11 @@ describe('utils', function () {
           type: _models.ComponentTypes.COLLECTION
         })).toBeFalsy();
       });
-      it('should show when it\'s not a collection and hideOnCyaWhenEmpty is truthy', function () {
+      it('should not show when it\'s not a collection and hideOnCyaWhenEmpty is truthy', function () {
         expect((0, _showComponentCYA.default)({
           hideOnCyaWhenEmpty: true,
           type: _models.ComponentTypes.TEXT
-        })).toBeTruthy();
+        })).toBeFalsy();
       });
       it('should show when length of full_path data is 1 or more', function () {
         expect((0, _showComponentCYA.default)({
@@ -97,6 +97,47 @@ describe('utils', function () {
           example: []
         })).toBeFalsy();
       });
+      it('should show when value of component data does exist and hideOnCyaWhenEmpty is truthy', function () {
+        expect((0, _showComponentCYA.default)({
+          hideOnCyaWhenEmpty: true,
+          type: _models.ComponentTypes.TEXT,
+          fieldId: "example"
+        }, {
+          example: "yes"
+        })).toBeTruthy();
+      });
+      it('should not show when value of component data does not exist and hideOnCyaWhenEmpty is truthy', function () {
+        expect((0, _showComponentCYA.default)({
+          hideOnCyaWhenEmpty: true,
+          type: _models.ComponentTypes.TEXT,
+          fieldId: "example"
+        }, {})).toBeFalsy();
+      });
+      it('should show when value of component data does not exist and hideOnCyaWhenEmpty is falsy', function () {
+        expect((0, _showComponentCYA.default)({
+          hideOnCyaWhenEmpty: false,
+          type: _models.ComponentTypes.TEXT,
+          fieldId: "example"
+        }, {})).toBeTruthy();
+      });
+      it('should show when value of component data does is falsy and hideOnCyaWhenEmpty is truthy', function () {
+        expect((0, _showComponentCYA.default)({
+          hideOnCyaWhenEmpty: true,
+          type: _models.ComponentTypes.TEXT,
+          fieldId: "example"
+        }, {
+          example: false
+        })).toBeTruthy();
+      });
+      it('should show when value of component data is numerically zero and hideOnCyaWhenEmpty is truthy', function () {
+        expect((0, _showComponentCYA.default)({
+          hideOnCyaWhenEmpty: true,
+          type: _models.ComponentTypes.TEXT,
+          fieldId: "example"
+        }, {
+          example: 0
+        })).toBeTruthy();
+      });
     });
   });
 });

package/package.json

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