From 409c7238aec0bcf9a7cae081b0b4541d2704d1ac Mon Sep 17 00:00:00 2001 From: Vim <86254807+vim-usds@users.noreply.github.com> Date: Fri, 17 Dec 2021 16:17:57 -0500 Subject: [PATCH] Make latest copy changes from Living Copy (#1055) * Make latest copy changes - update snapshots * Update cypress test on feedback link - update snapshot * Update side panel and copy - update snapshots * Make 2nd EO link open in new tab * Add latest changes from Living copy * Add back HS indicator to map * Add "X of Y thresholds exceed" to side panel - update snapshots * Update with latest copy * Update to latest copy - make BETA pill in logo bold - correct exceed to exceeded - update snapshots - update page title to Meth & data * Update total indicators to 21 * Update snapshot --- client/cypress/integration/AboutLinks.feature | 2 +- .../AreaDetail/areaDetail.module.scss | 29 ++-- .../AreaDetail/areaDetail.module.scss.d.ts | 4 +- client/src/components/AreaDetail/index.tsx | 34 ++-- .../__snapshots__/areaDetail.test.tsx.snap | 65 +++++-- .../__snapshots__/BetaBanner.test.tsx.snap | 6 +- .../__snapshots__/Categories.test.tsx.snap | 32 ++-- .../components/Category/Category.module.scss | 4 + .../Category/Category.module.scss.d.ts | 1 + client/src/components/Category/Category.tsx | 2 +- .../__snapshots__/datasetCard.test.tsx.snap | 2 +- .../datasetContainer.test.tsx.snap | 100 ++++++----- .../__snapshots__/howYouCanHelp.test.tsx.snap | 6 +- client/src/components/J40Footer.tsx | 8 +- .../J40Header/J40Header.module.scss | 1 + .../__snapshots__/J40Header.test.tsx.snap | 6 +- .../__snapshots__/mapLegend.test.tsx.snap | 6 +- .../__snapshots__/SurveyButton.test.tsx.snap | 2 +- .../__snapshots__/J40Footer.spec.tsx.snap | 4 +- .../__snapshots__/mapInfoPanel.test.tsx.snap | 4 +- client/src/data/blankCEJST/index.html | 7 + client/src/data/constants.tsx | 9 +- client/src/data/copy/about.tsx | 66 +++----- client/src/data/copy/common.tsx | 6 +- client/src/data/copy/contact.tsx | 6 +- client/src/data/copy/explore.tsx | 74 ++++---- client/src/data/copy/methodology.tsx | 147 +++++++++------- .../pages/__snapshots__/contact.test.tsx.snap | 15 +- .../pages/__snapshots__/index.test.tsx.snap | 69 +++++--- .../__snapshots__/methodology.test.tsx.snap | 159 ++++++++++-------- 30 files changed, 518 insertions(+), 358 deletions(-) diff --git a/client/cypress/integration/AboutLinks.feature b/client/cypress/integration/AboutLinks.feature index 5673a7c7..b89db2a1 100644 --- a/client/cypress/integration/AboutLinks.feature +++ b/client/cypress/integration/AboutLinks.feature @@ -22,7 +22,7 @@ Feature: All links on About page are functional Scenario: People can find how to Send feedback Given I am on the "About" page When I look for the "Send feedback" CTA - Then the link should allow client to send an email to "screeningtool.feedback@usds.gov" + Then the link should allow client to send an email to "Screeningtool-Support@omb.eop.gov" Scenario: Open source community can find and click on their CTA Given I am on the "About" page diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss index 9e040590..9e319643 100644 --- a/client/src/components/AreaDetail/areaDetail.module.scss +++ b/client/src/components/AreaDetail/areaDetail.module.scss @@ -9,10 +9,14 @@ $sidePanelLabelFontColor: #171716; font-weight: 600; } +@mixin thresholdExceeded { + font-size: medium; + @include u-margin-top('05'); +} + .versionInfo { padding: .5rem 1rem .5rem 1.2rem; font-size: medium; - font-weight: bold; border-bottom: 1px solid $sidePanelBorderColor; } @@ -26,7 +30,7 @@ $sidePanelLabelFontColor: #171716; display: flex; flex-direction: column; align-items: center; - padding-bottom: 2rem; + @include u-padding-bottom(3); .isInFocus { padding: .5rem 1rem .25rem 1.2rem; @@ -44,6 +48,17 @@ $sidePanelLabelFontColor: #171716; } } + .showThresholdExceed { + @include thresholdExceeded; + display: block; + + } + + .hideThresholdExceed { + @include thresholdExceeded; + visibility: hidden; + } + .feedbackLink { font-size: small; @include u-margin-top(1); @@ -67,13 +82,3 @@ $sidePanelLabelFontColor: #171716; font-size: medium; } } - -//Divider styles -.divider { - @include sidePanelLabelStyle; - display: flex; - justify-content: space-between; - padding: 0.5rem 0.5rem 0.5rem 1.2rem; - border-top: 1px solid $sidePanelBorderColor; - border-bottom: 1px solid $sidePanelBorderColor; -} diff --git a/client/src/components/AreaDetail/areaDetail.module.scss.d.ts b/client/src/components/AreaDetail/areaDetail.module.scss.d.ts index db8bddfb..ad2fc967 100644 --- a/client/src/components/AreaDetail/areaDetail.module.scss.d.ts +++ b/client/src/components/AreaDetail/areaDetail.module.scss.d.ts @@ -3,14 +3,14 @@ declare namespace MapModuleScssNamespace { areaDetailContainer: string; categorization:string; communityOfFocus:string; - communityOfFocusCircle:string; censusRow:string; censusLabel:string; censusText: string; - divider:string; feedbackLink:string; isInFocus:string; versionInfo: string; + showThresholdExceed:string; + hideThresholdExceed:string; } } diff --git a/client/src/components/AreaDetail/index.tsx b/client/src/components/AreaDetail/index.tsx index 25ed4b15..550224ec 100644 --- a/client/src/components/AreaDetail/index.tsx +++ b/client/src/components/AreaDetail/index.tsx @@ -1,7 +1,7 @@ /* eslint-disable quotes */ // External Libs: import React from 'react'; -import {useIntl} from 'gatsby-plugin-intl'; +import {useIntl, FormattedMessage} from 'gatsby-plugin-intl'; import {Accordion} from '@trussworks/react-uswds'; // Components: @@ -234,14 +234,14 @@ const AreaDetail = ({properties}:IAreaDetailProps) => { isDisadvagtaged: properties[constants.IS_GTE_90_BELOW_100_POVERTY_AND_LOW_HIGH_SCHOOL_EDU] ? properties[constants.IS_GTE_90_BELOW_100_POVERTY_AND_LOW_HIGH_SCHOOL_EDU] : null, }; - // const highSchool:indicatorInfo = { - // label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_SCL), - // description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HIGH_SKL), - // value: properties[constants.HIGH_SCHOOL_PROPERTY_PERCENTILE] ? - // properties[constants.HIGH_SCHOOL_PROPERTY_PERCENTILE] : null, - // isDisadvagtaged: properties[constants.IS_GTE_90_BELOW_100_POVERTY_AND_LOW_HIGH_SCHOOL_EDU] ? - // properties[constants.IS_GTE_90_BELOW_100_POVERTY_AND_LOW_HIGH_SCHOOL_EDU] : null, - // }; + const highSchool:indicatorInfo = { + label: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATORS.HIGH_SCL), + description: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INDICATOR_DESCRIPTION.HIGH_SKL), + value: properties[constants.HIGH_SCHOOL_PROPERTY_PERCENTILE] ? + properties[constants.HIGH_SCHOOL_PROPERTY_PERCENTILE] : null, + isDisadvagtaged: properties[constants.IS_GTE_90_UNEMPLOYMENT_AND_LOW_HIGH_SCHOOL_EDU] ? + properties[constants.IS_GTE_90_UNEMPLOYMENT_AND_LOW_HIGH_SCHOOL_EDU] : null, + }; // Aggregate indicators based on categories const categories = [ @@ -297,7 +297,7 @@ const AreaDetail = ({properties}:IAreaDetailProps) => { { id: 'work-dev', titleText: intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_CATEGORY.WORK_DEV), - indicators: [lowMedInc, lingIso, unemploy, poverty], + indicators: [lowMedInc, lingIso, unemploy, poverty, highSchool], isDisadvagtaged: properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_L] ? properties[constants.IS_WORKFORCE_FACTOR_DISADVANTAGED_L] : null, }, @@ -369,8 +369,22 @@ const AreaDetail = ({properties}:IAreaDetailProps) => {
@@ -388,7 +388,7 @@ exports[`rendering of the Categories checks if component renders 1`] = ` > the high school degree achievement rates - for adults 25 years and older is less than 90% + for adults 25 years and older is at or less than 90%
diff --git a/client/src/components/Category/Category.module.scss b/client/src/components/Category/Category.module.scss index c8e5ec8b..d06ffca3 100644 --- a/client/src/components/Category/Category.module.scss +++ b/client/src/components/Category/Category.module.scss @@ -3,4 +3,8 @@ .categoryContainer { display: flex; justify-content: space-between; + + .category { + flex-basis: 80%; + } } \ No newline at end of file diff --git a/client/src/components/Category/Category.module.scss.d.ts b/client/src/components/Category/Category.module.scss.d.ts index ab7b1b4e..9eafab43 100644 --- a/client/src/components/Category/Category.module.scss.d.ts +++ b/client/src/components/Category/Category.module.scss.d.ts @@ -1,6 +1,7 @@ declare namespace CategoryNamespace { export interface ICategoryScss { categoryContainer: string; + category:string; disadvantageDot: string; } } diff --git a/client/src/components/Category/Category.tsx b/client/src/components/Category/Category.tsx index d1bfc4d7..fd07427c 100644 --- a/client/src/components/Category/Category.tsx +++ b/client/src/components/Category/Category.tsx @@ -11,7 +11,7 @@ interface ICategory { const Category = ({name, isDisadvantaged}:ICategory) => { return (
For general feedback, email - screeningtool.feedback@usds.gov + Screeningtool-Support@omb.eop.gov + .
@@ -362,14 +361,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="grid"
>
- The tool will provide important information for the Justice40 Initiative. The goal of the Justice40 Initiative is to provide 40-percent of the overall benefits of certain federal programs in seven key areas to disadvantaged communities. These seven key areas are: climate change, clean energy and energy efficiency, clean transit, affordable and sustainable housing, training and workforce development, the remediation and reduction of legacy pollution, and the development of critical clean water infrastructure. + + The tool will provide important information for the Justice40 Initiative. The goal of the + Justice40 Initiative is to provide 40 percent of the overall benefits of certain federal + programs in seven key areas to disadvantaged communities. These seven key areas are: climate + change, clean energy and energy efficiency, clean transit, affordable and sustainable + housing, training and workforce development (related to climate, natural disasters, environment, + clean energy, clean transportation, affordable and sustainable housing, water and + wastewater infrastructure, and legacy pollution reduction, including in energy communities), + the remediation and reduction of legacy pollution, and the development of critical clean water infrastructure. +
Read more about the Justice40 Initiative in President Biden’s Executive Order 14008 - on Tackling the Climate Crisis at Home and Abroad. + on + + Tackling the Climate Crisis at Home and Abroad + + .
- The screening tool’s code is open source, which means it is available for the public to view and contribute to. Anyone can view and contribute on GitHub. + The screening tool’s code is open source, which means it is available for the public to view and contribute to.
- This tool identifies commmunities that are economically disadvantaged, overburdened by - certain environmental risks, and marginalized by legacies of historic underinvestment. - A community qualifies as 'disadvantaged' when a census tract is at or above a certain - threshold for a climate or environmental burden indicator and also above a certain - threshold for a socioeconomic indicator. Census tract geographical boundaries are + This tool identifies communities that are overburdened by pollution and other environmental exposures + and disadvantaged by underinvestment. A community qualifies as disadvantaged when a census tract + is at or above a certain threshold for a climate or environmental burden indicator and also above + a certain threshold for a socioeconomic indicator. Census tract geographical boundaries are determined by the U.S. Census Bureau once every ten years. This tool untilizes the census tract boundaries from 2010. @@ -330,8 +329,8 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis >
- Communities will be defined as disadvantaged if they meet the qualifications under one - or more of the 8 categories of criteria below. + Communities will be defined as disadvantaged for the purposes of Justice40 if they meet + the qualifications under one or more of the eight categories of criteria below.
@@ -788,7 +787,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > the high school degree achievement rates - for adults 25 years and older is less than 90% + for adults 25 years and older is at or less than 90%
@@ -833,7 +832,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis id="low-income" >