Skip to content

Commit

Permalink
Merge branch 'main' into mc-breadcrumbs-v1-part-four
Browse files Browse the repository at this point in the history
  • Loading branch information
micahchiang committed Mar 12, 2024
2 parents 41071c6 + 3e6d3e4 commit 18ac242
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 14 deletions.
11 changes: 6 additions & 5 deletions src/applications/discharge-wizard/components/gpSteps/StepOne.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,13 +158,14 @@ const StepOne = ({ formValues }) => {
<va-process-list-item header={header}>
<p>Important tips for completing Form {form.num}:</p>
{formValues['4_reason'] === '8' ? dd214Tips : nonDd2014Tips}
<va-link
class="vads-u-display--block vads-u-margin-bottom--1"
{/* Intentionally not using <va-link> per Platform Analytics team */}
<a
className="vads-u-display--block vads-u-margin-bottom--1 step-1-download"
download
filetype="PDF"
href={form.link}
text={`Download Form ${form.num}`}
/>
>
Download Form {form.num}
</a>
<AlertMessage
content={
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ const renderMedicalRecordInfo = formValues => {
You can request your <strong>VA medical records</strong> by
submitting VA Form 10-5345 to your local VA Medical Center.
<br />
<va-link
{/* Intentionally not using <va-link> per Platform Analytics team */}
<a
download
text="Download VA Form 10-5345"
href="https://www.va.gov/find-forms/about-form-10-5345/"
/>
>
Download VA Form 10-5345
</a>
</li>
<li>{requestQuestion}</li>
<li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('Discharge Wizard <GuidancePage />', () => {
router={reactRouterStub}
/>,
);
expect(tree.find('va-link[text*="Download Form"]')).to.have.lengthOf(1);
expect(tree.find('.step-1-download')).to.have.lengthOf(1);
tree.unmount();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('functionality of discharge wizard', () => {
axeTestPage();

// open Form download
cy.get('.main va-link[download="true"]')
cy.get('.main .step-1-download')
.first()
.click();
});
Expand Down
2 changes: 1 addition & 1 deletion src/applications/my-education-benefits/containers/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export const App = ({

return (
<>
<va-breadcrumbs>
<va-breadcrumbs uswds="false">
<a href="/">Home</a>
<a href="/education">Education and training</a>
<a href="/education/apply-for-benefits-form-22-1990">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const Breadcrumbs = ({ pathname }) => {
});

return (
<va-breadcrumbs home-veterans-affairs={false}>
<va-breadcrumbs uswds="false" home-veterans-affairs={false}>
{breadcrumbs.map(({ link, label }) => (
<li key={label}>
<Link to={link}>{label}</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const CustomHeader = ({ formData, formConfig, currentLocation }) => {
// With this custom header, breadcrumbs should not appear on the form pages.
// However we still want to show them on the introduction page and review page.
// Static breadcrumbs from content-build cannot be used with this custom header
<va-breadcrumbs label="Breadcrumb">
<va-breadcrumbs uswds="false" label="Breadcrumb">
<a href="/">Home</a>
<a href="/authorization-to-disclose-alternate/">
Authorize VA to release your information to a third-party source
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const fsrUrl = getAppUrl('request-debt-help-form-5655');

const ManageVADebtCTA = () => (
<>
<va-breadcrumbs>
<va-breadcrumbs uswds="false">
<a href="/">Home</a>
<a href="/manage-va-debt">Manage your VA debt</a>
</va-breadcrumbs>
Expand Down

0 comments on commit 18ac242

Please sign in to comment.