From 4acac7cb9ed4666ba810c7cf24ccc02781dbe221 Mon Sep 17 00:00:00 2001 From: Sue Tairaku Date: Tue, 9 Jun 2026 11:52:16 -0700 Subject: [PATCH 1/2] PSP-11355 fix --- .../PrimaryContactSelectorView.tsx | 56 ++++++++ .../LeasePages/details/LeaseTeamView.tsx | 64 +++------ .../AcquisitionView.test.tsx.snap | 38 ++---- .../AcquisitionFileTabs.test.tsx.snap | 38 ++---- .../detail/AcquisitionSummaryView.tsx | 94 +++++--------- .../AcquisitionSummaryView.test.tsx.snap | 39 +++--- .../DispositionView.test.tsx.snap | 6 +- .../DispositionFileTabs.test.tsx.snap | 6 +- .../detail/DispositionSummaryView.tsx | 54 +++----- .../DispositionSummaryView.test.tsx.snap | 40 +++--- .../activity/detail/ActivityDetailSubView.tsx | 121 +++++++++++------- 11 files changed, 275 insertions(+), 281 deletions(-) create mode 100644 source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx diff --git a/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx b/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx new file mode 100644 index 0000000000..6a3884afe9 --- /dev/null +++ b/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx @@ -0,0 +1,56 @@ +import { FaExternalLinkAlt } from 'react-icons/fa'; + +import { SectionField } from '../../Section/SectionField'; +import { StyledLink } from '../../styles'; + +interface PrimaryContactSelectorViewProps { + label: string; + teamMemberName: string; + teamMemberUrl: string; + primaryContactName: string; + primaryContactUrl: string; + showPrimaryContact: boolean; + index?: number; + tooltip?: string; +} + +export const PrimaryContactSelectorView = ({ + label, + teamMemberName, + teamMemberUrl, + primaryContactName, + primaryContactUrl, + showPrimaryContact = false, + index = 0, + tooltip, +}: PrimaryContactSelectorViewProps) => ( + <> + + {teamMemberName && teamMemberUrl ? ( + + {teamMemberName} + + + ) : ( + '' + )} + + + {showPrimaryContact && ( + + {primaryContactName && primaryContactUrl ? ( + + {primaryContactName} + + + ) : ( + 'No contacts available' + )} + + )} + +); diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx b/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx index 50bfe92506..40844d77b9 100644 --- a/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx +++ b/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx @@ -1,11 +1,8 @@ import React from 'react'; -import { FaExternalLinkAlt } from 'react-icons/fa'; +import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; import { Section } from '@/components/common/Section/Section'; -import { SectionField } from '@/components/common/Section/SectionField'; -import { StyledLink } from '@/components/common/styles'; import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease'; -import { exists } from '@/utils'; import { formatApiPersonNames } from '@/utils/personUtils'; export interface ILeaseTeamProps { @@ -18,47 +15,26 @@ export const LeaseTeamView: React.FunctionComponent {lease.leaseTeam.map((teamMember, index) => ( - - - - {teamMember?.person - ? formatApiPersonNames(teamMember?.person) - : teamMember?.organization?.name ?? ''} - - - - - {exists(teamMember?.organizationId) && ( - - {teamMember?.primaryContactId ? ( - - - {teamMember?.primaryContact - ? formatApiPersonNames(teamMember.primaryContact) - : ''} - - - - ) : ( - 'No contacts available' - )} - - )} + teamMemberName={ + teamMember?.person + ? formatApiPersonNames(teamMember.person) + : teamMember?.organization?.name ?? '' + } + teamMemberUrl={ + teamMember?.personId + ? `/contact/P${teamMember?.personId}` + : `/contact/O${teamMember?.organizationId}` + } + primaryContactName={ + teamMember?.primaryContact ? formatApiPersonNames(teamMember.primaryContact) : '' + } + primaryContactUrl={ + teamMember?.primaryContactId ? `/contact/P${teamMember?.primaryContactId}` : undefined + } + showPrimaryContact={!!teamMember?.organizationId} + /> ))} diff --git a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap index f849b98154..8b2be1acab 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap @@ -338,6 +338,11 @@ exports[`AcquisitionView component > renders as expected 1`] = ` cursor: pointer; } +.c42 { + padding: 0 0.4rem; + display: block; +} + .c5.btn.btn-light.Button { padding: 0; border: 0.1rem solid #9F9D9C; @@ -672,7 +677,7 @@ exports[`AcquisitionView component > renders as expected 1`] = ` white-space: pre-line; } -.c42 { +.c45 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -1879,6 +1884,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
renders as expected 1`] = `
- - - - - - + No contacts available
matches snapshot 1`] = ` text-decoration: none; } +.c8 { + padding: 0 0.4rem; + display: block; +} + .c7.required::before { content: '*'; position: absolute; @@ -100,7 +105,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = ` font-weight: bold; } -.c8 { +.c10 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -782,6 +787,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
matches snapshot 1`] = `
matches snapshot 1`] = `
matches snapshot 1`] = `
matches snapshot 1`] = `
- - - - - - + No contacts available
matches snapshot 1`] = ` class="c7 text-left col" > = ({
{detail.acquisitionTeam.map((teamMember, index) => ( - - - {teamMember?.teamName} - - - - {teamMember?.organizationId && ( - - {teamMember?.primaryContactId ? ( - - {teamMember?.primaryContactName} - - - ) : ( - 'No contacts available' - )} - - )} + ))}
@@ -264,41 +247,22 @@ const AcquisitionSummaryView: React.FC = ({ {!!ownerSolicitors?.length && ownerSolicitors.map(ownerSolicitor => ( - - - - {ownerSolicitor?.personId - ? formatApiPersonNames(ownerSolicitor?.person) - : ownerSolicitor?.organization?.name ?? ''} - - - - - - {ownerSolicitor?.organization && ( - - {ownerSolicitor?.primaryContactId ? ( - - {formatApiPersonNames(ownerSolicitor.primaryContact)} - - - ) : ( - 'No contacts available' - )} - - )} + ))} {!!ownerRepresentatives?.length && diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap index 77c1157a9a..74985f84bd 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap @@ -13,6 +13,22 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` text-decoration: none; } +.c6 { + padding: 0 0.4rem; + display: block; +} + +.c5.required::before { + content: '*'; + position: absolute; + top: 0.75rem; + left: 0rem; +} + +.c4 { + font-weight: bold; +} + .c0 { background-color: #f2f2f2; padding-top: 1rem; @@ -38,22 +54,11 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` margin-bottom: 2.4rem; } -.c5.required::before { - content: '*'; - position: absolute; - top: 0.75rem; - left: 0rem; -} - -.c4 { - font-weight: bold; -} - .c8 { white-space: pre-line; } -.c6 { +.c9 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -665,6 +670,7 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
matches snapshot 1`] = `
renders as expected 1`] = ` class="pb-2 row" >
renders as expected 1`] = ` class="pb-2 row" >
matches snapshot 1`] = ` class="pb-2 row" >
matches snapshot 1`] = ` class="pb-2 row" >
{dispositionFile?.dispositionTeam?.map((teamMember, index) => ( - - - - {teamMember?.personId - ? formatApiPersonNames(teamMember?.person) - : teamMember?.organization?.name ?? ''} - - - - - {teamMember?.organizationId && ( - - {teamMember?.primaryContactId ? ( - - {formatApiPersonNames(teamMember?.primaryContact)} - - - ) : ( - 'No contacts available' - )} - - )} + teamMemberName={ + teamMember?.personId + ? formatApiPersonNames(teamMember?.person) + : teamMember?.organization?.name ?? '' + } + teamMemberUrl={ + teamMember?.personId + ? `/contact/P${teamMember?.personId}` + : `/contact/O${teamMember?.organizationId}` + } + primaryContactName={formatApiPersonNames(teamMember?.primaryContact)} + primaryContactUrl={`/contact/P${teamMember?.primaryContactId}`} + showPrimaryContact={!!teamMember?.organizationId} + > ))} diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap index 98aeaab2b7..09b27c5921 100644 --- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap @@ -6,7 +6,23 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = ` class="Toastify" />
- .c0 { + .c4.required::before { + content: '*'; + position: absolute; + top: 0.75rem; + left: 0rem; +} + +.c3 { + font-weight: bold; +} + +.c6 { + padding: 0 0.4rem; + display: block; +} + +.c0 { background-color: #f2f2f2; padding-top: 1rem; } @@ -31,22 +47,6 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = ` margin-bottom: 2.4rem; } -.c4.required::before { - content: '*'; - position: absolute; - top: 0.75rem; - left: 0rem; -} - -.c3 { - font-weight: bold; -} - -.c6 { - padding: 0 0.4rem; - display: block; -} -
@@ -481,7 +481,7 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = ` class="pb-2 row" >
matches snapshot 1`] = ` class="pb-2 row" >
x.managementActivitySubtypeCode).filter(exists) ?? []; + const getRequestorName = () => { + if (props.activity?.requestorPerson) { + return formatApiPersonNames(props.activity.requestorPerson); + } else if (props.activity?.requestorOrganization) { + return props.activity.requestorOrganization?.name; + } + return null; + }; + + const getRequestorContactLink = () => { + if (props.activity?.requestorPerson) { + return `/contact/P${props.activity.requestorPerson?.id}`; + } else if (props.activity?.requestorOrganization) { + return `/contact/O${props.activity.requestorOrganization?.id}`; + } + return null; + }; + return (
@@ -58,52 +75,64 @@ const PropertyActivityDetailsSubView: React.FunctionComponent< <>{contact.person !== null && } ))} - - <> - {exists(props.activity.requestorPerson) && ( - - )} - {exists(props.activity.requestorOrganization) && ( - - )} - - - {exists(props.activity.requestorPrimaryContactId) && ( - */} + {/* <> + {exists(props.activity.requestorPerson) && ( + + )} + {exists(props.activity.requestorOrganization) && ( + + )} + + + {exists(props.activity.requestorPrimaryContactId) && ( + + {props.activity?.requestorPrimaryContactId ? ( + - {props.activity?.requestorPrimaryContactId ? ( - - - {props.activity?.requestorPrimaryContactId - ? formatApiPersonNames(props.activity?.requestorPrimaryContact) - : ''} - - - - ) : ( - 'No contacts available' - )} - + + {props.activity?.requestorPrimaryContactId + ? formatApiPersonNames(props.activity?.requestorPrimaryContact) + : ''} + + + + ) : ( + 'No contacts available' )} - - {props.activity.involvedParties?.map(contact => ( - <> - {contact.person !== null && } - {contact.organization !== null && } - - ))} - + + )} + + {props.activity.involvedParties?.map(contact => ( + <> + {contact.person !== null && } + {contact.organization !== null && } + + ))} */} + <> {props.activity.serviceProviderPerson !== null && ( From cb54322bfecf86164085768b62a3378205032d08 Mon Sep 17 00:00:00 2001 From: Sue Tairaku Date: Thu, 11 Jun 2026 14:38:25 -0700 Subject: [PATCH 2/2] Correcting PR observations --- .../PrimaryContactSelectorView.tsx | 61 ++-- .../LeasePages/details/LeaseTeamView.tsx | 4 +- .../AcquisitionView.test.tsx.snap | 258 ++++++++------- .../AcquisitionFileTabs.test.tsx.snap | 252 ++++++++------- .../detail/AcquisitionSummaryView.tsx | 10 +- .../AcquisitionSummaryView.test.tsx.snap | 300 ++++++++++-------- .../DispositionView.test.tsx.snap | 146 +++++---- .../DispositionFileTabs.test.tsx.snap | 146 +++++---- .../detail/DispositionSummaryView.tsx | 6 +- .../DispositionSummaryView.test.tsx.snap | 146 +++++---- .../activity/detail/ActivityDetailSubView.tsx | 51 +-- 11 files changed, 720 insertions(+), 660 deletions(-) diff --git a/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx b/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx index 6a3884afe9..9105f2de83 100644 --- a/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx +++ b/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx @@ -1,9 +1,10 @@ import { FaExternalLinkAlt } from 'react-icons/fa'; +import styled from 'styled-components'; import { SectionField } from '../../Section/SectionField'; import { StyledLink } from '../../styles'; -interface PrimaryContactSelectorViewProps { +interface PrimaryContactSelectorDetailsProps { label: string; teamMemberName: string; teamMemberUrl: string; @@ -14,43 +15,51 @@ interface PrimaryContactSelectorViewProps { tooltip?: string; } -export const PrimaryContactSelectorView = ({ +export const PrimaryContactSelectorDetails = ({ label, teamMemberName, teamMemberUrl, primaryContactName, primaryContactUrl, - showPrimaryContact = false, - index = 0, + showPrimaryContact, + index, tooltip, -}: PrimaryContactSelectorViewProps) => ( +}: PrimaryContactSelectorDetailsProps) => ( <> - - {teamMemberName && teamMemberUrl ? ( - - {teamMemberName} - - - ) : ( - '' - )} - - - {showPrimaryContact && ( - - {primaryContactName && primaryContactUrl ? ( - - {primaryContactName} + + + {teamMemberName && teamMemberUrl ? ( + + {teamMemberName} ) : ( - 'No contacts available' + '' )} + + + {showPrimaryContact && ( + + + {primaryContactName && primaryContactUrl ? ( + + {primaryContactName} + + + ) : ( + 'No contacts available' + )} + + )} ); + +export const StyledDiv = styled.div` + font-style: italic; +`; diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx b/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx index 40844d77b9..356d1711d3 100644 --- a/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx +++ b/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; +import { PrimaryContactSelectorDetails } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; import { Section } from '@/components/common/Section/Section'; import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease'; import { formatApiPersonNames } from '@/utils/personUtils'; @@ -15,7 +15,7 @@ export const LeaseTeamView: React.FunctionComponent {lease.leaseTeam.map((teamMember, index) => ( - renders as expected 1`] = ` margin-bottom: 2.4rem; } -.c43 { +.c44 { color: #474543; font-size: 1.6rem; -webkit-text-decoration: none; @@ -338,7 +338,7 @@ exports[`AcquisitionView component > renders as expected 1`] = ` cursor: pointer; } -.c42 { +.c43 { padding: 0 0.4rem; display: block; } @@ -673,11 +673,15 @@ exports[`AcquisitionView component > renders as expected 1`] = ` max-width: 60rem; } -.c44 { - white-space: pre-line; +.c42 { + font-style: italic; } .c45 { + white-space: pre-line; +} + +.c46 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -1871,87 +1875,95 @@ exports[`AcquisitionView component > renders as expected 1`] = ` class="collapse show" >
- -
-
- + Negotiation agent: + +
+
- - Bob Billy Smith - - - - - + + Bob Billy Smith + + + + + +
- -
-
- + Negotiation agent: + +
+
- - Stinky Cheese - - - - - + + Stinky Cheese + + + + + +
@@ -1976,7 +1988,7 @@ exports[`AcquisitionView component > renders as expected 1`] = ` class="collapse show" >

Each property in this file should be owned by the owner(s) in this section

@@ -2087,7 +2099,7 @@ exports[`AcquisitionView component > renders as expected 1`] = ` class="c41 text-left col" >
456 Souris Street PO Box 250 @@ -2241,7 +2253,7 @@ Canada class="c41 text-left col" >
123 Main Street PO Box 123 @@ -2289,64 +2301,72 @@ Canada
- -
-
- + Owner solicitor: + +
+
- - Millennium Inc - - - - - + + Millennium Inc + + + + + +
- -
-
- No contacts available + +
+
+ No contacts available +
matches snapshot 1`] = ` margin-bottom: 2.4rem; } -.c9 { +.c10 { color: #474543; font-size: 1.6rem; -webkit-text-decoration: none; text-decoration: none; } -.c8 { +.c9 { padding: 0 0.4rem; display: block; } @@ -105,7 +105,11 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = ` font-weight: bold; } -.c10 { +.c8 { + font-style: italic; +} + +.c11 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -774,87 +778,95 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = ` class="collapse show" >
- -
-
- + Negotiation agent: + +
+
- - Bob Billy Smith - - - - - + + Bob Billy Smith + + + + + +
- -
-
- + Negotiation agent: + +
+
- - Stinky Cheese - - - - - + + Stinky Cheese + + + + + +
@@ -879,69 +891,77 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = ` class="collapse show" >

Each property in this file should be owned by the owner(s) in this section

- -
-
- + Owner solicitor: + +
+
- - Millennium Inc - - - - - + + Millennium Inc + + + + + +
- -
-
- No contacts available + +
+
+ No contacts available +
matches snapshot 1`] = ` class="c7 text-left col" > = ({
{detail.acquisitionTeam.map((teamMember, index) => ( - = ({ primaryContactName={teamMember?.primaryContactName} primaryContactUrl={`/contact/P${teamMember?.primaryContactId}`} showPrimaryContact={!!teamMember?.organizationId} - > + > ))}
@@ -247,7 +247,7 @@ const AcquisitionSummaryView: React.FC = ({ {!!ownerSolicitors?.length && ownerSolicitors.map(ownerSolicitor => ( - = ({ primaryContactName={formatApiPersonNames(ownerSolicitor.primaryContact)} primaryContactUrl={`/contact/P${ownerSolicitor?.primaryContactId}`} showPrimaryContact={!!ownerSolicitor?.organization} - > + > ))} {!!ownerRepresentatives?.length && diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap index 74985f84bd..eaee561ec2 100644 --- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap @@ -6,14 +6,14 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` class="Toastify" />
- .c7 { + .c8 { color: #474543; font-size: 1.6rem; -webkit-text-decoration: none; text-decoration: none; } -.c6 { +.c7 { padding: 0 0.4rem; display: block; } @@ -29,6 +29,10 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` font-weight: bold; } +.c6 { + font-style: italic; +} + .c0 { background-color: #f2f2f2; padding-top: 1rem; @@ -54,11 +58,11 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` margin-bottom: 2.4rem; } -.c8 { +.c9 { white-space: pre-line; } -.c9 { +.c10 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -657,87 +661,95 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` class="collapse show" >
- -
-
- + Negotiation agent: + +
+
- - Bob Billy Smith - - - - - + + Bob Billy Smith + + + + + +
- -
-
- + Negotiation agent: + +
+
- - Stinky Cheese - - - - - + + Stinky Cheese + + + + + +
@@ -762,7 +774,7 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` class="collapse show" >

Each property in this file should be owned by the owner(s) in this section

@@ -873,7 +885,7 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = ` class="c5 text-left col" >
456 Souris Street PO Box 250 @@ -1027,7 +1039,7 @@ Canada class="c5 text-left col" >
123 Main Street PO Box 123 @@ -1075,87 +1087,95 @@ Canada
- -
-
- + Owner solicitor: + +
+
- - Millennium Inc - - - - - + + Millennium Inc + + + + + +
- -
-
- + Primary contact: + +
+
- - Foo Bar Baz - - - - - + + Foo Bar Baz + + + + + +
renders as expected 1`] = ` cursor: pointer; } -.c42 { +.c43 { padding: 0 0.4rem; display: block; } @@ -669,6 +669,10 @@ exports[`DispositionView component > renders as expected 1`] = ` overflow-x: hidden; } +.c42 { + font-style: italic; +} + @media only screen and (max-width:1199px) { .c0.expanded { min-width: 70rem; @@ -1636,87 +1640,95 @@ exports[`DispositionView component > renders as expected 1`] = ` class="collapse show" >
- -
-
- + MoTI Solicitor: + +
+
- - Alejandro Sanchez - - - - - + + Alejandro Sanchez + + + + + +
- -
-
- + Negotiation agent: + +
+
- - Aman Monga - - - - - + + Aman Monga + + + + + +
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap index bf04b9adf2..fa9f9f0753 100644 --- a/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap @@ -82,7 +82,7 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = ` margin-bottom: 2.4rem; } -.c8 { +.c9 { padding: 0 0.4rem; display: block; } @@ -98,6 +98,10 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = ` font-weight: bold; } +.c8 { + font-style: italic; +} +
@@ -599,87 +603,95 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = ` class="collapse show" >
- -
-
- + MoTI Solicitor: + +
+
- - Alejandro Sanchez - - - - - + + Alejandro Sanchez + + + + + +
- -
-
- + Negotiation agent: + +
+
- - Aman Monga - - - - - + + Aman Monga + + + + + +
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx index 28fa98aedc..96bad6e386 100644 --- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx +++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx @@ -1,7 +1,7 @@ import { Fragment } from 'react'; import EditButton from '@/components/common/buttons/EditButton'; -import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; +import { PrimaryContactSelectorDetails } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; import { Section } from '@/components/common/Section/Section'; import { SectionField } from '@/components/common/Section/SectionField'; import { StyledEditWrapper, StyledSummarySection } from '@/components/common/Section/SectionStyles'; @@ -136,7 +136,7 @@ export const DispositionSummaryView: React.FunctionComponent {dispositionFile?.dispositionTeam?.map((teamMember, index) => ( - + > ))} diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap index 09b27c5921..c5e9c334e5 100644 --- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap +++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap @@ -17,11 +17,15 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = ` font-weight: bold; } -.c6 { +.c7 { padding: 0 0.4rem; display: block; } +.c6 { + font-style: italic; +} + .c0 { background-color: #f2f2f2; padding-top: 1rem; @@ -478,87 +482,95 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = ` class="collapse show" >
- -
-
- + MoTI Solicitor: + +
+
- - Alejandro Sanchez - - - - - + + Alejandro Sanchez + + + + + +
- -
-
- + Negotiation agent: + +
+
- - Aman Monga - - - - - + + Aman Monga + + + + + +
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx index 5370d243c1..6cff7a09dc 100644 --- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx +++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx @@ -3,7 +3,7 @@ import * as React from 'react'; import ContactLink from '@/components/common/ContactLink'; import { readOnlyMultiSelectStyle } from '@/components/common/form'; -import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; +import { PrimaryContactSelectorDetails } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView'; import { Section } from '@/components/common/Section/Section'; import { SectionField } from '@/components/common/Section/SectionField'; import { ApiGen_Base_CodeType } from '@/models/api/generated/ApiGen_Base_CodeType'; @@ -75,52 +75,7 @@ const PropertyActivityDetailsSubView: React.FunctionComponent< <>{contact.person !== null && } ))} - {/* */} - {/* <> - {exists(props.activity.requestorPerson) && ( - - )} - {exists(props.activity.requestorOrganization) && ( - - )} - - - {exists(props.activity.requestorPrimaryContactId) && ( - - {props.activity?.requestorPrimaryContactId ? ( - - - {props.activity?.requestorPrimaryContactId - ? formatApiPersonNames(props.activity?.requestorPrimaryContact) - : ''} - - - - ) : ( - 'No contacts available' - )} - - )} - - {props.activity.involvedParties?.map(contact => ( - <> - {contact.person !== null && } - {contact.organization !== null && } - - ))} */} - + > <> {props.activity.serviceProviderPerson !== null && (