front: implement new nomenclature part 2

Author: Mathieu Richard

front/src/applications/operationalStudies/components/Scenario/Timetable.tsx

@@ -14,7 +14,7 @@ import {
   updateSelectedTrainId,
 } from 'reducers/osrdsimulation/actions';
 import { setFailure, setSuccess } from 'reducers/main';
-import trainNameWithNum from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/trainNameHelper';
+import trainNameWithNum from 'modules/trainschedule/components/ManageTrainSchedule/helpers/trainNameHelper';
 import { MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
 import { getTimetableID, getTrainScheduleIDsToModify } from 'reducers/osrdconf/selectors';
 import { OsrdSimulationState, ScheduledTrain } from 'reducers/osrdsimulation/types';
@@ -34,9 +34,9 @@ import { BsFillExclamationTriangleFill } from 'react-icons/bs';
 import DeleteModal from 'common/BootstrapSNCF/ModalSNCF/DeleteModal';
 import { ModalContext } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
 import ConflictsList from 'modules/conflict/components/ConflictsList';
+import findTrainsDurationsIntervals from 'modules/trainschedule/components/ManageTrainSchedule/helpers/trainsDurationsIntervals';
 import getSimulationResults from './getSimulationResults';
 import TimetableTrainCard from './TimetableTrainCard';
-import findTrainsDurationsIntervals from '../ManageTrainSchedule/helpers/trainsDurationsIntervals';
 
 type Props = {
   setDisplayTrainScheduleManagement: (mode: string) => void;

front/src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx

@@ -4,10 +4,12 @@ import { useTranslation } from 'react-i18next';
 import { updateTrainScheduleIDsToModify } from 'reducers/osrdconf';
 import DotsLoader from 'common/DotsLoader/DotsLoader';
 import { useDispatch } from 'react-redux';
-import TrainAddingSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings';
+import TrainAddingSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainAddingSettings';
 import { Infra } from 'common/api/osrdEditoastApi';
-import SubmitConfAddTrainSchedule from '../ManageTrainSchedule/SubmitConfAddTrainSchedule';
-import SubmitConfUpdateTrainSchedules from '../ManageTrainSchedule/SubmitConfUpdateTrainSchedules';
+import {
+  SubmitConfAddTrainSchedule,
+  SubmitConfUpdateTrainSchedules,
+} from 'modules/trainschedule/components/ManageTrainSchedule';
 
 type Props = {
   displayTrainScheduleManagement: string;

front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx

@@ -1,6 +1,8 @@
 import React, { useEffect, useState } from 'react';
-import ImportTrainScheduleConfig from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig';
-import ImportTrainScheduleTrainsList from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainsList';
+import {
+  ImportTrainScheduleConfig,
+  ImportTrainScheduleTrainsList,
+} from 'modules/trainschedule/components/ImportTrainSchedule';
 import Loader from 'common/Loader';
 import { TrainSchedule } from 'applications/operationalStudies/types';
 import { enhancedEditoastApi } from 'common/api/enhancedEditoastApi';

front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx

@@ -3,14 +3,14 @@ import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
-import TrainSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainSettings';
-import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
-import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
+import TrainSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainSettings';
+import Itinerary from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary';
+import Map from 'modules/trainschedule/components/ManageTrainSchedule/Map';
 import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
-import PowerRestrictionsSelector from 'applications/operationalStudies/components/ManageTrainSchedule/PowerRestrictionsSelector';
-import adjustConfWithTrainToModify from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
-import ElectricalProfiles from 'applications/operationalStudies/components/ManageTrainSchedule/ElectricalProfiles';
-import Allowances from 'applications/operationalStudies/components/ManageTrainSchedule/Allowances/Allowances';
+import PowerRestrictionsSelector from 'modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector';
+import adjustConfWithTrainToModify from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
+import ElectricalProfiles from 'modules/trainschedule/components/ManageTrainSchedule/ElectricalProfiles';
+import Allowances from 'modules/trainschedule/components/ManageTrainSchedule/Allowances/Allowances';
 import {
   getPathfindingID,
   getRollingStockID,

front/src/applications/operationalStudies/views/SimulationResults.tsx

@@ -3,11 +3,7 @@ import {
   persistentRedoSimulation,
   persistentUndoSimulation,
 } from 'reducers/osrdsimulation/simulation';
-import {
-  updateMustRedraw,
-  updateSelectedProjection,
-  updateSimulation,
-} from 'reducers/osrdsimulation/actions';
+import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions';
 import { useDispatch, useSelector } from 'react-redux';
 
 import SimulationResultsMap from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap';

front/src/applications/operationalStudies/views/Study.tsx

@@ -24,8 +24,8 @@ import {
   StudyResult,
   osrdEditoastApi,
 } from 'common/api/osrdEditoastApi';
+import AddOrEditStudyModal from 'modules/study/components/AddOrEditStudyModal';
 import BreadCrumbs from '../components/BreadCrumbs';
-import AddOrEditStudyModal from '../components/Study/AddOrEditStudyModal';
 import FilterTextField from '../components/FilterTextField';
 import { studyStates } from '../consts';
 

front/src/applications/rollingStockEditor/views/RollingStockEditor.tsx

@@ -8,17 +8,17 @@ import { useDispatch } from 'react-redux';
 import Loader from 'common/Loader';
 import { useTranslation } from 'react-i18next';
 import { LightRollingStock, osrdEditoastApi } from 'common/api/osrdEditoastApi';
-import RollingStockEditorButtons from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons';
-import RollingStockEditorCard from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorCard';
-import RollingStockEditorForm from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm';
+import RollingStockEditorButtons from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons';
+import RollingStockEditorCard from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorCard';
+import RollingStockEditorForm from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm';
 import { STANDARD_COMFORT_LEVEL } from 'modules/rollingStock/consts';
 import {
   updateComfortLvl,
   updateTractionMode,
   updateElectricalProfile,
   updatePowerRestriction,
 } from 'reducers/rollingstockEditor';
-import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
+import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 
 type RollingStockEditorProps = {

front/src/applications/stdcm/views/OSRDCStdcmConfig.tsx

@@ -5,8 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
 import { STDCM_REQUEST_STATUS } from 'applications/operationalStudies/consts';
-import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
-import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
+import { Itinerary, Map } from 'modules/trainschedule/components/ManageTrainSchedule';
 import ScenarioExplorer from 'common/ScenarioExplorer/ScenarioExplorer';
 import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
 import {
@@ -19,7 +18,7 @@ import {
 import { getSelectedTrain } from 'reducers/osrdsimulation/selectors';
 import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
-import STDCMAllowances from '../../../modules/allowances/components/STDCMAllowances';
+import STDCMAllowances from 'modules/stdcmAllowances/components/STDCMAllowances';
 import OSRDStdcmResults from './OSRDStdcmResults';
 import RunningTime from '../components/RunningTime';
 

front/src/common/Pathfinding/Pathfinding.tsx

@@ -33,7 +33,7 @@ import {
   getGeojson,
 } from 'reducers/osrdconf/selectors';
 
-import ModalPathJSONDetail from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail';
+import ModalPathJSONDetail from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail';
 import infraLogo from 'assets/pictures/components/tracks.svg';
 import InfraLoadingState from 'applications/operationalStudies/components/Scenario/InfraLoadingState';
 import { Spinner } from '../Loader';

front/src/modules/rollingStock/components/rollingStockEditor/AddRollingstockParam.tsx front/src/modules/rollingStock/components/RollingStockEditor/AddRollingstockParam.tsx

@@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import { setSuccess, setFailure } from 'reducers/main';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
-import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
+import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
 
 type RollingStockEditorButtonsProps = {
   rollingStock: RollingStock;

front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons.tsx front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons.tsx

@@ -9,7 +9,7 @@ import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import { useDispatch, useSelector } from 'react-redux';
 import { setFailure, setSuccess } from 'reducers/main';
 import Tabs, { TabProps } from 'common/Tabs';
-import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
+import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
 import getRollingStockEditorDefaultValues, {
   getDefaultRollingStockMode,
   rollingStockEditorQueryArg,

front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorCard.tsx front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCard.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaPlus } from 'react-icons/fa';
-import AddOrEditStudyModal from 'applications/operationalStudies/components/Study/AddOrEditStudyModal';
+import AddOrEditStudyModal from 'modules/study/components/AddOrEditStudyModal';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 
 export default function StudyCard() {

front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorCurves.tsx front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCurves.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 
 import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
 import InputSNCF from 'common/BootstrapSNCF/InputSNCF';
-import StationSelector from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleStationSelector';
+import StationSelector from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleStationSelector';
 import { setFailure } from 'reducers/main';
 import StationCard, { ImportStation } from 'common/StationCard';
 import { formatIsoDate } from 'utils/date';

front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm.tsx front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm.tsx

@@ -1,4 +1,4 @@
-import rollingstockOpenData2OSRD from 'applications/operationalStudies/components/ImportTrainSchedule/rollingstock_opendata2osrd.json';
+import rollingstockOpenData2OSRD from 'modules/trainschedule/components/ImportTrainSchedule/rollingstock_opendata2osrd.json';
 import { TrainSchedule, TrainScheduleWithPathRef } from 'applications/operationalStudies/types';
 import { Point } from './types';
 

front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormHelpers.tsx front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormHelpers.tsx

@@ -2,18 +2,18 @@ import React, { useEffect, useState } from 'react';
 import cx from 'classnames';
 
 import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';
-import Map from 'applications/operationalStudies/components/ImportTrainSchedule/Map';
+import Map from 'modules/trainschedule/components/ImportTrainSchedule/Map';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import { getRollingStockID } from 'reducers/osrdconf/selectors';
-import generatePathfindingPayload from 'applications/operationalStudies/components/ImportTrainSchedule/generatePathfindingPayload';
-import generateTrainSchedulesPayload from 'applications/operationalStudies/components/ImportTrainSchedule/generateTrainSchedulesPayload';
+import generatePathfindingPayload from 'modules/trainschedule/components/ImportTrainSchedule/generatePathfindingPayload';
+import generateTrainSchedulesPayload from 'modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayload';
 import getSimulationResults from 'applications/operationalStudies/components/Scenario/getSimulationResults';
 import {
   initialViewport,
   initialStatus,
-} from 'applications/operationalStudies/components/ImportTrainSchedule//consts';
-import { refactorUniquePaths } from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleHelpers';
+} from 'modules/trainschedule/components/ImportTrainSchedule/consts';
+import { refactorUniquePaths } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleHelpers';
 import {
   LightRollingStock,
   Path,

front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal.tsx front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import nextId from 'react-id-generator';
-import { seconds2hhmmss } from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleHelpers';
+import { seconds2hhmmss } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleHelpers';
 import { RollingStock2Img } from 'modules/rollingStock/components/RollingStockSelector';
 import { LazyLoadComponent } from 'react-lazy-load-image-component';
 import { TrainSchedule } from 'applications/operationalStudies/types';

front/src/modules/allowances/components/STDCMAllowances.tsx front/src/modules/stdcmAllowances/components/STDCMAllowances.tsx

@@ -1,12 +1,15 @@
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import Loader from 'common/Loader';
-import ImportTrainScheduleTrainDetail from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail';
-import ImportTrainScheduleModal from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModal';
+// eslint-disable-next-line import/no-cycle
+import {
+  ImportTrainScheduleTrainDetail,
+  ImportTrainScheduleModal,
+} from 'modules/trainschedule/components/ImportTrainSchedule';
 import { GoRocket } from 'react-icons/go';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import { keyBy } from 'lodash';
-import rollingstockOpenData2OSRD from 'applications/operationalStudies/components/ImportTrainSchedule/rollingstock_opendata2osrd.json';
+import rollingstockOpenData2OSRD from 'modules/trainschedule/components/ImportTrainSchedule/rollingstock_opendata2osrd.json';
 import nextId from 'react-id-generator';
 import { TrainSchedule } from 'applications/operationalStudies/types';
 import { LightRollingStock } from 'common/api/osrdEditoastApi';

front/src/applications/operationalStudies/components/Study/AddOrEditStudyModal.tsx front/src/modules/study/components/AddOrEditStudyModal.tsx

@@ -1,5 +1,5 @@
 import { compact, isEmpty } from 'lodash';
-import rollingstockOpenData2OSRD from 'applications/operationalStudies/components/ImportTrainSchedule/rollingstock_opendata2osrd.json';
+import rollingstockOpenData2OSRD from 'modules/trainschedule/components/ImportTrainSchedule/rollingstock_opendata2osrd.json';
 import { isFirstOrLastElement } from 'utils/array';
 import { Step, TrainScheduleWithPathRef } from 'applications/operationalStudies/types';
 import { LightRollingStock } from 'common/api/osrdEditoastApi';

front/src/modules/study/components/StudyCardEmpty.tsx

@@ -0,0 +1,9 @@
+/* eslint-disable import/prefer-default-export */
+// eslint-disable-next-line import/no-cycle
+export { default as ImportTrainScheduleTrainsList } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList';
+export { default as ImportTrainScheduleModal } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModal';
+export { default as ImportTrainScheduleModalFooter } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModalFooter';
+export { default as ImportTrainScheduleConfig } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig';
+export { default as ImportTrainScheduleStationSelector } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleStationSelector';
+export { default as ImportTrainScheduleTrainDetail } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail';
+export { default as Map } from 'modules/trainschedule/components/ImportTrainSchedule/Map';

front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx

@@ -6,8 +6,8 @@ import { replaceVias, updateDestination, updateOrigin } from 'reducers/osrdconf'
 import { updateFeatureInfoClick, updateViewport, Viewport } from 'reducers/map';
 import { Position } from 'geojson';
 
-import DisplayItinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary';
-import ModalSugerredVias from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias';
+import DisplayItinerary from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary';
+import ModalSugerredVias from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias';
 import { getOrigin, getDestination, getVias } from 'reducers/osrdconf/selectors';
 import { getMap } from 'reducers/map/selectors';
 import Pathfinding from 'common/Pathfinding/Pathfinding';

front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts

@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { Position } from 'geojson';
 import { useTranslation } from 'react-i18next';
 
-import DisplayVias from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayVias';
+import DisplayVias from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayVias';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import { getGeojson, getVias } from 'reducers/osrdconf/selectors';
 import { FaPlus } from 'react-icons/fa';

front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 
 import { getFeatureInfoClick } from 'reducers/osrdconf/selectors';
 import { RiMapPin2Fill, RiMapPin3Fill } from 'react-icons/ri';
-import setPointIti from 'applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti';
+import setPointIti from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti';
 import { useTranslation } from 'react-i18next';
 import { IoFlag } from 'react-icons/io5';
 

front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModalFooter.tsx front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModalFooter.tsx

@@ -18,10 +18,10 @@ import Hillshade from 'common/Map/Layers/Hillshade';
 import OSM from 'common/Map/Layers/OSM';
 import OperationalPoints from 'common/Map/Layers/OperationalPoints';
 import Platforms from 'common/Map/Layers/Platforms';
-import RenderItinerary from 'applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItinerary';
-import RenderItineraryMarkers from 'applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItineraryMarkers';
+import RenderItinerary from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItinerary';
+import RenderItineraryMarkers from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItineraryMarkers';
 /* Interactions */
-import RenderPopup from 'applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup';
+import RenderPopup from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup';
 import Routes from 'common/Map/Layers/Routes';
 import SearchMarker from 'common/Map/Layers/SearchMarker';
 import Signals from 'common/Map/Layers/Signals';