Skip to content

Commit 799b140

Browse files
younesschrifiyounesschrifi
committed
front: adapt tsv2 endpoints
1 parent 0a2a6bb commit 799b140

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+179
-204
lines changed

‎front/public/locales/fr/errors.json

+2-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,8 @@
194194
"PathNotFound": "Chemin '{{path_id}}' non trouvé",
195195
"RollingStockNotFound": "Matériel roulant '{{rolling_stock_id}}' non trouvé",
196196
"TimetableNotFound": "Grille horaire '{{timetable_id}}' non trouvée",
197-
"UnsimulatedTrainSchedule": "La circulation '{{train_schedule_id}}' n'est pas simulée"
198-
},
199-
"train_schedule_v2": {
200-
"BatchTrainScheduleNotFound": "'{{number}}' circulation(s) n'ont pas pu être trouvée(s)",
201-
"NotFound": "Circulation '{{train_schedule_id}}' non trouvée",
202-
"InfraNotFound": "Infrastructure '{{infra_id}}' non trouvée",
203-
"InvalidQueryParams": "Paramètres de la requête invalides '{{message}}'"
197+
"UnsimulatedTrainSchedule": "La circulation '{{train_schedule_id}}' n'est pas simulée",
198+
"InfraNotFound": "Infrastructure '{{infra_id}}' non trouvée"
204199
},
205200
"url": {
206201
"InvalidUrl": "Url invalide '{{url}}'"

‎front/src/applications/editor/tools/routeEdition/components/RouteEditionLeftPanel.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ const RouteEditionPanel = () => {
159159
);
160160
const candidates = await postPathfinding({
161161
infraId: infraID,
162-
pathfindingInput: payload,
162+
infraPathfindingInput: payload,
163163
}).unwrap();
164164

165165
const candidateColors = chroma

‎front/src/applications/operationalStudies/components/BreadCrumbs.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { ChevronRight } from '@osrd-project/ui-icons';
22
import { useTranslation } from 'react-i18next';
33
import { Link } from 'react-router-dom';
44

5-
import type { Project, Study, ScenarioV2 } from 'common/api/osrdEditoastApi';
5+
import type { Project, Study, Scenario } from 'common/api/osrdEditoastApi';
66

77
type Props = {
88
project?: Project;
99
study?: Study;
10-
scenario?: ScenarioV2;
10+
scenario?: Scenario;
1111
};
1212

1313
export default function BreadCrumbs({ project, study, scenario }: Props) {

‎front/src/applications/operationalStudies/components/MacroEditor/ngeToOsrd.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const handleTrainrunOperation = async ({
155155
trainrun.id
156156
);
157157
const newTrainSchedules = await dispatch(
158-
osrdEditoastApi.endpoints.postV2TimetableByIdTrainSchedule.initiate({
158+
osrdEditoastApi.endpoints.postTimetableByIdTrainSchedule.initiate({
159159
id: timeTableId,
160160
body: [
161161
{
@@ -172,7 +172,7 @@ const handleTrainrunOperation = async ({
172172
case 'delete': {
173173
const trainrunIdToDelete = createdTrainrun.get(trainrun.id) || trainrun.id;
174174
await dispatch(
175-
osrdEditoastApi.endpoints.deleteV2TrainSchedule.initiate({
175+
osrdEditoastApi.endpoints.deleteTrainSchedule.initiate({
176176
body: { ids: [trainrunIdToDelete] },
177177
})
178178
).unwrap();
@@ -187,12 +187,12 @@ const handleTrainrunOperation = async ({
187187
);
188188
const trainrunIdToUpdate = createdTrainrun.get(trainrun.id) || trainrun.id;
189189
const trainSchedule = await dispatch(
190-
osrdEditoastApi.endpoints.getV2TrainScheduleById.initiate({
190+
osrdEditoastApi.endpoints.getTrainScheduleById.initiate({
191191
id: trainrunIdToUpdate,
192192
})
193193
).unwrap();
194194
const newTrainSchedule = await dispatch(
195-
osrdEditoastApi.endpoints.putV2TrainScheduleById.initiate({
195+
osrdEditoastApi.endpoints.putTrainScheduleById.initiate({
196196
id: trainrunIdToUpdate,
197197
trainScheduleForm: {
198198
...trainSchedule,

‎front/src/applications/operationalStudies/components/MacroEditor/osrdToNge.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ const importTimetable = async (
204204
dispatch: AppDispatch
205205
): Promise<NetzgrafikDto> => {
206206
const timetablePromise = dispatch(
207-
osrdEditoastApi.endpoints.getV2TimetableById.initiate({ id: timetableId })
207+
osrdEditoastApi.endpoints.getTimetableById.initiate({ id: timetableId })
208208
);
209209
const { train_ids } = await timetablePromise.unwrap();
210210

211211
const trainSchedulesPromise = dispatch(
212-
osrdEditoastApi.endpoints.postV2TrainSchedule.initiate({
212+
osrdEditoastApi.endpoints.postTrainSchedule.initiate({
213213
body: { ids: train_ids },
214214
})
215215
);

‎front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const useLazyLoadTrains = ({
4949
const [trainIdsToProject, setTrainIdsToProject] = useState<number[]>([]);
5050
const [allTrainsLoaded, setAllTrainsLoaded] = useState(false);
5151

52-
const [postV2TrainScheduleSimulationSummary] =
53-
osrdEditoastApi.endpoints.postV2TrainScheduleSimulationSummary.useLazyQuery();
52+
const [postTrainScheduleSimulationSummary] =
53+
osrdEditoastApi.endpoints.postTrainScheduleSimulationSummary.useLazyQuery();
5454

5555
const { data: { results: rollingStocks } = { results: [] } } =
5656
osrdEditoastApi.endpoints.getLightRollingStock.useQuery({ pageSize: 1000 });
@@ -74,7 +74,7 @@ const useLazyLoadTrains = ({
7474
for (let i = 0; i < _trainToFetchIds.length; i += BATCH_SIZE) {
7575
const packageToFetch = getBatchPackage(i, _trainToFetchIds, BATCH_SIZE);
7676

77-
const rawSummaries = await postV2TrainScheduleSimulationSummary({
77+
const rawSummaries = await postTrainScheduleSimulationSummary({
7878
body: {
7979
infra_id: _infraId,
8080
ids: packageToFetch,

‎front/src/applications/operationalStudies/hooks/useScenario.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const useScenario = () => {
3737
data: scenario,
3838
isError: isScenarioError,
3939
error: errorScenario,
40-
} = osrdEditoastApi.endpoints.getV2ProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useQuery(
40+
} = osrdEditoastApi.endpoints.getProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useQuery(
4141
{
4242
projectId: projectId!,
4343
studyId: studyId!,

‎front/src/applications/operationalStudies/hooks/useScenarioData.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ const useScenarioData = () => {
3333

3434
const { infra, isInfraLoaded, reloadCount } = useInfraStatus();
3535

36-
const { data: timetable } = osrdEditoastApi.endpoints.getV2TimetableById.useQuery(
36+
const { data: timetable } = osrdEditoastApi.endpoints.getTimetableById.useQuery(
3737
{ id: scenario?.timetable_id! },
3838
{
3939
skip: !scenario,
4040
}
4141
);
4242

4343
const { data: rawTrainSchedules, error: fetchTrainSchedulesError } =
44-
osrdEditoastApi.endpoints.postV2TrainSchedule.useQuery(
44+
osrdEditoastApi.endpoints.postTrainSchedule.useQuery(
4545
{
4646
body: {
4747
ids: timetable?.train_ids!,
@@ -52,12 +52,12 @@ const useScenarioData = () => {
5252
}
5353
);
5454

55-
const { data: conflicts } = osrdEditoastApi.endpoints.getV2TimetableByIdConflicts.useQuery(
55+
const { data: conflicts } = osrdEditoastApi.endpoints.getTimetableByIdConflicts.useQuery(
5656
{ id: scenario?.timetable_id!, infraId: scenario?.infra_id! },
5757
{ skip: !scenario }
5858
);
5959

60-
const { data: projectionPath } = osrdEditoastApi.endpoints.getV2TrainScheduleByIdPath.useQuery(
60+
const { data: projectionPath } = osrdEditoastApi.endpoints.getTrainScheduleByIdPath.useQuery(
6161
{
6262
id: trainIdUsedForProjection!,
6363
infraId: scenario?.infra_id!,

‎front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { useSelector } from 'react-redux';
77
import {
88
osrdEditoastApi,
99
type PathItemLocation,
10-
type PostV2InfraByInfraIdPathPropertiesApiArg,
11-
type PostV2InfraByInfraIdPathfindingBlocksApiArg,
10+
type PostInfraByInfraIdPathPropertiesApiArg,
11+
type PostInfraByInfraIdPathfindingBlocksApiArg,
1212
type RollingStockWithLiveries,
1313
type TrainScheduleResult,
1414
type PathfindingResult,
@@ -131,13 +131,13 @@ const useSetupItineraryForTrainUpdate = (
131131
const usingElectricalProfiles = useSelector(getUsingElectricalProfiles);
132132
const dispatch = useAppDispatch();
133133
const osrdActions = useOsrdConfActions() as OperationalStudiesConfSliceActions;
134-
const [getTrainScheduleById] = osrdEditoastApi.endpoints.getV2TrainScheduleById.useLazyQuery({});
134+
const [getTrainScheduleById] = osrdEditoastApi.endpoints.getTrainScheduleById.useLazyQuery({});
135135
const [getRollingStockByName] =
136136
osrdEditoastApi.endpoints.getRollingStockNameByRollingStockName.useLazyQuery();
137137
const [postPathfindingBlocks] =
138-
osrdEditoastApi.endpoints.postV2InfraByInfraIdPathfindingBlocks.useMutation();
138+
osrdEditoastApi.endpoints.postInfraByInfraIdPathfindingBlocks.useMutation();
139139
const [postPathProperties] =
140-
osrdEditoastApi.endpoints.postV2InfraByInfraIdPathProperties.useMutation();
140+
osrdEditoastApi.endpoints.postInfraByInfraIdPathProperties.useMutation();
141141

142142
useEffect(() => {
143143
const computeItineraryForTrainUpdate = async (
@@ -150,9 +150,9 @@ const useSetupItineraryForTrainUpdate = (
150150

151151
// TODO TS2 : Next part might not be needed (except to updePathSteps), we need inly trainSchedulePath and
152152
// rolling stock infos to relaunch the pathfinding. Check for that in simulation results issue
153-
const params: PostV2InfraByInfraIdPathfindingBlocksApiArg = {
153+
const params: PostInfraByInfraIdPathfindingBlocksApiArg = {
154154
infraId,
155-
pathfindingInputV2: {
155+
pathfindingInput: {
156156
path_items: trainSchedule.path.map((item) =>
157157
omit(item, ['id', 'deleted'])
158158
) as PathItemLocation[],
@@ -170,7 +170,7 @@ const useSetupItineraryForTrainUpdate = (
170170
if (pathfindingResult.status !== 'success') {
171171
return null;
172172
}
173-
const pathPropertiesParams: PostV2InfraByInfraIdPathPropertiesApiArg = {
173+
const pathPropertiesParams: PostInfraByInfraIdPathPropertiesApiArg = {
174174
infraId,
175175
props: ['electrifications', 'geometry', 'operational_points'],
176176
pathPropertiesInput: {

‎front/src/applications/operationalStudies/hooks/useSimulationResults.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ const useSimulationResults = (): SimulationResults => {
1616
const electricalProfileSetId = useSelector(getElectricalProfileSetId);
1717
const selectedTrainId = useSelector(getSelectedTrainId);
1818

19-
const { data: selectedTrainSchedule } = osrdEditoastApi.endpoints.getV2TrainScheduleById.useQuery(
19+
const { data: selectedTrainSchedule } = osrdEditoastApi.endpoints.getTrainScheduleById.useQuery(
2020
{
2121
id: selectedTrainId as number,
2222
},
2323
{ skip: !selectedTrainId }
2424
);
2525

26-
const { data: rawPath } = osrdEditoastApi.endpoints.getV2TrainScheduleByIdPath.useQuery(
26+
const { data: rawPath } = osrdEditoastApi.endpoints.getTrainScheduleByIdPath.useQuery(
2727
{
2828
id: selectedTrainId as number,
2929
infraId: infraId as number,
@@ -33,7 +33,7 @@ const useSimulationResults = (): SimulationResults => {
3333
const path = selectedTrainId && rawPath?.status === 'success' ? rawPath : undefined;
3434

3535
const { data: trainSimulation } =
36-
osrdEditoastApi.endpoints.getV2TrainScheduleByIdSimulation.useQuery(
36+
osrdEditoastApi.endpoints.getTrainScheduleByIdSimulation.useQuery(
3737
{ id: selectedTrainId as number, infraId: infraId as number, electricalProfileSetId },
3838
{ skip: !selectedTrainId || !infraId }
3939
);

‎front/src/applications/operationalStudies/views/Study.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ export default function Study() {
7474

7575
const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();
7676
const [deleteScenarioV2] =
77-
osrdEditoastApi.endpoints.deleteV2ProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useMutation(
77+
osrdEditoastApi.endpoints.deleteProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useMutation(
7878
{}
7979
);
8080

8181
const { data: scenariosV2 } =
82-
osrdEditoastApi.endpoints.getV2ProjectsByProjectIdStudiesAndStudyIdScenarios.useQuery(
82+
osrdEditoastApi.endpoints.getProjectsByProjectIdStudiesAndStudyIdScenarios.useQuery(
8383
{
8484
projectId: projectId!,
8585
studyId: studyId!,

‎front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import ManageTrainScheduleV2 from './ManageTrainScheduleV2';
3131
import SimulationResultsV2 from './SimulationResultsV2';
3232
import useScenarioData from '../../hooks/useScenarioData';
3333

34-
const ScenarioV2 = () => {
34+
const Scenario = () => {
3535
const { t } = useTranslation('operationalStudies/scenario');
3636
const dispatch = useAppDispatch();
3737
const isUpdating = useSelector((state: RootState) => state.osrdsimulation.isUpdating);
@@ -323,4 +323,4 @@ const ScenarioV2 = () => {
323323
);
324324
};
325325

326-
export default ScenarioV2;
326+
export default Scenario;

‎front/src/applications/stdcm/hooks/useProjectedTrainsForStdcm.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ const useProjectedTrainsForStdcm = (stdcmResponse?: StdcmV2SuccessResponse) => {
1818
const [spaceTimeData, setSpaceTimeData] = useState<TrainSpaceTimeData[]>([]);
1919
const [trainIdsToProject, setTrainIdsToProject] = useState<number[]>([]);
2020

21-
const { data: timetable } = osrdEditoastApi.endpoints.getV2TimetableById.useQuery(
21+
const { data: timetable } = osrdEditoastApi.endpoints.getTimetableById.useQuery(
2222
{ id: timetableId! },
2323
{
2424
skip: !timetableId,
2525
}
2626
);
2727

28-
const { currentData: trainSchedules } = osrdEditoastApi.endpoints.postV2TrainSchedule.useQuery(
28+
const { currentData: trainSchedules } = osrdEditoastApi.endpoints.postTrainSchedule.useQuery(
2929
{
3030
body: {
3131
ids: timetable?.train_ids as number[],

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ const useStdcm = (showFailureNotification: boolean = true) => {
4747

4848
const stdcmV2Results = useStdcmResults(stdcmV2Response, stdcmTrainResult, setPathProperties);
4949

50-
const [postV2TimetableByIdStdcm] =
51-
osrdEditoastApi.endpoints.postV2TimetableByIdStdcm.useMutation();
50+
const [postTimetableByIdStdcm] = osrdEditoastApi.endpoints.postTimetableByIdStdcm.useMutation();
5251

5352
const { data: stdcmRollingStock } =
5453
osrdEditoastApi.endpoints.getLightRollingStockByRollingStockId.useQuery(
@@ -83,7 +82,7 @@ const useStdcm = (showFailureNotification: boolean = true) => {
8382
if (validConfig) {
8483
const payload = formatStdcmPayload(validConfig, stdcmV2Activated);
8584
try {
86-
const response = await postV2TimetableByIdStdcm(payload).unwrap();
85+
const response = await postTimetableByIdStdcm(payload).unwrap();
8786
if (
8887
response.status === 'success' &&
8988
response.simulation.status === 'success' &&

‎front/src/applications/stdcm/hooks/useStdcmResults.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { StdcmV2SuccessResponse } from 'applications/stdcm/types';
88
import {
99
osrdEditoastApi,
1010
type PathfindingResultSuccess,
11-
type PostV2InfraByInfraIdPathPropertiesApiArg,
11+
type PostInfraByInfraIdPathPropertiesApiArg,
1212
type TrainScheduleResult,
1313
} from 'common/api/osrdEditoastApi';
1414
import { useInfraID, useOsrdConfSelectors } from 'common/osrdContext';
@@ -30,10 +30,10 @@ const useStdcmResults = (
3030
const selectedTrainId = useSelector(getSelectedTrainId);
3131

3232
const [postPathProperties] =
33-
osrdEditoastApi.endpoints.postV2InfraByInfraIdPathProperties.useMutation();
33+
osrdEditoastApi.endpoints.postInfraByInfraIdPathProperties.useMutation();
3434

3535
const { data: otherSelectedTrainSchedule } =
36-
osrdEditoastApi.endpoints.getV2TrainScheduleById.useQuery(
36+
osrdEditoastApi.endpoints.getTrainScheduleById.useQuery(
3737
{
3838
id: selectedTrainId as number,
3939
},
@@ -57,7 +57,7 @@ const useStdcmResults = (
5757

5858
useEffect(() => {
5959
const getPathProperties = async (_infraId: number, path: PathfindingResultSuccess) => {
60-
const pathPropertiesParams: PostV2InfraByInfraIdPathPropertiesApiArg = {
60+
const pathPropertiesParams: PostInfraByInfraIdPathPropertiesApiArg = {
6161
infraId: _infraId,
6262
props: ['electrifications', 'geometry', 'operational_points'],
6363
pathPropertiesInput: {

‎front/src/applications/stdcm/types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type {
1010
import type { STDCM_REQUEST_STATUS } from 'applications/stdcm/consts';
1111
import type {
1212
LightRollingStock,
13-
PostV2TimetableByIdStdcmApiResponse,
13+
PostTimetableByIdStdcmApiResponse,
1414
RollingStockWithLiveries,
1515
SimulationResponse,
1616
} from 'common/api/osrdEditoastApi';
@@ -20,7 +20,7 @@ import type { ValueOf } from 'utils/types';
2020
export type StdcmRequestStatus = ValueOf<typeof STDCM_REQUEST_STATUS>;
2121

2222
export type StdcmV2SuccessResponse = Omit<
23-
Extract<PostV2TimetableByIdStdcmApiResponse, { status: 'success' }>,
23+
Extract<PostTimetableByIdStdcmApiResponse, { status: 'success' }>,
2424
'simulation'
2525
> & {
2626
simulation: Extract<SimulationResponse, { status: 'success' }>;

‎front/src/applications/stdcm/utils/formatStdcmConfV2.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Dispatch } from 'redux';
55

66
import type {
77
PathfindingItem,
8-
PostV2TimetableByIdStdcmApiArg,
8+
PostTimetableByIdStdcmApiArg,
99
TrainScheduleBase,
1010
} from 'common/api/osrdEditoastApi';
1111
import type { InfraState } from 'reducers/infra';
@@ -232,7 +232,7 @@ const toMsOrUndefined = (value: number | undefined): number | undefined =>
232232
export const formatStdcmPayload = (
233233
validConfig: ValidStdcmConfig,
234234
stdcmV2Activated: boolean
235-
): PostV2TimetableByIdStdcmApiArg => ({
235+
): PostTimetableByIdStdcmApiArg => ({
236236
infra: validConfig.infraId,
237237
id: validConfig.timetableId,
238238
body: {

0 commit comments

Comments
 (0)