front: remove flag for the edition source, call dtoimport on relevant…

… files
OpenRailAssociation · Dec 9, 2024 · b2b3224 · b2b3224
1 parent 4c19f93
commit b2b3224
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 24 deletions.
diff --git a/front/src/applications/operationalStudies/components/Scenario/ScenarioContent.tsx b/front/src/applications/operationalStudies/components/Scenario/ScenarioContent.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useCallback } from 'react';
 
 import { ChevronRight } from '@osrd-project/ui-icons';
 import cx from 'classnames';
@@ -60,33 +60,26 @@ const ScenarioContent = ({
     removeTrains,
   } = useScenarioData(scenario, timetable, infra);
 
-  const [editFromTimetable, setEditFromTimetable] = useState(false);
+  const [ngeDto, setNgeDto] = useState<NetzgrafikDto>();
+
+  const dtoImport = async () => {
+    const dto = await importTimetableToNGE(scenario.infra_id, scenario.timetable_id, dispatch);
+    setNgeDto(dto);
+  };
 
   const toggleMicroMacroButton = useCallback(
     (isMacroMode: boolean) => {
       setIsMacro(isMacroMode);
       if (!isMacroMode && collapsedTimetable) {
         setCollapsedTimetable(false);
       }
+      if (isMacroMode) {
+        dtoImport();
+      }
     },
     [setIsMacro, collapsedTimetable]
   );
 
-  const [ngeDto, setNgeDto] = useState<NetzgrafikDto>();
-
-  useEffect(() => {
-    const dtoImport = async () => {
-      const dto = await importTimetableToNGE(scenario.infra_id, scenario.timetable_id, dispatch);
-      setNgeDto(dto);
-      if (editFromTimetable) {
-        setEditFromTimetable(false);
-      }
-    };
-
-    if (isMacro || editFromTimetable) {
-      dtoImport();
-    }
-  }, [scenario, isMacro, editFromTimetable]);
   const handleNGEOperation = (event: NGEEvent, netzgrafikDto: NetzgrafikDto) => {
     handleOperation({
       event,
@@ -131,7 +124,7 @@ const ScenarioContent = ({
                       trainIdToEdit={trainIdToEdit}
                       setTrainIdToEdit={setTrainIdToEdit}
                       infraState={infra.state}
-                      setEditFromTimetable={setEditFromTimetable}
+                      dtoImport={dtoImport}
                     />
                   )}
                   <Timetable
@@ -145,6 +138,7 @@ const ScenarioContent = ({
                     trainIdToEdit={trainIdToEdit}
                     trainSchedules={trainSchedules}
                     trainSchedulesWithDetails={trainScheduleSummaries}
+                    dtoImport={dtoImport}
                   />
                 </>
               )}

diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleButton.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleButton.tsx
@@ -24,12 +24,14 @@ type AddTrainScheduleButtonProps = {
   infraState?: InfraState;
   setIsWorking: (isWorking: boolean) => void;
   upsertTrainSchedules: (trainSchedules: TrainScheduleResult[]) => void;
+  dtoImport: () => void;
 };
 
 const AddTrainScheduleButton = ({
   infraState,
   setIsWorking,
   upsertTrainSchedules,
+  dtoImport,
 }: AddTrainScheduleButtonProps) => {
   const [postTrainSchedule] =
     osrdEditoastApi.endpoints.postTimetableByIdTrainSchedule.useMutation();
@@ -83,6 +85,7 @@ const AddTrainScheduleButton = ({
           })
         );
         setIsWorking(false);
+        dtoImport();
         upsertTrainSchedules(newTrainSchedules);
       } catch (e) {
         setIsWorking(false);

diff --git a/...src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule.tsx b/...src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule.tsx
@@ -18,7 +18,7 @@ type TimetableManageTrainScheduleProps = {
   upsertTrainSchedules: (trainSchedules: TrainScheduleResult[]) => void;
   infraState?: InfraState;
   setTrainIdToEdit: (trainIdToEdit?: number) => void;
-  setEditFromTimetable: (editFromTimetable: boolean) => void;
+  dtoImport: () => void;
 };
 
 const TimetableManageTrainSchedule = ({
@@ -28,23 +28,23 @@ const TimetableManageTrainSchedule = ({
   infraState,
   trainIdToEdit,
   setTrainIdToEdit,
-  setEditFromTimetable,
+  dtoImport,
 }: TimetableManageTrainScheduleProps) => {
   const { t } = useTranslation('operationalStudies/manageTrainSchedule');
   const [isWorking, setIsWorking] = useState(false);
 
   const leaveManageTrainSchedule = () => {
     setDisplayTrainScheduleManagement(MANAGE_TRAIN_SCHEDULE_TYPES.none);
     setTrainIdToEdit(undefined);
-    setEditFromTimetable(false);
+    dtoImport();
   };
 
   const updateTrainSchedule = useUpdateTrainSchedule(
     setIsWorking,
     setDisplayTrainScheduleManagement,
     upsertTrainSchedules,
     setTrainIdToEdit,
-    setEditFromTimetable,
+    dtoImport,
     trainIdToEdit
   );
   return (
@@ -80,6 +80,7 @@ const TimetableManageTrainSchedule = ({
                 infraState={infraState}
                 setIsWorking={setIsWorking}
                 upsertTrainSchedules={upsertTrainSchedules}
+                dtoImport={dtoImport}
               />
             )}
             <TrainAddingSettings />

diff --git a/.../src/modules/trainschedule/components/ManageTrainSchedule/hooks/useUpdateTrainSchedule.ts b/.../src/modules/trainschedule/components/ManageTrainSchedule/hooks/useUpdateTrainSchedule.ts
@@ -19,7 +19,7 @@ const useUpdateTrainSchedule = (
   setDisplayTrainScheduleManagement: (type: string) => void,
   upsertTrainSchedules: (trainSchedules: TrainScheduleResult[]) => void,
   setTrainIdToEdit: (trainIdToEdit?: number) => void,
-  setEditFromTimetable: (editFromTimetable: boolean) => void,
+  dtoImport: () => void,
   trainIdToEdit?: number
 ) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
@@ -51,8 +51,8 @@ const useUpdateTrainSchedule = (
           id: trainIdToEdit,
           trainScheduleForm: trainSchedule,
         }).unwrap();
-        setEditFromTimetable(true);
         upsertTrainSchedules([trainScheduleResult]);
+        dtoImport();
         dispatch(
           setSuccess({
             title: t('trainUpdated'),

diff --git a/front/src/modules/trainschedule/components/Timetable/Timetable.tsx b/front/src/modules/trainschedule/components/Timetable/Timetable.tsx
@@ -28,6 +28,7 @@ type TimetableProps = {
   trainIdToEdit?: number;
   trainSchedules?: TrainScheduleResult[];
   trainSchedulesWithDetails: TrainScheduleWithDetails[];
+  dtoImport: () => void;
 };
 
 const formatDepartureDate = (d: Date) => dayjs(d).locale(i18n.language).format('dddd D MMMM YYYY');
@@ -43,6 +44,7 @@ const Timetable = ({
   trainIdToEdit,
   trainSchedules = [],
   trainSchedulesWithDetails,
+  dtoImport,
 }: TimetableProps) => {
   const { t } = useTranslation(['operationalStudies/scenario', 'common/itemTypes']);
 
@@ -160,6 +162,7 @@ const Timetable = ({
               projectionPathIsUsed={
                 infraState === 'CACHED' && trainIdUsedForProjection === train.id
               }
+              dtoImport={dtoImport}
             />
           </div>
         ))}

diff --git a/front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx b/front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx
@@ -34,6 +34,7 @@ type TimetableTrainCardProps = {
   setTrainIdToEdit: (trainIdToEdit?: number) => void;
   removeTrains: (trainIds: number[]) => void;
   projectionPathIsUsed: boolean;
+  dtoImport: () => void;
 };
 
 const formatFullDate = (d: Date) => dayjs(d).format('D/MM/YYYY HH:mm:ss');
@@ -50,6 +51,7 @@ const TimetableTrainCard = ({
   setTrainIdToEdit,
   removeTrains,
   projectionPathIsUsed,
+  dtoImport,
 }: TimetableTrainCardProps) => {
   const { t } = useTranslation(['operationalStudies/scenario']);
   const dispatch = useAppDispatch();
@@ -81,6 +83,7 @@ const TimetableTrainCard = ({
       .unwrap()
       .then(() => {
         removeTrains([train.id]);
+        dtoImport();
         dispatch(
           setSuccess({
             title: t('timetable.trainDeleted', { name: train.trainName }),
@@ -125,6 +128,7 @@ const TimetableTrainCard = ({
           body: [newTrain],
         }).unwrap();
         upsertTrainSchedules([trainScheduleResult]);
+        dtoImport();
         dispatch(
           setSuccess({
             title: t('timetable.trainAdded'),