From 3cce0a056c68a2ced39385b696592c3c529fe060 Mon Sep 17 00:00:00 2001 From: Chris Hopkins Date: Thu, 31 Oct 2024 13:54:16 +0000 Subject: [PATCH] Add contact consent to sandbox --- .../ContactDetails/ConsentDetails.jsx | 71 +++++++------- .../__test__/transformers.test.js | 72 ++++++++++++++ .../Contacts/ContactDetails/transformers.js | 18 ++++ .../cypress/specs/DIT/companies-spec.js | 2 +- .../cypress/specs/contacts/details-spec.js | 8 ++ .../fixtures/v3/contact/contact-by-id-uk.json | 77 ++++++++------- .../contact/contact-complete-details-uk.json | 93 ++++++++++--------- 7 files changed, 223 insertions(+), 118 deletions(-) create mode 100644 src/client/modules/Contacts/ContactDetails/__test__/transformers.test.js create mode 100644 src/client/modules/Contacts/ContactDetails/transformers.js diff --git a/src/client/modules/Contacts/ContactDetails/ConsentDetails.jsx b/src/client/modules/Contacts/ContactDetails/ConsentDetails.jsx index e24d183ea5a..f327d9e1346 100644 --- a/src/client/modules/Contacts/ContactDetails/ConsentDetails.jsx +++ b/src/client/modules/Contacts/ContactDetails/ConsentDetails.jsx @@ -3,51 +3,44 @@ import React from 'react' import Table from '@govuk-react/table' import { SummaryTable } from '../../../components' +import { transformContactConsents } from './transformers' -const getConsentRows = (consentData) => { - const domainGroupedConsent = Object.groupBy( - consentData, - ({ consentDomain }) => consentDomain - ) - const domainRows = Object.entries(domainGroupedConsent).map((domain) => { - { - const domainTitle = domain[0] - const domainTopics = domain[1] - return domainTopics.map((topic, index) => ( - - {index == 0 && {domainTitle}} - {topic.topic} - - {topic.emailContactConsent || topic.telephoneContactConsent - ? 'Yes' - : 'No'} - +const ConsentTableRows = ({ consents }) => ( + <> + + Domain + Topic + Consent Given + + + {consents.map((consent) => + consent.topics.map((topic) => ( + + {consent.domain} + {topic.name} + {topic.consent ? 'Yes' : 'No'} )) - } - }) + )} + +) +const ConsentDetails = ({ contact }) => { + const consents = transformContactConsents(contact) return ( - <> - - Domain - Topic - Consent Given - - {domainRows} - + + {consents ? ( + + ) : ( + + No consent data is available for this contact + + )} + ) } -const ConsentDetails = ({ contact }) => ( - - {contact.consentData ? ( - getConsentRows(contact.consentData) - ) : ( - - No consent data is available for this contact - - )} - -) export default ConsentDetails diff --git a/src/client/modules/Contacts/ContactDetails/__test__/transformers.test.js b/src/client/modules/Contacts/ContactDetails/__test__/transformers.test.js new file mode 100644 index 00000000000..06d45071d9d --- /dev/null +++ b/src/client/modules/Contacts/ContactDetails/__test__/transformers.test.js @@ -0,0 +1,72 @@ +import 'core-js/proposals/array-grouping-v2' +import { transformContactConsents } from '../transformers' + +describe('transformContactConsents', () => { + context('When a falsey contact is passed', () => { + it('Should return undefined', () => { + expect(transformContactConsents(undefined)).to.be.undefined + }) + }) + context('When a contact has no consent data', () => { + it('Should return undefined', () => { + expect(transformContactConsents({})).to.be.undefined + }) + }) + context('When a contact with a single unique value for domain', () => { + it('Should return a single domain with a single topic', () => { + expect( + transformContactConsents({ + consentData: [ + { + topic: 'Topic 1', + sourceSystem: 'System A', + consentDomain: 'International', + emailContactConsent: false, + telephoneContactConsent: false, + }, + ], + }) + ).to.deep.equal([ + { + domain: 'International', + topics: [{ consent: false, name: 'Topic 1' }], + }, + ]) + }) + }) + context('When a contact has multiple values for domain', () => { + it('Should return a single domain with multiple topics', () => { + expect( + transformContactConsents({ + consentData: [ + { + topic: 'Topic 1', + sourceSystem: 'System A', + consentDomain: 'International', + emailContactConsent: false, + telephoneContactConsent: false, + }, + { + topic: 'Topic 2', + sourceSystem: 'System A', + consentDomain: 'International', + emailContactConsent: false, + telephoneContactConsent: true, + }, + ], + }) + ).to.deep.equal([ + { + domain: 'International', + topics: [ + { consent: false, name: 'Topic 1' }, + { + consent: true, + name: 'Topic 2', + }, + ], + }, + ]) + }) + }) +}) diff --git a/src/client/modules/Contacts/ContactDetails/transformers.js b/src/client/modules/Contacts/ContactDetails/transformers.js new file mode 100644 index 00000000000..484f2198533 --- /dev/null +++ b/src/client/modules/Contacts/ContactDetails/transformers.js @@ -0,0 +1,18 @@ +export const transformContactConsents = (contact) => { + if (!contact || !contact.consentData) { + return undefined + } + + const domainGroupedConsent = Object.groupBy( + contact.consentData, + ({ consentDomain }) => consentDomain + ) + + return Object.entries(domainGroupedConsent).map((domain) => ({ + domain: domain[0], + topics: domain[1].map((topic) => ({ + consent: topic.emailContactConsent || topic.telephoneContactConsent, + name: topic.topic, + })), + })) +} diff --git a/test/end-to-end/cypress/specs/DIT/companies-spec.js b/test/end-to-end/cypress/specs/DIT/companies-spec.js index bc140513164..5964b0e8809 100644 --- a/test/end-to-end/cypress/specs/DIT/companies-spec.js +++ b/test/end-to-end/cypress/specs/DIT/companies-spec.js @@ -49,7 +49,7 @@ describe('Contacts', () => { cy.contains('You have successfully added a new contact Company Contact') - assertKeyValueTable('bodyMainContent', { + assertKeyValueTable('contact-details-table', { 'Job title': 'Coffee machine operator', 'Phone number': '44 0778877778800', Address: '100 Path, A town, 12345, United States', diff --git a/test/functional/cypress/specs/contacts/details-spec.js b/test/functional/cypress/specs/contacts/details-spec.js index a0a95bc13da..c59f5f791bb 100644 --- a/test/functional/cypress/specs/contacts/details-spec.js +++ b/test/functional/cypress/specs/contacts/details-spec.js @@ -60,6 +60,10 @@ describe('View contact details', () => { .should('have.attr', 'href', contacts.edit(completeUKContact.id)) }) + it('should render consent table with consent data', () => { + cy.get('[data-test=no-contact-consents]').should('not.exist') + }) + it('should render the archive container', () => { cy.get('[data-test=archive-contact-container]').should('exist') cy.get('[data-test=archive-header]') @@ -204,6 +208,10 @@ describe('View contact details', () => { }) }) + it('should render consent table without consent data', () => { + cy.get('[data-test=no-contact-consents]').should('exist') + }) + it('should not render the Edit Contact button', () => { cy.get('[data-test=edit-contact-button]').should('not.exist') }) diff --git a/test/sandbox/fixtures/v3/contact/contact-by-id-uk.json b/test/sandbox/fixtures/v3/contact/contact-by-id-uk.json index 323ff2911d8..b3eef423adb 100644 --- a/test/sandbox/fixtures/v3/contact/contact-by-id-uk.json +++ b/test/sandbox/fixtures/v3/contact/contact-by-id-uk.json @@ -1,43 +1,50 @@ { - "id":"f3d19ea7-d4cf-43e0-8e97-755c57cae313", - "title":null, - "first_name":"Joseph", - "last_name":"Woof", - "name":"Joseph Woof", - "job_title":"Dog master", - "company":{ - "name":"Zboncak Group|271eb29e-425b-4cd8-b386-3208c3a5f978", - "id":"4cd4128b-1bad-4f1e-9146-5d4678c6a018" + "id": "f3d19ea7-d4cf-43e0-8e97-755c57cae313", + "title": null, + "first_name": "Joseph", + "last_name": "Woof", + "name": "Joseph Woof", + "job_title": "Dog master", + "company": { + "name": "Zboncak Group|271eb29e-425b-4cd8-b386-3208c3a5f978", + "id": "4cd4128b-1bad-4f1e-9146-5d4678c6a018" }, - "adviser":{ - "name":"DBT Staff", - "first_name":"DBT", - "last_name":"Staff", - "id":"7d19d407-9aec-4d06-b190-d3f404627f21" + "adviser": { + "name": "DBT Staff", + "first_name": "DBT", + "last_name": "Staff", + "id": "7d19d407-9aec-4d06-b190-d3f404627f21" }, - "primary":true, - "telephone_countrycode":"", - "telephone_number":"", - "full_telephone_number":"222 3453454", - "email":"contact@bob.com", - "address_same_as_company":false, + "primary": true, + "telephone_countrycode": "", + "telephone_number": "", + "full_telephone_number": "222 3453454", + "email": "contact@bob.com", + "address_same_as_company": false, "address_1": null, - "address_2":null, - "address_town":null, - "address_county":null, + "address_2": null, + "address_town": null, + "address_county": null, "address_country": { "id": "80756b9a-5d95-e211-a939-e4115bead28a" }, - "address_postcode":"E14 8RJ", - "telephone_alternative":null, - "email_alternative":null, - "notes":null, - "accepts_dit_email_marketing":false, - "archived":false, - "archived_documents_url_path":"/document/123", - "archived_on":null, - "archived_reason":null, - "archived_by":null, - "created_on":"2019-02-04T15:59:14.267412Z", - "modified_on":"2019-02-05T13:17:23.112153Z" + "address_postcode": "E14 8RJ", + "telephone_alternative": null, + "email_alternative": null, + "notes": null, + "accepts_dit_email_marketing": false, + "archived": false, + "archived_documents_url_path": "/document/123", + "archived_on": null, + "archived_reason": null, + "archived_by": null, + "created_on": "2019-02-04T15:59:14.267412Z", + "modified_on": "2019-02-05T13:17:23.112153Z", + "consent_data": [ + { + "source_system": "System A", + "consent_domain": "Domestic", + "consent": false + } + ] } diff --git a/test/sandbox/fixtures/v3/contact/contact-complete-details-uk.json b/test/sandbox/fixtures/v3/contact/contact-complete-details-uk.json index 5874086a9c2..954ea12b46f 100644 --- a/test/sandbox/fixtures/v3/contact/contact-complete-details-uk.json +++ b/test/sandbox/fixtures/v3/contact/contact-complete-details-uk.json @@ -1,44 +1,51 @@ { - "id":"2676ea91-9dd7-4cf3-a4a3-67b06f841b54", - "title":null, - "first_name":"Joseph", - "last_name":"Woof", - "name":"Joseph Woof", - "job_title":"Dog master", - "company":{ - "name":"Zboncak Group|271eb29e-425b-4cd8-b386-3208c3a5f978", - "id":"4cd4128b-1bad-4f1e-9146-5d4678c6a018" - }, - "adviser":{ - "name":"DBT Staff", - "first_name":"DBT", - "last_name":"Staff", - "id":"7d19d407-9aec-4d06-b190-d3f404627f21" - }, - "primary":true, - "telephone_countrycode":"", - "telephone_number":"", - "full_telephone_number":"222 3453454", - "email":"contact@bob.com", - "address_same_as_company":false, - "address_1":"123 Test Street", - "address_2":"Address Line 2", - "address_town":"Sandbox Town", - "address_county":"Test County", - "address_country": { - "id": "80756b9a-5d95-e211-a939-e4115bead28a", - "name": "United Kingdom" - }, - "address_postcode":"AB1 2CD", - "telephone_alternative":null, - "email_alternative":null, - "notes":"An example of a contact for testing purposes", - "accepts_dit_email_marketing":true, - "archived":false, - "archived_documents_url_path":"/document/123", - "archived_on":null, - "archived_reason":null, - "archived_by":null, - "created_on":"2019-02-04T15:59:14.267412Z", - "modified_on":"2019-02-05T13:17:23.112153Z" - } + "id": "2676ea91-9dd7-4cf3-a4a3-67b06f841b54", + "title": null, + "first_name": "Joseph", + "last_name": "Woof", + "name": "Joseph Woof", + "job_title": "Dog master", + "company": { + "name": "Zboncak Group|271eb29e-425b-4cd8-b386-3208c3a5f978", + "id": "4cd4128b-1bad-4f1e-9146-5d4678c6a018" + }, + "adviser": { + "name": "DBT Staff", + "first_name": "DBT", + "last_name": "Staff", + "id": "7d19d407-9aec-4d06-b190-d3f404627f21" + }, + "primary": true, + "telephone_countrycode": "", + "telephone_number": "", + "full_telephone_number": "222 3453454", + "email": "contact@bob.com", + "address_same_as_company": false, + "address_1": "123 Test Street", + "address_2": "Address Line 2", + "address_town": "Sandbox Town", + "address_county": "Test County", + "address_country": { + "id": "80756b9a-5d95-e211-a939-e4115bead28a", + "name": "United Kingdom" + }, + "address_postcode": "AB1 2CD", + "telephone_alternative": null, + "email_alternative": null, + "notes": "An example of a contact for testing purposes", + "accepts_dit_email_marketing": true, + "archived": false, + "archived_documents_url_path": "/document/123", + "archived_on": null, + "archived_reason": null, + "archived_by": null, + "created_on": "2019-02-04T15:59:14.267412Z", + "modified_on": "2019-02-05T13:17:23.112153Z", + "consent_data": [ + { + "source_system": "System B", + "consent_domain": "International", + "consent": true + } + ] +}