From ac697b0e83290b9cbd03a72771a9bfaddbbf84c7 Mon Sep 17 00:00:00 2001 From: Clara Ni Date: Fri, 6 Dec 2024 12:07:57 +0100 Subject: [PATCH] front: set default tolerances in the store Signed-off-by: Clara Ni --- .../components/StdcmForm/StdcmDestination.tsx | 11 ++--------- .../stdcm/components/StdcmForm/StdcmOrigin.tsx | 7 ++----- front/src/applications/stdcm/consts.ts | 2 -- front/src/reducers/osrdconf/stdcmConf/index.ts | 18 ++++++++++++++++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmDestination.tsx index 1d3c43ea56a..a84cff2ee2a 100644 --- 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 index ed6ea2a5b9c..973ce6b072d 100644 --- 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 index 2c2faeaabd4..7862aa093eb 100644 --- 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 index 01912a2d9bf..b960299dc63 100644 --- 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,