front: use Duration for OsrdStdcmConfState grid margins

Improves type safety. Signed-off-by: Simon Ser <[email protected]>
OpenRailAssociation · Feb 28, 2025 · f060c6a · f060c6a
1 parent 5d09f8f
commit f060c6a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/front/src/applications/stdcm/utils/formatStdcmConf.ts b/front/src/applications/stdcm/utils/formatStdcmConf.ts
@@ -7,7 +7,7 @@ import getStepLocation from 'modules/pathfinding/helpers/getStepLocation';
 import { setFailure } from 'reducers/main';
 import type { OsrdStdcmConfState, StandardAllowance } from 'reducers/osrdconf/types';
 import { dateTimeFormatting } from 'utils/date';
-import { Duration } from 'utils/duration';
+import type { Duration } from 'utils/duration';
 import { kmhToMs, tToKg } from 'utils/physics';
 import { minToMs } from 'utils/timeManipulation';
 
@@ -190,8 +190,8 @@ export const checkStdcmConf = (
     maxSpeed,
     towedRollingStockID,
     margin: standardAllowance,
-    gridMarginBefore: new Duration({ seconds: gridMarginBefore }),
-    gridMarginAfter: new Duration({ seconds: gridMarginAfter }),
+    gridMarginBefore,
+    gridMarginAfter,
     workScheduleGroupId,
     temporarySpeedLimitGroupId,
     electricalProfileSetId,

diff --git a/front/src/modules/stdcmAllowances/components/StdcmAllowances.tsx b/front/src/modules/stdcmAllowances/components/StdcmAllowances.tsx
@@ -14,6 +14,7 @@ import {
 import { getMargins } from 'reducers/osrdconf/stdcmConf/selectors';
 import type { StandardAllowance } from 'reducers/osrdconf/types';
 import { useAppDispatch } from 'store';
+import { Duration } from 'utils/duration';
 import { convertInputStringToNumber } from 'utils/strings';
 
 const StdcmAllowances = ({ disabled = false }: { disabled?: boolean }) => {
@@ -49,11 +50,13 @@ const StdcmAllowances = ({ disabled = false }: { disabled?: boolean }) => {
             <InputSNCF
               id="standardAllowanceTypeGridMarginBefore"
               type="number"
-              value={gridMarginBefore || ''}
+              value={gridMarginBefore?.total('second') || ''}
               unit={ALLOWANCE_UNITS_KEYS.time}
               onChange={(e) =>
                 dispatch(
-                  updateGridMarginBefore(Math.abs(convertInputStringToNumber(e.target.value)))
+                  updateGridMarginBefore(
+                    new Duration({ seconds: Math.abs(convertInputStringToNumber(e.target.value)) })
+                  )
                 )
               }
               disabled={disabled}
@@ -67,11 +70,13 @@ const StdcmAllowances = ({ disabled = false }: { disabled?: boolean }) => {
             <InputSNCF
               id="standardAllowanceTypeGridMarginAfter"
               type="number"
-              value={gridMarginAfter || ''}
+              value={gridMarginAfter?.total('second') || ''}
               unit={ALLOWANCE_UNITS_KEYS.time}
               onChange={(e) =>
                 dispatch(
-                  updateGridMarginAfter(Math.abs(convertInputStringToNumber(e.target.value)))
+                  updateGridMarginAfter(
+                    new Duration({ seconds: Math.abs(convertInputStringToNumber(e.target.value)) })
+                  )
                 )
               }
               disabled={disabled}

diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -37,8 +37,8 @@ export const stdcmConfInitialState: OsrdStdcmConfState = {
   ],
   margins: {
     standardAllowance: { type: 'time_per_distance', value: 4.5 },
-    gridMarginBefore: 15,
-    gridMarginAfter: 15,
+    gridMarginBefore: new Duration({ seconds: 15 }),
+    gridMarginAfter: new Duration({ seconds: 15 }),
   },
   totalMass: undefined,
   totalLength: undefined,
@@ -113,8 +113,8 @@ export const stdcmConfSlice = createSlice({
     resetMargins(state: Draft<OsrdStdcmConfState>) {
       state.margins = {
         standardAllowance: { type: 'time_per_distance', value: 4.5 },
-        gridMarginBefore: 15,
-        gridMarginAfter: 15,
+        gridMarginBefore: new Duration({ seconds: 15 }),
+        gridMarginAfter: new Duration({ seconds: 15 }),
       };
     },
     updateStandardAllowance(

diff --git a/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts b/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
@@ -120,15 +120,15 @@ describe('stdcmConfReducers', () => {
     });
 
     it('should handle updateGridMarginBefore', () => {
-      const newGridMarginBefore = 5;
+      const newGridMarginBefore = new Duration({ seconds: 5 });
       const store = createStore(initialStateSTDCMConfig);
       store.dispatch(updateGridMarginBefore(newGridMarginBefore));
       const state = store.getState()[stdcmConfSlice.name];
       expect(state.margins.gridMarginBefore).toStrictEqual(newGridMarginBefore);
     });
 
     it('should handle updateGridMarginAfter', () => {
-      const newGridMarginAfter = 5;
+      const newGridMarginAfter = new Duration({ seconds: 5 });
       const store = createStore(initialStateSTDCMConfig);
       store.dispatch(updateGridMarginAfter(newGridMarginAfter));
       const state = store.getState()[stdcmConfSlice.name];

diff --git a/front/src/reducers/osrdconf/types.ts b/front/src/reducers/osrdconf/types.ts
@@ -57,8 +57,8 @@ export type OsrdStdcmConfState = OsrdConfState & {
   stdcmPathSteps: StdcmPathStep[];
   margins: {
     standardAllowance?: StandardAllowance;
-    gridMarginBefore?: number;
-    gridMarginAfter?: number;
+    gridMarginBefore?: Duration;
+    gridMarginAfter?: Duration;
   };
   totalMass?: number;
   totalLength?: number;