diff --git a/front/src/applications/editor/Map.tsx b/front/src/applications/editor/Map.tsx index 46ebe1d7480..c94ce612740 100644 --- a/front/src/applications/editor/Map.tsx +++ b/front/src/applications/editor/Map.tsx @@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next'; import { TFunction } from 'i18next'; import { isEmpty, isEqual } from 'lodash'; -import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers'; +import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers'; import colors from 'common/Map/Consts/colors'; import 'common/Map/Map.scss'; diff --git a/front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx b/front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx index 5a7f632d3ea..3f6a5cf9933 100644 --- a/front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx +++ b/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'; diff --git a/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx b/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx index bf72b971b78..c31e4b58904 100644 --- a/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx +++ b/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, diff --git a/front/src/applications/operationalStudies/views/Scenario.tsx b/front/src/applications/operationalStudies/views/Scenario.tsx index a349ac9ca58..8437c621e4a 100644 --- a/front/src/applications/operationalStudies/views/Scenario.tsx +++ b/front/src/applications/operationalStudies/views/Scenario.tsx @@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react'; import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF'; import logo from 'assets/pictures/home/operationalStudies.svg'; import { useTranslation } from 'react-i18next'; -import Timetable from 'applications/operationalStudies/components/Scenario/Timetable'; +import Timetable from 'modules/trainschedule/components/Timetable/Timetable'; import infraLogo from 'assets/pictures/components/tracks.svg'; import { useSelector, useDispatch } from 'react-redux'; import { MODES, MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts'; import { updateInfraID, updateMode, updateTimetableID } from 'reducers/osrdconf'; -import TimetableManageTrainSchedule from 'applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule'; +import TimetableManageTrainSchedule from 'modules/trainschedule/components/Timetable/TimetableManageTrainSchedule'; import BreadCrumbs from 'applications/operationalStudies/components/BreadCrumbs'; import { getInfraID, diff --git a/front/src/applications/operationalStudies/views/SimulationResults.tsx b/front/src/applications/operationalStudies/views/SimulationResults.tsx index 5a7a70eaa3e..a8a49161614 100644 --- a/front/src/applications/operationalStudies/views/SimulationResults.tsx +++ b/front/src/applications/operationalStudies/views/SimulationResults.tsx @@ -15,21 +15,23 @@ import { getSelectedProjection, getSelectedTrain, } from 'reducers/osrdsimulation/selectors'; -import { updateViewport, Viewport } from 'reducers/map'; -import { getTimetableID } from 'reducers/osrdconf/selectors'; -import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions'; import SimulationWarpedMap from 'common/Map/WarpedMap/SimulationWarpedMap'; -import SimulationResultsMap from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap'; -import SpaceCurvesSlopes from 'applications/operationalStudies/components/SimulationResults/SpaceCurvesSlopes'; -import SpaceTimeChartIsolated from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData'; -import SpeedSpaceChart from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart'; -import TimeButtons from 'applications/operationalStudies/components/SimulationResults/TimeButtons'; -import TimeLine from 'applications/operationalStudies/components/SimulationResults/TimeLine/TimeLine'; -import TrainDetails from 'applications/operationalStudies/components/SimulationResults/TrainDetails'; + +import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions'; + +import SimulationResultsMap from 'modules/simulationResult/components/SimulationResultsMap'; +import SpaceCurvesSlopes from 'modules/simulationResult/components/SpaceCurvesSlopes'; +import SpaceTimeChartIsolated from 'modules/simulationResult/components/SpaceTimeChart/withOSRDData'; +import SpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart'; +import TimeButtons from 'modules/simulationResult/components/TimeButtons'; +import TimeLine from 'modules/simulationResult/components/TimeLine/TimeLine'; +import TrainDetails from 'modules/simulationResult/components/TrainDetails'; import getSimulationResults from 'applications/operationalStudies/components/Scenario/getSimulationResults'; -import DriverTrainSchedule from 'applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainSchedule'; +import { updateViewport, Viewport } from 'reducers/map'; +import DriverTrainSchedule from 'modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule'; +import { getTimetableID } from 'reducers/osrdconf/selectors'; import { osrdEditoastApi } from 'common/api/osrdEditoastApi'; const MAP_MIN_HEIGHT = 450; diff --git a/front/src/applications/operationalStudies/views/Study.tsx b/front/src/applications/operationalStudies/views/Study.tsx index 2ad9a45bbc7..7dab3962025 100644 --- a/front/src/applications/operationalStudies/views/Study.tsx +++ b/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'; diff --git a/front/src/applications/referenceMap/Map.tsx b/front/src/applications/referenceMap/Map.tsx index 6d8a5fa4d62..0540857b2af 100644 --- a/front/src/applications/referenceMap/Map.tsx +++ b/front/src/applications/referenceMap/Map.tsx @@ -13,7 +13,7 @@ import { getTerrain3DExaggeration } from 'reducers/map/selectors'; /* Main data & layers */ import Background from 'common/Map/Layers/Background'; import Terrain from 'common/Map/Layers/Terrain'; -import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers'; +import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers'; import BufferStops from 'common/Map/Layers/BufferStops'; /* Settings & Buttons */ import MapButtons from 'common/Map/Buttons/MapButtons'; diff --git a/front/src/applications/rollingStockEditor/views/RollingStockEditor.tsx b/front/src/applications/rollingStockEditor/views/RollingStockEditor.tsx index 0925001fc05..8040d93ba96 100644 --- a/front/src/applications/rollingStockEditor/views/RollingStockEditor.tsx +++ b/front/src/applications/rollingStockEditor/views/RollingStockEditor.tsx @@ -8,9 +8,9 @@ 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, @@ -18,7 +18,7 @@ import { 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 = { diff --git a/front/src/applications/stdcm/views/OSRDCStdcmConfig.tsx b/front/src/applications/stdcm/views/OSRDCStdcmConfig.tsx index 889f60dc3dc..42a2f5bd78e 100644 --- a/front/src/applications/stdcm/views/OSRDCStdcmConfig.tsx +++ b/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'; diff --git a/front/src/applications/stdcm/views/OSRDStdcmResults.tsx b/front/src/applications/stdcm/views/OSRDStdcmResults.tsx index bf347e96148..e53b21b426c 100644 --- a/front/src/applications/stdcm/views/OSRDStdcmResults.tsx +++ b/front/src/applications/stdcm/views/OSRDStdcmResults.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; -import SpaceTimeChart from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData'; -import SpeedSpaceChart from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart'; +import SpaceTimeChart from 'modules/simulationResult/components/SpaceTimeChart/withOSRDData'; +import SpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; import { getPresentSimulation, getSelectedTrain } from 'reducers/osrdsimulation/selectors'; diff --git a/front/src/applications/stdcm/views/StdcmRequestModal.jsx b/front/src/applications/stdcm/views/StdcmRequestModal.jsx index 727ee1f44dd..e1f103296fc 100644 --- a/front/src/applications/stdcm/views/StdcmRequestModal.jsx +++ b/front/src/applications/stdcm/views/StdcmRequestModal.jsx @@ -10,7 +10,7 @@ import { } from 'reducers/osrdsimulation/actions'; import { useDispatch, useSelector } from 'react-redux'; -import { KEY_VALUES_FOR_CONSOLIDATED_SIMULATION } from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; +import { KEY_VALUES_FOR_CONSOLIDATED_SIMULATION } from 'modules/simulationResult/components/simulationResultsConsts'; import { getConf } from 'reducers/osrdconf/selectors'; // Generic components import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF'; @@ -18,7 +18,7 @@ import ModalHeaderSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalHeaderSNCF'; import PropTypes from 'prop-types'; import ReactModal from 'react-modal'; // OSRD helpers -import createTrain from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain'; +import createTrain from 'modules/simulationResult/components/SpaceTimeChart/createTrain'; import formatStdcmConf from 'applications/stdcm/formatStcmConf'; // Static Data and Assets import { setFailure } from 'reducers/main'; diff --git a/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx b/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx index 5795b40ae7c..8c8c6b1a569 100644 --- a/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx +++ b/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx @@ -17,7 +17,7 @@ import { LayerType } from 'applications/editor/tools/types'; import DataLoader from 'common/Map/WarpedMap/DataLoader'; import getWarping, { WarpingFunction } from 'common/Map/WarpedMap/getWarping'; import WarpedMap from 'common/Map/WarpedMap/WarpedMap'; -import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types'; +import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types'; import { getInfraID } from 'reducers/osrdconf/selectors'; import { getImprovedOSRDData } from 'common/Map/WarpedMap/core/helpers'; import { @@ -27,7 +27,7 @@ import { } from 'reducers/osrdsimulation/selectors'; import { Train } from 'reducers/osrdsimulation/types'; import { AsyncMemoState, getAsyncMemoData, useAsyncMemo } from 'utils/useAsyncMemo'; -import { getSimulationHoverPositions } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/helpers'; +import { getSimulationHoverPositions } from 'modules/simulationResult/components/SimulationResultsMap/helpers'; import { clip } from 'utils/mapHelper'; import './SimulationWarpedMap.scss'; diff --git a/front/src/common/Map/WarpedMap/WarpedMap.tsx b/front/src/common/Map/WarpedMap/WarpedMap.tsx index 8e23dd43f75..c154791c097 100644 --- a/front/src/common/Map/WarpedMap/WarpedMap.tsx +++ b/front/src/common/Map/WarpedMap/WarpedMap.tsx @@ -12,10 +12,10 @@ import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder'; import colors from 'common/Map/Consts/colors'; import { ALL_SIGNAL_LAYERS } from 'common/Map/Consts/SignalsNames'; import { LayerType } from 'applications/editor/tools/types'; -import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types'; -import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers'; -import RenderItinerary from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/RenderItinerary'; -import TrainHoverPosition from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/TrainHoverPosition'; +import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types'; +import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers'; +import RenderItinerary from 'modules/simulationResult/components/SimulationResultsMap/RenderItinerary'; +import TrainHoverPosition from 'modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition'; import { LayerContext } from 'common/Map/Layers/types'; import { EditorSource, SourcesDefinitionsIndex } from 'common/Map/Layers/GeoJSONs'; import OrderedLayer, { OrderedLayerProps } from 'common/Map/Layers/OrderedLayer'; diff --git a/front/src/common/Pathfinding/Pathfinding.tsx b/front/src/common/Pathfinding/Pathfinding.tsx index 19a8fc21823..2671ec87e66 100644 --- a/front/src/common/Pathfinding/Pathfinding.tsx +++ b/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'; diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/AddRollingstockParam.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/AddRollingstockParam.tsx similarity index 100% rename from front/src/modules/rollingStock/components/rollingStockEditor/AddRollingstockParam.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/AddRollingstockParam.tsx diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons.tsx similarity index 98% rename from front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons.tsx index 6c0c106beee..c5c4c27c054 100644 --- a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons.tsx +++ b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons.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; diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorCard.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCard.tsx similarity index 100% rename from front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorCard.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCard.tsx diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorCurves.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCurves.tsx similarity index 100% rename from front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorCurves.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCurves.tsx diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm.tsx similarity index 99% rename from front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm.tsx index a5a71b62efb..58d90579380 100644 --- a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm.tsx +++ b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm.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, diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormHelpers.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormHelpers.tsx similarity index 100% rename from front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormHelpers.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormHelpers.tsx diff --git a/front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal.tsx b/front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal.tsx similarity index 100% rename from front/src/modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal.tsx rename to front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers.ts b/front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts similarity index 99% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers.ts rename to front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts index 9c273e2c656..504fcd28aac 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers.ts +++ b/front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts @@ -15,7 +15,7 @@ import { Stop, SimulationD3Scale, } from 'reducers/osrdsimulation/types'; -import { TIME } from '../simulationResultsConsts'; +import { TIME } from 'modules/simulationResult/components/simulationResultsConsts'; export function sec2d3datetime(time: number) { return d3.timeParse('%H:%M:%S')(sec2time(time)); diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/__tests__/ChartHelpers.spec.ts b/front/src/modules/simulationResult/components/ChartHelpers/__tests__/ChartHelpers.spec.ts similarity index 94% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/__tests__/ChartHelpers.spec.ts rename to front/src/modules/simulationResult/components/ChartHelpers/__tests__/ChartHelpers.spec.ts index 324e9844902..56a7f08caa2 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/__tests__/ChartHelpers.spec.ts +++ b/front/src/modules/simulationResult/components/ChartHelpers/__tests__/ChartHelpers.spec.ts @@ -1,13 +1,13 @@ import { SimulationTrain } from 'reducers/osrdsimulation/types'; +import { LIST_VALUES_NAME_SPACE_TIME } from 'modules/simulationResult/components/simulationResultsConsts'; import { mergeDatasArea, interpolateOnTime, trainWithDepartureAndArrivalTimes, } from '../ChartHelpers'; -import { LIST_VALUES_NAME_SPACE_TIME } from '../../simulationResultsConsts'; -import train from '../../../../../../../tests/assets/operationStudies/trainExample'; -import simulationTrain from '../../../../../../../tests/assets/operationStudies/simulationTrain'; +import train from '../../../../../../tests/assets/operationStudies/trainExample'; +import simulationTrain from '../../../../../../tests/assets/operationStudies/simulationTrain'; describe('mergeDatasArea', () => { test('avoid crash', () => { diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart.ts b/front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts similarity index 93% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart.ts rename to front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts index 794e0bc5b50..e19d7c2c22a 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart.ts +++ b/front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts @@ -1,12 +1,8 @@ import * as d3 from 'd3'; import { select as d3select } from 'd3-selection'; -import { - gridX, - gridY, - isGET, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +import { gridX, gridY, isGET } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import nextId from 'react-id-generator'; -import svgDefs from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/svgDefs'; +import svgDefs from 'modules/simulationResult/components/ChartHelpers/svgDefs'; import { Chart, SimulationD3Scale } from 'reducers/osrdsimulation/types'; // keyValues ['position', 'gradient'] diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawArea.ts b/front/src/modules/simulationResult/components/ChartHelpers/drawArea.ts similarity index 91% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawArea.ts rename to front/src/modules/simulationResult/components/ChartHelpers/drawArea.ts index 003b29645f0..e9568cdee02 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawArea.ts +++ b/front/src/modules/simulationResult/components/ChartHelpers/drawArea.ts @@ -1,7 +1,7 @@ import * as d3 from 'd3'; import { isEmpty } from 'lodash'; import { Chart } from 'reducers/osrdsimulation/types'; -import { AreaBlock } from '../SpeedSpaceChart/prepareData'; +import { AreaBlock } from 'modules/simulationResult/components/SpeedSpaceChart/prepareData'; /** * Draw area for the SpeedSpaceChart or the SpaceCurvesSlopesChart diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawCurve.jsx b/front/src/modules/simulationResult/components/ChartHelpers/drawCurve.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawCurve.jsx rename to front/src/modules/simulationResult/components/ChartHelpers/drawCurve.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawElectricalProfile.jsx b/front/src/modules/simulationResult/components/ChartHelpers/drawElectricalProfile.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawElectricalProfile.jsx rename to front/src/modules/simulationResult/components/ChartHelpers/drawElectricalProfile.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawGuideLines.ts b/front/src/modules/simulationResult/components/ChartHelpers/drawGuideLines.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawGuideLines.ts rename to front/src/modules/simulationResult/components/ChartHelpers/drawGuideLines.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawPowerRestriction.jsx b/front/src/modules/simulationResult/components/ChartHelpers/drawPowerRestriction.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawPowerRestriction.jsx rename to front/src/modules/simulationResult/components/ChartHelpers/drawPowerRestriction.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawRect.ts b/front/src/modules/simulationResult/components/ChartHelpers/drawRect.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawRect.ts rename to front/src/modules/simulationResult/components/ChartHelpers/drawRect.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawText.ts b/front/src/modules/simulationResult/components/ChartHelpers/drawText.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawText.ts rename to front/src/modules/simulationResult/components/ChartHelpers/drawText.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity.jsx b/front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.jsx similarity index 98% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity.jsx rename to front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.jsx index 841de9e1307..9281ff9cdbe 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity.jsx +++ b/front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.jsx @@ -8,7 +8,7 @@ import { interpolateOnPosition, interpolateOnTime, isGET, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import { updateContextMenu, updateMustRedraw, @@ -18,8 +18,8 @@ import { datetime2sec, sec2datetime } from 'utils/timeManipulation'; import { LIST_VALUES_NAME_SPACE_TIME, LIST_VALUES_NAME_SPEED_SPACE, -} from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; -import drawGuideLines from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawGuideLines'; +} from 'modules/simulationResult/components/simulationResultsConsts'; +import drawGuideLines from 'modules/simulationResult/components/ChartHelpers/drawGuideLines'; import { store } from 'Store'; export const displayGuide = (chart, opacity) => { diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/svgDefs.jsx b/front/src/modules/simulationResult/components/ChartHelpers/svgDefs.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/svgDefs.jsx rename to front/src/modules/simulationResult/components/ChartHelpers/svgDefs.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartModal/ChartModal.jsx b/front/src/modules/simulationResult/components/ChartModal/ChartModal.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartModal/ChartModal.jsx rename to front/src/modules/simulationResult/components/ChartModal/ChartModal.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ChartModal/index.jsx b/front/src/modules/simulationResult/components/ChartModal/index.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ChartModal/index.jsx rename to front/src/modules/simulationResult/components/ChartModal/index.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/ContextMenu.jsx b/front/src/modules/simulationResult/components/ContextMenu.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/ContextMenu.jsx rename to front/src/modules/simulationResult/components/ContextMenu.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap.tsx similarity index 96% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap.tsx rename to front/src/modules/simulationResult/components/SimulationResultsMap.tsx index 6673ba9b15c..c214a8bff66 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap.tsx +++ b/front/src/modules/simulationResult/components/SimulationResultsMap.tsx @@ -16,12 +16,12 @@ import { getPresentSimulation, getSelectedTrain } from 'reducers/osrdsimulation/ import { PositionSpeedTime, Train } from 'reducers/osrdsimulation/types'; import { updateViewport, Viewport } from 'reducers/map'; import { RootState } from 'reducers'; -import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types'; +import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types'; /* Main data & layers */ import Background from 'common/Map/Layers/Background'; import BufferStops from 'common/Map/Layers/BufferStops'; -import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers'; +import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers'; /* Settings & Buttons */ import MapButtons from 'common/Map/Buttons/MapButtons'; import Detectors from 'common/Map/Layers/Detectors'; @@ -31,7 +31,7 @@ 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/SimulationResults/SimulationResultsMap/RenderItinerary'; +import RenderItinerary from 'modules/simulationResult/components/SimulationResultsMap/RenderItinerary'; import Routes from 'common/Map/Layers/Routes'; import SearchMarker from 'common/Map/Layers/SearchMarker'; import Signals from 'common/Map/Layers/Signals'; @@ -42,7 +42,7 @@ import TracksGeographic from 'common/Map/Layers/TracksGeographic'; import TracksOSM from 'common/Map/Layers/TracksOSM'; import TracksSchematic from 'common/Map/Layers/TracksSchematic'; /* Interactions */ -import TrainHoverPosition from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/TrainHoverPosition'; +import TrainHoverPosition from 'modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition'; import colors from 'common/Map/Consts/colors'; import { datetime2Isostring } from 'utils/timeManipulation'; @@ -50,7 +50,7 @@ import osmBlankStyle from 'common/Map/Layers/osmBlankStyle'; import { getDirection, interpolateOnPosition, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder'; import 'common/Map/Map.scss'; diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/RenderItinerary.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap/RenderItinerary.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/RenderItinerary.tsx rename to front/src/modules/simulationResult/components/SimulationResultsMap/RenderItinerary.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/TrainHoverPosition.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/TrainHoverPosition.tsx rename to front/src/modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap/VirtualLayers.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers.tsx rename to front/src/modules/simulationResult/components/SimulationResultsMap/VirtualLayers.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/__tests__/TrainHoverPosition.spec.ts.off b/front/src/modules/simulationResult/components/SimulationResultsMap/__tests__/TrainHoverPosition.spec.ts.off similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/__tests__/TrainHoverPosition.spec.ts.off rename to front/src/modules/simulationResult/components/SimulationResultsMap/__tests__/TrainHoverPosition.spec.ts.off diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/helpers.ts b/front/src/modules/simulationResult/components/SimulationResultsMap/helpers.ts similarity index 97% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/helpers.ts rename to front/src/modules/simulationResult/components/SimulationResultsMap/helpers.ts index 7ef8ba96ac2..c392003656e 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/helpers.ts +++ b/front/src/modules/simulationResult/components/SimulationResultsMap/helpers.ts @@ -10,7 +10,7 @@ import { SimulationSnapshot, } from 'reducers/osrdsimulation/types'; import { datetime2sec, timeString2datetime } from 'utils/timeManipulation'; -import { interpolateOnTime } from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +import { interpolateOnTime } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import { TrainPosition } from './types'; export type InterpoledTrain = { diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types.ts b/front/src/modules/simulationResult/components/SimulationResultsMap/types.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types.ts rename to front/src/modules/simulationResult/components/SimulationResultsMap/types.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceCurvesSlopes.jsx b/front/src/modules/simulationResult/components/SpaceCurvesSlopes.jsx similarity index 90% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceCurvesSlopes.jsx rename to front/src/modules/simulationResult/components/SpaceCurvesSlopes.jsx index c2ac040b78b..87da463df26 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpaceCurvesSlopes.jsx +++ b/front/src/modules/simulationResult/components/SpaceCurvesSlopes.jsx @@ -4,21 +4,21 @@ import React, { useEffect, useRef, useState } from 'react'; import { defineLinear, mergeDatasAreaConstant, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import enableInteractivity, { traceVerticalLine, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity'; +} from 'modules/simulationResult/components/ChartHelpers/enableInteractivity'; import { useDispatch, useSelector } from 'react-redux'; import { CgLoadbar } from 'react-icons/cg'; -import { LIST_VALUES_NAME_SPACE_CURVES_SLOPES } from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; +import { LIST_VALUES_NAME_SPACE_CURVES_SLOPES } from 'modules/simulationResult/components/simulationResultsConsts'; import PropTypes from 'prop-types'; import { createCurveCurve, createSlopeCurve, -} from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/utils'; -import defineChart from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart'; -import drawArea from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawArea'; -import drawCurve from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawCurve'; +} from 'modules/simulationResult/components/SpeedSpaceChart/utils'; +import defineChart from 'modules/simulationResult/components/ChartHelpers/defineChart'; +import drawArea from 'modules/simulationResult/components/ChartHelpers/drawArea'; +import drawCurve from 'modules/simulationResult/components/ChartHelpers/drawCurve'; import { updateMustRedraw } from 'reducers/osrdsimulation/actions'; import { getSelectedTrain } from 'reducers/osrdsimulation/selectors'; diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/SpaceTimeChart.tsx b/front/src/modules/simulationResult/components/SpaceTimeChart/SpaceTimeChart.tsx similarity index 93% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/SpaceTimeChart.tsx rename to front/src/modules/simulationResult/components/SpaceTimeChart/SpaceTimeChart.tsx index f7a80598bdb..4886c6e6e3e 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/SpaceTimeChart.tsx +++ b/front/src/modules/simulationResult/components/SpaceTimeChart/SpaceTimeChart.tsx @@ -6,23 +6,23 @@ import { updatePointers, displayGuide, traceVerticalLine, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity'; +} from 'modules/simulationResult/components/ChartHelpers/enableInteractivity'; import { Rnd } from 'react-rnd'; import { timeShiftTrain, interpolateOnTime, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; -import ORSD_GRAPH_SAMPLE_DATA from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/sampleData'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; +import ORSD_GRAPH_SAMPLE_DATA from 'modules/simulationResult/components/SpeedSpaceChart/sampleData'; import { CgLoadbar } from 'react-icons/cg'; -import ChartModal from 'applications/operationalStudies/components/SimulationResults/ChartModal'; +import ChartModal from 'modules/simulationResult/components/ChartModal'; import { GiResize } from 'react-icons/gi'; import { KEY_VALUES_FOR_SPACE_TIME_CHART, LIST_VALUES_NAME_SPACE_TIME, -} from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; -import { isolatedCreateTrain as createTrain } from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain'; +} from 'modules/simulationResult/components/simulationResultsConsts'; +import { isolatedCreateTrain as createTrain } from 'modules/simulationResult/components/SpaceTimeChart/createTrain'; -import { drawAllTrains } from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/d3Helpers'; +import { drawAllTrains } from 'modules/simulationResult/components/SpaceTimeChart/d3Helpers'; import { AllowancesSettings, Chart, diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createChart.ts b/front/src/modules/simulationResult/components/SpaceTimeChart/createChart.ts similarity index 89% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createChart.ts rename to front/src/modules/simulationResult/components/SpaceTimeChart/createChart.ts index 45eb13f2a1d..3ba5f4271d6 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createChart.ts +++ b/front/src/modules/simulationResult/components/SpaceTimeChart/createChart.ts @@ -6,8 +6,8 @@ import { defineLinear, defineTime, isGET, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; -import defineChart from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; +import defineChart from 'modules/simulationResult/components/ChartHelpers/defineChart'; // This is only used by SpaceTimeChart for now. export default function createChart( diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain.ts b/front/src/modules/simulationResult/components/SpaceTimeChart/createTrain.ts similarity index 97% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain.ts rename to front/src/modules/simulationResult/components/SpaceTimeChart/createTrain.ts index 97cbd7c6289..0f0581dce1d 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain.ts +++ b/front/src/modules/simulationResult/components/SpaceTimeChart/createTrain.ts @@ -7,7 +7,7 @@ import { formatStepsWithTime, formatStepsWithTimeMulti, mergeDatasArea, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import { setFailure } from 'reducers/main'; import { Train, SimulationTrain } from 'reducers/osrdsimulation/types'; diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/d3Helpers.ts b/front/src/modules/simulationResult/components/SpaceTimeChart/d3Helpers.ts similarity index 93% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/d3Helpers.ts rename to front/src/modules/simulationResult/components/SpaceTimeChart/d3Helpers.ts index f41922e5b8f..6ce44caec8c 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/d3Helpers.ts +++ b/front/src/modules/simulationResult/components/SpaceTimeChart/d3Helpers.ts @@ -1,5 +1,5 @@ -import drawTrain from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/drawTrain'; -import createChart from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createChart'; +import drawTrain from 'modules/simulationResult/components/SpaceTimeChart/drawTrain'; +import createChart from 'modules/simulationResult/components/SpaceTimeChart/createChart'; import { AllowancesSettings, Chart, diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/drawTrain.ts b/front/src/modules/simulationResult/components/SpaceTimeChart/drawTrain.ts similarity index 93% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/drawTrain.ts rename to front/src/modules/simulationResult/components/SpaceTimeChart/drawTrain.ts index f7b3e9de838..2d8fc7ee85f 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/drawTrain.ts +++ b/front/src/modules/simulationResult/components/SpaceTimeChart/drawTrain.ts @@ -4,10 +4,10 @@ import { drag as d3drag, DragContainerElement } from 'd3-drag'; import { getDirection, makeTrainList, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; -import drawCurve from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawCurve'; -import drawRect from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawRect'; -import drawText from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawText'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; +import drawCurve from 'modules/simulationResult/components/ChartHelpers/drawCurve'; +import drawRect from 'modules/simulationResult/components/ChartHelpers/drawRect'; +import drawText from 'modules/simulationResult/components/ChartHelpers/drawText'; import { AllowancesSettings, Chart, diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/types.ts b/front/src/modules/simulationResult/components/SpaceTimeChart/types.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/types.ts rename to front/src/modules/simulationResult/components/SpaceTimeChart/types.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData.tsx b/front/src/modules/simulationResult/components/SpaceTimeChart/withOSRDData.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData.tsx rename to front/src/modules/simulationResult/components/SpaceTimeChart/withOSRDData.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/ElectricalProfilesLegend.tsx b/front/src/modules/simulationResult/components/SpeedSpaceChart/ElectricalProfilesLegend.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/ElectricalProfilesLegend.tsx rename to front/src/modules/simulationResult/components/SpeedSpaceChart/ElectricalProfilesLegend.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart.tsx b/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart.tsx similarity index 96% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart.tsx rename to front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart.tsx index 292c769ab5e..4e0857288f7 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart.tsx +++ b/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart.tsx @@ -6,15 +6,15 @@ import { Rnd } from 'react-rnd'; import { isolatedEnableInteractivity, traceVerticalLine, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity'; +} from 'modules/simulationResult/components/ChartHelpers/enableInteractivity'; import { LIST_VALUES_NAME_SPEED_SPACE, SPEED_SPACE_CHART_KEY_VALUES, -} from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; +} from 'modules/simulationResult/components/simulationResultsConsts'; import { createChart, drawTrain, -} from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/d3Helpers'; +} from 'modules/simulationResult/components/SpeedSpaceChart/d3Helpers'; import { SpeedSpaceChart, SpeedSpaceSettingsType, Train } from 'reducers/osrdsimulation/types'; import { useDispatch, useSelector } from 'react-redux'; import { diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceSettings.tsx b/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceSettings.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceSettings.tsx rename to front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceSettings.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/d3Helpers.ts b/front/src/modules/simulationResult/components/SpeedSpaceChart/d3Helpers.ts similarity index 92% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/d3Helpers.ts rename to front/src/modules/simulationResult/components/SpeedSpaceChart/d3Helpers.ts index ad502685221..e58e0d66012 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/d3Helpers.ts +++ b/front/src/modules/simulationResult/components/SpeedSpaceChart/d3Helpers.ts @@ -1,7 +1,7 @@ -import drawArea from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawArea'; -import drawCurve from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawCurve'; -import defineChart from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart'; -import { defineLinear } from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +import drawArea from 'modules/simulationResult/components/ChartHelpers/drawArea'; +import drawCurve from 'modules/simulationResult/components/ChartHelpers/drawCurve'; +import defineChart from 'modules/simulationResult/components/ChartHelpers/defineChart'; +import { defineLinear } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import * as d3 from 'd3'; import { createProfileSegment, @@ -9,9 +9,9 @@ import { } from 'applications/operationalStudies/consts'; import { isEmpty } from 'lodash'; import { Chart, SpeedSpaceChart, SpeedSpaceSettingsType } from 'reducers/osrdsimulation/types'; -import drawElectricalProfile from '../ChartHelpers/drawElectricalProfile'; +import drawElectricalProfile from 'modules/simulationResult/components/ChartHelpers/drawElectricalProfile'; +import drawPowerRestriction from 'modules/simulationResult/components/ChartHelpers/drawPowerRestriction'; import { POSITION, SPEED, SPEED_SPACE_CHART_KEY_VALUES } from '../simulationResultsConsts'; -import drawPowerRestriction from '../ChartHelpers/drawPowerRestriction'; import { GevPreparedata } from './prepareData'; /** diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/prepareData.ts b/front/src/modules/simulationResult/components/SpeedSpaceChart/prepareData.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/prepareData.ts rename to front/src/modules/simulationResult/components/SpeedSpaceChart/prepareData.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/sampleData.ts b/front/src/modules/simulationResult/components/SpeedSpaceChart/sampleData.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/sampleData.ts rename to front/src/modules/simulationResult/components/SpeedSpaceChart/sampleData.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/utils.ts b/front/src/modules/simulationResult/components/SpeedSpaceChart/utils.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/utils.ts rename to front/src/modules/simulationResult/components/SpeedSpaceChart/utils.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/TimeButtons.jsx b/front/src/modules/simulationResult/components/TimeButtons.jsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/TimeButtons.jsx rename to front/src/modules/simulationResult/components/TimeButtons.jsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/TimeLine/TimeLine.jsx b/front/src/modules/simulationResult/components/TimeLine/TimeLine.jsx similarity index 97% rename from front/src/applications/operationalStudies/components/SimulationResults/TimeLine/TimeLine.jsx rename to front/src/modules/simulationResult/components/TimeLine/TimeLine.jsx index 11bcdb57d66..2abb576cb67 100644 --- a/front/src/applications/operationalStudies/components/SimulationResults/TimeLine/TimeLine.jsx +++ b/front/src/modules/simulationResult/components/TimeLine/TimeLine.jsx @@ -2,10 +2,7 @@ import { noop } from 'lodash'; import * as d3 from 'd3'; import React, { useEffect, useRef, useState } from 'react'; -import { - getDirection, - gridX, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +import { getDirection, gridX } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import { sec2datetime, time2datetime } from 'utils/timeManipulation'; import { updateChart, updateMustRedraw } from 'reducers/osrdsimulation/actions'; import { getSelectedTrainId } from 'reducers/osrdsimulation/selectors'; diff --git a/front/src/applications/operationalStudies/components/SimulationResults/TrainDetails.tsx b/front/src/modules/simulationResult/components/TrainDetails.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/TrainDetails.tsx rename to front/src/modules/simulationResult/components/TrainDetails.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/simulationResultsConsts.ts b/front/src/modules/simulationResult/components/simulationResultsConsts.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/simulationResultsConsts.ts rename to front/src/modules/simulationResult/components/simulationResultsConsts.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/simulationResultsHelpers.ts b/front/src/modules/simulationResult/components/simulationResultsHelpers.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/simulationResultsHelpers.ts rename to front/src/modules/simulationResult/components/simulationResultsHelpers.ts diff --git a/front/src/modules/allowances/components/STDCMAllowances.tsx b/front/src/modules/stdcmAllowances/components/STDCMAllowances.tsx similarity index 100% rename from front/src/modules/allowances/components/STDCMAllowances.tsx rename to front/src/modules/stdcmAllowances/components/STDCMAllowances.tsx diff --git a/front/src/applications/operationalStudies/components/Study/AddOrEditStudyModal.tsx b/front/src/modules/study/components/AddOrEditStudyModal.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/Study/AddOrEditStudyModal.tsx rename to front/src/modules/study/components/AddOrEditStudyModal.tsx diff --git a/front/src/modules/study/components/StudyCardEmpty.tsx b/front/src/modules/study/components/StudyCardEmpty.tsx index 0137d25bc84..5143a25fdcb 100644 --- a/front/src/modules/study/components/StudyCardEmpty.tsx +++ b/front/src/modules/study/components/StudyCardEmpty.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() { diff --git a/front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainSchedule.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainSchedule.tsx rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleHeader.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleHeader.tsx rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleHelpers.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHelpers.ts similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleHelpers.ts rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHelpers.ts diff --git a/front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleStop.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStop.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleStop.tsx rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStop.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleStopList.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleStopList.tsx rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx diff --git a/front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleTypes.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleTypes.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainScheduleTypes.tsx rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleTypes.tsx diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx similarity index 98% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx index 1f507e66cda..7b73f0736f0 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.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'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts similarity index 94% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts index 868e3eca83e..4449160213f 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleHelpers.ts @@ -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'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx similarity index 95% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx index a7bc17f3bfa..94a80ee3eb8 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModal.tsx +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModal.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, diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModalFooter.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModalFooter.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleModalFooter.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleModalFooter.tsx diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleStationSelector.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleStationSelector.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleStationSelector.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleStationSelector.tsx diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail.tsx similarity index 96% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail.tsx index d267dae95cf..e8a91d5a166 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail.tsx +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail.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'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx similarity index 88% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx index b4538bf34b0..6e50df6b384 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.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'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/Map.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/Map.tsx similarity index 97% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/Map.tsx rename to front/src/modules/trainschedule/components/ImportTrainSchedule/Map.tsx index 463a1fd4337..8f459fe753b 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/Map.tsx +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/Map.tsx @@ -10,7 +10,7 @@ import turfNearestPointOnLine, { NearestPointOnLine } from '@turf/nearest-point- /* Main data & layers */ import Background from 'common/Map/Layers/Background'; -import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers'; +import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers'; import SnappedMarker from 'common/Map/Layers/SnappedMarker'; /* Objects & various */ import TracksGeographic from 'common/Map/Layers/TracksGeographic'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/consts.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/consts.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/consts.ts rename to front/src/modules/trainschedule/components/ImportTrainSchedule/consts.ts diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/generatePathfindingPayload.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/generatePathfindingPayload.ts similarity index 96% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/generatePathfindingPayload.ts rename to front/src/modules/trainschedule/components/ImportTrainSchedule/generatePathfindingPayload.ts index a4eeb1723b0..c2d7feae21e 100644 --- a/front/src/applications/operationalStudies/components/ImportTrainSchedule/generatePathfindingPayload.ts +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/generatePathfindingPayload.ts @@ -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'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/generateTrainSchedulesPayload.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayload.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/generateTrainSchedulesPayload.ts rename to front/src/modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayload.ts diff --git a/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts new file mode 100644 index 00000000000..9e091c2e087 --- /dev/null +++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts @@ -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'; diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/rollingstock_opendata2osrd.json b/front/src/modules/trainschedule/components/ImportTrainSchedule/rollingstock_opendata2osrd.json similarity index 100% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/rollingstock_opendata2osrd.json rename to front/src/modules/trainschedule/components/ImportTrainSchedule/rollingstock_opendata2osrd.json diff --git a/front/src/applications/operationalStudies/components/ImportTrainSchedule/types.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/types.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ImportTrainSchedule/types.ts rename to front/src/modules/trainschedule/components/ImportTrainSchedule/types.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/Allowances.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/Allowances.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/Allowances.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/Allowances.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesActions.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesActions.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesActions.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesActions.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesLinearView.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesLinearView.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesLinearView.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesLinearView.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesList.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesList.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesList.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesList.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesListItem.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesListItem.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesListItem.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesListItem.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesModalOP.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesModalOP.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesModalOP.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesModalOP.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesStandardSettings.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesStandardSettings.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/AllowancesStandardSettings.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/AllowancesStandardSettings.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/consts.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/consts.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/consts.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/consts.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/helpers.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/helpers.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/helpers.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/helpers.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/types.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/types.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Allowances/types.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Allowances/types.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/ElectricalProfiles.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ElectricalProfiles.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/ElectricalProfiles.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/ElectricalProfiles.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary.tsx similarity index 92% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary.tsx index 69751704c27..ae02d1763ff 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary.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'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Destination.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Origin.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Origin.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Origin.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Origin.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Vias.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Vias.tsx similarity index 92% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Vias.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Vias.tsx index 259ebca153b..76290beb36a 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Vias.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/Vias.tsx @@ -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'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/index.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/index.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayItinerary/index.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayItinerary/index.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayVias.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayVias.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/DisplayVias.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayVias.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItinerary.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItinerary.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItinerary.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItinerary.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItineraryMarkers.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItineraryMarkers.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItineraryMarkers.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderItineraryMarkers.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx similarity index 95% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx index 1cc777f282d..bbe246cef80 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.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'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Map.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx similarity index 96% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/Map.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx index 50ded61f8bc..8e58a98a1af 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/Map.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx @@ -9,7 +9,7 @@ import { updateFeatureInfoClickOSRD } from 'reducers/osrdconf'; import { updateViewport, Viewport } from 'reducers/map'; /* Main data & layers */ import Background from 'common/Map/Layers/Background'; -import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers'; +import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers'; /* Settings & Buttons */ import MapButtons from 'common/Map/Buttons/MapButtons'; import Catenaries from 'common/Map/Layers/Catenaries'; @@ -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'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/PowerRestrictionsSelector.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/PowerRestrictionsSelector.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/SubmitConfAddTrainSchedule.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/SubmitConfAddTrainSchedule.tsx similarity index 94% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/SubmitConfAddTrainSchedule.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/SubmitConfAddTrainSchedule.tsx index 1f3ec89d812..b0a8dbce1bc 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/SubmitConfAddTrainSchedule.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/SubmitConfAddTrainSchedule.tsx @@ -6,8 +6,8 @@ import { useTranslation } from 'react-i18next'; import { setFailure, setSuccess } from 'reducers/main'; import { time2sec, sec2time } from 'utils/timeManipulation'; import getSimulationResults from 'applications/operationalStudies/components/Scenario/getSimulationResults'; -import formatConf from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/formatConf'; -import trainNameWithNum from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/trainNameHelper'; +import formatConf from 'modules/trainschedule/components/ManageTrainSchedule/helpers/formatConf'; +import trainNameWithNum from 'modules/trainschedule/components/ManageTrainSchedule/helpers/trainNameHelper'; import { Infra, TrainScheduleBatchItem, osrdEditoastApi } from 'common/api/osrdEditoastApi'; import { updateReloadTimetable } from 'reducers/osrdsimulation/actions'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules.tsx similarity index 97% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules.tsx index 165938a7977..720ecfeb1fa 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules.tsx +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import formatConf from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/formatConf'; +import formatConf from 'modules/trainschedule/components/ManageTrainSchedule/helpers/formatConf'; import { setFailure, setSuccess } from 'reducers/main'; import { store } from 'Store'; import getSimulationResults from 'applications/operationalStudies/components/Scenario/getSimulationResults'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/TrainAddingSettings.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/TrainAddingSettings.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/TrainSettings.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/TrainSettings.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/TrainSettings.tsx rename to front/src/modules/trainschedule/components/ManageTrainSchedule/TrainSettings.tsx diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/formatConf.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/formatConf.ts similarity index 96% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/formatConf.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/formatConf.ts index 9366e9f2057..a41fe5aac16 100644 --- a/front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/formatConf.ts +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/formatConf.ts @@ -1,7 +1,7 @@ import { isEmpty } from 'lodash'; import { Dispatch } from 'redux'; import { OsrdConfState, PowerRestrictionRange } from 'applications/operationalStudies/consts'; -import { NO_POWER_RESTRICTION } from 'applications/operationalStudies/components/ManageTrainSchedule/PowerRestrictionsSelector'; +import { NO_POWER_RESTRICTION } from 'modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector'; import { setFailure } from 'reducers/main'; import { time2sec } from 'utils/timeManipulation'; import { kmh2ms } from 'utils/physics'; diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/trainNameHelper.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/trainNameHelper.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/trainNameHelper.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/trainNameHelper.ts diff --git a/front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/trainsDurationsIntervals.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/trainsDurationsIntervals.ts similarity index 100% rename from front/src/applications/operationalStudies/components/ManageTrainSchedule/helpers/trainsDurationsIntervals.ts rename to front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/trainsDurationsIntervals.ts diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/index.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/index.ts new file mode 100644 index 00000000000..176fb4c8e57 --- /dev/null +++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/index.ts @@ -0,0 +1,9 @@ +/* eslint-disable import/prefer-default-export */ +export { default as Itinerary } from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary'; +export { default as Map } from 'modules/trainschedule/components/ManageTrainSchedule/Map'; +export { default as PowerRestrictionsSelector } from 'modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector'; +export { default as SubmitConfAddTrainSchedule } from 'modules/trainschedule/components/ManageTrainSchedule/SubmitConfAddTrainSchedule'; +export { default as SubmitConfUpdateTrainSchedules } from 'modules/trainschedule/components/ManageTrainSchedule/SubmitConfUpdateTrainSchedules'; +export { default as TrainAddingSettings } from 'modules/trainschedule/components/ManageTrainSchedule/TrainAddingSettings'; +export { default as TrainSettings } from 'modules/trainschedule/components/ManageTrainSchedule/TrainSettings'; +export { default as ElectricalProfiles } from 'modules/trainschedule/components/ManageTrainSchedule/ElectricalProfiles'; diff --git a/front/src/applications/operationalStudies/components/Scenario/Timetable.tsx b/front/src/modules/trainschedule/components/Timetable/Timetable.tsx similarity index 97% rename from front/src/applications/operationalStudies/components/Scenario/Timetable.tsx rename to front/src/modules/trainschedule/components/Timetable/Timetable.tsx index 4f228cc34ef..928e8d85b62 100644 --- a/front/src/applications/operationalStudies/components/Scenario/Timetable.tsx +++ b/front/src/modules/trainschedule/components/Timetable/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'; @@ -37,9 +37,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 getSimulationResults from './getSimulationResults'; +import findTrainsDurationsIntervals from 'modules/trainschedule/components/ManageTrainSchedule/helpers/trainsDurationsIntervals'; +import getSimulationResults from '../../../../applications/operationalStudies/components/Scenario/getSimulationResults'; import TimetableTrainCard from './TimetableTrainCard'; -import findTrainsDurationsIntervals from '../ManageTrainSchedule/helpers/trainsDurationsIntervals'; type Props = { setDisplayTrainScheduleManagement: (mode: string) => void; diff --git a/front/src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx b/front/src/modules/trainschedule/components/Timetable/TimetableManageTrainSchedule.tsx similarity index 88% rename from front/src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx rename to front/src/modules/trainschedule/components/Timetable/TimetableManageTrainSchedule.tsx index da144cc6fda..9b363cc81ef 100644 --- a/front/src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx +++ b/front/src/modules/trainschedule/components/Timetable/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; diff --git a/front/src/applications/operationalStudies/components/Scenario/TimetableTrainCard.tsx b/front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx similarity index 100% rename from front/src/applications/operationalStudies/components/Scenario/TimetableTrainCard.tsx rename to front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx diff --git a/front/src/reducers/osrdsimulation/index.ts b/front/src/reducers/osrdsimulation/index.ts index 2dc745ab009..4eb8e323e7e 100644 --- a/front/src/reducers/osrdsimulation/index.ts +++ b/front/src/reducers/osrdsimulation/index.ts @@ -2,16 +2,16 @@ import { AnyAction } from 'redux'; import produce from 'immer'; import { noop } from 'lodash'; -import createTrain from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain'; +import createTrain from 'modules/simulationResult/components/SpaceTimeChart/createTrain'; import { LIST_VALUES_NAME_SPACE_TIME, SIGNAL_BASE_DEFAULT, KEY_VALUES_FOR_CONSOLIDATED_SIMULATION, -} from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; +} from 'modules/simulationResult/components/simulationResultsConsts'; import { interpolateOnTime, makeTrainListWithAllTrainsOffset, -} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers'; +} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers'; import { SPEED_SPACE_SETTINGS_KEYS, OsrdSimulationState, diff --git a/front/src/reducers/osrdsimulation/simulation.ts b/front/src/reducers/osrdsimulation/simulation.ts index 332aba86628..89d5ba8f6a6 100644 --- a/front/src/reducers/osrdsimulation/simulation.ts +++ b/front/src/reducers/osrdsimulation/simulation.ts @@ -2,7 +2,7 @@ import { noop } from 'lodash'; import { changeTrain, getTrainDetailsForAPI, -} from 'applications/operationalStudies/components/SimulationResults/simulationResultsHelpers'; +} from 'modules/simulationResult/components/simulationResultsHelpers'; import { setFailure } from 'reducers/main'; import i18n from 'i18next'; diff --git a/front/src/reducers/osrdsimulation/types.ts b/front/src/reducers/osrdsimulation/types.ts index 03e80e30267..ad8168fa01d 100644 --- a/front/src/reducers/osrdsimulation/types.ts +++ b/front/src/reducers/osrdsimulation/types.ts @@ -1,6 +1,6 @@ import * as d3 from 'd3'; import { TimeString } from 'common/types'; -import { SIGNAL_BASE_DEFAULT } from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts'; +import { SIGNAL_BASE_DEFAULT } from 'modules/simulationResult/components/simulationResultsConsts'; import { ElectrificationRange, PowerRestrictionRangeItem, diff --git a/front/src/stories/RollingStockSelector.stories.tsx b/front/src/stories/RollingStockSelector.stories.tsx index e465a6d659f..4f8362628c4 100644 --- a/front/src/stories/RollingStockSelector.stories.tsx +++ b/front/src/stories/RollingStockSelector.stories.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { ComponentMeta, ComponentStory } from '@storybook/react'; import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector'; -import { OSRD_ROLLINGSTOCKSELECTED_SAMPLE_DATA } from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/sampleData'; +import { OSRD_ROLLINGSTOCKSELECTED_SAMPLE_DATA } from 'modules/simulationResult/components/SpeedSpaceChart/sampleData'; import { RollingStock } from 'common/api/osrdEditoastApi'; import exampleRollingStockImage1 from 'assets/defaultRSImages/example_rolling_stock_image_1.gif'; import exampleRollingStockImage2 from 'assets/defaultRSImages/example_rolling_stock_image_2.gif'; diff --git a/front/src/stories/SpaceTimeChart.stories.tsx b/front/src/stories/SpaceTimeChart.stories.tsx index b8fe6a533a7..a6dc6b980bc 100644 --- a/front/src/stories/SpaceTimeChart.stories.tsx +++ b/front/src/stories/SpaceTimeChart.stories.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { ComponentStory } from '@storybook/react'; -import SpaceTimeChart from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/SpaceTimeChart'; +import SpaceTimeChart from 'modules/simulationResult/components/SpaceTimeChart/SpaceTimeChart'; import 'stories/storybook.css'; -import ORSD_GEV_SAMPLE_DATA from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/sampleData'; +import ORSD_GEV_SAMPLE_DATA from 'modules/simulationResult/components/SpeedSpaceChart/sampleData'; export default { /* 👇 The title prop is optional. diff --git a/front/src/stories/SpeedSpaceChart.stories.tsx b/front/src/stories/SpeedSpaceChart.stories.tsx index c5b4757f5f3..7c936790581 100644 --- a/front/src/stories/SpeedSpaceChart.stories.tsx +++ b/front/src/stories/SpeedSpaceChart.stories.tsx @@ -3,11 +3,11 @@ import { noop } from 'lodash'; import { StoryFn } from '@storybook/react'; import SpeedSpaceChart, { SpeedSpaceChartProps, -} from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart'; +} from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart'; import 'stories/storybook.css'; import { Provider } from 'react-redux'; import { store } from 'Store'; -import ORSD_GRAPH_SAMPLE_DATA from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/sampleData'; +import ORSD_GRAPH_SAMPLE_DATA from 'modules/simulationResult/components/SpeedSpaceChart/sampleData'; export default { /* 👇 The title prop is optional.