From 85e5812191fd4804c11a4eb03aa561c42a5aa78e Mon Sep 17 00:00:00 2001 From: Carlos Felix <63804190+carlosfelix2@users.noreply.github.com> Date: Tue, 10 Dec 2024 11:58:31 -0500 Subject: [PATCH] Updated methodology version and Git URL for the UI --- .../tests/__snapshots__/datasetContainer.test.tsx.snap | 2 +- client/src/components/J40Footer/J40Footer.tsx | 2 +- .../J40Footer/__snapshots__/J40Footer.spec.tsx.snap | 2 +- .../__snapshots__/ReleaseUpdate.test.tsx.snap | 4 ++-- client/src/constants.tsx | 2 ++ client/src/data/copy/about.tsx | 3 --- client/src/data/copy/common.tsx | 3 ++- client/src/data/copy/methodology.tsx | 2 +- client/src/intl/en.json | 1 - client/src/pages/about.tsx | 3 ++- .../src/pages/tests/__snapshots__/about.test.tsx.snap | 6 +++--- .../pages/tests/__snapshots__/contact.test.tsx.snap | 2 +- .../pages/tests/__snapshots__/downloads.test.tsx.snap | 10 +++++----- .../__snapshots__/freqAskedQuestions.test.tsx.snap | 2 +- .../tests/__snapshots__/methodology.test.tsx.snap | 4 ++-- .../pages/tests/__snapshots__/publicEng.test.tsx.snap | 4 ++-- .../tests/__snapshots__/techSupportDoc.test.tsx.snap | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 client/src/constants.tsx diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap index cd01e52e..2974077a 100644 --- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap +++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap @@ -19,7 +19,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >

- Datasets used in v1.0 methodology + Datasets used in v2.0 methodology

diff --git a/client/src/components/J40Footer/J40Footer.tsx b/client/src/components/J40Footer/J40Footer.tsx index 0a7b6d31..603f6572 100644 --- a/client/src/components/J40Footer/J40Footer.tsx +++ b/client/src/components/J40Footer/J40Footer.tsx @@ -14,7 +14,7 @@ import SurveyButton from '../SurveyButton'; // @ts-ignore import whitehouseIcon from '../../images/eop-seal.svg'; import * as COMMON_COPY from '../../data/copy/common'; -import {GITHUB_LINK, GITHUB_LINK_ES} from '../../../src/data/copy/about'; +import {GITHUB_LINK, GITHUB_LINK_ES} from '../../constants'; const J40Footer = () => { const intl = useIntl(); diff --git a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap index 9e41a4d8..b260f699 100644 --- a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap +++ b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap @@ -161,7 +161,7 @@ exports[`J40Footer renders correctly 1`] = ` diff --git a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap index 984de718..f00e19bf 100644 --- a/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap +++ b/client/src/components/ReleaseUpdate/__snapshots__/ReleaseUpdate.test.tsx.snap @@ -26,7 +26,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] = >
- Version 1.0 Release update - Nov 22, 2022 + Version 2.0 Release update - Nov 22, 2022
New & improved @@ -237,7 +237,7 @@ exports[`rendering of ReleaseUpdate Component checks if component renders 1`] =
- release version 1.0 + release version 2.0
diff --git a/client/src/constants.tsx b/client/src/constants.tsx new file mode 100644 index 00000000..e5db74f1 --- /dev/null +++ b/client/src/constants.tsx @@ -0,0 +1,2 @@ +export const GITHUB_LINK = 'https://github.com/DOI-DO/ceq-j40-cejst-2'; +export const GITHUB_LINK_ES = `${GITHUB_LINK}/blob/main/README-es.md`; diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx index 78a15480..29214fd3 100644 --- a/client/src/data/copy/about.tsx +++ b/client/src/data/copy/about.tsx @@ -23,9 +23,6 @@ export const USE_MAP_TUTORIAL_LINK_ES = process.env.GATSBY_CDN_TILES_BASE_URL +` 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'; - export const PAGE = defineMessages({ TITLE: { id: 'about.page.title.text', diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx index f9248517..51651839 100644 --- a/client/src/data/copy/common.tsx +++ b/client/src/data/copy/common.tsx @@ -5,6 +5,7 @@ import {FormattedDate, FormattedMessage} from 'gatsby-plugin-intl'; import {defineMessages} from 'react-intl'; import LinkTypeWrapper from '../../components/LinkTypeWrapper'; import DownloadLink from '../../components/DownloadLink'; +import {GITHUB_LINK} from '../../constants'; export interface IDefineMessage { id: string, @@ -234,7 +235,7 @@ export const FOOTER = defineMessages({ }, GITHUB_LINK: { id: 'common.pages.footer.gatsby.link', - defaultMessage: 'https://github.com/usds/justice40-tool', + defaultMessage: GITHUB_LINK, description: 'Navigate to the about page. This is Footer find contact link text', }, CONTACT: { diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx index 802ce85d..a1086ce3 100644 --- a/client/src/data/copy/methodology.tsx +++ b/client/src/data/copy/methodology.tsx @@ -4,7 +4,7 @@ import {defineMessages} from 'react-intl'; import {FormattedMessage} from 'gatsby-plugin-intl'; import {boldFn, linkFn, simpleLink} from './common'; -export const VERSION_NUMBER = (1.0).toFixed(1); +export const VERSION_NUMBER = (2.0).toFixed(1); export const PAGE = defineMessages({ TILE: { diff --git a/client/src/intl/en.json b/client/src/intl/en.json index 25fd22f1..2f1d74d5 100644 --- a/client/src/intl/en.json +++ b/client/src/intl/en.json @@ -172,7 +172,6 @@ "description": "Navigate to the about page. This is Footer FOIA link text" }, "common.pages.footer.gatsby.link": { - "defaultMessage": "https://github.com/usds/justice40-tool", "description": "Navigate to the about page. This is Footer find contact link text" }, "common.pages.footer.github.link.text": { diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx index 9a69e598..7cf1bf23 100644 --- a/client/src/pages/about.tsx +++ b/client/src/pages/about.tsx @@ -12,6 +12,7 @@ import DatasetsButton from '../components/DatasetsButton'; import SubPageNav from '../components/SubPageNav'; import * as ABOUT_COPY from '../data/copy/about'; +import {GITHUB_LINK, GITHUB_LINK_ES} from '../constants'; import {FEEDBACK_EMAIL} from '../data/copy/common'; import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; @@ -164,7 +165,7 @@ const AboutPage = ({location}: IAboutPageProps) => { imgSrc={githubIcon} header={intl.formatMessage(ABOUT_COPY.GET_INVOLVED.JOIN_OSC_HEADING)} linkText={intl.formatMessage(ABOUT_COPY.GET_INVOLVED.JOIN_OSC_LINK_TEXT)} - url={intl.locale === 'es' ? ABOUT_COPY.GITHUB_LINK_ES : ABOUT_COPY.GITHUB_LINK} + url={intl.locale === 'es' ? GITHUB_LINK_ES : GITHUB_LINK} openUrlNewTab={true} internal={false}>

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

- 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 1.0. + 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 2.0. @@ -1047,7 +1047,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap index 183e4778..6c6e9dfb 100644 --- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap @@ -626,7 +626,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap index f0f2c0d8..05eec403 100644 --- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap @@ -431,7 +431,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

- Version 1.0 file formats + Version 2.0 file formats

@@ -458,7 +458,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis >
- Version 1.0 Release update - Nov 22, 2022 + Version 2.0 Release update - Nov 22, 2022
New & improved @@ -669,14 +669,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
- release version 1.0 + release version 2.0

- The dataset used in the 1.0 version of the tool, along with a codebook, and information about how to use the list of communities (.pdf) are available for download: + The dataset used in the 2.0 version of the tool, along with a codebook, and information about how to use the list of communities (.pdf) are available for download:

@@ -926,7 +926,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 d3d90ca8..a563787d 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -1460,7 +1460,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap index 5862755e..113c72bc 100644 --- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap @@ -1040,7 +1040,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >

- Datasets used in v1.0 methodology + Datasets used in v2.0 methodology

@@ -3307,7 +3307,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap index 076a44ef..871b10da 100644 --- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap @@ -486,7 +486,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >

- Upcoming events for CEJST version 1.0 + Upcoming events for CEJST version 2.0

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