refactor: switch from remote to local survey source for reviewer

InseeFrLab · Aug 21, 2024 · 27128e3 · 27128e3
1 parent 0664096
commit 27128e3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/src/pages/end-survey/EndSurvey.tsx b/src/pages/end-survey/EndSurvey.tsx
@@ -101,10 +101,10 @@ const EndSurveyPage = () => {
             data: dataWithIsEnvoyed ?? callbackHolder.getData(),
         };
 
-        const handleSuccess = (surveyDataAnswer: any) => {
-            surveyData.data.lastRemoteSaveDate = surveyDataAnswer.stateData?.date;
-            return saveDataAndInit(surveyData, true);
-        };
+        // const handleSuccess = (surveyDataAnswer: any) => {
+        //     surveyData.data.lastRemoteSaveDate = surveyDataAnswer.stateData?.date;
+        //     return saveDataAndInit(surveyData, true);
+        // };
 
         const handleError = () => {
             setErrorSubmit(true);

diff --git a/src/service/loop-service.ts b/src/service/loop-service.ts
@@ -636,9 +636,7 @@ const getCurrentLoopPage = (
 
 //TODO: Edit this function to send state data with COMPLETED status instead
 const setLoopCompleted = (idSurvey: string, iteration: number | undefined, isCompleted: boolean) => {
-    console.log("setLoopCompleted ", idSurvey, iteration, isCompleted);
     const completed = setValue(idSurvey, FieldNameEnum.ISCOMPLETED, isCompleted, iteration);
-    console.log("setLoopCompleted -> completed", completed);
     if (completed) {
         saveData(idSurvey, completed);
     }

diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
@@ -55,7 +55,6 @@ import {
 import { EdtUserRightsEnum } from "./../enumerations/EdtUserRightsEnum";
 import { LunaticData } from "./../interface/lunatic/Lunatic";
 import {
-    fetchSurveysSourcesByIds,
     fetchUserSurveysInfo,
     remoteGetSurveyData,
     remoteGetSurveyDataReviewer,
@@ -235,23 +234,21 @@ const initDataForSurveys = (setError: (error: ErrorCodeEnum) => void) => {
                 [SurveysIdsEnum.ACTIVITY_SURVEYS_IDS]: activitySurveysIds,
                 [SurveysIdsEnum.WORK_TIME_SURVEYS_IDS]: workingTimeSurveysIds,
             };
+            const sources: SourceData = {
+                [SourcesEnum.ACTIVITY_SURVEY]: edtActivitySurvey,
+                [SourcesEnum.WORK_TIME_SURVEY]: edtWorkTimeSurvey,
+            };
             const innerPromises: Promise<any>[] = [
                 getRemoteSavedSurveysDatas(allSurveysIds, setError).then(() => {
                     return initializeSurveysDatasCache(allSurveysIds);
                 }),
                 saveSurveysIds(surveysIds),
-                fetchSurveysSourcesByIds(
-                    [SourcesEnum.ACTIVITY_SURVEY, SourcesEnum.WORK_TIME_SURVEY],
-                    setError,
-                ).then(sources => {
-                    const inerFetchPromises: Promise<any>[] = [
-                        saveSources(sources),
-                        saveUserSurveysData({ data: userDatas }),
-                    ];
-                    return Promise.all(inerFetchPromises);
-                }),
             ];
-            return Promise.all(innerPromises);
+            const inerFetchPromises: Promise<any>[] = [
+                saveSources(sources),
+                saveUserSurveysData({ data: userDatas }),
+            ];
+            return Promise.all([...innerPromises, ...inerFetchPromises]);
         });
     } else {
         return lunaticDatabase.get(USER_SURVEYS_DATA).then((data: LunaticData | undefined) => {