Skip to content

Commit 22d7432

Browse files
committed
front: remove OperationalStudiesConfSliceActions casts
Signed-off-by: Clara Ni <clara.ni@outlook.fr>
1 parent 6a17f5d commit 22d7432

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

front/src/modules/pathfinding/components/Itinerary/ModalSuggestedVias.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import { useSelector } from 'react-redux';
88
import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';
99
import ModalFooterSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalFooterSNCF';
1010
import ModalHeaderSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalHeaderSNCF';
11-
import { useOsrdConfActions } from 'common/osrdContext';
1211
import { isVia, matchPathStepAndOp } from 'modules/pathfinding/utils';
1312
import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
14-
import type { OperationalStudiesConfSliceActions } from 'reducers/osrdconf/operationalStudiesConf';
13+
import { upsertViaFromSuggestedOP } from 'reducers/osrdconf/operationalStudiesConf';
1514
import {
1615
getVias,
1716
getDestination,
@@ -27,7 +26,6 @@ type ModalSuggestedViasProps = {
2726
};
2827

2928
const ModalSuggestedVias = ({ suggestedVias, launchPathfinding }: ModalSuggestedViasProps) => {
30-
const { upsertViaFromSuggestedOP } = useOsrdConfActions() as OperationalStudiesConfSliceActions;
3129
const dispatch = useAppDispatch();
3230
const vias = useSelector(getVias());
3331
const destination = useSelector(getDestination);

front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorBehaviours.ts

+7-10
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ import type {
77
} from 'applications/operationalStudies/types';
88
import type { TrackSection } from 'common/api/osrdEditoastApi';
99
import type { IntervalItem } from 'common/IntervalsEditor/types';
10-
import { useOsrdConfActions } from 'common/osrdContext';
1110
import getTrackLengthCumulativeSums from 'modules/pathfinding/helpers/getTrackLengthCumulativeSums';
1211
import { createCutAtPathStep } from 'modules/powerRestriction/helpers/createPathStep';
13-
import type { OperationalStudiesConfSliceActions } from 'reducers/osrdconf/operationalStudiesConf';
12+
import {
13+
upsertPowerRestrictionRanges,
14+
deletePowerRestrictionRanges,
15+
cutPowerRestrictionRanges,
16+
resizeSegmentBeginInput,
17+
resizeSegmentEndInput,
18+
} from 'reducers/osrdconf/operationalStudiesConf';
1419
import type { PathStep } from 'reducers/osrdconf/types';
1520
import { useAppDispatch } from 'store';
1621

@@ -43,14 +48,6 @@ const usePowerRestrictionSelectorBehaviours = ({
4348

4449
const { getTrackSectionsByIds } = useScenarioContext();
4550

46-
const {
47-
upsertPowerRestrictionRanges,
48-
cutPowerRestrictionRanges,
49-
deletePowerRestrictionRanges,
50-
resizeSegmentEndInput,
51-
resizeSegmentBeginInput,
52-
} = useOsrdConfActions() as OperationalStudiesConfSliceActions;
53-
5451
const [trackSectionsById, setTrackSectionsById] = useState<Record<string, TrackSection>>({});
5552

5653
/** Cumulative sums of the trackSections' length on path (in mm) */

front/src/modules/timesStops/TimesStopsInput.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import type { Operation } from 'react-datasheet-grid/dist/types';
77
import { useTranslation } from 'react-i18next';
88

99
import { useScenarioContext } from 'applications/operationalStudies/hooks/useScenarioContext';
10-
import { useOsrdConfActions } from 'common/osrdContext';
1110
import { isVia, matchPathStepAndOp } from 'modules/pathfinding/utils';
1211
import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
1312
import {
1413
updatePathSteps,
15-
type OperationalStudiesConfSliceActions,
14+
upsertSeveralViasFromSuggestedOP,
1615
} from 'reducers/osrdconf/operationalStudiesConf';
1716
import type { PathStep } from 'reducers/osrdconf/types';
1817
import { useAppDispatch } from 'store';
@@ -77,8 +76,6 @@ const TimesStopsInput = ({
7776
}: TimesStopsInputProps) => {
7877
const dispatch = useAppDispatch();
7978
const { t } = useTranslation('timesStops');
80-
const { upsertSeveralViasFromSuggestedOP } =
81-
useOsrdConfActions() as OperationalStudiesConfSliceActions;
8279

8380
const [rows, setRows] = useState<TimesStopsInputRow[]>([]);
8481
const { getTrackSectionsByIds, trackSectionsLoading } = useScenarioContext();

front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ import { GiPathDistance } from 'react-icons/gi';
1111
import { MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
1212
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
1313
import type { TrainScheduleBase, TrainScheduleResult } from 'common/api/osrdEditoastApi';
14-
import { useOsrdConfActions } from 'common/osrdContext';
1514
import RollingStock2Img from 'modules/rollingStock/components/RollingStock2Img';
1615
import trainNameWithNum from 'modules/trainschedule/components/ManageTrainSchedule/helpers/trainNameHelper';
1716
import { setFailure, setSuccess } from 'reducers/main';
18-
import type { OperationalStudiesConfSliceActions } from 'reducers/osrdconf/operationalStudiesConf';
17+
import { selectTrainToEdit } from 'reducers/osrdconf/operationalStudiesConf';
1918
import { updateTrainIdUsedForProjection, updateSelectedTrainId } from 'reducers/simulationResults';
2019
import { useAppDispatch } from 'store';
2120
import { formatToIsoDate, isoDateToMs } from 'utils/date';
@@ -55,7 +54,6 @@ const TimetableTrainCard = ({
5554
}: TimetableTrainCardProps) => {
5655
const { t } = useTranslation(['operationalStudies/scenario']);
5756
const dispatch = useAppDispatch();
58-
const { selectTrainToEdit } = useOsrdConfActions() as OperationalStudiesConfSliceActions;
5957

6058
const [postTrainSchedule] =
6159
osrdEditoastApi.endpoints.postTimetableByIdTrainSchedule.useMutation();

front/src/reducers/osrdconf/operationalStudiesConf/index.ts

+17-3
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,33 @@ export const operationalStudiesConfSlice = createSlice({
106106
export const operationalStudiesConfSliceActions = operationalStudiesConfSlice.actions;
107107

108108
export const {
109+
selectTrainToEdit,
110+
111+
// train settings reducer
109112
updateName,
110113
updateStartTime,
111114
updateInitialSpeed,
112115
updateLabels,
113116
updateRollingStockComfort,
114-
updatePathSteps,
115-
deleteItinerary,
116-
replaceItinerary,
117117
updateConstraintDistribution,
118118
toggleUsingElectricalProfiles,
119119
updateTrainCount,
120120
updateTrainDelta,
121121
updateTrainStep,
122+
upsertViaFromSuggestedOP,
123+
upsertSeveralViasFromSuggestedOP,
124+
125+
// itinerary reducer
126+
updatePathSteps,
127+
deleteItinerary,
128+
replaceItinerary,
129+
130+
// power restrictions reducer
131+
upsertPowerRestrictionRanges,
132+
cutPowerRestrictionRanges,
133+
deletePowerRestrictionRanges,
134+
resizeSegmentEndInput,
135+
resizeSegmentBeginInput,
122136
} = operationalStudiesConfSliceActions;
123137

124138
export type OperationalStudiesConfSlice = typeof operationalStudiesConfSlice;

0 commit comments

Comments
 (0)