front: rename v2 components

It does not handle stdcmV2 renaming as it still coexists with stdcm debug
OpenRailAssociation · Sep 6, 2024 · 1d75be4 · 1d75be4
1 parent fcd9734
commit 1d75be4
Show file tree

Hide file tree

Showing 111 changed files with 486 additions and 534 deletions.
diff --git a/front/src/applications/operationalStudies/__tests__/sampleData.ts b/front/src/applications/operationalStudies/__tests__/sampleData.ts
@@ -3,7 +3,7 @@ import type {
   ElectricalBoundariesData,
   ElectricalProfileValue,
   ElectricalRangesData,
-  ElectrificationRangeV2,
+  ElectrificationRange,
   ElectrificationValue,
   PositionData,
 } from 'applications/operationalStudies/types';
@@ -242,7 +242,7 @@ export const electricalProfileRangesDataShort: ElectricalRangesData<ElectricalPr
   },
 ];
 
-export const electrificationRanges: ElectrificationRangeV2[] = [
+export const electrificationRanges: ElectrificationRange[] = [
   {
     start: 0,
     stop: 1,
@@ -284,7 +284,7 @@ export const electrificationRanges: ElectrificationRangeV2[] = [
   },
 ];
 
-export const electrificationRangesLarge: ElectrificationRangeV2[] = [
+export const electrificationRangesLarge: ElectrificationRange[] = [
   {
     start: 0,
     stop: 1,

diff --git a/front/src/applications/operationalStudies/helpers/formatTrainScheduleSummaries.ts b/front/src/applications/operationalStudies/helpers/formatTrainScheduleSummaries.ts
@@ -6,7 +6,7 @@ import type {
   SimulationSummaryResult,
   TrainScheduleResult,
 } from 'common/api/osrdEditoastApi';
-import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/TimetableV2/types';
+import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 import { formatToIsoDate, isoDateToMs } from 'utils/date';
 import { jouleToKwh } from 'utils/physics';
 import { formatKmValue } from 'utils/strings';

diff --git a/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts b/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts
@@ -10,7 +10,7 @@ import {
 } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 import useLazyProjectTrains from 'modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains';
-import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/TimetableV2/types';
+import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 import { getBatchPackage } from 'utils/batch';
 import { concatMap, mapBy } from 'utils/types';
 
@@ -82,7 +82,7 @@ const useLazyLoadTrains = ({
           },
         }).unwrap();
 
-        // the two rtk-query calls postV2TrainSchedule & postV2TrainScheduleSimulationSummary
+        // the two rtk-query calls postTrainSchedule & postTrainScheduleSimulationSummary
         // do not happen during the same react cycle.
         // if we update a train, one is going to re-fetch first and the 2 are out of sync during a few cycles.
         // these cycles do not make sense to render.

diff --git a/front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts b/front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts
@@ -16,7 +16,7 @@ import {
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import { formatSuggestedOperationalPoints, upsertPathStepsInOPs } from 'modules/pathfinding/utils';
 import { getSupportedElectrification, isThermal } from 'modules/rollingStock/helpers/electric';
-import { adjustConfWithTrainToModifyV2 } from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
+import { adjustConfWithTrainToModify } from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
 import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
 import { setFailure } from 'reducers/main';
 import type { OperationalStudiesConfSliceActions } from 'reducers/osrdconf/operationalStudiesConf';
@@ -53,7 +53,6 @@ const computeBasePathSteps = (trainSchedule: TrainScheduleResult) =>
 
     const stepWithoutSecondaryCode = omit(step, ['secondary_code']);
 
-    // TODO DROP V1: we should store the offset in mm in the store
     if ('track' in stepWithoutSecondaryCode) {
       stepWithoutSecondaryCode.offset = mmToM(stepWithoutSecondaryCode.offset!);
     }
@@ -259,7 +258,7 @@ const useSetupItineraryForTrainUpdate = (
         }
       }
 
-      adjustConfWithTrainToModifyV2(
+      adjustConfWithTrainToModify(
         trainSchedule,
         pathSteps || computeBasePathSteps(trainSchedule),
         rollingStock?.id,

diff --git a/front/src/applications/operationalStudies/hooks/useSimulationResults.ts b/front/src/applications/operationalStudies/hooks/useSimulationResults.ts
@@ -5,12 +5,12 @@ import { useInfraID, useOsrdConfSelectors } from 'common/osrdContext';
 import useSpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/useSpeedSpaceChart';
 import { getSelectedTrainId } from 'reducers/osrdsimulation/selectors';
 
-import type { SimulationResults } from '../types';
+import type { SimulationResultsData } from '../types';
 
 /**
  * Prepare data to be used in simulation results
  */
-const useSimulationResults = (): SimulationResults => {
+const useSimulationResults = (): SimulationResultsData => {
   const infraId = useInfraID();
   const { getElectricalProfileSetId } = useOsrdConfSelectors();
   const electricalProfileSetId = useSelector(getElectricalProfileSetId);

diff --git a/front/src/applications/operationalStudies/types.ts b/front/src/applications/operationalStudies/types.ts
@@ -75,13 +75,13 @@ export type PositionData<T extends 'gradient' | 'radius'> = {
 };
 
 /** Start and stop are in meters */
-export type ElectrificationRangeV2 = {
-  electrificationUsage: ElectrificationUsageV2;
+export type ElectrificationRange = {
+  electrificationUsage: ElectrificationUsage;
   start: number;
   stop: number;
 };
 
-type ElectrificationUsageV2 = ElectrificationValue &
+type ElectrificationUsage = ElectrificationValue &
   SimulationResponseSuccess['electrical_profiles']['values'][number];
 
 export type BoundariesData = {
@@ -114,15 +114,15 @@ export type ElectricalProfileValue = Extract<
 
 /** Electrifications start and stop are in meters */
 export type PathPropertiesFormatted = {
-  electrifications: ElectrificationRangeV2[];
+  electrifications: ElectrificationRange[];
   curves: PositionData<'radius'>[];
   slopes: PositionData<'gradient'>[];
   operationalPoints: NonNullable<PathProperties['operational_points']>;
   geometry: NonNullable<PathProperties['geometry']>;
   voltages: RangedValue[];
 };
 
-export type PowerRestrictionV2 = ArrayElement<TrainScheduleBase['power_restrictions']>;
+export type PowerRestriction = ArrayElement<TrainScheduleBase['power_restrictions']>;
 
 export type SimulationResponseSuccess = Extract<SimulationResponse, { status: 'success' }>;
 
@@ -131,7 +131,7 @@ export type ElectrificationVoltage = {
   voltage?: string;
 };
 
-export type SimulationResults = {
+export type SimulationResultsData = {
   selectedTrainSchedule?: TrainScheduleResult;
   selectedTrainRollingStock?: RollingStockWithLiveries;
   selectedTrainPowerRestrictions: LayerData<PowerRestrictionValues>[];

diff --git a/front/src/applications/operationalStudies/utils.ts b/front/src/applications/operationalStudies/utils.ts
@@ -17,7 +17,7 @@ import type {
   ElectricalBoundariesData,
   ElectricalProfileValue,
   ElectricalRangesData,
-  ElectrificationRangeV2,
+  ElectrificationRange,
   ElectrificationValue,
   PathPropertiesFormatted,
   PositionData,
@@ -77,7 +77,7 @@ export const transformBoundariesDataToRangesData = <
   boundariesData: ElectricalBoundariesData<T>,
   pathLength: number
 ): ElectricalRangesData<T>[] => {
-  // TODO DROP V1 : remove electrical profiles
+  // TODO : remove electrical profiles
   const formatedData = boundariesData.boundaries.map((boundary, index) => ({
     start: index === 0 ? 0 : mmToM(boundariesData.boundaries[index - 1]),
     stop: mmToM(boundary),
@@ -99,7 +99,7 @@ export const transformBoundariesDataToRangesData = <
 export const formatElectrificationRanges = (
   electrifications: ElectricalRangesData<ElectrificationValue>[],
   electricalProfiles: ElectricalRangesData<ElectricalProfileValue>[]
-): ElectrificationRangeV2[] =>
+): ElectrificationRange[] =>
   // Electrifications can be of three types, electricalProfiles only two, so we know electrifications
   // will always be at least as long as electricalProfiles so we can use it as the main array
   electrifications.map((currentElectrification, index) => {

diff --git a/...tudies/views/v2/ImportTrainScheduleV2.tsx → ...onalStudies/views/ImportTrainSchedule.tsx b/...tudies/views/v2/ImportTrainScheduleV2.tsx → ...onalStudies/views/ImportTrainSchedule.tsx
@@ -6,12 +6,12 @@ import type { ImportedTrainSchedule } from 'applications/operationalStudies/type
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import type { TrainScheduleBase } from 'common/api/osrdEditoastApi';
 import { Loader } from 'common/Loaders';
-import { ImportTrainScheduleConfigV2 } from 'modules/trainschedule/components/ImportTrainSchedule';
-import ImportTrainScheduleTrainsListV2 from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsListV2';
+import { ImportTrainScheduleConfig } from 'modules/trainschedule/components/ImportTrainSchedule';
+import ImportTrainScheduleTrainsList from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList';
 import { setFailure } from 'reducers/main';
 import { useAppDispatch } from 'store';
 
-const ImportTrainScheduleV2 = ({ timetableId }: { timetableId: number }) => {
+const ImportTrainSchedule = ({ timetableId }: { timetableId: number }) => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation(['rollingstock']);
   const [trainsList, setTrainsList] = useState<ImportedTrainSchedule[]>([]);
@@ -36,12 +36,12 @@ const ImportTrainScheduleV2 = ({ timetableId }: { timetableId: number }) => {
 
   return rollingStocks ? (
     <main className="import-train-schedule">
-      <ImportTrainScheduleConfigV2
+      <ImportTrainScheduleConfig
         setIsLoading={setIsLoading}
         setTrainsList={setTrainsList}
         setTrainsJsonData={setTrainsJsonData}
       />
-      <ImportTrainScheduleTrainsListV2
+      <ImportTrainScheduleTrainsList
         isLoading={isLoading}
         rollingStocks={rollingStocks}
         timetableId={timetableId}
@@ -54,4 +54,4 @@ const ImportTrainScheduleV2 = ({ timetableId }: { timetableId: number }) => {
   );
 };
 
-export default ImportTrainScheduleV2;
+export default ImportTrainSchedule;
diff --git a/...tudies/views/v2/ManageTrainScheduleV2.tsx → ...onalStudies/views/ManageTrainSchedule.tsx b/...tudies/views/v2/ManageTrainScheduleV2.tsx → ...onalStudies/views/ManageTrainSchedule.tsx
@@ -14,10 +14,10 @@ import { useOsrdConfSelectors } from 'common/osrdContext';
 import { useStoreDataForSpeedLimitByTagSelector } from 'common/SpeedLimitByTagSelector/useStoreDataForSpeedLimitByTagSelector';
 import Tabs from 'common/Tabs';
 import IncompatibleConstraints from 'modules/pathfinding/components/IncompatibleConstraints';
-import ItineraryV2 from 'modules/pathfinding/components/Itinerary/ItineraryV2';
+import Itinerary from 'modules/pathfinding/components/Itinerary/Itinerary';
 import getPathVoltages from 'modules/pathfinding/helpers/getPathVoltages';
 import { upsertPathStepsInOPs } from 'modules/pathfinding/utils';
-import PowerRestrictionsSelectorV2 from 'modules/powerRestriction/components/PowerRestrictionsSelectorV2';
+import PowerRestrictionsSelector from 'modules/powerRestriction/components/PowerRestrictionsSelector';
 import RollingStock2Img from 'modules/rollingStock/components/RollingStock2Img';
 import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
 import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
@@ -28,16 +28,16 @@ import SimulationSettings from 'modules/trainschedule/components/ManageTrainSche
 import TrainSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainSettings';
 import { formatKmValue } from 'utils/strings';
 
-type ManageTrainScheduleV2Props = {
+type ManageTrainScheduleProps = {
   trainIdToEdit?: number;
 };
 
-const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) => {
+const ManageTrainSchedule = ({ trainIdToEdit }: ManageTrainScheduleProps) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
-  const { getOriginV2, getDestinationV2, getPathSteps, getConstraintDistribution, getStartTime } =
+  const { getOrigin, getDestination, getPathSteps, getConstraintDistribution, getStartTime } =
     useOsrdConfSelectors();
-  const origin = useSelector(getOriginV2);
-  const destination = useSelector(getDestinationV2);
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
   const pathSteps = useSelector(getPathSteps);
   const constraintDistribution = useSelector(getConstraintDistribution);
   const startTime = useSelector(getStartTime);
@@ -117,7 +117,7 @@ const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) =>
     content: (
       <div className="osrd-config-item-container-map" data-testid="map">
         <div className="floating-itinerary">
-          <ItineraryV2 pathProperties={pathProperties} setPathProperties={setPathProperties} />
+          <Itinerary pathProperties={pathProperties} setPathProperties={setPathProperties} />
         </div>
         <Map pathProperties={pathProperties}>
           <IncompatibleConstraints pathProperties={pathProperties} />
@@ -163,7 +163,7 @@ const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) =>
           constraintDistribution={constraintDistribution}
         />
         {rollingStock && isElectric(rollingStock.effort_curves.modes) && pathProperties && (
-          <PowerRestrictionsSelectorV2
+          <PowerRestrictionsSelector
             rollingStockModes={rollingStock.effort_curves.modes}
             rollingStockPowerRestrictions={rollingStock.power_restrictions}
             voltageRanges={voltageRanges}
@@ -190,4 +190,4 @@ const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) =>
   );
 };
 
-export default ManageTrainScheduleV2;
+export default ManageTrainSchedule;
diff --git a/front/src/applications/operationalStudies/views/Project.tsx b/front/src/applications/operationalStudies/views/Project.tsx
@@ -50,7 +50,7 @@ export default function Project() {
   const [isLoading, setIsLoading] = useState(true);
 
   const { projectId: urlProjectId } = useParams() as ProjectParams;
-  const [deleteStudyV2] =
+  const [deleteStudy] =
     osrdEditoastApi.endpoints.deleteProjectsByProjectIdStudiesAndStudyId.useMutation();
   const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();
 
@@ -69,7 +69,7 @@ export default function Project() {
     toggleSelection: toggleStudySelection,
     deleteItems,
   } = useMultiSelection<StudyWithScenarios>((studyId) => {
-    deleteStudyV2({ projectId: projectId!, studyId });
+    deleteStudy({ projectId: projectId!, studyId });
   });
 
   const handleDeleteStudy = () => {

diff --git a/...perationalStudies/views/v2/ScenarioV2.tsx → ...ons/operationalStudies/views/Scenario.tsx b/...perationalStudies/views/v2/ScenarioV2.tsx → ...ons/operationalStudies/views/Scenario.tsx
@@ -20,16 +20,16 @@ import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
 import AddAndEditScenarioModal from 'modules/scenario/components/AddOrEditScenarioModal';
 import ScenarioLoaderMessage from 'modules/scenario/components/ScenarioLoaderMessage';
-import TimetableManageTrainScheduleV2 from 'modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainScheduleV2';
-import TimetableV2 from 'modules/trainschedule/components/TimetableV2/TimetableV2';
+import TimetableManageTrainSchedule from 'modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule';
+import Timetable from 'modules/trainschedule/components/Timetable/Timetable';
 import type { RootState } from 'reducers';
 import { useAppDispatch } from 'store';
 import { concatMap, mapBy } from 'utils/types';
 
-import ImportTrainScheduleV2 from './ImportTrainScheduleV2';
-import ManageTrainScheduleV2 from './ManageTrainScheduleV2';
-import SimulationResultsV2 from './SimulationResultsV2';
-import useScenarioData from '../../hooks/useScenarioData';
+import ImportTrainSchedule from './ImportTrainSchedule';
+import ManageTrainSchedule from './ManageTrainSchedule';
+import SimulationResults from './SimulationResults';
+import useScenarioData from '../hooks/useScenarioData';
 
 const Scenario = () => {
   const { t } = useTranslation('operationalStudies/scenario');
@@ -221,7 +221,7 @@ const Scenario = () => {
                   <>
                     {displayTrainScheduleManagement !== MANAGE_TRAIN_SCHEDULE_TYPES.none &&
                       infra && (
-                        <TimetableManageTrainScheduleV2
+                        <TimetableManageTrainSchedule
                           displayTrainScheduleManagement={displayTrainScheduleManagement}
                           setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
                           upsertTrainSchedules={upsertTrainSchedules}
@@ -231,7 +231,7 @@ const Scenario = () => {
                         />
                       )}
                     {infra && (
-                      <TimetableV2
+                      <Timetable
                         setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
                         trainsWithDetails={trainsWithDetails}
                         infraState={infra.state}
@@ -260,12 +260,12 @@ const Scenario = () => {
               {(displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add ||
                 displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.edit) && (
                 <div className="scenario-managetrainschedule">
-                  <ManageTrainScheduleV2 trainIdToEdit={trainIdToEdit} />
+                  <ManageTrainSchedule trainIdToEdit={trainIdToEdit} />
                 </div>
               )}
               {displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.import && (
                 <div className="scenario-managetrainschedule">
-                  <ImportTrainScheduleV2 timetableId={scenario.timetable_id} />
+                  <ImportTrainSchedule timetableId={scenario.timetable_id} />
                 </div>
               )}
               <div className="scenario-results">
@@ -304,7 +304,7 @@ const Scenario = () => {
                 ) : (
                   isInfraLoaded &&
                   infra && (
-                    <SimulationResultsV2
+                    <SimulationResults
                       collapsedTimetable={collapsedTimetable}
                       spaceTimeData={projectedTrains}
                       simulationResults={simulationResults}