front: set default tolerances in the store

Signed-off-by: Clara Ni <[email protected]>
OpenRailAssociation · Dec 9, 2024 · 0f5f813 · 0f5f813
1 parent 9c34c10
commit 0f5f813
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx
@@ -13,7 +13,6 @@ import { extractDateAndTimefromISO, generateISODateFromDateTime } from 'utils/da
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
 import StdcmOpSchedule from './StdcmOpSchedule';
-import { DEFAULT_TOLERANCE } from '../../consts';
 import type { ArrivalTimeTypes, ScheduleConstraint, StdcmConfigCardProps } from '../../types';
 
 const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
@@ -32,14 +31,8 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
         ? extractDateAndTimefromISO(destination.arrival)
         : undefined,
       destinationToleranceValues: {
-        arrivalToleranceBefore:
-          destination.tolerances?.before !== undefined
-            ? destination.tolerances.before
-            : DEFAULT_TOLERANCE,
-        arrivalToleranceAfter:
-          destination.tolerances?.after !== undefined
-            ? destination.tolerances.after
-            : DEFAULT_TOLERANCE,
+        arrivalToleranceBefore: destination.tolerances!.before,
+        arrivalToleranceAfter: destination.tolerances!.after,
       },
     }),
     [destination]

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmOrigin.tsx
@@ -13,7 +13,6 @@ import { extractDateAndTimefromISO, generateISODateFromDateTime } from 'utils/da
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
 import StdcmOpSchedule from './StdcmOpSchedule';
-import { DEFAULT_TOLERANCE } from '../../consts';
 import type { ArrivalTimeTypes, ScheduleConstraint, StdcmConfigCardProps } from '../../types';
 
 const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
@@ -29,10 +28,8 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
     () => ({
       originArrival: origin.arrival ? extractDateAndTimefromISO(origin.arrival) : undefined,
       originToleranceValues: {
-        arrivalToleranceBefore:
-          origin.tolerances?.before !== undefined ? origin.tolerances.before : DEFAULT_TOLERANCE,
-        arrivalToleranceAfter:
-          origin.tolerances?.after !== undefined ? origin.tolerances.after : DEFAULT_TOLERANCE,
+        arrivalToleranceBefore: origin.tolerances!.before,
+        arrivalToleranceAfter: origin.tolerances!.after,
       },
     }),
     [origin]

diff --git a/front/src/applications/stdcm/consts.ts b/front/src/applications/stdcm/consts.ts
@@ -20,5 +20,3 @@ export const COMPOSITION_CODES = [
   'MV160',
   'MVGV',
 ];
-
-export const DEFAULT_TOLERANCE = 1800; // 30min
diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -13,11 +13,25 @@ import type { OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types'
 import { addElementAtIndex } from 'utils/array';
 import type { ArrayElement } from 'utils/types';
 
+const DEFAULT_TOLERANCE = 1800; // 30min
+
 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(),
+      uic: -1,
+      isVia: false,
+      arrivalType: ArrivalTimeTypes.PRECISE_TIME,
+      tolerances: { before: DEFAULT_TOLERANCE, after: DEFAULT_TOLERANCE },
+    },
+    {
+      id: nextId(),
+      uic: -1,
+      isVia: false,
+      arrivalType: ArrivalTimeTypes.ASAP,
+      tolerances: { before: DEFAULT_TOLERANCE, after: DEFAULT_TOLERANCE },
+    },
   ],
   standardStdcmAllowance: undefined,
   totalMass: undefined,
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,5 +20,3 @@ export const COMPOSITION_CODES = [ @@
       'MV160',
       'MVGV',
     ];
-    export const DEFAULT_TOLERANCE = 1800; // 30min