fix: double request that lead to init data in reviewer mode

InseeFrLab · Aug 26, 2024 · 8bab513 · 8bab513
1 parent 2da944b
commit 8bab513
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/src/pages/home-surveyed/HomeSurveyed.tsx b/src/pages/home-surveyed/HomeSurveyed.tsx
@@ -47,6 +47,7 @@ import {
     surveysIds,
     userDatasMap,
     initializeDatas,
+    createNameSurveyMap,
 } from "service/survey-service";
 import { isDemoMode, lockAllSurveys, validateAllEmptySurveys } from "service/survey-state-service";
 import { getUserRights } from "service/user-service";
@@ -72,14 +73,16 @@ const HomeSurveyedPage = () => {
 
     const initHome = (idsSurveysSelected: string[]) => {
         initializeHomeSurveys(idHousehold ?? "").then(() => {
-            initializeSurveysDatasCache(idsSurveysSelected).finally(() => {
-                userDatas = userDatasMap();
-                if (getData(idsSurveysSelected[0]) != undefined) {
-                    setState(getData(idsSurveysSelected[0]));
-                    setInitialized(true);
-                }
-                setDatas(userDatas);
-            });
+            // initializeSurveysDatasCache(idsSurveysSelected).finally(() => {
+
+            // });
+
+            userDatas = userDatasMap();
+            if (getData(idsSurveysSelected[0]) != undefined) {
+                setState(getData(idsSurveysSelected[0]));
+                setInitialized(true);
+            }
+            setDatas(userDatas);
         });
     };
 
@@ -258,7 +261,6 @@ const HomeSurveyedPage = () => {
     const renderHomeInterviewer = () => {
         let userDataGroupedInterv = nameSurveyGroupMap();
         let groups = Object.keys(userDataGroupedInterv);
-        console.log("groups", groups);
         return (
             <>
                 {renderReminderNote()}
@@ -310,6 +312,7 @@ const HomeSurveyedPage = () => {
 
     const renderHomeReviewer = () => {
         let userDatas = groupBy(userDatasMap(), nameSurveyData => nameSurveyData.num);
+        console.log("userDatas", userDatas);
         let groups = Object.keys(userDatas);
         return renderPageOrLoadingOrError(
             <ErrorBoundary FallbackComponent={ErrorProvider}>

diff --git a/src/service/api-service/getRemoteData.ts b/src/service/api-service/getRemoteData.ts
@@ -216,6 +216,22 @@ const remoteGetSurveyStateData = (
             });
     });
 };
+const remoteGetSurveyDataSurveyed = (
+    idSurvey: string,
+    setError: (error: ErrorCodeEnum) => void,
+): Promise<SurveyData> => {
+    return remoteGetSurveyData(idSurvey, setError).then(data => {
+        return remoteGetSurveyStateData(idSurvey, setError).then((stateData: StateData) => {
+            return new Promise(resolve => {
+                const surveyData: SurveyData = {
+                    stateData: stateData,
+                    data: data,
+                };
+                resolve(surveyData);
+            });
+        });
+    });
+};
 
 const requestGetDataReviewer = (
     idSurvey: string,
@@ -325,6 +341,8 @@ export {
     fetchSurveysSourcesByIds,
     fetchUserSurveysInfo,
     remoteGetSurveyData,
+    requestGetDataReviewer,
     remoteGetSurveyStateData,
     remoteGetSurveyDataReviewer,
+    remoteGetSurveyDataSurveyed,
 };
diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
@@ -36,7 +36,10 @@ import {
 } from "interface/lunatic/Lunatic";
 import { AuthContextProps } from "oidc-react";
 import { NavigateFunction } from "react-router-dom";
-import { fetchReviewerSurveysAssignments } from "service/api-service/getRemoteData";
+import {
+    fetchReviewerSurveysAssignments,
+    requestGetDataReviewer,
+} from "service/api-service/getRemoteData";
 import { lunaticDatabase } from "service/lunatic-database";
 import { LABEL_WORK_TIME_SURVEY, getCurrentPageSource } from "service/orchestrator-service";
 import {
@@ -533,7 +536,7 @@ const getRemoteSavedSurveyData = (
         return Promise.reject(new Error("Offline"));
     }
 
-    const urlRemote = isReviewer() ? remoteGetSurveyDataReviewer : remoteGetSurveyData;
+    const urlRemote = isReviewer() ? requestGetDataReviewer : remoteGetSurveyData;
 
     return urlRemote(surveyId, setError)
         .then((remoteSurveyData: any) => {
@@ -1696,6 +1699,7 @@ export {
     addToAutocompleteActivityReferentiel,
     arrayOfSurveysPersonDemo,
     createDataEmpty,
+    createNameSurveyMap,
     existVariableEdited,
     getAuthCache,
     getComponentId,