Merge pull request #201 from InseeFr/v2-fixStateData

fix: stateData on orchestrator > collector
InseeFr · Dec 14, 2022 · 4d28393 · 4d28393
2 parents 15d501d + 259eb59
commit 4d28393
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stromae",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "description": "Web application for the management of questionnaires powered by Lunatic",
   "repository": {
     "type": "git",

diff --git a/src/components/orchestrator/collector/index.js b/src/components/orchestrator/collector/index.js
@@ -44,11 +44,13 @@ export const Orchestrator = ({
   const [validationConfirmation, setValidationConfirmation] = useState(false);
 
   const { stateData, data, personalization } = stromaeData;
+  const [currentStateData, setCurrentStateData] = useState(stateData);
 
   const [validated, setValidated] = useState(
-    stateData?.state === 'VALIDATED' ||
-      stateData?.state === 'EXTRACTED' ||
-      stateData?.state === 'TOEXTRACT'
+    stateData &&
+      (stateData.state === 'VALIDATED' ||
+        stateData.state === 'EXTRACTED' ||
+        stateData.state === 'TOEXTRACT')
   );
 
   const { lunaticFetcher: suggesterFetcher } = useLunaticFetcher();
@@ -81,13 +83,15 @@ export const Orchestrator = ({
       date: new Date().getTime(),
       currentPage: currentPage,
     };
+    setCurrentStateData(newStateData);
     return newStateData;
   };
 
   const logoutAndClose = async () => {
     if (!validated) {
+      const logoutAndCloseUpdateState = updateStateData();
       const dataToSave = {
-        stateData: updateStateData(),
+        stateData: logoutAndCloseUpdateState,
         data: getData(),
       };
       await save(dataToSave);
@@ -114,8 +118,9 @@ export const Orchestrator = ({
   };
   const validateQuestionnaire = () => {
     setValidated(true);
+    const validateUpdateState = updateStateData(VALIDATED);
     const dataToSave = {
-      stateData: updateStateData(VALIDATED),
+      stateData: validateUpdateState,
       data: getData(),
     };
     save(dataToSave);
@@ -125,8 +130,9 @@ export const Orchestrator = ({
   const onNext = () => {
     if (currentPage === WELCOME_PAGE) setCurrentPage(page);
     else {
+      const onNextUpdateState = updateStateData();
       const dataToSave = {
-        stateData: updateStateData(),
+        stateData: onNextUpdateState,
         data: getData(),
       };
       if (!isLastPage) {
@@ -225,7 +231,7 @@ export const Orchestrator = ({
           <EndPage
             logoutAndClose={logoutAndClose}
             metadata={metadata}
-            stateData={stateData}
+            stateData={currentStateData}
             currentPage={currentPage}
             personalization={personalization}
           />