Skip to content

Commit 737e970

Browse files
Mathieu RichardMathieu Richard
Mathieu Richard
authored and
Mathieu Richard
committed
front: implement new nomenclature part 2
1 parent 6fc6ddb commit 737e970

File tree

129 files changed

+162
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+162
-143
lines changed

‎front/src/applications/editor/Map.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
55
import { TFunction } from 'i18next';
66
import { isEmpty, isEqual } from 'lodash';
77

8-
import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers';
8+
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
99
import colors from 'common/Map/Consts/colors';
1010
import 'common/Map/Map.scss';
1111

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React, { useEffect, useState } from 'react';
2-
import ImportTrainScheduleConfig from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig';
3-
import ImportTrainScheduleTrainsList from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainsList';
2+
import {
3+
ImportTrainScheduleConfig,
4+
ImportTrainScheduleTrainsList,
5+
} from 'modules/trainschedule/components/ImportTrainSchedule';
46
import Loader from 'common/Loader';
57
import { TrainSchedule } from 'applications/operationalStudies/types';
68
import { enhancedEditoastApi } from 'common/api/enhancedEditoastApi';

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import React, { useEffect, useState } from 'react';
33
import { useTranslation } from 'react-i18next';
44
import { useDispatch, useSelector } from 'react-redux';
55

6-
import TrainSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainSettings';
7-
import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
8-
import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
6+
import TrainSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainSettings';
7+
import Itinerary from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary';
8+
import Map from 'modules/trainschedule/components/ManageTrainSchedule/Map';
99
import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
10-
import PowerRestrictionsSelector from 'applications/operationalStudies/components/ManageTrainSchedule/PowerRestrictionsSelector';
11-
import adjustConfWithTrainToModify from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
12-
import ElectricalProfiles from 'applications/operationalStudies/components/ManageTrainSchedule/ElectricalProfiles';
13-
import Allowances from 'applications/operationalStudies/components/ManageTrainSchedule/Allowances/Allowances';
10+
import PowerRestrictionsSelector from 'modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector';
11+
import adjustConfWithTrainToModify from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
12+
import ElectricalProfiles from 'modules/trainschedule/components/ManageTrainSchedule/ElectricalProfiles';
13+
import Allowances from 'modules/trainschedule/components/ManageTrainSchedule/Allowances/Allowances';
1414
import {
1515
getPathfindingID,
1616
getRollingStockID,

‎front/src/applications/operationalStudies/views/Scenario.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react';
22
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
33
import logo from 'assets/pictures/home/operationalStudies.svg';
44
import { useTranslation } from 'react-i18next';
5-
import Timetable from 'applications/operationalStudies/components/Scenario/Timetable';
5+
import Timetable from 'modules/trainschedule/components/Timetable/Timetable';
66
import infraLogo from 'assets/pictures/components/tracks.svg';
77
import { useSelector, useDispatch } from 'react-redux';
88
import { MODES, MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
99
import { updateInfraID, updateMode, updateTimetableID } from 'reducers/osrdconf';
10-
import TimetableManageTrainSchedule from 'applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule';
10+
import TimetableManageTrainSchedule from 'modules/trainschedule/components/Timetable/TimetableManageTrainSchedule';
1111
import BreadCrumbs from 'applications/operationalStudies/components/BreadCrumbs';
1212
import {
1313
getInfraID,

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

+13-11
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,23 @@ import {
1515
getSelectedProjection,
1616
getSelectedTrain,
1717
} from 'reducers/osrdsimulation/selectors';
18-
import { updateViewport, Viewport } from 'reducers/map';
19-
import { getTimetableID } from 'reducers/osrdconf/selectors';
20-
import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions';
2118

2219
import SimulationWarpedMap from 'common/Map/WarpedMap/SimulationWarpedMap';
23-
import SimulationResultsMap from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap';
24-
import SpaceCurvesSlopes from 'applications/operationalStudies/components/SimulationResults/SpaceCurvesSlopes';
25-
import SpaceTimeChartIsolated from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData';
26-
import SpeedSpaceChart from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart';
27-
import TimeButtons from 'applications/operationalStudies/components/SimulationResults/TimeButtons';
28-
import TimeLine from 'applications/operationalStudies/components/SimulationResults/TimeLine/TimeLine';
29-
import TrainDetails from 'applications/operationalStudies/components/SimulationResults/TrainDetails';
20+
21+
import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions';
22+
23+
import SimulationResultsMap from 'modules/simulationResult/components/SimulationResultsMap';
24+
import SpaceCurvesSlopes from 'modules/simulationResult/components/SpaceCurvesSlopes';
25+
import SpaceTimeChartIsolated from 'modules/simulationResult/components/SpaceTimeChart/withOSRDData';
26+
import SpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart';
27+
import TimeButtons from 'modules/simulationResult/components/TimeButtons';
28+
import TimeLine from 'modules/simulationResult/components/TimeLine/TimeLine';
29+
import TrainDetails from 'modules/simulationResult/components/TrainDetails';
3030
import getSimulationResults from 'applications/operationalStudies/components/Scenario/getSimulationResults';
31-
import DriverTrainSchedule from 'applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainSchedule';
3231

32+
import { updateViewport, Viewport } from 'reducers/map';
33+
import DriverTrainSchedule from 'modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule';
34+
import { getTimetableID } from 'reducers/osrdconf/selectors';
3335
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
3436

3537
const MAP_MIN_HEIGHT = 450;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import {
2424
StudyResult,
2525
osrdEditoastApi,
2626
} from 'common/api/osrdEditoastApi';
27+
import AddOrEditStudyModal from 'modules/study/components/AddOrEditStudyModal';
2728
import BreadCrumbs from '../components/BreadCrumbs';
28-
import AddOrEditStudyModal from '../components/Study/AddOrEditStudyModal';
2929
import FilterTextField from '../components/FilterTextField';
3030
import { studyStates } from '../consts';
3131

‎front/src/applications/referenceMap/Map.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { getTerrain3DExaggeration } from 'reducers/map/selectors';
1313
/* Main data & layers */
1414
import Background from 'common/Map/Layers/Background';
1515
import Terrain from 'common/Map/Layers/Terrain';
16-
import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers';
16+
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
1717
import BufferStops from 'common/Map/Layers/BufferStops';
1818
/* Settings & Buttons */
1919
import MapButtons from 'common/Map/Buttons/MapButtons';

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import { useDispatch } from 'react-redux';
88
import Loader from 'common/Loader';
99
import { useTranslation } from 'react-i18next';
1010
import { LightRollingStock, osrdEditoastApi } from 'common/api/osrdEditoastApi';
11-
import RollingStockEditorButtons from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons';
12-
import RollingStockEditorCard from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorCard';
13-
import RollingStockEditorForm from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm';
11+
import RollingStockEditorButtons from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons';
12+
import RollingStockEditorCard from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorCard';
13+
import RollingStockEditorForm from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm';
1414
import { STANDARD_COMFORT_LEVEL } from 'modules/rollingStock/consts';
1515
import {
1616
updateComfortLvl,
1717
updateTractionMode,
1818
updateElectricalProfile,
1919
updatePowerRestriction,
2020
} from 'reducers/rollingstockEditor';
21-
import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
21+
import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
2222
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
2323

2424
type RollingStockEditorProps = {

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import { useTranslation } from 'react-i18next';
55
import { useSelector } from 'react-redux';
66

77
import { STDCM_REQUEST_STATUS } from 'applications/operationalStudies/consts';
8-
import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
9-
import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
8+
import { Itinerary, Map } from 'modules/trainschedule/components/ManageTrainSchedule';
109
import ScenarioExplorer from 'common/ScenarioExplorer/ScenarioExplorer';
1110
import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
1211
import {
@@ -19,7 +18,7 @@ import {
1918
import { getSelectedTrain } from 'reducers/osrdsimulation/selectors';
2019
import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
2120
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
22-
import STDCMAllowances from '../../../modules/allowances/components/STDCMAllowances';
21+
import STDCMAllowances from 'modules/stdcmAllowances/components/STDCMAllowances';
2322
import OSRDStdcmResults from './OSRDStdcmResults';
2423
import RunningTime from '../components/RunningTime';
2524

‎front/src/applications/stdcm/views/OSRDStdcmResults.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from 'react';
2-
import SpaceTimeChart from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData';
3-
import SpeedSpaceChart from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart';
2+
import SpaceTimeChart from 'modules/simulationResult/components/SpaceTimeChart/withOSRDData';
3+
import SpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart';
44
import { useTranslation } from 'react-i18next';
55
import { useSelector } from 'react-redux';
66
import { getPresentSimulation, getSelectedTrain } from 'reducers/osrdsimulation/selectors';

‎front/src/applications/stdcm/views/StdcmRequestModal.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import {
1010
} from 'reducers/osrdsimulation/actions';
1111
import { useDispatch, useSelector } from 'react-redux';
1212

13-
import { KEY_VALUES_FOR_CONSOLIDATED_SIMULATION } from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts';
13+
import { KEY_VALUES_FOR_CONSOLIDATED_SIMULATION } from 'modules/simulationResult/components/simulationResultsConsts';
1414
import { getConf } from 'reducers/osrdconf/selectors';
1515
// Generic components
1616
import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';
1717
import ModalHeaderSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalHeaderSNCF';
1818
import PropTypes from 'prop-types';
1919
import ReactModal from 'react-modal';
2020
// OSRD helpers
21-
import createTrain from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain';
21+
import createTrain from 'modules/simulationResult/components/SpaceTimeChart/createTrain';
2222
import formatStdcmConf from 'applications/stdcm/formatStcmConf';
2323
// Static Data and Assets
2424
import { setFailure } from 'reducers/main';

‎front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { LayerType } from 'applications/editor/tools/types';
1717
import DataLoader from 'common/Map/WarpedMap/DataLoader';
1818
import getWarping, { WarpingFunction } from 'common/Map/WarpedMap/getWarping';
1919
import WarpedMap from 'common/Map/WarpedMap/WarpedMap';
20-
import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types';
20+
import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types';
2121
import { getInfraID } from 'reducers/osrdconf/selectors';
2222
import { getImprovedOSRDData } from 'common/Map/WarpedMap/core/helpers';
2323
import {
@@ -27,7 +27,7 @@ import {
2727
} from 'reducers/osrdsimulation/selectors';
2828
import { Train } from 'reducers/osrdsimulation/types';
2929
import { AsyncMemoState, getAsyncMemoData, useAsyncMemo } from 'utils/useAsyncMemo';
30-
import { getSimulationHoverPositions } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/helpers';
30+
import { getSimulationHoverPositions } from 'modules/simulationResult/components/SimulationResultsMap/helpers';
3131
import { clip } from 'utils/mapHelper';
3232

3333
import './SimulationWarpedMap.scss';

‎front/src/common/Map/WarpedMap/WarpedMap.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder';
1212
import colors from 'common/Map/Consts/colors';
1313
import { ALL_SIGNAL_LAYERS } from 'common/Map/Consts/SignalsNames';
1414
import { LayerType } from 'applications/editor/tools/types';
15-
import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types';
16-
import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers';
17-
import RenderItinerary from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/RenderItinerary';
18-
import TrainHoverPosition from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/TrainHoverPosition';
15+
import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types';
16+
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
17+
import RenderItinerary from 'modules/simulationResult/components/SimulationResultsMap/RenderItinerary';
18+
import TrainHoverPosition from 'modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition';
1919
import { LayerContext } from 'common/Map/Layers/types';
2020
import { EditorSource, SourcesDefinitionsIndex } from 'common/Map/Layers/GeoJSONs';
2121
import OrderedLayer, { OrderedLayerProps } from 'common/Map/Layers/OrderedLayer';

‎front/src/common/Pathfinding/Pathfinding.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
getGeojson,
3434
} from 'reducers/osrdconf/selectors';
3535

36-
import ModalPathJSONDetail from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail';
36+
import ModalPathJSONDetail from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail';
3737
import infraLogo from 'assets/pictures/components/tracks.svg';
3838
import InfraLoadingState from 'applications/operationalStudies/components/Scenario/InfraLoadingState';
3939
import { Spinner } from '../Loader';

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

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux';
66
import { useTranslation } from 'react-i18next';
77
import { setSuccess, setFailure } from 'reducers/main';
88
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
9-
import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
9+
import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
1010

1111
type RollingStockEditorButtonsProps = {
1212
rollingStock: RollingStock;

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

File renamed without changes.

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

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
99
import { useDispatch, useSelector } from 'react-redux';
1010
import { setFailure, setSuccess } from 'reducers/main';
1111
import Tabs, { TabProps } from 'common/Tabs';
12-
import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
12+
import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
1313
import getRollingStockEditorDefaultValues, {
1414
getDefaultRollingStockMode,
1515
rollingStockEditorQueryArg,

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

File renamed without changes.

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

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers.ts ‎front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
Stop,
1616
SimulationD3Scale,
1717
} from 'reducers/osrdsimulation/types';
18-
import { TIME } from '../simulationResultsConsts';
18+
import { TIME } from 'modules/simulationResult/components/simulationResultsConsts';
1919

2020
export function sec2d3datetime(time: number) {
2121
return d3.timeParse('%H:%M:%S')(sec2time(time));

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/__tests__/ChartHelpers.spec.ts ‎front/src/modules/simulationResult/components/ChartHelpers/__tests__/ChartHelpers.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { SimulationTrain } from 'reducers/osrdsimulation/types';
2+
import { LIST_VALUES_NAME_SPACE_TIME } from 'modules/simulationResult/components/simulationResultsConsts';
23
import {
34
mergeDatasArea,
45
interpolateOnTime,
56
trainWithDepartureAndArrivalTimes,
67
} from '../ChartHelpers';
7-
import { LIST_VALUES_NAME_SPACE_TIME } from '../../simulationResultsConsts';
88

9-
import train from '../../../../../../../tests/assets/operationStudies/trainExample';
10-
import simulationTrain from '../../../../../../../tests/assets/operationStudies/simulationTrain';
9+
import train from '../../../../../../tests/assets/operationStudies/trainExample';
10+
import simulationTrain from '../../../../../../tests/assets/operationStudies/simulationTrain';
1111

1212
describe('mergeDatasArea', () => {
1313
test('avoid crash', () => {

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/defineChart.ts ‎front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
import * as d3 from 'd3';
22
import { select as d3select } from 'd3-selection';
3-
import {
4-
gridX,
5-
gridY,
6-
isGET,
7-
} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers';
3+
import { gridX, gridY, isGET } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers';
84
import nextId from 'react-id-generator';
9-
import svgDefs from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/svgDefs';
5+
import svgDefs from 'modules/simulationResult/components/ChartHelpers/svgDefs';
106
import { Chart, SimulationD3Scale } from 'reducers/osrdsimulation/types';
117

128
// keyValues ['position', 'gradient']

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawArea.ts ‎front/src/modules/simulationResult/components/ChartHelpers/drawArea.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as d3 from 'd3';
22
import { isEmpty } from 'lodash';
33
import { Chart } from 'reducers/osrdsimulation/types';
4-
import { AreaBlock } from '../SpeedSpaceChart/prepareData';
4+
import { AreaBlock } from 'modules/simulationResult/components/SpeedSpaceChart/prepareData';
55

66
/**
77
* Draw area for the SpeedSpaceChart or the SpaceCurvesSlopesChart

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawCurve.jsx ‎front/src/modules/simulationResult/components/ChartHelpers/drawCurve.jsx

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawElectricalProfile.jsx ‎front/src/modules/simulationResult/components/ChartHelpers/drawElectricalProfile.jsx

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawGuideLines.ts ‎front/src/modules/simulationResult/components/ChartHelpers/drawGuideLines.ts

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawPowerRestriction.jsx ‎front/src/modules/simulationResult/components/ChartHelpers/drawPowerRestriction.jsx

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawRect.ts ‎front/src/modules/simulationResult/components/ChartHelpers/drawRect.ts

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/drawText.ts ‎front/src/modules/simulationResult/components/ChartHelpers/drawText.ts

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/enableInteractivity.jsx ‎front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
interpolateOnPosition,
99
interpolateOnTime,
1010
isGET,
11-
} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers';
11+
} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers';
1212
import {
1313
updateContextMenu,
1414
updateMustRedraw,
@@ -18,8 +18,8 @@ import { datetime2sec, sec2datetime } from 'utils/timeManipulation';
1818
import {
1919
LIST_VALUES_NAME_SPACE_TIME,
2020
LIST_VALUES_NAME_SPEED_SPACE,
21-
} from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts';
22-
import drawGuideLines from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawGuideLines';
21+
} from 'modules/simulationResult/components/simulationResultsConsts';
22+
import drawGuideLines from 'modules/simulationResult/components/ChartHelpers/drawGuideLines';
2323
import { store } from 'Store';
2424

2525
export const displayGuide = (chart, opacity) => {

‎front/src/applications/operationalStudies/components/SimulationResults/ChartHelpers/svgDefs.jsx ‎front/src/modules/simulationResult/components/ChartHelpers/svgDefs.jsx

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartModal/ChartModal.jsx ‎front/src/modules/simulationResult/components/ChartModal/ChartModal.jsx

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ChartModal/index.jsx ‎front/src/modules/simulationResult/components/ChartModal/index.jsx

File renamed without changes.

‎front/src/applications/operationalStudies/components/SimulationResults/ContextMenu.jsx ‎front/src/modules/simulationResult/components/ContextMenu.jsx

File renamed without changes.

0 commit comments

Comments
 (0)