Skip to content

Commit

Permalink
set all breadcrumbs where uswds is absent to false
Browse files Browse the repository at this point in the history
Signed-off-by: Micah Chiang <micahkchiang@gmail.com>
  • Loading branch information
micahchiang committed Mar 11, 2024
1 parent 4272186 commit 414e69a
Show file tree
Hide file tree
Showing 22 changed files with 469 additions and 535 deletions.
2 changes: 1 addition & 1 deletion src/applications/ask-va/components/BreadCrumbs.jsx
Expand Up @@ -17,7 +17,7 @@ const BreadCrumbs = ({ currentLocation }) => {
const breadcrumbLinks = breadcrumbsDictionary[adjustedLocation];

return (
<va-breadcrumbs label="Breadcrumbs">
<va-breadcrumbs label="Breadcrumbs" uswds="false">
{breadcrumbLinks.map(link => (
<a href={link.href} key={link.key}>
{link.title}
Expand Down
2 changes: 1 addition & 1 deletion src/applications/debt-letters/components/DebtDetails.jsx
Expand Up @@ -57,7 +57,7 @@ const DebtDetails = ({ selectedDebt, debts }) => {

return (
<div className="vads-u-display--flex vads-u-flex-direction--column">
<VaBreadcrumbs label="Breadcrumb">
<VaBreadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
<a href="/manage-va-debt">Manage your VA debt</a>
<a href="/manage-va-debt/your-debt">Your VA debt</a>
Expand Down
Expand Up @@ -24,7 +24,7 @@ const DebtLettersDownload = ({
return (
<div className="vads-l-row large-screen:vads-u-margin-x--neg2p5">
<div className="vads-u-font-family--sans">
<VaBreadcrumbs label="Breadcrumb">
<VaBreadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
<a href="/manage-va-debt">Manage your VA debt</a>
<a href="/manage-va-debt/your-debt">Your debt</a>
Expand Down
Expand Up @@ -112,7 +112,7 @@ const DebtLettersSummary = ({ isError, isVBMSError, debts, debtLinks }) => {

return (
<>
<VaBreadcrumbs label="Breadcrumb">
<VaBreadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
<a href="/manage-va-debt">Manage your VA debt</a>
<a href="/manage-va-debt/your-debt">Your VA debt</a>
Expand Down
19 changes: 7 additions & 12 deletions src/applications/disability-benefits/2346/containers/App.jsx
Expand Up @@ -65,7 +65,7 @@ class App extends Component {
<>
{!featureToggles.loading && (
<div className="large-screen:vads-u-padding-left--0 vads-u-padding-left--2">
<VaBreadcrumbs label="Breadcrumb">
<VaBreadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
{/* this will get updated when this route is added */}
<a href="/health-care">Health care</a>
Expand All @@ -80,13 +80,11 @@ class App extends Component {
Loading your information...
</va-loading-indicator>
)}
{isError &&
!pending &&
isLoggedIn && (
<div className="row vads-u-margin-bottom--3">
<ErrorMessage />
</div>
)}
{isError && !pending && isLoggedIn && (

Check failure on line 83 in src/applications/disability-benefits/2346/containers/App.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/disability-benefits/2346/containers/App.jsx:83:20:Replace `·!pending·&&` with `⏎··········!pending·&&⏎·········`
<div className="row vads-u-margin-bottom--3">

Check failure on line 84 in src/applications/disability-benefits/2346/containers/App.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/disability-benefits/2346/containers/App.jsx:84:1:Insert `··`
<ErrorMessage />

Check failure on line 85 in src/applications/disability-benefits/2346/containers/App.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/disability-benefits/2346/containers/App.jsx:85:13:Insert `··`
</div>

Check failure on line 86 in src/applications/disability-benefits/2346/containers/App.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/disability-benefits/2346/containers/App.jsx:86:11:Insert `··`
)}

Check failure on line 87 in src/applications/disability-benefits/2346/containers/App.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/disability-benefits/2346/containers/App.jsx:87:1:Insert `··`
{showMainContent && (
<RoutedSavableApp formConfig={formConfig} currentLocation={location}>
{children}
Expand All @@ -108,7 +106,4 @@ const mapDispatchToProps = dispatch => ({
...bindActionCreators({ fetchFormStatus }, dispatch),
});

export default connect(
mapStateToProps,
mapDispatchToProps,
)(App);
export default connect(mapStateToProps, mapDispatchToProps)(App);

Check failure on line 109 in src/applications/disability-benefits/2346/containers/App.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/disability-benefits/2346/containers/App.jsx:109:24:Replace `mapStateToProps,·mapDispatchToProps` with `⏎··mapStateToProps,⏎··mapDispatchToProps,⏎`
6 changes: 3 additions & 3 deletions src/applications/education-letters/components/Layout.jsx
Expand Up @@ -10,7 +10,7 @@ const Layout = ({ children, clsName = '', breadCrumbs = {} }) => {

return (
<>
<va-breadcrumbs>
<va-breadcrumbs uswds="false">
<a href="/">Home</a>
<a href="/education/">Education and training</a>
{renderBreadCrumbs()}
Expand All @@ -29,9 +29,9 @@ const Layout = ({ children, clsName = '', breadCrumbs = {} }) => {
};

Layout.propTypes = {
clsName: PropTypes.string,
children: PropTypes.object,
breadCrumbs: PropTypes.object,
children: PropTypes.object,
clsName: PropTypes.string,
};

export default Layout;
Expand Up @@ -52,5 +52,5 @@ export default function EnrollmentVerificationBreadcrumbs() {
);
}

return <va-breadcrumbs>{breadcrumbs}</va-breadcrumbs>;
return <va-breadcrumbs uswds="false">{breadcrumbs}</va-breadcrumbs>;
}
66 changes: 30 additions & 36 deletions src/applications/fry-dea/containers/FryDeaApp.jsx
Expand Up @@ -24,43 +24,40 @@ function FryDeaApp({
}) {
const [fetchedVeterans, setFetchedVeterans] = useState(false);

useEffect(
() => {
if (!user.login.currentlyLoggedIn) {
return;
}
useEffect(() => {

Check failure on line 27 in src/applications/fry-dea/containers/FryDeaApp.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/fry-dea/containers/FryDeaApp.jsx:27:13:Insert `⏎····`
if (!user.login.currentlyLoggedIn) {

Check failure on line 28 in src/applications/fry-dea/containers/FryDeaApp.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/fry-dea/containers/FryDeaApp.jsx:28:1:Insert `··`
return;

Check failure on line 29 in src/applications/fry-dea/containers/FryDeaApp.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/fry-dea/containers/FryDeaApp.jsx:29:1:Insert `··`
}

Check failure on line 30 in src/applications/fry-dea/containers/FryDeaApp.jsx

View workflow job for this annotation

GitHub Actions / Linting (Files Changed)

src/applications/fry-dea/containers/FryDeaApp.jsx:30:5:Insert `··`

if (!fetchedVeterans) {
setFetchedVeterans(true);
getVeterans();
}
if (!fetchedVeterans) {
setFetchedVeterans(true);
getVeterans();
}

if (
formData.showUpdatedFryDeaApp !== showUpdatedFryDeaApp ||
formData.veterans !== veterans
) {
setFormData({
...formData,
showUpdatedFryDeaApp,
veterans,
});
}
},
[
fetchedVeterans,
formData,
getVeterans,
location.pathname,
setFormData,
showUpdatedFryDeaApp,
user.login.currentlyLoggedIn,
veterans,
],
);
if (
formData.showUpdatedFryDeaApp !== showUpdatedFryDeaApp ||
formData.veterans !== veterans
) {
setFormData({
...formData,
showUpdatedFryDeaApp,
veterans,
});
}
}, [
fetchedVeterans,
formData,
getVeterans,
location.pathname,
setFormData,
showUpdatedFryDeaApp,
user.login.currentlyLoggedIn,
veterans,
]);

return (
<>
<va-breadcrumbs>
<va-breadcrumbs uswds="false">
<a href="/">Home</a>
<a href="/education">Education and training</a>
<a href="/fry-dea">
Expand Down Expand Up @@ -98,7 +95,4 @@ const mapDispatchToProps = {
getVeterans: fetchVeterans,
};

export default connect(
mapStateToProps,
mapDispatchToProps,
)(FryDeaApp);
export default connect(mapStateToProps, mapDispatchToProps)(FryDeaApp);
2 changes: 1 addition & 1 deletion src/applications/gi/components/GiBillBreadcrumbs.jsx
Expand Up @@ -47,7 +47,7 @@ const GiBillBreadcrumbs = () => {
);
}

return <VaBreadcrumbs>{crumbs}</VaBreadcrumbs>;
return <VaBreadcrumbs uswds="false">{crumbs}</VaBreadcrumbs>;
};

export default GiBillBreadcrumbs;
19 changes: 7 additions & 12 deletions src/applications/health-care-supply-reordering/containers/App.jsx
Expand Up @@ -63,7 +63,7 @@ class App extends Component {
return (
<>
{!featureToggles.loading && (
<va-breadcrumbs class="va-nav-breadcrumbs">
<va-breadcrumbs uswds="false" class="va-nav-breadcrumbs">
<a href="/">Home</a>
{/* this will get updated when this route is added */}
<a href="/health-care">Health care</a>
Expand All @@ -77,13 +77,11 @@ class App extends Component {
Loading your information...
</va-loading-indicator>
)}
{isError &&
!pending &&
isLoggedIn && (
<div className="row vads-u-margin-bottom--3">
<ErrorMessage />
</div>
)}
{isError && !pending && isLoggedIn && (
<div className="row vads-u-margin-bottom--3">
<ErrorMessage />
</div>
)}
{showMainContent && (
<RoutedSavableApp formConfig={formConfig} currentLocation={location}>
{children}
Expand All @@ -105,7 +103,4 @@ const mapDispatchToProps = dispatch => ({
...bindActionCreators({ fetchFormStatus }, dispatch),
});

export default connect(
mapStateToProps,
mapDispatchToProps,
)(App);
export default connect(mapStateToProps, mapDispatchToProps)(App);
2 changes: 1 addition & 1 deletion src/applications/medical-copays/components/AlertView.jsx
Expand Up @@ -37,7 +37,7 @@ const AlertView = ({ pathname, alertType, error, cdpToggle, hasDebts }) => {

return (
<>
<VaBreadcrumbs label="Breadcrumb">
<VaBreadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
<a href="/health-care">Health care</a>
<a href="/health-care/pay-copay-bill">Pay your VA copay bill</a>
Expand Down
20 changes: 10 additions & 10 deletions src/applications/medical-copays/containers/DetailPage.jsx
Expand Up @@ -33,19 +33,19 @@ const DetailPage = ({ match }) => {
mcpHTMLStatementToggle(state),
);

useEffect(
() => {
if (!isCurrentBalance) {
setAlert('past-due-balance');
}
scrollToTop();
},
[isCurrentBalance],
);
useEffect(() => {
if (!isCurrentBalance) {
setAlert('past-due-balance');
}
scrollToTop();
}, [isCurrentBalance]);

return (
<>
<va-breadcrumbs className="vads-u-font-family--sans no-wrap">
<va-breadcrumbs
uswds="false"
className="vads-u-font-family--sans no-wrap"
>
<a href="/">Home</a>
<a href="/health-care">Health care</a>
<a href="/health-care/pay-copay-bill">Pay your VA copay bill</a>
Expand Down
Expand Up @@ -32,7 +32,10 @@ const HTMLStatementPage = ({ match }) => {
return (
<>
<article>
<va-breadcrumbs className="vads-u-font-family--sans no-wrap">
<va-breadcrumbs
uswds="false"
className="vads-u-font-family--sans no-wrap"
>
<a href="/">Home</a>
<a href="/health-care">Health care</a>
<a href="/health-care/pay-copay-bill">Pay your VA copay bill</a>
Expand Down
Expand Up @@ -59,7 +59,7 @@ const OverviewPage = () => {
return (
<>
<div className="vads-u-font-family--sans no-wrap">
<VaBreadcrumbs label="Breadcrumb">
<VaBreadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
<a href="/health-care">Health care</a>
<a href="/health-care/pay-copay-bill">Pay your VA copay bill</a>
Expand Down

0 comments on commit 414e69a

Please sign in to comment.