@financial-times/n-conversion-forms 37.0.0 → 37.1.0

package/.toolkitstate/ci.json

@@ -1,6 +1,6 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "386e3356ff251ce8366db3384b1648521b3fd5b6",
-  "tag": "v37.0.0"
+  "version": "3a1be1fd273d36daf3e20698803a42db3a4d295d",
+  "tag": "v37.1.0"
 }

package/components/delivery-option.jsx

@@ -35,7 +35,8 @@ export function DeliveryOption({
 					const deliveryOptionValue = getDeliveryOption(
 						productCode,
 						option,
-						FTShippingZone
+						FTShippingZone,
+						country
 					);
 
 					if (!isValidDeliveryOption || !deliveryOptionValue) {
@@ -54,6 +55,12 @@ export function DeliveryOption({
 						defaultChecked: isSelected,
 					};
 
+					const deliveryOptionBoxClassNames = classNames([
+						'o-forms-input__label',
+						'ncf__delivery-option__label',
+						{ 'no-title__delivery-option__box': !deliveryOptionValue.title },
+					]);
+
 					return (
 						<label
 							key={value}
@@ -61,10 +68,12 @@ export function DeliveryOption({
 							htmlFor={id}
 						>
 							<input {...inputProps} />
-							<span className="o-forms-input__label ncf__delivery-option__label">
-								<span className="ncf__delivery-option__title o-forms-title__main">
-									{deliveryOptionValue.title}
-								</span>
+							<span className={deliveryOptionBoxClassNames}>
+								{deliveryOptionValue.title && (
+									<span className="ncf__delivery-option__title o-forms-title__main">
+										{deliveryOptionValue.title}
+									</span>
+								)}
 								<div className="ncf__delivery-option__description">
 									{deliveryOptionValue.description}
 								</div>

package/components/delivery-option.stories.js

@@ -89,3 +89,18 @@ USWeekendOnlyDeliveryOptions.args = {
 	country: 'USA',
 	productCode: 'NWE',
 };
+
+export const JapanDeliveryOptions = (args) => (
+	<div className="ncf">
+		<DeliveryOption {...args} />
+	</div>
+);
+JapanDeliveryOptions.args = {
+	country: 'JPN',
+	options: [
+		{
+			value: 'HD',
+			isValidDeliveryOption: true,
+		},
+	],
+};

package/dist/delivery-option.jsx

@@ -35,7 +35,7 @@ function DeliveryOption(_ref) {
     var value = option.value,
       isValidDeliveryOption = option.isValidDeliveryOption,
       isSelected = option.isSelected;
-    var deliveryOptionValue = (0, _deliveryOptionMessages.getDeliveryOption)(productCode, option, FTShippingZone);
+    var deliveryOptionValue = (0, _deliveryOptionMessages.getDeliveryOption)(productCode, option, FTShippingZone, country);
     if (!isValidDeliveryOption || !deliveryOptionValue) {
       return null;
     }
@@ -50,13 +50,16 @@ function DeliveryOption(_ref) {
       className: 'ncf__delivery-option__input',
       defaultChecked: isSelected
     };
+    var deliveryOptionBoxClassNames = (0, _classnames["default"])(['o-forms-input__label', 'ncf__delivery-option__label', {
+      'no-title__delivery-option__box': !deliveryOptionValue.title
+    }]);
     return /*#__PURE__*/_react["default"].createElement("label", {
       key: value,
       className: "ncf__delivery-option__item",
       htmlFor: id
     }, /*#__PURE__*/_react["default"].createElement("input", inputProps), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "o-forms-input__label ncf__delivery-option__label"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: deliveryOptionBoxClassNames
+    }, deliveryOptionValue.title && /*#__PURE__*/_react["default"].createElement("span", {
       className: "ncf__delivery-option__title o-forms-title__main"
     }, deliveryOptionValue.title), /*#__PURE__*/_react["default"].createElement("div", {
       className: "ncf__delivery-option__description"

package/package.json

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

package/styles/_shared.scss

@@ -28,6 +28,9 @@
 			background-color: oColorsByName('white');
 			color: oColorsByName('black-80');;
 		}
+		.no-title__delivery-option__box {
+			min-height: 80px;
+		}
 		.o-forms-input__address-type__label {
 			padding: 2px 2px 2px 35px;
 			min-height: 0;

package/utils/delivery-option-messages.js

@@ -20,24 +20,37 @@ const HAND_DELIVERY = 'HD';
 const MAIL = 'ML';
 
 // Country codes
+const CANADA_COUNTRY_CODE = 'CAN';
+const JAPAN_COUNTRY_CODE = 'JPN';
 const UK_COUNTRY_CODE = 'GBR';
 const USA_COUNTRY_CODE = 'USA';
-const CAN_COUNTRY_CODE = 'CAN';
 
-const UKDeliveryOptions = {
-	PV: {
-		title: 'Paper vouchers',
-		description:
-			'13-week voucher pack delivered quarterly and redeemable at retailers nationwide.',
-	},
-	HD: {
-		title: 'Hand delivery',
-		description: 'Free delivery to your home or office before 7am.',
+const countryCodeToCustomDeliveryOptionsMap = {
+	[JAPAN_COUNTRY_CODE]: {
+		HD: {
+			description:
+				'Enjoy delivery of the newspaper to your home or office address.',
+		},
+		ML: {
+			description:
+				'Enjoy delivery of the newspaper to your home or office address.',
+		},
 	},
-	EV: {
-		title: 'Electronic vouchers',
-		description:
-			'Delivered via email and card, redeemable at retailers nationwide.',
+	[UK_COUNTRY_CODE]: {
+		PV: {
+			title: 'Paper vouchers',
+			description:
+				'13-week voucher pack delivered quarterly and redeemable at retailers nationwide.',
+		},
+		HD: {
+			title: 'Hand delivery',
+			description: 'Free delivery to your home or office before 7am.',
+		},
+		EV: {
+			title: 'Electronic vouchers',
+			description:
+				'Delivered via email and card, redeemable at retailers nationwide.',
+		},
 	},
 };
 
@@ -61,7 +74,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: true,
 		flightMarket: true,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			"Enjoy delivery of the newspaper daily to your home or office address. \nPlease 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 on the next delivery day.",
@@ -74,7 +87,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: true,
 		flightMarket: false,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			'Enjoy delivery of the newspaper daily to your home or office address.',
@@ -87,7 +100,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: false,
 		flightMarket: true,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			"Enjoy delivery of the newspaper daily to your home or office address. \nPlease 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 on the next delivery day. Please also be aware that your FT Weekend will be delivered on Sunday.",
@@ -100,7 +113,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: false,
 		flightMarket: false,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		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.',
@@ -180,7 +193,7 @@ const deliveryOptionMessages = [
 			SIX_DAYS_WEEK_DELIVERY_FREQ,
 		],
 		distributorType: MAIL,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Mail',
 		customId: 'ML',
 		description:
@@ -191,7 +204,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: true,
 		flightMarket: true,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			"Enjoy delivery of the newspaper daily to your home or office address. \nPlease note: We fly the newspapers 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.",
@@ -201,7 +214,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: true,
 		flightMarket: false,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			'Enjoy delivery of the newspaper daily to your home or office address.',
@@ -211,7 +224,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: false,
 		flightMarket: true,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			"Enjoy delivery of the newspaper daily to your home or office address. \nPlease 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 on the next delivery day. Please also be aware that your FT Weekend will be delivered on Sunday.",
@@ -221,7 +234,7 @@ const deliveryOptionMessages = [
 		distributorType: HAND_DELIVERY,
 		deliveryOnPublicationDate: false,
 		flightMarket: false,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Hand delivery',
 		description:
 			'Enjoy delivery of the newspaper daily to your home or office address. \nPlease note: Your FT Weekend will be delivered on Sunday.',
@@ -229,7 +242,7 @@ const deliveryOptionMessages = [
 	{
 		deliveryFrequency: [ONLY_WEEKEND_DELIVERY_FREQ],
 		distributorType: MAIL,
-		country: [USA_COUNTRY_CODE, CAN_COUNTRY_CODE],
+		country: [USA_COUNTRY_CODE, CANADA_COUNTRY_CODE],
 		title: 'Mail',
 		customId: 'ML',
 		description:
@@ -287,10 +300,13 @@ function findCustomDeliveryOption(productCode, option, FTShippingZone) {
 	return deliveryOption;
 }
 
-function getDeliveryOption(productCode, option, FTShippingZone) {
-	return FTShippingZone === UK_COUNTRY_CODE
-		? UKDeliveryOptions[option.value]
-		: findCustomDeliveryOption(productCode, option, FTShippingZone);
+function getDeliveryOption(productCode, option, FTShippingZone, country) {
+	// Custom delivery messages are displayed for certain countries
+	if (Object.keys(countryCodeToCustomDeliveryOptionsMap).includes(country)) {
+		return countryCodeToCustomDeliveryOptionsMap[country][option.value];
+	}
+
+	return findCustomDeliveryOption(productCode, option, FTShippingZone);
 }
 
 module.exports = {

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

@@ -14,14 +14,14 @@ describe('Find Custom Delivery Option', () => {
 
 		it('returns undefined when other country than custom messages', () => {
 			expect(
-				getDeliveryOption(sixDaysProductCode, stubOption, 'AAA')
+				getDeliveryOption(sixDaysProductCode, stubOption, 'AAA', 'AAA')
 			).toBeUndefined();
 		});
 
 		it('returns undefined when invalid distributor type code', () => {
 			const option = { ...stubOption, value: 'ZZ' };
 			expect(
-				getDeliveryOption(sixDaysProductCode, option, 'USA')
+				getDeliveryOption(sixDaysProductCode, option, 'USA', 'USA')
 			).toBeUndefined();
 		});
 
@@ -29,7 +29,7 @@ describe('Find Custom Delivery Option', () => {
 			stubOption.deliveryOnPublicationDate = undefined;
 			stubOption.flightMarket = undefined;
 			expect(
-				getDeliveryOption(sixDaysProductCode, stubOption, 'AAA')
+				getDeliveryOption(sixDaysProductCode, stubOption, 'AAA', 'AAA')
 			).toBeUndefined();
 		});
 	});
@@ -51,6 +51,7 @@ describe('Find Custom Delivery Option', () => {
 			const deliveryOption = getDeliveryOption(
 				sixDaysProductCode,
 				stubOption,
+				'USA',
 				'USA'
 			);
 
@@ -69,6 +70,7 @@ describe('Find Custom Delivery Option', () => {
 			const deliveryOption = getDeliveryOption(
 				weekendProductCode,
 				stubOption,
+				'USA',
 				'USA'
 			);
 
@@ -92,6 +94,7 @@ describe('Find Custom Delivery Option', () => {
 			const deliveryOption = getDeliveryOption(
 				sixDaysProductCode,
 				stubOption,
+				'USA',
 				'USA'
 			);
 
@@ -109,6 +112,7 @@ describe('Find Custom Delivery Option', () => {
 			const deliveryOption = getDeliveryOption(
 				weekendProductCode,
 				stubOption,
+				'CAN',
 				'CAN'
 			);
 
@@ -127,6 +131,7 @@ describe('Find Custom Delivery Option', () => {
 			const deliveryOption = getDeliveryOption(
 				sixDaysProductCode,
 				{ value: 'EV' },
+				'GBR',
 				'GBR'
 			);
 
@@ -134,6 +139,24 @@ describe('Find Custom Delivery Option', () => {
 		});
 	});
 
+	describe('Find Japan Delivery Option', () => {
+		it('returns Japan HD delivery option', () => {
+			const expected = {
+				description:
+					'Enjoy delivery of the newspaper to your home or office address.',
+			};
+
+			const deliveryOption = getDeliveryOption(
+				sixDaysProductCode,
+				stubOption,
+				'APAC',
+				'JPN'
+			);
+
+			expect(deliveryOption).toEqual(expected);
+		});
+	});
+
 	describe('Find CEMEA/APAC Delivery Option', () => {
 		it('returns CEMEA/APAC HD delivery option', () => {
 			stubOption.flightMarket = true;
@@ -145,7 +168,12 @@ describe('Find Custom Delivery Option', () => {
 					'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');
+			const deliveryOption = getDeliveryOption(
+				'N6D',
+				stubOption,
+				'CEMEA_V1',
+				'BGR'
+			);
 
 			expect(deliveryOption).toEqual(expected);
 		});
@@ -160,7 +188,12 @@ describe('Find Custom Delivery Option', () => {
 					'Enjoy delivery of the newspaper to your home or office address. Note this is a postal delivery - expect delivery after the day of publication. If you would prefer to read the newspaper on the day of publication, purchase an FT ePaper subscription, our digital replica of the each daily edition.',
 			};
 
-			const deliveryOption = getDeliveryOption('N6D', stubOption, 'APAC');
+			const deliveryOption = getDeliveryOption(
+				'N6D',
+				stubOption,
+				'APAC',
+				'HKG'
+			);
 
 			expect(deliveryOption).toEqual(expected);
 		});

package/.github/settings.yml

@@ -1,11 +0,0 @@
-_extends: github-apps-config-next
-
-branches:
-  - name: main
-    protection:
-      required_pull_request_reviews: null
-      required_status_checks: null
-      enforce_admins: true
-      restrictions:
-        users: []
-        teams: []