lint

SocialGouv · Feb 3, 2025 · 2e15898 · 2e15898
1 parent b9a8c6e
commit 2e15898
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 41 deletions.
diff --git a/packages/code-du-travail-frontend/src/modules/contributions/ContributionGeneric.tsx b/packages/code-du-travail-frontend/src/modules/contributions/ContributionGeneric.tsx
@@ -4,7 +4,10 @@ import { useContributionTracking } from "./tracking";
 import { isAgreementSupported, isAgreementValid } from "./contributionUtils";
 import { ContributionGenericContent } from "./ContributionGenericContent";
 import { Contribution } from "./type";
-import { useLocalStorageForAgreementOnPageLoad } from "../common/useLocalStorage";
+import {
+  useLocalStorageForAgreement,
+  useLocalStorageForAgreementOnPageLoad,
+} from "../common/useLocalStorage";
 import { ContributionGenericAgreementSearch } from "./ContributionGenericAgreementSearch";
 
 type Props = {
@@ -17,7 +20,7 @@ export function ContributionGeneric({ contribution }: Props) {
 
   const [displayGeneric, setDisplayGeneric] = useState(false);
   const [selectedAgreement, setSelectedAgreement] =
-    useLocalStorageForAgreementOnPageLoad();
+    useLocalStorageForAgreement();
   const {
     emitAgreementTreatedEvent,
     emitAgreementUntreatedEvent,

diff --git a/...code-du-travail-frontend/src/modules/contributions/ContributionGenericAgreementSearch.tsx b/...code-du-travail-frontend/src/modules/contributions/ContributionGenericAgreementSearch.tsx
@@ -33,8 +33,9 @@ export function ContributionGenericAgreementSearch({
 }: Props) {
   const { slug } = contribution;
 
-  const [selectedAgreement, setSelectedAgreement] =
-    useState<EnterpriseAgreement>();
+  const [selectedAgreement, setSelectedAgreement] = useState<
+    EnterpriseAgreement | undefined
+  >(defaultAgreement);
   const [isValid, setIsValid] = useState(
     defaultAgreement ? isAgreementValid(contribution, defaultAgreement) : false
   );

diff --git a/...es/enterprise/EnterpriseAgreementSearch/__tests__/EnterpriseAgreementSearchInput.test.tsx b/...es/enterprise/EnterpriseAgreementSearch/__tests__/EnterpriseAgreementSearchInput.test.tsx
@@ -4,6 +4,7 @@ import { searchEnterprises } from "../../queries";
 import { ui } from "./ui";
 import { sendEvent } from "../../../utils";
 import { wait } from "@testing-library/user-event/dist/utils";
+import { TrackingAgreementSearchAction } from "../../../convention-collective/tracking";
 
 jest.mock("../../../utils", () => ({
   sendEvent: jest.fn(),
@@ -44,7 +45,10 @@ describe("EnterpriseAgreementSearchInput", () => {
   describe("Form mode", () => {
     beforeEach(async () => {
       rendering = render(
-        <EnterpriseAgreementSearchInput onAgreementSelect={() => {}} />
+        <EnterpriseAgreementSearchInput
+          onAgreementSelect={() => {}}
+          trackingActionName={TrackingAgreementSearchAction.AGREEMENT_SEARCH}
+        />
       );
     });
     it("should navigate correctly with one treated agreement on enterprise", async () => {

diff --git a/...ges/code-du-travail-frontend/src/modules/enterprise/EnterpriseAgreementSearch/tracking.ts b/...ges/code-du-travail-frontend/src/modules/enterprise/EnterpriseAgreementSearch/tracking.ts
@@ -20,32 +20,29 @@ export const useEnterpriseAgreementSearchTracking = () => {
     });
   };
 
-    const emitSelectEnterpriseEvent = (
-      action: string,
-      enterprise: {
-        label: string;
-        siren: string;
-      }
-    ) => {
-      sendEvent({
-        category: TrackingAgreementSearchCategory.CC_ENTERPRISE_SELECT,
-        action: action,
-        name: JSON.stringify(enterprise),
-        value: generateUUID(),
-      });
-    };
+  const emitSelectEnterpriseEvent = (
+    action: string,
+    enterprise: {
+      label: string;
+      siren: string;
+    }
+  ) => {
+    sendEvent({
+      category: TrackingAgreementSearchCategory.CC_ENTERPRISE_SELECT,
+      action: action,
+      name: JSON.stringify(enterprise),
+      value: generateUUID(),
+    });
+  };
 
-    const emitSelectEnterpriseAgreementEvent = (
-      idcc: string,
-      action: string
-    ) => {
-      sendEvent({
-        category: TrackingAgreementSearchCategory.CC_SELECT_P2,
-        action: action,
-        name: idcc,
-        value: generateUUID(),
-      });
-    };
+  const emitSelectEnterpriseAgreementEvent = (idcc: string, action: string) => {
+    sendEvent({
+      category: TrackingAgreementSearchCategory.CC_SELECT_P2,
+      action: action,
+      name: idcc,
+      value: generateUUID(),
+    });
+  };
 
   const emitPreviousEvent = () => {
     sendEvent({

diff --git a/...code-du-travail-frontend/src/modules/outils/convention-collective/AgreementSearchForm.tsx b/...code-du-travail-frontend/src/modules/outils/convention-collective/AgreementSearchForm.tsx
@@ -1,6 +1,6 @@
 "use client";
 import { RadioButtons } from "@codegouvfr/react-dsfr/RadioButtons";
-import { ReactNode, useState } from "react";
+import { ReactNode, useEffect, useState } from "react";
 import { AgreementSearchInput } from "./AgreementSearchInput";
 import {
   EnterpriseAgreement,
@@ -24,7 +24,11 @@ export const AgreementSearchForm = ({
 }: Props) => {
   const [mode, setMode] = useState<
     "agreementSearch" | "enterpriseSearch" | "noSearch" | undefined
-  >(!!defaultAgreement ? "agreementSearch" : undefined);
+  >();
+
+  useEffect(() => {
+    setMode(!!defaultAgreement ? "agreementSearch" : undefined);
+  }, [defaultAgreement]);
 
   return (
     <>

diff --git a/...-frontend/src/modules/outils/convention-collective/__tests__/AgreementSearchForm.test.tsx b/...-frontend/src/modules/outils/convention-collective/__tests__/AgreementSearchForm.test.tsx
@@ -1,12 +1,13 @@
 import { render, screen } from "@testing-library/react";
-import React, { useRef } from "react";
+import React from "react";
 import { wait } from "@testing-library/user-event/dist/utils";
-import { searchEnterprises } from "../../enterprise/queries";
-import { sendEvent } from "../../../common/utils";
-import { ui } from "./ui";
-import { ui as enterpriseUi } from "../../enterprise/EnterpriseAgreementSearch/__tests__/ui";
+import { AgreementSearchForm } from "../AgreementSearchForm";
+import { searchEnterprises } from "../../../enterprise";
 import { UserAction } from "../../../../common";
-import { AgreementSearchForm } from "../../common/AgreementSearchForm/AgreementSearchForm";
+import { TrackingAgreementSearchAction } from "../../../convention-collective/tracking";
+import { ui } from "../../../convention-collective/__tests__/ui";
+import { ui as enterpriseUi } from "../../../enterprise/EnterpriseAgreementSearch/__tests__/ui";
+import { sendEvent } from "../../../utils";
 
 jest.mock("../../../common/utils", () => ({
   sendEvent: jest.fn(),
@@ -101,7 +102,11 @@ const enterpriseMoreCC = {
 describe("<PageContribution />", () => {
   let userAction: UserAction;
   it("should track when searching by enterprise name", async () => {
-    render(<AgreementSearchForm />);
+    render(
+      <AgreementSearchForm
+        trackingActionName={TrackingAgreementSearchAction.AGREEMENT_SEARCH}
+      />
+    );
     (searchEnterprises as jest.Mock).mockImplementation(() =>
       Promise.resolve([enterprise1CC])
     );
@@ -142,7 +147,11 @@ describe("<PageContribution />", () => {
     });
   });
   it("should track when searching by enterprise with multiple agreements", async () => {
-    render(<AgreementSearchForm />);
+    render(
+      <AgreementSearchForm
+        trackingActionName={TrackingAgreementSearchAction.AGREEMENT_SEARCH}
+      />
+    );
     (searchEnterprises as jest.Mock).mockImplementation(() =>
       Promise.resolve([enterpriseMoreCC])
     );
@@ -196,7 +205,11 @@ describe("<PageContribution />", () => {
   });
 
   it("should track when selecting agreement 3239", () => {
-    render(<AgreementSearchForm />);
+    render(
+      <AgreementSearchForm
+        trackingActionName={TrackingAgreementSearchAction.AGREEMENT_SEARCH}
+      />
+    );
     userAction = new UserAction();
     userAction.click(ui.radio.enterpriseSearchOption.get());
     screen.debug();