@financial-times/n-conversion-forms 32.8.0 → 32.10.0

package/components/position.jsx

@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { b2b, demographics } from 'n-common-static-data';
-const B2CPositions = demographics.positions.positions;
-const B2BPositions = b2b.demographics.positions.positions;
+import { demographics } from 'n-common-static-data';
 
 export function Position({
 	value,
@@ -12,8 +10,7 @@ export function Position({
 	fieldId = 'positionField',
 	selectId = 'position',
 	selectName = 'position',
-	isB2B = false,
-	options = isB2B ? B2BPositions : B2CPositions,
+	options = demographics.positions.positions,
 	isRequired = true,
 	fieldLabel = 'What’s your job position?',
 }) {
@@ -28,6 +25,8 @@ export function Position({
 		{ 'o-forms-field--optional': !isRequired },
 	]);
 
+	options.sort((a, b) => a.description.localeCompare(b.description));
+
 	return (
 		<label
 			id={fieldId}
@@ -72,7 +71,6 @@ 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.stories.js

@@ -21,3 +21,6 @@ Basic.args = {
 		},
 	],
 };
+
+export const Default = (args) => <Position {...args} />;
+Default.args = {};

package/components/responsibility.jsx

@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { b2b, demographics } from 'n-common-static-data';
-const B2CResponsibilities = demographics.responsibilities.responsibilities;
-const B2BResponsibilities = b2b.demographics.responsibilities.responsibilities;
+import { demographics } from 'n-common-static-data';
 
 export function Responsibility({
 	value,
@@ -13,8 +11,7 @@ export function Responsibility({
 	fieldId = 'responsibilityField',
 	selectId = 'responsibility',
 	selectName = 'responsibility',
-	isB2B = false,
-	options = isB2B ? B2BResponsibilities : B2CResponsibilities,
+	options = demographics.responsibilities.responsibilities,
 	fieldLabel = 'Which best describes your job responsibility?',
 }) {
 	const inputWrapperClassName = classNames([
@@ -28,6 +25,8 @@ export function Responsibility({
 		{ 'o-forms-field--optional': !isRequired },
 	]);
 
+	options.sort((a, b) => a.description.localeCompare(b.description));
+
 	return (
 		<label
 			id={fieldId}
@@ -74,7 +73,6 @@ 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

@@ -74,14 +74,4 @@ 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/components/responsibility.stories.js

@@ -26,3 +26,6 @@ Basic.args = {
 		},
 	],
 };
+
+export const Default = (args) => <Responsibility {...args} />;
+Default.args = {};

package/dist/industry.jsx

@@ -34,6 +34,9 @@ function Industry(_ref) {
   var fieldTitleClassName = (0, _classnames["default"])(['o-forms-title', {
     'o-forms-field--optional': !isRequired
   }]);
+  options.sort(function (a, b) {
+    return a.description.localeCompare(b.description);
+  });
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: fieldId,
     className: "o-forms-field ncf__validation-error",

package/dist/position.jsx

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _nCommonStaticData = require("n-common-static-data");
-var B2CPositions = _nCommonStaticData.demographics.positions.positions;
-var B2BPositions = _nCommonStaticData.b2b.demographics.positions.positions;
 function Position(_ref) {
   var value = _ref.value,
     _ref$isDisabled = _ref.isDisabled,
@@ -23,10 +21,8 @@ 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 ? isB2B ? B2BPositions : B2CPositions : _ref$options,
+    options = _ref$options === void 0 ? _nCommonStaticData.demographics.positions.positions : _ref$options,
     _ref$isRequired = _ref.isRequired,
     isRequired = _ref$isRequired === void 0 ? true : _ref$isRequired,
     _ref$fieldLabel = _ref.fieldLabel,
@@ -37,6 +33,9 @@ function Position(_ref) {
   var fieldTitleClassName = (0, _classnames["default"])(['o-forms-title', {
     'o-forms-field--optional': !isRequired
   }]);
+  options.sort(function (a, b) {
+    return a.description.localeCompare(b.description);
+  });
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: fieldId,
     className: "o-forms-field ncf__validation-error",
@@ -76,7 +75,6 @@ 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.jsx

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _nCommonStaticData = require("n-common-static-data");
-var B2CResponsibilities = _nCommonStaticData.demographics.responsibilities.responsibilities;
-var B2BResponsibilities = _nCommonStaticData.b2b.demographics.responsibilities.responsibilities;
 function Responsibility(_ref) {
   var value = _ref.value,
     _ref$isDisabled = _ref.isDisabled,
@@ -25,10 +23,8 @@ 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 ? isB2B ? B2BResponsibilities : B2CResponsibilities : _ref$options,
+    options = _ref$options === void 0 ? _nCommonStaticData.demographics.responsibilities.responsibilities : _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', {
@@ -37,6 +33,9 @@ function Responsibility(_ref) {
   var fieldTitleClassName = (0, _classnames["default"])(['o-forms-title', {
     'o-forms-field--optional': !isRequired
   }]);
+  options.sort(function (a, b) {
+    return a.description.localeCompare(b.description);
+  });
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: fieldId,
     className: "o-forms-field ncf__validation-error",
@@ -76,7 +75,6 @@ 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,10 +1,11 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "32.8.0",
+  "version": "32.10.0",
   "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": {
     "test": "dotcom-tool-kit test:local",
+    "test:update-snapshots": "NODE_ENV=test jest --updateSnapshot",
     "prepare": "snyk-protect || snyk-protect -d || true",
     "build": "npm run clean && dotcom-tool-kit build:local",
     "start": "dotcom-tool-kit run:local",
@@ -29,7 +30,7 @@
     "classnames": "2.3.2",
     "fetchres": "1.7.2",
     "lodash.get": "4.4.2",
-    "n-common-static-data": "github:Financial-Times/n-common-static-data#v2.2.0"
+    "n-common-static-data": "github:Financial-Times/n-common-static-data#v2.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.22.15",
@@ -40,11 +41,10 @@
     "@dotcom-tool-kit/component": "^4.0.4",
     "@dotcom-tool-kit/eslint": "^3.1.3",
     "@dotcom-tool-kit/frontend-app": "^3.1.9",
-    "@dotcom-tool-kit/husky-npm": "^4.1.0",
     "@dotcom-tool-kit/jest": "^3.2.0",
-    "@dotcom-tool-kit/lint-staged": "^4.1.3",
+    "@dotcom-tool-kit/lint-staged-npm": "^3.1.6",
     "@dotcom-tool-kit/logger": "^3.1.1",
-    "@dotcom-tool-kit/prettier": "^3.1.3",
+    "@dotcom-tool-kit/prettier": "^3.1.6",
     "@financial-times/eslint-config-next": "^6.0.0",
     "@financial-times/jest-browser-resolver": "^1.0.2",
     "@snyk/protect": "1.1193.0",
@@ -58,10 +58,10 @@
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.7",
     "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-jest": "^27.2.3",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.31.1",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-jest": "^27.6.1",
+    "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-storybook": "^0.6.13",
     "fetch-mock": "^7.2.0",
     "html-webpack-plugin": "^5.5.3",
@@ -72,8 +72,6 @@
     "jsdom-global": "^3.0.2",
     "lint-staged": "^13.0.4",
     "pa11y-ci": "2.4.2",
-    "prettier": "^2.4.1",
-    "pretty-quick": "^3.1.3",
     "prop-types": "15.7.2",
     "react": "16.14.0",
     "react-dom": "16.14.0",
@@ -89,13 +87,13 @@
     "npm": "7.x || 8.x || 9.x"
   },
   "lint-staged": {
-    "**/*.{js,jsx,json,scss}": "prettier --write",
-    "**/*.{js,jsx}": "eslint --fix"
+    "**/*.{js,jsx,json,scss}": "dotcom-tool-kit format:staged test:staged --"
   },
   "husky": {
     "hooks": {
       "commit-msg": "dotcom-tool-kit git:commitmsg",
-      "pre-commit": "pretty-quick --staged && dotcom-tool-kit git:precommit"
+      "pre-commit": "dotcom-tool-kit git:precommit",
+      "pre-push": "dotcom-tool-kit test:local"
     }
   },
   "peerDependencies": {