front: display only trains around stdcm result

front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts

@@ -3,13 +3,8 @@ import { useEffect, useState, type Dispatch, type SetStateAction, useMemo } from
 
 import { useSelector } from 'react-redux';
 
-import {
-  osrdEditoastApi,
-  type PathfindingResultSuccess,
-  type TrainScheduleResult,
-} from 'common/api/osrdEditoastApi';
+import { osrdEditoastApi, type TrainScheduleResult } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
-import useLazyProjectTrains from 'modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains';
 import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 import { getBatchPackage } from 'utils/batch';
 import { concatMap, mapBy } from 'utils/types';
@@ -21,9 +16,9 @@ const BATCH_SIZE = 10;
 type UseLazyLoadTrainsProps = {
   infraId?: number;
   trainIdsToFetch?: number[];
-  path?: PathfindingResultSuccess;
   trainSchedules?: TrainScheduleResult[];
-  setTrainIdsToFetch: Dispatch<SetStateAction<number[] | undefined>>;
+  setTrainIdsToFetch?: Dispatch<SetStateAction<number[] | undefined>>;
+  setTrainIdsToProject?: Dispatch<SetStateAction<Set<number>>>;
 };
 
 /**
@@ -36,17 +31,15 @@ type UseLazyLoadTrainsProps = {
 const useLazyLoadTrains = ({
   infraId,
   trainIdsToFetch,
-  path,
   trainSchedules,
-  setTrainIdsToFetch,
+  setTrainIdsToProject,
 }: UseLazyLoadTrainsProps) => {
   const { getElectricalProfileSetId } = useOsrdConfSelectors();
   const electricalProfileSetId = useSelector(getElectricalProfileSetId);
 
   const [trainScheduleSummariesById, setTrainScheduleSummariesById] = useState<
     Map<number, TrainScheduleWithDetails>
   >(new Map());
-  const [trainIdsToProject, setTrainIdsToProject] = useState<Set<number>>(new Set());
   const [allTrainsLoaded, setAllTrainsLoaded] = useState(false);
 
   const [postTrainScheduleSimulationSummary] =
@@ -57,17 +50,6 @@ const useLazyLoadTrains = ({
 
   const trainSchedulesById = useMemo(() => mapBy(trainSchedules, 'id'), [trainSchedules]);
 
-  const allTrainsProjected = useMemo(() => trainIdsToProject.size === 0, [trainIdsToProject]);
-
-  const { projectedTrainsById, setProjectedTrainsById } = useLazyProjectTrains({
-    infraId,
-    trainIdsToProject,
-    path,
-    trainSchedules,
-    moreTrainsToCome: !allTrainsLoaded,
-    setTrainIdsToProject,
-  });
-
   // gradually fetch the simulation of the trains
   useEffect(() => {
     const getTrainScheduleSummaries = async (_infraId: number, _trainToFetchIds: number[]) => {
@@ -97,9 +79,6 @@ const useLazyLoadTrains = ({
         });
 
         if (!outOfSync) {
-          // launch the projection of the trains
-          setTrainIdsToProject((prev) => new Set([...prev, ...packageToFetch]));
-
           // format the summaries to display them in the timetable
           const newFormattedSummaries = formatTrainScheduleSummaries(
             packageToFetch,
@@ -108,12 +87,14 @@ const useLazyLoadTrains = ({
             rollingStocks!
           );
 
+          // launch the projection of the trains if needed
+          setTrainIdsToProject?.((prev) => new Set([...prev, ...packageToFetch]));
+
           // as formattedSummaries is a dictionary, we replace the previous values with the new ones
           setTrainScheduleSummariesById((prev) => concatMap(prev, newFormattedSummaries));
         }
       }
 
-      setTrainIdsToFetch([]);
       setAllTrainsLoaded(true);
     };
 
@@ -124,10 +105,7 @@ const useLazyLoadTrains = ({
 
   return {
     trainScheduleSummariesById,
-    projectedTrainsById,
     setTrainScheduleSummariesById,
-    setProjectedTrainsById,
-    allTrainsProjected,
     allTrainsLoaded,
   };
 };

front/src/applications/operationalStudies/hooks/useScenarioData.ts

@@ -11,6 +11,7 @@ import {
   type TrainScheduleResult,
 } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
+import useLazyProjectTrains from 'modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains';
 import { getTrainIdUsedForProjection } from 'reducers/simulationResults/selectors';
 import { mapBy } from 'utils/types';
 
@@ -30,6 +31,7 @@ const useScenarioData = (
 
   const [trainSchedules, setTrainSchedules] = useState<TrainScheduleResult[]>();
   const [trainIdsToFetch, setTrainIdsToFetch] = useState<number[]>();
+  const [trainIdsToProject, setTrainIdsToProject] = useState<Set<number>>(new Set());
 
   const [fetchTrainSchedules] = osrdEditoastApi.endpoints.postTrainSchedule.useLazyQuery();
   const [putTrainScheduleById] = osrdEditoastApi.endpoints.putTrainScheduleById.useMutation();
@@ -40,21 +42,36 @@ const useScenarioData = (
 
   const projectionPath = usePathProjection(infra);
 
-  const {
-    trainScheduleSummariesById,
-    projectedTrainsById,
-    setTrainScheduleSummariesById,
-    setProjectedTrainsById,
-    allTrainsProjected,
-    allTrainsLoaded,
-  } = useLazyLoadTrains({
+  const { trainScheduleSummariesById, setTrainScheduleSummariesById, allTrainsLoaded } =
+    useLazyLoadTrains({
+      infraId: scenario.infra_id,
+      trainIdsToFetch,
+      trainSchedules,
+      setTrainIdsToProject,
+    });
+
+  useEffect(() => {
+    if (allTrainsLoaded) {
+      setTrainIdsToFetch([]);
+    }
+  }, [allTrainsLoaded]);
+
+  const { projectedTrainsById, allTrainsProjected, setProjectedTrainsById } = useLazyProjectTrains({
     infraId: scenario.infra_id,
-    trainIdsToFetch,
-    setTrainIdsToFetch,
+    trainIdsToProject,
     path: projectionPath?.path,
     trainSchedules,
+    moreTrainsToCome: !allTrainsLoaded,
+    setTrainIdsToProject,
   });
 
+  useEffect(() => {
+    if (trainSchedules && projectionPath?.path && allTrainsLoaded) {
+      const trainIds = trainSchedules.map((trainSchedule) => trainSchedule.id);
+      setTrainIdsToProject(new Set(trainIds));
+    }
+  }, [projectionPath?.path]);
+
   const { data: conflicts, refetch: refetchConflicts } =
     osrdEditoastApi.endpoints.getTimetableByIdConflicts.useQuery(
       {

front/src/applications/stdcm/components/StdcmResults/StdcmDebugResults.tsx

@@ -4,8 +4,9 @@ import { useSelector } from 'react-redux';
 
 import { STDCM_TRAIN_ID } from 'applications/stdcm/consts';
 import useProjectedTrainsForStdcm from 'applications/stdcm/hooks/useProjectedTrainsForStdcm';
-import type { StdcmResultsOutput } from 'applications/stdcm/types';
-import { osrdEditoastApi, type TrackRange } from 'common/api/osrdEditoastApi';
+import type { StdcmSimulationOutputs } from 'applications/stdcm/types';
+import { hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
+import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 import ResizableSection from 'common/ResizableSection';
 import i18n from 'i18n';
@@ -20,16 +21,13 @@ const HANDLE_TAB_RESIZE_HEIGHT = 20;
 const MANCHETTE_HEIGHT_DIFF = 100;
 
 type StdcmDebugResultsProps = {
-  pathTrackRanges: TrackRange[];
-  simulationOutputs: StdcmResultsOutput;
+  simulationOutputs?: StdcmSimulationOutputs;
 };
 
-const StdcmDebugResults = ({
-  pathTrackRanges,
-  simulationOutputs: { pathProperties, results, speedSpaceChartData },
-}: StdcmDebugResultsProps) => {
+const StdcmDebugResults = ({ simulationOutputs }: StdcmDebugResultsProps) => {
   const { getWorkScheduleGroupId } = useOsrdConfSelectors() as StdcmConfSelectors;
   const workScheduleGroupId = useSelector(getWorkScheduleGroupId);
+  const successfulSimulation = hasResults(simulationOutputs) ? simulationOutputs : undefined;
 
   const [speedSpaceChartContainerHeight, setSpeedSpaceChartContainerHeight] =
     useState(SPEED_SPACE_CHART_HEIGHT);
@@ -39,46 +37,53 @@ const StdcmDebugResults = ({
     MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT
   );
 
-  const projectedData = useProjectedTrainsForStdcm(results);
+  const projectedData = useProjectedTrainsForStdcm(successfulSimulation?.results);
 
   const { data: workSchedules } = osrdEditoastApi.endpoints.postWorkSchedulesProjectPath.useQuery(
     {
       body: {
-        path_track_ranges: pathTrackRanges,
+        path_track_ranges: successfulSimulation?.results.path.track_section_ranges || [],
         work_schedule_group_id: workScheduleGroupId!,
       },
     },
-    { skip: !workScheduleGroupId }
+    { skip: !workScheduleGroupId || !successfulSimulation }
   );
 
+  if (!successfulSimulation) return null;
+  const { pathProperties, results, speedSpaceChartData } = successfulSimulation;
+
   return (
     <>
-      {projectedData && pathProperties.manchetteOperationalPoints && (
-        <ResizableSection
-          height={manchetteWithSpaceTimeChartHeight}
-          setHeight={setManchetteWithSpaceTimeChartHeight}
-          minHeight={MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT}
-        >
-          <div
-            className="osrd-simulation-container mb-2"
-            style={{
-              height: manchetteWithSpaceTimeChartHeight,
-            }}
+      {projectedData &&
+        projectedData?.spaceTimeData.length > 0 &&
+        pathProperties.manchetteOperationalPoints && (
+          <ResizableSection
+            height={manchetteWithSpaceTimeChartHeight}
+            setHeight={setManchetteWithSpaceTimeChartHeight}
+            minHeight={MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT}
           >
-            <p className="mt-2 mb-3 ml-4 font-weight-bold">{tWithoutPrefix('spaceTimeGraphic')}</p>
-            <div className="chart-container mt-2">
-              <ManchetteWithSpaceTimeChartWrapper
-                operationalPoints={pathProperties.manchetteOperationalPoints}
-                projectPathTrainResult={projectedData.spaceTimeData}
-                selectedTrainScheduleId={STDCM_TRAIN_ID}
-                workSchedules={workSchedules}
-                projectionLoaderData={projectedData.projectionLoaderData}
-                height={manchetteWithSpaceTimeChartHeight - MANCHETTE_HEIGHT_DIFF}
-              />
+            <div
+              className="osrd-simulation-container mb-2"
+              style={{
+                height: manchetteWithSpaceTimeChartHeight,
+              }}
+            >
+              <p className="mt-2 mb-3 ml-4 font-weight-bold">
+                {tWithoutPrefix('spaceTimeGraphic')}
+              </p>
+              <div className="chart-container mt-2">
+                <ManchetteWithSpaceTimeChartWrapper
+                  operationalPoints={pathProperties.manchetteOperationalPoints}
+                  projectPathTrainResult={projectedData.spaceTimeData}
+                  selectedTrainScheduleId={STDCM_TRAIN_ID}
+                  workSchedules={workSchedules}
+                  projectionLoaderData={projectedData.projectionLoaderData}
+                  height={manchetteWithSpaceTimeChartHeight - MANCHETTE_HEIGHT_DIFF}
+                />
+              </div>
             </div>
-          </div>
-        </ResizableSection>
-      )}
+          </ResizableSection>
+        )}
 
       <div className="osrd-simulation-container my-2 speedspacechart-container">
         <div

front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx

@@ -12,7 +12,6 @@ import {
   getOperationalPointsWithTimes,
 } from 'applications/stdcm/utils/formatSimulationReportSheet';
 import { hasConflicts, hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
-import { type TrackRange } from 'common/api/osrdEditoastApi';
 import NewMap from 'modules/trainschedule/components/ManageTrainSchedule/NewMap';
 import useDeploymentSettings from 'utils/hooks/useDeploymentSettings';
 
@@ -33,7 +32,6 @@ type StcdmResultsProps = {
   selectedSimulationIndex: number;
   showStatusBanner: boolean;
   simulationsList: StdcmSimulation[];
-  pathTrackRanges?: TrackRange[];
 };
 
 const StcdmResults = ({
@@ -48,7 +46,6 @@ const StcdmResults = ({
   selectedSimulationIndex,
   showStatusBanner,
   simulationsList,
-  pathTrackRanges,
 }: StcdmResultsProps) => {
   const { t } = useTranslation('stdcm', { keyPrefix: 'simulation.results' });
   const { stdcmName } = useDeploymentSettings();
@@ -188,9 +185,7 @@ const StcdmResults = ({
           />
         </div>
       </div>
-      {isDebugMode && pathTrackRanges && hasSimulationResults && (
-        <StdcmDebugResults pathTrackRanges={pathTrackRanges} simulationOutputs={outputs} />
-      )}
+      {isDebugMode && <StdcmDebugResults simulationOutputs={outputs} />}
     </>
   );
 };