Skip to content
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.

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

[Fix][Filing landing] Associated institution links - Avoid "list" styles at mobile screen sizes #340

Merged
merged 17 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1c623e5
[Fix][Filing landing] Associated institution links - Avoid "list" sty…
meissadia Mar 29, 2024
42e98ec
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 1, 2024
91d7074
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 1, 2024
959ee86
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 1, 2024
a50238a
Merge branch '339-homepage-institution-links' of https://github.com/c…
meissadia Apr 1, 2024
ac14c95
[Page][Authenticated Landing] Add 15px margin between associated inst…
meissadia Apr 1, 2024
50928c1
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 1, 2024
74d9372
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 4, 2024
a49a18a
feat: Shared AssociatedInstitutionList phase 1
meissadia Apr 4, 2024
745a5f5
feat: Shared AssociatedInstitutionList phase 2
meissadia Apr 4, 2024
13bd16e
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 4, 2024
9ba7313
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 9, 2024
17b8bed
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 10, 2024
8229cd9
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 22, 2024
86af900
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 24, 2024
503c8cd
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 25, 2024
9d510ba
Merge branch 'main' into 339-homepage-institution-links
meissadia Apr 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
73 changes: 47 additions & 26 deletions src/components/AssociatedInstitution.tsx
Original file line number Diff line number Diff line change
@@ -1,40 +1,61 @@
/* eslint-disable react/require-default-props */
import { Link } from 'components/Link';
import { Icon, ListItem } from 'design-system-react';
import type { InstitutionDetailsApiType } from 'types/formTypes';

interface FirstLast {
isFirst?: boolean;
isLast?: boolean;
}

export function AssociatedInstitution({
name,
lei,
}: InstitutionDetailsApiType): JSX.Element {
let displayText = null;
isFirst,
isLast,
}: FirstLast & InstitutionDetailsApiType): JSX.Element {
let baseStylesLink = `inline-block w-full border-pacific visited:border-teal border-dashed border-0 border-t-[1px] py-[.625rem]`;
if (isLast) baseStylesLink += ' border-b-[1px]';

// Generate the Institution's label
if (name && lei) displayText = `${name} | ${lei}`;
else if (!name && !lei)
displayText = 'Missing institution details; please contact support staff';
else if (!lei)
displayText = `"${name}" has no LEI; please contact support staff`;
else if (!name) displayText = lei;
let desktopStylesLink = 'lg:border-0 lg:pb-0';
if (isFirst) desktopStylesLink += ' lg:pt-0';
if (isLast) desktopStylesLink += ' lg:pb-0';

// Do we have enough info to link to the Institution's details page?
const institutionLabel = lei ? (
<Link href={`/institution/${lei}`} type='list'>
{displayText}
</Link>
) : (
<span>{displayText}</span>
);
// Error
if (!name || !lei)
return (
<ListItem key={lei} className='associated-institution my-0'>
<Link
href='mailto:SBLHelp@cfpb.gov?subject=[BETA] Associated institutions: Missing "Name" or "LEI"'
className={`${baseStylesLink} ${desktopStylesLink} font-medium`}
>
<Icon
className='mr-[5px] text-[#20aa3f]'
isPresentational
name='approved'
withBg
/>
<span className='mr-[10px] font-normal text-[#101820]'>Approved</span>
Missing institution details, email our support staff.
</Link>
</ListItem>
);

return (
<ListItem key={lei} className='associated-institution'>
<Icon
className='mr-[5px] text-[#20aa3f]'
isPresentational
name='approved'
withBg
/>
<span className='mr-[10px] font-normal'>Approved</span>
{institutionLabel}
<ListItem key={lei} className='associated-institution my-0'>
<Link
href={lei ? `/institution/${lei}` : `/404`}
className={`${baseStylesLink} ${desktopStylesLink} font-medium`}
>
<Icon
className='mr-[5px] text-[#20aa3f]'
isPresentational
name='approved'
withBg
/>
<span className='mr-[10px] font-normal text-[#101820]'>Approved</span>
{`${name} | ${lei}`}
</Link>
</ListItem>
);
}
Expand Down
44 changes: 44 additions & 0 deletions src/components/AssociatedInstitutionList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/* eslint-disable react/require-default-props */
import { List } from 'design-system-react';
import type { JSXElement } from 'design-system-react/dist/types/jsxElement';
import type { ReactElement } from 'react';
import type { InstitutionDetailsApiType } from 'types/formTypes';
import { One } from 'utils/constants';
import { AssociatedInstitution } from './AssociatedInstitution';

function AssociatedInstitutionList({
institutions,
className = '',
children,
}: {
institutions?: InstitutionDetailsApiType[] | undefined;
className?: string;
children?: (JSX.Element | ReactElement)[] | JSX.Element | ReactElement;
}): JSXElement {
if (children)
return (
<List isLinks className={`institution-list ${className}`}>
{children}
</List>
);

if (!institutions || institutions.length === 0) return null;
const lastIndex = institutions.length - One;

return (
<List isLinks className={`institution-list ${className}`}>
{institutions.map((object, index) => {
return (
<AssociatedInstitution
{...object}
key={object.lei}
isFirst={index === 0}
isLast={index === lastIndex}
/>
);
})}
</List>
);
}

export default AssociatedInstitutionList;
4 changes: 0 additions & 4 deletions src/pages/AuthenticatedLanding/Landing.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
}
}

.institution-list {
margin-top: 15px;
}

.additional-resources {
ul {
padding-left: 0;
Expand Down
57 changes: 32 additions & 25 deletions src/pages/AuthenticatedLanding/ReviewInstitutions.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import AssociatedInstitution from 'components/AssociatedInstitution';
import { Alert, Heading, List, Paragraph } from 'design-system-react';
import AssociatedInstitutionList from 'components/AssociatedInstitutionList';
import { Alert, Heading, Paragraph } from 'design-system-react';
import type { InstitutionDetailsApiType } from 'types/formTypes';
import { SubsectionWrapper } from './SubsectionWrapper';

Expand All @@ -10,31 +10,40 @@ export function ReviewInstitutions({
institutions: InstitutionDetailsApiType[] | undefined;
error: boolean | string | null;
}): JSX.Element {
let institutionList = [];
let institutionList: JSX.Element | JSX.Element[];
const hasInstitutions = (institutions?.length ?? 0) > 0;
const sharedStyles = 'u-mt15';

if (error) {
institutionList = [
<Alert
isFieldLevel
key='query-error'
status='error'
message='There was an error loading your associated financial institutions'
/>,
];
institutionList = (
<AssociatedInstitutionList className={sharedStyles}>
<Alert
isFieldLevel
key='query-error'
status='error'
message='There was an error loading your associated financial institutions'
/>
</AssociatedInstitutionList>
);
} else if (hasInstitutions) {
institutionList = institutions.map(object => (
<AssociatedInstitution key={object.lei} {...object} />
));
institutionList = (
<AssociatedInstitutionList
institutions={institutions}
className={sharedStyles}
key='institutions'
/>
);
} else {
institutionList = [
<Alert
isFieldLevel
key='no-associations'
status='warning'
message='You have no associated institutions.'
/>,
];
institutionList = (
<AssociatedInstitutionList className={sharedStyles}>
<Alert
isFieldLevel
key='no-associations'
status='warning'
message='You have no associated institutions.'
/>
</AssociatedInstitutionList>
);
}

return (
Expand All @@ -48,9 +57,7 @@ export function ReviewInstitutions({
your financial institution to view or update your financial institution
profile.
</Paragraph>
<List isLinks className='institution-list'>
{institutionList}
</List>
{institutionList}
</SubsectionWrapper>
);
}
Expand Down
10 changes: 3 additions & 7 deletions src/pages/Filing/ViewUserProfile/AssociatedInstitutions.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AssociatedInstitution } from 'components/AssociatedInstitution';
import AssociatedInstitutionList from 'components/AssociatedInstitutionList';
import { Link } from 'components/Link';
import SectionIntro from 'components/SectionIntro';
import { List, WellContainer } from 'design-system-react';
import { WellContainer } from 'design-system-react';
import type { InstitutionDetailsApiType } from 'types/formTypes';

export default function AssociatedInstitutions({
Expand Down Expand Up @@ -32,11 +32,7 @@ export default function AssociatedInstitutions({
</SectionIntro>

<WellContainer className='u-mt30'>
<List isLinks className='institution-list'>
{associatedInstitutions.map(object => (
<AssociatedInstitution {...object} key={object.lei} />
))}
</List>
<AssociatedInstitutionList institutions={associatedInstitutions} />
</WellContainer>
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const config = {
stepIndicatorIncomplete: '#D2D3D5',
inProgressUploadValidation: '#43484E',
labelHelper: '#43484E',
pacific: '#0072CE', // TODO: Integrate DS color vars
teal: '#257675',
},
fontFamily: {
inter: ['Inter', ...defaultConfig.theme.fontFamily.sans],
Expand Down