front: add train type filter in the timetable

Signed-off-by: SharglutDev <[email protected]>

Author: SharglutDev

front/public/locales/en/operationalStudies/scenario.json

@@ -25,9 +25,6 @@
   "modifyScenario": "Modify scenario",
   "moreDetails": "more details",
   "noElectricalProfileSet": "No electrical profile",
-  "pacedTrain": {
-    "pacedTrain": "Paced train"
-  },
   "pacedTrain_one": "1 service",
   "pacedTrain_other": "{{count}} services",
   "pacedTrain_zero": "0 service",
@@ -82,6 +79,7 @@
     "noSpeedLimitTags": "Without code",
     "noSpeedLimitTagsShort": "None",
     "noTrain": "No train",
+    "pacedTrain": "Service",
     "punctuality": "Punctuality",
     "rollingStockFilterPlaceholder": "Family, detail, serie",
     "scheduledPointsHonoredFilter": "Scheduled points honored",
@@ -96,8 +94,11 @@
     "toggleMultiSelection": "Toggle multiselection",
     "trainAdded": "Train added",
     "trainDeleted": "{{ name }} train has been deleted.",
+    "trainSchedule": "Unique train",
+
     "trainsSelectionDeletedCount_one": "The train has been deleted.",
     "trainsSelectionDeletedCount_other": "The {{count}} trains have been deleted.",
+    "trainType": "Services, trains",
     "update": "Edit",
     "validityFilter": "Trains validity"
   },

front/public/locales/fr/operationalStudies/scenario.json

@@ -25,9 +25,6 @@
   "modifyScenario": "Modifier le scénario",
   "moreDetails": "plus de détails",
   "noElectricalProfileSet": "Pas de profil électrique",
-  "pacedTrain": {
-    "pacedTrain": "Mission"
-  },
   "pacedTrain_one": "1 mission",
   "pacedTrain_other": "{{count}} missions",
   "pacedTrain_zero": "0 mission",
@@ -82,6 +79,7 @@
     "noSpeedLimitTags": "Sans code",
     "noSpeedLimitTagsShort": "Aucun",
     "noTrain": "Aucun train",
+    "pacedTrain": "Mission",
     "punctuality": "Ponctualité",
     "rollingStockFilterPlaceholder": "Famille, détail, série",
     "scheduledPointsHonoredFilter": "Points horaires honorés",
@@ -96,8 +94,10 @@
     "toggleMultiSelection": "Basculer le mode multisélection",
     "trainAdded": "Train ajouté",
     "trainDeleted": "Le train {{name}} a bien été supprimé.",
+    "trainSchedule": "Train unique",
     "trainsSelectionDeletedCount_one": "Le train a bien été supprimé.",
     "trainsSelectionDeletedCount_other": "Les {{count}} trains ont bien été supprimés.",
+    "trainType": "Missions, trains",
     "update": "Modifier",
     "validityFilter": "Validité des trains"
   },

front/src/common/UserSettings.tsx

@@ -76,7 +76,7 @@ const UserSettings = () => {
                   )
                 }
               />
-              <div className="ml-2">{t('operationalStudies/scenario:pacedTrain.pacedTrain')}</div>
+              <div className="ml-2">{t('operationalStudies/scenario:timetable.pacedTrain')}</div>
             </div>
           )
         }

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

@@ -3,7 +3,12 @@ import { X } from '@osrd-project/ui-icons';
 import cx from 'classnames';
 import { useTranslation } from 'react-i18next';
 
-import type { ValidityFilter, ScheduledPointsHonoredFilter, TimetableFilters } from './types';
+import type {
+  ValidityFilter,
+  ScheduledPointsHonoredFilter,
+  TimetableFilters,
+  TrainTypeFilter,
+} from './types';
 
 type FilterPanelProps = {
   toggleFilterPanel: () => void;
@@ -22,6 +27,8 @@ const FilterPanel = ({ toggleFilterPanel, timetableFilters }: FilterPanelProps)
     setValidityFilter,
     scheduledPointsHonoredFilter,
     setScheduledPointsHonoredFilter,
+    trainTypeFilter,
+    setTrainTypeFilter,
     uniqueTags,
     selectedTags,
     setSelectedTags,
@@ -39,6 +46,12 @@ const FilterPanel = ({ toggleFilterPanel, timetableFilters }: FilterPanelProps)
     { value: 'notHonored', label: t('timetable.showNotHonoredTrains') },
   ];
 
+  const trainTypeOptions: { value: TrainTypeFilter; label: string }[] = [
+    { value: 'both', label: t('timetable.showAllTrains') },
+    { value: 'pacedTrain', label: t('timetable.pacedTrain') },
+    { value: 'trainSchedule', label: t('timetable.trainSchedule') },
+  ];
+
   const toggleTagSelection = (tag: string | null) => {
     setSelectedTags((prevSelectedTags) => {
       const newSelectedTags = new Set(prevSelectedTags);
@@ -92,8 +105,23 @@ const FilterPanel = ({ toggleFilterPanel, timetableFilters }: FilterPanelProps)
               validityOptions[0]
             }
           />
+          <Select
+            getOptionLabel={(option) => option.label}
+            getOptionValue={(option) => option.value}
+            id="train-type"
+            label={t('timetable.trainType')}
+            onChange={(selectedOption) => {
+              if (selectedOption) {
+                setTrainTypeFilter(selectedOption.value);
+              }
+            }}
+            options={trainTypeOptions}
+            value={
+              trainTypeOptions.find((option) => option.value === trainTypeFilter) ||
+              trainTypeOptions[0]
+            }
+          />
         </div>
-
         <div id="schedule-point-honored-and-rollingstock">
           <Input
             type="text"

front/src/modules/trainschedule/components/Timetable/types.ts

@@ -12,6 +12,8 @@ export type ValidityFilter = 'both' | 'valid' | 'invalid';
 
 export type ScheduledPointsHonoredFilter = 'both' | 'honored' | 'notHonored';
 
+export type TrainTypeFilter = 'both' | 'pacedTrain' | 'trainSchedule';
+
 type SimulationSummaryResultSuccess = Extract<SimulationSummaryResult, { status: 'success' }>;
 
 type TimetableItemWithDetails = Omit<
@@ -70,6 +72,8 @@ export type TimetableFilters = {
   setScheduledPointsHonoredFilter: (
     scheduledPointsHonoredFilter: ScheduledPointsHonoredFilter
   ) => void;
+  trainTypeFilter: TrainTypeFilter;
+  setTrainTypeFilter: (trainType: TrainTypeFilter) => void;
   selectedTags: Set<string | null>;
   setSelectedTags: React.Dispatch<React.SetStateAction<Set<string | null>>>;
 };

front/src/modules/trainschedule/components/Timetable/useFilterTimetableItems.ts

@@ -3,11 +3,13 @@ import { useMemo, useState } from 'react';
 import { uniq } from 'lodash';
 
 import { useDebounce } from 'utils/helpers';
+import { isPacedTrain, isTrainSchedule } from 'utils/trainId';
 
 import type {
   ScheduledPointsHonoredFilter,
   TimetableFilters,
   TimetableItemResult,
+  TrainTypeFilter,
   ValidityFilter,
 } from './types';
 import { extractTagCode, keepItem } from './utils';
@@ -25,6 +27,7 @@ const useFilterTimetableItems = (
   const [validityFilter, setValidityFilter] = useState<ValidityFilter>('both');
   const [scheduledPointsHonoredFilter, setScheduledPointsHonoredFilter] =
     useState<ScheduledPointsHonoredFilter>('both');
+  const [trainTypeFilter, setTrainTypeFilter] = useState<TrainTypeFilter>('both');
   const [selectedTags, setSelectedTags] = useState<Set<string | null>>(new Set());
 
   const debouncedNameLabelFilter = useDebounce(nameLabelFilter, 500);
@@ -60,6 +63,12 @@ const useFilterTimetableItems = (
           }
         }
 
+        // Apply train type filter
+        if (trainTypeFilter !== 'both') {
+          if (trainTypeFilter === 'pacedTrain' && isTrainSchedule(timetableItem.id)) return false;
+          if (trainTypeFilter === 'trainSchedule' && isPacedTrain(timetableItem.id)) return false;
+        }
+
         // Apply tag filter
         if (
           selectedTags.size > 0 &&
@@ -93,6 +102,7 @@ const useFilterTimetableItems = (
       debouncedRollingstockFilter,
       validityFilter,
       scheduledPointsHonoredFilter,
+      trainTypeFilter,
       selectedTags,
     ]
   );
@@ -108,6 +118,8 @@ const useFilterTimetableItems = (
     setValidityFilter,
     scheduledPointsHonoredFilter,
     setScheduledPointsHonoredFilter,
+    trainTypeFilter,
+    setTrainTypeFilter,
     selectedTags,
     setSelectedTags,
   };