closes a number of tickets (#2216)

- closes #2209
- closes #2210
- closes #2211
- closes #2213
- closes #2214
- closes #2215
This commit is contained in:
Vim 2023-06-27 12:42:29 -07:00 committed by GitHub
parent 941d657ee1
commit c7dd4f20d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 147 additions and 85 deletions

View file

@ -530,14 +530,14 @@ exports[`rendering of the Categories checks if component renders 1`] = `
<strong>
AND
</strong>
more than 10% of people ages 25 or older have a
more than 10% of people ages 25 years or older whose high school education is less than a
<a
class="usa-link"
href="#high-school"
>
high school education
high school diploma
</a>
(i.e. graduated with a high school diploma)
</p>
</div>

View file

@ -51,6 +51,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
>
Screeningtool-Support@omb.eop.gov
</a>
.
</li>
</ul>
<p>

View file

@ -93,7 +93,7 @@ export const CONTENT = {
<FormattedMessage
id={'about.page.paragraph.4'}
defaultMessage={`
CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ
CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ.
`}
description={'Navigate to the About page. This is the paragraph 4'}
values={{
@ -269,7 +269,7 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
/>,
LIST_ITEM_4: <FormattedMessage
id={'about.page.how.you.can.help.list.item.4'}
defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this <link2>form</link2> . Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>`}
defaultMessage={`Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this <link2>form</link2> . Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>.`}
description={`Navigate to the about page. You will see How you can help list item 3`}
values={{
link1: linkFn(PAGES_ENDPOINTS.METHODOLOGY, true, false),

View file

@ -217,12 +217,12 @@ export const QUESTIONS = [
defaultMessage={ 'Q: Can the public provide feedback on this tool?'}
description={ 'Navigate to the FAQs page, this will be Q15'}
/>,
// <FormattedMessage
// id={ 'faqs.page.Q16'}
// key={ 'faqs.page.Q16'}
// defaultMessage={ 'Q: Will CEQ issue another Request for Information about the tool?'}
// description={ 'Navigate to the FAQs page, this will be Q16'}
// />,
<FormattedMessage
id={ 'faqs.page.Q16'}
key={ 'faqs.page.Q16'}
defaultMessage={ 'Q: Why was the CEJST initially released in a beta version?'}
description={ 'Navigate to the FAQs page, this will be Q16'}
/>,
<FormattedMessage
id={ 'faqs.page.Q17'}
key={ 'faqs.page.Q17'}
@ -373,7 +373,7 @@ export const FAQ_ANSWERS = {
/>,
Q5_P2: <FormattedMessage
id={ 'faqs.page.answers.Q5_P2'}
defaultMessage={ `Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the <link1>annual notice</link1> it publishes in the Federal Register:`}
defaultMessage={ `Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the <link1>annual notice</link1> it publishes in the Federal Register.`}
description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2'}
values={{
link1: linkFn(FED_RECOGNIZED_INDIAN_ENTITIES, false, true),
@ -381,7 +381,7 @@ export const FAQ_ANSWERS = {
/>,
Q5_P2_1: <FormattedMessage
id={ 'faqs.page.answers.Q5_P2_1'}
defaultMessage={ `This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQs <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3> President Bidens Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation </link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.`}
defaultMessage={ `This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQs <link1>Action Plan</link1> for Consultation and Coordination with Tribal Nations, President Bidens <link3>Memorandum</link3> on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and <link2>Executive Order 13175</link2> on Consultation and Coordination With Indian Tribal Governments.`}
description={ 'Navigate to the FAQs page, this will be an answer, Q5_P2_1'}
values={{
link1: linkFn(EXPLORE_PAGE_LINKS.WH_GOV_TRIBAL_ACTION_PLAN_4_26_21, false, true),
@ -606,8 +606,13 @@ export const FAQ_ANSWERS = {
/>,
Q16: <FormattedMessage
id={ 'faqs.page.answers.Q16'}
defaultMessage={ `Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.`}
defaultMessage={ `CEQ launched a beta or draft version of the CEJST on February 18, 2022 with support from the U.S. Digital Service (USDS), and in collaboration with other Federal agencies and departments. The CEJST was released in a beta version in order to seek <link1>feedback</link1> from Federal agencies, Tribal Nations, State and local governments, Members of Congress, environmental justice stakeholders, and the public. The 90 day public comment period <link2>closed</link2> on May 25, 2022. CEQ and the USDS hosted several <link2>public training</link2> sessions on the beta version of the CEJST. All of this feedback on the beta version of the CEJST helped to inform the release of version 1.0 of the CEJST.`}
description={ 'Navigate to the FAQs page, this will be an answer, Q16'}
values={{
link1: linkFn('https://www.federalregister.gov/documents/2022/02/23/2022-03920/climate-and-economic-justice-screening-tool-beta-version', false, true),
link2: linkFn('https://www.whitehouse.gov/ceq/news-updates/2022/04/21/ceq-extends-public-comment-period-on-beta-version-of-the-climate-and-economic-justice-screening-tool/', false, true),
link3: linkFn('https://www.youtube.com/watch?v=QwHWcXbhw28', false, true),
}}
/>,
Q17_P1: <FormattedMessage
id={ 'faqs.page.answers.Q17_P1'}

View file

@ -141,7 +141,7 @@ export const CATEGORY_AND_CLAUSE = {
/>,
HS_DEG_GTE_10: <FormattedMessage
id={'methodology.page.category.and.clause.hs.ed.higher.ed'}
defaultMessage={`<boldtag>AND</boldtag> more than 10% of people ages 25 or older have a <link1>high school education</link1> (i.e. graduated with a high school diploma)
defaultMessage={`<boldtag>AND</boldtag> more than 10% of people ages 25 years or older whose high school education is less than a <link1>high school diploma</link1>
`}
description={'Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school diploma rate'}
values={{

View file

@ -36,7 +36,7 @@
"description": "Navigate to the about page. You will see How you can help list item 3"
},
"about.page.how.you.can.help.list.item.4": {
"defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this <link2>form</link2> . Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>",
"defaultMessage": "Any other questions? The best way to contact the Council on Environmental Quality (CEQ) is by filling out this <link2>form</link2> . Otherwise, email: <link1>Screeningtool-Support@omb.eop.gov</link1>.",
"description": "Navigate to the about page. You will see How you can help list item 3"
},
"about.page.how.you.can.help.para.1": {
@ -76,7 +76,7 @@
"description": "Navigate to the About page. This is the paragraph 3"
},
"about.page.paragraph.4": {
"defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ",
"defaultMessage": "CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version {version}. <link1>Sign-up</link1> for updates from CEQ.",
"description": "Navigate to the About page. This is the paragraph 4"
},
"about.page.paragraph.5": {
@ -1519,6 +1519,10 @@
"defaultMessage": "Q: Can the public provide feedback on this tool?",
"description": "Navigate to the FAQs page, this will be Q15"
},
"faqs.page.Q16": {
"defaultMessage": "Q: Why was the CEJST initially released in a beta version?",
"description": "Navigate to the FAQs page, this will be Q16"
},
"faqs.page.Q17": {
"defaultMessage": "Q: When did the official version of the tool come out?",
"description": "Navigate to the FAQs page, this will be Q17"
@ -1656,7 +1660,7 @@
"description": "Navigate to the FAQs page, this will be an answer, Q15_P1_4"
},
"faqs.page.answers.Q16": {
"defaultMessage": "Yes. CEQ plans to issue a Request for Information (RFI) about version 1.0 of the CEJST in 2023. The feedback received in that RFI will inform version 2.0 of the tool.",
"defaultMessage": "CEQ launched a beta or draft version of the CEJST on February 18, 2022 with support from the U.S. Digital Service (USDS), and in collaboration with other Federal agencies and departments. The CEJST was released in a beta version in order to seek <link1>feedback</link1> from Federal agencies, Tribal Nations, State and local governments, Members of Congress, environmental justice stakeholders, and the public. The 90 day public comment period <link2>closed</link2> on May 25, 2022. CEQ and the USDS hosted several <link2>public training</link2> sessions on the beta version of the CEJST. All of this feedback on the beta version of the CEJST helped to inform the release of version 1.0 of the CEJST.",
"description": "Navigate to the FAQs page, this will be an answer, Q16"
},
"faqs.page.answers.Q17_P1": {
@ -1760,11 +1764,11 @@
"description": "Navigate to the FAQs page, this will be an answer, Q5_P1"
},
"faqs.page.answers.Q5_P2": {
"defaultMessage": "Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the <link1>annual notice</link1> it publishes in the Federal Register:",
"defaultMessage": "Federally Recognized Tribes are those that are recognized by the U.S. Bureau of Indian Affairs in the <link1>annual notice</link1> it publishes in the Federal Register.",
"description": "Navigate to the FAQs page, this will be an answer, Q5_P2"
},
"faqs.page.answers.Q5_P2_1": {
"defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQs <link1>Action Plan for Consultation and Coordination with Tribal Nations</link1>, <link3> President Bidens Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation </link3>, and <link2>Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments</link2>.",
"defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQs <link1>Action Plan</link1> for Consultation and Coordination with Tribal Nations, President Bidens <link3>Memorandum</link3> on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and <link2>Executive Order 13175</link2> on Consultation and Coordination With Indian Tribal Governments.",
"description": "Navigate to the FAQs page, this will be an answer, Q5_P2_1"
},
"faqs.page.answers.Q6_P1": {
@ -1932,7 +1936,7 @@
"description": "responsible party text"
},
"methodology.page.category.and.clause.hs.ed.higher.ed": {
"defaultMessage": "<boldtag>AND</boldtag> more than 10% of people ages 25 or older have a <link1>high school education</link1> (i.e. graduated with a high school diploma)",
"defaultMessage": "<boldtag>AND</boldtag> more than 10% of people ages 25 years or older whose high school education is less than a <link1>high school diploma</link1>",
"description": "Navigate to the methodology page. Navigate to the category section. This is the portion of the formula dealing with higher ed enrollment and high school diploma rate"
},
"methodology.page.category.and.clause.low.inc": {

View file

@ -18,8 +18,8 @@ import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants';
import accountBalanceIcon // @ts-ignore
from '/node_modules/uswds/dist/img/usa-icons/account_balance.svg';
import groupsIcon from // @ts-ignore
'/node_modules/uswds/dist/img/usa-icons/groups.svg';
import fileDownloadIcon from // @ts-ignore
'/node_modules/uswds/dist/img/usa-icons/file_download.svg';
import commentIcon from // @ts-ignore
'/node_modules/uswds/dist/img/usa-icons/comment.svg';
@ -128,7 +128,7 @@ const AboutPage = ({location}: IAboutPageProps) => {
<AboutCard
size={'small'}
imgSrc={groupsIcon}
imgSrc={fileDownloadIcon}
header={intl.formatMessage(ABOUT_COPY.HOW_TO_USE_TOOL.USE_DATA_HEADING)}
linkText={ABOUT_COPY.CONTENT.USE_DATA_TUTORIAL}
url={USE_DATA_TUTORIAL_LINK}

View file

@ -85,9 +85,9 @@ const FAQPage = ({location}: IFAQPageProps) => {
<>
<p key={5}>{FAQS_COPY.FAQ_ANSWERS.Q5_P1}</p>
<p>{FAQS_COPY.FAQ_ANSWERS.Q5_P2}</p>
<ul>
<li>{FAQS_COPY.FAQ_ANSWERS.Q5_P2_1}</li>
</ul>
<p>
{FAQS_COPY.FAQ_ANSWERS.Q5_P2_1}
</p>
</>
),
(
@ -188,11 +188,11 @@ const FAQPage = ({location}: IFAQPageProps) => {
</ul>
</>
),
// (
// <>
// <p key={16}>{FAQS_COPY.FAQ_ANSWERS.Q16}</p>
// </>
// ),
(
<>
<p key={16}>{FAQS_COPY.FAQ_ANSWERS.Q16}</p>
</>
),
(
<>
<p key={17}>{FAQS_COPY.FAQ_ANSWERS.Q17_P1}</p>

View file

@ -513,7 +513,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
>
Sign-up
</a>
for updates from CEQ
for updates from CEQ.
</p>
</section>
@ -886,6 +886,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
>
Screeningtool-Support@omb.eop.gov
</a>
.
</li>
</ul>
<p>

View file

@ -661,10 +661,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
>
annual notice
</a>
it publishes in the Federal Register:
it publishes in the Federal Register.
</p>
<ul>
<li>
<p>
This decision was made after meaningful and robust consultation with Tribal Nations. This approach is consistent with CEQs
<a
class="usa-link usa-link--external"
@ -673,9 +672,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
rel="noreferrer"
target="_blank"
>
Action Plan for Consultation and Coordination with Tribal Nations
Action Plan
</a>
,
for Consultation and Coordination with Tribal Nations, President Bidens
<a
class="usa-link usa-link--external"
data-cy=""
@ -683,9 +682,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
rel="noreferrer"
target="_blank"
>
President Bidens Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation
Memorandum
</a>
, and
on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and
<a
class="usa-link usa-link--external"
data-cy=""
@ -693,11 +692,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
rel="noreferrer"
target="_blank"
>
Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments
Executive Order 13175
</a>
.
</li>
</ul>
on Consultation and Coordination With Indian Tribal Governments.
</p>
</div>
<h2
class="usa-accordion__heading"
@ -1106,7 +1104,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="accordionButton_faq-id-15"
type="button"
>
Q: When did the official version of the tool come out?
Q: Why was the CEJST initially released in a beta version?
</button>
</h2>
<div
@ -1114,6 +1112,59 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="accordionItem_faq-id-15"
hidden=""
id="faq-id-15"
>
<p>
CEQ launched a beta or draft version of the CEJST on February 18, 2022 with support from the U.S. Digital Service (USDS), and in collaboration with other Federal agencies and departments. The CEJST was released in a beta version in order to seek
<a
class="usa-link usa-link--external"
data-cy=""
href="https://www.federalregister.gov/documents/2022/02/23/2022-03920/climate-and-economic-justice-screening-tool-beta-version"
rel="noreferrer"
target="_blank"
>
feedback
</a>
from Federal agencies, Tribal Nations, State and local governments, Members of Congress, environmental justice stakeholders, and the public. The 90 day public comment period
<a
class="usa-link usa-link--external"
data-cy=""
href="https://www.whitehouse.gov/ceq/news-updates/2022/04/21/ceq-extends-public-comment-period-on-beta-version-of-the-climate-and-economic-justice-screening-tool/"
rel="noreferrer"
target="_blank"
>
closed
</a>
on May 25, 2022. CEQ and the USDS hosted several
<a
class="usa-link usa-link--external"
data-cy=""
href="https://www.whitehouse.gov/ceq/news-updates/2022/04/21/ceq-extends-public-comment-period-on-beta-version-of-the-climate-and-economic-justice-screening-tool/"
rel="noreferrer"
target="_blank"
>
public training
</a>
sessions on the beta version of the CEJST. All of this feedback on the beta version of the CEJST helped to inform the release of version 1.0 of the CEJST.
</p>
</div>
<h2
class="usa-accordion__heading"
>
<button
aria-controls="faq-id-16"
aria-expanded="false"
class="usa-accordion__button"
data-testid="accordionButton_faq-id-16"
type="button"
>
Q: When did the official version of the tool come out?
</button>
</h2>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_faq-id-16"
hidden=""
id="faq-id-16"
>
<p>
The tool is now considered official because Federal agencies can now use version 1.0 of the Climate and Economic Justice Screening Tool (CEJST) to help identify disadvantaged communities. The 1.0 version was released in
@ -1136,10 +1187,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
class="usa-accordion__heading"
>
<button
aria-controls="faq-id-16"
aria-controls="faq-id-17"
aria-expanded="false"
class="usa-accordion__button"
data-testid="accordionButton_faq-id-16"
data-testid="accordionButton_faq-id-17"
type="button"
>
Q. How does the Council on Environmental Quality (CEQ) keep people informed about the tool?
@ -1147,9 +1198,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</h2>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_faq-id-16"
data-testid="accordionItem_faq-id-17"
hidden=""
id="faq-id-16"
id="faq-id-17"
>
<p>
<a
@ -1168,10 +1219,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
class="usa-accordion__heading"
>
<button
aria-controls="faq-id-17"
aria-controls="faq-id-18"
aria-expanded="false"
class="usa-accordion__button"
data-testid="accordionButton_faq-id-17"
data-testid="accordionButton_faq-id-18"
type="button"
>
Q: What files and documentation are available from the tool?
@ -1179,9 +1230,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</h2>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_faq-id-17"
data-testid="accordionItem_faq-id-18"
hidden=""
id="faq-id-17"
id="faq-id-18"
>
<p>
The Climate and Economic Justice Screening Tool (CEJST) has
@ -1198,10 +1249,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
class="usa-accordion__heading"
>
<button
aria-controls="faq-id-18"
aria-controls="faq-id-19"
aria-expanded="false"
class="usa-accordion__button"
data-testid="accordionButton_faq-id-18"
data-testid="accordionButton_faq-id-19"
type="button"
>
Q: How does the tools shapefile work?
@ -1209,9 +1260,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
</h2>
<div
class="usa-accordion__content usa-prose"
data-testid="accordionItem_faq-id-18"
data-testid="accordionItem_faq-id-19"
hidden=""
id="faq-id-18"
id="faq-id-19"
>
<p>
The tools shapefile can be uploaded into other mapping programs such as Esri.

View file

@ -986,14 +986,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
<strong>
AND
</strong>
more than 10% of people ages 25 or older have a
more than 10% of people ages 25 years or older whose high school education is less than a
<a
class="usa-link"
href="#high-school"
>
high school education
high school diploma
</a>
(i.e. graduated with a high school diploma)
</p>
</div>