Skip to content

Commit c667a50

Browse files
committed
front: fetch directly rollingStock in usePathfinding
Signed-off-by: Clara Ni <clara.ni@outlook.fr>
1 parent 0196665 commit c667a50

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

front/src/modules/pathfinding/hooks/usePathfinding.ts

+10-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import type {
1313
PostInfraByInfraIdPathPropertiesApiArg,
1414
} from 'common/api/osrdEditoastApi';
1515
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
16+
import { useOsrdConfSelectors } from 'common/osrdContext';
1617
import {
1718
formatSuggestedOperationalPoints,
1819
getPathfindingQuery,
1920
matchPathStepAndOp,
2021
} from 'modules/pathfinding/utils';
21-
import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
2222
import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
2323
import { setFailure, setWarning } from 'reducers/main';
2424
import { replaceItinerary, updatePathSteps } from 'reducers/osrdconf/operationalStudiesConf';
@@ -51,11 +51,14 @@ const usePathfinding = (
5151
const pathSteps = useSelector(getPathSteps);
5252
const powerRestrictions = useSelector(getPowerRestrictions);
5353
const { infra, reloadCount, setIsInfraError } = useInfraStatus();
54-
const { rollingStock } = useStoreDataForRollingStockSelector();
54+
const { getRollingStockID } = useOsrdConfSelectors();
55+
const rollingStockId = useSelector(getRollingStockID);
5556

5657
const [pathfindingState, setPathfindingState] =
5758
useState<PathfindingState>(initialPathfindingState);
5859

60+
const [getRollingStockById] =
61+
osrdEditoastApi.endpoints.getRollingStockByRollingStockId.useLazyQuery();
5962
const [postPathfindingBlocks] =
6063
osrdEditoastApi.endpoints.postInfraByInfraIdPathfindingBlocks.useLazyQuery();
6164
const [postPathProperties] =
@@ -186,6 +189,10 @@ const usePathfinding = (
186189
}
187190

188191
setIsRunning();
192+
193+
const rollingStock = rollingStockId
194+
? await getRollingStockById({ rollingStockId }).unwrap()
195+
: undefined;
189196
const pathfindingInput = getPathfindingQuery({
190197
infraId,
191198
rollingStock,
@@ -257,7 +264,7 @@ const usePathfinding = (
257264
}
258265
}
259266
},
260-
[rollingStock, infra]
267+
[rollingStockId, infra]
261268
);
262269

263270
useEffect(() => {

0 commit comments

Comments
 (0)