front: fix pathfinding success message persistence

OpenRailAssociation · Nov 30, 2023 · 74dbdee · 74dbdee
1 parent 9a4e4a3
commit 74dbdee
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx b/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
@@ -103,7 +103,7 @@ export default function ManageTrainSchedule() {
     content: (
       <div className="osrd-config-item-container-map" data-testid="map">
         <span className="floating-itinerary">
-          <Itinerary />
+          <Itinerary path={pathFinding} />
         </span>
         <Map />
       </div>

diff --git a/front/src/common/Pathfinding/Pathfinding.tsx b/front/src/common/Pathfinding/Pathfinding.tsx
@@ -172,6 +172,7 @@ function init({
 
 interface PathfindingProps {
   zoomToFeature: (lngLat: Position, id?: undefined, source?: undefined) => void;
+  path?: Path;
 }
 
 export function getPathfindingQuery({
@@ -257,7 +258,7 @@ export function getPathfindingQuery({
   return null;
 }
 
-function Pathfinding({ zoomToFeature }: PathfindingProps) {
+function Pathfinding({ zoomToFeature, path }: PathfindingProps) {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
   const [pathfindingRequest, setPathfindingRequest] =
     useState<ReturnType<typeof postPathfinding>>();
@@ -293,7 +294,6 @@ function Pathfinding({ zoomToFeature }: PathfindingProps) {
     }
   );
   const [reloadInfra] = osrdEditoastApi.usePostInfraByIdLoadMutation();
-
   useEffect(() => {
     if (reloadCount <= 5 && infra && infra.state === 'TRANSIENT_ERROR') {
       setTimeout(() => {
@@ -518,23 +518,24 @@ function Pathfinding({ zoomToFeature }: PathfindingProps) {
           ? displayInfraSoftError()
           : infra.state === 'ERROR' && displayInfraHardError())}
 
-      {isPathFindingActive ? (
+      {!pathfindingState.error && !pathfindingState.running && path && origin && destination && (
+        <div className="content pathfinding-done">
+          <span className="lead">
+            <GoCheckCircle />
+          </span>
+          <span className="flex-grow-1">{t('pathfindingDone')}</span>
+          <small className="text-secondary">
+            {geojson?.length && formatKmValue(geojson?.length / 1000, 3)}
+          </small>
+        </div>
+      )}
+
+      {!path && isPathFindingActive ? (
         <div className={`content pathfinding-none ${infra && infra.state !== 'CACHED' && 'mt-2'}`}>
           {t('pathfindingNoState')}
         </div>
       ) : (
         <>
-          {pathfindingState.done && !pathfindingState.error && (
-            <div className="content pathfinding-done">
-              <span className="lead">
-                <GoCheckCircle />
-              </span>
-              <span className="flex-grow-1">{t('pathfindingDone')}</span>
-              <small className="text-secondary">
-                {geojson?.length && formatKmValue(geojson?.length / 1000, 3)}
-              </small>
-            </div>
-          )}
           {pathfindingState.error && (
             <div
               className={`content pathfinding-error ${infra && infra.state !== 'CACHED' && 'mt-2'}`}

diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/Itinerary.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/Itinerary.tsx
@@ -13,8 +13,13 @@ import { getMap } from 'reducers/map/selectors';
 import Pathfinding from 'common/Pathfinding/Pathfinding';
 import TypeAndPath from 'common/Pathfinding/TypeAndPath';
 import { GoRocket } from 'react-icons/go';
+import { Path } from 'common/api/osrdEditoastApi';
 
-function Itinerary() {
+type ItineraryProps = {
+  path?: Path;
+};
+
+function Itinerary({ path }: ItineraryProps) {
   const origin = useSelector(getOrigin);
   const destination = useSelector(getDestination);
   const vias = useSelector(getVias);
@@ -93,7 +98,7 @@ function Itinerary() {
   return (
     <div className="osrd-config-item">
       <div className="mb-2 d-flex">
-        <Pathfinding zoomToFeature={zoomToFeature} />
+        <Pathfinding zoomToFeature={zoomToFeature} path={path} />
         <button
           type="button"
           className="btn btn-sm btn-only-icon btn-white px-3 ml-2"