diff --git a/.github/workflows/deploy_fe_main.yml b/.github/workflows/deploy_fe_main.yml index 776339dc..9f2eb386 100644 --- a/.github/workflows/deploy_fe_main.yml +++ b/.github/workflows/deploy_fe_main.yml @@ -6,7 +6,7 @@ on: - "client/**/*" env: PR_NUMBER: ${{ github.event.number }} - WEB_CDN_ID: E27WCOZZ03KIBX + WEB_CDN_ID: E30NWFWBUUX9X jobs: build: runs-on: ubuntu-latest @@ -89,13 +89,13 @@ jobs: with: message: | **🚢 PR Deployed! 🚢** - Find it here: https://d29zfl8cj7y1zf.cloudfront.net/ ! + Find it here: https://d3r1k4gynx5dw4.cloudfront.net ! repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token-user-login: "github-actions[bot]" # The user.login for temporary GitHub tokens allow-repeats: false # This is the default - name: Printing deployment URLs run: | echo "Geoplatform official site (may or may not be up): https://screeningtool.geoplatform.gov/" - echo "The Cloudfront behind this official site: https://d29zfl8cj7y1zf.cloudfront.net/" + echo "The Cloudfront behind this official site: https://d3r1k4gynx5dw4.cloudfront.net" echo "Github pages: https://usds.github.io/justice40-tool/$DESTINATION_FOLDER/en" echo "The origin S3 bucket (http only) : http://usds-geoplatform-justice40-website.s3-website-us-east-1.amazonaws.com/justice40-tool/$DESTINATION_FOLDER/en" diff --git a/client/cypress/integration/DatasetLinks.feature b/client/cypress/integration/DatasetLinks.feature index 29fd26ce..45d33ddc 100644 --- a/client/cypress/integration/DatasetLinks.feature +++ b/client/cypress/integration/DatasetLinks.feature @@ -2,5 +2,5 @@ Feature: All links on the dataset cards should be functional Scenario: If I click on any link in the indicators dataset, they should work Given I am on the "Methodology" page - When I look for the "Datasets used in methodology" CTA - Then All links under "Datasets used in methodology" should work + When I look for the "Datasets used in beta methodology" CTA + Then All links under "Datasets used in beta methodology" should work diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap index 5c014e36..2869414c 100644 --- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap +++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap @@ -57,7 +57,7 @@ exports[`rendering of the AreaDetail checks if indicators for ISLAND AREAS are p @@ -258,7 +258,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present @@ -642,8 +642,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present Lead paint
- Percent of pre-1960 housing when median home value is at or below 90th percentile in order to - exclude areas with high value, older homes + Percent of pre-1960 housing when median home value at or below 90th percentile
@@ -1203,7 +1202,7 @@ exports[`rendering of the AreaDetail checks if indicators for PUERTO RICO are pr diff --git a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap index 2ea601ba..b74efcae 100644 --- a/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap +++ b/client/src/components/Categories/__snapshots__/Categories.test.tsx.snap @@ -146,7 +146,7 @@ exports[`rendering of the Categories checks if component renders 1`] = `

- Clean transportation + Clean transit

@@ -230,7 +230,7 @@ exports[`rendering of the Categories checks if component renders 1`] = ` - low median home value + median home value is at or less than 90th percentile OR at or above the 90th percentile for the @@ -488,7 +488,7 @@ exports[`rendering of the Categories checks if component renders 1`] = ` unemployment OR - percent individuals in households at or below 100% federal + percent individuals in households at or below 100% Federal diff --git a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap index 86a7776f..4c6ae6d9 100644 --- a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap +++ b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap @@ -11,7 +11,7 @@ exports[`rendering of indicator dataset card checks if component renders 1`] = `

Percent of a census tract's population in households where household income is at or below - 200% of the federal poverty level. + 200% of the Federal poverty level.
diff --git a/client/src/components/MapWrapper/index.tsx b/client/src/components/MapWrapper/index.tsx index 1f3858c5..90722830 100644 --- a/client/src/components/MapWrapper/index.tsx +++ b/client/src/components/MapWrapper/index.tsx @@ -31,6 +31,14 @@ const MapWrapper = ({location}: IMapWrapperProps) => {

{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_1}

{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_2}

{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_3}

+

{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_4}

+ + + + + +

{EXPLORE_COPY.NOTE_ON_TRIBAL_NATIONS.INTRO}

+

{EXPLORE_COPY.NOTE_ON_TRIBAL_NATIONS.PARA_1}

 diff --git a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap index ee7baebc..ab3bc38d 100644 --- a/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap +++ b/client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap @@ -24,9 +24,9 @@ exports[`simulate app starting up, no click on map should match the snapshot of A census tract is generally between 1,200 and 8,000 people, with an average size of 4,000 people. Census tracts are small, relatively permanent subdivisions of a county defined by the - U.S. Census Bureau and usually cover a contiguous area. The census tract level represents the - smallest geographical unit that can be presented in a statistically sound manner, given the - datasets that are being used. + U.S. Census Bureau and usually cover a contiguous area. The census tract level currently represents the + smallest geographical unit for which publicly-available and nationally-consistent datasets can + be consistently displayed on the tool. diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx index 267c1054..15b0d8f9 100644 --- a/client/src/data/copy/about.tsx +++ b/client/src/data/copy/about.tsx @@ -30,20 +30,18 @@ export const PAGE = defineMessages({ }, HEADING_2: { id: 'index.heading.justice40', - defaultMessage: 'Justice40', + defaultMessage: 'The Justice40 Initiative', description: 'heading for about justice 40', }, HEADING2_DESCRIPTION1: { id: 'about.page.sub.header.2.text.1', defaultMessage: ` 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 + Justice40 Initiative is to provide 40 percent of the overall benefits of certain Federal + investments 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. + housing, training and workforce development, the remediation and reduction of legacy pollution, + and the development of critical clean water infrastructure. `, description: 'about page sub header text', }, @@ -57,10 +55,10 @@ export const HEADING_1 = { defaultMessage={` In {eoLink} on {tacklingItalics}, President Biden directed the Council on Environmental Quality (CEQ) to create a Climate and Economic Justice Screening Tool. The purpose of the tool is to help - Federal agencies identify disadvantaged communities that have been historically - marginalized, underserved, and overburdened by pollution. The tool provides socioeconomic, - environmental, and climate information to inform decisions that may affect these communities. The - tool identifies disadvantaged communities through publicly-available, nationally-consistent, and high-quality data. + Federal agencies identify disadvantaged communities that are marginalized, underserved, and + overburdened by pollution. The current version of the tool provides socioeconomic, environmental, + and climate information to inform decisions that may affect these communities. The + tool identifies disadvantaged communities through publicly-available, nationally-consistent datasets. `} values={{ eoLink: , PARA_3: , - + PARA_4: , }; + +export const NOTE_ON_TRIBAL_NATIONS = { + INTRO: , + PARA_1: Methodology & data, + actionPlanTribalNation: , + bidenMemoNat2Nat: , + coordinateTribal: , + }} + />, +}; + export const HOW_YOU_CAN_HELP_LIST_ITEMS = { HEADING: , }; + // Indicator Categories copy constants: export const CATEGORIES = { ALL: , ALL_EXCEPT_WORKFORCE: , CLIMATE_CHANGE: { METHODOLOGY: , TITLE: , TITLE: , TITLE: , IF: , TITLE: IF, lead: lead paint, - medianHomeVal: low median home value, + medianHomeVal: median home value, houseBur: housing cost burden, }} />, @@ -346,7 +346,7 @@ export const CATEGORIES = { LEGACY_POLLUTION: { METHODOLOGY: , TITLE: , TITLE: , TITLE: , TITLE: , date10: DATE_RANGE.TEN, @@ -695,7 +696,7 @@ export const SOURCE_LINKS = { EPA_TSDF: , @@ -851,10 +852,10 @@ export const INDICATORS = [ description: , usedIn: CATEGORIES.CLEAN_ENERGY.METHODOLOGY, @@ -943,7 +944,9 @@ export const INDICATORS = [ description: , @@ -962,7 +965,8 @@ export const INDICATORS = [ description: , @@ -982,7 +986,7 @@ export const INDICATORS = [ id= {'category.traffic.vol.description.text'} defaultMessage= {` Count of vehicles (average annual daily traffic) at major roads - within 500 meters, divided by distance in meters (not km). + within 500 meters, divided by distance in meters. `} description= {'description text for traffic volume'} />, @@ -1002,7 +1006,7 @@ export const INDICATORS = [ id= {'category.house.burden.description.text'} defaultMessage= {` The percent of households in a census tract that are both earning less than 80% of HUD Area Median - Family Income by county and are paying greater than 30% of their income to housing costs. + Family Income by county and are spending more than 30% of their income on housing costs. `} description= {'description text for housing burden'} />, @@ -1022,7 +1026,7 @@ export const INDICATORS = [ id= {'category.lead.paint.description.text'} defaultMessage= {` Percent of housing units built pre-1960, used as an indicator of potential lead paint exposure in - tracts with median home values less than 90th percentile + tracts with median home values less than 90th percentile. `} description= {'description text for lead paint'} />, @@ -1037,7 +1041,7 @@ export const INDICATORS = [ }, { domID: 'median-home', - indicator: 'Low median home value', + indicator: 'Median home value', description: , @@ -1080,8 +1085,8 @@ export const INDICATORS = [ description: , @@ -1100,8 +1105,8 @@ export const INDICATORS = [ description: , @@ -1120,8 +1125,8 @@ export const INDICATORS = [ description: , @@ -1141,7 +1146,7 @@ export const INDICATORS = [ id= {'category.asthma.description.text'} defaultMessage= {` Weighted percent of people who answer “yes” to both of the following questions: “Have you ever - been told by a doctor, nurse, or other health professional that you have asthma?” and the question + been told by a doctor, nurse, or other health professional that you have asthma?” and “Do you still have asthma?” `} description= {'description text for asthma'} @@ -1199,7 +1204,7 @@ export const INDICATORS = [ }, { domID: 'life-exp', - indicator: 'Low life expectancy', + indicator: 'Life expectancy', description: Note:{` - Unlike most of the other datasets, high values of this indicator indicate low burdens. - For percentile calculations, the percentile is calculated in reverse order, so that the tract with + Unlike most of the other datasets, high values of this data indicate low burdens. + For percentile calculations of burden, the percentile is calculated in reverse order, so that the tract with the highest median income relative to area median income (lowest burden on this measure) is at the 0th percentile, and the tract with the lowest median income relative to area median income - (highest burden on this measure) is at the 100th percentile. + (highest burden on this measure) is at the 100th percentile. Tracts with the highest number + have the lowest life expectancy. `}

, }} />, @@ -1228,7 +1234,7 @@ export const INDICATORS = [ }, { domID: 'low-med-inc', - indicator: 'Low median Income', + indicator: 'Median Income', description: , @@ -1298,8 +1303,8 @@ export const INDICATORS = [ description: , @@ -1322,7 +1327,7 @@ export const INDICATORS = [ description: , }; - -// Methodology Steps: -// export const METHODOLOGY_STEPS = defineMessages({ -// HEADING: { -// id: 'methodology.steps.heading', -// defaultMessage: `Methodology`, -// description: 'heading of methodology section', -// }, -// DESCRIPTION_1: { -// id: 'methodology.steps.description.1', -// defaultMessage: 'The methodology for identifying communities of focus is'+ -// ' calculated at the census block group level. Census block geographical boundaries'+ -// ' are determined by the U.S. Census Bureau once every ten years. This tool utilizes'+ -// ' the census block boundaries from 2010.', -// description: 'first description text ', -// }, -// DESCRIPTION_2: { -// id: 'methodology.steps.description.2', -// defaultMessage: 'The following describes the process for identifying communities of focus.', -// description: 'second description text', -// }, -// STEP_1_HEADING: { -// id: 'methodology.step.1.heading', -// defaultMessage: `Gather datasets`, -// description: 'first step heading', -// }, -// STEP_1_INFO: { -// id: 'methodology.step.1.info', -// defaultMessage: `The methodology includes the following inputs that are equally weighted.`, -// description: 'first step info', -// }, -// STEP_1_A_HEADING: { -// id: 'methodology.step.1.a.heading', -// defaultMessage: `Percent of Area Median Income`, -// description: 'step 1 a heading', -// }, -// STEP_1_A_INFO_1: { -// id: 'methodology.step.1.a.info.1', -// defaultMessage: 'If a census block group is in a metropolitan area, this value is the'+ -// ' median income of the census block group calculated as a percent of'+ -// ' the metropolitan area’s median income.', -// description: 'step 1 a info 1', -// }, -// STEP_1_A_INFO_2: { -// id: 'methodology.step.1.a.info.2', -// defaultMessage: 'If a census block group is not in a metropolitan area, this value is the'+ -// ' median income of the census block group calculated as a percent of the state’s median'+ -// ' income.', -// description: 'step 1 a info 2', -// }, -// STEP_1_B_HEADING: { -// id: 'methodology.step.1.b.heading', -// defaultMessage: `Percent of households below or at 100% of the federal poverty line`, -// description: 'step 1 b heading', -// }, -// STEP_1_C_HEADING: { -// id: 'methodology.step.1.c.heading', -// defaultMessage: `The high school degree achievement rate for adults 25 years and older`, -// description: 'step 1 a heading', -// }, -// STEP_1_C_INFO: { -// id: 'methodology.step.1.c.info', -// defaultMessage: 'The percent of individuals who are 25 or older who have received a high school degree.', -// description: 'step 1 c info', -// }, -// STEP_2_HEADING: { -// id: 'methodology.step.2.heading', -// defaultMessage: `Determine communites of focus`, -// description: 'second step heading', -// }, -// STEP_2_INFO: { -// id: 'methodology.step.2.info', -// defaultMessage: `Under the existing formula, a census block group will be considered a community of focus if:`, -// description: 'second step info', -// }, -// }); - -// const FED_POVERTY_LINE_URL = 'https://www.census.gov/topics/income-poverty/poverty/guidance/poverty-measures.html'; - -// // Copy that has links or other HTML tags in them -// export const COMPLEX_METH_STEPS = { -// STEP_2_B_INFO: -// federal poverty line -// , -// }} -// />, -// FORMULA: -// (The median income is less than 80% of the area median income -//

, -// or: -//

-// OR -//

, -// livingAtPovery: -//

-// households living in poverty (at or below 100% of the federal poverty level) is greater than 20%) -//

, -// and: -//

-// AND -//

, -// education: -//

-// The high school degree achievement rate for adults 25 years and older is greater than 95% -//

, -// }} -// />, -// }; diff --git a/client/src/pages/__snapshots__/contact.test.tsx.snap b/client/src/pages/__snapshots__/contact.test.tsx.snap index dbb0cfde..149b7866 100644 --- a/client/src/pages/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/__snapshots__/contact.test.tsx.snap @@ -315,8 +315,8 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > Explore the tool - page or just use the email address provided above. Please - include the census tract ID, county, state or territory information, in addition to your feedback. + page or use the email address provided above. Please + include the census tract ID, county, and state or territory information, in addition to your feedback.

@@ -327,7 +327,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- In addition, you can provide information about data via the + In addition, you can provide feedback on the tool via this - improvement survey + survey . diff --git a/client/src/pages/__snapshots__/index.test.tsx.snap b/client/src/pages/__snapshots__/index.test.tsx.snap index d419da4a..cb7dfd74 100644 --- a/client/src/pages/__snapshots__/index.test.tsx.snap +++ b/client/src/pages/__snapshots__/index.test.tsx.snap @@ -333,10 +333,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis , President Biden directed the Council on Environmental Quality (CEQ) to create a Climate and Economic Justice Screening Tool. The purpose of the tool is to help - Federal agencies identify disadvantaged communities that have been historically - marginalized, underserved, and overburdened by pollution. The tool provides socioeconomic, - environmental, and climate information to inform decisions that may affect these communities. The - tool identifies disadvantaged communities through publicly-available, nationally-consistent, and high-quality data. + Federal agencies identify disadvantaged communities that are marginalized, underserved, and + overburdened by pollution. The current version of the tool provides socioeconomic, environmental, + and climate information to inform decisions that may affect these communities. The + tool identifies disadvantaged communities through publicly-available, nationally-consistent datasets.

@@ -364,14 +364,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" > Justice40

- Justice40 + The Justice40 Initiative

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 + Justice40 Initiative is to provide 40 percent of the overall benefits of certain Federal + investments 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. + housing, training and workforce development, the remediation and reduction of legacy pollution, + and the development of critical clean water infrastructure.

@@ -520,7 +518,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- Explore data about communities in your area and provide feedback on the tool. + Explore data about communities across the U.S., including your own, and provide feedback on the tool.

- Have ideas about how this tool can be improved to better reflect the on-the-ground experiences of your community? + + Have ideas about data and information that reflect the experiences and conditions of your community? +

- The screening tool’s code is open source, which means it is available for the public to view and contribute to. + + The tool’s code is open source, which means it is available for the public to view and contribute to it. +

- 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. + The current version of the tool identifies communities that are disadvantaged for the purposes of + the Justice40 Initiative using census tracts, which are the smallest geographic unit for + which publicly-available and nationally-consistent datasets can be consistently displayed on the + tool. Census tract geographical boundaries are determined by the U.S. Census Bureau once every ten + years. This tool uses the census tract boundaries from 2010.

@@ -331,8 +330,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- 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. + Communities are identified as disadvantaged by the current version of the tool for the purposes of + the Justice40 Initiative if they are located in census tracts that are at or above the + combined thresholds in one or more of eight categories of criteria below.

@@ -533,7 +533,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- Clean transportation + Clean transit

@@ -617,7 +617,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis - low median home value + median home value is at or less than 90th percentile OR at or above the 90th percentile for the @@ -875,7 +875,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis unemployment OR - percent individuals in households at or below 100% federal + percent individuals in households at or below 100% Federal @@ -914,7 +914,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis >

- Datasets used in methodology + Datasets used in beta methodology

+
+
+

+ + The datasets used in the current version of the tool come from a variety of sources and were + selected based on relevance, availability, and quality. The datasets seek to identify a range of + human health, environmental, climate-related, and other impacts on communities. + +

+
+
Percent of a census tract's population in households where household income is at or below - 200% of the federal poverty level. + 200% of the Federal poverty level.