front: rename allWaypoints to pathStepsAndSuggestedOPs

This list doesn't only contain waypoints, it also contains all suggested OPs. Signed-off-by: Simon Ser <contact@emersion.fr>
OpenRailAssociation · Jan 3, 2025 · 53ed0cf · 53ed0cf
1 parent 661b5fc
commit 53ed0cf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/front/src/applications/operationalStudies/hooks/useManageTrainScheduleContext.tsx b/front/src/applications/operationalStudies/hooks/useManageTrainScheduleContext.tsx
@@ -23,7 +23,7 @@ type ManageTrainScheduleContextType = {
   pathfindingState: PathfindingState;
   infraInfo: { infra?: InfraWithState; reloadCount: number };
   /** Operational points along the path (including origin and destination) and vias added by clicking on map */
-  allWaypoints?: SuggestedOP[];
+  pathStepsAndSuggestedOPs?: SuggestedOP[];
 } | null;
 
 const ManageTrainScheduleContext = createContext<ManageTrainScheduleContextType>(null);
@@ -45,7 +45,7 @@ export const ManageTrainScheduleContextProvider = ({
     [pathProperties]
   );
 
-  const allWaypoints = useMemo(() => {
+  const pathStepsAndSuggestedOPs = useMemo(() => {
     if (!pathProperties) return undefined;
     return upsertPathStepsInOPs(pathProperties.suggestedOperationalPoints, compact(pathSteps));
   }, [pathProperties?.suggestedOperationalPoints, pathSteps]);
@@ -58,7 +58,7 @@ export const ManageTrainScheduleContextProvider = ({
       launchPathfinding,
       pathfindingState,
       infraInfo,
-      allWaypoints,
+      pathStepsAndSuggestedOPs,
     }),
     [
       pathProperties,
@@ -67,7 +67,7 @@ export const ManageTrainScheduleContextProvider = ({
       launchPathfinding,
       pathfindingState,
       infraInfo,
-      allWaypoints,
+      pathStepsAndSuggestedOPs,
     ]
   );
 

diff --git a/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx b/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
@@ -35,7 +35,8 @@ type ManageTrainScheduleProps = {
 
 const ManageTrainSchedule = ({ trainIdToEdit }: ManageTrainScheduleProps) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
-  const { pathProperties, voltageRanges, allWaypoints } = useManageTrainScheduleContext();
+  const { pathProperties, voltageRanges, pathStepsAndSuggestedOPs } =
+    useManageTrainScheduleContext();
 
   const { getOrigin, getDestination, getPathSteps } = useOsrdConfSelectors();
   const origin = useSelector(getOrigin);
@@ -120,7 +121,7 @@ const ManageTrainSchedule = ({ trainIdToEdit }: ManageTrainScheduleProps) => {
     // If pathProperties is defined we know that pathSteps won't have any null values
     content: (
       <TimesStopsInput
-        allWaypoints={allWaypoints}
+        pathStepsAndSuggestedOPs={pathStepsAndSuggestedOPs}
         startTime={new Date(startTime)}
         pathSteps={compact(pathSteps)}
       />

diff --git a/front/src/modules/pathfinding/components/Itinerary/Itinerary.tsx b/front/src/modules/pathfinding/components/Itinerary/Itinerary.tsx
@@ -38,7 +38,7 @@ const Itinerary = () => {
   const { t } = useTranslation('operationalStudies/manageTrainSchedule');
   const { openModal } = useModal();
 
-  const { pathProperties, setPathProperties, launchPathfinding, allWaypoints } =
+  const { pathProperties, setPathProperties, launchPathfinding, pathStepsAndSuggestedOPs } =
     useManageTrainScheduleContext();
 
   const zoomToFeaturePoint = (lngLat?: Position) => {
@@ -119,15 +119,15 @@ const Itinerary = () => {
           >
             <Route />
           </button>
-          {allWaypoints && (
+          {pathStepsAndSuggestedOPs && (
             <button
               data-testid="add-waypoints-button"
               className="col ml-1 my-1 text-white btn bg-info btn-sm"
               type="button"
               onClick={() =>
                 openModal(
                   <ModalSuggestedVias
-                    suggestedVias={allWaypoints}
+                    suggestedVias={pathStepsAndSuggestedOPs}
                     launchPathfinding={launchPathfinding}
                   />
                 )

diff --git a/front/src/modules/timesStops/TimesStopsInput.tsx b/front/src/modules/timesStops/TimesStopsInput.tsx
@@ -28,21 +28,21 @@ type ClearButtonProps = {
   removeVia: () => void;
   rowIndex: number;
   rowData: TimesStopsInputRow;
-  allWaypoints?: SuggestedOP[];
+  pathStepsAndSuggestedOPs?: SuggestedOP[];
   pathSteps: PathStep[];
 };
 
 const createClearViaButton = ({
   removeVia,
   rowIndex,
   rowData,
-  allWaypoints,
+  pathStepsAndSuggestedOPs,
   pathSteps,
 }: ClearButtonProps) => {
   const isClearBtnShown =
-    allWaypoints &&
+    pathStepsAndSuggestedOPs &&
     rowIndex > 0 &&
-    rowIndex < allWaypoints.length - 1 &&
+    rowIndex < pathStepsAndSuggestedOPs.length - 1 &&
     isVia(pathSteps || [], rowData, { withKP: true }) &&
     (!isNil(rowData.stopFor) ||
       rowData.theoreticalMargin !== undefined ||
@@ -59,12 +59,16 @@ const createClearViaButton = ({
 };
 
 type TimesStopsInputProps = {
-  allWaypoints?: SuggestedOP[];
+  pathStepsAndSuggestedOPs?: SuggestedOP[];
   startTime: Date;
   pathSteps: PathStep[];
 };
 
-const TimesStopsInput = ({ allWaypoints, startTime, pathSteps }: TimesStopsInputProps) => {
+const TimesStopsInput = ({
+  pathStepsAndSuggestedOPs,
+  startTime,
+  pathSteps,
+}: TimesStopsInputProps) => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation('timesStops');
   const { updatePathSteps, upsertSeveralViasFromSuggestedOP } =
@@ -128,10 +132,10 @@ const TimesStopsInput = ({ allWaypoints, startTime, pathSteps }: TimesStopsInput
 
   useEffect(() => {
     const fetchAndFormatRows = async () => {
-      if (allWaypoints) {
-        const trackIds = allWaypoints.map((op) => op.track);
+      if (pathStepsAndSuggestedOPs) {
+        const trackIds = pathStepsAndSuggestedOPs.map((op) => op.track);
         const trackSections = await getTrackSectionsByIds(trackIds);
-        const suggestedOPsWithTrackNames = allWaypoints.map((op) => ({
+        const suggestedOPsWithTrackNames = pathStepsAndSuggestedOPs.map((op) => ({
           ...op,
           trackName: trackSections[op.track]?.extensions?.sncf?.track_name,
         }));
@@ -147,7 +151,7 @@ const TimesStopsInput = ({ allWaypoints, startTime, pathSteps }: TimesStopsInput
     };
 
     fetchAndFormatRows();
-  }, [allWaypoints, pathSteps, startTime]);
+  }, [pathStepsAndSuggestedOPs, pathSteps, startTime]);
 
   return (
     <TimesStops
@@ -159,7 +163,7 @@ const TimesStopsInput = ({ allWaypoints, startTime, pathSteps }: TimesStopsInput
             removeVia: () => clearPathStep(rowData),
             rowIndex,
             rowData,
-            allWaypoints,
+            pathStepsAndSuggestedOPs,
             pathSteps,
           }),
       }}