From 216df612e6c63b5fd11debad9cd9220b67dc1aca Mon Sep 17 00:00:00 2001 From: Meis Date: Tue, 22 Oct 2024 13:14:23 -0600 Subject: [PATCH 01/11] task: [DisplayField] Change default `fallbackValue` to "Not applicable" --- src/pages/Filing/ViewInstitutionProfile/DisplayField.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/Filing/ViewInstitutionProfile/DisplayField.tsx b/src/pages/Filing/ViewInstitutionProfile/DisplayField.tsx index 94604b94e..f213e5d11 100644 --- a/src/pages/Filing/ViewInstitutionProfile/DisplayField.tsx +++ b/src/pages/Filing/ViewInstitutionProfile/DisplayField.tsx @@ -4,6 +4,8 @@ import type { ReactNode } from 'react'; import './DisplayField.less'; export const NOT_AVAILABLE = 'Not available'; +export const NOT_APPLICABLE = 'Not applicable'; +export const FALLBACK_BLANK = ''; export interface DisplayFieldProperties { label?: ReactNode; @@ -32,7 +34,7 @@ export function DisplayField({ DisplayField.defaultProps = { className: undefined, - fallbackValue: NOT_AVAILABLE, + fallbackValue: NOT_APPLICABLE, label: undefined, value: undefined, }; From e08e953c9d1580b49327804431ca29c6898c4b38 Mon Sep 17 00:00:00 2001 From: Meis Date: Tue, 22 Oct 2024 13:39:12 -0600 Subject: [PATCH 02/11] [FinancialInstitutionDetails] Update LEI displayed LEI status from "Active/Inactive" to "Issued/Lapsed" --- .../ViewInstitutionProfile/FinancialInstitutionDetails.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Filing/ViewInstitutionProfile/FinancialInstitutionDetails.tsx b/src/pages/Filing/ViewInstitutionProfile/FinancialInstitutionDetails.tsx index c7312eb24..840ba7a13 100644 --- a/src/pages/Filing/ViewInstitutionProfile/FinancialInstitutionDetails.tsx +++ b/src/pages/Filing/ViewInstitutionProfile/FinancialInstitutionDetails.tsx @@ -78,7 +78,7 @@ export function FinancialInstitutionDetails({ label={InstitutionDataLabels.leiStatus} value={ - {data.is_active ? 'Active' : 'Inactive'} + {data.is_active ? 'Issued' : 'Lapsed'} } /> From 5d2f5a9e4746598de6784a5c4f5bb854187ecb2a Mon Sep 17 00:00:00 2001 From: Meis Date: Tue, 22 Oct 2024 13:42:12 -0600 Subject: [PATCH 03/11] [FinancialInstitutionDetails] Display empty "Federal prudential regulator" value as "Not applicable" --- src/utils/formatting.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/utils/formatting.tsx b/src/utils/formatting.tsx index 85a75527b..503b3d23b 100644 --- a/src/utils/formatting.tsx +++ b/src/utils/formatting.tsx @@ -1,4 +1,7 @@ -import { NOT_AVAILABLE } from 'pages/Filing/ViewInstitutionProfile/DisplayField'; +import { + NOT_APPLICABLE, + NOT_AVAILABLE, +} from 'pages/Filing/ViewInstitutionProfile/DisplayField'; import type { DomainType, InstitutionDetailsApiType } from 'types/formTypes'; export const buildEmailDomainString = ( @@ -19,4 +22,4 @@ export const formatFederalRegulator = ( // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition data.primary_federal_regulator ? `${data.primary_federal_regulator.name} (${data.primary_federal_regulator.id})` - : NOT_AVAILABLE; + : NOT_APPLICABLE; From 2bd093c99fc3bd9b31190bf39221f1b8d15692be Mon Sep 17 00:00:00 2001 From: Meis Date: Tue, 22 Oct 2024 13:43:52 -0600 Subject: [PATCH 04/11] [FinancialInstitutionDetails] Display empty "Type of financial institution" and "Federal Taxpayer Identification Number (TIN)" value as BLANK --- .../IdentifyingInformation.tsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/Filing/ViewInstitutionProfile/IdentifyingInformation.tsx b/src/pages/Filing/ViewInstitutionProfile/IdentifyingInformation.tsx index 8561fcae4..bf3d88e68 100644 --- a/src/pages/Filing/ViewInstitutionProfile/IdentifyingInformation.tsx +++ b/src/pages/Filing/ViewInstitutionProfile/IdentifyingInformation.tsx @@ -5,9 +5,9 @@ import SectionIntro from 'components/SectionIntro'; import { WellContainer } from 'design-system-react'; import type { ReactNode } from 'react'; import type { InstitutionDetailsApiType } from 'types/formTypes'; -import { formatFederalRegulator, valueOrNotavailable } from 'utils/formatting'; +import { formatFederalRegulator } from 'utils/formatting'; import InstitutionDataLabels from '../formHelpers'; -import { DisplayField } from './DisplayField'; +import { DisplayField, FALLBACK_BLANK } from './DisplayField'; const defaultDescription = ( <> @@ -29,7 +29,7 @@ export function IdentifyingInformation({ }): JSX.Element { // TODO: Asking Le about 'Other' institution type/detail in mock data and the ending period // https://github.com/cfpb/sbl-frontend/issues/137 - const institutionTypeNamesArray = data.sbl_institution_types.map( + const institutionTypeNamesArray = data.sbl_institution_types?.map( institutionType => { let name = ''; if (typeof institutionType === 'string') name = institutionType; @@ -45,16 +45,19 @@ export function IdentifyingInformation({ }, ); - const institutionTypeNamesString = valueOrNotavailable( - institutionTypeNamesArray.join(', '), - ); + const institutionTypeNamesString = + institutionTypeNamesArray?.join(', ') || FALLBACK_BLANK; return ( {description} - + From 42bfac0f366fb0c8306c4fdcfe73b8c041f07daa Mon Sep 17 00:00:00 2001 From: Meis Date: Tue, 22 Oct 2024 13:52:01 -0600 Subject: [PATCH 05/11] [FinancialInstitutionDetails] Display empty string "Top-holding Parent Entity LEI" and "Immediate Parent Entity LEI" value as "Not applicable" --- .../ViewInstitutionProfile/AffiliateInformation.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/Filing/ViewInstitutionProfile/AffiliateInformation.tsx b/src/pages/Filing/ViewInstitutionProfile/AffiliateInformation.tsx index 37cded1ae..5d60517dd 100644 --- a/src/pages/Filing/ViewInstitutionProfile/AffiliateInformation.tsx +++ b/src/pages/Filing/ViewInstitutionProfile/AffiliateInformation.tsx @@ -7,7 +7,7 @@ import type { ReactNode } from 'react'; import type { InstitutionDetailsApiType } from 'types/formTypes'; import InstitutionDataLabels from '../formHelpers'; import './AffiliateInformation.less'; -import { DisplayField } from './DisplayField'; +import { DisplayField, NOT_APPLICABLE } from './DisplayField'; const defaultDescription = ( <> @@ -41,7 +41,8 @@ export function AffiliateInformation({ /> Date: Tue, 22 Oct 2024 13:59:42 -0600 Subject: [PATCH 06/11] [useAuthHeaderLinks] Fix "missing key" issue --- src/utils/useHeaderAuthLinks.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/useHeaderAuthLinks.tsx b/src/utils/useHeaderAuthLinks.tsx index 2f2176f9c..84ed8baab 100644 --- a/src/utils/useHeaderAuthLinks.tsx +++ b/src/utils/useHeaderAuthLinks.tsx @@ -30,7 +30,7 @@ export const useHeaderAuthLinks = (): ReactElement[] => { {auth.user?.profile.name ?? auth.user?.profile.email ?? 'User profile'} , -