front: ensure behavior for non-recognized points in path

Signed-off-by: Achraf Mohyeddine <[email protected]>
OpenRailAssociation · Nov 7, 2024 · 5028bd0 · 5028bd0
1 parent c3d0409
commit 5028bd0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/front/public/locales/en/operationalStudies/manageTrainSchedule.json b/front/public/locales/en/operationalStudies/manageTrainSchedule.json
@@ -91,6 +91,7 @@
   "pathfinding": "Path search",
   "pathfindingDone": "Pathfinding done.",
   "pathfindingError": "An error occurred in pathfinding: {{errorMessage}}.",
+  "InvalidTrainScheduleStep": "At least one of the waypoints could not be recognized",
   "pathfindingInProgress": "Pathfinding in progress…",
   "pathfindingMissingParams": "Missing parameters for pathfinding: {{missingElements}}.",
   "pathfindingMissingParamsSimple": "Missing information for the search",

diff --git a/front/public/locales/fr/operationalStudies/manageTrainSchedule.json b/front/public/locales/fr/operationalStudies/manageTrainSchedule.json
@@ -91,6 +91,7 @@
   "pathfinding": "Recherche d’itinéraire",
   "pathfindingDone": "Recherche d'itinéraire terminée.",
   "pathfindingError": "Erreur dans la recherche d’itinéraire : {{errorMessage}}.",
+  "InvalidTrainScheduleStep": "Au moins un des points de passage n'a pas été reconnu",
   "pathfindingInProgress": "Recherche d’itinéraire en cours…",
   "pathfindingMissingParams": "Éléments manquants pour la recherche : {{missingElements}}.",
   "pathfindingMissingParamsSimple": "Informations manquantes pour la recherche",

diff --git a/front/src/modules/pathfinding/components/Pathfinding/Pathfinding.tsx b/front/src/modules/pathfinding/components/Pathfinding/Pathfinding.tsx
@@ -1,3 +1,5 @@
+import { useEffect } from 'react';
+
 import { Alert, CheckCircle, Stop } from '@osrd-project/ui-icons';
 import cx from 'classnames';
 import { isEqual } from 'lodash';
@@ -10,6 +12,7 @@ import infraLogo from 'assets/pictures/components/tracks.svg';
 import { Spinner } from 'common/Loaders';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 import { usePathfinding } from 'modules/pathfinding/hooks/usePathfinding';
+import { isPathStepInvalid } from 'modules/pathfinding/utils';
 import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
 import { conditionalStringConcat, formatKmValue } from 'utils/strings';
 
@@ -23,7 +26,9 @@ type PathfindingProps = {
 const Pathfinding = ({ pathProperties, setPathProperties }: PathfindingProps) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
 
-  const { getOrigin, getDestination } = useOsrdConfSelectors();
+  const { getOrigin, getDestination, getPathSteps } = useOsrdConfSelectors();
+  const pathSteps = useSelector(getPathSteps);
+  const hasInvalidPathStep = pathSteps.some((pathStep) => isPathStepInvalid(pathStep));
   const origin = useSelector(getOrigin, isEqual);
   const destination = useSelector(getDestination, isEqual);
   const { rollingStock } = useStoreDataForRollingStockSelector();
@@ -61,7 +66,8 @@ const Pathfinding = ({ pathProperties, setPathProperties }: PathfindingProps) =>
         !pathfindingState.running &&
         pathfindingState.done &&
         origin &&
-        destination && (
+        destination &&
+        !hasInvalidPathStep && (
           <div className="content pathfinding-done">
             <span className="lead" data-testid="result-pathfinding-done">
               <CheckCircle />
@@ -83,7 +89,7 @@ const Pathfinding = ({ pathProperties, setPathProperties }: PathfindingProps) =>
         </div>
       ) : (
         <>
-          {pathfindingState.error && (
+          {(pathfindingState.error || hasInvalidPathStep) && (
             <div
               className={cx('content pathfinding-error', {
                 'mt-2': infra && infra.state !== 'CACHED',
@@ -93,7 +99,9 @@ const Pathfinding = ({ pathProperties, setPathProperties }: PathfindingProps) =>
                 <Stop />
               </span>
               <span className="flex-grow-1">
-                {t('pathfindingError', { errorMessage: t(pathfindingState.error) })}
+                {hasInvalidPathStep
+                  ? t('InvalidTrainScheduleStep')
+                  : t('pathfindingError', { errorMessage: t(pathfindingState.error) })}
               </span>
             </div>
           )}

diff --git a/front/src/modules/pathfinding/hooks/usePathfinding.ts b/front/src/modules/pathfinding/hooks/usePathfinding.ts
@@ -219,7 +219,7 @@ export const usePathfinding = (
         },
       });
     }
-  }, [origin?.id, destination?.id, rollingStock]);
+  }, [origin, destination, rollingStock]);
 
   const handleInvalidPathItems = (
     steps: (PathStep | null)[],