publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-08-16 14:21:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Production tickets for the week of 12-5-22 (#2117)

Browse source 
* remove training from low income card

- update snaphots

* Update npm audit level

* Update query-string lib

* Remove security checks

* Adds security audit back

* Add npm and node version

* remove $

* Remove node versions

* Fix redundant IDs for en.json creation

- closes #2116
- closes #2106

* Update also copy

- update snapshots
- closes #2096

* Update public engagement video

- closes #2102
- updates snapshots

* Correct Prioritization copy >= 1
This commit is contained in:
Vim 2022-12-12 09:51:06 -08:00 • committed by GitHub
commit c5b201e1b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 2285 additions and 27269 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/components/Categories/Categories.tsx
View file

@ -31,7 +31,7 @@ const Categories = () => {
<h2>{METHODOLOGY_COPY.CATEGORY.HEADING}</h2>
<p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA3)}</p>
<p>{intl.formatMessage(METHODOLOGY_COPY.PAGE.PARA4)}</p>
<p>{METHODOLOGY_COPY.FORMULA.PARA4}</p>
<p>{METHODOLOGY_COPY.FORMULA.PARA6}</p>
</Grid>
</Grid>

2
client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap
View file

@ -23,7 +23,7 @@ exports[`rendering of indicator dataset card checks if component renders 1`] = `
<span>
Used in:
</span>
All categories except for the training and workforce development category
All categories except for the workforce development category
</li>
<li>
<span>

2
client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap
View file

@ -94,7 +94,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
<span>
Used in:
</span>
All categories except for the training and workforce development category
All categories except for the workforce development category
</li>
<li>
<span>

28
client/src/components/PrioritizationCopy2/PrioritizationCopy2.tsx
View file

@ -127,12 +127,30 @@ const PrioritizationCopy2 =
) {
// if 2-1
if (percentTractTribal !== null && percentTractTribal == 0) {
prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, true);
prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`less than 1%`, false);
// if 2-2
} else if (percentTractTribal !== null && percentTractTribal >= 0) {
prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, true);
} else if (percentTractTribal !== null && percentTractTribal >= 1) {
prioCopy2Rendered = EXPLORE_COPY.getPrioFRTCopy(`${percentTractTribal}%`, false);
}
// if 3
// if 3-1
} else if (
totalCategoriesPrioritized === 0 &&
(isAdjacencyThreshMet && !isAdjacencyLowIncome) &&
tribalCountAK === null &&
(tribalCountUS !== null && tribalCountUS >= 1) &&
(percentTractTribal !== null && percentTractTribal == 0)
) {
prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, false);
// if 3-2
} else if (
totalCategoriesPrioritized === 0 &&
(isAdjacencyThreshMet && !isAdjacencyLowIncome) &&
tribalCountAK === null &&
(tribalCountUS !== null && tribalCountUS >= 1) &&
(percentTractTribal !== null && percentTractTribal >= 1)
) {
prioCopy2Rendered = EXPLORE_COPY.getPrioFRTPointsCopy(tribalCountUS, false);
// if 3-3
} else if (
(totalCategoriesPrioritized === 0 && !(isAdjacencyThreshMet && isAdjacencyLowIncome)) &&
tribalCountAK === null &&
@ -146,7 +164,7 @@ const PrioritizationCopy2 =
isAdjacencyThreshMet && !isAdjacencyLowIncome &&
(tribalCountAK !== null && tribalCountAK >= 1)
) {
prioCopy2Rendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK, true);
prioCopy2Rendered = EXPLORE_COPY.getPrioANVCopy(tribalCountAK, false);
} else {
prioCopy2Rendered = <></>;
noStyles = true;

9
client/src/components/PublicVideoBox/PublicVideoBox.tsx
View file

@ -13,9 +13,10 @@ import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg';
interface IPublicVideoBox {
isBeta: boolean,
youTubeLink: string,
}
const PublicVideoBox = ({isBeta}:IPublicVideoBox) => {
const PublicVideoBox = ({isBeta, youTubeLink}:IPublicVideoBox) => {
const intl = useIntl();
return (
@ -32,7 +33,7 @@ const PublicVideoBox = ({isBeta}:IPublicVideoBox) => {
{isBeta ? PUBLIC_COPY.RICH_COPY.VIDEO_BOX_BODY2 : PUBLIC_COPY.RICH_COPY.VIDEO_BOX_BODY1}
<a
className={styles.publicVideoLink}
href={`https://www.youtube.com/watch?v=QwHWcXbhw28`}
href={youTubeLink}
target={'_blank'}
rel="noreferrer"
>
@ -55,7 +56,7 @@ const PublicVideoBox = ({isBeta}:IPublicVideoBox) => {
</div>
</Button>
</a>
<DownloadButton
{isBeta && <DownloadButton
downloadLink={getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT, true)}
buttonText={isBeta ?
intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.BUTTON2_BETA_TEXT) :
@ -63,7 +64,7 @@ const PublicVideoBox = ({isBeta}:IPublicVideoBox) => {
}
imageAltTagText={intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.IMG_ALT_TEXT2)}
color={isBeta ? 'gray' : 'yellow'}
/>
/>}
</SummaryBoxContent>
</SummaryBox>
);

26
client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap
View file

@ -12,16 +12,15 @@ exports[`rendering of the PublicVideoBox checks if component renders when it is
<h2
class="usa-summary-box__heading"
>
Need information about the latest version of the tool?
What's new overview
</h2>
<div
class="usa-summary-box__text"
>
See what's new in the version 1.0 of the Climate and Economic Justice Screening tool.
Watch a recorded update from CEQ on the changes in the 1.0 version of the tool.
<a
href="https://www.youtube.com/watch?v=QwHWcXbhw28"
rel="noreferrer"
target="_blank"
>
@ -41,26 +40,6 @@ exports[`rendering of the PublicVideoBox checks if component renders when it is
</div>
</button>
</a>
<a
download=""
href="//"
>
<button
class="usa-button"
data-testid="button"
type="button"
>
<div>
<div>
Download slide deck
</div>
<img
alt="the icon to show that this button will download the file"
src="test-file-stub"
/>
</div>
</button>
</a>
</div>
</div>
</div>
@ -88,7 +67,6 @@ exports[`rendering of the PublicVideoBox checks if component renders when it is
Watch a recorded version of the beta version of the CEJST training on YouTube.
<a
href="https://www.youtube.com/watch?v=QwHWcXbhw28"
rel="noreferrer"
target="_blank"
>