fixup! fixup! front: manchette: display waypoints added with map click

Author: SharglutDev

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

@@ -92,6 +92,11 @@ const useScenarioData = () => {
     [projectedTrainsById]
   );
 
+  const trainScheduleUsedForProjection = useMemo(
+    () => trainSchedules?.find((trainSchedule) => trainSchedule.id === trainIdUsedForProjection),
+    [trainIdUsedForProjection, trainSchedules]
+  );
+
   useEffect(() => {
     if (!rawTrainSchedules) {
       setTrainSchedules(undefined);
@@ -193,6 +198,7 @@ const useScenarioData = () => {
         infra: { infra, isInfraLoaded, reloadCount },
         trainScheduleSummaries,
         trainSchedules,
+        trainScheduleUsedForProjection,
         trainIdUsedForProjection,
         projectedTrains,
         simulationResults,

front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx

@@ -97,6 +97,7 @@ const Scenario = () => {
     infra: { infra, isInfraLoaded, reloadCount },
     trainScheduleSummaries,
     trainSchedules,
+    trainScheduleUsedForProjection,
     trainIdUsedForProjection,
     projectedTrains,
     simulationResults,
@@ -308,6 +309,7 @@ const Scenario = () => {
                       collapsedTimetable={collapsedTimetable}
                       spaceTimeData={projectedTrains}
                       simulationResults={simulationResults}
+                      trainScheduleUsedForProjection={trainScheduleUsedForProjection}
                       trainIdUsedForProjection={trainIdUsedForProjection}
                       infraId={infraId}
                       timetableTrainNb={timetable.train_ids.length}

front/src/applications/operationalStudies/views/v2/SimulationResultsV2.tsx

@@ -8,6 +8,7 @@ import { useSelector } from 'react-redux';
 import { Rnd } from 'react-rnd';
 
 import type { SimulationResults, TrainSpaceTimeData } from 'applications/operationalStudies/types';
+import type { TrainScheduleResult } from 'common/api/osrdEditoastApi';
 import SimulationWarpedMap from 'common/Map/WarpedMap/SimulationWarpedMap';
 import { getScaleDomainFromValuesV2 } from 'modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues';
 import SimulationResultsMapV2 from 'modules/simulationResult/components/SimulationResultsMapV2';
@@ -33,6 +34,7 @@ type SimulationResultsV2Props = {
   collapsedTimetable: boolean;
   spaceTimeData?: TrainSpaceTimeData[];
   infraId?: number;
+  trainScheduleUsedForProjection?: TrainScheduleResult;
   trainIdUsedForProjection?: number;
   simulationResults: SimulationResults;
   timetableTrainNb: number;
@@ -42,6 +44,7 @@ const SimulationResultsV2 = ({
   collapsedTimetable,
   spaceTimeData,
   infraId,
+  trainScheduleUsedForProjection,
   trainIdUsedForProjection,
   simulationResults: {
     selectedTrainSchedule,
@@ -88,6 +91,7 @@ const SimulationResultsV2 = ({
   );
 
   const projectedOperationalPoints = useGetProjectedTrainOperationalPoints(
+    trainScheduleUsedForProjection,
     trainIdUsedForProjection,
     infraId
   );

front/src/modules/simulationResult/components/SpaceTimeChart/useGetProjectedTrainOperationalPoints.ts

@@ -7,10 +7,12 @@ import {
   osrdEditoastApi,
   type PathProperties,
   type PostInfraByInfraIdPathPropertiesApiArg,
+  type TrainScheduleResult,
 } from 'common/api/osrdEditoastApi';
 import { addElementAtIndex } from 'utils/array';
 
 const useGetProjectedTrainOperationalPoints = (
+  trainScheduleUsedForProjection?: TrainScheduleResult,
   trainIdUsedForProjection?: number,
   infraId?: number
 ) => {
@@ -19,16 +21,6 @@ const useGetProjectedTrainOperationalPoints = (
     NonNullable<PathProperties['operational_points']>
   >([]);
 
-  const { data: trainScheduleUsedForProjection } =
-    osrdEditoastApi.endpoints.getTrainScheduleById.useQuery(
-      {
-        id: trainIdUsedForProjection!,
-      },
-      {
-        skip: !trainIdUsedForProjection,
-      }
-    );
-
   const { data: pathfindingResult } = osrdEditoastApi.endpoints.getTrainScheduleByIdPath.useQuery(
     {
       id: trainIdUsedForProjection!,
@@ -59,11 +51,11 @@ const useGetProjectedTrainOperationalPoints = (
         };
         const { operational_points } = await postPathProperties(pathPropertiesParams).unwrap();
 
-        let operationalPointsWithAllWaypoints = operational_points as NonNullable<
-          PathProperties['operational_points']
-        >;
+        let operationalPointsWithAllWaypoints = operational_points!;
+
         // Check if there are vias added by map click and insert them in the operational points
         let waypointCounter = 1;
+
         trainScheduleUsedForProjection.path.forEach((step, i) => {
           if (!('track' in step)) return;
 
@@ -84,6 +76,12 @@ const useGetProjectedTrainOperationalPoints = (
             position: positionOnPath,
           };
 
+          // If we can't find any op position greater than the current step position, we add it at the end
+          if (indexToInsert === -1) {
+            operationalPointsWithAllWaypoints.push(formattedStep);
+            return;
+          }
+
           operationalPointsWithAllWaypoints = addElementAtIndex(
             operationalPointsWithAllWaypoints,
             indexToInsert,