Skip to content

Commit 6dff90c

Browse files
anisometropieanisometropie
authored
react starting warnings (#1943)
* more warnings * warnings * warnings * warnings * warnings
1 parent d7dfd80 commit 6dff90c

37 files changed

+126
-148
lines changed

‎front/src/applications/osrd/components/Simulation/Allowances/MarecoMultiRange.js

+23-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as d3 from 'd3';
22

33
import React, { useEffect, useRef, useState } from 'react';
4-
import { select, selectAll } from 'd3-selection';
4+
import PropTypes from 'prop-types';
5+
import { select } from 'd3-selection';
56

67
import { brushX } from 'd3-brush';
78

@@ -192,21 +193,6 @@ export default function MarecoMultiRange({
192193
setBrushes((brushes) => [...brushes, ...extensionMapped]);
193194
}, [extensions]);
194195

195-
const newBrush = (qu) => {
196-
console.log('new Brush', brushesRef.current);
197-
198-
const brush = brushX()
199-
.extent([
200-
[margin.left, margin.top],
201-
[viewBoxWidth - margin.right, viewBoxHeight - margin.bottom - 6],
202-
])
203-
.on('start', brushstart) // Make sure don't pass surrounding brushes
204-
.on('brush', brushed) // Make sure don't pass surrounding brushes
205-
.on('end', brushend); // Keep track of what brushes is surrounding
206-
207-
setBrushes((brushes) => [...brushes, { id: brushes.length, brush }]);
208-
};
209-
210196
function brushstart({ sourceEvent }) {
211197
// empty for now
212198
}
@@ -269,6 +255,21 @@ export default function MarecoMultiRange({
269255
// newBrush(); /// Only on drag mode
270256
}
271257

258+
const newBrush = () => {
259+
console.log('new Brush', brushesRef.current);
260+
261+
const brush = brushX()
262+
.extent([
263+
[margin.left, margin.top],
264+
[viewBoxWidth - margin.right, viewBoxHeight - margin.bottom - 6],
265+
])
266+
.on('start', brushstart) // Make sure don't pass surrounding brushes
267+
.on('brush', brushed) // Make sure don't pass surrounding brushes
268+
.on('end', brushend); // Keep track of what brushes is surrounding
269+
270+
setBrushes((brushes) => [...brushes, { id: brushes.length, brush }]);
271+
};
272+
272273
return (
273274
<svg
274275
ref={ref}
@@ -286,3 +287,9 @@ export default function MarecoMultiRange({
286287
</svg>
287288
);
288289
}
290+
291+
MarecoMultiRange.propTypes = {
292+
stops: PropTypes.array.isRequired,
293+
extensions: PropTypes.array.isRequired,
294+
setExtensions: PropTypes.func.isRequired,
295+
};

‎front/src/applications/osrd/components/Simulation/SignalSwitch/withOSRDData.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import React from 'react';
12
import { useDispatch, useSelector } from 'react-redux';
23

34
import { LIST_VALUES_SIGNAL_BASE } from 'applications/osrd/components/Simulation/consts';
@@ -10,7 +11,7 @@ import SignalSwitch from './SignalSwitch';
1011
* @returns RFC with OSRD Data. SignalSwitch
1112
*/
1213
const withOSRDData = (Component) =>
13-
function (props) {
14+
function wrapperComponent(props) {
1415
const { signalBase } = useSelector((state) => state.osrdsimulation);
1516
const dispatch = useDispatch();
1617

‎front/src/applications/osrd/components/Simulation/SpaceTimeChart/createTrain.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import {
33
formatSignalAspects,
44
formatStepsWithTime,
55
formatStepsWithTimeMulti,
6-
makeStairCase,
76
mergeDatasArea,
87
} from 'applications/osrd/components/Helpers/ChartHelpers';
98

10-
import { setFailure } from 'reducers/main.ts';
9+
import { setFailure } from 'reducers/main';
1110

1211
/**
1312
* Will do some formating & computation to get a trains to be displayed. Stored then with currentSimulation splitted reducer

‎front/src/applications/osrd/components/Simulation/SpaceTimeChart/drawTrain.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
import * as d3 from 'd3';
22

3-
import { getDirection, timeShiftTrain } from 'applications/osrd/components/Helpers/ChartHelpers';
4-
import {
5-
updateContextMenu,
6-
updateMustRedraw,
7-
updateSelectedTrain,
8-
updateSimulation,
9-
} from 'reducers/osrdsimulation';
3+
import { getDirection } from 'applications/osrd/components/Helpers/ChartHelpers';
4+
import { updateContextMenu, updateMustRedraw, updateSelectedTrain } from 'reducers/osrdsimulation';
105

11-
import React from 'react';
126
import drawArea from 'applications/osrd/components/Simulation/drawArea';
137
import drawCurve from 'applications/osrd/components/Simulation/drawCurve';
148
import drawRect from 'applications/osrd/components/Simulation/drawRect';

‎front/src/applications/osrd/components/Simulation/drawRect.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import * as d3 from 'd3';
2-
1+
/* eslint-disable no-unused-vars */
32
const drawRect = (
43
chart,
54
classes,

‎front/src/applications/osrd/components/Simulation/enableInteractivity.js

-9
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ import {
1010
updateChartXGEV,
1111
updateContextMenu,
1212
updateMustRedraw,
13-
updateTimePosition,
1413
updateTimePositionValues,
1514
} from 'reducers/osrdsimulation';
1615

1716
import { LIST_VALUES_NAME_SPACE_TIME } from 'applications/osrd/components/Simulation/consts';
1817
import drawGuideLines from 'applications/osrd/components/Simulation/drawGuideLines';
1918
import { store } from 'Store';
20-
import createTrain from './SpaceTimeChart/createTrain';
2119

2220
export const displayGuide = (chart, opacity) => {
2321
chart.svg.selectAll('#vertical-line').style('opacity', opacity);
@@ -305,13 +303,6 @@ const enableInteractivity = (
305303
: chart.x.invert(d3.mouse(d3.event.currentTarget)[0]);
306304
const timePositionLocal = interpolateOnPosition(dataSimulation, keyValues, positionLocal);
307305
if (timePositionLocal) {
308-
const immediatePositionsValues = interpolateOnTime(
309-
dataSimulation,
310-
['time'],
311-
LIST_VALUES_NAME_SPACE_TIME,
312-
timePositionLocal
313-
);
314-
315306
debounceUpdateTimePositionValues(timePositionLocal, null, 15);
316307
}
317308
}

‎front/src/applications/osrd/components/SimulationMap/TrainHoverPosition.js

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ function TrainHoverPosition(props) {
4848
className="map-search-marker"
4949
longitude={intermediateMarkerPoint.geometry.coordinates[0]}
5050
latitude={intermediateMarkerPoint.geometry.coordinates[1]}
51+
// eslint-disable-next-line react/no-array-index-key
5152
key={`intermediateMarker-${i}`}
5253
>
5354
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">

‎front/src/applications/osrd/components/SimulationMap/TrainHoverPositionOthers.js

+21-23
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import nextId from 'react-id-generator';
55

66
const TrainHoverPositionOthers = (props) => {
77
const { trainHoverPositionOthers } = props;
8-
return trainHoverPositionOthers.map((point, headIndex) => (
8+
return trainHoverPositionOthers.map((point) => (
99
<>
1010
<Marker
1111
className="map-search-marker"
@@ -23,28 +23,26 @@ const TrainHoverPositionOthers = (props) => {
2323
</span>
2424
</Marker>
2525
{point.properties.intermediaterMarkersPoints &&
26-
point.properties.intermediaterMarkersPoints.map(
27-
(intermediateMarkerPoint, followingIndex) => (
28-
<Marker
29-
className="map-search-marker"
30-
longitude={intermediateMarkerPoint.geometry.coordinates[0]}
31-
latitude={intermediateMarkerPoint.geometry.coordinates[1]}
32-
key={nextId()}
33-
>
34-
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
35-
<circle
36-
style={{
37-
fill: '#333',
38-
fillOpacity: '0.60',
39-
}}
40-
cx="16"
41-
cy="16"
42-
r="8"
43-
/>
44-
</svg>
45-
</Marker>
46-
)
47-
)}
26+
point.properties.intermediaterMarkersPoints.map((intermediateMarkerPoint) => (
27+
<Marker
28+
className="map-search-marker"
29+
longitude={intermediateMarkerPoint.geometry.coordinates[0]}
30+
latitude={intermediateMarkerPoint.geometry.coordinates[1]}
31+
key={nextId()}
32+
>
33+
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
34+
<circle
35+
style={{
36+
fill: '#333',
37+
fillOpacity: '0.60',
38+
}}
39+
cx="16"
40+
cy="16"
41+
r="8"
42+
/>
43+
</svg>
44+
</Marker>
45+
))}
4846
</>
4947
));
5048
};

‎front/src/applications/osrd/components/TimetableSelector/TimetableSelectorModal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import ModalSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalSNCF';
88
import ModalHeaderSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalHeaderSNCF';
99
import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';
1010
import InputSNCF from 'common/BootstrapSNCF/InputSNCF';
11-
import { setSuccess, setFailure } from 'reducers/main.ts';
11+
import { setSuccess, setFailure } from 'reducers/main';
1212
import icon from 'assets/pictures/timetable.svg';
1313

1414
const timetableURL = '/timetable/';

‎front/src/applications/osrd/components/TrainList/TrainListModal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react';
1+
import React from 'react';
22

33
import InputSNCF from 'common/BootstrapSNCF/InputSNCF';
44
import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';

‎front/src/applications/osrd/views/OSRDConfig/AddTrainSchedule.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
44
import { useDispatch, useSelector } from 'react-redux';
55
import { post } from 'common/requests';
66
import { updateName } from 'reducers/osrdconf';
7-
import { setFailure, setSuccess } from 'reducers/main.ts';
7+
import { setFailure, setSuccess } from 'reducers/main';
88
import InputSNCF from 'common/BootstrapSNCF/InputSNCF';
99
import DotsLoader from 'common/DotsLoader/DotsLoader';
1010
import { time2sec, sec2time } from 'utils/timeManipulation';

‎front/src/applications/osrd/views/OSRDConfig/InfraSelector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
22
import { useDispatch, useSelector } from 'react-redux';
33
import { useTranslation } from 'react-i18next';
44
import { updateInfraID } from 'reducers/osrdconf';
5-
import { setFailure } from 'reducers/main.ts';
5+
import { setFailure } from 'reducers/main';
66
import { get } from 'common/requests';
77
import icon from 'assets/pictures/tracks.svg';
88
import InfraSelectorModal from 'applications/osrd/components/InfraSelector/InfraSelectorModal';

‎front/src/applications/osrd/views/OSRDConfig/Itinerary.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import PropTypes from 'prop-types';
1616
import { WebMercatorViewport } from 'react-map-gl';
1717
import bbox from '@turf/bbox';
1818
import { post } from 'common/requests';
19-
import { setFailure } from 'reducers/main.ts';
19+
import { setFailure } from 'reducers/main';
2020
import { updateFeatureInfoClick } from 'reducers/map';
2121
import { useTranslation } from 'react-i18next';
2222

@@ -25,7 +25,7 @@ const itineraryURI = '/pathfinding/';
2525
function Itinerary(props) {
2626
const [launchPathfinding, setLaunchPathfinding] = useState(false);
2727
const [pathfindingInProgress, setPathfindingInProgress] = useState(false);
28-
const { updateExtViewport, mode } = props;
28+
const { updateExtViewport } = props;
2929
const dispatch = useDispatch();
3030
const map = useSelector((state) => state.map);
3131
const osrdconf = useSelector((state) => state.osrdconf);

‎front/src/applications/osrd/views/OSRDConfig/Map.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ import SignalingType from 'common/Map/Layers/SignalingType';
2424
import Signals from 'common/Map/Layers/Signals';
2525
import SnappedMarker from 'common/Map/Layers/SnappedMarker';
2626
import SpeedLimits from 'common/Map/Layers/SpeedLimits';
27-
import BufferStops from 'common/Map/Layers/BufferStops.tsx';
28-
import Detectors from 'common/Map/Layers/Detectors.tsx';
27+
import BufferStops from 'common/Map/Layers/BufferStops';
28+
import Detectors from 'common/Map/Layers/Detectors';
2929
import Switches from 'common/Map/Layers/Switches';
3030
import TracksOSM from 'common/Map/Layers/TracksOSM';
3131
/* Objects & various */
3232
import TVDs from 'common/Map/Layers/TVDs';
3333
import TracksGeographic from 'common/Map/Layers/TracksGeographic';
3434
import TracksSchematic from 'common/Map/Layers/TracksSchematic';
35-
import colors from 'common/Map/Consts/colors.ts';
35+
import colors from 'common/Map/Consts/colors';
3636
import osmBlankStyle from 'common/Map/Layers/osmBlankStyle';
3737
import turfNearestPointOnLine from '@turf/nearest-point-on-line';
3838
import { updateFeatureInfoClickOSRD } from 'reducers/osrdconf';

‎front/src/applications/osrd/views/OSRDConfig/SpeedLimitByTagSelector.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React, { useState, useEffect } from 'react';
22
import { useDispatch, useSelector } from 'react-redux';
33
import { useTranslation } from 'react-i18next';
44
import { updateSpeedLimitByTag } from 'reducers/osrdconf';
5-
import { setFailure } from 'reducers/main.ts';
6-
import { get } from 'common/requests.ts';
5+
import { setFailure } from 'reducers/main';
6+
import { get } from 'common/requests';
77
import icon from 'assets/pictures/speedometer.svg';
88
import DotsLoader from 'common/DotsLoader/DotsLoader';
99
import SelectImprovedSNCF from 'common/BootstrapSNCF/SelectImprovedSNCF';

‎front/src/applications/osrd/views/OSRDConfig/TimetableSelector.js

+19-21
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,24 @@ export default function TimetableSelector(props) {
7171
}
7272
}, [timetableID, mustUpdateTimetable]);
7373

74+
let timeTable = <span className="ml-1">{t('osrdconf:noTimetable')}</span>;
75+
if (timetableID !== undefined && selectedTimetable === undefined) {
76+
timeTable = (
77+
<span className="ml-3">
78+
<DotsLoader />
79+
</span>
80+
);
81+
} else if (selectedTimetable !== undefined) {
82+
timeTable = (
83+
<>
84+
<span className="ml-1">{selectedTimetable.name}</span>
85+
<small className="ml-1 text-primary flex-grow-1">{selectedTimetable.id}</small>
86+
<span className="ml-2 badge badge-secondary">
87+
{`${selectedTimetable.train_schedules.length} ${t('translation:common.train(s)')}`}
88+
</span>
89+
</>
90+
);
91+
}
7492
return (
7593
<>
7694
<div className="osrd-config-item mb-2">
@@ -84,27 +102,7 @@ export default function TimetableSelector(props) {
84102
<div className="h2 mb-0 d-flex align-items-center">
85103
<img width="32px" className="mr-2" src={icon} alt="timetableIcon" />
86104
<span className="text-muted">{t('osrdconf:timetable')}</span>
87-
{timetableID !== undefined && selectedTimetable === undefined ? (
88-
<span className="ml-3">
89-
<DotsLoader />
90-
</span>
91-
) : (
92-
<>
93-
{selectedTimetable !== undefined ? (
94-
<>
95-
<span className="ml-1">{selectedTimetable.name}</span>
96-
<small className="ml-1 text-primary flex-grow-1">{selectedTimetable.id}</small>
97-
<span className="ml-2 badge badge-secondary">
98-
{`${selectedTimetable.train_schedules.length} ${t(
99-
'translation:common.train(s)'
100-
)}`}
101-
</span>
102-
</>
103-
) : (
104-
<span className="ml-1">{t('osrdconf:noTimetable')}</span>
105-
)}
106-
</>
107-
)}
105+
{timeTable}
108106
</div>
109107
</div>
110108
{timetableID !== undefined && trainList !== undefined && trainList.length > 0 ? (

‎front/src/applications/osrd/views/OSRDSimulation/OSRDSimulation.js

+7-11
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ function OSRDSimulation() {
7070
departureArrivalTimes,
7171
selectedTrain,
7272
stickyBar,
73-
signalBase,
7473
} = useSelector((state) => state.osrdsimulation);
7574
const simulation = useSelector((state) => state.osrdsimulation.simulation.present);
7675
const dispatch = useDispatch();
@@ -79,13 +78,6 @@ function OSRDSimulation() {
7978
import('./OSRDSimulationDarkMode.scss');
8079
}
8180

82-
function WaitingLoader() {
83-
if (isEmpty) {
84-
return <h1 className="text-center">{t('simulation:noData')}</h1>;
85-
}
86-
return <CenterLoader message={t('simulation:waiting')} />;
87-
}
88-
8981
/**
9082
* Recover the time table for all the trains
9183
*/
@@ -200,12 +192,16 @@ function OSRDSimulation() {
200192
dispatch(updateConsolidatedSimulation(consolidatedSimulation));
201193
}, [simulation]);
202194

195+
const waitingLoader = isEmpty ? (
196+
<h1 className="text-center">{t('simulation:noData')}</h1>
197+
) : (
198+
<CenterLoader message={t('simulation:waiting')} />
199+
);
200+
203201
return (
204202
<main className={`mastcontainer ${fullscreen ? ' fullscreen' : ''}`}>
205203
{!simulation || simulation.trains.length === 0 ? (
206-
<div className="pt-5 mt-5">
207-
<WaitingLoader />
208-
</div>
204+
<div className="pt-5 mt-5">{waitingLoader}</div>
209205
) : (
210206
<div className="m-0 p-3">
211207
<div className="mb-2">

‎front/src/applications/osrd/views/OSRDSimulation/SpaceCurvesSlopes.js

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export default function SpaceCurvesSlopes(props) {
5050
(state) => state.osrdsimulation
5151
);
5252
const simulation = useSelector((state) => state.osrdsimulation.simulation.present);
53+
// eslint-disable-next-line no-unused-vars
5354
const [rotate, setRotate] = useState(false);
5455
const [chart, setChart] = useState(undefined);
5556
const [zoomLevel, setZoomLevel] = useState(1);

0 commit comments

Comments
 (0)