From ca6ed892b2021f405eb6e35341e19c9e6608f3a2 Mon Sep 17 00:00:00 2001 From: Jordan Willis <31868510+will0684@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:30:25 -0400 Subject: [PATCH] Update dictionary terms selection + modify project page updates sections (#1056) * fix dictionary term and make updates section consistent * update dictionary mock --- __mocks__/mockStore.js | 67 ++++++++++++++++++- pages/projects/benefits-navigator/[id].js | 8 +-- pages/projects/benefits-navigator/index.js | 25 ++++--- pages/projects/dashboard/[id].js | 8 +-- pages/projects/dashboard/index.js | 26 +++---- .../digital-standards-playbook/[id].js | 8 +-- .../digital-standards-playbook/index.js | 26 +++---- .../making-easier-get-benefits/[id].js | 8 +-- .../making-easier-get-benefits/index.js | 21 ++++-- pages/projects/oas-benefits-estimator/[id].js | 8 +-- .../projects/oas-benefits-estimator/index.js | 24 ++++--- 11 files changed, 156 insertions(+), 73 deletions(-) diff --git a/__mocks__/mockStore.js b/__mocks__/mockStore.js index 9619f4f1d4..67e69eb72e 100644 --- a/__mocks__/mockStore.js +++ b/__mocks__/mockStore.js @@ -1014,6 +1014,13 @@ export const dictionaryData = { data: { dictionaryV1List: { items: [ + { + _path: + "/content/dam/decd-endc/content-fragments/sch/dictionary/opens-in-a-new-tab", + scId: "opens-in-a-new-tab", + scTermEn: "(Opens in a new tab)", + scTermFr: "(S'ouvre dans un nouvel onglet)", + }, { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/all", @@ -1028,6 +1035,20 @@ export const dictionaryData = { scTermEn: "Ended", scTermFr: "Fin", }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/explore-other-projects", + scId: "EXPLORE-OTHER-PROJECTS", + scTermEn: "Explore other projects", + scTermFr: "Explorez d'autres projets", + }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/explore-the-project", + scId: "EXPLORE-THE-PROJECT", + scTermEn: "Explore the project", + scTermFr: "Explorez le projet", + }, { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/filter-by", @@ -1035,6 +1056,27 @@ export const dictionaryData = { scTermEn: "Filter by:", scTermFr: "Filtrer par :", }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/filter-by-project", + scId: "DICTIONARY-FILTER-BY-PROJECT", + scTermEn: "Filter by project", + scTermFr: "Filtrer par projet", + }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/filter-by-project-status", + scId: "DICTIONARY-FILTER-BY-PROJECT-STATUS", + scTermEn: "Filter by project status", + scTermFr: "Filtrer par état du projet", + }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/last-updated", + scId: "LAST-UPDATED", + scTermEn: "Last updated:", + scTermFr: "Dernière mise à jour :", + }, { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/on-this-page", @@ -1060,9 +1102,16 @@ export const dictionaryData = { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/paused", scId: "PAUSED", - scTermEn: "Paused", + scTermEn: "Paused:", scTermFr: "Interrompu :", }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/posted-on", + scId: "POSTED-ON", + scTermEn: "Posted on:", + scTermFr: "Publié le :", + }, { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/project-stage", @@ -1070,6 +1119,13 @@ export const dictionaryData = { scTermEn: "Project stage:", scTermFr: "Phase du projet :", }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/project-updates", + scId: "PROJECT-UPDATES", + scTermEn: "project updates", + scTermFr: "Mises à jour du projet", + }, { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/required-information", @@ -1077,6 +1133,13 @@ export const dictionaryData = { scTermEn: "Required information", scTermFr: "Renseignements obligatoires", }, + { + _path: + "/content/dam/decd-endc/content-fragments/sclabs/dictionary/see-all-updates-project", + scId: "DICTIONARY-SEE-ALL-UPDATES-PROJECT", + scTermEn: "See all updates about this project", + scTermFr: "Consulter toutes les mises à jour de ce projet", + }, { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/started", @@ -1088,7 +1151,7 @@ export const dictionaryData = { _path: "/content/dam/decd-endc/content-fragments/sclabs/dictionary/summary", scId: "SUMMARY", - scTermEn: "Summary", + scTermEn: "Summary:", scTermFr: "Résumé :", }, { diff --git a/pages/projects/benefits-navigator/[id].js b/pages/projects/benefits-navigator/[id].js index 0dd14f4522..3d96de4c52 100644 --- a/pages/projects/benefits-navigator/[id].js +++ b/pages/projects/benefits-navigator/[id].js @@ -49,8 +49,8 @@ export default function BenefitNavigatorArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[9].scTermEn - : dictionary[9].scTermFr} + ? dictionary[13].scTermEn + : dictionary[13].scTermFr}

{pageData.scDateModifiedOverwrite} @@ -61,8 +61,8 @@ export default function BenefitNavigatorArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[4].scTermEn - : dictionary[4].scTermFr} + ? dictionary[8].scTermEn + : dictionary[8].scTermFr}

{pageData.scDateModifiedOverwrite} diff --git a/pages/projects/benefits-navigator/index.js b/pages/projects/benefits-navigator/index.js index 46665a22d7..fd3837e6c7 100644 --- a/pages/projects/benefits-navigator/index.js +++ b/pages/projects/benefits-navigator/index.js @@ -45,8 +45,8 @@ export default function BenefitsNavigatorOverview(props) { href={props.locale === "en" ? update.scPageNameEn : update.scPageNameFr} description={`${ props.locale === "en" - ? props.dictionary.items[9].scTermEn - : props.dictionary.items[9].scTermFr + ? props.dictionary.items[13].scTermEn + : props.dictionary.items[13].scTermFr } ${update.scDateModifiedOverwrite}`} /> @@ -622,15 +622,18 @@ export default function BenefitsNavigatorOverview(props) { - {/* Todo: add locale files and use i18next for translations */} -

- {props.locale === "en" - ? "Project updates" - : "Mises à jour du projet"} -

- + {updatesData.length === 0 ? null : ( +
+

+ {props.locale === "en" + ? "Project updates" + : "Mises à jour du projet"} +

+ +
+ )} diff --git a/pages/projects/dashboard/[id].js b/pages/projects/dashboard/[id].js index 94a5b8ed4a..46036c7d38 100644 --- a/pages/projects/dashboard/[id].js +++ b/pages/projects/dashboard/[id].js @@ -49,8 +49,8 @@ export default function MscaDashboardArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[9].scTermEn - : dictionary[9].scTermFr} + ? dictionary[13].scTermEn + : dictionary[13].scTermFr}

{pageData.scDateModifiedOverwrite} @@ -61,8 +61,8 @@ export default function MscaDashboardArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[4].scTermEn - : dictionary[4].scTermFr} + ? dictionary[8].scTermEn + : dictionary[8].scTermFr}

{pageData.scDateModifiedOverwrite} diff --git a/pages/projects/dashboard/index.js b/pages/projects/dashboard/index.js index 46104c7030..b257439138 100644 --- a/pages/projects/dashboard/index.js +++ b/pages/projects/dashboard/index.js @@ -46,8 +46,8 @@ export default function MscaDashboard(props) { href={props.locale === "en" ? update.scPageNameEn : update.scPageNameFr} description={`${ props.locale === "en" - ? props.dictionary.items[9].scTermEn - : props.dictionary.items[9].scTermFr + ? props.dictionary.items[13].scTermEn + : props.dictionary.items[13].scTermFr } ${update.scDateModifiedOverwrite}`} /> @@ -340,16 +340,18 @@ export default function MscaDashboard(props) { excludeH1={true} /> -

-

- {props.locale === "en" - ? "Project updates" - : "Mises à jour du projet"} -

- -
+ {updatesData.length === 0 ? null : ( +
+

+ {props.locale === "en" + ? "Project updates" + : "Mises à jour du projet"} +

+ +
+ )} ); diff --git a/pages/projects/digital-standards-playbook/[id].js b/pages/projects/digital-standards-playbook/[id].js index a126cd81f5..83f805267e 100644 --- a/pages/projects/digital-standards-playbook/[id].js +++ b/pages/projects/digital-standards-playbook/[id].js @@ -51,8 +51,8 @@ export default function DigitalStandardsArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[9].scTermEn - : dictionary[9].scTermFr} + ? dictionary[13].scTermEn + : dictionary[13].scTermFr}

{pageData.scDateModifiedOverwrite} @@ -63,8 +63,8 @@ export default function DigitalStandardsArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[4].scTermEn - : dictionary[4].scTermFr} + ? dictionary[8].scTermEn + : dictionary[8].scTermFr}

{pageData.scDateModifiedOverwrite} diff --git a/pages/projects/digital-standards-playbook/index.js b/pages/projects/digital-standards-playbook/index.js index 0428c1d09b..d342b46b31 100644 --- a/pages/projects/digital-standards-playbook/index.js +++ b/pages/projects/digital-standards-playbook/index.js @@ -43,8 +43,8 @@ export default function DigitalStandardsPlaybookPage(props) { href={props.locale === "en" ? update.scPageNameEn : update.scPageNameFr} description={`${ props.locale === "en" - ? props.dictionary.items[9].scTermEn - : props.dictionary.items[9].scTermFr + ? props.dictionary.items[13].scTermEn + : props.dictionary.items[13].scTermFr } ${update.scDateModifiedOverwrite}`} /> @@ -441,16 +441,18 @@ export default function DigitalStandardsPlaybookPage(props) {

-
-

- {props.locale === "en" - ? props.dictionary.items[11].scTermEn - : props.dictionary.items[11].scTermFr} -

- -
+ {updatesData.length === 0 ? null : ( +
+

+ {props.locale === "en" + ? "Project updates" + : "Mises à jour du projet"} +

+ +
+ )} diff --git a/pages/projects/making-easier-get-benefits/[id].js b/pages/projects/making-easier-get-benefits/[id].js index 7270672585..c1e0adcfd2 100644 --- a/pages/projects/making-easier-get-benefits/[id].js +++ b/pages/projects/making-easier-get-benefits/[id].js @@ -51,8 +51,8 @@ export default function IntegratedChannelStrategyArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[9].scTermEn - : dictionary[9].scTermFr} + ? dictionary[13].scTermEn + : dictionary[13].scTermFr}

{pageData.scDateModifiedOverwrite} @@ -63,8 +63,8 @@ export default function IntegratedChannelStrategyArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[4].scTermEn - : dictionary[4].scTermFr} + ? dictionary[8].scTermEn + : dictionary[8].scTermFr}

{pageData.scDateModifiedOverwrite} diff --git a/pages/projects/making-easier-get-benefits/index.js b/pages/projects/making-easier-get-benefits/index.js index 888f9bb238..d8dcf2c352 100644 --- a/pages/projects/making-easier-get-benefits/index.js +++ b/pages/projects/making-easier-get-benefits/index.js @@ -45,8 +45,8 @@ export default function IntegratedChannelStrategyPage(props) { href={props.locale === "en" ? update.scPageNameEn : update.scPageNameFr} description={`${ props.locale === "en" - ? props.dictionary.items[9].scTermEn - : props.dictionary.items[9].scTermFr + ? props.dictionary.items[13].scTermEn + : props.dictionary.items[13].scTermFr } ${update.scDateModifiedOverwrite}`} /> @@ -331,7 +331,7 @@ export default function IntegratedChannelStrategyPage(props) { -

+
- + {updatesData.length === 0 ? null : ( +
+

+ {props.locale === "en" + ? "Project updates" + : "Mises à jour du projet"} +

+ +
+ )}
diff --git a/pages/projects/oas-benefits-estimator/[id].js b/pages/projects/oas-benefits-estimator/[id].js index 6ab6cf1564..1658072063 100644 --- a/pages/projects/oas-benefits-estimator/[id].js +++ b/pages/projects/oas-benefits-estimator/[id].js @@ -51,8 +51,8 @@ export default function OASBenefitsEstimatorArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[9].scTermEn - : dictionary[9].scTermFr} + ? dictionary[13].scTermEn + : dictionary[13].scTermFr}

{pageData.scDateModifiedOverwrite} @@ -63,8 +63,8 @@ export default function OASBenefitsEstimatorArticles(props) { } font-bold`} > {props.locale === "en" - ? dictionary[4].scTermEn - : dictionary[4].scTermFr} + ? dictionary[8].scTermEn + : dictionary[8].scTermFr}

{pageData.scDateModifiedOverwrite} diff --git a/pages/projects/oas-benefits-estimator/index.js b/pages/projects/oas-benefits-estimator/index.js index a1047b2cf6..485c501315 100644 --- a/pages/projects/oas-benefits-estimator/index.js +++ b/pages/projects/oas-benefits-estimator/index.js @@ -44,8 +44,8 @@ export default function OasBenefitsEstimator(props) { href={props.locale === "en" ? update.scPageNameEn : update.scPageNameFr} description={`${ props.locale === "en" - ? props.dictionary.items[9].scTermEn - : props.dictionary.items[9].scTermFr + ? props.dictionary.items[13].scTermEn + : props.dictionary.items[13].scTermFr } ${update.scDateModifiedOverwrite}`} /> @@ -395,14 +395,18 @@ export default function OasBenefitsEstimator(props) { ariaExpanded={props.ariaExpanded} /> -

- {props.locale === "en" - ? props.dictionary.items[11].scTermEn - : props.dictionary.items[11].scTermFr} -

- + {updatesData.length === 0 ? null : ( +
+

+ {props.locale === "en" + ? "Project updates" + : "Mises à jour du projet"} +

+ +
+ )}