fix: rollback to remote refs

InseeFrLab · Aug 6, 2024 · 4a16afa · 4a16afa
1 parent 9447a33
commit 4a16afa
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -15,7 +15,7 @@ import {
     getAuthCache,
     getDatas,
     initPropsAuth,
-    initializeDatas,
+    initializeRemoteDatas,
     initializeListSurveys,
 } from "service/survey-service";
 import { getUserRights, setAuth, setUser, setUserToken } from "service/user-service";
@@ -84,7 +84,7 @@ const App = () => {
 
             //auth.userManager.startSilentRenew();
             promisesToWait.push(
-                initializeDatas(setError).then(() => {
+                initializeRemoteDatas(setError).then(() => {
                     setInitialized(true);
                     return initPropsAuth(auth).then(() => {
                         const options = optionsFiltered(getAutoCompleteRef());
@@ -127,7 +127,7 @@ const App = () => {
                 }
 
                 promisesToWait.push(
-                    initializeDatas(setError).then(() => {
+                    initializeRemoteDatas(setError).then(() => {
                         if (getUserRights() === EdtUserRightsEnum.REVIEWER) {
                             return initializeListSurveys(setError).then(() => {
                                 setInitialized(true);

diff --git a/src/pages/home-surveyed/HomeSurveyed.tsx b/src/pages/home-surveyed/HomeSurveyed.tsx
@@ -41,6 +41,7 @@ import {
     getUserDatasActivity,
     initializeDatas,
     initializeHomeSurveys,
+    initializeRemoteDatas,
     initializeSurveysDatasCache,
     initializeSurveysIdsDemo,
     nameSurveyGroupMap,
@@ -85,11 +86,11 @@ const HomeSurveyedPage = () => {
 
     useEffect(() => {
         if (navigator.onLine && getUserRights() === EdtUserRightsEnum.SURVEYED) {
-            initializeDatas(setError).then(() => {
+            initializeRemoteDatas(setError).then(() => {
                 setInitialized(true);
             });
         } else if (getUserRights() === EdtUserRightsEnum.SURVEYED) {
-            initializeDatas(setError).then(() => {
+            initializeRemoteDatas(setError).then(() => {
                 setInitialized(true);
                 setState({});
             });

diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
@@ -76,6 +76,7 @@ import { getActivitiesOrRoutes, getScore } from "./survey-activity-service";
 import { getUserRights, isReviewer } from "./user-service";
 import { remotePutSurveyData, remotePutSurveyDataReviewer } from "./api-service/putRemoteData";
 import { fetchReferentiels } from "./api-service/getLocalSurveyData";
+import { fetchRemoteReferentiels } from "service/api-service/getRemoteData";
 import {
     getSurveyStateData,
     initStateData,
@@ -141,6 +142,17 @@ const initializeDatas = (setError: (error: ErrorCodeEnum) => void): Promise<bool
     });
 };
 
+const initializeRemoteDatas = (setError: (error: ErrorCodeEnum) => void): Promise<boolean> => {
+    const promisesToWait: Promise<any>[] = [];
+    return new Promise(resolve => {
+        promisesToWait.push(initializeRemoteRefs(setError));
+        promisesToWait.push(initializeSurveysIdsAndSources(setError));
+        Promise.all(promisesToWait).then(() => {
+            resolve(true);
+        });
+    });
+};
+
 const initPropsAuth = (auth: AuthContextProps): Promise<DataState> => {
     const dataState: DataState = {
         data: {
@@ -175,6 +187,18 @@ const getAuthCache = (): Promise<DataState> => {
     });
 };
 
+const initializeRemoteRefs = (setError: (error: ErrorCodeEnum) => void) => {
+    return lunaticDatabase.get(REFERENTIELS_ID).then(refData => {
+        if (!refData && navigator.onLine) {
+            return fetchRemoteReferentiels(setError).then(refs => {
+                return saveReferentiels(refs);
+            });
+        } else {
+            referentielsData = refData as ReferentielData;
+        }
+    });
+};
+
 const initializeRefs = () => {
     return lunaticDatabase.get(REFERENTIELS_ID).then(refData => {
         if (!refData && navigator.onLine) {
@@ -1903,6 +1927,7 @@ export {
     initStateData,
     initSurveyData,
     initializeDatas,
+    initializeRemoteDatas,
     initializeHomeSurveys,
     initializeListSurveys,
     initializeSurveysDatasCache,