Skip to content

Commit

Permalink
updates for kmi walk-in (#17140)
Browse files Browse the repository at this point in the history
* updates for kmi walk-in

* Resolved PostCSS security advisory.

* update test

* Upgrade PostCSS specifically under web-components.

* disable vax CTA on eng page

* update e2e

* more e2e

* more e2e

Co-authored-by: Eugene Doan <[email protected]>
  • Loading branch information
batemapf and U-DON authored May 10, 2021
1 parent 7294658 commit 60db4ed
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import { connect } from 'react-redux';
import { withRouter } from 'react-router';

import { focusElement } from 'platform/utilities/ui';
import {
CaregiverMessage,
ConfirmationMessage,
ContactRules,
} from './VerbiageHelper';
import { ContactRules } from './VerbiageHelper';

function Confirmation({ router, formData }) {
useEffect(() => {
Expand All @@ -25,17 +21,18 @@ function Confirmation({ router, formData }) {
<h1 className="no-outline" id="covid-vaccination-heading-confirmation">
We've received your information
</h1>
<ConfirmationMessage />
<CaregiverMessage />
<h2>How will VA contact me when I can get a COVID-19 vaccine?</h2>
<ContactRules />
<p>
<strong>Please know:</strong> By sharing your plans for getting a
vaccine, you help us better plan our efforts. But we’ll still contact
every eligible Veteran in each risk group to ask if they want to get a
vaccine. You don’t need to call or come to a VA facility to request or
reserve a vaccine.
Thank you for signing up to stay informed about COVID-19 vaccines at VA.
When we have new information to share about our COVID-19 plans and your
vaccine options, we'll send you updates by email or text.
</p>
<p>
We may also use your information to contact you about your vaccine
options. It's always your choice if you want to get a vaccine.
</p>

<h2>How will VA contact me about my vaccine options?</h2>
<ContactRules />
<p>
You can also get updates and answers to common questions on our main{' '}
<a
Expand Down
24 changes: 19 additions & 5 deletions src/applications/coronavirus-vaccination/components/Form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function Form({ formState, updateFormData, router, isLoggedIn, profile }) {
dependencies={[externalServices.vetextVaccine]}
>
<h1 id="covid-vaccination-heading-form" className="no-outline">
Fill out the form below
Sign up for vaccine updates
</h1>
{previouslySubmittedFormData ? (
<p>
Expand All @@ -96,10 +96,24 @@ function Form({ formState, updateFormData, router, isLoggedIn, profile }) {
</p>
) : (
<p>
We’ll share this information with your local VA health facility.
They may use this information to determine when to contact you about
getting your COVID-19 vaccine. We’ll also send you updates on our
vaccine plans.
<p>
<strong>
If you’re a Veteran who receives care at VA, you don’t need to
fill out this form to get your COVID-19 vaccine.
</strong>{' '}
You can call your nearest VA health facility, or go to the
facility’s vaccine clinic during walk-in hours.{' '}
<a href="/find-locations/?facilityType=health&serviceType=Covid19Vaccine">
Find VA facilities near you that offer COVID-19 vaccines
</a>
</p>
<p>
If you’re not ready to get your vaccine yet, sign up here to stay
informed about your options. We’ll send you updates about our
vaccine plans and other helpful information. We may also use your
information to contact you about your vaccine options. It's always
your choice if you want to get a vaccine.
</p>
</p>
)}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('<Form/>', () => {
reducers: reducer,
});

screen.getByText('Fill out the form below');
screen.getByText('Sign up for vaccine updates');
await screen.findByLabelText('Social Security number (SSN)');
screen.getByLabelText('Last name', { exact: false });
screen.getByLabelText('First name', { exact: false });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe('COVID-19 Vaccination Preparation Form', () => {
cy.injectAxe();
cy.axeCheck();
cy.get('#covid-vaccination-heading-form').contains(
'Fill out the form below',
'Sign up for vaccine updates',
);

cy.findByLabelText(/First name/i)
Expand Down Expand Up @@ -91,15 +91,9 @@ describe('COVID-19 Vaccination Preparation Form', () => {
cy.get('.vads-l-row').contains(
'Thank you for signing up to stay informed about COVID-19 vaccines at VA',
);
cy.get('.vads-l-row').contains(
'Your local VA health facility may also use the information you provided to determine when to contact you about getting a vaccine once your risk group becomes eligible',
);
cy.get('.vads-l-row').contains(
'Your local VA health facility may contact you by phone, email, or text message.',
);
cy.get('.vads-l-row').contains(
'By sharing your plans for getting a vaccine, you help us better plan our efforts',
);
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ describe('COVID-19 Vaccination Preparation Form', () => {
);
cy.axeCheck();
cy.get('#covid-vaccination-heading-form').contains(
'Fill out the form below',
'Sign up for vaccine updates',
);

cy.findByLabelText(/First name/i)
Expand Down Expand Up @@ -135,15 +135,6 @@ describe('COVID-19 Vaccination Preparation Form', () => {
cy.get('.vads-l-row').contains(
'Thank you for signing up to stay informed about COVID-19 vaccines at VA',
);
cy.get('.vads-l-row').contains(
'Your local VA health facility may also use the information you provided to determine when to contact you about getting a vaccine once your risk group becomes eligible',
);
cy.get('.vads-l-row').contains(
'Your local VA health facility may contact you by phone, email, or text message.',
);
cy.get('.vads-l-row').contains(
'By sharing your plans for getting a vaccine, you help us better plan our efforts',
);
});
});
});
2 changes: 1 addition & 1 deletion src/applications/registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@
},
{
"path": "health-care/covid-19-vaccine/stay-informed",
"name": "Sign up to get a vaccine"
"name": "Sign up for vaccine updates"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Provider } from 'react-redux';

export default function createCovidVaccineUpdatesWidget(store, _widgetType) {
const covidVaccineUpdatesPaths = new Set([
'/health-care/covid-19-vaccine/',
// '/health-care/covid-19-vaccine/',
'/health-care/covid-19-vaccine-esp/',
'/health-care/covid-19-vaccine-tag/',
]);
Expand Down

1 comment on commit 60db4ed

@timwright12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.