From f79d9afb2f6df931fb9c7a3046c8c62642423409 Mon Sep 17 00:00:00 2001 From: Carlos Felix <63804190+carlosfelix2@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:43:57 -0500 Subject: [PATCH] Update Rel date and hide Territory low income for Donut holes --- .../src/components/AreaDetail/AreaDetail.tsx | 40 +++++++++---------- .../__snapshots__/J40Header.test.tsx.snap | 2 +- .../__snapshots__/ReleaseUpdate.test.tsx.snap | 2 +- .../__snapshots__/UpdateBanner.test.tsx.snap | 4 +- client/src/data/copy/common.tsx | 2 +- .../tests/__snapshots__/about.test.tsx.snap | 2 +- .../tests/__snapshots__/contact.test.tsx.snap | 2 +- .../__snapshots__/downloads.test.tsx.snap | 4 +- .../freqAskedQuestions.test.tsx.snap | 2 +- .../__snapshots__/methodology.test.tsx.snap | 2 +- .../tests/__snapshots__/privacy.test.tsx.snap | 2 +- .../techSupportDoc.test.tsx.snap | 2 +- 12 files changed, 31 insertions(+), 35 deletions(-) diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx index a18b5f0f..e28c0b00 100644 --- a/client/src/components/AreaDetail/AreaDetail.tsx +++ b/client/src/components/AreaDetail/AreaDetail.tsx @@ -1025,6 +1025,17 @@ const AreaDetail = ({properties}: IAreaDetailProps) => { categories[0].indicators = [lowMedInc, unemploy, poverty]; } + const isTerritory = constants.TILES_ISLAND_AREA_FIPS_CODES.some((code) => { + return properties[constants.GEOID_PROPERTY].startsWith(code); + }); + + const isGrandfathered = properties[constants.IS_GRANDFATHERED]; + // Show Donut information !isGrandfathered + const showDonutCopy = !isGrandfathered && + properties[constants.ADJACENCY_EXCEEDS_THRESH] && + properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS] === 0; + const showIslandCopy = isTerritory && !showDonutCopy; + /** * Create the AccoridionItems by mapping over the categories array. In this array we define the * various indicators for a specific category. This is an array which then maps over the @@ -1065,12 +1076,6 @@ const AreaDetail = ({properties}: IAreaDetailProps) => { {EXPLORE_COPY.SIDE_PANEL_SPACERS.AND} - {/* Exceeds both socioeconomic burdens */} - {/* */} - {/* socioeconomic indicators */} {category.socioEcIndicators.map((indicator: any, index: number) => { return ( @@ -1192,27 +1197,18 @@ const AreaDetail = ({properties}: IAreaDetailProps) => { - {/* Show IslandCopy if the GeoID matches an island prefix */} - {constants.TILES_ISLAND_AREA_FIPS_CODES.some((code) => { - return properties[constants.GEOID_PROPERTY].startsWith(code); - }) && ( - - )} - - {/* Only show the DonutCopy if Adjacency index is true, the total number of disadv ind == 0, - and not grandfathered. */} - {properties[constants.ADJACENCY_EXCEEDS_THRESH] && - properties[constants.TOTAL_NUMBER_OF_DISADVANTAGE_INDICATORS] === 0 && - !properties[constants.IS_GRANDFATHERED] && ( + {showIslandCopy && + } + {showDonutCopy && 0 ? - properties[constants.POVERTY_BELOW_200_PERCENTILE] : - null + properties[constants.POVERTY_BELOW_200_PERCENTILE] > 0 ? + properties[constants.POVERTY_BELOW_200_PERCENTILE] : + null } /> - )} + } {/* Send Feedback button */} - The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap index 823cccfe..988ea07f 100644 --- a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap +++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap @@ -27,7 +27,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
- Version 2.0 Release update - Dec 19, 2024 + Version 2.0 Release update - Dec 20, 2024
New & Improved diff --git a/client/src/components/UpdateBanner/__snapshots__/UpdateBanner.test.tsx.snap b/client/src/components/UpdateBanner/__snapshots__/UpdateBanner.test.tsx.snap index 6a262d3b..61fb151c 100644 --- a/client/src/components/UpdateBanner/__snapshots__/UpdateBanner.test.tsx.snap +++ b/client/src/components/UpdateBanner/__snapshots__/UpdateBanner.test.tsx.snap @@ -18,7 +18,7 @@ exports[`rendering of the UpdateBanner renders large version before cutoff date

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

@@ -33,7 +33,7 @@ exports[`rendering of the UpdateBanner renders small version at cutoff date 1`] This tool has been updated. - The 2.0 version of the tool was released on Dec 19, 2024. + The 2.0 version of the tool was released on Dec 20, 2024.
diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx index bef01b63..2bd7661d 100644 --- a/client/src/data/copy/common.tsx +++ b/client/src/data/copy/common.tsx @@ -30,7 +30,7 @@ export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov'; export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb 18 2022 export const METH_1_0_RELEASE_DATE = new Date(2022, 10, 22, 11, 59, 59); // Nov 22 2022 -export const METH_2_0_RELEASE_DATE = new Date(2024, 11, 19, 11, 59, 59); // Dec 19 2024 +export const METH_2_0_RELEASE_DATE = new Date(2024, 11, 20, 11, 59, 59); // Dec 19 2024 // Update Banner diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap index 7464ebdd..c809b5e7 100644 --- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap index e52e2b0f..de16ecb1 100644 --- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap index 4761eb14..a967a4c9 100644 --- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

@@ -462,7 +462,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
- Version 2.0 Release update - Dec 19, 2024 + Version 2.0 Release update - Dec 20, 2024
New & Improved diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap index 507973b1..c500596d 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap index 6f46063e..f26f4c50 100644 --- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

diff --git a/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap b/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap index 4b2214fd..88d1f8ca 100644 --- a/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the Privacy Policy page matches Privacy Policy page snapsh

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.

diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap index 61419e17..f2dfc0c8 100644 --- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap @@ -176,7 +176,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 19, 2024. + The Council on Environmental Quality (CEQ) made the 2.0 version of the tool available on Dec 20, 2024.