front: adapt import train schedules v2

OpenRailAssociation · Apr 10, 2024 · 2c8576b · 2c8576b
1 parent 9d4937f
commit 2c8576b
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 192 deletions.
diff --git a/front/src/applications/operationalStudies/types.ts b/front/src/applications/operationalStudies/types.ts
@@ -13,10 +13,6 @@ export interface Step extends Destination {
   arrivalTime: string;
   departureTime: string;
   duration?: number;
-  tracks: {
-    position: number;
-    track: string;
-  }[];
 }
 
 export type TrainSchedule = {

diff --git a/front/src/applications/operationalStudies/views/v2/ImportTrainScheduleV2.tsx b/front/src/applications/operationalStudies/views/v2/ImportTrainScheduleV2.tsx
@@ -5,10 +5,8 @@ import { useTranslation } from 'react-i18next';
 import type { TrainSchedule } from 'applications/operationalStudies/types';
 import { enhancedEditoastApi } from 'common/api/enhancedEditoastApi';
 import { Loader } from 'common/Loaders';
-import {
-  ImportTrainScheduleConfigV2,
-  ImportTrainScheduleTrainsList,
-} from 'modules/trainschedule/components/ImportTrainSchedule';
+import { ImportTrainScheduleConfigV2 } from 'modules/trainschedule/components/ImportTrainSchedule';
+import ImportTrainScheduleTrainsListV2 from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsListV2';
 import { setFailure } from 'reducers/main';
 import { useAppDispatch } from 'store';
 
@@ -47,7 +45,7 @@ const ImportTrainScheduleV2 = ({
         setTrainsList={setTrainsList}
         infraId={infraId}
       />
-      <ImportTrainScheduleTrainsList
+      <ImportTrainScheduleTrainsListV2
         infraId={infraId}
         isLoading={isLoading}
         rollingStocks={rollingStocks}

diff --git a/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx b/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
@@ -24,6 +24,7 @@ import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulat
 import { getPresentSimulation, getSelectedTrainId } from 'reducers/osrdsimulation/selectors';
 import { useAppDispatch } from 'store';
 
+import ImportTrainScheduleV2 from './ImportTrainScheduleV2';
 import ManageTrainScheduleV2 from './ManageTrainScheduleV2';
 import SimulationResultsV2 from './SimulationResultsV2';
 
@@ -331,7 +332,7 @@ const ScenarioV2 = () => {
               )}
               {displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.import && (
                 <div className="scenario-managetrainschedule">
-                  <ImportTrainSchedule infraId={infraId} timetableId={timetableId} />
+                  <ImportTrainScheduleV2 infraId={infraId} timetableId={timetableId} />
                 </div>
               )}
               <div className="scenario-results">

diff --git a/.../src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfigV2.tsx b/.../src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfigV2.tsx
@@ -32,15 +32,11 @@ interface ImportTrainScheduleConfigProps {
   setIsLoading: (isLoading: boolean) => void;
 }
 
-type SearchConstraintType = (string | number | string[])[];
-
 const ImportTrainScheduleConfigV2 = ({
   setTrainsList,
-  infraId,
   setIsLoading,
 }: ImportTrainScheduleConfigProps) => {
   const { t } = useTranslation(['operationalStudies/importTrainSchedule']);
-  const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();
   const [from, setFrom] = useState<ImportStation | undefined>();
   const [fromSearchString, setFromSearchString] = useState('');
   const [to, setTo] = useState<ImportStation | undefined>();
@@ -52,42 +48,6 @@ const ImportTrainScheduleConfigV2 = ({
   const { openModal, closeModal } = useContext(ModalContext);
   const { rollingStockComfort, rollingStock } = useStoreDataForRollingStockSelector();
 
-  async function importTrackSections(opIds: number[]): Promise<
-    Record<
-      number,
-      {
-        position: number;
-        track: string;
-      }[]
-    >
-  > {
-    const uniqueOpIds = Array.from(new Set(opIds));
-    const constraint = uniqueOpIds.reduce((res, uic) => [...res, ['=', ['uic'], Number(uic)]], [
-      'or',
-    ] as (string | SearchConstraintType)[]);
-    const payload: PostSearchApiArg = {
-      searchPayload: {
-        object: 'operationalpoint',
-        query: ['and', constraint, ['=', ['infra_id'], infraId]],
-      },
-      pageSize: 1000,
-    };
-    const operationalPoints = (await postSearch(
-      payload
-    ).unwrap()) as SearchResultItemOperationalPoint[];
-
-    return operationalPoints.reduce(
-      (res, operationalPoint) =>
-        operationalPoint.uic
-          ? {
-              ...res,
-              [operationalPoint.uic]: operationalPoint.track_sections,
-            }
-          : res,
-      {}
-    );
-  }
-
   function validateImportedTrainSchedules(
     importedTrainSchedules: Record<string, unknown>[]
   ): ImportedTrainSchedule[] | null {
@@ -120,11 +80,6 @@ const ImportTrainScheduleConfigV2 = ({
   }
 
   async function updateTrainSchedules(importedTrainSchedules: ImportedTrainSchedule[]) {
-    const opIds = importedTrainSchedules.flatMap((trainSchedule) =>
-      trainSchedule.steps.map((step) => step.uic)
-    );
-    const trackSectionsByOp = await importTrackSections(opIds);
-
     // For each train schedule, we add the duration and tracks of each step
     const trainsSchedules = importedTrainSchedules.map((trainSchedule) => {
       const stepsWithDuration = trainSchedule.steps.map((step) => {
@@ -137,7 +92,6 @@ const ImportTrainScheduleConfigV2 = ({
         return {
           ...step,
           duration,
-          tracks: trackSectionsByOp[Number(step.uic)] || [],
         };
       });
       return {