fix: remove put request at each step of activity

InseeFrLab · Jul 8, 2024 · 9b57448 · 9b57448
1 parent a5f40c7
commit 9b57448
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 54 deletions.
diff --git a/src/components/commons/SurveyPage/SurveyPageStep/SurveyPageStep.tsx b/src/components/commons/SurveyPage/SurveyPageStep/SurveyPageStep.tsx
@@ -16,6 +16,7 @@ import {
     getOrchestratorPage,
     saveAndNav,
     saveAndNavFullPath,
+    saveAndNavLocally,
     saveAndNextStep,
     setEnviro,
     validateAndNextStep,
@@ -106,7 +107,7 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
             () =>
                 specifiquesProps?.displayModal
                     ? validateAndNav(false, setIsModalDisplayed)
-                    : saveAndNav(idSurvey),
+                    : saveAndNavLocally(idSurvey),
             [isModalDisplayed],
         ),
         onNext: useCallback(
@@ -117,7 +118,7 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
             [isModalDisplayed],
         ),
         onPrevious: useCallback(
-            () => (backRoute ? saveAndNavFullPath(idSurvey, backRoute) : saveAndNav(idSurvey)),
+            () => (backRoute ? saveAndNavFullPath(idSurvey, backRoute) : saveAndNavLocally(idSurvey)),
             [],
         ),
         simpleHeader: true,
@@ -143,9 +144,9 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
                 [],
             ),
         icon: errorIcon ? <IconError aria-label={t(errorAltIcon ?? "")} /> : undefined,
-        onNavigateBack: useCallback(() => saveAndNav(idSurvey), []),
+        onNavigateBack: useCallback(() => saveAndNavLocally(idSurvey), []),
         onPrevious: useCallback(
-            () => (backRoute ? saveAndNavFullPath(idSurvey, backRoute) : saveAndNav(idSurvey)),
+            () => (backRoute ? saveAndNavFullPath(idSurvey, backRoute) : saveAndNavLocally(idSurvey)),
             [],
         ),
         firstName: getPrintedFirstName(idSurvey),
@@ -168,13 +169,14 @@ const SurveyPageStep = (props: SurveyPageStepProps) => {
         forceQuit: boolean,
         setIsModalDisplayed: (value: SetStateAction<boolean>) => void,
     ): void => {
+        console.log("validateAndNav");
         if (forceQuit) {
             saveAndNav(idSurvey);
         } else {
             setIsModalDisplayed(true);
         }
     };
-
+    console.log("SurveyPageStep,", isStep);
     const surveyPageProps = isStep ? surveyPageStepProps : surveyPageNotStepProps;
 
     return (

diff --git a/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx b/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx
@@ -71,6 +71,7 @@ import {
     lockSurvey,
     refreshSurvey,
     saveData,
+    saveDataLocally,
     setValue,
     surveyLocked,
 } from "service/survey-service";
@@ -165,6 +166,7 @@ const onFinish = (
 ) => {
     if (closed) {
         const data = setValue(idSurvey, FieldNameEnum.ISCLOSED, true);
+        console.log("Save data on closed");
         saveData(idSurvey, data ?? callbackHolder.getData(), false, true).then(() => {
             navigate(
                 getCurrentNavigatePath(
@@ -435,7 +437,8 @@ const ActivityOrRoutePlannerPage = () => {
         contextIteration = loopSize - 1;
         const routeData = setValue(idSurvey, FieldNameEnum.ISROUTE, isRouteBool, contextIteration);
         console.log(routeData, isRouteBool);
-        saveData(idSurvey, routeData).then(() => {
+        saveDataLocally(idSurvey, routeData).then(() => {
+            console.log("Save Data on Add Activity or Route");
             navToActivityOrRoute(idSurvey, contextIteration, isRouteBool);
         });
     };
@@ -455,7 +458,8 @@ const ActivityOrRoutePlannerPage = () => {
         setValueOrNull(idSurvey, FieldNameEnum.START_TIME, startTime, contextIteration);
         setValueOrNull(idSurvey, FieldNameEnum.END_TIME, endTime, contextIteration);
         const updatedData = setValue(idSurvey, FieldNameEnum.ISROUTE, isRouteBool, contextIteration);
-        saveData(idSurvey, updatedData).then(() => {
+        saveDataLocally(idSurvey, updatedData).then(() => {
+            console.log("Save Data on Add Activity or Route from Gap");
             onCloseAddActivityOrRoute();
             setIsRoute(isRouteBool);
             navigate(

diff --git a/src/pages/activity/activity-or-route-planner/activity-duration/ActivityDuration.tsx b/src/pages/activity/activity-or-route-planner/activity-duration/ActivityDuration.tsx
@@ -27,7 +27,7 @@ import {
 } from "service/navigation-service";
 import { isDesktop } from "service/responsive";
 import { getActivitiesOrRoutes, surveyReadOnly } from "service/survey-activity-service";
-import { getData, getValue, getValueOfData, saveData } from "service/survey-service";
+import { getData, getValue, getValueOfData, saveDataLocally } from "service/survey-service";
 import { getSurveyIdFromUrl } from "utils/utils";
 
 const ActivityDurationPage = () => {
@@ -150,7 +150,7 @@ const ActivityDurationPage = () => {
         }
 
         if ((skip && isAfter) || !isAfter) {
-            saveData(idSurvey, callbackHolder.getData()).then(() => {
+            saveDataLocally(idSurvey, callbackHolder.getData()).then(() => {
                 navigate(
                     getLoopParameterizedNavigatePath(
                         idSurvey,
@@ -177,7 +177,7 @@ const ActivityDurationPage = () => {
         if (!openSnackbar) {
             if (!isCompleted) {
                 if (forceQuit) {
-                    saveData(idSurvey, callbackHolder.getData()).then(() => {
+                    saveDataLocally(idSurvey, callbackHolder.getData()).then(() => {
                         navIsClompleted(isCloture);
                     });
                 } else {

diff --git a/src/pages/activity/activity-or-route-planner/activity/main-activity/MainActivity.tsx b/src/pages/activity/activity-or-route-planner/activity/main-activity/MainActivity.tsx
@@ -15,7 +15,7 @@ import {
     onClose,
     onNext,
     onPrevious,
-    saveAndLoopNavigate,
+    saveAndLoopNavigateLocally,
     setEnviro,
     validate,
 } from "service/navigation-service";
@@ -119,7 +119,7 @@ const MainActivityPage = () => {
         backClickEvent: backClickEvent,
         nextClickEvent: nextClickEvent,
         backClickCallback: () => {
-            saveAndLoopNavigate(
+            saveAndLoopNavigateLocally(
                 idSurvey,
                 context.source,
                 getPreviousLoopPage(currentPage),
@@ -131,7 +131,7 @@ const MainActivityPage = () => {
             const codeActivity = getValueOfActivity(callbackHolder.getData(), currentIteration) ?? "";
             const skip = filtrePage(EdtRoutesNameEnum.MAIN_ACTIVITY_GOAL, codeActivity);
             if (routeToGoal && !skip) {
-                saveAndLoopNavigate(
+                saveAndLoopNavigateLocally(
                     idSurvey,
                     context.source,
                     EdtRoutesNameEnum.MAIN_ACTIVITY_GOAL,
@@ -140,7 +140,7 @@ const MainActivityPage = () => {
                 );
             } else {
                 const skip = filtrePage(EdtRoutesNameEnum.SECONDARY_ACTIVITY, codeActivity);
-                saveAndLoopNavigate(
+                saveAndLoopNavigateLocally(
                     idSurvey,
                     context.source,
                     skip ? EdtRoutesNameEnum.ACTIVITY_LOCATION : getNextLoopPage(currentPage),

diff --git a/src/pages/activity/activity-or-route-planner/with-screen/WithScreen.tsx b/src/pages/activity/activity-or-route-planner/with-screen/WithScreen.tsx
@@ -21,8 +21,8 @@ import {
     onClose,
     onNext,
     onPrevious,
-    saveAndLoopNavigate,
-    saveAndNav,
+    saveAndLoopNavigateLocally,
+    saveAndNavLocally,
     setEnviro,
     validate,
 } from "service/navigation-service";
@@ -54,7 +54,7 @@ const WithScreenPage = () => {
         backClickEvent: backClickEvent,
         nextClickEvent: nextClickEvent,
         backClickCallback: () => {
-            saveAndLoopNavigate(
+            saveAndLoopNavigateLocally(
                 idSurvey,
                 context.source,
                 EdtRoutesNameEnum.WITH_SOMEONE_SELECTION,
@@ -65,7 +65,7 @@ const WithScreenPage = () => {
             );
         },
         nextClickCallback: () => {
-            saveAndNav(
+            saveAndNavLocally(
                 idSurvey,
                 isCloture
                     ? summaryRoutePath
@@ -79,7 +79,7 @@ const WithScreenPage = () => {
         },
         onSelectValue: () => {
             validate(idSurvey).then(() => {
-                saveAndNav(
+                saveAndNavLocally(
                     idSurvey,
                     isCloture
                         ? summaryRoutePath

diff --git a/src/pages/activity/help/HelpWorkTime/HelpWorkTime.tsx b/src/pages/activity/help/HelpWorkTime/HelpWorkTime.tsx
@@ -43,7 +43,7 @@ import {
     getPrintedFirstName,
     getSource,
     getSurveyDate,
-    saveData,
+    saveDataLocally,
 } from "service/survey-service";
 
 const HelpWorkTime = () => {
@@ -101,7 +101,7 @@ const HelpWorkTime = () => {
             dates: "DATES",
             datesStarted: "DATES_STARTED",
         },
-        saveAll: () => saveData(idSurvey, data),
+        saveAll: () => saveDataLocally(idSurvey, data),
         language: getLanguage(),
         helpStep: helpStep,
         moreIcon: <MoreHorizontalIcon aria-label={t("accessibility.asset.mui-icon.more-horizontal")} />,

diff --git a/src/pages/activity/phone-time/PhoneTime.tsx b/src/pages/activity/phone-time/PhoneTime.tsx
@@ -11,7 +11,7 @@ import {
     getNavigatePath,
     getOrchestratorPage,
     getParameterizedNavigatePath,
-    saveAndNav,
+    saveAndNavLocally,
     saveAndNavFullPath,
     setEnviro,
     validateAndNextStep,
@@ -34,10 +34,10 @@ const PhoneTimePage = () => {
 
     const surveyPageStepProps = {
         idSurvey: idSurvey,
-        onNavigateBack: useCallback(() => saveAndNav(idSurvey), []),
+        onNavigateBack: useCallback(() => saveAndNavLocally(idSurvey), []),
         onNext: useCallback(
             () =>
-                saveAndNav(
+                saveAndNavLocally(
                     idSurvey,
                     getParameterizedNavigatePath(EdtRoutesNameEnum.ACTIVITY, idSurvey) +
                         getNavigatePath(EdtRoutesNameEnum.END_SURVEY),

diff --git a/src/service/api-service.ts b/src/service/api-service.ts
@@ -211,7 +211,7 @@ const requestPutSurveyData = (
     data: SurveyData,
     token?: string,
 ): Promise<SurveyData> => {
-    console.log("data", data);
+    //console.log("data", data);
     const collectedData = token ? transformCollectedArray(data.data?.COLLECTED) : data.data?.COLLECTED;
     if (data.data) {
         data.data.COLLECTED = collectedData;

diff --git a/src/service/loop-service.ts b/src/service/loop-service.ts
@@ -23,7 +23,7 @@ import {
     getValue,
     getValueOfData,
     getVariable,
-    saveData,
+    saveDataLocally,
     setValue,
     toIgnoreForActivity,
     toIgnoreForRoute,
@@ -39,8 +39,8 @@ import {
     getCurrentNavigatePath,
     getLoopPage,
     getOrchestratorPage,
-    saveAndLoopNavigate,
-    saveAndNav,
+    saveAndLoopNavigateLocally,
+    saveAndNavLocally,
 } from "./navigation-service";
 import { getNomenclatureRef } from "./referentiel-service";
 
@@ -353,7 +353,7 @@ const skipNextPage = (
         nextPageRoute == EdtRoutesNameEnum.ACTIVITY_OR_ROUTE_PLANNER ||
         (nextPageRoute == null && nextPageNextLoop == EdtRoutesNameEnum.ACTIVITY_OR_ROUTE_PLANNER)
     ) {
-        saveAndNav(
+        saveAndNavLocally(
             idSurvey,
             getCurrentNavigatePath(
                 idSurvey,
@@ -363,7 +363,7 @@ const skipNextPage = (
             ),
         );
     } else {
-        saveAndLoopNavigate(
+        saveAndLoopNavigateLocally(
             idSurvey,
             source,
             nextPageRoute ?? nextPageNextLoop,
@@ -405,7 +405,7 @@ const skipBackPage = (
         backPageRoute == EdtRoutesNameEnum.ACTIVITY_OR_ROUTE_PLANNER ||
         backPageBackLoop == EdtRoutesNameEnum.ACTIVITY_OR_ROUTE_PLANNER
     ) {
-        saveAndNav(
+        saveAndNavLocally(
             idSurvey,
             getCurrentNavigatePath(
                 idSurvey,
@@ -415,7 +415,7 @@ const skipBackPage = (
             ),
         );
     } else {
-        saveAndLoopNavigate(
+        saveAndLoopNavigateLocally(
             idSurvey,
             source,
             backPageRoute ?? backPageBackLoop,
@@ -633,7 +633,7 @@ const getCurrentLoopPage = (
 const setLoopCompleted = (idSurvey: string, iteration: number | undefined, isCompleted: boolean) => {
     const completed = setValue(idSurvey, FieldNameEnum.ISCOMPLETED, isCompleted, iteration);
     if (completed) {
-        saveData(idSurvey, completed);
+        saveDataLocally(idSurvey, completed);
     }
 };