Skip to content

Commit 6d27f72

Browse files
committed
front: replace timetabletraincard by trainscheduleitem
Signed-off-by: Math_R_ <[email protected]>
1 parent 5456f71 commit 6d27f72

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

front/src/modules/trainschedule/components/Timetable/Timetable.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333

3434
import PacedTrainItem from './PacedTrain/PacedTrainItem';
3535
import TimetableToolbar from './TimetableToolbar';
36-
import TimetableTrainCard from './TimetableTrainCard';
36+
import TrainScheduleItem from './TrainScheduleItem';
3737
import type { PacedTrainWithResult, TimetableItemResult, TrainScheduleWithDetails } from './types';
3838

3939
type TimetableProps = {
@@ -95,9 +95,7 @@ const Timetable = ({
9595
const handleSelectTimetableItem = useCallback(
9696
(id: TimetableItemId) => {
9797
const itemType = isTrainSchedule(id) ? 'trainScheduleIds' : 'pacedTrainIds';
98-
99-
// TODO Paced train : Adapt this to handle paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
100-
const currentSelectedTrainIds = [...selectedTimetableItemIds[itemType]];
98+
const currentSelectedTrainIds: TimetableItemId[] = selectedTimetableItemIds[itemType];
10199
const index = currentSelectedTrainIds.indexOf(id as TrainScheduleId);
102100

103101
if (index === -1) {
@@ -218,7 +216,7 @@ const Timetable = ({
218216
{/* TODO Paced train : Adapt this to handle paced trains in issue
219217
https://github.com/OpenRailAssociation/osrd/issues/10615 */}
220218
{isTrainSchedule(timetableItem.id) ? (
221-
<TimetableTrainCard
219+
<TrainScheduleItem
222220
isInSelection={selectedTimetableItemIds.trainScheduleIds.includes(
223221
timetableItem.id
224222
)}

front/src/modules/trainschedule/components/Timetable/TimetableToolbar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ const TimetableToolbar = ({
102102
if (displayedTimetableItems.length === [...trainScheduleIds, ...pacedTrainIds].length) {
103103
setSelectedTimetableItemIds({ trainScheduleIds: [], pacedTrainIds: [] });
104104
} else {
105-
// TODO Paced train : Adapt this to handle delete paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
106105
const timetableItemsDisplayed = displayedTimetableItems.reduce(
107106
(acc, { id }) => {
108107
if (isTrainSchedule(id)) {
@@ -241,6 +240,7 @@ const TimetableToolbar = ({
241240
label={t('timetable.export')}
242241
title={t('timetable.exportSelection')}
243242
type="button"
243+
// TODO PACED TRAIN: https://github.com/OpenRailAssociation/osrd/issues/10614
244244
onClick={() => exportTrainSchedules(trainScheduleIds)}
245245
/>
246246
</div>

front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx front/src/modules/trainschedule/components/Timetable/TrainScheduleItem.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
import TimetableItemActions from './TimetableItemActions';
3131
import type { TrainScheduleWithDetails } from './types';
3232

33-
type TimetableTrainCardProps = {
33+
type TrainScheduleItemProps = {
3434
isInSelection: boolean;
3535
train: TrainScheduleWithDetails;
3636
isSelected: boolean;
@@ -46,7 +46,7 @@ type TimetableTrainCardProps = {
4646
const formatFullDate = (d: Date) => dayjs(d).format('D/MM/YYYY HH:mm:ss');
4747
const formatDateHours = (d: Date) => dayjs(d).format('HH:mm');
4848

49-
const TimetableTrainCard = ({
49+
const TrainScheduleItem = ({
5050
isInSelection,
5151
train,
5252
isSelected,
@@ -57,7 +57,7 @@ const TimetableTrainCard = ({
5757
projectionPathIsUsed,
5858
dtoImport,
5959
selectTrainToEdit,
60-
}: TimetableTrainCardProps) => {
60+
}: TrainScheduleItemProps) => {
6161
const { t } = useTranslation(['operationalStudies/scenario']);
6262
const dispatch = useAppDispatch();
6363

@@ -278,4 +278,4 @@ const TimetableTrainCard = ({
278278
);
279279
};
280280

281-
export default React.memo(TimetableTrainCard);
281+
export default React.memo(TrainScheduleItem);

0 commit comments

Comments
 (0)