From c48617f142c8a1b8c3f29e1c2c97b0e3d6dc2bc8 Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Tue, 24 Dec 2024 13:43:13 +0100
Subject: [PATCH 1/6] front: move main actions from parent component in
 StdcmOpSchedule

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../components/StdcmForm/StdcmDestination.tsx | 42 ++---------------
 .../components/StdcmForm/StdcmOpSchedule.tsx  | 46 +++++++++++-------
 .../components/StdcmForm/StdcmOrigin.tsx      | 47 ++-----------------
 3 files changed, 35 insertions(+), 100 deletions(-)

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
index 31e0a185904..5f7eada11cb 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
@@ -5,26 +5,21 @@ 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 { useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
-import { useAppDispatch } from 'store';
 
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
 import StdcmOpSchedule from './StdcmOpSchedule';
-import type { ArrivalTimeTypes, ScheduleConstraint, StdcmConfigCardProps } from '../../types';
+import type { StdcmConfigCardProps } from '../../types';
 
 const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
   const { t } = useTranslation('stdcm');
-  const dispatch = useAppDispatch();
 
   const { getStdcmDestination } = useOsrdConfSelectors() as StdcmConfSelectors;
 
   const destination = useSelector(getStdcmDestination);
 
-  const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
-
   const { destinationArrival, destinationToleranceValues } = useMemo(
     () => ({
       destinationArrival: getTimesInfoFromDate(destination.arrival),
@@ -36,35 +31,6 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
     [destination]
   );
 
-  const onArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
-    date.setHours(hours, minutes);
-    dispatch(
-      updateStdcmPathStep({
-        id: destination.id,
-        updates: { arrival: date },
-      })
-    );
-  };
-
-  const onArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
-    dispatch(updateStdcmPathStep({ id: destination.id, updates: { arrivalType } }));
-  };
-
-  const onToleranceChange = ({
-    toleranceBefore,
-    toleranceAfter,
-  }: {
-    toleranceBefore: number;
-    toleranceAfter: number;
-  }) => {
-    dispatch(
-      updateStdcmPathStep({
-        id: destination.id,
-        updates: { tolerances: { before: toleranceBefore, after: toleranceAfter } },
-      })
-    );
-  };
-
   return (
     <StdcmCard
       data-testid="destination-card"
@@ -79,9 +45,7 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
         disabled={disabled}
       />
       <StdcmOpSchedule
-        onArrivalChange={onArrivalChange}
-        onArrivalTypeChange={onArrivalTypeChange}
-        onArrivalToleranceChange={onToleranceChange}
+        pathStep={destination}
         opTimingData={destinationArrival}
         opToleranceValues={destinationToleranceValues}
         opScheduleTimeType={destination.arrivalType}
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
index 06890423654..0848856ee4a 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
@@ -4,7 +4,10 @@ import { DatePicker, Select, TimePicker, TolerancePicker } from '@osrd-project/u
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
-import { useOsrdConfSelectors } from 'common/osrdContext';
+import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
+import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
+import type { StdcmPathStep } from 'reducers/osrdconf/types';
+import { useAppDispatch } from 'store';
 import { formatDateString, isArrivalDateInSearchTimeWindow } from 'utils/date';
 import { createStringSelectOptions } from 'utils/uiCoreHelpers';
 
@@ -12,15 +15,7 @@ import type { ArrivalTimeTypes, ScheduleConstraint } from '../../types';
 
 type StdcmOpScheduleProps = {
   disabled: boolean;
-  onArrivalChange: ({ date, hours, minutes }: ScheduleConstraint) => void;
-  onArrivalTypeChange: (arrivalType: ArrivalTimeTypes) => void;
-  onArrivalToleranceChange: ({
-    toleranceBefore,
-    toleranceAfter,
-  }: {
-    toleranceBefore: number;
-    toleranceAfter: number;
-  }) => void;
+  pathStep: Extract<StdcmPathStep, { isVia: false }>;
   opScheduleTimeType: ArrivalTimeTypes;
   opTimingData?: {
     date: Date;
@@ -45,9 +40,7 @@ const defaultDate = (date?: Date) => {
 
 const StdcmOpSchedule = ({
   disabled,
-  onArrivalChange,
-  onArrivalTypeChange,
-  onArrivalToleranceChange,
+  pathStep,
   opTimingData,
   opScheduleTimeType,
   opToleranceValues,
@@ -55,6 +48,9 @@ const StdcmOpSchedule = ({
   isOrigin = false,
 }: StdcmOpScheduleProps) => {
   const { t } = useTranslation('stdcm');
+  const dispatch = useAppDispatch();
+
+  const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
   const { getSearchDatetimeWindow } = useOsrdConfSelectors();
   const searchDatetimeWindow = useSelector(getSearchDatetimeWindow);
 
@@ -101,6 +97,20 @@ const StdcmOpSchedule = ({
     [t, searchDatetimeWindow]
   );
 
+  const onArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
+    date.setHours(hours, minutes);
+    dispatch(
+      updateStdcmPathStep({
+        id: pathStep.id,
+        updates: { arrival: date },
+      })
+    );
+  };
+
+  const onArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
+    dispatch(updateStdcmPathStep({ id: pathStep.id, updates: { arrivalType } }));
+  };
+
   useEffect(() => {
     if (
       (!isArrivalDateInSearchTimeWindow(arrivalDate, searchDatetimeWindow) ||
@@ -174,10 +184,12 @@ const StdcmOpSchedule = ({
               toleranceValues={arrivalToleranceValues}
               onChange={() => {}}
               onToleranceChange={({ minusTolerance, plusTolerance }) => {
-                onArrivalToleranceChange({
-                  toleranceBefore: minusTolerance,
-                  toleranceAfter: plusTolerance,
-                });
+                dispatch(
+                  updateStdcmPathStep({
+                    id: pathStep.id,
+                    updates: { tolerances: { before: minusTolerance, after: plusTolerance } },
+                  })
+                );
               }}
               disabled={disabled}
             />
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
index bc934810e45..d9724bae523 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
@@ -5,25 +5,20 @@ 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 { useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
-import { useAppDispatch } from 'store';
 
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
 import StdcmOpSchedule from './StdcmOpSchedule';
-import type { ArrivalTimeTypes, ScheduleConstraint, StdcmConfigCardProps } from '../../types';
+import type { StdcmConfigCardProps } from '../../types';
 
 const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
   const { t } = useTranslation('stdcm');
-  const dispatch = useAppDispatch();
 
   const { getStdcmOrigin } = useOsrdConfSelectors() as StdcmConfSelectors;
   const origin = useSelector(getStdcmOrigin);
 
-  const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
-
   const { originArrival, originToleranceValues } = useMemo(
     () => ({
       originArrival: getTimesInfoFromDate(origin.arrival),
@@ -35,40 +30,6 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
     [origin]
   );
 
-  const onOriginArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
-    date.setHours(hours, minutes);
-    dispatch(
-      updateStdcmPathStep({
-        id: origin.id,
-        updates: { arrival: date },
-      })
-    );
-  };
-
-  const onOriginArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
-    dispatch(
-      updateStdcmPathStep({
-        id: origin.id,
-        updates: { arrivalType },
-      })
-    );
-  };
-
-  const onOriginToleranceChange = ({
-    toleranceBefore,
-    toleranceAfter,
-  }: {
-    toleranceBefore: number;
-    toleranceAfter: number;
-  }) => {
-    dispatch(
-      updateStdcmPathStep({
-        id: origin.id,
-        updates: { tolerances: { before: toleranceBefore, after: toleranceAfter } },
-      })
-    );
-  };
-
   return (
     <StdcmCard
       name={t('trainPath.origin')}
@@ -83,9 +44,7 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
         disabled={disabled}
       />
       <StdcmOpSchedule
-        onArrivalChange={onOriginArrivalChange}
-        onArrivalTypeChange={onOriginArrivalTypeChange}
-        onArrivalToleranceChange={onOriginToleranceChange}
+        pathStep={origin}
         opTimingData={originArrival}
         opToleranceValues={originToleranceValues}
         opScheduleTimeType={origin.arrivalType}

From 0ff822166c402337a963c91c5aead63547940c5a Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Tue, 24 Dec 2024 13:46:46 +0100
Subject: [PATCH 2/6] front: compute tolerances directly in StdcmOpSchedule

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../components/StdcmForm/StdcmDestination.tsx |  7 +--
 .../components/StdcmForm/StdcmOpSchedule.tsx  | 50 +++++++++----------
 .../components/StdcmForm/StdcmOrigin.tsx      |  7 +--
 front/src/reducers/osrdconf/types.ts          |  2 +-
 4 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
index 5f7eada11cb..9add2b3fdc3 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
@@ -20,13 +20,9 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
 
   const destination = useSelector(getStdcmDestination);
 
-  const { destinationArrival, destinationToleranceValues } = useMemo(
+  const { destinationArrival } = useMemo(
     () => ({
       destinationArrival: getTimesInfoFromDate(destination.arrival),
-      destinationToleranceValues: {
-        arrivalToleranceBefore: destination.tolerances?.before || 0,
-        arrivalToleranceAfter: destination.tolerances?.after || 0,
-      },
     }),
     [destination]
   );
@@ -47,7 +43,6 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
       <StdcmOpSchedule
         pathStep={destination}
         opTimingData={destinationArrival}
-        opToleranceValues={destinationToleranceValues}
         opScheduleTimeType={destination.arrivalType}
         disabled={disabled}
         opId="destination-arrival"
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
index 0848856ee4a..69c56996610 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
@@ -24,10 +24,6 @@ type StdcmOpScheduleProps = {
     arrivalTimeHours: number;
     arrivalTimeMinutes: number;
   };
-  opToleranceValues: {
-    arrivalToleranceBefore: number;
-    arrivalToleranceAfter: number;
-  };
   opId: string;
   isOrigin?: boolean;
 };
@@ -43,7 +39,6 @@ const StdcmOpSchedule = ({
   pathStep,
   opTimingData,
   opScheduleTimeType,
-  opToleranceValues,
   opId,
   isOrigin = false,
 }: StdcmOpScheduleProps) => {
@@ -54,26 +49,29 @@ const StdcmOpSchedule = ({
   const { getSearchDatetimeWindow } = useOsrdConfSelectors();
   const searchDatetimeWindow = useSelector(getSearchDatetimeWindow);
 
-  const { arrivalDate, arrivalTime, arrivalTimeHours, arrivalTimeMinutes, arrivalToleranceValues } =
-    useMemo(() => {
-      const isArrivalDateValid =
-        opTimingData?.arrivalDate &&
-        isArrivalDateInSearchTimeWindow(opTimingData.date, searchDatetimeWindow);
-
-      return {
-        arrivalDate:
-          opTimingData && isArrivalDateValid
-            ? opTimingData.date
-            : defaultDate(searchDatetimeWindow?.begin),
-        arrivalTime: opTimingData?.arrivalTime,
-        arrivalTimeHours: opTimingData?.arrivalTimeHours,
-        arrivalTimeMinutes: opTimingData?.arrivalTimeMinutes,
-        arrivalToleranceValues: {
-          minusTolerance: opToleranceValues.arrivalToleranceBefore,
-          plusTolerance: opToleranceValues.arrivalToleranceAfter,
-        },
-      };
-    }, [opTimingData, opToleranceValues, searchDatetimeWindow]);
+  const { arrivalDate, arrivalTime, arrivalTimeHours, arrivalTimeMinutes } = useMemo(() => {
+    const isArrivalDateValid =
+      opTimingData?.arrivalDate &&
+      isArrivalDateInSearchTimeWindow(opTimingData.date, searchDatetimeWindow);
+
+    return {
+      arrivalDate:
+        opTimingData && isArrivalDateValid
+          ? opTimingData.date
+          : defaultDate(searchDatetimeWindow?.begin),
+      arrivalTime: opTimingData?.arrivalTime,
+      arrivalTimeHours: opTimingData?.arrivalTimeHours,
+      arrivalTimeMinutes: opTimingData?.arrivalTimeMinutes,
+    };
+  }, [opTimingData, searchDatetimeWindow]);
+
+  const tolerances = useMemo(
+    () => ({
+      minusTolerance: pathStep.tolerances.before,
+      plusTolerance: pathStep.tolerances.after,
+    }),
+    [pathStep.tolerances]
+  );
 
   const selectableSlot = useMemo(
     () =>
@@ -181,7 +179,7 @@ const StdcmOpSchedule = ({
             <TolerancePicker
               id={`stdcm-tolerance-${opId}`}
               label={t('trainPath.tolerance')}
-              toleranceValues={arrivalToleranceValues}
+              toleranceValues={tolerances}
               onChange={() => {}}
               onToleranceChange={({ minusTolerance, plusTolerance }) => {
                 dispatch(
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
index d9724bae523..159aa5bb0d9 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
@@ -19,13 +19,9 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
   const { getStdcmOrigin } = useOsrdConfSelectors() as StdcmConfSelectors;
   const origin = useSelector(getStdcmOrigin);
 
-  const { originArrival, originToleranceValues } = useMemo(
+  const { originArrival } = useMemo(
     () => ({
       originArrival: getTimesInfoFromDate(origin.arrival),
-      originToleranceValues: {
-        arrivalToleranceBefore: origin.tolerances?.before || 0,
-        arrivalToleranceAfter: origin.tolerances?.after || 0,
-      },
     }),
     [origin]
   );
@@ -46,7 +42,6 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
       <StdcmOpSchedule
         pathStep={origin}
         opTimingData={originArrival}
-        opToleranceValues={originToleranceValues}
         opScheduleTimeType={origin.arrivalType}
         disabled={disabled}
         opId="origin-arrival"
diff --git a/front/src/reducers/osrdconf/types.ts b/front/src/reducers/osrdconf/types.ts
index a1c3d35a9e2..8135047e20f 100644
--- a/front/src/reducers/osrdconf/types.ts
+++ b/front/src/reducers/osrdconf/types.ts
@@ -98,6 +98,6 @@ export type StdcmPathStep = {
       isVia: false;
       arrivalType: ArrivalTimeTypes;
       arrival?: Date;
-      tolerances?: { before: number; after: number };
+      tolerances: { before: number; after: number };
     }
 );

From 8587a2d2393a7eb442a5d3d939fd72da907c47a2 Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Tue, 24 Dec 2024 13:48:35 +0100
Subject: [PATCH 3/6] front: remove opScheduleTimeType props from
 StdcmOpScheduleProps

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../stdcm/components/StdcmForm/StdcmDestination.tsx    |  1 -
 .../stdcm/components/StdcmForm/StdcmOpSchedule.tsx     | 10 ++++------
 .../stdcm/components/StdcmForm/StdcmOrigin.tsx         |  1 -
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
index 9add2b3fdc3..4f46570a04f 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
@@ -43,7 +43,6 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
       <StdcmOpSchedule
         pathStep={destination}
         opTimingData={destinationArrival}
-        opScheduleTimeType={destination.arrivalType}
         disabled={disabled}
         opId="destination-arrival"
       />
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
index 69c56996610..154408c954b 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
@@ -16,7 +16,6 @@ import type { ArrivalTimeTypes, ScheduleConstraint } from '../../types';
 type StdcmOpScheduleProps = {
   disabled: boolean;
   pathStep: Extract<StdcmPathStep, { isVia: false }>;
-  opScheduleTimeType: ArrivalTimeTypes;
   opTimingData?: {
     date: Date;
     arrivalDate: string;
@@ -38,7 +37,6 @@ const StdcmOpSchedule = ({
   disabled,
   pathStep,
   opTimingData,
-  opScheduleTimeType,
   opId,
   isOrigin = false,
 }: StdcmOpScheduleProps) => {
@@ -113,7 +111,7 @@ const StdcmOpSchedule = ({
     if (
       (!isArrivalDateInSearchTimeWindow(arrivalDate, searchDatetimeWindow) ||
         !opTimingData?.arrivalDate) &&
-      opScheduleTimeType === 'preciseTime'
+      pathStep.arrivalType === 'preciseTime'
     ) {
       onArrivalChange({
         date: defaultDate(searchDatetimeWindow?.begin),
@@ -121,14 +119,14 @@ const StdcmOpSchedule = ({
         minutes: arrivalTimeMinutes || 0,
       });
     }
-  }, [searchDatetimeWindow, opScheduleTimeType]);
+  }, [searchDatetimeWindow, pathStep.arrivalType]);
 
   return (
     <>
       <div className="arrival-type-select">
         <Select
           id={`select-${opId}`}
-          value={opScheduleTimeType}
+          value={pathStep.arrivalType}
           onChange={(e) => {
             if (e) {
               onArrivalTypeChange(e as ArrivalTimeTypes);
@@ -143,7 +141,7 @@ const StdcmOpSchedule = ({
           disabled={disabled}
         />
       </div>
-      {opScheduleTimeType === 'preciseTime' && (
+      {pathStep.arrivalType === 'preciseTime' && (
         <div className="schedule">
           <DatePicker
             inputProps={{
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
index 159aa5bb0d9..8623b65fe84 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
@@ -42,7 +42,6 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
       <StdcmOpSchedule
         pathStep={origin}
         opTimingData={originArrival}
-        opScheduleTimeType={origin.arrivalType}
         disabled={disabled}
         opId="origin-arrival"
         isOrigin

From f3e623f27f0386d3c595204e6386fb4cf9c47837 Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Tue, 24 Dec 2024 14:02:17 +0100
Subject: [PATCH 4/6] front: update stdcm arrival dates when
 searchDatetimeWindow changes

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../components/StdcmForm/StdcmOpSchedule.tsx  | 16 +-----
 .../src/reducers/osrdconf/stdcmConf/index.ts  | 55 +++++++++++++------
 front/src/reducers/osrdconf/types.ts          |  1 +
 3 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
index 154408c954b..1f1674bae5b 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 
 import { DatePicker, Select, TimePicker, TolerancePicker } from '@osrd-project/ui-core';
 import { useTranslation } from 'react-i18next';
@@ -107,20 +107,6 @@ const StdcmOpSchedule = ({
     dispatch(updateStdcmPathStep({ id: pathStep.id, updates: { arrivalType } }));
   };
 
-  useEffect(() => {
-    if (
-      (!isArrivalDateInSearchTimeWindow(arrivalDate, searchDatetimeWindow) ||
-        !opTimingData?.arrivalDate) &&
-      pathStep.arrivalType === 'preciseTime'
-    ) {
-      onArrivalChange({
-        date: defaultDate(searchDatetimeWindow?.begin),
-        hours: arrivalTimeHours || 0,
-        minutes: arrivalTimeMinutes || 0,
-      });
-    }
-  }, [searchDatetimeWindow, pathStep.arrivalType]);
-
   return (
     <>
       <div className="arrival-type-select">
diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
index 503e169ae7a..74211ae2c85 100644
--- a/front/src/reducers/osrdconf/stdcmConf/index.ts
+++ b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -11,6 +11,7 @@ import {
 import { defaultCommonConf, buildCommonConfReducers } from 'reducers/osrdconf/osrdConfCommon';
 import type { OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types';
 import { addElementAtIndex } from 'utils/array';
+import { isArrivalDateInSearchTimeWindow } from 'utils/date';
 import type { ArrayElement } from 'utils/types';
 
 const DEFAULT_TOLERANCE = 1800; // 30min
@@ -134,28 +135,48 @@ export const stdcmConfSlice = createSlice({
     },
     updateStdcmEnvironment(
       state: Draft<OsrdStdcmConfState>,
-      action: PayloadAction<
-        Pick<
-          OsrdStdcmConfState,
-          | 'infraID'
-          | 'timetableID'
-          | 'electricalProfileSetId'
-          | 'workScheduleGroupId'
-          | 'temporarySpeedLimitGroupId'
-          | 'searchDatetimeWindow'
-        >
-      >
+      action: PayloadAction<{
+        infraID: number;
+        timetableID: number;
+        searchDatetimeWindow?: {
+          begin: Date;
+          end: Date;
+        };
+        electricalProfileSetId?: number;
+        temporarySpeedLimitGroupId?: number;
+        workScheduleGroupId?: number;
+      }>
     ) {
+      const { searchDatetimeWindow } = action.payload;
       state.infraID = action.payload.infraID;
       state.timetableID = action.payload.timetableID;
       state.electricalProfileSetId = action.payload.electricalProfileSetId;
-      state.searchDatetimeWindow = action.payload.searchDatetimeWindow;
-      if (action.payload.workScheduleGroupId) {
-        state.workScheduleGroupId = action.payload.workScheduleGroupId;
-      }
-      if (action.payload.temporarySpeedLimitGroupId) {
-        state.temporarySpeedLimitGroupId = action.payload.temporarySpeedLimitGroupId;
+      state.searchDatetimeWindow = searchDatetimeWindow;
+      state.workScheduleGroupId = action.payload.workScheduleGroupId;
+      state.temporarySpeedLimitGroupId = action.payload.temporarySpeedLimitGroupId;
+
+      // check that the arrival dates are in the search time window
+      const origin = state.stdcmPathSteps.at(0) as Extract<StdcmPathStep, { isVia: false }>;
+      const destination = state.stdcmPathSteps.at(-1) as Extract<StdcmPathStep, { isVia: false }>;
+      let newOrigin = origin;
+      let newDestination = destination;
+
+      if (searchDatetimeWindow) {
+        if (
+          !origin.arrival ||
+          !isArrivalDateInSearchTimeWindow(origin.arrival, searchDatetimeWindow)
+        ) {
+          newOrigin = { ...origin, arrival: searchDatetimeWindow.begin };
+        }
+        if (
+          !destination.arrival ||
+          !isArrivalDateInSearchTimeWindow(destination.arrival, searchDatetimeWindow)
+        ) {
+          newDestination = { ...destination, arrival: searchDatetimeWindow.begin };
+        }
       }
+
+      state.stdcmPathSteps = [newOrigin, ...state.stdcmPathSteps.slice(1, -1), newDestination];
     },
     updateStdcmPathSteps(
       state: Draft<OsrdStdcmConfState>,
diff --git a/front/src/reducers/osrdconf/types.ts b/front/src/reducers/osrdconf/types.ts
index 8135047e20f..9936c9b023c 100644
--- a/front/src/reducers/osrdconf/types.ts
+++ b/front/src/reducers/osrdconf/types.ts
@@ -97,6 +97,7 @@ export type StdcmPathStep = {
   | {
       isVia: false;
       arrivalType: ArrivalTimeTypes;
+      // TODO: make arrival non nullable (/!\ store migration)
       arrival?: Date;
       tolerances: { before: number; after: number };
     }

From 2075358bb9100b5203b5bff5ca528b212b19ea5d Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Tue, 24 Dec 2024 14:18:27 +0100
Subject: [PATCH 5/6] front: remove opTimingData from StdcmOpSchedule and
 simplify date management

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../components/StdcmForm/StdcmDestination.tsx | 17 +----
 .../components/StdcmForm/StdcmOpSchedule.tsx  | 63 ++++++++-----------
 .../components/StdcmForm/StdcmOrigin.tsx      | 18 +-----
 front/tests/utils/setup-utils.ts              | 22 ++++++-
 4 files changed, 46 insertions(+), 74 deletions(-)

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
index 4f46570a04f..5da7ce58cfc 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
@@ -1,9 +1,6 @@
-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 { useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
@@ -20,13 +17,6 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
 
   const destination = useSelector(getStdcmDestination);
 
-  const { destinationArrival } = useMemo(
-    () => ({
-      destinationArrival: getTimesInfoFromDate(destination.arrival),
-    }),
-    [destination]
-  );
-
   return (
     <StdcmCard
       data-testid="destination-card"
@@ -40,12 +30,7 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
         pathStepId={destination.id}
         disabled={disabled}
       />
-      <StdcmOpSchedule
-        pathStep={destination}
-        opTimingData={destinationArrival}
-        disabled={disabled}
-        opId="destination-arrival"
-      />
+      <StdcmOpSchedule pathStep={destination} disabled={disabled} opId="destination-arrival" />
     </StdcmCard>
   );
 };
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
index 1f1674bae5b..3a7b0dd7889 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOpSchedule.tsx
@@ -8,7 +8,7 @@ import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
 import type { StdcmPathStep } from 'reducers/osrdconf/types';
 import { useAppDispatch } from 'store';
-import { formatDateString, isArrivalDateInSearchTimeWindow } from 'utils/date';
+import { dateToHHMMSS, formatDateString } from 'utils/date';
 import { createStringSelectOptions } from 'utils/uiCoreHelpers';
 
 import type { ArrivalTimeTypes, ScheduleConstraint } from '../../types';
@@ -16,30 +16,11 @@ import type { ArrivalTimeTypes, ScheduleConstraint } from '../../types';
 type StdcmOpScheduleProps = {
   disabled: boolean;
   pathStep: Extract<StdcmPathStep, { isVia: false }>;
-  opTimingData?: {
-    date: Date;
-    arrivalDate: string;
-    arrivalTime: string;
-    arrivalTimeHours: number;
-    arrivalTimeMinutes: number;
-  };
   opId: string;
   isOrigin?: boolean;
 };
 
-const defaultDate = (date?: Date) => {
-  const newDate = date ? new Date(date) : new Date();
-  newDate.setHours(0, 0, 0);
-  return newDate;
-};
-
-const StdcmOpSchedule = ({
-  disabled,
-  pathStep,
-  opTimingData,
-  opId,
-  isOrigin = false,
-}: StdcmOpScheduleProps) => {
+const StdcmOpSchedule = ({ disabled, pathStep, opId, isOrigin = false }: StdcmOpScheduleProps) => {
   const { t } = useTranslation('stdcm');
   const dispatch = useAppDispatch();
 
@@ -47,21 +28,20 @@ const StdcmOpSchedule = ({
   const { getSearchDatetimeWindow } = useOsrdConfSelectors();
   const searchDatetimeWindow = useSelector(getSearchDatetimeWindow);
 
-  const { arrivalDate, arrivalTime, arrivalTimeHours, arrivalTimeMinutes } = useMemo(() => {
-    const isArrivalDateValid =
-      opTimingData?.arrivalDate &&
-      isArrivalDateInSearchTimeWindow(opTimingData.date, searchDatetimeWindow);
-
+  const { arrivalTime, arrivalTimeHours, arrivalTimeMinutes } = useMemo(() => {
+    if (!pathStep.arrival) {
+      return {
+        arrivalTime: undefined,
+        arrivalTimeHours: undefined,
+        arrivalTimeMinutes: undefined,
+      };
+    }
     return {
-      arrivalDate:
-        opTimingData && isArrivalDateValid
-          ? opTimingData.date
-          : defaultDate(searchDatetimeWindow?.begin),
-      arrivalTime: opTimingData?.arrivalTime,
-      arrivalTimeHours: opTimingData?.arrivalTimeHours,
-      arrivalTimeMinutes: opTimingData?.arrivalTimeMinutes,
+      arrivalTime: dateToHHMMSS(pathStep.arrival, { withoutSeconds: true }),
+      arrivalTimeHours: pathStep.arrival.getHours(),
+      arrivalTimeMinutes: pathStep.arrival.getMinutes(),
     };
-  }, [opTimingData, searchDatetimeWindow]);
+  }, [pathStep.arrival]);
 
   const tolerances = useMemo(
     () => ({
@@ -94,11 +74,14 @@ const StdcmOpSchedule = ({
   );
 
   const onArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
-    date.setHours(hours, minutes);
+    // We need to create a new date object to avoid mutating the original one
+    // otherwise the useEffect/useMemo will not be triggered
+    const newDate = new Date(date);
+    newDate.setHours(hours, minutes);
     dispatch(
       updateStdcmPathStep({
         id: pathStep.id,
-        updates: { arrival: date },
+        updates: { arrival: newDate },
       })
     );
   };
@@ -137,7 +120,7 @@ const StdcmOpSchedule = ({
               disabled,
             }}
             selectableSlot={selectableSlot}
-            value={arrivalDate}
+            value={pathStep.arrival}
             onDateChange={(e) => {
               onArrivalChange({
                 date: e,
@@ -153,7 +136,11 @@ const StdcmOpSchedule = ({
             hours={arrivalTimeHours}
             minutes={arrivalTimeMinutes}
             onTimeChange={({ hours, minutes }) => {
-              onArrivalChange({ date: arrivalDate, hours, minutes });
+              onArrivalChange({
+                date: pathStep.arrival || searchDatetimeWindow!.begin,
+                hours,
+                minutes,
+              });
             }}
             disabled={disabled}
             value={arrivalTime}
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
index 8623b65fe84..63b760c2bac 100644
--- a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
+++ b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
@@ -1,9 +1,6 @@
-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 { useOsrdConfSelectors } from 'common/osrdContext';
 import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
@@ -19,13 +16,6 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
   const { getStdcmOrigin } = useOsrdConfSelectors() as StdcmConfSelectors;
   const origin = useSelector(getStdcmOrigin);
 
-  const { originArrival } = useMemo(
-    () => ({
-      originArrival: getTimesInfoFromDate(origin.arrival),
-    }),
-    [origin]
-  );
-
   return (
     <StdcmCard
       name={t('trainPath.origin')}
@@ -39,13 +29,7 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
         pathStepId={origin.id}
         disabled={disabled}
       />
-      <StdcmOpSchedule
-        pathStep={origin}
-        opTimingData={originArrival}
-        disabled={disabled}
-        opId="origin-arrival"
-        isOrigin
-      />
+      <StdcmOpSchedule pathStep={origin} disabled={disabled} opId="origin-arrival" isOrigin />
     </StdcmCard>
   );
 };
diff --git a/front/tests/utils/setup-utils.ts b/front/tests/utils/setup-utils.ts
index de6bbc3af9d..c67db28dcbc 100644
--- a/front/tests/utils/setup-utils.ts
+++ b/front/tests/utils/setup-utils.ts
@@ -1,3 +1,7 @@
+import dayjs from 'dayjs';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+
 import type {
   Infra,
   PostInfraRailjsonApiResponse,
@@ -30,6 +34,9 @@ import {
 } from '../assets/project-const';
 import { logger } from '../test-logger';
 
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
 /**
  * Helper function to create infrastructure using RailJson.
  *
@@ -137,6 +144,10 @@ export async function createStudy(projectId: number, studyName = globalStudyName
 
   return study;
 }
+
+const createDateInSpecialTimeZone = (dateString: string, timeZone: string) =>
+  dayjs.tz(dateString, timeZone);
+
 /**
  * Main function to create all necessary test data including infrastructure, rolling stocks,
  * project, study, and scenario.
@@ -174,11 +185,16 @@ export async function createDataForTests(): Promise<void> {
     await sendTrainSchedules(scenarioTrainSchedule.timetable_id, trainSchedulesJson);
 
     // Configure STDCM search environment for the tests
-
     const stdcmEnvironment = {
       infra_id: smallInfra.id,
-      search_window_begin: '2024-10-17T00:00:00Z',
-      search_window_end: '2024-10-18T23:59:59Z',
+      search_window_begin: createDateInSpecialTimeZone(
+        '2024-10-17T00:00:00',
+        'Europe/Paris'
+      ).toISOString(),
+      search_window_end: createDateInSpecialTimeZone(
+        '2024-10-18T23:59:59',
+        'Europe/Paris'
+      ).toISOString(),
       timetable_id: scenarioTrainSchedule.timetable_id,
     } as StdcmSearchEnvironment;
 

From dc8f701acb4f3c312f322df8807f87e72b803d06 Mon Sep 17 00:00:00 2001
From: Clara Ni <clara.ni@outlook.fr>
Date: Wed, 8 Jan 2025 12:03:19 +0100
Subject: [PATCH 6/6] front: add PickAndNonNullableFields type

Signed-off-by: Clara Ni <clara.ni@outlook.fr>
---
 .../src/reducers/osrdconf/stdcmConf/index.ts  | 25 +++++++++---------
 front/src/utils/types.ts                      | 26 +++++++++++++++++++
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
index 74211ae2c85..d9316967042 100644
--- a/front/src/reducers/osrdconf/stdcmConf/index.ts
+++ b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -12,7 +12,7 @@ import { defaultCommonConf, buildCommonConfReducers } from 'reducers/osrdconf/os
 import type { OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types';
 import { addElementAtIndex } from 'utils/array';
 import { isArrivalDateInSearchTimeWindow } from 'utils/date';
-import type { ArrayElement } from 'utils/types';
+import type { ArrayElement, PickAndNonNullableFields } from 'utils/types';
 
 const DEFAULT_TOLERANCE = 1800; // 30min
 
@@ -135,17 +135,18 @@ export const stdcmConfSlice = createSlice({
     },
     updateStdcmEnvironment(
       state: Draft<OsrdStdcmConfState>,
-      action: PayloadAction<{
-        infraID: number;
-        timetableID: number;
-        searchDatetimeWindow?: {
-          begin: Date;
-          end: Date;
-        };
-        electricalProfileSetId?: number;
-        temporarySpeedLimitGroupId?: number;
-        workScheduleGroupId?: number;
-      }>
+      action: PayloadAction<
+        PickAndNonNullableFields<
+          OsrdStdcmConfState,
+          | 'infraID'
+          | 'timetableID'
+          | 'electricalProfileSetId'
+          | 'workScheduleGroupId'
+          | 'temporarySpeedLimitGroupId'
+          | 'searchDatetimeWindow',
+          'infraID' | 'timetableID'
+        >
+      >
     ) {
       const { searchDatetimeWindow } = action.payload;
       state.infraID = action.payload.infraID;
diff --git a/front/src/utils/types.ts b/front/src/utils/types.ts
index 4d3d8598743..442110020ef 100644
--- a/front/src/utils/types.ts
+++ b/front/src/utils/types.ts
@@ -19,3 +19,29 @@ export const mapBy = <K extends keyof T, T>(items: T[] | undefined, key: K): Map
 
 export const concatMap = <K, V>(map1: Map<K, V>, map2: Map<K, V>) =>
   new Map([...map1.entries(), ...map2.entries()]);
+
+/**
+ * Transform the provided keys of an object to be non-nullable.
+ *
+ * -? removes the optional modifier
+ *
+ * NonNullable removes the nullable modifier
+ * @param Type The object type we want to transform
+ * @param K The keys we want to make non-nullable
+ * @example NonNullableObject<{ a?: string | null; b?: string; c?: string }, 'a' | 'c'> = { a: string; b?: string; c: string }
+ */
+type NonNullableObject<Type, K extends keyof Type> = {
+  [Property in keyof Type as Property extends K ? Property : never]-?: NonNullable<Type[Property]>;
+} & {
+  [Property in keyof Type as Property extends K ? never : Property]: Type[Property];
+};
+
+/**
+ * Shortcut type to pick some properties of an object and make some of them non-nullable.
+ * @example PickAndNonNullableFields<{ a?: string | null; b?: string; c?: string }, 'a' | 'c', 'a'> = { a: string; c?: string }
+ */
+export type PickAndNonNullableFields<
+  Type,
+  PickKeys extends keyof Type,
+  TransformKeys extends keyof Type,
+> = NonNullableObject<Pick<Type, PickKeys>, Extract<TransformKeys, PickKeys>>;