front: linkedTrain search enhancements

Signed-off-by: SarahBellaha <[email protected]>
OpenRailAssociation · Dec 18, 2024 · ef69c8d · ef69c8d
1 parent 855aaad
commit ef69c8d
Show file tree

Hide file tree

Showing 17 changed files with 240 additions and 238 deletions.
diff --git a/front/public/locales/en/stdcm.json b/front/public/locales/en/stdcm.json
@@ -25,9 +25,11 @@
     "incompleteForm": "Incomplete form",
     "viaNotDefined": "Au moins une localisation n'est pas renseignée"
   },
-  "indicateAnteriorPath": "Indicate anterior path",
-  "indicatePosteriorPath": "Indicate posterior path",
   "leaveAt": "Leave at {{ time }}",
+  "linkedTrainDefaultCard": {
+    "anterior": "Indicate anterior train",
+    "posterior": "Indicate posterior train"
+  },
   "noConfigurationFound": {
     "title": "A configuration problem prevents you from performing a search",
     "text": "Please contact the maintenance team so they can get you back on track."
@@ -99,14 +101,16 @@
   "stdcmSimulationReport": "Path simulation report",
   "trainPath": {
     "addVia": "Add intermediate OP",
-    "anteriorPath": "Anterior path",
     "asSoonAsPossible": "as soon as possible",
     "ch": "CH",
     "ci": "CI",
     "date": "Date",
     "destination": "Destination",
+    "linkedTrain": {
+      "anterior": "Anterior train",
+      "posterior": "Posterior train"
+    },
     "origin": "Origin",
-    "posteriorPath": "Posterior path",
     "preciseTime": "precise time",
     "respectDestinationSchedule": "respect the destination schedule",
     "stopFor": "Minimum stop time",

diff --git a/front/public/locales/fr/stdcm.json b/front/public/locales/fr/stdcm.json
@@ -25,9 +25,11 @@
     "incompleteForm": "Formulaire incomplet",
     "viaNotDefined": "Au moins une localisation n'est pas renseignée"
   },
-  "indicateAnteriorPath": "Indiquer le sillon antérieur",
-  "indicatePosteriorPath": "Indiquer le sillon postérieur",
   "leaveAt": "Partir à {{ time }}",
+  "linkedTrainDefaultCard": {
+    "anterior": "Indiquer le sillon antérieur",
+    "posterior": "Indiquer le sillon postérieur"
+  },
   "noConfigurationFound": {
     "title": "Un problème de configuration vous empêche de faire une recherche",
     "text": "Veuillez contacter l'équipe de maintenance pour qu'elle puisse vous remettre sur les rails."
@@ -99,14 +101,16 @@
   "stdcmSimulationReport": "Fiche simulation",
   "trainPath": {
     "addVia": "Ajouter un PR intermédiaire",
-    "anteriorPath": "Sillon antérieur",
     "asSoonAsPossible": "dès que possible",
     "ch": "CH",
     "ci": "CI",
     "date": "Date",
     "destination": "Destination",
+    "linkedTrain": {
+      "anterior": "Sillon antérieur",
+      "posterior": "Sillon postérieur"
+    },
     "origin": "Origine",
-    "posteriorPath": "Sillon postérieur",
     "preciseTime": "horaire précis",
     "respectDestinationSchedule": "respecter l'horaire de la destination",
     "stopFor": "Temps d'arrêt minimum",

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
 
 import { Button } from '@osrd-project/ui-core';
-import { ArrowDown, ArrowUp } from '@osrd-project/ui-icons';
 import cx from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
@@ -16,7 +15,7 @@ import { useAppDispatch } from 'store';
 
 import StdcmConsist from './StdcmConsist';
 import StdcmDestination from './StdcmDestination';
-import StdcmLinkedPathSearch from './StdcmLinkedPathSearch';
+import StdcmLinkedTrainSearch from './StdcmLinkedTrainSearch';
 import StdcmOrigin from './StdcmOrigin';
 import useStaticPathfinding from '../../hooks/useStaticPathfinding';
 import type { StdcmConfigErrors } from '../../types';
@@ -148,13 +147,10 @@ const StdcmConfig = ({
       )}
       <div className="d-flex">
         <div className="d-flex flex-column">
-          <StdcmLinkedPathSearch
+          <StdcmLinkedTrainSearch
             disabled={disabled}
-            defaultCardText={t('indicateAnteriorPath')}
-            cardName={t('trainPath.anteriorPath')}
-            cardIcon={<ArrowUp size="lg" />}
-            className="anterior-linked-path"
-            linkedOp={{ extremityType: 'destination', id: origin.id }}
+            linkedTrainType="anterior"
+            linkedOpId={origin.id}
           />
           <div className="stdcm-simulation-inputs">
             <div className="stdcm-consist-container">
@@ -165,13 +161,10 @@ const StdcmConfig = ({
               <StdcmOrigin disabled={disabled} />
               <StdcmVias disabled={disabled} />
               <StdcmDestination disabled={disabled} />
-              <StdcmLinkedPathSearch
+              <StdcmLinkedTrainSearch
                 disabled={disabled}
-                defaultCardText={t('indicatePosteriorPath')}
-                cardName={t('trainPath.posteriorPath')}
-                cardIcon={<ArrowDown size="lg" />}
-                className="posterior-linked-path"
-                linkedOp={{ extremityType: 'origin', id: destination.id }}
+                linkedTrainType="posterior"
+                linkedOpId={destination.id}
               />
 
               <div

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmLinkedPathSearch.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmLinkedPathSearch.tsx
diff --git a/...ents/StdcmForm/StdcmLinkedPathResults.tsx → ...nts/StdcmForm/StdcmLinkedTrainResults.tsx b/...ents/StdcmForm/StdcmLinkedPathResults.tsx → ...nts/StdcmForm/StdcmLinkedTrainResults.tsx
@@ -5,52 +5,52 @@ import { useDispatch } from 'react-redux';
 import { useOsrdConfActions } from 'common/osrdContext';
 import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
 
-import type { StdcmLinkedPathResult, ExtremityPathStepType } from '../../types';
+import type { StdcmLinkedTrainResult, ExtremityPathStepType } from '../../types';
 
-type StdcmLinkedPathResultsProps = {
-  linkedPathResults: StdcmLinkedPathResult[];
+type StdcmLinkedTrainResultsProps = {
+  linkedTrainResults: StdcmLinkedTrainResult[];
   linkedOp: { extremityType: ExtremityPathStepType; id: string };
 };
 
-const StdcmLinkedPathResults = ({
-  linkedPathResults,
+const StdcmLinkedTrainResults = ({
+  linkedTrainResults,
   linkedOp: { extremityType, id },
-}: StdcmLinkedPathResultsProps) => {
+}: StdcmLinkedTrainResultsProps) => {
   const dispatch = useDispatch();
-  const { updateLinkedPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
+  const { updateLinkedTrainExtremity } = useOsrdConfActions() as StdcmConfSliceActions;
   return (
-    <div className="stdcm-linked-path-results">
-      {linkedPathResults.map(({ trainName, origin, destination }, index) => (
+    <div className="stdcm-linked-train-results">
+      {linkedTrainResults.map(({ trainName, origin, destination }, index) => (
         <button
-          key={`linked-path-${index}`}
+          key={`linked-train-${index}`}
           tabIndex={0}
           type="button"
-          className="linked-path-result-infos"
+          className="linked-train-result-infos"
           onClick={() => {
-            if (linkedPathResults.length === 1)
+            if (linkedTrainResults.length === 1)
               dispatch(
-                updateLinkedPathStep({
-                  linkedPathStep: extremityType,
+                updateLinkedTrainExtremity({
+                  linkedTrainExtremity: extremityType,
                   trainName,
-                  pathStep: linkedPathResults[0][extremityType],
+                  pathStep: linkedTrainResults[0][extremityType],
                   pathStepId: id,
                 })
               );
           }}
         >
-          {linkedPathResults.length > 1 ? (
+          {linkedTrainResults.length > 1 ? (
             <RadioButton
               label={trainName}
               id={`${extremityType}-${index}`}
               value={`${index}`}
-              name={`linked-path-radio-buttons-${extremityType}`}
+              name={`linked-train-radio-buttons-${extremityType}`}
               onClick={({ target }) => {
                 const resultIndex = Number((target as HTMLInputElement).value);
                 dispatch(
-                  updateLinkedPathStep({
-                    linkedPathStep: extremityType,
+                  updateLinkedTrainExtremity({
+                    linkedTrainExtremity: extremityType,
                     trainName,
-                    pathStep: linkedPathResults[resultIndex][extremityType],
+                    pathStep: linkedTrainResults[resultIndex][extremityType],
                     pathStepId: id,
                   })
                 );
@@ -62,7 +62,7 @@ const StdcmLinkedPathResults = ({
           {[origin, destination].map((opPoint) => (
             <div
               key={`linked-op-${opPoint.obj_id}-${index}`}
-              className={cx('d-flex', { 'ml-4 pl-1': linkedPathResults.length > 1 })}
+              className={cx('d-flex', { 'ml-4 pl-1': linkedTrainResults.length > 1 })}
             >
               <p className="opDetails grey50">{opPoint.date}</p>
               <p className="opDetails info60">{opPoint.time}</p>
@@ -76,4 +76,4 @@ const StdcmLinkedPathResults = ({
   );
 };
 
-export default StdcmLinkedPathResults;
+export default StdcmLinkedTrainResults;