Update for multi-variable organization schema

client/components/domains/registrant-extra-info/fr-schema.json

@@ -24,7 +24,8 @@
 						}
 					},
 					"organization": { "$ref": "#/definitions/empty" }
-				}
+				},
+				"formField": "organization"
 			}
 		}
 	},

client/components/domains/registrant-extra-info/fr-validate-contact-details.js

@@ -16,33 +16,44 @@ import validationSchema from './fr-schema';
 
 const debug = debugFactory( 'calypso:components:domains:registrant-extra-info:validation' );
 
-const ajv = new Ajv( { messages: false } );
+const ajv = new Ajv( { messages: false, extendRefs: true, verbose: true } );
 ajv.addMetaSchema( draft04 );
 const validate = ajv.compile( validationSchema );
 
 const schemaPathFilterRegex = /anyOf\/\d+/;
 
+export function inferFormField( { keyword, params, dataPath } ) {
+	const possiblePathAddition =
+		keyword === 'required' && params && params.missingProperty
+			? `.${ params.missingProperty }`
+			: '';
+
+	return ( dataPath + possiblePathAddition ).slice( 1 );
+}
+
 /*
  * @returns errors by field, like: { 'extra.field: name, errors: [ string ] }
  */
 export default function validateContactDetails( contactDetails ) {
 	// Populate validate.errors
 	const valid = validate( contactDetails );
-	valid && debug( validate.errors );
+	valid || debug( validate.errors );
 
 	return reduce(
 		validate.errors,
-		( accumulatedErrors, { dataPath, keyword, schemaPath } ) => {
+		( accumulatedErrors, validationError ) => {
 			// Drop '.' prefix
-			const path = dataPath.slice( 1 );
+			const { keyword, schemaPath, schema } = validationError;
 
 			if ( schemaPathFilterRegex.test( schemaPath ) ) {
 				return accumulatedErrors;
 			}
 
+			const formFieldPath = schema.formField || inferFormField( validationError );
+
 			const appendThisMessage = before => [ ...( before || [] ), keyword ];
 
-			return update( accumulatedErrors, path, appendThisMessage );
+			return update( accumulatedErrors, formFieldPath, appendThisMessage );
 		},
 		{}
 	);

client/components/domains/registrant-extra-info/test/fr-validate-contact-details.js

@@ -246,8 +246,7 @@ describe( 'validateContactDetails', () => {
 
 		test( 'should reject SIRET for VAT', () => {
 			realSiretNumbers.forEach( ( [ registrantVatId ] ) => {
-				const testDetails = Object.assign( {}, contactDetails, { extra: { registrantVatId } } );
-
+				const testDetails = contactWithExtraProperty( 'registrantVatId', registrantVatId );
 				const result = validateContactDetails( testDetails );
 				expect( result, `expected to reject '${ registrantVatId }'` )
 					.to.have.property( 'extra' )
@@ -288,7 +287,7 @@ describe( 'validateContactDetails', () => {
 
 		test( 'should reject our bad SIRET examples', () => {
 			badTrademarkNumbers.forEach( ( [ trademarkNumber ] ) => {
-				const testDetails = Object.assign( {}, contactDetails, { extra: { trademarkNumber } } );
+				const testDetails = contactWithExtraProperty( 'trademarkNumber', trademarkNumber );
 
 				const result = validateContactDetails( testDetails );
 				expect( result, `expected to reject '${ trademarkNumber }'` )