@financial-times/n-conversion-forms 27.0.7 → 27.2.2

package/build-state/npm-shrinkwrap.json

@@ -10419,6 +10419,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ansi-html": {
       "version": "0.0.7",
       "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
@@ -32005,9 +32017,12 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "0.21.3",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -41537,6 +41552,14 @@
       "dev": true,
       "requires": {
         "type-fest": "^0.21.3"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.21.3",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+          "dev": true
+        }
       }
     },
     "ansi-html": {
@@ -58293,9 +58316,12 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.21.3",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "type-is": {
       "version": "1.6.18",

package/components/__snapshots__/b2c-partnership-confirmation.spec.js.snap

@@ -7,7 +7,7 @@ exports[`B2CPartnershipConfirmation renders as default 1`] = `
     </div>
     <div class="ncf__paragraph">
       <h1 class="ncf__header ncf__header--confirmation">
-        Welcome to your 30 days&#x27; Premium access
+        Welcome to your Premium access
       </h1>
     </div>
   </div>

package/components/b2c-partnership-confirmation.jsx

@@ -19,7 +19,7 @@ export function B2CPartnershipConfirmation ({ ctaElement = null }) {
 				<div className="ncf__paragraph">
 					{
 						<h1 className="ncf__header ncf__header--confirmation">
-							{'Welcome to your 30 days\' Premium access'}
+							{'Welcome to your Premium access'}
 						</h1>
 					}
 				</div>

package/components/delivery-address-map.jsx

@@ -31,7 +31,7 @@ const deliveryAddressMap = {
 			APAC: 'District/County/Province/Ward',
 		},
 		addressLine1Title:{
-			'ARE': 'PO Box',
+			ARE: 'PO Box',
 		},
 		addressLine3Title:  {
 			GBR: 'Address line 3',
@@ -39,6 +39,7 @@ const deliveryAddressMap = {
 			CAN: 'APT/FL/STE',
 			CEMEA_V1: 'Address line 3',
 			CEMEA_V2: 'Address line 3',
+			APAC: 'Address line 3',
 		},
 		addressLine3Prompt: {
 			USA: 'Max. 6 characters. Please enter “Apartment 2C” as “Apt 2C”, “Floor 10 as FL 10”',

package/components/delivery-address-type.jsx

@@ -12,6 +12,7 @@ export function DeliveryAddressType ({
 	fieldId = 'deliveryAddressTypeField',
 	inputName = 'deliveryAddressType',
 	options = ['home', 'company', 'pobox'],
+	editMode = false,
 }) {
 	return (
 		<div
@@ -36,6 +37,7 @@ export function DeliveryAddressType ({
 								name={inputName}
 								value={type.id}
 								className="ncf__delivery-address-type__input"
+								disabled={editMode && (type.id !== value)}
 								defaultChecked={type.id === value}
 							/>
 							<span

package/components/licence-confirmation.jsx

@@ -8,6 +8,7 @@ export function LicenceConfirmation ({
 	isEducationalLicence = false,
 	contentId = '',
 	ctaElement = null,
+	bodyContent = null,
 }) {
 	const readingLinkProps = {
 		href: contentId === '' ? '/' : `/content/${contentId}`,
@@ -32,17 +33,19 @@ export function LicenceConfirmation ({
 					)}
 				</div>
 			</div>
+			{
+				bodyContent ? bodyContent : <>
+					<p className="ncf__paragraph">
+					Go to myFT to personalise your feed &amp; follow topics &amp; articles
+					of interest to you. Set this up now or later.
+					</p>
 
-			<p className="ncf__paragraph">
-				Go to myFT to personalise your feed &amp; follow topics &amp; articles
-				of interest to you. Set this up now or later.
-			</p>
-
-			<p className="ncf__paragraph">
-				Explore the homepage &amp; enjoy your unlimited access &amp; exclusive
-				content.
-			</p>
-
+					<p className="ncf__paragraph">
+						Explore the homepage &amp; enjoy your unlimited access &amp; exclusive
+						content.
+					</p>
+				</>
+			}
 			{ctaElement || (
 				<p className="ncf__paragraph ncf__center">
 					<a className="ncf__button ncf__button--submit" href="/myft">
@@ -65,4 +68,5 @@ LicenceConfirmation.propTypes = {
 	isEducationalLicence: PropTypes.bool,
 	contentId: PropTypes.string,
 	ctaElement: PropTypes.node,
+	bodyContent: PropTypes.element,
 };

package/dist/b2c-partnership-confirmation.js

@@ -32,7 +32,7 @@ function B2CPartnershipConfirmation(_ref) {
     className: "ncf__paragraph"
   }, /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ncf__header ncf__header--confirmation"
-  }, 'Welcome to your 30 days\' Premium access'))), /*#__PURE__*/_react["default"].createElement("p", {
+  }, 'Welcome to your Premium access'))), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
   }, "Please check your email to confirm your account and set your password."), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"

package/dist/delivery-address-map.js

@@ -30,14 +30,15 @@ var deliveryAddressMap = {
       APAC: 'District/County/Province/Ward'
     },
     addressLine1Title: {
-      'ARE': 'PO Box'
+      ARE: 'PO Box'
     },
     addressLine3Title: {
       GBR: 'Address line 3',
       USA: 'APT/FL/STE',
       CAN: 'APT/FL/STE',
       CEMEA_V1: 'Address line 3',
-      CEMEA_V2: 'Address line 3'
+      CEMEA_V2: 'Address line 3',
+      APAC: 'Address line 3'
     },
     addressLine3Prompt: {
       USA: 'Max. 6 characters. Please enter “Apartment 2C” as “Apt 2C”, “Floor 10 as FL 10”',

package/dist/delivery-address-type.js

@@ -30,7 +30,9 @@ function DeliveryAddressType(_ref) {
       _ref$inputName = _ref.inputName,
       inputName = _ref$inputName === void 0 ? 'deliveryAddressType' : _ref$inputName,
       _ref$options = _ref.options,
-      options = _ref$options === void 0 ? ['home', 'company', 'pobox'] : _ref$options;
+      options = _ref$options === void 0 ? ['home', 'company', 'pobox'] : _ref$options,
+      _ref$editMode = _ref.editMode,
+      editMode = _ref$editMode === void 0 ? false : _ref$editMode;
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: fieldId,
     className: "o-forms-field ncf__delivery-address-type",
@@ -56,6 +58,7 @@ function DeliveryAddressType(_ref) {
       name: inputName,
       value: type.id,
       className: "ncf__delivery-address-type__input",
+      disabled: editMode && type.id !== value,
       defaultChecked: type.id === value
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-forms-input__label o-forms-input__address-type__label",

package/dist/licence-confirmation.js

@@ -29,7 +29,9 @@ function LicenceConfirmation(_ref) {
       _ref$contentId = _ref.contentId,
       contentId = _ref$contentId === void 0 ? '' : _ref$contentId,
       _ref$ctaElement = _ref.ctaElement,
-      ctaElement = _ref$ctaElement === void 0 ? null : _ref$ctaElement;
+      ctaElement = _ref$ctaElement === void 0 ? null : _ref$ctaElement,
+      _ref$bodyContent = _ref.bodyContent,
+      bodyContent = _ref$bodyContent === void 0 ? null : _ref$bodyContent;
 
   var readingLinkProps = _objectSpread({
     href: contentId === '' ? '/' : "/content/".concat(contentId),
@@ -50,11 +52,11 @@ function LicenceConfirmation(_ref) {
     className: "ncf__header ncf__header--confirmation"
   }, "Your", duration ? " ".concat(duration) : '', " trial has started") : /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ncf__header ncf__header--confirmation"
-  }, "Great news, you have joined your", ' ', isEducationalLicence ? 'school' : 'company', " licence"))), /*#__PURE__*/_react["default"].createElement("p", {
+  }, "Great news, you have joined your", ' ', isEducationalLicence ? 'school' : 'company', " licence"))), bodyContent ? bodyContent : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
   }, "Go to myFT to personalise your feed & follow topics & articles of interest to you. Set this up now or later."), /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
-  }, "Explore the homepage & enjoy your unlimited access & exclusive content."), ctaElement || /*#__PURE__*/_react["default"].createElement("p", {
+  }, "Explore the homepage & enjoy your unlimited access & exclusive content.")), ctaElement || /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph ncf__center"
   }, /*#__PURE__*/_react["default"].createElement("a", {
     className: "ncf__button ncf__button--submit",
@@ -70,5 +72,6 @@ LicenceConfirmation.propTypes = {
   duration: _propTypes["default"].string,
   isEducationalLicence: _propTypes["default"].bool,
   contentId: _propTypes["default"].string,
-  ctaElement: _propTypes["default"].node
+  ctaElement: _propTypes["default"].node,
+  bodyContent: _propTypes["default"].element
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "27.0.7",
+  "version": "27.2.2",
   "description": "Containing jsx components and styles for forms included on Accounts and Acqusition apps (next-signup, next-profile, next-retention, etc).",
   "main": "dist/index.js",
   "scripts": {

package/utils/delivery-option-messages.js

@@ -105,6 +105,19 @@ const deliveryOptionMessages = [
 		description:
 			'Enjoy delivery of the newspaper daily to your home or office address. \nPlease note: Your FT Weekend will be delivered on Sunday or Monday.',
 	},
+	{
+		deliveryFrequency: [
+			FIVE_DAYS_WEEK_DELIVERY_FREQ,
+			SIX_DAYS_WEEK_DELIVERY_FREQ,
+		],
+		distributorType: HAND_DELIVERY,
+		deliveryOnPublicationDate: false,
+		flightMarket: true,
+		country: [printRegions.cemeaV1, printRegions.cemeaV2, printRegions.apac],
+		title: 'Hand Delivery',
+		description:
+			'Enjoy the delivery of the newspaper to your home or office address. Please note we fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside of the FT’s control. In those circumstances, your newspaper will be delivered the next delivery day. Please also be aware that your FT weekend will be delivered on Sunday.',
+	},
 	{
 		deliveryFrequency: [
 			FIVE_DAYS_WEEK_DELIVERY_FREQ,
@@ -112,12 +125,24 @@ const deliveryOptionMessages = [
 		],
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: true,
-		flightMarket: false,
+		flightMarket: true,
 		country: [printRegions.cemeaV1, printRegions.cemeaV2, printRegions.apac],
-		title: 'Hand delivery',
+		title: 'Hand Delivery',
 		description:
 			'Enjoy the delivery of the newspaper to your home or office address. Please note we fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside of the FT’s control. In those circumstances, your newspaper will be delivered the next delivery day. Please also be aware that your FT weekend will be delivered on Sunday.',
 	},
+	{
+		deliveryFrequency: [
+			FIVE_DAYS_WEEK_DELIVERY_FREQ,
+			SIX_DAYS_WEEK_DELIVERY_FREQ,
+		],
+		distributorType: MAIL,
+		country: [printRegions.cemeaV1, printRegions.cemeaV2, printRegions.apac],
+		title: 'Mail Delivery',
+		customId: 'ML',
+		description:
+			'We can only deliver the newspaper to your location by postal mail which means your delivery will arrive up to 3 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT\'s control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.',
+	},
 	{
 		deliveryFrequency: [
 			FIVE_DAYS_WEEK_DELIVERY_FREQ,
@@ -188,38 +213,38 @@ function includesDeliveryFrequency (productCode = '', item) {
 	});
 }
 
-function mailStrategy (productCode, option, country, item) {
+function mailStrategy (productCode, option, FTShippingZone, item) {
 	return (
 		includesDeliveryFrequency(productCode, item) &&
 		item.distributorType === MAIL &&
-		item.country.includes(country)
+		item.country.includes(FTShippingZone)
 	);
 }
 
-function handDeliveryStrategy (productCode, option, country, item) {
+function handDeliveryStrategy (productCode, option, FTShippingZone, item) {
 	return (
 		includesDeliveryFrequency(productCode, item) &&
 		item.distributorType === HAND_DELIVERY &&
 		item.deliveryOnPublicationDate === option.deliveryOnPublicationDate &&
 		item.flightMarket === option.flightMarket &&
-		item.country.includes(country)
+		item.country.includes(FTShippingZone)
 	);
 }
 
 /**
- * Method to find a specific delivery option based on the delivery frequency, country and option values.
+ * Method to find a specific delivery option based on the delivery frequency, FTShippingZone and option values.
  * There are two different strategies, one for options with mailDelivery = true and other by the opposite.
  * Both cases are represented by system option code 'HD', but differ on the mailDelivery property value.
  * If no message matchs, then undefined is returned.
  */
-function findCustomDeliveryOption (productCode, option, country) {
+function findCustomDeliveryOption (productCode, option, FTShippingZone) {
 	let deliveryOption;
 
 	if (option.value === HAND_DELIVERY) {
 		const filteredMessages = deliveryOptionMessages.filter((item) => {
 			return option.mailDelivery
-				? mailStrategy(productCode, option, country, item)
-				: handDeliveryStrategy(productCode, option, country, item);
+				? mailStrategy(productCode, option, FTShippingZone, item)
+				: handDeliveryStrategy(productCode, option, FTShippingZone, item);
 		});
 
 		if (filteredMessages.length) {
@@ -231,10 +256,10 @@ function findCustomDeliveryOption (productCode, option, country) {
 	return deliveryOption;
 }
 
-function getDeliveryOption (productCode, option, country) {
-	return country === UK_COUNTRY_CODE
+function getDeliveryOption (productCode, option, FTShippingZone) {
+	return FTShippingZone === UK_COUNTRY_CODE
 		? UKDeliveryOptions[option.value]
-		: findCustomDeliveryOption(productCode, option, country);
+		: findCustomDeliveryOption(productCode, option, FTShippingZone);
 }
 
 module.exports = {

package/utils/delivery-option-messages.spec.js

@@ -133,4 +133,45 @@ describe('Find Custom Delivery Option', () => {
 			expect(deliveryOption).toEqual(expected);
 		});
 	});
+
+	describe('Find CEMEA/APAC Delivery Option', () => {
+
+		it('returns CEMEA/APAC HD delivery option', () => {
+			stubOption.flightMarket = true;
+			stubOption.deliveryOnPublicationDate = false;
+			stubOption.mailDelivery = false;
+			const expected = {
+				title: 'Hand Delivery',
+				description:
+					'Enjoy the delivery of the newspaper to your home or office address. Please note we fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside of the FT’s control. In those circumstances, your newspaper will be delivered the next delivery day. Please also be aware that your FT weekend will be delivered on Sunday.',
+			};
+
+			const deliveryOption = getDeliveryOption(
+				'N6D',
+				stubOption,
+				'CEMEA_V1'
+			);
+
+			expect(deliveryOption).toEqual(expected);
+		});
+
+		it('returns CEMEA/APAC ML delivery option', () => {
+			stubOption.mailDelivery = true;
+
+			const expected = {
+				title: 'Mail Delivery',
+				customId: 'ML',
+				description:
+					'We can only deliver the newspaper to your location by postal mail which means your delivery will arrive up to 3 business days after the date of publication and will not include the HTSI Magazine. We also fly the newspaper to your location which means delivery is subject to flight delays/cancellations outside the FT\'s control. If you prefer to read the printed content on the day of publication, please proceed to subscribe to the FT ePaper - a digital replica of the print edition.',
+			};
+
+			const deliveryOption = getDeliveryOption(
+				'N6D',
+				stubOption,
+				'APAC'
+			);
+
+			expect(deliveryOption).toEqual(expected);
+		});
+	});
 });