Adn/front start warning (#2030)

* warnings reduction * end of warnings
OpenRailAssociation · Oct 5, 2022 · cdee566 · cdee566
1 parent 0a33517
commit cdee566
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 67 deletions.
diff --git a/front/src/applications/osrd/components/Helpers/ChartHelpers.js b/front/src/applications/osrd/components/Helpers/ChartHelpers.js
@@ -1,6 +1,8 @@
 import * as d3 from 'd3';
 
 import { sec2time } from 'utils/timeManipulation';
+// import/no-cycle is disabled because this func call will be removed by refacto
+// eslint-disable-next-line
 import { updateMustRedraw } from 'reducers/osrdsimulation';
 
 export const sec2d3datetime = (time) => d3.timeParse('%H:%M:%S')(sec2time(time));

diff --git a/front/src/applications/osrd/consts.js b/front/src/applications/osrd/consts.js
@@ -57,3 +57,12 @@ export const STDCM_MODES = {
 };
 
 export const DEFAULT_STDCM_MODE = STDCM_MODES.byOrigin;
+
+export const stdcmRequestStatus = {
+  idle: 'IDLE',
+  pending: 'PENDING',
+  success: 'SUCCESS',
+  rejected: 'REJECTED',
+  canceled: 'CANCELED',
+  noresults: 'NORESULTS',
+};
diff --git a/front/src/applications/osrd/views/OSRDConfig/OSRDConfig.js b/front/src/applications/osrd/views/OSRDConfig/OSRDConfig.js
@@ -1,6 +1,7 @@
 import 'applications/osrd/views/OSRDConfig/OSRDConfig.scss';
 
 import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 
 import AddTrainLabels from 'applications/osrd/views/OSRDConfig/AddTrainLabels';
@@ -12,7 +13,7 @@ import Map from 'applications/osrd/views/OSRDConfig/Map';
 import RollingStockSelector from 'applications/osrd/views/OSRDConfig/RollingStockSelector';
 import SpeedLimitByTagSelector from 'applications/osrd/views/OSRDConfig/SpeedLimitByTagSelector';
 import TimetableSelector from 'applications/osrd/views/OSRDConfig/TimetableSelector';
-import { stdcmRequestStatus } from 'applications/stdcm/views/OSRDSTDCM';
+import { stdcmRequestStatus } from 'applications/osrd/consts';
 import { updateViewport } from 'reducers/map';
 import { useTranslation } from 'react-i18next';
 import { MODES } from '../../consts';
@@ -93,3 +94,10 @@ export default function OSRDConfig(props) {
     </main>
   );
 }
+
+OSRDConfig.propTypes = {
+  setCurrentStdcmRequestStatus: PropTypes.func,
+};
+OSRDConfig.defaultProps = {
+  setCurrentStdcmRequestStatus: () => {},
+};
diff --git a/front/src/applications/osrd/views/OSRDSimulation/Allowances.js b/front/src/applications/osrd/views/OSRDSimulation/Allowances.js
@@ -41,7 +41,7 @@ function EmptyLine(props) {
     allowances,
     setAllowances,
     setUpdateAllowances,
-    allowanceType = 'construction',
+    allowanceType,
     marecoBeginPosition,
     marecoEndPosition,
     defaultDistributionId,
@@ -276,7 +276,7 @@ export default function Allowances(props) {
   const simulation = useSelector((state) => state.osrdsimulation.simulation.present);
   const [trainDetail, setTrainDetail] = useState(undefined);
   const [allowances, setAllowances] = useState([]);
-  const [rawExtensions, setRawExtensions] = useState([]);
+  const [rawExtensions] = useState([]);
   const [updateAllowances, setUpdateAllowances] = useState(false);
   const [isUpdating, setIsUpdating] = useState(false);
   const dispatch = useDispatch();
@@ -407,16 +407,6 @@ export default function Allowances(props) {
     getAllowances();
   }, [selectedTrain]);
 
-  const handleExtensionsChange = (extensions) => {
-    const newMarecoProposal = extensions
-      .filter((d) => d.extensionData !== 'mareco')
-      .map((d) => ({
-        begin_position: d.currentSelection[0],
-        end_position: d.currentSelection[1],
-      }));
-    setRawExtensions(newMarecoProposal);
-  };
-
   const standardAllowance = allowances.find(
     (allowance) => allowance.allowance_type === 'standard' && allowance.ranges
   );
@@ -500,7 +490,7 @@ export default function Allowances(props) {
             allowanceType="engineering"
             allowanceTypes={allowanceTypes}
           />
-          {rawExtensions.map((rawExtension) => (
+          {rawExtensions.map(() => (
             <EmptyLine
               defaultDistributionId={defaultEngineeringDistributionId}
               setAllowances={setAllowances}
@@ -531,10 +521,17 @@ Allowance.propTypes = {
 EmptyLine.propTypes = {
   allowances: PropTypes.array,
   allowanceTypes: PropTypes.array.isRequired,
+  allowanceType: PropTypes.string,
   distributionsTypes: PropTypes.array.isRequired,
   setAllowances: PropTypes.func.isRequired,
   setUpdateAllowances: PropTypes.func.isRequired,
+  marecoBeginPosition: PropTypes.number,
+  // eslint-disable-next-line react/require-default-props
+  marecoEndPosition: PropTypes.number,
+  defaultDistributionId: PropTypes.string.isRequired,
 };
 EmptyLine.defaultProps = {
   allowances: [],
+  allowanceType: 'construction',
+  marecoBeginPosition: 0,
 };
diff --git a/front/src/applications/osrd/views/OSRDSimulation/Map.js b/front/src/applications/osrd/views/OSRDSimulation/Map.js
@@ -17,10 +17,10 @@ import { useDispatch, useSelector } from 'react-redux';
 
 /* Main data & layers */
 import Background from 'common/Map/Layers/Background';
-import BufferStops from 'common/Map/Layers/BufferStops.tsx';
+import BufferStops from 'common/Map/Layers/BufferStops';
 /* Settings & Buttons */
 import MapButtons from 'common/Map/Buttons/MapButtons';
-import Detectors from 'common/Map/Layers/Detectors.tsx';
+import Detectors from 'common/Map/Layers/Detectors';
 import Catenaries from 'common/Map/Layers/Catenaries';
 import Hillshade from 'common/Map/Layers/Hillshade';
 import OSM from 'common/Map/Layers/OSM';
@@ -44,13 +44,12 @@ import TrainHoverPosition from 'applications/osrd/components/SimulationMap/Train
 import TrainHoverPositionOthers from 'applications/osrd/components/SimulationMap/TrainHoverPositionOthers';
 import along from '@turf/along';
 import bbox from '@turf/bbox';
-import bearing from '@turf/bearing';
-import colors from 'common/Map/Consts/colors.ts';
+
+import colors from 'common/Map/Consts/colors';
 import { datetime2sec } from 'utils/timeManipulation';
 import { get } from 'common/requests';
 import lineLength from '@turf/length';
 import lineSlice from '@turf/line-slice';
-import nearestPointOnLine from '@turf/nearest-point-on-line';
 import osmBlankStyle from 'common/Map/Layers/osmBlankStyle';
 import { updateTimePositionValues } from 'reducers/osrdsimulation';
 import { updateViewport } from 'reducers/map';
@@ -61,7 +60,7 @@ const INTERMEDIATE_MARKERS_QTY = 8;
 
 function Map(props) {
   const { setExtViewport } = props;
-  const { viewport, mapSearchMarker, mapStyle, mapTrackSources, showOSM, layersSettings, zoom } =
+  const { viewport, mapSearchMarker, mapStyle, mapTrackSources, showOSM, layersSettings } =
     useSelector((state) => state.map);
   const { isPlaying, selectedTrain, positionValues, timePosition, allowancesSettings } =
     useSelector((state) => state.osrdsimulation);
@@ -143,7 +142,7 @@ function Map(props) {
       if (viewport?.zoom > 13) {
         // To do: get this data from rollingstock, stored
         const trainLength = positionValues[headKey].position - positionValues[tailKey].position;
-        for (let i = 0; i < INTERMEDIATE_MARKERS_QTY; i++) {
+        for (let i = 0; i < INTERMEDIATE_MARKERS_QTY; i += 1) {
           const intermediatePosition = along(
             line,
             (positionValues[headKey].position - (trainLength / INTERMEDIATE_MARKERS_QTY) * i) /
@@ -177,7 +176,7 @@ function Map(props) {
         if (viewport?.zoom > 13) {
           // To do: get this data from rollingstock, stored
           const trainLength = train.head_positions.position - train.tail_positions.position;
-          for (let i = 0; i < INTERMEDIATE_MARKERS_QTY; i++) {
+          for (let i = 0; i < INTERMEDIATE_MARKERS_QTY; i += 1) {
             const intermediatePosition = along(
               line,
               (train.head_positions.position - (trainLength / INTERMEDIATE_MARKERS_QTY) * i) / 1000,
@@ -308,7 +307,7 @@ function Map(props) {
   };
 
   useEffect(() => {
-    mapRef.current.getMap().on('click', (e) => {});
+    mapRef.current.getMap().on('click', () => {});
 
     if (urlLat) {
       updateViewportChange({

diff --git a/front/src/applications/stdcm/views/OSRDSTDCM.js b/front/src/applications/stdcm/views/OSRDSTDCM.js
@@ -1,24 +1,14 @@
 import React, { useEffect, useState } from 'react';
 
 import { useDispatch } from 'react-redux';
-import { useTranslation } from 'react-i18next';
 import { MODES } from '../../osrd/consts';
 import OSRDConfig from '../../osrd/views/OSRDConfig/OSRDConfig';
 import OSRDStdcmResults from './OSRDStdcmResults';
 import StdcmRequestModal from './StdcmRequestModal';
 import { updateMode } from '../../../reducers/osrdconf';
 
-export const stdcmRequestStatus = {
-  idle: 'IDLE',
-  pending: 'PENDING',
-  success: 'SUCCESS',
-  rejected: 'REJECTED',
-  canceled: 'CANCELED',
-  noresults: 'NORESULTS',
-};
-
 const keylog = [];
-document.onkeydown = function (e) {
+document.onkeydown = (e) => {
   const keypressed = e.key;
   keylog.push(keypressed);
   if (keylog.join('') === 'boum') {
@@ -34,10 +24,9 @@ document.onkeydown = function (e) {
 };
 
 export default function OSRDSTDCM() {
-  const { t } = useTranslation(['translation', 'osrdconf']);
   const dispatch = useDispatch();
   const [currentStdcmRequestStatus, setCurrentStdcmRequestStatus] = useState(null);
-  const [currentStdcmRequestResults, setCurrentStdcmRequestResults] = useState(null);
+  const [, setCurrentStdcmRequestResults] = useState(null);
   useEffect(() => {
     dispatch(updateMode(MODES.stdcm));
   }, []);

diff --git a/front/src/applications/stdcm/views/OSRDStdcmResults.js b/front/src/applications/stdcm/views/OSRDStdcmResults.js
@@ -23,16 +23,16 @@ import SpeedSpaceChart from 'applications/osrd/views/OSRDSimulation/SpeedSpaceCh
 import TimeTable from 'applications/osrd/views/OSRDSimulation/TimeTable';
 import createTrain from 'applications/osrd/components/Simulation/SpaceTimeChart/createTrain';
 import { get } from 'common/requests';
-import { setFailure } from 'reducers/main.ts';
-import { stdcmRequestStatus } from 'applications/stdcm/views/OSRDSTDCM';
+import { setFailure } from 'reducers/main';
+import { stdcmRequestStatus } from 'applications/osrd/consts';
 import { useTranslation } from 'react-i18next';
 
 export default function OSRDStcdmResults(props) {
   const { selectedTrain } = useSelector((state) => state.osrdsimulation);
   const simulation = useSelector((state) => state.osrdsimulation.simulation.present);
   const { timetableID } = useSelector((state) => state.osrdconf);
   const { t } = useTranslation(['translation', 'osrdconf']);
-  const [isEmpty, setIsEmpty] = useState(true);
+  const [, setIsEmpty] = useState(true);
   const { currentStdcmRequestStatus } = props;
   const { allowancesSettings, selectedProjection } = useSelector((state) => state.osrdsimulation);
   const dispatch = useDispatch();

diff --git a/front/src/applications/stdcm/views/StdcmRequestModal.js b/front/src/applications/stdcm/views/StdcmRequestModal.js
@@ -23,8 +23,8 @@ import formatStdcmConf from 'applications/stdcm/formatStcmConf';
 import { post } from 'common/requests';
 // Static Data and Assets
 import rabbit from 'assets/pictures/KLCW_nc_standard.png';
-import { setFailure } from 'reducers/main.ts';
-import { stdcmRequestStatus } from 'applications/stdcm/views/OSRDSTDCM';
+import { setFailure } from 'reducers/main';
+import { stdcmRequestStatus } from 'applications/osrd/consts';
 import { updateItinerary } from 'reducers/osrdconf';
 import { useTranslation } from 'react-i18next';
 
@@ -112,7 +112,6 @@ export default function StdcmRequestModal(props) {
               path: result.path,
             })
           );
-
         })
         .catch((e) => {
           // Update simu in redux with data;

diff --git a/front/src/common/requests.ts b/front/src/common/requests.ts
@@ -39,8 +39,11 @@ function handleAxiosError(e: unknown): Error {
         error = new Error(
           err.response.data.map((e2) => new Error(e2.message || JSON.stringify(e2))).join('\n')
         );
-      else
+      else {
+        // we can't know the type of the result right now
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         error = new Error((err.response.data as any).message || JSON.stringify(err.response.data));
+      }
     }
     if (!error && err.response && err.response.status) {
       error = new Error(`Request failed: ${err.response.status}`);

diff --git a/front/src/config/config.js b/front/src/config/config.js
@@ -20,7 +20,7 @@ export const KEYCLOAK_CONFIG = {
 
 export const SENTRY_CONFIG = {
   react_sentry_dsn: process.env.REACT_APP_SENTRY_DSN,
-  environment: process.env.REACT_APP_SENTRY_ENVIRONMENT
+  environment: process.env.REACT_APP_SENTRY_ENVIRONMENT,
 };
 
 export default MAIN_API;
diff --git a/front/src/reducers/osrdsimulation/simulation.js b/front/src/reducers/osrdsimulation/simulation.js
@@ -31,6 +31,7 @@ export async function progressiveDuplicateTrain(
   selectedProjection,
   simulationTrains,
   selectedTrain,
+  trainDelta,
   dispatch
 ) {
   const trainDetail = await get(`${trainscheduleURI}${simulationTrains[selectedTrain].id}/`);
@@ -70,7 +71,7 @@ export async function progressiveDuplicateTrain(
   } catch (e) {
     dispatch(
       setFailure({
-        name: t('simulation:errorMessages.unableToRetrieveTrainSchedule'),
+        name: 'unableToRetrieveTrainSchedule',
         message: `${e.message} : ${e.response.data.detail}`,
       })
     );
@@ -84,7 +85,7 @@ function simulationEquals(present, newPresent) {
   return JSON.stringify(present) === JSON.stringify(newPresent);
 }
 
-function apiSyncOnDiff(present, nextPresent, dispatch = () => {}, getState = () => {}) {
+function apiSyncOnDiff(present, nextPresent, dispatch = () => {}) {
   // If there is not mod don't do anything
   if (simulationEquals(present, nextPresent)) return;
   // test missing trains and apply delete api
@@ -120,24 +121,6 @@ function apiSyncOnDiff(present, nextPresent, dispatch = () => {}, getState = ()
       changeTrain(getTrainDetailsForAPI(nextTrain), nextTrain.id);
     }
   }
-
-  // test new trains and apply post api
-  for (let i = 0; i < nextPresent.trains; i += 1) {
-    const id = nextPresent.trains[i];
-    if (!present.trains.find((train) => train.id === id)) {
-      // Call standalone api
-      // ADN: infect bicolup. Will test more efficent
-      /*
-      const timeTableID = getState()?.osrdconf.timetableID;
-      const selectedProjection = getState()?.osrdsimulation.selectedProjection;
-      const selectedTrain = getState()?.osrdsimulation.selectedTrain;
-      const simulationTrains = getState()?.osrdsimulation.simulation.present.trains;
-      progressiveDuplicateTrain(
-        timeTableID, selectedProjection, simulationTrains, selectedTrain, dispatch
-      );
-      */
-    }
-  }
 }
 
 // THUNKS
@@ -196,7 +179,8 @@ function undoable(simulationReducer) {
   };
 
   // Return a reducer that handles undo and redo
-  return function undoableReducer(state = initialStateU, action) {
+  return function undoableReducer(state, action) {
+    if (!state) state = initialStateU;
     const { past, present, future } = state;
 
     switch (action.type) {
@@ -244,8 +228,8 @@ const initialState = {
   trains: [],
 };
 
-function reducer(state = initialState, action) {
-  // eslint-disable-next-line default-case
+function reducer(state, action) {
+  if (!state) state = initialState;
 
   switch (action.type) {
     case UPDATE_SIMULATION: