diff --git a/client/.env.development b/client/.env.development index 0c6c369a..a9594395 100644 --- a/client/.env.development +++ b/client/.env.development @@ -10,7 +10,7 @@ GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL=data_pipeline/data/score GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal GATSBY_BETA_SCORE_PATH = data-versions/beta/data/score -GATSBY_1_0_SCORE_PATH = data-versions/1.0/data/score +GATSBY_2_0_SCORE_PATH = data-versions/2.0/data/score GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv @@ -19,17 +19,17 @@ GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-slides.pptx -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF=downloadable/1.0-communities-list.pdf -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_ES_PDF=downloadable/1.0-communities-list-es.pdf -GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip -GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/CEQ-CEJST-Instructions.pdf -GATSBY_FILE_DL_PATH_1_0_INSTRUCT_ES_PDF=downloadable/CEQ-CEJST-Instructions-es.pdf -GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf -GATSBY_FILE_DL_PATH_1_0_TSD_PDF=downloadable/1.0-cejst-technical-support-document.pdf -GATSBY_FILE_DL_PATH_1_0_TOOL_COMP_PDF=downloadable/1.0-climate-and-environmental-burden-tool-comparison.pdf -GATSBY_FILE_DL_PATH_1_0_M_23_09_SIGNED_PDF=downloadable/M-23-09_Signed_CEQ_CPO_es.pdf +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_XLS=downloadable/2.0-communities.xlsx +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_CSV=downloadable/2.0-communities.csv +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_PDF=downloadable/2.0-communities-list.pdf +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_ES_PDF=downloadable/2.0-communities-list-es.pdf +GATSBY_FILE_DL_PATH_2_0_SHAPE_FILE_ZIP=downloadable/2.0-shapefile-codebook.zip +GATSBY_FILE_DL_PATH_2_0_INSTRUCT_PDF=downloadable/CEQ-CEJST-Instructions.pdf +GATSBY_FILE_DL_PATH_2_0_INSTRUCT_ES_PDF=downloadable/CEQ-CEJST-Instructions-es.pdf +GATSBY_FILE_DL_PATH_2_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf +GATSBY_FILE_DL_PATH_2_0_TSD_PDF=downloadable/2.0-cejst-technical-support-document.pdf +GATSBY_FILE_DL_PATH_2_0_TOOL_COMP_PDF=downloadable/2.0-climate-and-environmental-burden-tool-comparison.pdf +GATSBY_FILE_DL_PATH_2_0_M_23_09_SIGNED_PDF=downloadable/M-23-09_Signed_CEQ_CPO_es.pdf GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft-communities-list.pdf diff --git a/client/.env.production b/client/.env.production index 41ec89a8..a925c4a2 100644 --- a/client/.env.production +++ b/client/.env.production @@ -8,7 +8,7 @@ GATSBY_CDN_TILES_BASE_URL=https://dig0wsohit6js.cloudfront.net GATSBY_DATA_PIPELINE_TRIBAL_PATH=data-pipeline/data/tribal GATSBY_BETA_SCORE_PATH = data-versions/beta/data/score -GATSBY_1_0_SCORE_PATH = data-versions/1.0/data/score +GATSBY_2_0_SCORE_PATH = data-versions/2.0/data/score GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv @@ -16,17 +16,17 @@ GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-slides.pptx -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS=downloadable/1.0-communities.xlsx -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV=downloadable/1.0-communities.csv -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF=downloadable/1.0-communities-list.pdf -GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_ES_PDF=downloadable/1.0-communities-list-es.pdf -GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip -GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF=downloadable/CEQ-CEJST-Instructions.pdf -GATSBY_FILE_DL_PATH_1_0_INSTRUCT_ES_PDF=downloadable/CEQ-CEJST-Instructions-es.pdf -GATSBY_FILE_DL_PATH_1_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf -GATSBY_FILE_DL_PATH_1_0_TSD_PDF=downloadable/1.0-cejst-technical-support-document.pdf -GATSBY_FILE_DL_PATH_1_0_TOOL_COMP_PDF=downloadable/1.0-climate-and-environmental-burden-tool-comparison.pdf -GATSBY_FILE_DL_PATH_1_0_M_23_09_SIGNED_PDF=downloadable/M-23-09_Signed_CEQ_CPO_es.pdf +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_XLS=downloadable/2.0-communities.xlsx +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_CSV=downloadable/2.0-communities.csv +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_PDF=downloadable/2.0-communities-list.pdf +GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_ES_PDF=downloadable/2.0-communities-list-es.pdf +GATSBY_FILE_DL_PATH_2_0_SHAPE_FILE_ZIP=downloadable/2.0-shapefile-codebook.zip +GATSBY_FILE_DL_PATH_2_0_INSTRUCT_PDF=downloadable/CEQ-CEJST-Instructions.pdf +GATSBY_FILE_DL_PATH_2_0_INSTRUCT_ES_PDF=downloadable/CEQ-CEJST-Instructions-es.pdf +GATSBY_FILE_DL_PATH_2_0_COMP_CHART_PDF=downloadable/total-comparison-chart.pdf +GATSBY_FILE_DL_PATH_2_0_TSD_PDF=downloadable/2.0-cejst-technical-support-document.pdf +GATSBY_FILE_DL_PATH_2_0_TOOL_COMP_PDF=downloadable/2.0-climate-and-environmental-burden-tool-comparison.pdf +GATSBY_FILE_DL_PATH_2_0_M_23_09_SIGNED_PDF=downloadable/M-23-09_Signed_CEQ_CPO_es.pdf GATSBY_FILE_DL_PATH_TSD_ES_PDF=downloadable/cejst-technical-support-document-es.pdf GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF=downloadable/draft-communities-list.pdf diff --git a/client/src/components/MapTractLayers/MapTractLayers.tsx b/client/src/components/MapTractLayers/MapTractLayers.tsx index 7970d4d1..c36295e8 100644 --- a/client/src/components/MapTractLayers/MapTractLayers.tsx +++ b/client/src/components/MapTractLayers/MapTractLayers.tsx @@ -24,7 +24,7 @@ interface IMapTractLayers { export const featureURLForTilesetName = (tilesetName: string): string => { const flags = useFlags(); - const pipelineStagingBaseURL = `https://justice40-data.s3.amazonaws.com/data-pipeline-staging`; + const pipelineStagingBaseURL = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-pipeline-staging`; const XYZ_SUFFIX = '{z}/{x}/{y}.pbf'; if ('stage_hash' in flags) { @@ -44,7 +44,7 @@ export const featureURLForTilesetName = (tilesetName: string): string => { const featureTilePath = process.env.DATA_SOURCE === 'local' ? process.env.GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL : - process.env.GATSBY_1_0_SCORE_PATH; + process.env.GATSBY_2_0_SCORE_PATH; return [ featureTileBaseURL, diff --git a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx index 57b4f3e4..fc509e81 100644 --- a/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx +++ b/client/src/components/ReleaseUpdate/ReleaseUpdate.tsx @@ -77,195 +77,195 @@ const ReleaseUpdate = ({}: IReleaseUpdateProps) => {
- {DOWNLOAD_COPY.RELEASE_1_0.UPDATE_1} + {DOWNLOAD_COPY.RELEASE_2_0.UPDATE_1}
- {DOWNLOAD_COPY.RELEASE_1_0.SECTION1} + {DOWNLOAD_COPY.RELEASE_2_0.SECTION1}
- {DOWNLOAD_COPY.RELEASE_1_0.SECTION2} + {DOWNLOAD_COPY.RELEASE_2_0.SECTION2}
- {DOWNLOAD_COPY.RELEASE_1_0.FOOTER} + {DOWNLOAD_COPY.RELEASE_2_0.FOOTER}
diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx index 4326ef4b..78a15480 100644 --- a/client/src/data/copy/about.tsx +++ b/client/src/data/copy/about.tsx @@ -12,16 +12,16 @@ export const FAQS_LINK = 'https://www.whitehouse.gov/wp-content/uploads/2022/02/ export const FED_RECOGNIZED_INDIAN_ENTITIES = `https://www.federalregister.gov/documents/2022/01/28/2022-01789/indian-entities-recognized-by-and-eligible-to-receive-services-from-the-united-states-bureau-of`; export const EJSCREEN = 'https://www.epa.gov/ejscreen/how-does-epa-use-ejscreen'; -export const CEJST_INSTRUCT = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/CEQ-CEJST-Instructions.pdf`; -export const CEJST_INSTRUCT_ES = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/CEQ-CEJST-Instructions-es.pdf`; +export const CEJST_INSTRUCT = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/CEQ-CEJST-Instructions.pdf`; +export const CEJST_INSTRUCT_ES = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/CEQ-CEJST-Instructions-es.pdf`; export const CEJST_MEMO = `https://www.whitehouse.gov/wp-content/uploads/2023/01/M-23-09_Signed_CEQ_CPO.pdf`; -export const CEJST_MEMO_ES = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/M-23-09_Signed_CEQ_CPO_es.pdf`; +export const CEJST_MEMO_ES = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/M-23-09_Signed_CEQ_CPO_es.pdf`; -export const USE_MAP_TUTORIAL_LINK = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/Using-the-CEJST-Tutorial.pdf`; -export const USE_MAP_TUTORIAL_LINK_ES = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/Using-the-CEJST-Tutorial-es.pdf`; -export const USE_DATA_TUTORIAL_LINK = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/Using-the-CEJST-Spreadsheet-Tutorial.pdf`; -export const USE_DATA_TUTORIAL_LINK_ES = `https://static-data-screeningtool.geoplatform.gov/data-versions/1.0/data/score/downloadable/Using-the-CEJST-Spreadsheet-Tutorial-es.pdf`; +export const USE_MAP_TUTORIAL_LINK = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/Using-the-CEJST-Tutorial.pdf`; +export const USE_MAP_TUTORIAL_LINK_ES = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/Using-the-CEJST-Tutorial-es.pdf`; +export const USE_DATA_TUTORIAL_LINK = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/Using-the-CEJST-Spreadsheet-Tutorial.pdf`; +export const USE_DATA_TUTORIAL_LINK_ES = process.env.GATSBY_CDN_TILES_BASE_URL +`/data-versions/2.0/data/score/downloadable/Using-the-CEJST-Spreadsheet-Tutorial-es.pdf`; export const GITHUB_LINK = 'https://github.com/usds/justice40-tool'; export const GITHUB_LINK_ES = 'https://github.com/usds/justice40-tool/blob/main/README-es.md'; diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx index 1433615f..f9248517 100644 --- a/client/src/data/copy/common.tsx +++ b/client/src/data/copy/common.tsx @@ -28,7 +28,7 @@ export const linkFn = (to:string | IDefineMessage, isInternal:boolean, isOpenNew export const FEEDBACK_EMAIL = 'Screeningtool-Support@omb.eop.gov'; -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(2022, 10, 22, 11, 59, 59); // Nov 22 2022 export const METH_BETA_RELEASE_DATE = new Date(2022, 1, 18, 11, 59, 59); // Feb 18 2022 @@ -40,7 +40,7 @@ export const BETA_BANNER_CONTENT = { return [ process.env.GATSBY_CDN_TILES_BASE_URL, - (isBeta ? process.env.GATSBY_BETA_SCORE_PATH : process.env.GATSBY_1_0_SCORE_PATH), + (isBeta ? process.env.GATSBY_BETA_SCORE_PATH : process.env.GATSBY_2_0_SCORE_PATH), filePath, ].join('/'); }; @@ -41,58 +41,58 @@ export const DOWNLOAD_FILES = { NARWAL: { COMMUNITIES_LIST_XLS: { SIZE: 35.6, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_XLS, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_XLS, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, COMMUNITIES_LIST_CSV: { SIZE: 42, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_CSV, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_CSV, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, SHAPE_FILE: { SIZE: 356.8, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_SHAPE_FILE_ZIP, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, TSD: { SIZE: 4.4, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_TSD_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_TSD_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, TSD_ES: { SIZE: 4.8, // MB URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, HOW_TO_COMMUNITIES: { SIZE: 687.9, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, HOW_TO_COMMUNITIES_ES: { SIZE: 761.8, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_COMMUNITIES_LIST_ES_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_ES_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, INSTRUCTIONS: { SIZE: 228.4, // KB // Todo: Update when actual file is uploaded - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_INSTRUCT_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_INSTRUCT_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, INSTRUCTIONS_ES: { SIZE: 173.6, // KB // Todo: Update when actual file is uploaded - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_INSTRUCT_ES_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_INSTRUCT_ES_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, COMP_CHART: { SIZE: 33.1, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_TOOL_COMP_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_TOOL_COMP_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, M_23_09_ES: { SIZE: 120.5, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_1_0_M_23_09_SIGNED_PDF, false), - LAST_UPDATED: COMMON_COPY.METH_1_0_RELEASE_DATE, + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_M_23_09_SIGNED_PDF, false), + LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, }, BETA: { @@ -138,7 +138,7 @@ export const getDownloadIconAltTag = () => defineMessages({ }, }); -export const RELEASE_1_0 = { +export const RELEASE_2_0 = { UPDATE_1: , releaseDate: @@ -614,7 +614,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis @@ -681,7 +681,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap index a337eaa5..d3d90ca8 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -490,7 +490,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis