>(new Set());
+ const { totalPacedTrainCount, totalTrainScheduleCount } = useMemo(
+ () =>
+ timetableItems.reduce(
+ (acc, { id }) => {
+ if (isTrainSchedule(id)) {
+ acc.totalTrainScheduleCount += 1;
+ } else {
+ acc.totalPacedTrainCount += 1;
+ }
+ return acc;
+ },
+ { totalPacedTrainCount: 0, totalTrainScheduleCount: 0 }
+ ),
+ [timetableItems]
+ );
+
const debouncedFilter = useDebounce(filter, 500);
const debouncedRollingstockFilter = useDebounce(rollingStockFilter, 500);
const [deleteTrainSchedules] = osrdEditoastApi.endpoints.deleteTrainSchedule.useMutation();
- const { trainScheduleIds, pacedTrainIds } = selectedTimetableItemIds;
- const timetableItemIds = [...trainScheduleIds, ...pacedTrainIds];
+ const { selectedTrainScheduleIds, selectedPacedTrainIds } = selectedTimetableItemIdsByType;
+ const selectedTimetableItemIds = [...selectedTrainScheduleIds, ...selectedPacedTrainIds];
// TODO: move this hook in Timetable
const { uniqueTags } = useFilterTrainSchedules(
@@ -99,43 +114,49 @@ const TimetableToolbar = ({
};
const toggleAllTrainsSelecton = () => {
- if (displayedTimetableItems.length === [...trainScheduleIds, ...pacedTrainIds].length) {
- setSelectedTimetableItemIds({ trainScheduleIds: [], pacedTrainIds: [] });
+ if (displayedTimetableItems.length === selectedTimetableItemIds.length) {
+ setSelectedTimetableItemIdsByType({
+ selectedTrainScheduleIds: [],
+ selectedPacedTrainIds: [],
+ });
} else {
const timetableItemsDisplayed = displayedTimetableItems.reduce(
(acc, { id }) => {
if (isTrainSchedule(id)) {
- acc.trainScheduleIds.push(id);
+ acc.selectedTrainScheduleIds.push(id);
} else {
- acc.pacedTrainIds.push(id);
+ acc.selectedPacedTrainIds.push(id);
}
return acc;
},
- { trainScheduleIds: [] as TrainScheduleId[], pacedTrainIds: [] as PacedTrainId[] }
+ {
+ selectedTrainScheduleIds: [] as TrainScheduleId[],
+ selectedPacedTrainIds: [] as PacedTrainId[],
+ }
);
- setSelectedTimetableItemIds(timetableItemsDisplayed);
+ setSelectedTimetableItemIdsByType(timetableItemsDisplayed);
}
};
const handleTrainsDelete = async () => {
- const itemsCount = timetableItemIds.length;
+ const itemsCount = selectedTimetableItemIds.length;
// TODO Paced train : Adapt this to handle delete paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
- if (selectedTrainId && timetableItemIds.includes(selectedTrainId as TrainScheduleId)) {
+ if (selectedTrainId && selectedTimetableItemIds.includes(selectedTrainId as TrainScheduleId)) {
// we need to set selectedTrainId to undefined, otherwise just after the delete,
// some unvalid rtk calls are dispatched (see rollingstock request in SimulationResults)
dispatch(updateSelectedTrainId(undefined));
}
// TODO Paced train : Adapt this to handle delete paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
- const editoastSelectedTrainScheduleIds = timetableItemIds
+ const editoastSelectedTrainScheduleIds = selectedTimetableItemIds
.filter(isTrainSchedule)
.map((id) => formatTrainScheduleIdToEditoastTrainId(id));
await deleteTrainSchedules({ body: { ids: editoastSelectedTrainScheduleIds } })
.unwrap()
.then(() => {
- removeTrains(trainScheduleIds);
+ removeTrains(selectedTrainScheduleIds);
dispatch(
setSuccess({
title: t('timetable.trainsSelectionDeletedCount', { count: itemsCount }),
@@ -145,7 +166,10 @@ const TimetableToolbar = ({
})
.catch((e) => {
// TODO Paced train : Adapt this to handle delete paced trains in issue https://github.com/OpenRailAssociation/osrd/issues/10615
- if (selectedTrainId && timetableItemIds.includes(selectedTrainId as TrainScheduleId)) {
+ if (
+ selectedTrainId &&
+ selectedTimetableItemIds.includes(selectedTrainId as TrainScheduleId)
+ ) {
dispatch(updateSelectedTrainId(selectedTrainId));
} else {
dispatch(setFailure(castErrorToFailure(e)));
@@ -171,6 +195,45 @@ const TimetableToolbar = ({
a.click();
};
+ const computedItemLabel = (trainSchedulesCount: number, pacedTrainCount: number) => {
+ if (trainSchedulesCount === 0 && pacedTrainCount === 0) return t('timetable.noItem');
+
+ const pacedTrainLabel = t('pacedTrainCount', {
+ count: selectedPacedTrainIds.length,
+ totalCount: totalPacedTrainCount,
+ });
+
+ const trainScheduleLabel = t('trainCount', {
+ count: selectedTrainScheduleIds.length,
+ totalCount: totalTrainScheduleCount,
+ });
+
+ if (
+ trainSchedulesCount === 0 ||
+ (selectedPacedTrainIds.length > 0 && selectedTrainScheduleIds.length === 0)
+ ) {
+ return pacedTrainLabel;
+ }
+
+ if (
+ pacedTrainCount === 0 ||
+ (selectedTrainScheduleIds.length > 0 && selectedPacedTrainIds.length === 0)
+ ) {
+ return trainScheduleLabel;
+ }
+
+ if (selectedTrainScheduleIds.length > 0 && selectedPacedTrainIds.length > 0) {
+ return t('pacedTrainAndTrainCount', {
+ pacedTrainCount: selectedPacedTrainIds.length,
+ totalPacedTrainCount,
+ trainCount: selectedTrainScheduleIds.length,
+ totalTrainScheduleCount,
+ });
+ }
+
+ return `${pacedTrainLabel}\u00A0${t('translation:common.and')}\u00A0${trainScheduleLabel}`;
+ };
+
return (
<>
0
+ selectedTimetableItemIds.length === timetableItems.length &&
+ selectedTimetableItemIds.length > 0
}
isIndeterminate={
- timetableItemIds.length !== timetableItems.length && timetableItemIds.length > 0
+ selectedTimetableItemIds.length !== timetableItems.length &&
+ selectedTimetableItemIds.length > 0
}
onChange={() => toggleAllTrainsSelecton()}
/>
@@ -218,7 +280,7 @@ const TimetableToolbar = ({
)}
- {timetableItemIds.length > 0 && (
+ {selectedTimetableItemIds.length > 0 && (
,
'sm'
)
@@ -241,7 +303,7 @@ const TimetableToolbar = ({
title={t('timetable.exportSelection')}
type="button"
// TODO PACED TRAIN: https://github.com/OpenRailAssociation/osrd/issues/10614
- onClick={() => exportTrainSchedules(trainScheduleIds)}
+ onClick={() => exportTrainSchedules(selectedTrainScheduleIds)}
/>
)}
diff --git a/front/src/modules/trainschedule/components/Timetable/types.ts b/front/src/modules/trainschedule/components/Timetable/types.ts
index 98facd0c2f9..c62d6c3f70b 100644
--- a/front/src/modules/trainschedule/components/Timetable/types.ts
+++ b/front/src/modules/trainschedule/components/Timetable/types.ts
@@ -14,7 +14,7 @@ export type ScheduledPointsHonoredFilter = 'both' | 'honored' | 'notHonored';
type SimulationSummaryResultSuccess = Extract;
-export type TimetableItemWithDetails = Omit<
+type TimetableItemWithDetails = Omit<
TrainScheduleResult,
'id' | 'train_name' | 'rolling_stock_name' | 'timetable_id' | 'start_time'
> & {
@@ -57,3 +57,8 @@ export type PacedTrainWithResult = TimetableItemWithDetails & {
};
export type TimetableItemResult = TrainScheduleWithDetails | PacedTrainWithResult;
+
+export type SelectedTimetableIdsByType = {
+ selectedTrainScheduleIds: TrainScheduleId[];
+ selectedPacedTrainIds: PacedTrainId[];
+};
diff --git a/front/src/styles/scss/applications/operationalStudies/_pacedTrain.scss b/front/src/styles/scss/applications/operationalStudies/_pacedTrain.scss
index a4e0c597084..410450998bb 100644
--- a/front/src/styles/scss/applications/operationalStudies/_pacedTrain.scss
+++ b/front/src/styles/scss/applications/operationalStudies/_pacedTrain.scss
@@ -20,7 +20,7 @@
}
}
- &:has(.paced-train-right-zone:hover, .action-buttons:hover):not(.modified) {
+ &:hover:not(.modified) {
.action-buttons {
display: flex !important;
z-index: 1;
@@ -35,12 +35,6 @@
z-index: 3;
}
- &.invalid {
- .checkbox-title {
- min-width: auto !important;
- }
- }
-
.paced-train-main-info {
display: flex;
margin-inline: 9px 24px;
@@ -144,4 +138,16 @@
height: 0;
}
}
+
+ .invalid-reason {
+ margin-right: 18px;
+ font-size: 16px;
+ color: var(--error80);
+ font-weight: 600;
+ min-width: 155px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ line-height: 24px;
+ }
}
diff --git a/front/src/styles/scss/applications/operationalStudies/_scenario.scss b/front/src/styles/scss/applications/operationalStudies/_scenario.scss
index 3ba87465a1e..1340dd2a521 100644
--- a/front/src/styles/scss/applications/operationalStudies/_scenario.scss
+++ b/front/src/styles/scss/applications/operationalStudies/_scenario.scss
@@ -655,15 +655,11 @@
background-image: url('data:image/svg+xml,%3Csvg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"%3E%3Ctitle%3EAssets/TrainList/InvalidTrain%3C/title%3E%3Cg fill-rule="evenodd"%3E%3Crect width="48" height="48" fill="%23FFEEED"/%3E%3Cpath d="m48 26v22h-22l22-22zm0-26-48 48v-22l26-26h22z" fill="%23FF6868" opacity=".1"/%3E%3C/g%3E%3C/svg%3E');
background-repeat: repeat;
box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.25);
- .checkbox-title {
- min-width: 0;
- }
+
.checkbox-title::after {
display: none;
}
.rolling-stock {
- min-width: max-content;
- white-space: nowrap;
font-weight: 600;
color: var(--error80);
}