Skip to content

PSP-11355: Visually associate primary contact and owning organization. #5331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
stairaku wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

PSP-11355: Visually associate primary contact and owning organization. #5331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4acac7c
PSP-11355 fix
stairaku Jun 9, 2026
a4511a0
Merge branch 'PSP-11355' of https://github.com/stairaku/PSP into PSP-…
stairaku Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions ...frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) => (
<>
<SectionField label={label} valueTestId={`teamMember[${index}]`} tooltip={tooltip}>
{teamMemberName && teamMemberUrl ? (
<StyledLink target="_blank" rel="noopener noreferrer" to={teamMemberUrl}>
<span>{teamMemberName}</span>
<FaExternalLinkAlt className="ml-2" size="1rem" />
</StyledLink>
) : (
''
)}
</SectionField>

{showPrimaryContact && (
<SectionField
label="Primary contact"
valueTestId={`primaryContact[${index}]`}
className="pl-4 mb-3"
>
{primaryContactName && primaryContactUrl ? (
<StyledLink target="_blank" rel="noopener noreferrer" to={primaryContactUrl}>
<span>{primaryContactName}</span>
<FaExternalLinkAlt className="ml-2" size="1rem" />
</StyledLink>
) : (
'No contacts available'
)}
</SectionField>
)}
</>
);
64 changes: 20 additions & 44 deletions source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -18,47 +15,26 @@ export const LeaseTeamView: React.FunctionComponent<React.PropsWithChildren<ILea
<Section header="Lease & Licence Team">
{lease.leaseTeam.map((teamMember, index) => (
<React.Fragment key={`lease-team-${teamMember?.id ?? index}`}>
<SectionField
<PrimaryContactSelectorView
label={teamMember?.teamProfileType.description || ''}
valueTestId={`teamMember[${index}]`}
>
<StyledLink
target="_blank"
rel="noopener noreferrer"
to={
teamMember?.personId
? `/contact/P${teamMember?.personId}`
: `/contact/O${teamMember?.organizationId}`
}
>
<span>
{teamMember?.person
? formatApiPersonNames(teamMember?.person)
: teamMember?.organization?.name ?? ''}
</span>
<FaExternalLinkAlt className="ml-2" size="1rem" />
</StyledLink>
</SectionField>
{exists(teamMember?.organizationId) && (
<SectionField label="Primary contact" valueTestId={`primaryContact[${index}]`}>
{teamMember?.primaryContactId ? (
<StyledLink
target="_blank"
rel="noopener noreferrer"
to={`/contact/P${teamMember?.primaryContactId}`}
>
<span>
{teamMember?.primaryContact
? formatApiPersonNames(teamMember.primaryContact)
: ''}
</span>
<FaExternalLinkAlt className="m1-2" size="1rem" />
</StyledLink>
) : (
'No contacts available'
)}
</SectionField>
)}
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}
/>
</React.Fragment>
))}
</Section>
Expand Down
38 changes: 13 additions & 25 deletions .../frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1879,6 +1884,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
</div>
<div
class="c41 text-left col"
data-testid="teamMember[0]"
>
<a
class="c42"
Expand Down Expand Up @@ -1920,6 +1926,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
</div>
<div
class="c41 text-left col"
data-testid="teamMember[0]"
>
<a
class="c42"
Expand Down Expand Up @@ -2295,6 +2302,7 @@ Canada
</div>
<div
class="c41 text-left col"
data-testid="teamMember[0]"
>
<a
class="c42"
Expand Down Expand Up @@ -2323,7 +2331,7 @@ Canada
</div>
</div>
<div
class="pb-2 row"
class="pl-4 mb-3 row"
>
<div
class="pr-0 text-left col-4"
Expand All @@ -2336,29 +2344,9 @@ Canada
</div>
<div
class="c41 text-left col"
data-testid="primaryContact[0]"
>
<a
class="c42"
href="/contact/P1"
rel="noopener noreferrer"
target="_blank"
>
<span />
<svg
class="m1-2"
fill="currentColor"
height="1rem"
stroke="currentColor"
stroke-width="0"
viewBox="0 0 512 512"
width="1rem"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M432,320H400a16,16,0,0,0-16,16V448H64V128H208a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H48A48,48,0,0,0,0,112V464a48,48,0,0,0,48,48H400a48,48,0,0,0,48-48V336A16,16,0,0,0,432,320ZM488,0h-128c-21.37,0-32.05,25.91-17,41l35.73,35.73L135,320.37a24,24,0,0,0,0,34L157.67,377a24,24,0,0,0,34,0L435.28,133.32,471,169c15,15,41,4.5,41-17V24A24,24,0,0,0,488,0Z"
/>
</svg>
</a>
No contacts available
</div>
</div>
<div
Expand All @@ -2377,7 +2365,7 @@ Canada
class="c41 text-left col"
>
<a
class="c42"
class="c45"
href="/contact/P2"
rel="noopener noreferrer"
target="_blank"
Expand Down
38 changes: 13 additions & 25 deletions .../src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
text-decoration: none;
}

.c8 {
padding: 0 0.4rem;
display: block;
}

.c7.required::before {
content: '*';
position: absolute;
Expand All @@ -100,7 +105,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
font-weight: bold;
}

.c8 {
.c10 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -782,6 +787,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
</div>
<div
class="c7 text-left col"
data-testid="teamMember[0]"
>
<a
class="c8"
Expand Down Expand Up @@ -823,6 +829,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
</div>
<div
class="c7 text-left col"
data-testid="teamMember[0]"
>
<a
class="c8"
Expand Down Expand Up @@ -890,6 +897,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
</div>
<div
class="c7 text-left col"
data-testid="teamMember[0]"
>
<a
class="c8"
Expand Down Expand Up @@ -918,7 +926,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
</div>
</div>
<div
class="pb-2 row"
class="pl-4 mb-3 row"
>
<div
class="pr-0 text-left col-4"
Expand All @@ -931,29 +939,9 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
</div>
<div
class="c7 text-left col"
data-testid="primaryContact[0]"
>
<a
class="c8"
href="/contact/P1"
rel="noopener noreferrer"
target="_blank"
>
<span />
<svg
class="m1-2"
fill="currentColor"
height="1rem"
stroke="currentColor"
stroke-width="0"
viewBox="0 0 512 512"
width="1rem"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M432,320H400a16,16,0,0,0-16,16V448H64V128H208a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H48A48,48,0,0,0,0,112V464a48,48,0,0,0,48,48H400a48,48,0,0,0,48-48V336A16,16,0,0,0,432,320ZM488,0h-128c-21.37,0-32.05,25.91-17,41l35.73,35.73L135,320.37a24,24,0,0,0,0,34L157.67,377a24,24,0,0,0,34,0L435.28,133.32,471,169c15,15,41,4.5,41-17V24A24,24,0,0,0,488,0Z"
/>
</svg>
</a>
No contacts available
</div>
</div>
<div
Expand All @@ -972,7 +960,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
class="c7 text-left col"
>
<a
class="c8"
class="c10"
href="/contact/P2"
rel="noopener noreferrer"
target="_blank"
Expand Down
Loading
Loading