diff --git a/services/app-web/src/components/Breadcrumbs/Breadcrumb.test.tsx b/services/app-web/src/components/Breadcrumbs/Breadcrumb.test.tsx index 0d2f75e223..4b63fdcce8 100644 --- a/services/app-web/src/components/Breadcrumbs/Breadcrumb.test.tsx +++ b/services/app-web/src/components/Breadcrumbs/Breadcrumb.test.tsx @@ -17,11 +17,11 @@ describe('Breadcrumbs', () => { const items = [ { text: 'First link', link: '/firstlink' }, { text: 'Second link', link: '/secondlink' }, - { text: 'Active link, no href needed' }, + { text: 'Active link', link: '/thirdlink' }, ] renderWithProviders() expect(screen.getAllByRole('listitem')).toHaveLength(items.length) - expect(screen.getAllByRole('link')).toHaveLength(items.length - 1) + expect(screen.getAllByRole('link')).toHaveLength(items.length) }) it('renders nothing if no items passed in', () => { diff --git a/services/app-web/src/components/Breadcrumbs/Breadcrumbs.module.scss b/services/app-web/src/components/Breadcrumbs/Breadcrumbs.module.scss index da76fe841d..9b299a4edf 100644 --- a/services/app-web/src/components/Breadcrumbs/Breadcrumbs.module.scss +++ b/services/app-web/src/components/Breadcrumbs/Breadcrumbs.module.scss @@ -1,5 +1,14 @@ +@import '../../styles/uswdsImports.scss'; + .crumbContainer { margin-top: 1em; margin-bottom: 1em; background: none; + + [class^='usa-breadcrumb'] { + li:last-child a { + text-decoration: none; + color: $theme-color-base-ink; + } + } } diff --git a/services/app-web/src/components/Breadcrumbs/Breadcrumbs.stories.tsx b/services/app-web/src/components/Breadcrumbs/Breadcrumbs.stories.tsx index 5a92b2d6af..b8a9531691 100644 --- a/services/app-web/src/components/Breadcrumbs/Breadcrumbs.stories.tsx +++ b/services/app-web/src/components/Breadcrumbs/Breadcrumbs.stories.tsx @@ -20,6 +20,6 @@ Default.args = { items: [ { text: 'First link', link: '/firstlink' }, { text: 'Second link', link: '/secondlink' }, - { text: 'Active link, no href needed' }, + { text: 'Active link', link: '/thirdlink' }, ], } diff --git a/services/app-web/src/components/Breadcrumbs/Breadcrumbs.tsx b/services/app-web/src/components/Breadcrumbs/Breadcrumbs.tsx index bf5568010e..25a3f30fb1 100644 --- a/services/app-web/src/components/Breadcrumbs/Breadcrumbs.tsx +++ b/services/app-web/src/components/Breadcrumbs/Breadcrumbs.tsx @@ -4,7 +4,7 @@ import styles from './Breadcrumbs.module.scss' type BreadcrumbItem = { text: string - link?: string + link: string } export type BreadcrumbsProps = { items: BreadcrumbItem[] @@ -12,21 +12,13 @@ export type BreadcrumbsProps = { const Crumb = (crumb: BreadcrumbItem) => { const { link, text } = crumb - if (link) { - return ( - - - {text} - - - ) - } else { - return ( - + return ( + + {text} - - ) - } + + + ) } const Breadcrumbs = ({ items }: BreadcrumbsProps) => { diff --git a/services/app-web/src/pages/MccrsId/MccrsId.module.scss b/services/app-web/src/pages/MccrsId/MccrsId.module.scss index caf6b3d3c9..8a91e3c479 100644 --- a/services/app-web/src/pages/MccrsId/MccrsId.module.scss +++ b/services/app-web/src/pages/MccrsId/MccrsId.module.scss @@ -11,6 +11,8 @@ max-width: 20rem; margin: 0 auto; } + + } .formContainer.tableContainer { diff --git a/services/app-web/src/pages/MccrsId/MccrsId.tsx b/services/app-web/src/pages/MccrsId/MccrsId.tsx index ef995ef9d6..2e40e12af7 100644 --- a/services/app-web/src/pages/MccrsId/MccrsId.tsx +++ b/services/app-web/src/pages/MccrsId/MccrsId.tsx @@ -176,7 +176,10 @@ export const MccrsId = (): React.ReactElement => { link: `/submissions/${id}`, text: pkgName || '', }, - { text: 'MC-CRS record number' }, + { + text: 'MC-CRS record number', + link: `/submissions/${id}/mccrs-record-number`, + }, ]} /> { text: 'Dashboard', }, { link: `/submissions/${id}`, text: packageName }, - { text: 'Add questions' }, + { + text: 'Add questions', + link: RoutesRecord.SUBMISSIONS_UPLOAD_QUESTION, + }, ]} /> diff --git a/services/app-web/src/pages/QuestionResponse/UploadResponse/UploadResponse.tsx b/services/app-web/src/pages/QuestionResponse/UploadResponse/UploadResponse.tsx index f0c3d12bba..df8d0735ff 100644 --- a/services/app-web/src/pages/QuestionResponse/UploadResponse/UploadResponse.tsx +++ b/services/app-web/src/pages/QuestionResponse/UploadResponse/UploadResponse.tsx @@ -114,7 +114,10 @@ export const UploadResponse = () => { text: 'Dashboard', }, { link: `/submissions/${id}`, text: packageName }, - { text: 'Add response' }, + { + text: 'Add response', + link: RoutesRecord.SUBMISSIONS_UPLOAD_RESPONSE, + }, ]} /> diff --git a/services/app-web/src/pages/SubmissionSummary/SubmissionSummary.tsx b/services/app-web/src/pages/SubmissionSummary/SubmissionSummary.tsx index 2c2d53cc8e..2164285714 100644 --- a/services/app-web/src/pages/SubmissionSummary/SubmissionSummary.tsx +++ b/services/app-web/src/pages/SubmissionSummary/SubmissionSummary.tsx @@ -104,6 +104,10 @@ export const SubmissionSummary = (): React.ReactElement => { const handleDocumentDownloadError = (error: boolean) => setDocumentError(error) + const editOrAddMCCRSID = pkg.mccrsID + ? 'Edit MC-CRS number' + : 'Add MC-CRS record number' + return (
{ MC-CRS record number: {pkg.mccrsID} @@ -179,10 +184,9 @@ export const SubmissionSummary = (): React.ReactElement => { className={ pkg.mccrsID ? styles.editLink : '' } + aria-label={editOrAddMCCRSID} > - {pkg.mccrsID - ? 'Edit MC-CRS number' - : 'Add MC-CRS record number'} + {editOrAddMCCRSID}
) : undefined