From 135adecdc2752665757543c142592cd9b3397223 Mon Sep 17 00:00:00 2001
From: Gary van Woerkens <gary.van-woerkens@sg.social.gouv.fr>
Date: Tue, 5 Dec 2023 20:28:51 +0100
Subject: [PATCH] fix: sync onboarding request and form hooks

---
 .talismanrc                            |  2 ++
 src/components/common/wizard/index.tsx |  8 +++-----
 src/components/onboarding/index.tsx    |  5 ++---
 src/hooks/use-onboarding.ts            | 13 +++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.talismanrc b/.talismanrc
index 1b237a7fa..7d76bf195 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -15,6 +15,8 @@ fileignoreconfig:
   checksum: 390c88e78b3e8bd3153e028403a3ffea2b5da636eeab22c307788cbddb86e096
 - filename: src/components/users/toggle-account-modal.tsx
   checksum: 2d0bd58b461814a6d2d934d96441ed7962a74f2d184e2581b38b4990562dde70
+- filename: src/hooks/use-onboarding.ts
+  checksum: 5a4e696e13c7b9674979b192acb1e73b55694b93e54d54e805b74ad3a288dc40
 - filename: src/services/disablers/ovh.ts
   checksum: 390c9e51cf01b5db14a4af94a4182c3d55ccddeb7905462b21b0a5f23b8d24e9
 - filename: src/services/enablers/ovh.ts
diff --git a/src/components/common/wizard/index.tsx b/src/components/common/wizard/index.tsx
index bf5c596ab..82a867bc6 100644
--- a/src/components/common/wizard/index.tsx
+++ b/src/components/common/wizard/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react"
+import { useState } from "react"
 
 import Stepper from "./stepper"
 
@@ -17,13 +17,10 @@ const Wizard = ({
 }) => {
   const [isValidStep, setValidStep] = useState(false)
   const [activeStepIndex, setActiveStepIndex] = useState(0)
-  const [fields, setFields] = useState<OnboardingData | undefined>(data)
 
   const { component: Step } = steps[activeStepIndex]
   const isLastStep = activeStepIndex === steps.length - 1
 
-  useEffect(() => setFields(data), [data])
-
   const PreviousButton = () => (
     <button
       className="primary flex leading-4"
@@ -58,7 +55,8 @@ const Wizard = ({
       className="primary flex leading-4"
       onClick={(e) => {
         e.preventDefault()
-        onComplete(fields)
+        // onComplete(fields)
+        onComplete(data)
       }}
     >
       Terminer
diff --git a/src/components/onboarding/index.tsx b/src/components/onboarding/index.tsx
index ffb90a875..25859ebda 100644
--- a/src/components/onboarding/index.tsx
+++ b/src/components/onboarding/index.tsx
@@ -4,9 +4,9 @@ import { useEffect, useMemo, useState } from "react"
 import statusOk from "@/utils/status-ok"
 import Alert from "@/components/common/alert"
 import Wizard from "@/components/common/wizard"
+import useOnboarding from "@/hooks/use-onboarding"
 import graphQLFetcher from "@/utils/graphql-fetcher"
 import UserInfo from "@/components/onboarding/steps/user-info"
-import useOnboarding, { fallbackData } from "@/hooks/use-onboarding"
 import GithubServices from "@/components/onboarding/steps/github-services"
 import DefaultServices from "@/components/onboarding/steps/default-services"
 import ServicesAccountsStatuses from "@/components/onboarding/steps/services-accounts-statuses"
@@ -16,7 +16,7 @@ import {
 } from "@/queries/index"
 
 const Onboarding = () => {
-  const { data, request, id, mutate: mutateOnboarding } = useOnboarding()
+  const { data, request, id } = useOnboarding()
 
   const [status, setStatus] = useState<
     "create" | "review" | "reviewed" | "create_success" | "review_success"
@@ -64,7 +64,6 @@ const Onboarding = () => {
     } else if (status === "create") {
       handleCreationSubmit()
     }
-    await mutateOnboarding(fallbackData)
   }
 
   useEffect(() => {
diff --git a/src/hooks/use-onboarding.ts b/src/hooks/use-onboarding.ts
index 1389c57b1..353b7214c 100644
--- a/src/hooks/use-onboarding.ts
+++ b/src/hooks/use-onboarding.ts
@@ -5,7 +5,7 @@ import useSWR from "swr"
 
 import useOnboardingRequest from "./use-onboarding-request"
 
-export const fallbackData = {
+const defaultData = {
   email: "",
   message: "",
   lastName: "",
@@ -19,15 +19,16 @@ export const fallbackData = {
 const useOnboarding = () => {
   const { request, id } = useOnboardingRequest()
 
+  const key = id ? `onboarding-${id}` : "onboarding"
+  const fallbackData = id ? request?.data : defaultData
+
   const {
     data,
     mutate,
-  }: { data?: OnboardingData; mutate: KeyedMutator<unknown> } = useSWR(
-    "onboarding",
+  }: { data?: OnboardingData; mutate: KeyedMutator<OnboardingData> } = useSWR(
+    key,
     null,
-    {
-      fallbackData: request?.data || fallbackData,
-    }
+    { fallbackData }
   )
 
   return { data, mutate, request, id }