@financial-times/n-conversion-forms 23.0.2 → 23.0.5

package/.circleci/config.yml

@@ -22,13 +22,13 @@ references:
 
   npm_cache_keys: &npm_cache_keys
     keys:
-        - v2-dependency-npm-{{ checksum "package.json" }}-
-        - v2-dependency-npm-{{ checksum "package.json" }}
-        - v2-dependency-npm-
+        - v3-dependency-npm-{{ checksum "package.json" }}-
+        - v3-dependency-npm-{{ checksum "package.json" }}
+        - v3-dependency-npm-
 
   cache_npm_cache: &cache_npm_cache
     save_cache:
-        key: v2-dependency-npm-{{ checksum "package.json" }}-{{ epoch }}
+        key: v3-dependency-npm-{{ checksum "package.json" }}-{{ epoch }}
         paths:
         - ./node_modules/
 

package/build-state/npm-shrinkwrap.json

@@ -14,7 +14,7 @@
         "classnames": "2.3.1",
         "fetchres": "1.7.2",
         "lodash.get": "4.4.2",
-        "n-common-static-data": "financial-times/n-common-static-data#v1.6.1"
+        "n-common-static-data": "github:Financial-Times/n-common-static-data#v1.7.1"
       },
       "devDependencies": {
         "@babel/cli": "^7.10.5",
@@ -25134,9 +25134,11 @@
     },
     "node_modules/n-common-static-data": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/financial-times/n-common-static-data.git#f20f8476d37b1694134c4bc5ba72bfeb75ea2565",
+      "resolved": "git+ssh://git@github.com/Financial-Times/n-common-static-data.git#bc4ac35d786ed747f026a5e131dd1ce80d746d6a",
+      "hasInstallScript": true,
       "engines": {
-        "node": "^6.11.0"
+        "node": "12.x || 14.x || 16.x",
+        "npm": "7.x || 8.x"
       }
     },
     "node_modules/nan": {
@@ -56318,8 +56320,8 @@
       }
     },
     "n-common-static-data": {
-      "version": "git+ssh://git@github.com/financial-times/n-common-static-data.git#f20f8476d37b1694134c4bc5ba72bfeb75ea2565",
-      "from": "n-common-static-data@financial-times/n-common-static-data#v1.6.1"
+      "version": "git+ssh://git@github.com/Financial-Times/n-common-static-data.git#bc4ac35d786ed747f026a5e131dd1ce80d746d6a",
+      "from": "n-common-static-data@github:Financial-Times/n-common-static-data#v1.7.1"
     },
     "nan": {
       "version": "2.15.0",

package/components/position.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { demographics } from 'n-common-static-data';
-const defaultOptions = demographics.positions.positions;
+import { b2b, demographics } from 'n-common-static-data';
+const B2CPositions = demographics.positions.positions;
+const B2BPositions = b2b.demographics.positions.positions;
 
 export function Position ({
 	value,
@@ -11,7 +12,8 @@ export function Position ({
 	fieldId = 'positionField',
 	selectId = 'position',
 	selectName = 'position',
-	options = defaultOptions,
+	isB2B = false,
+	options = isB2B ? B2BPositions : B2CPositions,
 	isRequired = true,
 	fieldLabel = 'What’s your job position?',
 }) {
@@ -70,6 +72,7 @@ Position.propTypes = {
 	fieldId: PropTypes.string,
 	selectId: PropTypes.string,
 	selectName: PropTypes.string,
+	isB2B: PropTypes.bool,
 	options: PropTypes.arrayOf(
 		PropTypes.shape({
 			code: PropTypes.string,

package/components/position.spec.js

@@ -1,7 +1,7 @@
 import { Position } from './index';
 import { expectToRenderCorrectly } from '../test-jest/helpers/expect-to-render-correctly';
 import { demographics } from 'n-common-static-data';
-const defaultOptions = demographics.positions.positions;
+const B2CPositions = demographics.positions.positions;
 
 import Enzyme, { mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
@@ -12,7 +12,7 @@ expect.extend(expectToRenderCorrectly);
 describe('Position', () => {
 	it('render a select with a label', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CPositions,
 		};
 
 		expect(Position).toRenderCorrectly(props);
@@ -20,7 +20,7 @@ describe('Position', () => {
 
 	it('can render an initial selected value', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CPositions,
 			value: 'CP',
 		};
 
@@ -29,7 +29,7 @@ describe('Position', () => {
 
 	it('can render a disable select', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CPositions,
 			isDisabled: true,
 		};
 
@@ -38,7 +38,7 @@ describe('Position', () => {
 
 	it('can render an error message', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CPositions,
 			hasError: true,
 		};
 
@@ -68,4 +68,14 @@ describe('Position', () => {
 			component.find('.o-forms-title.o-forms-field--optional').length
 		).toEqual(1);
 	});
+
+	it('defaults to B2B options if isB2B is true', () => {
+		const props = { isB2B: true };
+		const component = mount(Position(props));
+
+		// Look for an option which is only present in the default B2B data set and not in the B2C one.
+		const optionValue = component.find('option').at(1).instance().value;
+
+		expect(optionValue).toBe('OW');
+	});
 });

package/components/responsibility.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { demographics } from 'n-common-static-data';
-const defaultOptions = demographics.responsibilities.responsibilities;
+import { b2b, demographics } from 'n-common-static-data';
+const B2CResponsibilities = demographics.responsibilities.responsibilities;
+const B2BResponsibilities = b2b.demographics.responsibilities.responsibilities;
 
 export function Responsibility ({
 	value,
@@ -12,7 +13,8 @@ export function Responsibility ({
 	fieldId = 'responsibilityField',
 	selectId = 'responsibility',
 	selectName = 'responsibility',
-	options = defaultOptions,
+	isB2B = false,
+	options = isB2B ? B2BResponsibilities : B2CResponsibilities,
 	fieldLabel = 'Which best describes your job responsibility?',
 }) {
 	const inputWrapperClassName = classNames([
@@ -72,6 +74,7 @@ Responsibility.propTypes = {
 	fieldId: PropTypes.string,
 	selectId: PropTypes.string,
 	selectName: PropTypes.string,
+	isB2B: PropTypes.bool,
 	options: PropTypes.arrayOf(
 		PropTypes.shape({
 			code: PropTypes.string,

package/components/responsibility.spec.js

@@ -1,7 +1,7 @@
 import { Responsibility } from './index';
 import { expectToRenderCorrectly } from '../test-jest/helpers/expect-to-render-correctly';
 import { demographics } from 'n-common-static-data';
-const defaultOptions = demographics.responsibilities.responsibilities;
+const B2CResponsibilities = demographics.responsibilities.responsibilities;
 
 import Enzyme, { mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
@@ -12,7 +12,7 @@ expect.extend(expectToRenderCorrectly);
 describe('Responsibility', () => {
 	it('render a select with a label', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CResponsibilities,
 		};
 
 		expect(Responsibility).toRenderCorrectly(props);
@@ -20,7 +20,7 @@ describe('Responsibility', () => {
 
 	it('can render an initial selected value', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CResponsibilities,
 			value: 'FIN',
 		};
 
@@ -29,7 +29,7 @@ describe('Responsibility', () => {
 
 	it('can render a disable select', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CResponsibilities,
 			isDisabled: true,
 		};
 
@@ -38,7 +38,7 @@ describe('Responsibility', () => {
 
 	it('can render an error message', () => {
 		const props = {
-			options: defaultOptions,
+			options: B2CResponsibilities,
 			hasError: true,
 		};
 
@@ -74,4 +74,14 @@ describe('Responsibility', () => {
 			component.find('.o-forms-title.o-forms-field--optional').length
 		).toEqual(1);
 	});
+
+	it('defaults to B2B options if isB2B is true', () => {
+		const props = { isB2B: true };
+		const component = mount(Responsibility(props));
+
+		// Look for an option which is only present in the default B2B data set and not in the B2C one.
+		const optionValue = component.find('option').at(1).instance().value;
+
+		expect(optionValue).toBe('ACC');
+	});
 });

package/dist/position.js

@@ -15,7 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _nCommonStaticData = require("n-common-static-data");
 
-var defaultOptions = _nCommonStaticData.demographics.positions.positions;
+var B2CPositions = _nCommonStaticData.demographics.positions.positions;
+var B2BPositions = _nCommonStaticData.b2b.demographics.positions.positions;
 
 function Position(_ref) {
   var value = _ref.value,
@@ -29,8 +30,10 @@ function Position(_ref) {
       selectId = _ref$selectId === void 0 ? 'position' : _ref$selectId,
       _ref$selectName = _ref.selectName,
       selectName = _ref$selectName === void 0 ? 'position' : _ref$selectName,
+      _ref$isB2B = _ref.isB2B,
+      isB2B = _ref$isB2B === void 0 ? false : _ref$isB2B,
       _ref$options = _ref.options,
-      options = _ref$options === void 0 ? defaultOptions : _ref$options,
+      options = _ref$options === void 0 ? isB2B ? B2BPositions : B2CPositions : _ref$options,
       _ref$isRequired = _ref.isRequired,
       isRequired = _ref$isRequired === void 0 ? true : _ref$isRequired,
       _ref$fieldLabel = _ref.fieldLabel,
@@ -81,6 +84,7 @@ Position.propTypes = {
   fieldId: _propTypes["default"].string,
   selectId: _propTypes["default"].string,
   selectName: _propTypes["default"].string,
+  isB2B: _propTypes["default"].bool,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     code: _propTypes["default"].string,
     description: _propTypes["default"].string

package/dist/responsibility.js

@@ -15,7 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _nCommonStaticData = require("n-common-static-data");
 
-var defaultOptions = _nCommonStaticData.demographics.responsibilities.responsibilities;
+var B2CResponsibilities = _nCommonStaticData.demographics.responsibilities.responsibilities;
+var B2BResponsibilities = _nCommonStaticData.b2b.demographics.responsibilities.responsibilities;
 
 function Responsibility(_ref) {
   var value = _ref.value,
@@ -31,8 +32,10 @@ function Responsibility(_ref) {
       selectId = _ref$selectId === void 0 ? 'responsibility' : _ref$selectId,
       _ref$selectName = _ref.selectName,
       selectName = _ref$selectName === void 0 ? 'responsibility' : _ref$selectName,
+      _ref$isB2B = _ref.isB2B,
+      isB2B = _ref$isB2B === void 0 ? false : _ref$isB2B,
       _ref$options = _ref.options,
-      options = _ref$options === void 0 ? defaultOptions : _ref$options,
+      options = _ref$options === void 0 ? isB2B ? B2BResponsibilities : B2CResponsibilities : _ref$options,
       _ref$fieldLabel = _ref.fieldLabel,
       fieldLabel = _ref$fieldLabel === void 0 ? 'Which best describes your job responsibility?' : _ref$fieldLabel;
   var inputWrapperClassName = (0, _classnames["default"])(['o-forms-input', 'o-forms-input--select', {
@@ -81,6 +84,7 @@ Responsibility.propTypes = {
   fieldId: _propTypes["default"].string,
   selectId: _propTypes["default"].string,
   selectName: _propTypes["default"].string,
+  isB2B: _propTypes["default"].bool,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     code: _propTypes["default"].string,
     description: _propTypes["default"].string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "23.0.2",
+  "version": "23.0.5",
   "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": {
@@ -29,7 +29,7 @@
     "classnames": "2.3.1",
     "fetchres": "1.7.2",
     "lodash.get": "4.4.2",
-    "n-common-static-data": "financial-times/n-common-static-data#v1.6.1"
+    "n-common-static-data": "github:Financial-Times/n-common-static-data#v1.7.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.5",