From 352c8a2b3c8f3de41fe0439675ef9855c58f277e Mon Sep 17 00:00:00 2001
From: Clemence <technique@clem-dev.com>
Date: Tue, 14 Jan 2025 09:57:35 +0100
Subject: [PATCH 1/5] feat(from): add from fields in user registration form

---
 .../StructureFormStep.controller.test.ts      | 29 +++++++++++++-
 .../StructureFormStep.controller.ts           | 23 ++++++++++-
 .../StructureFormStep.svelte                  | 39 +++++++++++++++++++
 .../src/lib/resources/users/user.port.js      |  3 ++
 4 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
index 9434f3f52..cf3398895 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
@@ -1,4 +1,4 @@
-import { AgentTypeEnum } from "dto";
+import { AgentTypeEnum, FromTypeEnum } from "dto";
 import type { MockInstance } from "vitest";
 import { beforeEach } from "vitest";
 import StructureFormStepController from "./StructureFormStep.controller";
@@ -208,4 +208,31 @@ describe("StructureFormStepController", () => {
             expect(values.centralSomething).toBeUndefined();
         });
     });
+
+    describe("updateFrom", () => {
+        it("fromEmail and fromOther are set to empty strings", () => {
+            const values = {
+                from: [FromTypeEnum.DEMO],
+                fromEmail: "test@email.com",
+                fromOther: "Other",
+            };
+            const expected = {
+                from: [FromTypeEnum.DEMO],
+                fromEmail: "",
+                fromOther: "",
+            };
+            ctrl.onUpdateFrom(values);
+            expect(values).toStrictEqual(expected);
+        });
+        it("fromEmail and fromOther are not set to empty strings", () => {
+            const values = {
+                from: [FromTypeEnum.COLLEAGUES_HIERARCHY, FromTypeEnum.OTHER],
+                fromEmail: "test@email.com",
+                fromOther: "Other",
+            };
+            const expected = { ...values };
+            ctrl.onUpdateFrom(values);
+            expect(values).toStrictEqual(expected);
+        });
+    });
 });
diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
index 18bf10b96..3978b37bd 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
@@ -1,4 +1,4 @@
-import { AgentTypeEnum, AgentJobTypeEnum } from "dto";
+import { AgentTypeEnum, AgentJobTypeEnum, FromTypeEnum } from "dto";
 import type { ComponentType, SvelteComponent } from "svelte";
 import OperatorSubStep from "./OperatorSubStep/OperatorSubStep.svelte";
 import CentralSubStep from "./CentralSubStep/CentralSubStep.svelte";
@@ -48,6 +48,13 @@ export default class StructureFormStepController {
         { value: AgentJobTypeEnum.CONTROLLER, label: "Contrôleur / Inspecteur" },
         { value: AgentJobTypeEnum.OTHER, label: "Autre" },
     ];
+    public readonly fromOptions: Option<FromTypeEnum>[] = [
+        { value: FromTypeEnum.DEMO, label: "Lors d’une présentation avec une personne de Data.Subvention" },
+        { value: FromTypeEnum.SEARCH_ENGINE, label: "Via des recherches sur internet" },
+        { value: FromTypeEnum.COLLEAGUES_HIERARCHY, label: "Un de mes collègues ou de ma hiérarchie m’en a parlé" },
+        { value: FromTypeEnum.SOCIALS, label: "Via une publication sur les réseaux sociaux" },
+        { value: FromTypeEnum.OTHER, label: "Autre" },
+    ];
 
     private static subStepByAgentType: Record<AgentTypeEnum, ComponentType> = {
         [AgentTypeEnum.CENTRAL_ADMIN]: CentralSubStep,
@@ -102,6 +109,20 @@ export default class StructureFormStepController {
         this.dispatch(shouldBlockStep ? "error" : "valid");
     }
 
+    onUpdateFrom(values: Record<string, unknown>) {
+        this.onUpdate(values, "from");
+        if (values["from"] && Array.isArray(values["from"])) {
+            if (!values["from"].includes(FromTypeEnum.COLLEAGUES_HIERARCHY) && values["fromEmail"] !== "") {
+                values["fromEmail"] = "";
+                this.onUpdate(values, "fromEmail");
+            }
+            if (!values["from"].includes(FromTypeEnum.OTHER) && values["fromOther"] !== "") {
+                values["fromOther"] = "";
+                this.onUpdate(values, "fromOther");
+            }
+        }
+    }
+
     cleanSubStepValues(values: Record<string, any>, contextAgentType: AgentTypeEnum) {
         const prefixes: string[] = [];
         for (const [agentType, prefix] of Object.entries(StructureFormStepController.subFieldsPrefixByAgentType)) {
diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
index 4b621f7f4..61176de00 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { FromTypeEnum } from "dto";
     import StructureFormStepController from "./StructureFormStep.controller";
     import Checkbox from "$lib/dsfr/Checkbox.svelte";
     import Input from "$lib/dsfr/Input.svelte";
@@ -7,6 +8,9 @@
         service: "",
         jobType: [],
         phoneNumber: "",
+        from: [] as FromTypeEnum[],
+        fromEmail: "",
+        fromOther: "",
     };
     export let context = {};
 
@@ -55,4 +59,39 @@
             on:change
             on:blur={() => ctrl.onUpdate(values, "phoneNumber")} />
     </div>
+
+    <div class="fr-fieldset__element fr-mb-0 fr-mt-4v">
+        <Checkbox
+            options={ctrl.fromOptions}
+            label="Comment avez-vous connu Data.Subvention ?"
+            errorMsg={$errors.from}
+            on:change={() => ctrl.onUpdateFrom(values)}
+            bind:value={values.from} />
+    </div>
+
+    {#if values?.from && values?.from.includes(FromTypeEnum.COLLEAGUES_HIERARCHY)}
+        <div class="fr-fieldset__element">
+            <Input
+                id="fromEmail-input"
+                type="email"
+                label="Pouvez-vous nous indiquer son email ?"
+                autocomplete="email"
+                bind:value={values.fromEmail}
+                errorMsg={$errors.fromEmail}
+                error={$errors.fromEmail}
+                on:change
+                on:blur={() => ctrl.onUpdate(values, "fromEmail")} />
+        </div>
+    {/if}
+    {#if values?.from && values?.from.includes(FromTypeEnum.OTHER)}
+        <div class="fr-fieldset__element">
+            <Input
+                id="fromOther-input"
+                type="text"
+                label="Précisez"
+                bind:value={values.fromOther}
+                on:change
+                on:blur={() => ctrl.onUpdate(values, "fromOther")} />
+        </div>
+    {/if}
 </fieldset>
diff --git a/packages/front/src/lib/resources/users/user.port.js b/packages/front/src/lib/resources/users/user.port.js
index 155916386..279bad356 100644
--- a/packages/front/src/lib/resources/users/user.port.js
+++ b/packages/front/src/lib/resources/users/user.port.js
@@ -24,6 +24,9 @@ export class UserPort {
             decentralizedLevel: data.decentralizedLevel,
             decentralizedTerritory: data.decentralizedTerritory,
             territorialScope: data.territorialScope,
+            from: data.from,
+            fromEmail: data.fromEmail,
+            fromOther: data.fromOther,
         };
         return requestsService.patch(`${this.BASE_PATH}/`, updateProfile);
     }

From c46e0643e47732f06cf6c5d38a436480804bbac3 Mon Sep 17 00:00:00 2001
From: Clemence <technique@clem-dev.com>
Date: Tue, 14 Jan 2025 12:18:42 +0100
Subject: [PATCH 2/5] feat(front): rename from into registrationSrc

---
 .../StructureFormStep.controller.test.ts      | 30 +++++++-------
 .../StructureFormStep.controller.ts           | 41 +++++++++++--------
 .../StructureFormStep.svelte                  | 36 ++++++++--------
 .../src/lib/resources/users/user.port.js      |  6 +--
 4 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
index cf3398895..1d1400430 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
@@ -1,4 +1,4 @@
-import { AgentTypeEnum, FromTypeEnum } from "dto";
+import { AgentTypeEnum, RegistrationSrcTypeEnum } from "dto";
 import type { MockInstance } from "vitest";
 import { beforeEach } from "vitest";
 import StructureFormStepController from "./StructureFormStep.controller";
@@ -209,29 +209,29 @@ describe("StructureFormStepController", () => {
         });
     });
 
-    describe("updateFrom", () => {
-        it("fromEmail and fromOther are set to empty strings", () => {
+    describe("onUpdateRegistrationSrc", () => {
+        it("registrationSrcEmail and registrationSrcDetails are set to empty strings", () => {
             const values = {
-                from: [FromTypeEnum.DEMO],
-                fromEmail: "test@email.com",
-                fromOther: "Other",
+                registrationSrc: [RegistrationSrcTypeEnum.DEMO],
+                registrationSrcEmail: "test@email.com",
+                registrationSrcDetails: "Other",
             };
             const expected = {
-                from: [FromTypeEnum.DEMO],
-                fromEmail: "",
-                fromOther: "",
+                registrationSrc: [RegistrationSrcTypeEnum.DEMO],
+                registrationSrcEmail: "",
+                registrationSrcDetails: "",
             };
-            ctrl.onUpdateFrom(values);
+            ctrl.onUpdateRegistrationSrc(values);
             expect(values).toStrictEqual(expected);
         });
-        it("fromEmail and fromOther are not set to empty strings", () => {
+        it("registrationSrcEmail and registrationSrcDetails are not set to empty strings", () => {
             const values = {
-                from: [FromTypeEnum.COLLEAGUES_HIERARCHY, FromTypeEnum.OTHER],
-                fromEmail: "test@email.com",
-                fromOther: "Other",
+                registrationSrc: [RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY, RegistrationSrcTypeEnum.OTHER],
+                registrationSrcEmail: "test@email.com",
+                registrationSrcDetails: "Other",
             };
             const expected = { ...values };
-            ctrl.onUpdateFrom(values);
+            ctrl.onUpdateRegistrationSrc(values);
             expect(values).toStrictEqual(expected);
         });
     });
diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
index 3978b37bd..65b883df2 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
@@ -1,4 +1,4 @@
-import { AgentTypeEnum, AgentJobTypeEnum, FromTypeEnum } from "dto";
+import { AgentTypeEnum, AgentJobTypeEnum, RegistrationSrcTypeEnum } from "dto";
 import type { ComponentType, SvelteComponent } from "svelte";
 import OperatorSubStep from "./OperatorSubStep/OperatorSubStep.svelte";
 import CentralSubStep from "./CentralSubStep/CentralSubStep.svelte";
@@ -48,12 +48,15 @@ export default class StructureFormStepController {
         { value: AgentJobTypeEnum.CONTROLLER, label: "Contrôleur / Inspecteur" },
         { value: AgentJobTypeEnum.OTHER, label: "Autre" },
     ];
-    public readonly fromOptions: Option<FromTypeEnum>[] = [
-        { value: FromTypeEnum.DEMO, label: "Lors d’une présentation avec une personne de Data.Subvention" },
-        { value: FromTypeEnum.SEARCH_ENGINE, label: "Via des recherches sur internet" },
-        { value: FromTypeEnum.COLLEAGUES_HIERARCHY, label: "Un de mes collègues ou de ma hiérarchie m’en a parlé" },
-        { value: FromTypeEnum.SOCIALS, label: "Via une publication sur les réseaux sociaux" },
-        { value: FromTypeEnum.OTHER, label: "Autre" },
+    public readonly registrationSrcOptions: Option<RegistrationSrcTypeEnum>[] = [
+        { value: RegistrationSrcTypeEnum.DEMO, label: "Lors d’une présentation avec une personne de Data.Subvention" },
+        { value: RegistrationSrcTypeEnum.SEARCH_ENGINE, label: "Via des recherches sur internet" },
+        {
+            value: RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY,
+            label: "Un de mes collègues ou de ma hiérarchie m’en a parlé",
+        },
+        { value: RegistrationSrcTypeEnum.SOCIALS, label: "Via une publication sur les réseaux sociaux" },
+        { value: RegistrationSrcTypeEnum.OTHER, label: "Autre" },
     ];
 
     private static subStepByAgentType: Record<AgentTypeEnum, ComponentType> = {
@@ -109,16 +112,22 @@ export default class StructureFormStepController {
         this.dispatch(shouldBlockStep ? "error" : "valid");
     }
 
-    onUpdateFrom(values: Record<string, unknown>) {
-        this.onUpdate(values, "from");
-        if (values["from"] && Array.isArray(values["from"])) {
-            if (!values["from"].includes(FromTypeEnum.COLLEAGUES_HIERARCHY) && values["fromEmail"] !== "") {
-                values["fromEmail"] = "";
-                this.onUpdate(values, "fromEmail");
+    onUpdateRegistrationSrc(values: Record<string, unknown>) {
+        this.onUpdate(values, "registrationSrc");
+        if (values["registrationSrc"] && Array.isArray(values["registrationSrc"])) {
+            if (
+                !values["registrationSrc"].includes(RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY) &&
+                values["registrationSrcEmail"] !== ""
+            ) {
+                values["registrationSrcEmail"] = "";
+                this.onUpdate(values, "registrationSrcEmail");
             }
-            if (!values["from"].includes(FromTypeEnum.OTHER) && values["fromOther"] !== "") {
-                values["fromOther"] = "";
-                this.onUpdate(values, "fromOther");
+            if (
+                !values["registrationSrc"].includes(RegistrationSrcTypeEnum.OTHER) &&
+                values["registrationSrcDetails"] !== ""
+            ) {
+                values["registrationSrcDetails"] = "";
+                this.onUpdate(values, "registrationSrcDetails");
             }
         }
     }
diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
index 61176de00..043ff9778 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { FromTypeEnum } from "dto";
+    import { RegistrationSrcTypeEnum } from "dto";
     import StructureFormStepController from "./StructureFormStep.controller";
     import Checkbox from "$lib/dsfr/Checkbox.svelte";
     import Input from "$lib/dsfr/Input.svelte";
@@ -8,9 +8,9 @@
         service: "",
         jobType: [],
         phoneNumber: "",
-        from: [] as FromTypeEnum[],
-        fromEmail: "",
-        fromOther: "",
+        registrationSrc: [] as RegistrationSrcTypeEnum[],
+        registrationSrcEmail: "",
+        registrationSrcDetails: "",
     };
     export let context = {};
 
@@ -62,36 +62,36 @@
 
     <div class="fr-fieldset__element fr-mb-0 fr-mt-4v">
         <Checkbox
-            options={ctrl.fromOptions}
+            options={ctrl.registrationSrcOptions}
             label="Comment avez-vous connu Data.Subvention ?"
-            errorMsg={$errors.from}
-            on:change={() => ctrl.onUpdateFrom(values)}
-            bind:value={values.from} />
+            errorMsg={$errors.registrationSrc}
+            on:change={() => ctrl.onUpdateRegistrationSrc(values)}
+            bind:value={values.registrationSrc} />
     </div>
 
-    {#if values?.from && values?.from.includes(FromTypeEnum.COLLEAGUES_HIERARCHY)}
+    {#if values?.registrationSrc && values?.registrationSrc.includes(RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY)}
         <div class="fr-fieldset__element">
             <Input
-                id="fromEmail-input"
+                id="registrationSrcEmail-input"
                 type="email"
                 label="Pouvez-vous nous indiquer son email ?"
                 autocomplete="email"
-                bind:value={values.fromEmail}
-                errorMsg={$errors.fromEmail}
-                error={$errors.fromEmail}
+                bind:value={values.registrationSrcEmail}
+                errorMsg={$errors.registrationSrcEmail}
+                error={$errors.registrationSrcEmail}
                 on:change
-                on:blur={() => ctrl.onUpdate(values, "fromEmail")} />
+                on:blur={() => ctrl.onUpdate(values, "registrationSrcEmail")} />
         </div>
     {/if}
-    {#if values?.from && values?.from.includes(FromTypeEnum.OTHER)}
+    {#if values?.registrationSrc && values?.registrationSrc.includes(RegistrationSrcTypeEnum.OTHER)}
         <div class="fr-fieldset__element">
             <Input
-                id="fromOther-input"
+                id="registrationSrcDetails-input"
                 type="text"
                 label="Précisez"
-                bind:value={values.fromOther}
+                bind:value={values.registrationSrcDetails}
                 on:change
-                on:blur={() => ctrl.onUpdate(values, "fromOther")} />
+                on:blur={() => ctrl.onUpdate(values, "registrationSrcDetails")} />
         </div>
     {/if}
 </fieldset>
diff --git a/packages/front/src/lib/resources/users/user.port.js b/packages/front/src/lib/resources/users/user.port.js
index 279bad356..d140e3fb4 100644
--- a/packages/front/src/lib/resources/users/user.port.js
+++ b/packages/front/src/lib/resources/users/user.port.js
@@ -24,9 +24,9 @@ export class UserPort {
             decentralizedLevel: data.decentralizedLevel,
             decentralizedTerritory: data.decentralizedTerritory,
             territorialScope: data.territorialScope,
-            from: data.from,
-            fromEmail: data.fromEmail,
-            fromOther: data.fromOther,
+            registrationSrc: data.from,
+            registrationSrcEmail: data.fromEmail,
+            registrationSrcDetails: data.fromOther,
         };
         return requestsService.patch(`${this.BASE_PATH}/`, updateProfile);
     }

From e9957e4b6b4eda3638597b403686a74a2345289d Mon Sep 17 00:00:00 2001
From: Clemence <technique@clem-dev.com>
Date: Wed, 15 Jan 2025 19:46:41 +0100
Subject: [PATCH 3/5] feat(front): move testing in controller

---
 .../StructureFormStep.controller.test.ts      | 30 +++++++++++++++++++
 .../StructureFormStep.controller.ts           | 14 +++++++++
 .../StructureFormStep.svelte                  |  4 +--
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
index 1d1400430..500491403 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
@@ -235,4 +235,34 @@ describe("StructureFormStepController", () => {
             expect(values).toStrictEqual(expected);
         });
     });
+
+    describe("isRegistrationSrcEmailVisible", () => {
+        it("is visible", () => {
+            const registerSrcValue = [RegistrationSrcTypeEnum.SOCIALS, RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY];
+            const expected = true;
+            const isVisible = ctrl.isRegistrationSrcEmailVisible(registerSrcValue);
+            expect(isVisible).toStrictEqual(expected);
+        });
+        it("is not visible", () => {
+            const registerSrcValue = [RegistrationSrcTypeEnum.SOCIALS, RegistrationSrcTypeEnum.OTHER];
+            const expected = false;
+            const isVisible = ctrl.isRegistrationSrcEmailVisible(registerSrcValue);
+            expect(isVisible).toStrictEqual(expected);
+        });
+    });
+
+    describe("isRegistrationSrcDetailsVisible", () => {
+        it("is visible", () => {
+            const registerSrcValue = [RegistrationSrcTypeEnum.SOCIALS, RegistrationSrcTypeEnum.OTHER];
+            const expected = true;
+            const isVisible = ctrl.isRegistrationSrcDetailsVisible(registerSrcValue);
+            expect(isVisible).toStrictEqual(expected);
+        });
+        it("is not visible", () => {
+            const registerSrcValue = [RegistrationSrcTypeEnum.SOCIALS, RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY];
+            const expected = false;
+            const isVisible = ctrl.isRegistrationSrcDetailsVisible(registerSrcValue);
+            expect(isVisible).toStrictEqual(expected);
+        });
+    });
 });
diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
index 65b883df2..9b887fa7b 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
@@ -160,4 +160,18 @@ export default class StructureFormStepController {
                 : undefined,
         );
     }
+
+    isRegistrationSrcEmailVisible(registerSrcValue: RegistrationSrcTypeEnum[]) {
+        if (registerSrcValue && registerSrcValue.includes(RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY)) {
+            return true;
+        }
+        return false;
+    }
+
+    isRegistrationSrcDetailsVisible(registerSrcValue: RegistrationSrcTypeEnum[]) {
+        if (registerSrcValue && registerSrcValue.includes(RegistrationSrcTypeEnum.OTHER)) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
index 043ff9778..9896ad355 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.svelte
@@ -69,7 +69,7 @@
             bind:value={values.registrationSrc} />
     </div>
 
-    {#if values?.registrationSrc && values?.registrationSrc.includes(RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY)}
+    {#if ctrl.isRegistrationSrcEmailVisible(values.registrationSrc)}
         <div class="fr-fieldset__element">
             <Input
                 id="registrationSrcEmail-input"
@@ -83,7 +83,7 @@
                 on:blur={() => ctrl.onUpdate(values, "registrationSrcEmail")} />
         </div>
     {/if}
-    {#if values?.registrationSrc && values?.registrationSrc.includes(RegistrationSrcTypeEnum.OTHER)}
+    {#if ctrl.isRegistrationSrcDetailsVisible(values.registrationSrc)}
         <div class="fr-fieldset__element">
             <Input
                 id="registrationSrcDetails-input"

From 6e2b094e34b98a8c33459b1634d9024ad586b85f Mon Sep 17 00:00:00 2001
From: Clemence <technique@clem-dev.com>
Date: Tue, 21 Jan 2025 09:23:57 +0100
Subject: [PATCH 4/5] feat(front): functions refacto + fix user update

---
 .../StructureFormStep/StructureFormStep.controller.ts | 11 +++--------
 packages/front/src/lib/resources/users/user.port.js   |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
index 9b887fa7b..f733cf372 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.ts
@@ -113,6 +113,7 @@ export default class StructureFormStepController {
     }
 
     onUpdateRegistrationSrc(values: Record<string, unknown>) {
+        //Set registrationSrcEmail & registrationSrcDetails to empty, to avoid saving unused data
         this.onUpdate(values, "registrationSrc");
         if (values["registrationSrc"] && Array.isArray(values["registrationSrc"])) {
             if (
@@ -162,16 +163,10 @@ export default class StructureFormStepController {
     }
 
     isRegistrationSrcEmailVisible(registerSrcValue: RegistrationSrcTypeEnum[]) {
-        if (registerSrcValue && registerSrcValue.includes(RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY)) {
-            return true;
-        }
-        return false;
+        return registerSrcValue && registerSrcValue.includes(RegistrationSrcTypeEnum.COLLEAGUES_HIERARCHY);
     }
 
     isRegistrationSrcDetailsVisible(registerSrcValue: RegistrationSrcTypeEnum[]) {
-        if (registerSrcValue && registerSrcValue.includes(RegistrationSrcTypeEnum.OTHER)) {
-            return true;
-        }
-        return false;
+        return registerSrcValue && registerSrcValue.includes(RegistrationSrcTypeEnum.OTHER);
     }
 }
diff --git a/packages/front/src/lib/resources/users/user.port.js b/packages/front/src/lib/resources/users/user.port.js
index d140e3fb4..61f9563c8 100644
--- a/packages/front/src/lib/resources/users/user.port.js
+++ b/packages/front/src/lib/resources/users/user.port.js
@@ -24,9 +24,9 @@ export class UserPort {
             decentralizedLevel: data.decentralizedLevel,
             decentralizedTerritory: data.decentralizedTerritory,
             territorialScope: data.territorialScope,
-            registrationSrc: data.from,
-            registrationSrcEmail: data.fromEmail,
-            registrationSrcDetails: data.fromOther,
+            registrationSrc: data.registrationSrc,
+            registrationSrcEmail: data.registrationSrcEmail,
+            registrationSrcDetails: data.registrationSrcDetails,
         };
         return requestsService.patch(`${this.BASE_PATH}/`, updateProfile);
     }

From e69b8e97d56741ebfc6795d92bffb1b1ae73ba7b Mon Sep 17 00:00:00 2001
From: Clemence <technique@clem-dev.com>
Date: Tue, 28 Jan 2025 14:58:29 +0100
Subject: [PATCH 5/5] feat(front): add mock for onUpdate

---
 .../StructureFormStep.controller.test.ts               | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
index 500491403..a94613e35 100644
--- a/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
+++ b/packages/front/src/lib/components/StructureFormStep/StructureFormStep.controller.test.ts
@@ -1,6 +1,7 @@
 import { AgentTypeEnum, RegistrationSrcTypeEnum } from "dto";
 import type { MockInstance } from "vitest";
 import { beforeEach } from "vitest";
+import type { SpyInstance } from "vitest";
 import StructureFormStepController from "./StructureFormStep.controller";
 import Dispatch from "$lib/core/Dispatch";
 import { isPhoneNumber } from "$lib/helpers/stringHelper";
@@ -210,6 +211,15 @@ describe("StructureFormStepController", () => {
     });
 
     describe("onUpdateRegistrationSrc", () => {
+        let mockUpdate: SpyInstance;
+        beforeEach(() => {
+            mockUpdate = vi.spyOn(StructureFormStepController.prototype, "onUpdate").mockImplementation(vi.fn());
+        });
+
+        afterAll(() => {
+            mockUpdate.mockRestore();
+        });
+
         it("registrationSrcEmail and registrationSrcDetails are set to empty strings", () => {
             const values = {
                 registrationSrc: [RegistrationSrcTypeEnum.DEMO],