Skip to content

Commit

Permalink
front: handle both invalid trigrams and uics as invalid op
Browse files Browse the repository at this point in the history
Signed-off-by: Achraf Mohyeddine <[email protected]>
  • Loading branch information
achrafmohye committed Jan 21, 2025
1 parent 9ddc06c commit b7050a2
Showing 1 changed file with 33 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
type TrainScheduleResult,
type PathfindingResult,
type SearchResultItemOperationalPoint,
type PathfindingInputError,
} from 'common/api/osrdEditoastApi';
import { useOsrdConfActions } from 'common/osrdContext';
import buildOpSearchQuery from 'modules/operationalPoint/helpers/buildOpSearchQuery';
Expand Down Expand Up @@ -74,7 +75,24 @@ const useSetupItineraryForTrainUpdate = (trainIdToEdit: number) => {
const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();

useEffect(() => {
const fetchPathStepsCoordinates = async (trainSchedule: TrainScheduleResult) => {
const fetchPathStepsCoordinates = async (
trainSchedule: TrainScheduleResult,
invalidPathItems: Extract<
PathfindingInputError,
{ error_type: 'invalid_path_items' }
>['items'] = []
) => {
const invalidIdentifiers = invalidPathItems
.map((item) => {
if ('trigram' in item.path_item) {
return item.path_item.trigram;
}
if ('uic' in item.path_item) {
return item.path_item.uic;
}
return null;
})
.filter((value): value is string | number => value !== null);
// get track sections
const trackSectionIds: string[] = [];
trainSchedule.path.forEach((step) => {
Expand All @@ -97,6 +115,8 @@ const useSetupItineraryForTrainUpdate = (trainIdToEdit: number) => {
const pathStepsWithCoordinates = trainSchedule.path.map((step, index) => {
let coordinates: Position | undefined;
let name: string | undefined;
let uic: number | undefined;
let isInvalid: boolean | undefined;

if ('track' in step) {
const track = tracks[step.track];
Expand All @@ -107,19 +127,23 @@ const useSetupItineraryForTrainUpdate = (trainIdToEdit: number) => {
let op: SearchResultItemOperationalPoint | undefined;
if ('uic' in step) {
op = ops.find((o) => o.uic === step.uic);
uic = step.uic;
isInvalid = invalidIdentifiers.includes(step.uic);
} else if ('trigram' in step) {
op = ops.find((o) => o.trigram === step.trigram);
isInvalid = invalidIdentifiers.includes(step.trigram);
} else {
op = ops.find((o) => o.obj_id === step.operational_point);
}
coordinates = op?.geographic.coordinates;
name = `${op?.name}`;
name = `${op?.name || uic?.toString()}`;
}

return {
...computeBasePathStep(trainSchedule, index),
coordinates,
name,
isInvalid,
};
});

Expand Down Expand Up @@ -153,7 +177,13 @@ const useSetupItineraryForTrainUpdate = (trainIdToEdit: number) => {
};
const pathfindingResult = await postPathfindingBlocks(params).unwrap();
if (pathfindingResult.status !== 'success') {
fetchPathStepsCoordinates(trainSchedule);
const invalidPathItems =
pathfindingResult.failed_status === 'pathfinding_input_error' &&
pathfindingResult.error_type === 'invalid_path_items'
? pathfindingResult.items
: [];

fetchPathStepsCoordinates(trainSchedule, invalidPathItems);
return null;
}
const pathPropertiesParams: PostInfraByInfraIdPathPropertiesApiArg = {
Expand Down

0 comments on commit b7050a2

Please sign in to comment.