Merge branch 'fix/perf' into 'feat/sprint20'

Fix/perf See merge request insee/edt/pwa-edt!66
InseeFrLab · Mar 28, 2024 · 2c882dd · 2c882dd
2 parents 882e727 + 53d6bc3
commit 2c882dd
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 173 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "edt",
-    "version": "3.14.4",
-    "dateVersion": "27/03/2024",
+    "version": "3.14.7",
+    "dateVersion": "28/03/2024",
     "licence": "MIT",
     "dependencies": {
         "@emotion/react": "^11.10.4",

diff --git a/public/manifest.json b/public/manifest.json
@@ -4,7 +4,7 @@
     "icons": [
         {
             "src": "favicon.ico",
-            "sizes": "48x48 32x32 16x16",
+            "sizes": "32x32 16x16",
             "type": "image/x-icon"
         },
         {
@@ -219,5 +219,6 @@
     "start_url": ".",
     "display": "standalone",
     "theme_color": "#000000",
-    "background_color": "#ffffff"
+    "background_color": "#ffffff",
+    "prefer_related_applications": true
 }
diff --git a/src/App.tsx b/src/App.tsx
@@ -22,6 +22,7 @@ const App = () => {
     const { t } = useTranslation();
     const [initialized, setInitialized] = useState(false);
     const [error, setError] = useState<ErrorCodeEnum | undefined>(undefined);
+    const auth = useAuth();
 
     const getTokenHint = () => {
         return localStorage.getItem("id_token") ?? undefined;
@@ -36,8 +37,6 @@ const App = () => {
     };
     const promisesToWait: Promise<any>[] = [];
 
-    const auth = useAuth();
-
     useEffect(() => {
         if (
             window.location.search &&

diff --git a/src/index.tsx b/src/index.tsx
@@ -20,6 +20,8 @@ const oidcConfigSSO = {
     userManager: createUserManager(),
 };
 
+const currentHost = `${window.location.protocol}//${window.location.hostname}`;
+
 const oidcConfigOnline = {
     onSignIn: () => {
         //to remove keycloak params in url
@@ -33,7 +35,7 @@ const oidcConfigOnline = {
 
 const oidcConfigOffline = {
     automaticSilentRenew: !navigator.onLine,
-    silent_redirect_uri: "https://insee-edt.k8s.keyconsulting.fr/",
+    silent_redirect_uri: currentHost,
 };
 
 const oidcConfig = navigator.onLine ? oidcConfigOnline : oidcConfigOffline;

diff --git a/src/pages/home-surveyed/HomeSurveyed.tsx b/src/pages/home-surveyed/HomeSurveyed.tsx
@@ -105,7 +105,7 @@ const HomeSurveyedPage = () => {
                         !survey.startsWith("activitySurvey") && !survey.startsWith("workTimeSurvey"),
                 );
             if (navigator.onLine) {
-                getRemoteSavedSurveysDatas(idsSurveysSelected, setError).then(() => {
+                getRemoteSavedSurveysDatas(idsSurveysSelected, setError, false).then(() => {
                     initHome(idsSurveysSelected);
                 });
             } else {

diff --git a/src/pages/surveys-overview/SurveysOverview.tsx b/src/pages/surveys-overview/SurveysOverview.tsx
@@ -124,7 +124,6 @@ const SurveysOverviewPage = () => {
 
     const initHouseholds = () => {
         dataHouseholds = getListSurveysHousehold();
-
         if (searchResult == null || searchResult.length == 0) {
             setSearchResult(dataHouseholds);
         }

diff --git a/src/service/api-service.ts b/src/service/api-service.ts
@@ -168,16 +168,18 @@ const requestPutSurveyData = (
     data: SurveyData,
     token?: string,
 ): Promise<SurveyData> => {
-    return new Promise<SurveyData>(resolve => {
-        axios
-            .put(
-                stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey,
-                data,
-                getHeader(stromaeBackOfficeApiBaseUrl, token),
-            )
-            .then(() => {
-                resolve(data);
-            });
+    return new Promise((resolve, reject) => {
+        setTimeout(() => {
+            axios
+                .put(
+                    stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey,
+                    data,
+                    getHeader(stromaeBackOfficeApiBaseUrl, token),
+                )
+                .then(() => {
+                    resolve(data);
+                });
+        }, 1000);
     });
 };
 
@@ -235,15 +237,17 @@ const requestPutDataReviewer = (
     token?: string,
 ): Promise<LunaticData> => {
     return new Promise<LunaticData>(resolve => {
-        axios
-            .put(
-                stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey + "/data",
-                data,
-                getHeader(stromaeBackOfficeApiBaseUrl, token),
-            )
-            .then(() => {
-                resolve(data);
-            });
+        setTimeout(() => {
+            axios
+                .put(
+                    stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey + "/data",
+                    data,
+                    getHeader(stromaeBackOfficeApiBaseUrl, token),
+                )
+                .then(() => {
+                    resolve(data);
+                });
+        }, 1000);
     });
 };
 
@@ -253,25 +257,27 @@ const requestPutStateReviewer = (
     token?: string,
 ): Promise<StateData> => {
     return new Promise<StateData>(resolve => {
-        axios
-            .put(
-                stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey + "/state-data",
-                data,
-                getHeader(stromaeBackOfficeApiBaseUrl, token),
-            )
-            .then(() => {
-                resolve(data);
-            })
-            .catch(err => {
-                if (err.response?.status == 404) {
-                    const stateData = {
-                        state: StateDataStateEnum.INIT,
-                        date: Date.now(),
-                        currentPage: 0,
-                    };
-                    resolve(stateData);
-                }
-            });
+        setTimeout(() => {
+            axios
+                .put(
+                    stromaeBackOfficeApiBaseUrl + "api/survey-unit/" + idSurvey + "/state-data",
+                    data,
+                    getHeader(stromaeBackOfficeApiBaseUrl, token),
+                )
+                .then(() => {
+                    resolve(data);
+                })
+                .catch(err => {
+                    if (err.response?.status == 404) {
+                        const stateData = {
+                            state: StateDataStateEnum.INIT,
+                            date: Date.now(),
+                            currentPage: 0,
+                        };
+                        resolve(stateData);
+                    }
+                });
+        }, 1000);
     });
 };
 
@@ -281,18 +287,17 @@ const requestPutSurveyDataReviewer = (
     stateData: StateData,
     token?: string,
 ): Promise<SurveyData> => {
-    const promises = requestPutDataReviewer(idSurvey, data, token).then(() => {
-        return requestPutStateReviewer(idSurvey, stateData, token).then(() => {
-            return new Promise<SurveyData>(resolve => {
-                const surveyData: SurveyData = {
-                    stateData: stateData,
-                    data: data,
-                };
-                resolve(surveyData);
-            });
-        });
+    requestPutStateReviewer(idSurvey, stateData, token).then(() => {
+        requestPutDataReviewer(idSurvey, data, token);
+    });
+
+    return new Promise(resolve => {
+        const surveyData: SurveyData = {
+            stateData: stateData,
+            data: data,
+        };
+        return surveyData;
     });
-    return promises;
 };
 
 const logout = () => {

diff --git a/src/service/auth-service.ts b/src/service/auth-service.ts
@@ -66,9 +66,10 @@ const createUserManager = () => {
     });
 
     userManager.events.addUserLoaded(user => {
-        console.log("add user");
+        console.log("add user", user);
         setUserToken(user?.access_token || "");
     });
+
     userManager.events.addAccessTokenExpired(() => {
         if (navigator.onLine) {
             signinSilent(userManager);