Skip to content

Commit ae1a20d

Browse files
committed
front: fix occurences edition when no exception in paced train
Signed-off-by: romainvalls <romain.valls95@gmail.com>
1 parent d33ba81 commit ae1a20d

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

front/src/modules/timetableItem/components/Timetable/PacedTrain/hooks/useOccurrenceActions.ts

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,30 @@ const useOccurrenceActions = ({
5959
editedOccurrence.id
6060
);
6161

62-
if (occurrenceToUpdateException) {
63-
const rawPacedTrain: Omit<PacedTrain, 'paced'> = {
64-
...pacedTrain,
65-
train_name: editedOccurrence.trainName,
66-
speed_limit_tag: pacedTrain.speedLimitTag,
67-
rolling_stock_name: editedOccurrence.rollingStock?.name || '',
68-
start_time: editedOccurrence.startTime.toISOString(),
69-
};
70-
71-
const {
72-
train_name,
73-
start_time,
74-
speed_limit_tag,
75-
rolling_stock_name: _rollingStockName,
76-
...occurrenceProps
77-
} = extractOccurrenceDetailsFromPacedTrain(rawPacedTrain, occurrenceToUpdateException);
78-
79-
occurrenceWithDetails = {
80-
...pacedTrain,
81-
...occurrenceProps,
82-
name: train_name,
83-
startTime: new Date(start_time),
84-
speedLimitTag: speed_limit_tag ?? null,
85-
rollingStock: editedOccurrence.rollingStock,
86-
};
87-
}
62+
const rawPacedTrain: Omit<PacedTrain, 'paced'> = {
63+
...pacedTrain,
64+
train_name: editedOccurrence.trainName,
65+
speed_limit_tag: pacedTrain.speedLimitTag,
66+
rolling_stock_name: editedOccurrence.rollingStock?.name || '',
67+
start_time: editedOccurrence.startTime.toISOString(),
68+
};
69+
70+
const {
71+
train_name,
72+
start_time,
73+
speed_limit_tag,
74+
rolling_stock_name: _rollingStockName,
75+
...occurrenceProps
76+
} = extractOccurrenceDetailsFromPacedTrain(rawPacedTrain, occurrenceToUpdateException);
77+
78+
occurrenceWithDetails = {
79+
...pacedTrain,
80+
...occurrenceProps,
81+
name: train_name,
82+
startTime: new Date(start_time),
83+
speedLimitTag: speed_limit_tag ?? null,
84+
rollingStock: editedOccurrence.rollingStock,
85+
};
8886

8987
selectPacedTrainToEdit(occurrenceWithDetails, pacedTrain, editedOccurrence.id);
9088
},

front/src/modules/timetableItem/helpers/pacedTrain.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ export const extractOccurrenceDetailsFromPacedTrain = <
3535
T extends Omit<PacedTrain, 'paced' | 'exceptions'>,
3636
>(
3737
pacedTrain: T,
38-
exceptionChangeGroups: ExceptionChangeGroups
38+
exceptionChangeGroups: ExceptionChangeGroups | undefined
3939
) => {
4040
const occurrence = { ...pacedTrain };
4141

42+
if (!exceptionChangeGroups) {
43+
return occurrence;
44+
}
45+
4246
if (exceptionChangeGroups.train_name) {
4347
occurrence.train_name = exceptionChangeGroups.train_name.value;
4448
}

0 commit comments

Comments
 (0)