From b7904efc1a9240a202f95d6c473582849d58c414 Mon Sep 17 00:00:00 2001 From: Lebret Audrey Date: Wed, 11 Jan 2023 16:06:03 +0100 Subject: [PATCH 1/2] feat(appli): supression des logos sur la home --- __tests__/utils/main.utils.test.js | 30 ++++++++++++++++++++++++++++ pages/index.js | 32 ++++++++++++++++++++---------- src/constants/constants.js | 1 + src/utils/main.utils.js | 12 +++++++++++ 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/__tests__/utils/main.utils.test.js b/__tests__/utils/main.utils.test.js index 46db1ba2..862c1326 100644 --- a/__tests__/utils/main.utils.test.js +++ b/__tests__/utils/main.utils.test.js @@ -1,5 +1,7 @@ +import { STORAGE_SOURCE } from "../../src/constants/constants" import { getColorIconAndTextByMood, + isUiForApp, phoneNumberFormatting, updateRadioButtonSelectedInList, } from "../../src/utils/main.utils" @@ -112,4 +114,32 @@ describe("Utils", () => { expect(result).toEqual(expected) }) }) + + describe("Retourne si le widget est intégré dans l'application 1000jours en particulier ou non", () => { + beforeEach(() => { + localStorage.clear() + }) + + test("Retourne True avec la source en paramètre est `1000j-application`", () => { + expect(isUiForApp("1000j-application")).toBeTruthy() + }) + + test("Retourne False avec la source en paramètre est `1000jblues-integration`", () => { + expect(isUiForApp("1000jblues-integration")).toBeFalsy() + }) + + test("Retourne False avec aucune source en paramètre et dans le localStorage", () => { + expect(isUiForApp()).toBeFalsy() + }) + + test("Retourne True avec la source `1000j-application` dans le localStorage", () => { + localStorage.setItem(STORAGE_SOURCE, "1000j-application") + expect(isUiForApp()).toBeTruthy() + }) + + test("Retourne False avec la source `1000jblues-integration` dans le localStorage", () => { + localStorage.setItem(STORAGE_SOURCE, "1000jblues-integration") + expect(isUiForApp()).toBeFalsy() + }) + }) }) diff --git a/pages/index.js b/pages/index.js index f4fcd726..a215d2dd 100644 --- a/pages/index.js +++ b/pages/index.js @@ -11,10 +11,6 @@ import { import { useRouter } from "next/router" import { gql, useLazyQuery } from "@apollo/client" import { client, GET_TEMOIGNAGES_CHIFFRES } from "../apollo-client" -import { - convertArrayLabelsToObject, - readSourceInUrl, -} from "../src/utils/main.utils" import { EPDS_LABELS_TRANSLATION_BY_LOCALE, GET_LOCALES, @@ -24,6 +20,7 @@ import { CarouselCustom } from "../src/components/CarouselCustom" import * as AbTestingUtils from "../src/utils/ab-testing/ab-testing.utils" import * as DemographicDataUtils from "../src/utils/ab-testing/demographic-data.utils" import * as TrackerUtils from "../src/utils/tracker.utils" +import * as MainUtils from "../src/utils/main.utils" export default function Home() { const router = useRouter() @@ -37,7 +34,7 @@ export default function Home() { const [chiffresChoc, setChiffresChoc] = useState() useEffect(() => { - const paramSource = readSourceInUrl() + const paramSource = MainUtils.readSourceInUrl() setSource(paramSource) const localesQuery = async () => { @@ -89,7 +86,7 @@ export default function Home() { client: client, onCompleted: (data) => { const labelsData = data.labelsEpdsTraductions[0]?.labels - const labels = convertArrayLabelsToObject(labelsData) + const labels = MainUtils.convertArrayLabelsToObject(labelsData) setLabelsTranslated(labels) localStorage.setItem(STORAGE_LABELS, JSON.stringify(labels)) }, @@ -150,9 +147,9 @@ export default function Home() { ) - return ( -
-
+ const ImagesRfAndLogo = () => { + return ( + <> Logo république française - {getSlogan(source, labelsTranslated)} -
+ + ) + } + + return ( +
+
+ {!MainUtils.isUiForApp(source) ? ( + <> + + {getSlogan(source, labelsTranslated)} +
+ + ) : null} +