From a98a41061cae23c5cf61d8e2bfa7fa5efd050f82 Mon Sep 17 00:00:00 2001
From: victor <victor.zeinstra@gmail.com>
Date: Thu, 23 Jan 2025 18:29:26 +0100
Subject: [PATCH] refactor: localstorage should not send events

---
 .../ContributionGenericAgreementSearch.tsx    | 17 ++++++--
 .../contributions/ContributionLayout.tsx      |  5 ++-
 .../DisplayContentContribution.test.tsx.snap  | 30 +++++++-------
 .../__tests__/contributions.test.tsx          | 19 ++++++---
 .../AgreementSearch/AgreementSearchForm.tsx   |  9 ++---
 .../AgreementSearch/AgreementSearchInput.tsx  |  4 +-
 .../__tests__/AgreementSearchForm.test.tsx    | 39 ++++++++++++-------
 .../convention-collective/__tests__/ui.ts     |  8 ++++
 .../EnterpriseAgreementSearch/__tests__/ui.ts |  8 ----
 9 files changed, 84 insertions(+), 55 deletions(-)

diff --git a/packages/code-du-travail-frontend/src/modules/contributions/ContributionGenericAgreementSearch.tsx b/packages/code-du-travail-frontend/src/modules/contributions/ContributionGenericAgreementSearch.tsx
index 9315230091..98cfa66e3d 100644
--- a/packages/code-du-travail-frontend/src/modules/contributions/ContributionGenericAgreementSearch.tsx
+++ b/packages/code-du-travail-frontend/src/modules/contributions/ContributionGenericAgreementSearch.tsx
@@ -19,17 +19,27 @@ type Props = {
   onAgreementSelect: (agreement?: EnterpriseAgreement, mode?: string) => void;
   onDisplayClick: (ev: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void;
   contribution: Contribution;
+  defaultAgreement?: EnterpriseAgreement;
 };
 
 export function ContributionGenericAgreementSearch({
   contribution,
   onAgreementSelect,
   onDisplayClick,
+  defaultAgreement,
 }: Props) {
   const { slug, isNoCDT } = contribution;
 
   const [selectedAgreement, setSelectedAgreement] =
     useState<EnterpriseAgreement>();
+  const [isValid, setIsValid] = useState(
+    defaultAgreement ? isAgreementValid(contribution, defaultAgreement) : false
+  );
+  useEffect(() => {
+    setIsValid(
+      isAgreementValid(contribution, selectedAgreement ?? defaultAgreement)
+    );
+  }, [selectedAgreement, defaultAgreement]);
   const selectedAgreementAlert = (agreement: EnterpriseAgreement) => {
     const isSupported = isCCSupported(contribution, agreement);
     const isUnextended = isCCUnextended(contribution, agreement);
@@ -98,13 +108,14 @@ export function ContributionGenericAgreementSearch({
                 ? "La convention collective est nécessaire pour obtenir une réponse car le code du travail ne prévoit rien sur ce sujet."
                 : "La réponse dépend de la convention collective à laquelle votre entreprise est rattachée. Veuillez renseigner votre situation afin d’obtenir une réponse adaptée."
             }
+            defaultAgreement={defaultAgreement}
           />
-          {(!contribution.isNoCDT || selectedAgreement) && (
+          {((contribution.isNoCDT && isValid) || !contribution.isNoCDT) && (
             <Button
               className={fr.cx("fr-mt-2w")}
               linkProps={{
-                href: selectedAgreement
-                  ? `/contribution/${selectedAgreement.num}-${slug}`
+                href: isValid
+                  ? `/contribution/${(selectedAgreement ?? defaultAgreement)?.num}-${slug}`
                   : "",
                 onClick: onDisplayClick,
               }}
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/ContributionLayout.tsx b/packages/code-du-travail-frontend/src/modules/contributions/ContributionLayout.tsx
index ea9fe0eea7..d8f6431c37 100644
--- a/packages/code-du-travail-frontend/src/modules/contributions/ContributionLayout.tsx
+++ b/packages/code-du-travail-frontend/src/modules/contributions/ContributionLayout.tsx
@@ -16,6 +16,7 @@ import { ContributionAgreementSelect } from "./ContributionAgreemeentSelect";
 import { ContributionAgreementContent } from "./ContributionAgreementContent";
 import { Contribution } from "./type";
 import { A11yLink } from "../../common/A11yLink";
+import { useLocalStorageForAgreement } from "../common/useLocalStorage";
 
 type Props = {
   contribution: Contribution;
@@ -37,7 +38,7 @@ export function ContributionLayout({ contribution }: Props) {
 
   const [displayGeneric, setDisplayGeneric] = useState(false);
   const [selectedAgreement, setSelectedAgreement] =
-    useState<EnterpriseAgreement>();
+    useLocalStorageForAgreement();
   const {
     emitAgreementTreatedEvent,
     emitAgreementUntreatedEvent,
@@ -101,6 +102,7 @@ export function ContributionLayout({ contribution }: Props) {
             contribution={contribution}
             onAgreementSelect={(agreement, mode) => {
               setSelectedAgreement(agreement);
+              setDisplayGeneric(false);
               if (!agreement) return;
               switch (mode) {
                 case "p1":
@@ -133,6 +135,7 @@ export function ContributionLayout({ contribution }: Props) {
                 emitDisplayAgreementContent(getTitle());
               }
             }}
+            defaultAgreement={selectedAgreement}
           />
         </>
       ) : (
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/__tests__/__snapshots__/DisplayContentContribution.test.tsx.snap b/packages/code-du-travail-frontend/src/modules/contributions/__tests__/__snapshots__/DisplayContentContribution.test.tsx.snap
index b7b9d1023d..3d1362dcbd 100644
--- a/packages/code-du-travail-frontend/src/modules/contributions/__tests__/__snapshots__/DisplayContentContribution.test.tsx.snap
+++ b/packages/code-du-travail-frontend/src/modules/contributions/__tests__/__snapshots__/DisplayContentContribution.test.tsx.snap
@@ -52,10 +52,10 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                       class="fr-accordion__title"
                     >
                       <button
-                        aria-controls="b95d9272-7473-4694-b02a-7f46f641cd8d-collapse"
+                        aria-controls="fb3e4700-1a45-42e0-9277-15475b951211-collapse"
                         aria-expanded="false"
                         class="fr-accordion__btn"
-                        id="b95d9272-7473-4694-b02a-7f46f641cd8d__toggle-btn"
+                        id="fb3e4700-1a45-42e0-9277-15475b951211__toggle-btn"
                         type="button"
                       >
                         Congés payés
@@ -63,7 +63,7 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                     </h4>
                     <div
                       class="fr-collapse"
-                      id="b95d9272-7473-4694-b02a-7f46f641cd8d-collapse"
+                      id="fb3e4700-1a45-42e0-9277-15475b951211-collapse"
                     >
                       <div>
                         <div
@@ -80,10 +80,10 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                                 class="fr-accordion__title"
                               >
                                 <button
-                                  aria-controls="c5a9a538-7207-4675-99ff-0805b22fe1e6-collapse"
+                                  aria-controls="44f5add2-42a4-4bec-8845-5e3e658473b9-collapse"
                                   aria-expanded="false"
                                   class="fr-accordion__btn"
-                                  id="c5a9a538-7207-4675-99ff-0805b22fe1e6__toggle-btn"
+                                  id="44f5add2-42a4-4bec-8845-5e3e658473b9__toggle-btn"
                                   type="button"
                                 >
                                   
@@ -93,7 +93,7 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                               </h5>
                               <div
                                 class="fr-collapse"
-                                id="c5a9a538-7207-4675-99ff-0805b22fe1e6-collapse"
+                                id="44f5add2-42a4-4bec-8845-5e3e658473b9-collapse"
                               >
                                 <div>
                                   <p>
@@ -114,10 +114,10 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                                 class="fr-accordion__title"
                               >
                                 <button
-                                  aria-controls="24022d69-ef1f-49b1-94c7-e91dae4e8ad1-collapse"
+                                  aria-controls="d0aa7deb-a17e-478e-97cc-6b35300dc578-collapse"
                                   aria-expanded="false"
                                   class="fr-accordion__btn"
-                                  id="24022d69-ef1f-49b1-94c7-e91dae4e8ad1__toggle-btn"
+                                  id="d0aa7deb-a17e-478e-97cc-6b35300dc578__toggle-btn"
                                   type="button"
                                 >
                                   
@@ -127,7 +127,7 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                               </h5>
                               <div
                                 class="fr-collapse"
-                                id="24022d69-ef1f-49b1-94c7-e91dae4e8ad1-collapse"
+                                id="d0aa7deb-a17e-478e-97cc-6b35300dc578-collapse"
                               >
                                 <div>
                                   <p>
@@ -149,10 +149,10 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                                 class="fr-accordion__title"
                               >
                                 <button
-                                  aria-controls="817700f8-ba7c-4643-a6dc-5cfcb1d0feb1-collapse"
+                                  aria-controls="ea238161-2712-4e62-bde2-410e4b904934-collapse"
                                   aria-expanded="false"
                                   class="fr-accordion__btn"
-                                  id="817700f8-ba7c-4643-a6dc-5cfcb1d0feb1__toggle-btn"
+                                  id="ea238161-2712-4e62-bde2-410e4b904934__toggle-btn"
                                   type="button"
                                 >
                                   Licenciement notifié pendant les congés payés
@@ -160,7 +160,7 @@ exports[`DisplayContentContribution Accordions should not fail if no summary tag
                               </h5>
                               <div
                                 class="fr-collapse"
-                                id="817700f8-ba7c-4643-a6dc-5cfcb1d0feb1-collapse"
+                                id="ea238161-2712-4e62-bde2-410e4b904934-collapse"
                               >
                                 <div>
                                   <p>
@@ -273,10 +273,10 @@ exports[`DisplayContentContribution Accordions should replace details element wi
                     class="fr-accordion__title"
                   >
                     <button
-                      aria-controls="44ee4e1a-3945-4fee-b603-cae2e71de684-collapse"
+                      aria-controls="8dec1493-8d8a-4c7d-bade-12c7d13ae062-collapse"
                       aria-expanded="false"
                       class="fr-accordion__btn"
-                      id="44ee4e1a-3945-4fee-b603-cae2e71de684__toggle-btn"
+                      id="8dec1493-8d8a-4c7d-bade-12c7d13ae062__toggle-btn"
                       type="button"
                     >
                       Ceci est un sous titre
@@ -284,7 +284,7 @@ exports[`DisplayContentContribution Accordions should replace details element wi
                   </h4>
                   <div
                     class="fr-collapse"
-                    id="44ee4e1a-3945-4fee-b603-cae2e71de684-collapse"
+                    id="8dec1493-8d8a-4c7d-bade-12c7d13ae062-collapse"
                   >
                     <div>
                       <p>
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/__tests__/contributions.test.tsx b/packages/code-du-travail-frontend/src/modules/contributions/__tests__/contributions.test.tsx
index 8bbc2fb2bf..bac71fb322 100644
--- a/packages/code-du-travail-frontend/src/modules/contributions/__tests__/contributions.test.tsx
+++ b/packages/code-du-travail-frontend/src/modules/contributions/__tests__/contributions.test.tsx
@@ -89,6 +89,7 @@ describe("<ContributionLayout />", () => {
       rendering = render(<ContributionLayout contribution={contribution} />);
     });
     it("should display correctly when no agreement is selected", async () => {
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       expect(ccUi.buttonDisplayInfo.query()).toBeInTheDocument();
       expect(ui.generic.linkDisplayInfo.query()).toBeInTheDocument();
       expect(ui.generic.title.query()).toBeInTheDocument();
@@ -113,6 +114,7 @@ describe("<ContributionLayout />", () => {
           },
         ])
       );
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       expect(ui.generic.linkDisplayInfo.query()).toBeInTheDocument();
       fireEvent.change(ccUi.searchByName.input.get(), {
         target: { value: "16" },
@@ -125,7 +127,7 @@ describe("<ContributionLayout />", () => {
         "/contribution/16-slug"
       );
       expect(ccUi.warning.nonTreatedAgreement.query()).not.toBeInTheDocument();
-      expect(sendEvent).toHaveBeenLastCalledWith({
+      expect(sendEvent).toHaveBeenCalledWith({
         action: "cc_select_traitée",
         category: "outil",
         name: "0016",
@@ -133,13 +135,13 @@ describe("<ContributionLayout />", () => {
     });
 
     it("should display correctly when a selecting agreement 3239", async () => {
-      fireEvent.click(entrepriseUi.radio.enterpriseSearchOption.get());
+      fireEvent.click(ccUi.radio.enterpriseSearchOption.get());
       fireEvent.click(ccUi.searchByEnterprise.noEnterprise.get());
       expect(ccUi.buttonDisplayInfo.query()).toHaveAttribute(
         "href",
         "/contribution/3239-slug"
       );
-      expect(sendEvent).toHaveBeenLastCalledWith({
+      expect(sendEvent).toHaveBeenCalledWith({
         action: "cc_select_traitée",
         category: "outil",
         name: "3239",
@@ -163,6 +165,7 @@ describe("<ContributionLayout />", () => {
           },
         ])
       );
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       fireEvent.change(ccUi.searchByName.input.get(), {
         target: { value: "1388" },
       });
@@ -174,7 +177,7 @@ describe("<ContributionLayout />", () => {
       expect(ccUi.buttonDisplayInfo.query()).toHaveAttribute("href", "");
       expect(ccUi.warning.title.query()).toBeInTheDocument();
       expect(ccUi.warning.nonTreatedAgreement.query()).toBeInTheDocument();
-      expect(sendEvent).toHaveBeenLastCalledWith({
+      expect(sendEvent).toHaveBeenCalledWith({
         action: "cc_select_non_traitée",
         category: "outil",
         name: "1388",
@@ -194,6 +197,7 @@ describe("<ContributionLayout />", () => {
       );
     });
     it("should display correctly when no agreement is selected", () => {
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       expect(ui.generic.noCdtDescription.query()).toBeInTheDocument();
       expect(ui.generic.linkDisplayInfo.query()).not.toBeInTheDocument();
       expect(ccUi.buttonDisplayInfo.query()).not.toBeInTheDocument();
@@ -214,6 +218,7 @@ describe("<ContributionLayout />", () => {
           },
         ])
       );
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       expect(ccUi.buttonDisplayInfo.query()).not.toBeInTheDocument();
       fireEvent.change(ccUi.searchByName.input.get(), {
         target: { value: "16" },
@@ -225,7 +230,7 @@ describe("<ContributionLayout />", () => {
         "/contribution/16-slug"
       );
       expect(ccUi.warning.nonTreatedAgreement.query()).not.toBeInTheDocument();
-      expect(sendEvent).toHaveBeenLastCalledWith({
+      expect(sendEvent).toHaveBeenCalledWith({
         action: "cc_select_traitée",
         category: "outil",
         name: "0016",
@@ -249,6 +254,7 @@ describe("<ContributionLayout />", () => {
           },
         ])
       );
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       fireEvent.change(ccUi.searchByName.input.get(), {
         target: { value: "1388" },
       });
@@ -263,7 +269,7 @@ describe("<ContributionLayout />", () => {
       expect(
         rendering.getByText(new RegExp(contribution.messageBlockGenericNoCDT))
       ).toBeInTheDocument();
-      expect(sendEvent).toHaveBeenLastCalledWith({
+      expect(sendEvent).toHaveBeenCalledWith({
         action: "cc_select_non_traitée",
         category: "outil",
         name: "1388",
@@ -288,6 +294,7 @@ describe("<ContributionLayout />", () => {
           },
         ])
       );
+      fireEvent.click(ccUi.radio.agreementSearchOption.get());
       fireEvent.change(ccUi.searchByName.input.get(), {
         target: { value: "29" },
       });
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchForm.tsx b/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchForm.tsx
index ccf09b45b8..e89d911bd8 100644
--- a/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchForm.tsx
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchForm.tsx
@@ -15,17 +15,18 @@ type Props = {
   selectedAgreementAlert?: (
     agreement?: EnterpriseAgreement
   ) => NonNullable<ReactNode> | undefined;
+  defaultAgreement?: EnterpriseAgreement;
 };
 
 export const AgreementSearchForm = ({
   description,
   onAgreementSelect,
   selectedAgreementAlert,
+  defaultAgreement,
 }: Props) => {
-  const [storageAgreement, setStorageAgreement] = useLocalStorageForAgreement();
   const [mode, setMode] = useState<
     "agreementSearch" | "enterpriseSearch" | "noSearch" | undefined
-  >(!!storageAgreement ? "agreementSearch" : undefined);
+  >(!!defaultAgreement ? "agreementSearch" : undefined);
 
   return (
     <>
@@ -58,17 +59,15 @@ export const AgreementSearchForm = ({
         <AgreementSearchInput
           onAgreementSelect={(agreement) => {
             if (onAgreementSelect) onAgreementSelect(agreement, "p1");
-            setStorageAgreement(agreement);
           }}
           selectedAgreementAlert={selectedAgreementAlert}
-          defaultAgreement={storageAgreement}
+          defaultAgreement={defaultAgreement}
         />
       )}
       {mode === "enterpriseSearch" && (
         <EnterpriseAgreementSearchInput
           onAgreementSelect={(agreement) => {
             if (onAgreementSelect) onAgreementSelect(agreement, "p2");
-            setStorageAgreement(agreement);
           }}
           selectedAgreementAlert={selectedAgreementAlert}
         />
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchInput.tsx b/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchInput.tsx
index c1230d3da9..6a912a2d2b 100644
--- a/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchInput.tsx
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/AgreementSearch/AgreementSearchInput.tsx
@@ -26,9 +26,6 @@ export const AgreementSearchInput = ({
   defaultAgreement,
 }: Props) => {
   const [selectedAgreement, setSelectedAgreement] = useState(defaultAgreement);
-  useEffect(() => {
-    if (onAgreementSelect) onAgreementSelect(selectedAgreement);
-  }, [selectedAgreement]);
   const [searchState, setSearchState] = useState<
     "noSearch" | "lowSearch" | "notFoundSearch" | "errorSearch" | "fullSearch"
   >("noSearch");
@@ -86,6 +83,7 @@ export const AgreementSearchInput = ({
           stateRelatedMessage={getStateMessage()}
           onChange={(agreement) => {
             setSelectedAgreement(agreement);
+            if (onAgreementSelect) onAgreementSelect(agreement);
             if (agreement) {
               emitSelectEvent(`idcc${agreement.id}`);
             }
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/AgreementSearchForm.test.tsx b/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/AgreementSearchForm.test.tsx
index d0502b937f..2403308f8b 100644
--- a/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/AgreementSearchForm.test.tsx
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/AgreementSearchForm.test.tsx
@@ -3,7 +3,8 @@ import React from "react";
 import { wait } from "@testing-library/user-event/dist/utils";
 import { searchEnterprises } from "../../enterprise/queries";
 import { sendEvent } from "../../utils";
-import { ui } from "../../enterprise/EnterpriseAgreementSearch/__tests__/ui";
+import { ui } from "./ui";
+import { ui as enterpriseUi } from "../../enterprise/EnterpriseAgreementSearch/__tests__/ui";
 import { UserAction } from "src/common";
 import { AgreementSearchForm } from "../AgreementSearch/AgreementSearchForm";
 
@@ -106,8 +107,11 @@ describe("<PageContribution />", () => {
     );
     userAction = new UserAction();
     userAction.click(ui.radio.enterpriseSearchOption.get());
-    userAction.setInput(ui.enterpriseAgreementSearch.input.get(), "carrefour");
-    userAction.click(ui.enterpriseAgreementSearch.submitButton.get());
+    userAction.setInput(
+      enterpriseUi.enterpriseAgreementSearch.input.get(),
+      "carrefour"
+    );
+    userAction.click(enterpriseUi.enterpriseAgreementSearch.submitButton.get());
     await wait();
     expect(sendEvent).toHaveBeenCalledWith({
       action: "Trouver sa convention collective",
@@ -116,10 +120,10 @@ describe("<PageContribution />", () => {
       value: "",
     });
     expect(
-      ui.enterpriseAgreementSearch.resultLines.carrefour.title.query()
+      enterpriseUi.enterpriseAgreementSearch.resultLines.carrefour.title.query()
     ).toBeInTheDocument();
     userAction.click(
-      ui.enterpriseAgreementSearch.resultLines.carrefour.link.get()
+      enterpriseUi.enterpriseAgreementSearch.resultLines.carrefour.link.get()
     );
     expect(sendEvent).toHaveBeenCalledWith({
       action: "Trouver sa convention collective",
@@ -144,8 +148,11 @@ describe("<PageContribution />", () => {
     );
     userAction = new UserAction();
     userAction.click(ui.radio.enterpriseSearchOption.get());
-    userAction.setInput(ui.enterpriseAgreementSearch.input.get(), "bnp");
-    userAction.click(ui.enterpriseAgreementSearch.submitButton.get());
+    userAction.setInput(
+      enterpriseUi.enterpriseAgreementSearch.input.get(),
+      "bnp"
+    );
+    userAction.click(enterpriseUi.enterpriseAgreementSearch.submitButton.get());
     await wait();
     expect(sendEvent).toHaveBeenCalledWith({
       action: "Trouver sa convention collective",
@@ -154,11 +161,13 @@ describe("<PageContribution />", () => {
       value: "",
     });
     expect(
-      ui.enterpriseAgreementSearch.resultLines.bnp.title.query()
+      enterpriseUi.enterpriseAgreementSearch.resultLines.bnp.title.query()
     ).toBeInTheDocument();
-    userAction.click(ui.enterpriseAgreementSearch.resultLines.bnp.link.get());
     userAction.click(
-      ui.enterpriseAgreementSearch.resultLines.bnp.ccList.idcc2120.get()
+      enterpriseUi.enterpriseAgreementSearch.resultLines.bnp.link.get()
+    );
+    userAction.click(
+      enterpriseUi.enterpriseAgreementSearch.resultLines.bnp.ccList.idcc2120.get()
     );
     expect(sendEvent).toHaveBeenCalledWith({
       action: "Trouver sa convention collective",
@@ -176,13 +185,13 @@ describe("<PageContribution />", () => {
       value: "",
     });
     expect(
-      ui.enterpriseAgreementSearch.errorNotFound.notTreated.query()
+      enterpriseUi.enterpriseAgreementSearch.errorNotFound.notTreated.query()
     ).not.toBeInTheDocument();
     userAction.click(
-      ui.enterpriseAgreementSearch.resultLines.bnp.ccList.idcc9999.get()
+      enterpriseUi.enterpriseAgreementSearch.resultLines.bnp.ccList.idcc9999.get()
     );
     expect(
-      ui.enterpriseAgreementSearch.errorNotFound.notTreated.query()
+      enterpriseUi.enterpriseAgreementSearch.errorNotFound.notTreated.query()
     ).toBeInTheDocument();
   });
 
@@ -190,7 +199,9 @@ describe("<PageContribution />", () => {
     render(<AgreementSearchForm />);
     userAction = new UserAction();
     userAction.click(ui.radio.enterpriseSearchOption.get());
-    userAction.click(ui.enterpriseAgreementSearch.childminder.link.get());
+    userAction.click(
+      enterpriseUi.enterpriseAgreementSearch.childminder.link.get()
+    );
     expect(sendEvent).toHaveBeenCalledWith({
       action: "select_je_n_ai_pas_d_entreprise",
       category: "cc_search_type_of_users",
diff --git a/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/ui.ts b/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/ui.ts
index cc0c38f60c..e6320d58fd 100644
--- a/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/ui.ts
+++ b/packages/code-du-travail-frontend/src/modules/convention-collective/__tests__/ui.ts
@@ -6,6 +6,14 @@ import {
 } from "testing-library-selector";
 
 export const ui = {
+  radio: {
+    agreementSearchOption: byLabelText(
+      /Je sais quelle est ma convention collective et je la saisis\./
+    ),
+    enterpriseSearchOption: byLabelText(
+      /Je cherche mon entreprise pour trouver ma convention collective\./
+    ),
+  },
   buttonDisplayInfo: byText("Afficher les informations"),
   warning: {
     title: byText(
diff --git a/packages/code-du-travail-frontend/src/modules/enterprise/EnterpriseAgreementSearch/__tests__/ui.ts b/packages/code-du-travail-frontend/src/modules/enterprise/EnterpriseAgreementSearch/__tests__/ui.ts
index d3c53bf2cf..7a04cfcaef 100644
--- a/packages/code-du-travail-frontend/src/modules/enterprise/EnterpriseAgreementSearch/__tests__/ui.ts
+++ b/packages/code-du-travail-frontend/src/modules/enterprise/EnterpriseAgreementSearch/__tests__/ui.ts
@@ -6,14 +6,6 @@ import {
 } from "testing-library-selector";
 
 export const ui = {
-  radio: {
-    agreementSearchOption: byLabelText(
-      /Je sais quelle est ma convention collective et je la saisis\./
-    ),
-    enterpriseSearchOption: byLabelText(
-      /Je cherche mon entreprise pour trouver ma convention collective\./
-    ),
-  },
   enterpriseAgreementSearch: {
     input: byLabelText(/Nom de votre entreprise ou numéro Siren\/Siret/),
     inputLocation: byLabelText("Code postal ou Ville (optionnel)"),