fix: lunatic-edt alert component

InseeFrLab · Aug 6, 2024 · 9447a33 · 9447a33
1 parent 7afc7d0
commit 9447a33
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 13 deletions.
diff --git a/src/orchestrator/Orchestrator.tsx b/src/orchestrator/Orchestrator.tsx
@@ -357,6 +357,7 @@ export const OrchestratorForStories = (props: OrchestratorProps) => {
                                 source,
                             ),
                         );
+                        console.log("Value", value);
                         return (
                             <div className="lunatic lunatic-component" key={`component-${id}`}>
                                 <Component

diff --git a/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx b/src/pages/activity/activity-or-route-planner/ActivityOrRoutePlanner.tsx
@@ -69,7 +69,6 @@ import {
     getSurveyRights,
     refreshSurvey,
     saveData,
-    saveDataLocally,
     setValue,
 } from "service/survey-service";
 import { isDemoMode, isSurveyLocked, lockSurvey } from "service/survey-state-service";
@@ -692,7 +691,7 @@ const ActivityOrRoutePlannerPage = () => {
                             >
                                 <Box id="inner-content-scroll" className={classes.innerContentScroll}>
                                     <FlexCenter>
-                                        {/* <Alert
+                                        <Alert
                                             isAlertDisplayed={isAlertDisplayed}
                                             onCompleteCallBack={closeActivity(true, idSurvey)}
                                             onCancelCallBack={displayAlert(setIsAlertDisplayed, false)}
@@ -702,7 +701,7 @@ const ActivityOrRoutePlannerPage = () => {
                                                     aria-label={t("page.alert-when-quit.alt-alert-icon")}
                                                 />
                                             }
-                                        ></Alert> */}
+                                        ></Alert>
                                         <Box
                                             className={getClassCondition(
                                                 isReviewerMode() && activitiesRoutesOrGaps.length !== 0,

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
@@ -16,7 +16,6 @@ import {
     onNext,
     onPrevious,
     saveAndLoopNavigate,
-    saveAndLoopNavigateLocally,
     setEnviro,
     validateLocally,
 } from "service/navigation-service";

diff --git a/src/pages/activity/activity-summary/ActivitySummary.tsx b/src/pages/activity/activity-summary/ActivitySummary.tsx
@@ -522,7 +522,7 @@ const ActivitySummaryPage = () => {
                         {activitiesRoutesOrGaps.length !== 0 &&
                             (isReviewerMode ? (
                                 <Box className={classes.headerActivityLockBox}>
-                                    {/* <Alert
+                                    <Alert
                                         isAlertDisplayed={isAlertLockDisplayed}
                                         onCompleteCallBack={lock}
                                         onCancelCallBack={displayAlert(setIsAlertLockDisplayed, false)}
@@ -532,7 +532,7 @@ const ActivitySummaryPage = () => {
                                                 aria-label={t("page.alert-when-quit.alt-alert-icon")}
                                             />
                                         }
-                                    ></Alert> */}
+                                    ></Alert>
                                     <Box className={classes.headerActivityBox}>
                                         <Typography className={classes.label}>
                                             {t("page.activity-planner.activity-for-day")}

diff --git a/src/pages/home-surveyed/HomeSurveyed.tsx b/src/pages/home-surveyed/HomeSurveyed.tsx
@@ -372,9 +372,9 @@ const HomeSurveyedPage = () => {
 
     return (
         <>
-            {/* <FlexCenter>
+            <FlexCenter>
                 <Alert {...alertProps} />
-            </FlexCenter> */}
+            </FlexCenter>
             <Box className={classes.headerBox}>
                 {isReviewer ? (
                     <Box className={classes.reviewerButtonBox}>

diff --git a/src/service/api-service/getRemoteData.ts b/src/service/api-service/getRemoteData.ts
@@ -1,9 +1,12 @@
 import axios from "axios";
 import { ErrorCodeEnum } from "enumerations/ErrorCodeEnum";
 import { StateData, SurveyData, UserSurveys } from "interface/entity/Api";
-import { LunaticData, SourceData } from "interface/lunatic/Lunatic";
+import { LunaticData, ReferentielData, SourceData } from "interface/lunatic/Lunatic";
 import { initStateData, initSurveyData } from "../survey-service";
 import { getUserToken, isReviewer } from "../user-service";
+import { AuthContextProps } from "oidc-react";
+import { NomenclatureActivityOption } from "@inseefrlab/lunatic-edt";
+import { ReferentielsEnum } from "enumerations/ReferentielsEnum";
 
 export const edtOrganisationApiBaseUrl = process.env.REACT_APP_EDT_ORGANISATION_API_BASE_URL;
 export const stromaeBackOfficeApiBaseUrl = process.env.REACT_APP_STROMAE_BACK_OFFICE_API_BASE_URL;
@@ -31,6 +34,57 @@ export const getHeader = (origin?: string, userToken?: string) => {
     };
 };
 
+const fetchRemoteReferentiel = (auth: AuthContextProps, idReferentiel: ReferentielsEnum) => {
+    return axios.get<NomenclatureActivityOption[]>(
+        stromaeBackOfficeApiBaseUrl + "api/nomenclature/" + idReferentiel,
+        getHeader(stromaeBackOfficeApiBaseUrl),
+    );
+};
+
+const fetchRemoteReferentiels = (setError: (error: ErrorCodeEnum) => void): Promise<ReferentielData> => {
+    let refs: ReferentielData = {
+        [ReferentielsEnum.ACTIVITYNOMENCLATURE]: [],
+        [ReferentielsEnum.ACTIVITYAUTOCOMPLETE]: [],
+        [ReferentielsEnum.ROUTE]: [],
+        [ReferentielsEnum.MEANOFTRANSPORT]: [],
+        [ReferentielsEnum.ACTIVITYSECONDARYACTIVITY]: [],
+        [ReferentielsEnum.ROUTESECONDARYACTIVITY]: [],
+        [ReferentielsEnum.LOCATION]: [],
+        [ReferentielsEnum.KINDOFWEEK]: [],
+        [ReferentielsEnum.KINDOFDAY]: [],
+        [ReferentielsEnum.ACTIVITYGOAL]: [],
+    };
+    let refsEndPoints: string[] = [];
+    Object.values(ReferentielsEnum).forEach(value => {
+        refsEndPoints.push("api/nomenclature/" + value);
+    });
+
+    return new Promise(resolve => {
+        axios
+            .all(
+                refsEndPoints.map(endPoint =>
+                    axios.get(
+                        stromaeBackOfficeApiBaseUrl + endPoint,
+                        getHeader(stromaeBackOfficeApiBaseUrl),
+                    ),
+                ),
+            )
+            .then(res => {
+                Object.values(ReferentielsEnum).forEach((key, index) => {
+                    refs[key as ReferentielsEnum] = res[index].data;
+                });
+                resolve(refs);
+            })
+            .catch(err => {
+                if (err.response?.status === 403) {
+                    setError(ErrorCodeEnum.NO_RIGHTS);
+                } else {
+                    setError(ErrorCodeEnum.UNREACHABLE_NOMENCLATURES);
+                }
+            });
+    });
+};
+
 const revertTransformedArray = (dataAct: any) => {
     const revertedDataAct: { [key: string]: any } = {};
     Object.keys(dataAct).forEach(key => {
@@ -240,6 +294,8 @@ const remoteGetSurveyDataReviewer = (
 };
 
 export {
+    fetchRemoteReferentiel,
+    fetchRemoteReferentiels,
     fetchReviewerSurveysAssignments,
     fetchSurveysSourcesByIds,
     fetchUserSurveysInfo,

diff --git a/src/service/survey-service.ts b/src/service/survey-service.ts
@@ -94,7 +94,11 @@ const NUM_MAX_WORKTIME_SURVEYS = 3;
 
 let referentielsData: ReferentielData;
 let sourcesData: SourceData;
-let surveysIds: SurveysIds;
+let surveysIds: SurveysIds = {
+    [SurveysIdsEnum.ALL_SURVEYS_IDS]: [],
+    [SurveysIdsEnum.ACTIVITY_SURVEYS_IDS]: [],
+    [SurveysIdsEnum.WORK_TIME_SURVEYS_IDS]: [],
+};
 let userDatasActivity: UserSurveys[] = [];
 let userDatasWorkTime: UserSurveys[] = [];
 let userDatas: UserSurveys[] = [];
@@ -175,7 +179,6 @@ const initializeRefs = () => {
     return lunaticDatabase.get(REFERENTIELS_ID).then(refData => {
         if (!refData && navigator.onLine) {
             return fetchReferentiels().then(refs => {
-                console.log("refs", refs);
                 return saveReferentiels(refs);
             });
         } else {
@@ -797,7 +800,7 @@ const dataIsChange = (idSurvey: string, dataAct: LunaticData, lastData: LunaticD
     if (!dataCollected || !currentDataCollected) {
         return true;
     }
-    console.log("dataIsChange", !_.isEqual(dataCollected, currentDataCollected));
+    //console.log("dataIsChange", !_.isEqual(dataCollected, currentDataCollected));
     return !_.isEqual(dataCollected, currentDataCollected);
 };
 
@@ -967,7 +970,6 @@ const saveData = (
     forceUpdate = false,
     stateDataForced?: StateData,
 ): Promise<LunaticData> => {
-    console.log("saveData");
     data.lastLocalSaveDate = navigator.onLine ? Date.now() : Date.now() + 1;
     if (!data.houseReference) {
         const regexp = new RegExp(process.env.REACT_APP_HOUSE_REFERENCE_REGULAR_EXPRESSION || "");