@ukhomeoffice/cop-react-form-renderer 2.8.3 → 2.9.1

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

@@ -416,7 +416,7 @@ describe('components', function () {
               groupedComponent = cya.childNodes[10];
               keyGroup = groupedComponent.childNodes[0].childNodes[0].childNodes[0];
               expect(keyGroup.tagName).toEqual('DT');
-              expect(keyGroup.textContent).toEqual('Address details (optional)');
+              expect(keyGroup.textContent).toEqual('Address details');
               valueGroup = groupedComponent.childNodes[0].childNodes[0].childNodes[1];
               expect(valueGroup.childNodes.length).toEqual(4);
               expect(valueGroup.tagName).toEqual('DD');

package/dist/components/FormComponent/FormComponent.js

@@ -208,7 +208,8 @@ var FormComponent = function FormComponent(_ref3) {
     hint: component.hint || '',
     options: options,
     value: value || defaultValue,
-    onChange: onComponentChange
+    onChange: onComponentChange,
+    formData: formData
   }), wrap, hooks.onGetComponent);
 };
 

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

@@ -19,7 +19,14 @@ var getSubmissionStatus = function getSubmissionStatus(formType, pages, currentP
 
     if (currentPageId === (_models.FormPages.CYA || 'submitForm') && isCompleted) {
       formStatus.tasks[currentTask.name].complete = true;
+    } else if ((action === null || action === void 0 ? void 0 : action.type) === _models.PageAction.TYPES.SAVE_AND_NAVIGATE) {
+      console.log('pg action sc');
+      formStatus.tasks[currentTask.name] = {
+        complete: false,
+        currentPage: (0, _getNextPageId.default)(formType, pages, currentPageId, action, formData)
+      };
     } else {
+      console.log('got to else stmt');
       formStatus.tasks[currentTask.name] = {
         complete: false,
         currentPage: currentPageId

package/dist/components/FormRenderer/helpers/getSubmissionStatus.test.js

@@ -222,7 +222,7 @@ describe('components', function () {
               })
             });
           });
-          it("should update the current task with the current page and a false complete flag if the current page is not '".concat(_models.FormPages.CYA, "'"), function () {
+          it("should update the current task with the current page and a false complete flag if the next page is not '".concat(_models.FormPages.CYA, "'"), function () {
             var CURRENT_PAGE_ID = 'eventDate';
             var TASK_NAME = 'taskName';
             var CURRENT_TASK = {
@@ -236,7 +236,7 @@ describe('components', function () {
             expect((0, _getSubmissionStatus.default)(FORM_TYPE, PAGES, CURRENT_PAGE_ID, ACTION, {}, CURRENT_TASK)).toMatchObject({
               tasks: _defineProperty({}, TASK_NAME, {
                 complete: false,
-                currentPage: CURRENT_PAGE_ID
+                currentPage: NEXT_PAGE_ID
               })
             });
           });

package/dist/components/SummaryList/GroupAction.js

@@ -21,6 +21,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -49,7 +51,9 @@ var GroupAction = function GroupAction(_ref) {
     return null;
   }
 
-  return /*#__PURE__*/_react.default.createElement(_copReactComponents.Link, attrs, group.action.label, group.action.aria_suffix && /*#__PURE__*/_react.default.createElement("span", {
+  return /*#__PURE__*/_react.default.createElement(_copReactComponents.Link, _extends({}, attrs, {
+    "aria-label": "".concat(group.action.label, " ").concat(group.action.aria_suffix)
+  }), group.action.label, group.action.aria_suffix && /*#__PURE__*/_react.default.createElement("span", {
     className: "mobile-text govuk-link"
   }, ' ', "".concat(group.action.aria_suffix)));
 };

package/dist/components/SummaryList/SummaryList.js

@@ -53,7 +53,7 @@ var SummaryList = function SummaryList(_ref) {
       className: classes('row')
     }, /*#__PURE__*/_react.default.createElement("dt", {
       className: classes('key')
-    }, row.key, !((_row$component = row.component) !== null && _row$component !== void 0 && _row$component.required) && " (optional)"), /*#__PURE__*/_react.default.createElement("dd", {
+    }, row.key, !row.hasOwnProperty('required') && !((_row$component = row.component) !== null && _row$component !== void 0 && _row$component.required) && " (optional)", !row.hasOwnProperty('component') && row.hasOwnProperty('required') && !(row !== null && row !== void 0 && row.required) && " (optional)"), /*#__PURE__*/_react.default.createElement("dd", {
       className: classes('value')
     }, row.value), !noChangeAction && /*#__PURE__*/_react.default.createElement("dd", {
       className: classes('actions')

package/dist/json/group.json

@@ -175,23 +175,6 @@
         "field": "addressDetails.town"
       }
     },
-    {
-      "id": "postCode",
-      "fieldId": "postCode",
-      "label": "Postcode",
-      "type": "text",
-      "required": true,
-      "groupId": "addressDetails",
-      "custom_errors": [
-        {
-          "type": "required",
-          "message": "Please enter postcode"
-        }
-      ],
-      "source": {
-        "field": "addressDetails.postCode"
-      }
-    },
     {
       "id": "postCode",
       "fieldId": "postCode",
@@ -378,6 +361,7 @@
         {
           "id": "address",
           "label": "Address details",
+          "required": true,
           "components": ["firstLineOfTheAddress", "town", "city", "postCode"]
         }
       ],

package/dist/json/port.json

@@ -0,0 +1,346 @@
+{
+    "data": [
+      {
+        "id": 5,
+        "countryid": 234,
+        "commandid": 27,
+        "locationid": null,
+        "name": "Abbotsbury",
+        "addressid": null,
+        "subdivision": "DOR",
+        "municipality": null,
+        "geolong": null,
+        "geolat": null,
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "AOT",
+        "helipad": false,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": 3,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 7947,
+        "countryid": 234,
+        "commandid": null,
+        "locationid": null,
+        "name": "Whitehall",
+        "addressid": null,
+        "subdivision": "NA",
+        "municipality": null,
+        "geolong": "-1.14934",
+        "geolat": "51.79353",
+        "air": true,
+        "land": false,
+        "sea": false,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": null,
+        "helipad": false,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": 3,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 9887,
+        "countryid": 234,
+        "commandid": 20,
+        "locationid": null,
+        "name": "The Manor House Castle Combe",
+        "addressid": null,
+        "subdivision": "NA",
+        "municipality": null,
+        "geolong": "-2.23211",
+        "geolat": "51.49378",
+        "air": true,
+        "land": false,
+        "sea": false,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": null,
+        "helipad": true,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": 3,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 13418,
+        "countryid": 14,
+        "commandid": null,
+        "locationid": null,
+        "name": "Ballast Head",
+        "addressid": null,
+        "subdivision": "SA",
+        "municipality": null,
+        "geolong": null,
+        "geolat": null,
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "BAH",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 17391,
+        "countryid": 22,
+        "commandid": null,
+        "locationid": null,
+        "name": "Thuin",
+        "addressid": null,
+        "subdivision": "WHT",
+        "municipality": null,
+        "geolong": "4.28333",
+        "geolat": "50.33333",
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "THU",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 27077,
+        "countryid": 47,
+        "commandid": null,
+        "locationid": null,
+        "name": "Pudongxinqu Pt",
+        "addressid": null,
+        "subdivision": "31",
+        "municipality": null,
+        "geolong": null,
+        "geolat": null,
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "PDX",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 52061,
+        "countryid": 80,
+        "commandid": null,
+        "locationid": null,
+        "name": "Jouques",
+        "addressid": null,
+        "subdivision": "13",
+        "municipality": null,
+        "geolong": "5.63333",
+        "geolat": "43.63333",
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "QUU",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 63838,
+        "countryid": 107,
+        "commandid": null,
+        "locationid": null,
+        "name": "Panjang",
+        "addressid": null,
+        "subdivision": null,
+        "municipality": null,
+        "geolong": null,
+        "geolat": null,
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "PNJ",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 78550,
+        "countryid": 155,
+        "commandid": null,
+        "locationid": null,
+        "name": "Hoek van Holland",
+        "addressid": null,
+        "subdivision": null,
+        "municipality": null,
+        "geolong": null,
+        "geolat": null,
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "HVH",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 102163,
+        "countryid": 238,
+        "commandid": null,
+        "locationid": null,
+        "name": "Lolita",
+        "addressid": null,
+        "subdivision": "TX",
+        "municipality": null,
+        "geolong": "-96.53333",
+        "geolat": "28.83333",
+        "air": false,
+        "land": false,
+        "sea": true,
+        "rail": false,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "OIT",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": null,
+        "juxtaposed": false,
+        "freightparcelposthub": false,
+        "validfrom": "2019-01-01T00:01:00.000Z",
+        "validto": null,
+        "updatedby": null
+      },
+      {
+        "id": 113626,
+        "countryid": 234,
+        "commandid": 6,
+        "locationid": null,
+        "name": "Rotterdam Central Station",
+        "addressid": null,
+        "subdivision": "ZH",
+        "municipality": null,
+        "geolong": "4.469093",
+        "geolat": "51.92468",
+        "air": false,
+        "land": false,
+        "sea": false,
+        "rail": true,
+        "iata": null,
+        "icao": null,
+        "localcode": null,
+        "unlocode": "RTM",
+        "helipad": null,
+        "fixedpcp": null,
+        "portablepcp": null,
+        "egates": null,
+        "nonoperational": false,
+        "portsizeid": 2,
+        "juxtaposed": true,
+        "freightparcelposthub": false,
+        "validfrom": "2022-01-11T00:00:01.000Z",
+        "validto": null,
+        "updatedby": "Mohammed Abdul Odud"
+      }
+    ]
+  }
+