Skip to content

Commit 1354c32

Browse files
claraniSharglutDev
authored andcommitted
front: introduce const STDCM_TRAIN_TIMETABLE_ID
Signed-off-by: Clara Ni <clara.ni@outlook.fr>
1 parent ac7986e commit 1354c32

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

front/src/applications/stdcm/components/StdcmResults/StdcmDebugResults.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useState } from 'react';
22

33
import { useSelector } from 'react-redux';
44

5-
import { STDCM_TRAIN_ID } from 'applications/stdcm/consts';
5+
import { STDCM_TRAIN_TIMETABLE_ID } from 'applications/stdcm/consts';
66
import useProjectedTrainsForStdcm from 'applications/stdcm/hooks/useProjectedTrainsForStdcm';
77
import type { StdcmSimulationOutputs } from 'applications/stdcm/types';
88
import { hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
@@ -14,7 +14,6 @@ import ManchetteWithSpaceTimeChartWrapper, {
1414
MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT,
1515
} from 'modules/simulationResult/components/ManchetteWithSpaceTimeChart/ManchetteWithSpaceTimeChart';
1616
import SpeedSpaceChartContainer from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer';
17-
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';
1817

1918
const SPEED_SPACE_CHART_HEIGHT = 521.5;
2019
const HANDLE_TAB_RESIZE_HEIGHT = 20;
@@ -75,11 +74,11 @@ const StdcmDebugResults = ({ simulationOutputs }: StdcmDebugResultsProps) => {
7574
<ManchetteWithSpaceTimeChartWrapper
7675
operationalPoints={pathProperties.manchetteOperationalPoints}
7776
projectPathTrainResult={projectedData.spaceTimeData}
78-
selectedTrainScheduleId={formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID)}
77+
selectedTrainScheduleId={STDCM_TRAIN_TIMETABLE_ID}
7978
workSchedules={workSchedules}
8079
projectionLoaderData={projectedData.projectionLoaderData}
8180
height={manchetteWithSpaceTimeChartHeight - MANCHETTE_HEIGHT_DIFF}
82-
selectedProjectionId={formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID)}
81+
selectedProjectionId={STDCM_TRAIN_TIMETABLE_ID}
8382
/>
8483
</div>
8584
</div>

front/src/applications/stdcm/consts.ts

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';
2+
13
export const STDCM_REQUEST_STATUS = Object.freeze({
24
idle: 'IDLE',
35
pending: 'PENDING',
@@ -8,6 +10,7 @@ export const STDCM_REQUEST_STATUS = Object.freeze({
810
});
911

1012
export const STDCM_TRAIN_ID = -10;
13+
export const STDCM_TRAIN_TIMETABLE_ID = formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID);
1114

1215
export const COMPOSITION_CODES_MAX_SPEEDS: Record<string, number | undefined> = {
1316
MA80: 80,

front/src/applications/stdcm/hooks/useStdcm.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import { useTranslation } from 'react-i18next';
44
import nextId from 'react-id-generator';
55
import { useSelector } from 'react-redux';
66

7-
import { STDCM_REQUEST_STATUS, STDCM_TRAIN_ID } from 'applications/stdcm/consts';
7+
import {
8+
STDCM_REQUEST_STATUS,
9+
STDCM_TRAIN_ID,
10+
STDCM_TRAIN_TIMETABLE_ID,
11+
} from 'applications/stdcm/consts';
812
import type {
913
StdcmRequestStatus,
1014
StdcmSuccessResponse,
@@ -24,7 +28,6 @@ import { getStdcmConf } from 'reducers/osrdconf/stdcmConf/selectors';
2428
import { updateSelectedTrainId } from 'reducers/simulationResults';
2529
import { useAppDispatch } from 'store';
2630
import { castErrorToFailure } from 'utils/error';
27-
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';
2831

2932
import useStdcmResults from './useStdcmResults';
3033
import { checkStdcmConf, formatStdcmPayload } from '../utils/formatStdcmConf';
@@ -122,7 +125,7 @@ const useStdcm = ({
122125
train_name: 'stdcm',
123126
};
124127
setStdcmTrainResult(stdcmTrain);
125-
dispatch(updateSelectedTrainId(formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID)));
128+
dispatch(updateSelectedTrainId(STDCM_TRAIN_TIMETABLE_ID));
126129
} else if (response.status === 'conflicts') {
127130
setStdcmResponse({
128131
...response,

front/src/applications/stdcm/utils/formatStdcmIntoSpaceTimeData.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { TrainSpaceTimeData } from 'applications/operationalStudies/types';
2-
import { formatEditoastTrainIdToTrainScheduleId } from 'utils/trainId';
32

4-
import { STDCM_TRAIN_ID } from '../consts';
3+
import { STDCM_TRAIN_TIMETABLE_ID } from '../consts';
54
import type { StdcmSuccessResponse } from '../types';
65

76
const formatStdcmTrainIntoSpaceTimeData = (
@@ -10,7 +9,7 @@ const formatStdcmTrainIntoSpaceTimeData = (
109
const { simulation, departure_time } = stdcmResponse;
1110
// TODO Paced train : Adapt this to handle paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
1211
return {
13-
id: formatEditoastTrainIdToTrainScheduleId(STDCM_TRAIN_ID),
12+
id: STDCM_TRAIN_TIMETABLE_ID,
1413
name: 'stdcm',
1514
spaceTimeCurves: [
1615
{

0 commit comments

Comments
 (0)