From 80dba3d1329fffe5455c4531d4e46c2415e5b3cb Mon Sep 17 00:00:00 2001 From: Edoardo Lincetto Date: Sun, 30 Oct 2022 13:29:33 +0100 Subject: [PATCH] fix: organization prop contactPoint (#1070) --- cypress/e2e/organization.spec.js | 4 ++-- cypress/schemas/organization-schema.js | 4 ++-- e2e/pages/jsonld/organization/organization.tsx | 2 +- src/jsonld/organization.tsx | 7 ++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cypress/e2e/organization.spec.js b/cypress/e2e/organization.spec.js index 4e9d6e43..78b01520 100644 --- a/cypress/e2e/organization.spec.js +++ b/cypress/e2e/organization.spec.js @@ -30,7 +30,7 @@ describe('Organization JSON-LD', () => { postalCode: '95129', addressCountry: 'US', }, - contactPoints: [ + contactPoint: [ { '@type': 'ContactPoint', contactType: 'customer service', @@ -75,7 +75,7 @@ describe('Organization JSON-LD', () => { addressCountry: 'France', }, ], - contactPoints: [ + contactPoint: [ { '@type': 'ContactPoint', contactType: 'customer service', diff --git a/cypress/schemas/organization-schema.js b/cypress/schemas/organization-schema.js index c0801d16..21230f9e 100644 --- a/cypress/schemas/organization-schema.js +++ b/cypress/schemas/organization-schema.js @@ -49,7 +49,7 @@ const organization110 = { description: "Array of Organization's URL's, usually social urls like instagram, facebook etc.", }, - contactPoints: { + contactPoint: { type: 'array', items: { ...contactPoint100.schema, @@ -73,7 +73,7 @@ const organization110 = { legalName: 'Purple Fox LLC', name: 'Purple Fox', address: [address100.example], - contactPoints: [contactPoint100.example], + contactPoint: [contactPoint100.example], sameAs: ['https://www.orange-fox.com'], url: 'https://www.purpule-fox.io/', }, diff --git a/e2e/pages/jsonld/organization/organization.tsx b/e2e/pages/jsonld/organization/organization.tsx index 3fe92240..5a368de8 100644 --- a/e2e/pages/jsonld/organization/organization.tsx +++ b/e2e/pages/jsonld/organization/organization.tsx @@ -19,7 +19,7 @@ function Organization() { postalCode: '95129', addressCountry: 'US', }} - contactPoints={[ + contactPoint={[ { contactType: 'customer service', telephone: '+1-877-746-0909', diff --git a/src/jsonld/organization.tsx b/src/jsonld/organization.tsx index 5f8d8dfc..44d01c05 100644 --- a/src/jsonld/organization.tsx +++ b/src/jsonld/organization.tsx @@ -14,7 +14,11 @@ export interface OrganizationJsonLdProps extends JsonLdProps { legalName?: string; sameAs?: string[]; address?: Address | Address[]; + /** + * @deprecated please use contactPoint instead. contactPoints will continue to work until next major release. + */ contactPoints?: ContactPoint[]; + contactPoint?: ContactPoint[]; } function OrganizationJsonLd({ @@ -22,12 +26,13 @@ function OrganizationJsonLd({ keyOverride, address, contactPoints, + contactPoint, ...rest }: OrganizationJsonLdProps) { const data = { ...rest, address: setAddress(address), - contactPoints: setContactPoints(contactPoints), + contactPoint: setContactPoints(contactPoint || contactPoints), }; return (