fixup! front: add new stdcm error when origin and destination are the…

… same
OpenRailAssociation · Jan 14, 2025 · df926d1 · df926d1
1 parent 94aee2d
commit df926d1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/front/public/locales/en/stdcm.json b/front/public/locales/en/stdcm.json
@@ -111,7 +111,7 @@
     "noScheduledPoint": "The calculation requires either the origin or destination schedule.",
     "pathfindingFailed": "No path have been found for these waypoints.",
     "requestFailed": "Calculation error for last minute train path",
-    "sameOriginAndDestination": "The origin and destination must be different."
+    "zeroLengthPath": "The path cannot have a null length."
   },
   "stdcmResults": "Results",
   "stdcmSimulationReport": "Path simulation report",

diff --git a/front/public/locales/fr/stdcm.json b/front/public/locales/fr/stdcm.json
@@ -111,7 +111,7 @@
     "noScheduledPoint": "Le calcul a besoin de l'horaire d'origine ou de celui de la destination.",
     "pathfindingFailed": "Aucun chemin n'a été trouvé pour ces points de jalonnement.",
     "requestFailed": "Erreur de calcul Sillon de dernière minute",
-    "sameOriginAndDestination": "L'origine et la destination doivent être différentes."
+    "zeroLengthPath": "Le chemin ne peut pas avoir de longueur nulle."
   },
   "stdcmResults": "Résultats",
   "stdcmSimulationReport": "Fiche simulation",

diff --git a/front/src/applications/stdcm/types.ts b/front/src/applications/stdcm/types.ts
@@ -168,7 +168,7 @@ export enum StdcmConfigErrorTypes {
   PATHFINDING_FAILED = 'pathfindingFailed',
   BOTH_POINT_SCHEDULED = 'bothPointAreScheduled',
   NO_SCHEDULED_POINT = 'noScheduledPoint',
-  SAME_ORIGIN_AND_DESTINATION = 'sameOriginAndDestination',
+  ZERO_LENGTH_PATH = 'zeroLengthPath',
 }
 
 export type StdcmConfigErrors = {

diff --git a/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts b/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts
@@ -23,24 +23,20 @@ const checkStdcmConfigErrors = (
     throw new Error('Last step can not be a via');
   }
 
+  if (
+    origin.location!.uic === destination.location!.uic &&
+    origin.location!.secondary_code === destination.location!.secondary_code
+  ) {
+    return { errorType: StdcmConfigErrorTypes.ZERO_LENGTH_PATH };
+  }
+
   if (pathfindingStateError) {
     return { errorType: StdcmConfigErrorTypes.PATHFINDING_FAILED };
   }
 
   const isOriginRespectDestinationSchedule =
     origin.arrivalType === ArrivalTimeTypes.RESPECT_DESTINATION_SCHEDULE;
 
-  if (
-    'uic' in origin &&
-    'uic' in destination &&
-    'ch' in origin &&
-    'ch' in destination &&
-    origin.uic === destination.uic &&
-    origin.ch === destination.ch
-  ) {
-    return { errorType: StdcmConfigErrorTypes.SAME_ORIGIN_AND_DESTINATION };
-  }
-
   const isDestinationASAP = destination.arrivalType === ArrivalTimeTypes.ASAP;
 
   const areBothPointsNotSchedule = isOriginRespectDestinationSchedule && isDestinationASAP;