front: fix space time chart warning display

Add a new boolean allTrainsProjected and display the warning "Projecting..." only if this boolean is not truthy.
OpenRailAssociation · Sep 16, 2024 · fd57bf9 · fd57bf9
1 parent 782d245
commit fd57bf9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/front/src/applications/operationalStudies/components/Scenario/ScenarioContent.tsx b/front/src/applications/operationalStudies/components/Scenario/ScenarioContent.tsx
@@ -64,6 +64,7 @@ const ScenarioContent = ({
     trainScheduleUsedForProjection,
     trainIdUsedForProjection,
     projectedTrains,
+    allTrainsProjected,
     simulationResults,
     conflicts,
     upsertTrainSchedules,
@@ -230,6 +231,7 @@ const ScenarioContent = ({
                     trainScheduleUsedForProjection={trainScheduleUsedForProjection}
                     trainIdUsedForProjection={trainIdUsedForProjection}
                     infraId={infra.id}
+                    allTrainsProjected={allTrainsProjected}
                     timetableTrainNb={timetable.train_ids.length}
                   />
                 )

diff --git a/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts b/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts
@@ -57,7 +57,7 @@ const useLazyLoadTrains = ({
 
   const trainSchedulesById = useMemo(() => mapBy(trainSchedules, 'id'), [trainSchedules]);
 
-  const { projectedTrainsById, setProjectedTrainsById } = useLazyProjectTrains({
+  const { projectedTrainsById, setProjectedTrainsById, allTrainsProjected } = useLazyProjectTrains({
     infraId,
     trainIdsToProject,
     path,
@@ -125,6 +125,7 @@ const useLazyLoadTrains = ({
     projectedTrainsById,
     setTrainScheduleSummariesById,
     setProjectedTrainsById,
+    allTrainsProjected,
   };
 };
 

diff --git a/front/src/applications/operationalStudies/hooks/useScenarioData.ts b/front/src/applications/operationalStudies/hooks/useScenarioData.ts
@@ -65,6 +65,7 @@ const useScenarioData = (
     projectedTrainsById,
     setTrainScheduleSummariesById,
     setProjectedTrainsById,
+    allTrainsProjected,
   } = useLazyLoadTrains({
     infraId: scenario.infra_id,
     trainIdsToFetch,
@@ -187,6 +188,7 @@ const useScenarioData = (
     trainScheduleUsedForProjection,
     trainIdUsedForProjection,
     projectedTrains,
+    allTrainsProjected,
     simulationResults,
     conflicts,
     removeTrains,

diff --git a/front/src/applications/operationalStudies/views/SimulationResults.tsx b/front/src/applications/operationalStudies/views/SimulationResults.tsx
@@ -41,6 +41,7 @@ type SimulationResultsProps = {
   trainIdUsedForProjection?: number;
   simulationResults: SimulationResultsData;
   timetableTrainNb: number;
+  allTrainsProjected: boolean;
 };
 
 const SimulationResults = ({
@@ -58,6 +59,7 @@ const SimulationResults = ({
     path,
   },
   timetableTrainNb,
+  allTrainsProjected,
 }: SimulationResultsProps) => {
   const { t } = useTranslation('simulation');
   const dispatch = useAppDispatch();
@@ -170,7 +172,7 @@ const SimulationResults = ({
 
             <div className="osrd-simulation-container d-flex flex-grow-1 flex-shrink-1">
               <div className="chart-container">
-                {spaceTimeData.length !== timetableTrainNb && (
+                {!allTrainsProjected && (
                   <ProjectionLoadingMessage
                     projectedTrainsNb={spaceTimeData.length}
                     totalTrains={timetableTrainNb}

diff --git a/front/src/modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains.ts b/front/src/modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains.ts
@@ -50,6 +50,7 @@ const useLazyProjectTrains = ({
   const [projectedTrainsById, setProjectedTrainsById] = useState<Map<number, TrainSpaceTimeData>>(
     new Map()
   );
+  const [allTrainsProjected, setAllTrainsProjected] = useState(false);
 
   const requestedProjectedTrainIds = useRef<Set<number>>(new Set());
   const projectionSeqNum = useRef(0);
@@ -96,6 +97,10 @@ const useLazyProjectTrains = ({
         (trainId) => !requestedProjectedTrainIds.current.has(trainId)
       );
 
+      if (allTrainsProjected && shouldProjectIds.length > 0) {
+        setAllTrainsProjected(false);
+      }
+
       for (let i = 0; i < shouldProjectIds.length; i += BATCH_SIZE) {
         // If projection parameters have changed, bail out
         if (projectionSeqNum.current !== seqNum) break;
@@ -125,6 +130,7 @@ const useLazyProjectTrains = ({
     ) {
       setTrainIdsToProject([]);
       requestedProjectedTrainIds.current = new Set();
+      setAllTrainsProjected(true);
     }
   }, [moreTrainsToCome, projectedTrainsById]);
 
@@ -143,6 +149,7 @@ const useLazyProjectTrains = ({
   return {
     projectedTrainsById,
     setProjectedTrainsById,
+    allTrainsProjected,
   };
 };