Skip to content

Commit 05ab67f

Browse files
committed
front: fix Conflict signature
OpenAPI error catched by generation.
1 parent 6e1f040 commit 05ab67f

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

front/src/applications/operationalStudies/components/Scenario/Timetable.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,19 @@ import { OsrdSimulationState, ScheduledTrain } from 'reducers/osrdsimulation/typ
2121
import { RootState } from 'reducers';
2222
import { updateTrainScheduleIDsToModify } from 'reducers/osrdconf';
2323
import { valueToInterval } from 'utils/numbers';
24-
import { GetTimetableByIdApiResponse, Infra, osrdEditoastApi } from 'common/api/osrdEditoastApi';
24+
import {
25+
Conflict,
26+
GetTimetableByIdApiResponse,
27+
Infra,
28+
osrdEditoastApi,
29+
} from 'common/api/osrdEditoastApi';
2530
import { durationInSeconds } from 'utils/timeManipulation';
2631
import { getSelectedTrainId } from 'reducers/osrdsimulation/selectors';
2732
import { isEmpty } from 'lodash';
2833
import { BsFillExclamationTriangleFill } from 'react-icons/bs';
2934
import DeleteModal from 'common/BootstrapSNCF/ModalSNCF/DeleteModal';
3035
import { ModalContext } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
31-
import ConflictsList, { Conflict } from 'modules/conflict/components/ConflictsList';
36+
import ConflictsList from 'modules/conflict/components/ConflictsList';
3237
import getSimulationResults from './getSimulationResults';
3338
import TimetableTrainCard from './TimetableTrainCard';
3439
import findTrainsDurationsIntervals from '../ManageTrainSchedule/helpers/trainsDurationsIntervals';

front/src/modules/conflict/components/ConflictsList.tsx

+3-10
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@ import cx from 'classnames';
33
import { BsLightningFill } from 'react-icons/bs';
44
import { useTranslation } from 'react-i18next';
55
import { sec2time } from 'utils/timeManipulation';
6-
7-
export type Conflict = {
8-
train_ids: number[];
9-
conflict_type: string;
10-
start_time: string;
11-
end_time: string;
12-
train_names: string[];
13-
};
6+
import { Conflict } from 'common/api/osrdEditoastApi';
147

158
type ConflictTableProps = {
169
conflicts: Conflict[];
@@ -32,8 +25,8 @@ function ConflictCard({ conflict }: { conflict: Conflict }) {
3225
<p className="card-text">{t(`${conflict.conflict_type}`)}</p>
3326
</div>
3427
<div className="conflict-times">
35-
<div className="card-text start-time">{sec2time(Number(conflict.start_time))}</div>
36-
<div className="card-text end-time">{sec2time(Number(conflict.end_time))}</div>
28+
<div className="card-text start-time">{sec2time(conflict.start_time)}</div>
29+
<div className="card-text end-time">{sec2time(conflict.end_time)}</div>
3730
</div>
3831
</div>
3932
);

0 commit comments

Comments
 (0)