fixup! front: create type StdcmPathStep

Author: clarani

front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx

@@ -94,10 +94,14 @@ const StdcmConfig = ({
   };
 
   const removeOriginArrivalTime = () => {
-    dispatch(updateStdcmPathStep({ ...origin, arrivalType: ArrivalTimeTypes.ASAP }));
+    dispatch(
+      updateStdcmPathStep({ id: origin.id, updates: { arrivalType: ArrivalTimeTypes.ASAP } })
+    );
   };
   const removeDestinationArrivalTime = () => {
-    dispatch(updateStdcmPathStep({ ...destination, arrivalType: ArrivalTimeTypes.ASAP }));
+    dispatch(
+      updateStdcmPathStep({ id: destination.id, updates: { arrivalType: ArrivalTimeTypes.ASAP } })
+    );
   };
 
   useEffect(() => {

front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx

@@ -40,12 +40,16 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
   );
 
   const onArrivalChange = (schedule: ScheduleConstraint) => {
-    const newPathStep = { ...destination, arrival: generateISODateFromDateTime(schedule) };
-    dispatch(updateStdcmPathStep(newPathStep));
+    dispatch(
+      updateStdcmPathStep({
+        id: destination.id,
+        updates: { arrival: generateISODateFromDateTime(schedule) },
+      })
+    );
   };
 
   const onArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
-    dispatch(updateStdcmPathStep({ ...destination, arrivalType }));
+    dispatch(updateStdcmPathStep({ id: destination.id, updates: { arrivalType } }));
   };
 
   const onToleranceChange = ({
@@ -57,8 +61,8 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
   }) => {
     dispatch(
       updateStdcmPathStep({
-        ...destination,
-        tolerances: { before: toleranceBefore, after: toleranceAfter },
+        id: destination.id,
+        updates: { tolerances: { before: toleranceBefore, after: toleranceAfter } },
       })
     );
   };

front/src/applications/stdcm/components/StdcmForm/StdcmOperationalPoint.tsx

@@ -84,7 +84,7 @@ const StdcmOperationalPoint = ({ point, opPointId, disabled }: StdcmOperationalP
           coordinates: p.geographic.coordinates,
         }
       : { name: undefined, ch: undefined, uic: -1, coordinates: undefined };
-    dispatch(updateStdcmPathStep({ ...point, ...newPoint }));
+    dispatch(updateStdcmPathStep({ id: point.id, updates: newPoint }));
   };
 
   const updateSelectedPoint = (

front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx

@@ -37,12 +37,21 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
   );
 
   const onOriginArrivalChange = (schedule: ScheduleConstraint) => {
-    const newPathStep = { ...origin, arrival: generateISODateFromDateTime(schedule) };
-    dispatch(updateStdcmPathStep(newPathStep));
+    dispatch(
+      updateStdcmPathStep({
+        id: origin.id,
+        updates: { arrival: generateISODateFromDateTime(schedule) },
+      })
+    );
   };
 
   const onOriginArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
-    dispatch(updateStdcmPathStep({ ...origin, arrivalType }));
+    dispatch(
+      updateStdcmPathStep({
+        id: origin.id,
+        updates: { arrivalType },
+      })
+    );
   };
 
   const onOriginToleranceChange = ({
@@ -54,8 +63,8 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
   }) => {
     dispatch(
       updateStdcmPathStep({
-        ...origin,
-        tolerances: { before: toleranceBefore, after: toleranceAfter },
+        id: origin.id,
+        updates: { tolerances: { before: toleranceBefore, after: toleranceAfter } },
       })
     );
   };

front/src/applications/stdcm/components/StdcmForm/StdcmVias.tsx

@@ -33,13 +33,20 @@ const StdcmVias = ({ disabled = false }: StdcmConfigCardProps) => {
   const updateStopType = (newStopType: StdcmStopTypes, pathStep: StdcmPathStep) => {
     const defaultStopTime =
       newStopType === StdcmStopTypes.DRIVER_SWITCH ? formatDurationAsISO8601(3 * 60) : '';
-    const newPathStep = { ...pathStep, stopType: newStopType, stopFor: defaultStopTime };
-    dispatch(updateStdcmPathStep(newPathStep));
+    dispatch(
+      updateStdcmPathStep({
+        id: pathStep.id,
+        updates: { stopType: newStopType, stopFor: defaultStopTime },
+      })
+    );
   };
 
   const updateStopDuration = (stopTime: string, pathStep: StdcmPathStep) => {
     dispatch(
-      updateStdcmPathStep({ ...pathStep, stopFor: formatDurationAsISO8601(Number(stopTime) * 60) })
+      updateStdcmPathStep({
+        id: pathStep.id,
+        updates: { stopFor: formatDurationAsISO8601(Number(stopTime) * 60) },
+      })
     );
   };
 

front/src/reducers/osrdconf/stdcmConf/index.ts

@@ -4,7 +4,7 @@ import nextId from 'react-id-generator';
 
 import { ArrivalTimeTypes, StdcmStopTypes } from 'applications/stdcm/types';
 import { defaultCommonConf, buildCommonConfReducers } from 'reducers/osrdconf/osrdConfCommon';
-import type { OsrdStdcmConfState } from 'reducers/osrdconf/types';
+import type { OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types';
 import { addElementAtIndex } from 'utils/array';
 import type { ArrayElement } from 'utils/types';
 
@@ -94,10 +94,15 @@ export const stdcmConfSlice = createSlice({
     },
     updateStdcmPathStep(
       state: Draft<OsrdStdcmConfState>,
-      action: PayloadAction<ArrayElement<OsrdStdcmConfState['stdcmPathSteps']>>
+      action: PayloadAction<{
+        id: string;
+        updates: Partial<ArrayElement<OsrdStdcmConfState['stdcmPathSteps']>>;
+      }>
     ) {
       const newPathSteps = state.stdcmPathSteps.map((pathStep) =>
-        pathStep.id === action.payload.id ? action.payload : pathStep
+        pathStep.id === action.payload.id
+          ? ({ ...pathStep, ...action.payload.updates } as StdcmPathStep)
+          : pathStep
       );
       state.stdcmPathSteps = newPathSteps;
     },

front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts

@@ -138,8 +138,7 @@ describe('stdcmConfReducers', () => {
     it('should handle origin update', () => {
       const origin = store.getState()[stdcmConfSlice.name].stdcmPathSteps.at(0)!;
       expect(origin.isVia).toBe(false);
-      const newOrigin = {
-        ...origin,
+      const updates = {
         arrivalType: ArrivalTimeTypes.ASAP,
         arrival: '2024-08-12T15:45:00.000+02:00',
         tolerances: {
@@ -148,30 +147,28 @@ describe('stdcmConfReducers', () => {
         },
       };
 
-      store.dispatch(stdcmConfSliceActions.updateStdcmPathStep(newOrigin));
+      store.dispatch(stdcmConfSliceActions.updateStdcmPathStep({ id: origin.id, updates }));
       const state = store.getState()[stdcmConfSlice.name];
-      expect(state.stdcmPathSteps.at(0)).toEqual(newOrigin);
+      expect(state.stdcmPathSteps.at(0)).toEqual({ ...origin, ...updates });
     });
 
     it('should handle via update', () => {
       const via = store.getState()[stdcmConfSlice.name].stdcmPathSteps.at(1)!;
       expect(via.isVia).toBe(true);
-      const newVia = {
-        ...via,
+      const updates = {
         stopType: StdcmStopTypes.DRIVER_SWITCH,
         stopFor: 'PT60',
       };
 
-      store.dispatch(stdcmConfSliceActions.updateStdcmPathStep(newVia));
+      store.dispatch(stdcmConfSliceActions.updateStdcmPathStep({ id: via.id, updates }));
       const state = store.getState()[stdcmConfSlice.name];
-      expect(state.stdcmPathSteps.at(1)).toEqual(newVia);
+      expect(state.stdcmPathSteps.at(1)).toEqual({ ...via, ...updates });
     });
 
     it('should handle destination update', () => {
       const destination = store.getState()[stdcmConfSlice.name].stdcmPathSteps.at(-1)!;
       expect(destination.isVia).toBe(false);
-      const newDestination = {
-        ...destination,
+      const updates = {
         arrivalType: ArrivalTimeTypes.ASAP,
         arrival: '2024-08-12T15:45:00.000+02:00',
         tolerances: {
@@ -180,9 +177,9 @@ describe('stdcmConfReducers', () => {
         },
       };
 
-      store.dispatch(stdcmConfSliceActions.updateStdcmPathStep(newDestination));
+      store.dispatch(stdcmConfSliceActions.updateStdcmPathStep({ id: destination.id, updates }));
       const state = store.getState()[stdcmConfSlice.name];
-      expect(state.stdcmPathSteps.at(-1)).toEqual(newDestination);
+      expect(state.stdcmPathSteps.at(-1)).toEqual({ ...destination, ...updates });
     });
   });
 

front/src/reducers/osrdconf/types.ts

@@ -84,6 +84,5 @@ export type PathStep = PathItemLocation & {
 };
 
 export type StdcmPathStep = PathStep & {
-  isVia: boolean;
   tolerances?: { before: number; after: number };
 } & ({ isVia: true; stopType: StdcmStopTypes } | { isVia: false; arrivalType: ArrivalTimeTypes });