fixup! front: refacto useOutputData

Author: clarani

front/src/applications/operationalStudies/views/SimulationResults.tsx

@@ -209,13 +209,12 @@ const SimulationResults = ({
       </div>
 
       {/* TIME STOPS TABLE */}
-
       <div className="time-stop-outputs">
         <p className="mt-2 mb-3 ml-3 font-weight-bold">{t('timetableOutput')}</p>
         <TimesStopsOutput
           simulatedTrain={trainSimulation}
           trainSummary={selectedTrainSummary}
-          pathProperties={pathProperties}
+          operationalPoints={pathProperties?.operationalPoints}
           selectedTrainSchedule={selectedTrainSchedule}
           path={path}
           dataIsLoading={formattedOpPointsLoading}

front/src/modules/timesStops/TimesStopsOutput.tsx

@@ -16,7 +16,7 @@ import { TableType, type TimeStopsRow } from './types';
 type TimesStopsOutputProps = {
   simulatedTrain: SimulationResponseSuccess;
   trainSummary?: TrainScheduleWithDetails;
-  pathProperties?: PathPropertiesFormatted;
+  operationalPoints?: PathPropertiesFormatted['operationalPoints'];
   selectedTrainSchedule?: TrainScheduleResult;
   path?: PathfindingResultSuccess;
   dataIsLoading: boolean;
@@ -25,20 +25,20 @@ type TimesStopsOutputProps = {
 const TimesStopsOutput = ({
   simulatedTrain,
   trainSummary,
-  pathProperties,
+  operationalPoints,
   selectedTrainSchedule,
   path,
   dataIsLoading,
 }: TimesStopsOutputProps) => {
   const enrichedOperationalPoints = useOutputTableData(
     simulatedTrain,
     trainSummary,
-    pathProperties,
+    operationalPoints,
     selectedTrainSchedule,
     path
   );
 
-  if (dataIsLoading || !trainSummary || !pathProperties || !selectedTrainSchedule) {
+  if (dataIsLoading || !trainSummary || !operationalPoints || !selectedTrainSchedule) {
     return (
       <div style={{ height: '600px' }}>
         <Loader />

front/src/modules/timesStops/helpers/__tests__/computeMargins.spec.ts

@@ -3,7 +3,6 @@ import { describe, it, expect } from 'vitest';
 import type { TrainScheduleResult } from 'common/api/osrdEditoastApi';
 
 import computeMargins from '../computeMargins';
-import { findNextScheduledOpPoint } from '../utils';
 
 describe('computeMargins', () => {
   const path = [
@@ -49,126 +48,3 @@ describe('computeMargins', () => {
     });
   });
 });
-
-describe('findNextScheduledOpPoint', () => {
-  const operationalPoints = [
-    {
-      id: 'd9c92cb4-tsrn-x',
-      name: 'Gondor',
-      time: 1715646000,
-      speed: 0,
-      duration: 0,
-      position: 0,
-      line_code: 78945612,
-      track_number: 9213,
-      line_name: 'line α',
-      track_name: 'A',
-      ch: 'hl',
-    },
-    {
-      id: 'd9b38600-tsrn-x',
-      name: 'Gondor',
-      time: 1715646048.531712,
-      speed: 12.867353322128086,
-      duration: 0,
-      position: 438,
-      line_code: 78945612,
-      track_number: 9288,
-      line_name: 'line α',
-      track_name: 'J1300',
-      ch: 't',
-    },
-    {
-      id: 'd94a2af4-tsrn-x',
-      name: 'Gondor',
-      time: 1715646059.5107863,
-      speed: 13.801572793437755,
-      duration: 0,
-      position: 586,
-      line_code: 78945612,
-      track_number: 7815,
-      line_name: 'line α',
-      track_name: 'track_1',
-      ch: 'P2',
-    },
-    {
-      id: 'd9cdd03e-tsrn-x',
-      name: 'Gondor',
-      time: 1715646219.668,
-      speed: 18.64034770551918,
-      duration: 0,
-      position: 2791,
-      line_code: 78945612,
-      track_number: 940,
-      line_name: 'line α',
-      track_name: 'a',
-      ch: 'PB',
-    },
-    {
-      id: '36239402-c97c-11e7-y',
-      name: 'Gondor',
-      time: 1715646254.8250234,
-      speed: 14.091773148623844,
-      duration: 0,
-      position: 3308,
-      line_code: 78945612,
-      track_number: 940,
-      line_name: 'line α',
-      track_name: 'a',
-      ch: '3M',
-    },
-    {
-      id: 'd9c4227a-tsrn-x',
-      name: 'Gondor',
-      time: 1715646279.9558847,
-      speed: 13.990647751771307,
-      duration: 0,
-      position: 3663,
-      line_code: 78945612,
-      track_number: 7815,
-      line_name: 'line α',
-      track_name: 'track_1',
-      ch: 'P1',
-    },
-    {
-      id: 'd982df3e-tsrn-x',
-      name: 'Mordor',
-      time: 1715646528.955,
-      speed: 0,
-      duration: 0,
-      position: 6288,
-      line_code: 78945612,
-      track_number: 940,
-      line_name: 'line α',
-      track_name: 'a',
-      ch: 'hl',
-    },
-  ];
-  const pathStepsWithOpPointIndex = [
-    {
-      id: 'id1087',
-      deleted: false,
-      uic: 78,
-      secondary_code: 'hl',
-      correspondingOpPointIndex: 0,
-    },
-    {
-      id: 'id461',
-      deleted: false,
-      uic: 78,
-      secondary_code: 'PB',
-      correspondingOpPointIndex: 3,
-    },
-    {
-      id: 'id1088',
-      deleted: false,
-      uic: 456,
-      secondary_code: 'hl',
-      correspondingOpPointIndex: 6,
-    },
-  ];
-  it('should find the next scheduled pathstep', () => {
-    const result = findNextScheduledOpPoint(operationalPoints, pathStepsWithOpPointIndex, 3);
-    expect(result).toBe(operationalPoints[6]);
-  });
-});

front/src/modules/timesStops/helpers/arrivalTime.ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/prefer-default-export */
 import { dateToHHMM } from 'utils/date';
-import { ISO8601Duration2sec } from 'utils/timeManipulation';
+import { ISO8601Duration2sec, calculateTimeDifferenceInDays } from 'utils/timeManipulation';
 
 import type { ScheduleEntry, TimeExtraDays } from '../types';
 
@@ -15,8 +15,7 @@ const computeDayTimeFromStartTime = (
 
   const timeExtraDay = {
     time: dateToHHMM(arrivalDatetime, { withSeconds: true }),
-    daySinceDeparture:
-      Math.abs(arrivalDatetime.getTime() - startDatetime.getTime()) / (1000 * 60 * 60 * 24),
+    daySinceDeparture: calculateTimeDifferenceInDays(startDatetime, arrivalDatetime),
     dayDisplayed: isAfterMidnight,
   };
 
@@ -25,34 +24,40 @@ const computeDayTimeFromStartTime = (
 
 export const computeInputDatetimes = (
   startDatetime: Date,
-  previousDatetime: Date,
-  schedule: ScheduleEntry,
+  lastReferenceDate: Date,
+  schedule: ScheduleEntry | undefined,
   { isDeparture }: { isDeparture: boolean }
 ) => {
+  let theoriticalArrival: Date | undefined;
   let arrival: TimeExtraDays | undefined;
   let departure: TimeExtraDays | undefined;
-  let prev = previousDatetime;
+  let refDate = lastReferenceDate;
+
+  let arrivalInSeconds;
+  // if is departure, use the startDatetime
+  if (isDeparture) {
+    arrivalInSeconds = 0;
+  } else if (schedule?.arrival) {
+    arrivalInSeconds = ISO8601Duration2sec(schedule.arrival); // duration from startTime
+  }
 
-  if (schedule && schedule.arrival) {
-    const arrivalInSeconds = ISO8601Duration2sec(schedule.arrival); // duration from startTime
-    const result = computeDayTimeFromStartTime(startDatetime, arrivalInSeconds, prev);
+  if (arrivalInSeconds !== undefined) {
+    theoriticalArrival = new Date(startDatetime.getTime() + arrivalInSeconds * 1000);
+    const result = computeDayTimeFromStartTime(startDatetime, arrivalInSeconds, refDate);
     arrival = result.timeExtraDay;
-    prev = result.previousTime;
-
-    if (schedule.stop_for) {
-      const departureInSeconds =
-        ISO8601Duration2sec(schedule.arrival) + ISO8601Duration2sec(schedule.stop_for);
-      const resultDeparture = computeDayTimeFromStartTime(startDatetime, departureInSeconds, prev);
+    refDate = result.previousTime;
+
+    if (schedule?.stop_for) {
+      const departureInSeconds = arrivalInSeconds + ISO8601Duration2sec(schedule.stop_for);
+      const resultDeparture = computeDayTimeFromStartTime(
+        startDatetime,
+        departureInSeconds,
+        refDate
+      );
       departure = resultDeparture.timeExtraDay;
-      prev = resultDeparture.previousTime;
+      refDate = resultDeparture.previousTime;
     }
   }
 
-  // if is departure and no arrival is defined, use the startDatetime
-  if (isDeparture && !arrival) {
-    const result = computeDayTimeFromStartTime(startDatetime, 0, prev);
-    arrival = result.timeExtraDay;
-  }
-
-  return { arrival, departure, prev };
+  return { theoriticalArrival, arrival, departure, refDate };
 };

front/src/modules/timesStops/helpers/computeMargins.ts

@@ -50,17 +50,16 @@ function computeMargins(
 
   // find the previous pathStep where margin was defined
   let prevIndex = 0;
-  // eslint-disable-next-line no-plusplus
-  for (let index = 1; index < pathStepIndex; index++) {
+  for (let index = 1; index < pathStepIndex; index += 1) {
     if (margins.boundaries.includes(path[index].id)) {
       prevIndex = index;
     }
   }
 
-  // durations to go from the previous pathStep with margin to current one.
+  // durations to go from the last pathStep with theorical margin to the next pathStep
   // base = no margin
   // provisional = margins
-  // final = margin + requested arrival times
+  // final = margins + requested arrival times
   const { base, provisional, final } = pathItemTimes;
   const baseDuration = ms2sec(base[pathStepIndex + 1] - base[prevIndex]);
   const provisionalDuration = ms2sec(provisional[pathStepIndex + 1] - provisional[prevIndex]);

front/src/modules/timesStops/helpers/utils.ts

@@ -4,7 +4,6 @@ import type { TFunction } from 'i18next';
 import { round, isEqual, isNil } from 'lodash';
 import { keyColumn, createTextColumn } from 'react-datasheet-grid';
 
-import type { OperationalPointWithTimeAndSpeed } from 'applications/operationalStudies/types';
 import type { ReceptionSignal } from 'common/api/osrdEditoastApi';
 import type { IsoDateTimeString, IsoDurationString, TimeString } from 'common/types';
 import { matchPathStepAndOp } from 'modules/pathfinding/utils';
@@ -26,7 +25,6 @@ import { marginRegExValidation, MarginUnit } from '../consts';
 import {
   TableType,
   type TimeExtraDays,
-  type PathStepOpPointCorrespondance,
   type TimesStopsInputRow,
 } from '../types';
 
@@ -116,21 +114,6 @@ export const formatSuggestedViasToRowVias = (
   });
 };
 
-export function findNextScheduledOpPoint(
-  operationalPoints: OperationalPointWithTimeAndSpeed[],
-  pathStepsWithOpPointIndex: PathStepOpPointCorrespondance[],
-  sugOpIndex: number
-) {
-  const pathStepIndex = pathStepsWithOpPointIndex.findIndex(
-    (pathStep) => pathStep.correspondingOpPointIndex === sugOpIndex
-  );
-  if (pathStepIndex >= 0) {
-    const nextPathStep = pathStepsWithOpPointIndex[pathStepIndex + 1];
-    return operationalPoints[nextPathStep?.correspondingOpPointIndex];
-  }
-  return null;
-}
-
 const getDigits = (unit: string | undefined) =>
   unit === MarginUnit.second || unit === MarginUnit.percent ? 0 : 1;