From e7e185711c468da77a36afa2fba009e818538a15 Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Fri, 15 Nov 2024 16:42:26 +0100
Subject: [PATCH] front: separate StdcmPathStep and PathStep types

- completely separate StdcmPathStep and PathStep types
- remove all the fake uic path item location (which were equal to -1)
- add a transformer in the persist config so the date are correctly deserialized from the local storage

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../components/StdcmForm/StdcmConfig.tsx      | 24 +++-----
 .../components/StdcmForm/StdcmDestination.tsx | 19 +++---
 .../components/StdcmForm/StdcmInputVia.tsx    | 25 ++------
 .../StdcmForm/StdcmOperationalPoint.tsx       | 42 +++++++------
 .../components/StdcmForm/StdcmOrigin.tsx      | 17 ++++--
 .../stdcm/components/StdcmForm/StdcmVias.tsx  | 36 +++++------
 .../StdcmResults/SimulationReportSheet.tsx    | 52 ++++++++++------
 .../components/StdcmResults/StdcmResults.tsx  | 10 ++-
 .../StdcmResults/StdcmResultsTable.tsx        |  6 +-
 .../stdcm/hooks/useStaticPathfinding.ts       |  5 +-
 .../src/applications/stdcm/hooks/useStdcm.ts  |  2 +-
 .../applications/stdcm/hooks/useStdcmForm.ts  |  4 +-
 front/src/applications/stdcm/types.ts         |  8 +--
 .../stdcm/utils/checkStdcmConfigErrors.ts     | 11 +---
 .../stdcm/utils/formatStdcmConf.ts            | 61 ++++++++++++-------
 front/src/applications/stdcm/utils/index.ts   | 24 ++++++++
 .../applications/stdcm/views/StdcmView.tsx    |  2 +-
 .../pathfinding/helpers/getStepLocation.ts    | 10 +--
 .../pathfinding/hooks/usePathfinding.ts       |  1 +
 front/src/modules/pathfinding/utils.ts        |  9 +--
 front/src/reducers/index.ts                   | 19 +++++-
 .../src/reducers/osrdconf/stdcmConf/index.ts  | 10 ++-
 .../stdcmConf/stdcmConfReducers.spec.ts       | 35 ++++++++---
 front/src/reducers/osrdconf/types.ts          | 25 +++++++-
 front/src/utils/__tests__/date.spec.ts        | 17 ------
 front/src/utils/date.ts                       | 33 +++++-----
 26 files changed, 290 insertions(+), 217 deletions(-)
 create mode 100644 front/src/applications/stdcm/utils/index.ts

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx
index 417f9298535..87e5bd330e1 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx
@@ -1,12 +1,12 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { Button } from '@osrd-project/ui-core';
 import { ArrowDown, ArrowUp } from '@osrd-project/ui-icons';
 import cx from 'classnames';
-import { compact } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
+import { extractMarkersInfo } from 'applications/stdcm/utils';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import useInfraStatus from 'modules/pathfinding/hooks/useInfraStatus';
 import { Map } from 'modules/trainschedule/components/ManageTrainSchedule';
@@ -77,15 +77,11 @@ const StdcmConfig = ({
 
   const disabled = isPending || retainedSimulationIndex > -1;
 
+  const markerInfos = useMemo(() => extractMarkersInfo(pathSteps), [pathSteps]);
+
   const startSimulation = () => {
     const isPathfindingFailed = !!pathfinding && pathfinding.status !== 'success';
-    const formErrorsStatus = checkStdcmConfigErrors(
-      isPathfindingFailed,
-      origin,
-      destination,
-      compact(pathSteps),
-      t
-    );
+    const formErrorsStatus = checkStdcmConfigErrors(isPathfindingFailed, origin, destination, t);
     if (pathfinding?.status === 'success' && !formErrorsStatus) {
       launchStdcmRequest();
     } else {
@@ -108,13 +104,7 @@ const StdcmConfig = ({
 
   useEffect(() => {
     const isPathfindingFailed = !!pathfinding && pathfinding.status !== 'success';
-    const formErrorsStatus = checkStdcmConfigErrors(
-      isPathfindingFailed,
-      origin,
-      destination,
-      [],
-      t
-    );
+    const formErrorsStatus = checkStdcmConfigErrors(isPathfindingFailed, origin, destination, t);
     setFormErrors(formErrorsStatus);
   }, [origin, destination, pathfinding]);
 
@@ -195,7 +185,7 @@ const StdcmConfig = ({
             preventPointSelection
             pathGeometry={pathfinding?.geometry}
             showStdcmAssets
-            simulationPathSteps={pathSteps}
+            simulationPathSteps={markerInfos}
           />
         </div>
       </div>
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
index 990a533db5d..d51d5f0150a 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
@@ -3,12 +3,12 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
+import { getTimesInfoFromDate } from 'applications/stdcm/utils';
 import DestinationIcon from 'assets/pictures/mapMarkers/destination.svg';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
 import { useAppDispatch } from 'store';
-import { extractDateAndTimefromISO, generateISODateFromDateTime } from 'utils/date';
 
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
@@ -28,9 +28,7 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
 
   const { destinationArrival, destinationToleranceValues } = useMemo(
     () => ({
-      destinationArrival: destination.arrival
-        ? extractDateAndTimefromISO(destination.arrival)
-        : undefined,
+      destinationArrival: getTimesInfoFromDate(destination.arrival),
       destinationToleranceValues: {
         arrivalToleranceBefore:
           destination.tolerances?.before !== undefined
@@ -45,11 +43,12 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
     [destination]
   );
 
-  const onArrivalChange = (schedule: ScheduleConstraint) => {
+  const onArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
+    date.setHours(hours, minutes);
     dispatch(
       updateStdcmPathStep({
         id: destination.id,
-        updates: { arrival: generateISODateFromDateTime(schedule) },
+        updates: { arrival: date },
       })
     );
   };
@@ -80,8 +79,12 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
       disabled={disabled}
       className="extremity"
     >
-      {'uic' in destination && (
-        <StdcmOperationalPoint point={destination} opPointId={destination.id} disabled={disabled} />
+      {(!destination.location || 'uic' in destination.location) && (
+        <StdcmOperationalPoint
+          location={destination.location}
+          pathStepId={destination.id}
+          disabled={disabled}
+        />
       )}
       <StdcmOpSchedule
         onArrivalChange={onArrivalChange}
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmInputVia.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmInputVia.tsx
index 2edf66c187c..ce2a449b88c 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmInputVia.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmInputVia.tsx
@@ -4,35 +4,20 @@ import { Input } from '@osrd-project/ui-core';
 import { debounce } from 'lodash';
 import { useTranslation } from 'react-i18next';
 
-import type { PathStep } from 'reducers/osrdconf/types';
-import { ISO8601Duration2sec, secToMin } from 'utils/timeManipulation';
-
 import { StdcmStopTypes } from '../../types';
 
 type StdcmInputViaProps = {
   stopType: StdcmStopTypes;
-  stopDuration: PathStep['stopFor'];
+  stopDuration?: number;
   updatePathStepStopTime: (stopTime: string) => void;
 };
 
 const StdcmInputVia = ({ stopType, stopDuration, updatePathStepStopTime }: StdcmInputViaProps) => {
   const { t } = useTranslation('stdcm');
 
-  const computedStopTime = useMemo(() => {
-    const duration = stopDuration ? `${secToMin(ISO8601Duration2sec(stopDuration))}` : '';
-    switch (stopType) {
-      case StdcmStopTypes.PASSAGE_TIME:
-        return '0';
-      case StdcmStopTypes.DRIVER_SWITCH:
-        return duration || '3';
-      default:
-        return duration || '0';
-    }
-  }, [stopDuration, stopType]);
-
-  const [pathStepStopTime, setPathStepStopTime] = useState(computedStopTime);
+  const [pathStepStopTime, setPathStepStopTime] = useState('');
 
-  const stopWarning = stopType === StdcmStopTypes.DRIVER_SWITCH && Number(computedStopTime) < 3;
+  const stopWarning = stopType === StdcmStopTypes.DRIVER_SWITCH && stopDuration && stopDuration < 3;
 
   const debounceUpdatePathStepStopTime = useMemo(
     () => debounce((value) => updatePathStepStopTime(value), 300),
@@ -40,8 +25,8 @@ const StdcmInputVia = ({ stopType, stopDuration, updatePathStepStopTime }: Stdcm
   );
 
   useEffect(() => {
-    setPathStepStopTime(computedStopTime);
-  }, [computedStopTime]);
+    setPathStepStopTime(stopDuration ? `${stopDuration}` : '');
+  }, [stopDuration]);
 
   return (
     stopType !== StdcmStopTypes.PASSAGE_TIME && (
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOperationalPoint.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOperationalPoint.tsx
index 28217bbe623..838379fb19c 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOperationalPoint.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOperationalPoint.tsx
@@ -7,14 +7,14 @@ import { type SearchResultItemOperationalPoint } from 'common/api/osrdEditoastAp
 import useSearchOperationalPoint from 'common/Map/Search/useSearchOperationalPoint';
 import { useOsrdConfActions } from 'common/osrdContext';
 import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
-import type { StdcmPathStep } from 'reducers/osrdconf/types';
+import type { UicPathItemLocation } from 'reducers/osrdconf/types';
 import { useAppDispatch } from 'store';
 import { normalized } from 'utils/strings';
 import { createFixedSelectOptions } from 'utils/uiCoreHelpers';
 
 type StdcmOperationalPointProps = {
-  point: StdcmPathStep;
-  opPointId: string;
+  location?: UicPathItemLocation;
+  pathStepId: string;
   disabled?: boolean;
 };
 
@@ -24,12 +24,15 @@ function formatChCode(chCode: string) {
   return chCode === '' ? 'BV' : chCode;
 }
 
-const StdcmOperationalPoint = ({ point, opPointId, disabled }: StdcmOperationalPointProps) => {
+const StdcmOperationalPoint = ({ location, pathStepId, disabled }: StdcmOperationalPointProps) => {
   const { t } = useTranslation('stdcm');
   const dispatch = useAppDispatch();
 
   const { searchTerm, chCodeFilter, sortedSearchResults, setSearchTerm, setChCodeFilter } =
-    useSearchOperationalPoint({ initialSearchTerm: point.name, initialChCodeFilter: point.ch });
+    useSearchOperationalPoint({
+      initialSearchTerm: location?.name,
+      initialChCodeFilter: location?.secondary_code || undefined,
+    });
 
   const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
 
@@ -71,20 +74,21 @@ const StdcmOperationalPoint = ({ point, opPointId, disabled }: StdcmOperationalP
           },
           [] as { label: string; id: string }[]
         ),
-    [point, sortedSearchResults]
+    [location, sortedSearchResults]
   );
 
   const dispatchNewPoint = (p?: SearchResultItemOperationalPoint) => {
-    if (p && p.ch === point.ch && 'uic' in point && p.uic === point.uic) return;
-    const newPoint = p
+    if (p && p.ch === location?.secondary_code && 'uic' in location && p.uic === location.uic)
+      return;
+    const newLocation = p
       ? {
           name: p.name,
           ch: p.ch,
           uic: p.uic,
-          coordinates: p.geographic.coordinates,
+          coordinates: p.geographic.coordinates as [number, number],
         }
-      : { name: undefined, ch: undefined, uic: -1, coordinates: undefined };
-    dispatch(updateStdcmPathStep({ id: point.id, updates: newPoint }));
+      : undefined;
+    dispatch(updateStdcmPathStep({ id: pathStepId, updates: { location: newLocation } }));
   };
 
   const updateSelectedPoint = (
@@ -110,8 +114,8 @@ const StdcmOperationalPoint = ({ point, opPointId, disabled }: StdcmOperationalP
 
   const onSelectChCodeFilter = (selectedChCode?: { id: string }) => {
     setChCodeFilter(selectedChCode?.id);
-    if (point && 'uic' in point)
-      updateSelectedPoint(sortedSearchResults, point.uic, selectedChCode?.id);
+    if (location && 'uic' in location)
+      updateSelectedPoint(sortedSearchResults, location.uic, selectedChCode?.id);
   };
 
   const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -122,20 +126,20 @@ const StdcmOperationalPoint = ({ point, opPointId, disabled }: StdcmOperationalP
   };
 
   useEffect(() => {
-    if (point) {
-      setSearchTerm(point.name || '');
-      setChCodeFilter(point.ch || '');
+    if (location) {
+      setSearchTerm(location.name || '');
+      setChCodeFilter(location.secondary_code || '');
     } else {
       setSearchTerm('');
       setChCodeFilter(undefined);
     }
-  }, [point]);
+  }, [location]);
 
   return (
     <div className="location-line">
       <div className="col-9 ci-input">
         <ComboBox
-          id={`${opPointId}-ci`}
+          id={`${pathStepId}-ci`}
           label={t('trainPath.ci')}
           value={searchTerm}
           onChange={onInputChange}
@@ -150,7 +154,7 @@ const StdcmOperationalPoint = ({ point, opPointId, disabled }: StdcmOperationalP
       <div className="col-3 p-0">
         <Select
           label={t('trainPath.ch')}
-          id={`${opPointId}-ch`}
+          id={`${pathStepId}-ch`}
           value={chCodeFilter ? { label: formatChCode(chCodeFilter), id: chCodeFilter } : undefined}
           onChange={(e) => onSelectChCodeFilter(e)}
           {...createFixedSelectOptions(sortedChOptions)}
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
index ed6ea2a5b9c..d54bb580c10 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
@@ -3,12 +3,12 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
+import { getTimesInfoFromDate } from 'applications/stdcm/utils';
 import OriginIcon from 'assets/pictures/mapMarkers/start.svg';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
 import { useAppDispatch } from 'store';
-import { extractDateAndTimefromISO, generateISODateFromDateTime } from 'utils/date';
 
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
@@ -27,7 +27,7 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
 
   const { originArrival, originToleranceValues } = useMemo(
     () => ({
-      originArrival: origin.arrival ? extractDateAndTimefromISO(origin.arrival) : undefined,
+      originArrival: getTimesInfoFromDate(origin.arrival),
       originToleranceValues: {
         arrivalToleranceBefore:
           origin.tolerances?.before !== undefined ? origin.tolerances.before : DEFAULT_TOLERANCE,
@@ -38,11 +38,12 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
     [origin]
   );
 
-  const onOriginArrivalChange = (schedule: ScheduleConstraint) => {
+  const onOriginArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
+    date.setHours(hours, minutes);
     dispatch(
       updateStdcmPathStep({
         id: origin.id,
-        updates: { arrival: generateISODateFromDateTime(schedule) },
+        updates: { arrival: date },
       })
     );
   };
@@ -79,8 +80,12 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
       disabled={disabled}
       hasTip
     >
-      {'uic' in origin && (
-        <StdcmOperationalPoint point={origin} opPointId={origin.id} disabled={disabled} />
+      {(!origin.location || 'uic' in origin.location) && (
+        <StdcmOperationalPoint
+          location={origin.location}
+          pathStepId={origin.id}
+          disabled={disabled}
+        />
       )}
       <StdcmOpSchedule
         onArrivalChange={onOriginArrivalChange}
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx
index 6d37886a465..9bbdd81cedd 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx
@@ -10,7 +10,6 @@ import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
 import type { StdcmPathStep } from 'reducers/osrdconf/types';
 import { useAppDispatch } from 'store';
-import { formatDurationAsISO8601 } from 'utils/timeManipulation';
 
 import StdcmCard from './StdcmCard';
 import StdcmDefaultCard from './StdcmDefaultCard';
@@ -31,8 +30,7 @@ const StdcmVias = ({ disabled = false }: StdcmConfigCardProps) => {
   const intermediatePoints = useMemo(() => pathSteps.slice(1, -1), [pathSteps]);
 
   const updateStopType = (newStopType: StdcmStopTypes, pathStep: StdcmPathStep) => {
-    const defaultStopTime =
-      newStopType === StdcmStopTypes.DRIVER_SWITCH ? formatDurationAsISO8601(3 * 60) : '';
+    const defaultStopTime = newStopType === StdcmStopTypes.DRIVER_SWITCH ? 3 : undefined;
     dispatch(
       updateStdcmPathStep({
         id: pathStep.id,
@@ -42,10 +40,11 @@ const StdcmVias = ({ disabled = false }: StdcmConfigCardProps) => {
   };
 
   const updateStopDuration = (stopTime: string, pathStep: StdcmPathStep) => {
+    const stopFor = stopTime ? Number(stopTime) : undefined;
     dispatch(
       updateStdcmPathStep({
         id: pathStep.id,
-        updates: { stopFor: formatDurationAsISO8601(Number(stopTime) * 60) },
+        updates: { stopFor },
       })
     );
   };
@@ -89,20 +88,23 @@ const StdcmVias = ({ disabled = false }: StdcmConfigCardProps) => {
               disabled={disabled}
               className="via"
             >
-              <StdcmOperationalPoint point={pathStep} opPointId={pathStep.id} disabled={disabled} />
-              {'uic' in pathStep && pathStep.uic !== -1 && (
-                <>
-                  <StdcmStopType
-                    stopTypes={pathStep.stopType}
-                    updatePathStepStopType={(newStopType) => updateStopType(newStopType, pathStep)}
-                  />
-                  <StdcmInputVia
-                    stopType={pathStep.stopType}
-                    stopDuration={pathStep.stopFor}
-                    updatePathStepStopTime={(e) => updateStopDuration(e, pathStep)}
-                  />
-                </>
+              {(!pathStep.location || 'uic' in pathStep.location) && (
+                <StdcmOperationalPoint
+                  location={pathStep.location}
+                  pathStepId={pathStep.id}
+                  disabled={disabled}
+                />
               )}
+
+              <StdcmStopType
+                stopTypes={pathStep.stopType}
+                updatePathStepStopType={(newStopType) => updateStopType(newStopType, pathStep)}
+              />
+              <StdcmInputVia
+                stopType={pathStep.stopType}
+                stopDuration={pathStep.stopFor}
+                updatePathStepStopTime={(e) => updateStopDuration(e, pathStep)}
+              />
             </StdcmCard>
           </div>
         );
diff --git a/front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx b/front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx
index 0dc2c710117..29960461c02 100644
--- a/front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx
+++ b/front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx
@@ -2,11 +2,12 @@ import { useEffect, useState } from 'react';
 
 import { Table, TR, TH, TD } from '@ag-media/react-pdf-table';
 import { Page, Text, Image, Document, View, Link } from '@react-pdf/renderer';
+import type { TFunction } from 'i18next';
 import { useTranslation } from 'react-i18next';
 
 import iconAlert from 'assets/simulationReportSheet/icon_alert_fill.png';
 import logoSNCF from 'assets/simulationReportSheet/logo_sncf_reseau.png';
-import type { PathStep } from 'reducers/osrdconf/types';
+import type { StdcmPathStep } from 'reducers/osrdconf/types';
 import { extractHHMM, formatDateToString, formatDay } from 'utils/date';
 import { msToKmh } from 'utils/physics';
 import { capitalizeFirstLetter } from 'utils/strings';
@@ -15,6 +16,20 @@ import styles from './SimulationReportStyleSheet';
 import type { SimulationReportSheetProps } from '../../types';
 import { base64ToJpeg, getStopDurationTime } from '../../utils/formatSimulationReportSheet';
 
+const getSecondaryCode = ({ location }: StdcmPathStep) => {
+  if (location && ('uic' in location || 'trigram' in location)) {
+    return location.secondary_code;
+  }
+  return null;
+};
+
+const getStopType = (step: StdcmPathStep, t: TFunction) => {
+  if (!step.isVia) {
+    return t('serviceStop');
+  }
+  return capitalizeFirstLetter(t(`stdcm:trainPath.stopType.${step.stopType}`));
+};
+
 const SimulationReportSheet = ({
   stdcmLinkedPaths,
   stdcmData,
@@ -65,11 +80,8 @@ const SimulationReportSheet = ({
     [mapImageUrl]
   );
 
-  const getArrivalTime = (
-    step: PathStep,
-    { isFirstStep, isLastStep }: { isFirstStep?: boolean; isLastStep?: boolean }
-  ) => {
-    if (isFirstStep || isLastStep) {
+  const getArrivalTime = (step: StdcmPathStep) => {
+    if (!step.isVia) {
       if (step.arrival && step.arrivalType === 'preciseTime') {
         return extractHHMM(step.arrival);
       }
@@ -191,8 +203,6 @@ const SimulationReportSheet = ({
                   </View>
                 </TH>
                 {stdcmData.simulationPathSteps.map((step, index) => {
-                  const isFirstStep = index === 0;
-                  const isLastStep = index === stdcmData.simulationPathSteps.length - 1;
                   renderedIndex += 1;
                   return (
                     <TR key={index} style={styles.convoyAndRoute.stopTableTbody}>
@@ -201,31 +211,27 @@ const SimulationReportSheet = ({
                       </View>
                       <View style={styles.convoyAndRoute.stopTableOpWidth}>
                         <TD style={styles.convoyAndRoute.stopTableOpColumn}>
-                          {step.name || 'Unknown'}
+                          {step.location?.name || 'Unknown'}
                         </TD>
                       </View>
                       <View style={styles.convoyAndRoute.stopTableChWidth}>
-                        <TD style={styles.convoyAndRoute.stopTableChColumn}>{step.ch}</TD>
+                        <TD style={styles.convoyAndRoute.stopTableChColumn}>
+                          {getSecondaryCode(step)}
+                        </TD>
                       </View>
                       <View style={styles.convoyAndRoute.stopTableEndWidth}>
                         <TD style={styles.convoyAndRoute.stopTableItalicColumn}>
-                          {getArrivalTime(step, { isLastStep })}
+                          {getArrivalTime(step)}
                         </TD>
                       </View>
                       <View style={styles.convoyAndRoute.stopTableStartWidth}>
                         <TD style={styles.convoyAndRoute.stopTableStartColumn}>
-                          {getArrivalTime(step, { isFirstStep })}
+                          {getArrivalTime(step)}
                         </TD>
                       </View>
                       <View style={styles.convoyAndRoute.stopTableStopTypeWidth}>
                         <TD style={styles.convoyAndRoute.stopTableItalicColumn}>
-                          {isFirstStep || isLastStep
-                            ? t('serviceStop')
-                            : capitalizeFirstLetter(
-                                t(
-                                  `stdcm:trainPath.stopType.${stdcmData.simulationPathSteps[index].stopType}`
-                                )
-                              )}
+                          {getStopType(step, t)}
                         </TD>
                       </View>
                     </TR>
@@ -305,7 +311,13 @@ const SimulationReportSheet = ({
                 const prevStep = operationalPointsList[index - 1];
                 const isViaInSimulationPath = stdcmData.simulationPathSteps
                   .slice(1, -1)
-                  .some((pathStep) => pathStep.name === step.name && pathStep.ch === step.ch);
+                  .some(
+                    ({ location }) =>
+                      location &&
+                      location.name === step.name &&
+                      'uic' in location &&
+                      location.secondary_code === step.ch
+                  );
                 const isViaWithoutStop = isViaInSimulationPath && step.duration === 0;
                 const isNotExtremity = !isFirstStep && !isLastStep;
                 const isStepWithDuration = step.duration !== 0 && !isLastStep;
diff --git a/front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx b/front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx
index 4a7962dbaf0..07612153176 100644
--- a/front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx
+++ b/front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx
@@ -6,6 +6,7 @@ import { useTranslation, Trans } from 'react-i18next';
 
 import useConflictsMessages from 'applications/stdcm/hooks/useConflictsMessages';
 import type { StdcmSimulation } from 'applications/stdcm/types';
+import { extractMarkersInfo } from 'applications/stdcm/utils';
 import {
   generateCodeNumber,
   getOperationalPointsWithTimes,
@@ -67,9 +68,12 @@ const StcdmResults = ({
     );
   }, [outputs]);
 
-  const simulationPathSteps = hasSimulationResults
-    ? outputs.results.simulationPathSteps
-    : undefined;
+  const simulationPathSteps = useMemo(() => {
+    if (!hasSimulationResults) {
+      return undefined;
+    }
+    return extractMarkersInfo(outputs.results.simulationPathSteps);
+  }, []);
 
   return (
     <>
diff --git a/front/src/applications/stdcm/components/StdcmResults/StdcmResultsTable.tsx b/front/src/applications/stdcm/components/StdcmResults/StdcmResultsTable.tsx
index 770c9ef5a10..236583f969a 100644
--- a/front/src/applications/stdcm/components/StdcmResults/StdcmResultsTable.tsx
+++ b/front/src/applications/stdcm/components/StdcmResults/StdcmResultsTable.tsx
@@ -52,7 +52,11 @@ const StcdmResultsTable = ({
             const isLastStep = index === operationalPointsList.length - 1;
             const prevStep = operationalPointsList[index - 1];
             const isRequestedPathStep = stdcmData.simulationPathSteps.some(
-              (pathStep) => pathStep.name === step.name && pathStep.ch === step.ch
+              ({ location }) =>
+                location &&
+                location.name === step.name &&
+                'uic' in location &&
+                location.secondary_code === step.ch
             );
             const shouldRenderRow = isFirstStep || isRequestedPathStep || isLastStep;
             const isPathStep =
diff --git a/front/src/applications/stdcm/hooks/useStaticPathfinding.ts b/front/src/applications/stdcm/hooks/useStaticPathfinding.ts
index f7b0cf91c8b..bdaa13e8ed7 100644
--- a/front/src/applications/stdcm/hooks/useStaticPathfinding.ts
+++ b/front/src/applications/stdcm/hooks/useStaticPathfinding.ts
@@ -26,10 +26,7 @@ const useStaticPathfinding = (infra?: InfraWithState) => {
     osrdEditoastApi.endpoints.postInfraByInfraIdPathfindingBlocks.useMutation();
 
   const pathStepsLocations = useMemo(
-    () =>
-      compact(
-        pathSteps.map((step) => (step && (!('uic' in step) || step.uic !== -1) ? step : null))
-      ),
+    () => compact(pathSteps.map((step) => step.location)),
     [pathSteps]
   );
 
diff --git a/front/src/applications/stdcm/hooks/useStdcm.ts b/front/src/applications/stdcm/hooks/useStdcm.ts
index fc06cd3492d..f4841167c50 100644
--- a/front/src/applications/stdcm/hooks/useStdcm.ts
+++ b/front/src/applications/stdcm/hooks/useStdcm.ts
@@ -119,7 +119,7 @@ const useStdcm = ({
             rollingStock: stdcmRollingStock,
             creationDate: new Date(),
             speedLimitByTag,
-            simulationPathSteps: osrdconf.pathSteps,
+            simulationPathSteps: osrdconf.stdcmPathSteps,
             path: response.pathfinding_result,
           } as StdcmConflictsResponse);
           setStdcmTrainConflicts(response.conflicts); // Set conflicts
diff --git a/front/src/applications/stdcm/hooks/useStdcmForm.ts b/front/src/applications/stdcm/hooks/useStdcmForm.ts
index c9dad0963e1..92ea77c1774 100644
--- a/front/src/applications/stdcm/hooks/useStdcmForm.ts
+++ b/front/src/applications/stdcm/hooks/useStdcmForm.ts
@@ -6,9 +6,9 @@ import useStdcmTowedRollingStock from 'applications/stdcm/hooks/useStdcmTowedRol
 import { useOsrdConfSelectors } from 'common/osrdContext';
 import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
-import { extractDateAndTimefromISO } from 'utils/date';
 
 import type { StdcmSimulationInputs } from '../types';
+import { getTimesInfoFromDate } from '../utils';
 
 const useStdcmForm = (): StdcmSimulationInputs => {
   const {
@@ -32,7 +32,7 @@ const useStdcmForm = (): StdcmSimulationInputs => {
   const towedRollingStock = useStdcmTowedRollingStock();
 
   const currentSimulationInputs = useMemo(() => {
-    const originArrival = origin?.arrival ? extractDateAndTimefromISO(origin.arrival) : undefined;
+    const originArrival = getTimesInfoFromDate(origin.arrival);
 
     return {
       pathSteps,
diff --git a/front/src/applications/stdcm/types.ts b/front/src/applications/stdcm/types.ts
index 12ddb30cb7e..26665a58037 100644
--- a/front/src/applications/stdcm/types.ts
+++ b/front/src/applications/stdcm/types.ts
@@ -13,7 +13,7 @@ import type {
 } from 'common/api/osrdEditoastApi';
 import type { SpeedSpaceChartData } from 'modules/simulationResult/types';
 import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
-import type { PathStep } from 'reducers/osrdconf/types';
+import type { StdcmPathStep } from 'reducers/osrdconf/types';
 import type { ValueOf } from 'utils/types';
 
 export type StdcmRequestStatus = ValueOf<typeof STDCM_REQUEST_STATUS>;
@@ -26,7 +26,7 @@ export type StdcmSuccessResponse = Omit<
   rollingStock: LightRollingStock;
   creationDate: Date;
   speedLimitByTag?: string;
-  simulationPathSteps: PathStep[];
+  simulationPathSteps: StdcmPathStep[];
 };
 
 export type StdcmConflictsResponse = Extract<
@@ -36,7 +36,7 @@ export type StdcmConflictsResponse = Extract<
   rollingStock: LightRollingStock;
   creationDate: Date;
   speedLimitByTag?: string;
-  simulationPathSteps: PathStep[];
+  simulationPathSteps: StdcmPathStep[];
   path: PathfindingResultSuccess;
 };
 
@@ -111,7 +111,7 @@ export type AllowanceValue =
 export type StdcmSimulationInputs = {
   departureDate?: string;
   departureTime?: string;
-  pathSteps: (PathStep | null)[];
+  pathSteps: StdcmPathStep[];
   consist?: {
     tractionEngine?: RollingStockWithLiveries;
     towedRollingStock?: TowedRollingStock;
diff --git a/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts b/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts
index a737f808ac6..d12d4de3c72 100644
--- a/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts
+++ b/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts
@@ -1,15 +1,14 @@
 import type { TFunction } from 'i18next';
 
-import type { PathStep } from 'reducers/osrdconf/types';
+import type { StdcmPathStep } from 'reducers/osrdconf/types';
 import { extractHHMM } from 'utils/date';
 
 import { StdcmConfigErrorTypes, ArrivalTimeTypes, type StdcmConfigErrors } from '../types';
 
 const checkStdcmConfigErrors = (
   pathfindingStateError: boolean,
-  origin: PathStep | null,
-  destination: PathStep | null,
-  pathSteps: (PathStep | null)[],
+  origin: Extract<StdcmPathStep, { isVia: false }>,
+  destination: Extract<StdcmPathStep, { isVia: false }>,
   t: TFunction
 ): StdcmConfigErrors | undefined => {
   const isOneOpPointMissing = !origin || !destination;
@@ -17,10 +16,6 @@ const checkStdcmConfigErrors = (
     return undefined;
   }
 
-  if (pathSteps.some((step) => step === null || ('uic' in step && step.uic === -1))) {
-    return { errorType: StdcmConfigErrorTypes.MISSING_LOCATION };
-  }
-
   if (pathfindingStateError) {
     return { errorType: StdcmConfigErrorTypes.PATHFINDING_FAILED };
   }
diff --git a/front/src/applications/stdcm/utils/formatStdcmConf.ts b/front/src/applications/stdcm/utils/formatStdcmConf.ts
index 4fbf6503fb3..267097283e9 100644
--- a/front/src/applications/stdcm/utils/formatStdcmConf.ts
+++ b/front/src/applications/stdcm/utils/formatStdcmConf.ts
@@ -13,9 +13,10 @@ import { setFailure } from 'reducers/main';
 import type { OsrdStdcmConfState, StandardAllowance } from 'reducers/osrdconf/types';
 import { dateTimeFormatting } from 'utils/date';
 import { kmhToMs, tToKg } from 'utils/physics';
-import { ISO8601Duration2sec, sec2ms } from 'utils/timeManipulation';
+import { sec2ms } from 'utils/timeManipulation';
 
 import createMargin from './createMargin';
+import { StdcmStopTypes } from '../types';
 
 type ValidStdcmConfig = {
   rollingStockId: number;
@@ -59,7 +60,17 @@ export const checkStdcmConf = (
     maxSpeed,
   } = osrdconf;
   let error = false;
-  if (pathSteps[0] === null) {
+
+  const origin = pathSteps.at(0)!;
+  if (origin.isVia) {
+    throw new Error('First step should not be a via');
+  }
+  const destination = pathSteps.at(-1)!;
+  if (destination.isVia) {
+    throw new Error('First step should not be a via');
+  }
+
+  if (!origin.location) {
     error = true;
     dispatch(
       setFailure({
@@ -68,7 +79,7 @@ export const checkStdcmConf = (
       })
     );
   }
-  if (pathSteps[pathSteps.length - 1] === null) {
+  if (!destination.location) {
     error = true;
     dispatch(
       setFailure({
@@ -105,12 +116,9 @@ export const checkStdcmConf = (
     );
   }
 
-  const origin = pathSteps.at(0);
-  const destination = pathSteps.at(-1);
-
-  const originArrival = origin?.arrival;
-  const destinationArrival = destination?.arrival;
-  const isDepartureScheduled = origin?.arrivalType === 'preciseTime';
+  const originArrival = origin.arrival;
+  const destinationArrival = destination.arrival;
+  const isDepartureScheduled = origin.arrivalType === 'preciseTime';
 
   const startDateTime = isDepartureScheduled
     ? new Date(originArrival!)
@@ -136,18 +144,29 @@ export const checkStdcmConf = (
   if (error) return null;
 
   const path = compact(osrdconf.stdcmPathSteps).map((step) => {
-    const { arrival, tolerances, stopFor, arrivalType } = step;
-    const location = getStepLocation(step);
-
-    const duration = stopFor ? sec2ms(ISO8601Duration2sec(stopFor) || Number(stopFor)) : 0;
-    const timingData =
-      arrivalType === 'preciseTime' && arrival
-        ? {
-            arrival_time: arrival,
-            arrival_time_tolerance_before: sec2ms(tolerances?.before ?? 0),
-            arrival_time_tolerance_after: sec2ms(tolerances?.after ?? 0),
-          }
-        : undefined;
+    const location = getStepLocation(step.location!);
+
+    let timingData: PathfindingItem['timing_data'] | undefined;
+    let duration: number | undefined;
+    if (step.isVia) {
+      const { stopFor } = step;
+      if (step.stopType !== StdcmStopTypes.PASSAGE_TIME) {
+        duration = stopFor;
+      }
+    } else {
+      const { arrival, tolerances, arrivalType } = step;
+      if (arrivalType === 'preciseTime' && arrival) {
+        // if the step is either the origin or the destination and is scheduled,
+        // it must have a duration (because it's a stop)
+        timingData = {
+          arrival_time: arrival.toISOString(),
+          arrival_time_tolerance_before: sec2ms(tolerances?.before ?? 0),
+          arrival_time_tolerance_after: sec2ms(tolerances?.after ?? 0),
+        };
+      }
+      duration = 0;
+    }
+
     return {
       duration,
       location,
diff --git a/front/src/applications/stdcm/utils/index.ts b/front/src/applications/stdcm/utils/index.ts
new file mode 100644
index 00000000000..a7acd385e6e
--- /dev/null
+++ b/front/src/applications/stdcm/utils/index.ts
@@ -0,0 +1,24 @@
+import type { MarkerInformation } from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers';
+import type { StdcmPathStep } from 'reducers/osrdconf/types';
+import { extractHHMM, extractDDMMYYYY } from 'utils/date';
+
+export const getTimesInfoFromDate = (date?: Date) =>
+  date
+    ? {
+        arrivalDate: extractDDMMYYYY(date), // ISO date part
+        arrivalTime: extractHHMM(date),
+        arrivalTimehours: date.getHours(),
+        arrivalTimeMinutes: date.getMinutes(),
+      }
+    : undefined;
+
+export const extractMarkersInfo = (pathSteps: StdcmPathStep[]) =>
+  pathSteps.reduce((acc, step) => {
+    if (step.location) {
+      acc.push({
+        coordinates: step.location.coordinates,
+        name: step.location.name,
+      });
+    }
+    return acc;
+  }, [] as MarkerInformation[]);
diff --git a/front/src/applications/stdcm/views/StdcmView.tsx b/front/src/applications/stdcm/views/StdcmView.tsx
index 041b4e1a568..882882235e1 100644
--- a/front/src/applications/stdcm/views/StdcmView.tsx
+++ b/front/src/applications/stdcm/views/StdcmView.tsx
@@ -80,7 +80,7 @@ const StdcmView = () => {
           totalMass: consist?.totalMass,
           maxSpeed: consist?.maxSpeed,
           speedLimitByTag: consist?.speedLimitByTag,
-          pathSteps: [...pathSteps],
+          stdcmPathSteps: [...pathSteps],
         })
       );
     }
diff --git a/front/src/modules/pathfinding/helpers/getStepLocation.ts b/front/src/modules/pathfinding/helpers/getStepLocation.ts
index 0bae3255ebf..7bad5601a8b 100644
--- a/front/src/modules/pathfinding/helpers/getStepLocation.ts
+++ b/front/src/modules/pathfinding/helpers/getStepLocation.ts
@@ -1,8 +1,7 @@
 import type { PathItemLocation } from 'common/api/osrdEditoastApi';
-import type { PathStep, StdcmPathStep } from 'reducers/osrdconf/types';
 import { mToMm } from 'utils/physics';
 
-const getStepLocation = (step: PathStep | StdcmPathStep): PathItemLocation => {
+const getStepLocation = <T extends PathItemLocation>(step: T): PathItemLocation => {
   if ('track' in step) {
     // TODO: step offset should be in mm in the store /!\
     // pathfinding blocks endpoint requires offsets in mm
@@ -12,12 +11,9 @@ const getStepLocation = (step: PathStep | StdcmPathStep): PathItemLocation => {
     return { operational_point: step.operational_point };
   }
   if ('trigram' in step) {
-    return { trigram: step.trigram, secondary_code: step.ch };
+    return { trigram: step.trigram, secondary_code: step.secondary_code };
   }
-  if (step.uic === -1) {
-    throw new Error('Invalid UIC');
-  }
-  return { uic: step.uic, secondary_code: step.ch };
+  return { uic: step.uic, secondary_code: step.secondary_code };
 };
 
 export default getStepLocation;
diff --git a/front/src/modules/pathfinding/hooks/usePathfinding.ts b/front/src/modules/pathfinding/hooks/usePathfinding.ts
index 0d71aa17118..5f3718adff7 100644
--- a/front/src/modules/pathfinding/hooks/usePathfinding.ts
+++ b/front/src/modules/pathfinding/hooks/usePathfinding.ts
@@ -324,6 +324,7 @@ export const usePathfinding = (
                     name: correspondingOp.name,
                     uic: correspondingOp.uic,
                     ch: correspondingOp.ch,
+                    secondary_code: correspondingOp.ch,
                     kp: correspondingOp.kp,
                     coordinates: correspondingOp.coordinates,
                   }),
diff --git a/front/src/modules/pathfinding/utils.ts b/front/src/modules/pathfinding/utils.ts
index 83d0f530483..07f1fb33d44 100644
--- a/front/src/modules/pathfinding/utils.ts
+++ b/front/src/modules/pathfinding/utils.ts
@@ -2,6 +2,7 @@ import { compact } from 'lodash';
 
 import type {
   GeoJsonLineString,
+  PathItemLocation,
   PathProperties,
   PathfindingInput,
   PostInfraByInfraIdPathfindingBlocksApiArg,
@@ -52,7 +53,7 @@ export const matchPathStepAndOp = (
   return step.track === op.track && step.offset === op.offsetOnTrack;
 };
 
-export const getPathfindingQuery = ({
+export const getPathfindingQuery = <T extends PathItemLocation>({
   infraId,
   rollingStock,
   origin,
@@ -61,9 +62,9 @@ export const getPathfindingQuery = ({
 }: {
   infraId?: number;
   rollingStock?: RollingStockWithLiveries;
-  origin: PathStep | null;
-  destination: PathStep | null;
-  pathSteps: (PathStep | null)[];
+  origin: T | null;
+  destination: T | null;
+  pathSteps: (T | null)[];
 }): PostInfraByInfraIdPathfindingBlocksApiArg | null => {
   if (infraId && rollingStock && origin && destination) {
     // Only origin and destination can be null so we can compact and we want to remove any via that would be null
diff --git a/front/src/reducers/index.ts b/front/src/reducers/index.ts
index 691fa0f9412..b44a8a8aeb7 100644
--- a/front/src/reducers/index.ts
+++ b/front/src/reducers/index.ts
@@ -1,6 +1,6 @@
 import type { Action, Reducer, ReducersMapObject, AnyAction } from 'redux';
 import type { PersistConfig } from 'redux-persist';
-import { persistCombineReducers, persistReducer } from 'redux-persist';
+import { createTransform, persistCombineReducers, persistReducer } from 'redux-persist';
 import storage from 'redux-persist/lib/storage'; // defaults to localStorage
 import createCompressor from 'redux-persist-transform-compress';
 import { createFilter } from 'redux-persist-transform-filter';
@@ -22,7 +22,7 @@ import stdcmConfReducer, {
   stdcmConfInitialState,
   stdcmConfSlice,
 } from 'reducers/osrdconf/stdcmConf';
-import type { OsrdConfState, OsrdStdcmConfState } from 'reducers/osrdconf/types';
+import type { OsrdConfState, OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types';
 import simulationReducer, {
   simulationResultsInitialState,
   simulationResultsSlice,
@@ -30,6 +30,7 @@ import simulationReducer, {
 import type { SimulationResultsState } from 'reducers/simulationResults/types';
 import userReducer, { userInitialState, userSlice } from 'reducers/user';
 import type { UserState } from 'reducers/user';
+import { isISOString } from 'utils/date';
 
 import { type ConfSlice, defaultCommonConf } from './osrdconf/osrdConfCommon';
 
@@ -57,12 +58,26 @@ const saveUserFilter = createFilter('user', userWhiteList);
 
 const saveMainFilter = createFilter('main', mainWhiteList);
 
+const dateTransform = createTransform(
+  null,
+  (outboundState: StdcmPathStep[]) =>
+    outboundState.map((step) => {
+      if (!step.isVia && step.arrival && isISOString(step.arrival as unknown as string)) {
+        return { ...step, arrival: new Date(step.arrival) };
+      }
+
+      return step;
+    }),
+  { whitelist: ['stdcmPathSteps'] }
+);
+
 // Useful to only blacklist a sub-propertie of osrdconf
 const buildOsrdConfPersistConfig = <T extends OsrdConfState>(
   slice: ConfSlice
 ): PersistConfig<T> => ({
   key: slice.name,
   storage,
+  transforms: [dateTransform],
   blacklist: ['featureInfoClick'],
 });
 
diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
index 14c07060703..063e87fe180 100644
--- a/front/src/reducers/osrdconf/stdcmConf/index.ts
+++ b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -14,10 +14,9 @@ import { addElementAtIndex } from 'utils/array';
 import type { ArrayElement } from 'utils/types';
 
 export const stdcmConfInitialState: OsrdStdcmConfState = {
-  // TODO: remove all the default uic values
   stdcmPathSteps: [
-    { id: nextId(), uic: -1, isVia: false, arrivalType: ArrivalTimeTypes.PRECISE_TIME },
-    { id: nextId(), uic: -1, isVia: false, arrivalType: ArrivalTimeTypes.ASAP },
+    { id: nextId(), isVia: false, arrivalType: ArrivalTimeTypes.PRECISE_TIME },
+    { id: nextId(), isVia: false, arrivalType: ArrivalTimeTypes.ASAP },
   ],
   standardStdcmAllowance: undefined,
   totalMass: undefined,
@@ -76,7 +75,7 @@ export const stdcmConfSlice = createSlice({
           OsrdStdcmConfState,
           | 'rollingStockID'
           | 'towedRollingStockID'
-          | 'pathSteps'
+          | 'stdcmPathSteps'
           | 'speedLimitByTag'
           | 'totalLength'
           | 'totalMass'
@@ -89,7 +88,7 @@ export const stdcmConfSlice = createSlice({
       state.totalLength = action.payload.totalLength;
       state.totalMass = action.payload.totalMass;
       state.maxSpeed = action.payload.maxSpeed;
-      state.pathSteps = action.payload.pathSteps;
+      state.stdcmPathSteps = action.payload.stdcmPathSteps;
       state.speedLimitByTag = action.payload.speedLimitByTag;
     },
     updateStdcmStandardAllowance(
@@ -143,7 +142,6 @@ export const stdcmConfSlice = createSlice({
       // Index takes count of the origin in the array
       state.stdcmPathSteps = addElementAtIndex(state.stdcmPathSteps, action.payload, {
         id: nextId(),
-        uic: -1,
         stopType: StdcmStopTypes.PASSAGE_TIME,
         isVia: true,
       });
diff --git a/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts b/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
index 74c14e3efb7..a6c187c80ca 100644
--- a/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
+++ b/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
@@ -1,6 +1,8 @@
+import nextId from 'react-id-generator';
 import { describe, it, expect } from 'vitest';
 
 import { ArrivalTimeTypes, StdcmStopTypes } from 'applications/stdcm/types';
+import getStepLocation from 'modules/pathfinding/helpers/getStepLocation';
 import {
   stdcmConfInitialState,
   stdcmConfSlice,
@@ -39,7 +41,7 @@ const testDataBuilder = {
 };
 
 const pathSteps = testDataBuilder.buildPathSteps();
-const [brest, rennes, lemans, paris] = pathSteps;
+const [_brest, rennes, _lemans, paris] = pathSteps;
 const stdcmPathSteps = pathSteps.map(
   (step, index) =>
     ({
@@ -58,7 +60,6 @@ const stdcmPathSteps = pathSteps.map(
 
 const initialStateSTDCMConfig = {
   rollingStockID: 10,
-  pathSteps: [paris, lemans, rennes, brest],
   speedLimitByTag: 'init-tag',
   stdcmPathSteps,
 };
@@ -98,17 +99,37 @@ describe('stdcmConfReducers', () => {
 
   it('should handle updateStdcmConfigWithData', () => {
     const store = createStore(initialStateSTDCMConfig);
+    const parisStdcm = {
+      id: nextId(),
+      isVia: false,
+      arrivalType: ArrivalTimeTypes.PRECISE_TIME,
+      location: {
+        ...getStepLocation(paris),
+        coordinates: paris.coordinates as [number, number],
+        name: paris.id,
+      },
+    } as StdcmPathStep;
+    const rennesStdcm = {
+      id: nextId(),
+      isVia: false,
+      arrivalType: ArrivalTimeTypes.ASAP,
+      location: {
+        ...getStepLocation(rennes),
+        coordinates: rennes.coordinates as [number, number],
+        name: rennes.id,
+      },
+    } as StdcmPathStep;
     store.dispatch(
       stdcmConfSliceActions.updateStdcmConfigWithData({
         rollingStockID: 20,
-        pathSteps: [paris, rennes],
+        stdcmPathSteps: [parisStdcm, rennesStdcm],
         speedLimitByTag: 'new-tag',
       })
     );
 
     const state = store.getState()[stdcmConfSlice.name];
     expect(state.rollingStockID).toBe(20);
-    expect(state.pathSteps).toEqual([paris, rennes]);
+    expect(state.stdcmPathSteps).toEqual([parisStdcm, rennesStdcm]);
     expect(state.speedLimitByTag).toBe('new-tag');
   });
 
@@ -145,7 +166,7 @@ describe('stdcmConfReducers', () => {
       expect(origin.isVia).toBe(false);
       const updates = {
         arrivalType: ArrivalTimeTypes.ASAP,
-        arrival: '2024-08-12T15:45:00.000+02:00',
+        arrival: new Date('2024-08-12T15:45:00.000+02:00'),
         tolerances: {
           before: 60,
           after: 60,
@@ -162,7 +183,7 @@ describe('stdcmConfReducers', () => {
       expect(via.isVia).toBe(true);
       const updates = {
         stopType: StdcmStopTypes.DRIVER_SWITCH,
-        stopFor: 'PT60',
+        stopFor: 1,
       };
 
       store.dispatch(stdcmConfSliceActions.updateStdcmPathStep({ id: via.id, updates }));
@@ -175,7 +196,7 @@ describe('stdcmConfReducers', () => {
       expect(destination.isVia).toBe(false);
       const updates = {
         arrivalType: ArrivalTimeTypes.ASAP,
-        arrival: '2024-08-12T15:45:00.000+02:00',
+        arrival: new Date('2024-08-12T15:45:00.000+02:00'),
         tolerances: {
           before: 60,
           after: 60,
diff --git a/front/src/reducers/osrdconf/types.ts b/front/src/reducers/osrdconf/types.ts
index d26fb8c1db7..27c73f585b3 100644
--- a/front/src/reducers/osrdconf/types.ts
+++ b/front/src/reducers/osrdconf/types.ts
@@ -91,6 +91,25 @@ export type PathStep = PathItemLocation & {
   isInvalid?: boolean;
 };
 
-export type StdcmPathStep = PathStep & {
-  tolerances?: { before: number; after: number };
-} & ({ isVia: true; stopType: StdcmStopTypes } | { isVia: false; arrivalType: ArrivalTimeTypes });
+export type UicPathItemLocation = {
+  uic: number;
+  secondary_code?: string | null;
+  name: string;
+  coordinates: [number, number];
+};
+
+export type StdcmPathStep = {
+  id: string;
+  location?: PathItemLocation & {
+    name: string;
+    coordinates: [number, number];
+  };
+} & (
+  | { isVia: true; stopType: StdcmStopTypes; stopFor?: number }
+  | {
+      isVia: false;
+      arrivalType: ArrivalTimeTypes;
+      arrival?: Date;
+      tolerances?: { before: number; after: number };
+    }
+);
diff --git a/front/src/utils/__tests__/date.spec.ts b/front/src/utils/__tests__/date.spec.ts
index 57140f5b962..64a5b4b96d9 100644
--- a/front/src/utils/__tests__/date.spec.ts
+++ b/front/src/utils/__tests__/date.spec.ts
@@ -8,8 +8,6 @@ import {
   parseDateTime,
   extractDateAndTimefromISO,
   isArrivalDateInSearchTimeWindow,
-  formatLocaleDateToIsoDate,
-  generateISODateFromDateTime,
 } from 'utils/date';
 
 describe('dateTimeToIso', () => {
@@ -138,18 +136,3 @@ describe('isArrivalDateInSearchTimeWindow', () => {
     expect(result).toBe(false);
   });
 });
-
-describe('generateISODateFromDateTime', () => {
-  it('should correctly set hours and minutes and return ISO string', () => {
-    const schedule = {
-      date: new Date('2024-08-01T00:00:00Z'),
-      hours: 10,
-      minutes: 30,
-    };
-    const expectedISODate = formatLocaleDateToIsoDate(new Date('2024-08-01T10:30:00Z'));
-
-    const result = generateISODateFromDateTime(schedule);
-
-    expect(result).toBe(expectedISODate);
-  });
-});
diff --git a/front/src/utils/date.ts b/front/src/utils/date.ts
index 4aee17c966d..e06e45eda92 100644
--- a/front/src/utils/date.ts
+++ b/front/src/utils/date.ts
@@ -4,7 +4,6 @@ import customParseFormat from 'dayjs/plugin/customParseFormat';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
 
-import type { ScheduleConstraint } from 'applications/stdcm/types';
 import type { IsoDateTimeString, IsoDurationString } from 'common/types';
 import i18n from 'i18n';
 
@@ -27,15 +26,16 @@ function extractHHMMSS(dateTimeString?: string) {
   return dateTimeString.substring(11, 19);
 }
 
-/**
- * @param dateTimeString date string in ISO format
- * @returns string "HH:MM"
- */
-export function extractHHMM(dateTimeString?: string) {
-  if (!dateTimeString) {
+/** given a Date, returns its time "HH:MM" */
+export function extractHHMM(date?: Date) {
+  if (!date) {
     return '';
   }
-  return dateTimeString.substring(11, 16);
+  return dayjs(date).format('HH:mm');
+}
+
+export function extractDDMMYYYY(date: Date) {
+  return dayjs(date).format('DD/MM/YYYY');
 }
 
 export function timestampToHHMMSS(timestamp: number) {
@@ -233,17 +233,6 @@ export function isArrivalDateInSearchTimeWindow(
   return arrivalDate >= searchDatetimeWindow.begin && arrivalDate <= searchDatetimeWindow.end;
 }
 
-/**
- * Generates an ISO date string from a given date and time.
- * @param {ScheduleConstraint} - An object containing the base date, the hours, and the minutes.
- * @returns {string} The ISO formatted date string.
- */
-export const generateISODateFromDateTime = ({ date, hours, minutes }: ScheduleConstraint) => {
-  date.setHours(hours);
-  date.setMinutes(minutes);
-  return formatLocaleDateToIsoDate(date);
-};
-
 /** Format a date to a string 'DD/MM/YY', for instance '01/01/24' */
 export const formatDateString = (date?: Date | null) => {
   if (!date) return '';
@@ -254,3 +243,9 @@ export const formatLocaleDate = (date: Date) => date.toLocaleString().substring(
 
 export const isEqualDate = (searchDate: Date, startDate: Date) =>
   formatLocaleDate(searchDate) === formatLocaleDate(startDate);
+
+/** Check if a string is a valid ISO string and can be converted into a date */
+export const isISOString = (val: string) => {
+  const d = new Date(val);
+  return !Number.isNaN(d.valueOf()) && d.toISOString() === val;
+};