fix clara

OpenRailAssociation · Dec 2, 2024 · 073b940 · 073b940
1 parent 5b48a87
commit 073b940
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 33 deletions.
diff --git a/front/public/locales/fr/stdcm.json b/front/public/locales/fr/stdcm.json
@@ -23,8 +23,6 @@
       "invalidDate": "Renseignez une date entre le {{startDate}} et le {{endDate}}"
     }
   },
-  "indicateAnteriorPath": "Indiquer le sillon antérieur",
-  "indicatePosteriorPath": "Indiquer le sillon postérieur",
   "leaveAt": "Partir à {{ time }}",
   "linkedTrainDefaultCard": {
     "anterior": "Indiquer le sillon antérieur",

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmLinkedTrainResults.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmLinkedTrainResults.tsx
@@ -17,7 +17,7 @@ const StdcmLinkedTrainResults = ({
   linkedOp: { extremityType, id },
 }: StdcmLinkedTrainResultsProps) => {
   const dispatch = useDispatch();
-  const { updateLinkedPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
+  const { updateLinkedTrainExtremity } = useOsrdConfActions() as StdcmConfSliceActions;
   return (
     <div className="stdcm-linked-train-results">
       {linkedTrainResults.map(({ trainName, origin, destination }, index) => (
@@ -29,8 +29,8 @@ const StdcmLinkedTrainResults = ({
           onClick={() => {
             if (linkedTrainResults.length === 1)
               dispatch(
-                updateLinkedPathStep({
-                  linkedPathStep: extremityType,
+                updateLinkedTrainExtremity({
+                  linkedTrainExtremity: extremityType,
                   trainName,
                   pathStep: linkedTrainResults[0][extremityType],
                   pathStepId: id,
@@ -47,8 +47,8 @@ const StdcmLinkedTrainResults = ({
               onClick={({ target }) => {
                 const resultIndex = Number((target as HTMLInputElement).value);
                 dispatch(
-                  updateLinkedPathStep({
-                    linkedPathStep: extremityType,
+                  updateLinkedTrainExtremity({
+                    linkedTrainExtremity: extremityType,
                     trainName,
                     pathStep: linkedTrainResults[resultIndex][extremityType],
                     pathStepId: id,

diff --git a/front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx b/front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx
@@ -27,7 +27,7 @@ const SimulationReportSheet = ({
   let renderedIndex = 0;
 
   const { rollingStock, speedLimitByTag, departure_time: departureTime, creationDate } = stdcmData;
-  const { anteriorPath, posteriorPath } = stdcmLinkedTrains;
+  const { anteriorTrain, posteriorTrain } = stdcmLinkedTrains;
 
   const convoyMass = consist?.totalMass ?? rollingStock.mass / 1000;
   const convoyLength = consist?.totalLength ?? rollingStock.length;
@@ -161,11 +161,11 @@ const SimulationReportSheet = ({
                 <Text style={styles.convoyAndRoute.from}>{t('from')}</Text>
               </View>
               <Text style={styles.convoyAndRoute.fromNumber}>
-                {anteriorPath?.trainName || fakeInformation.path_number1}
+                {anteriorTrain?.trainName || fakeInformation.path_number1}
               </Text>
               <Text style={styles.convoyAndRoute.fromScheduled}>
-                {anteriorPath &&
-                  t('scheduledArrival', { date: anteriorPath.date, time: anteriorPath.time })}
+                {anteriorTrain &&
+                  t('scheduledArrival', { date: anteriorTrain.date, time: anteriorTrain.time })}
               </Text>
             </View>
             <View style={styles.convoyAndRoute.stopTableContainer}>
@@ -236,11 +236,11 @@ const SimulationReportSheet = ({
             {/* TODO: Add path number and date from reference path when it becomes avalaible */}
             <View style={styles.convoyAndRoute.forBanner}>
               <Text style={styles.convoyAndRoute.forScheduled}>
-                {posteriorPath &&
-                  t('scheduledDeparture', { date: posteriorPath.date, time: posteriorPath.time })}
+                {posteriorTrain &&
+                  t('scheduledDeparture', { date: posteriorTrain.date, time: posteriorTrain.time })}
               </Text>
               <Text style={styles.convoyAndRoute.forNumber}>
-                {posteriorPath?.trainName || fakeInformation.path_number2}
+                {posteriorTrain?.trainName || fakeInformation.path_number2}
               </Text>
               <View style={styles.convoyAndRoute.forBox}>
                 <Text style={styles.convoyAndRoute.for}>{t('for')}</Text>

diff --git a/front/src/applications/stdcm/hooks/useLinkedTrainSearch.ts b/front/src/applications/stdcm/hooks/useLinkedTrainSearch.ts
@@ -8,7 +8,7 @@ import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 import { isEqualDate } from 'utils/date';
 
-import type { StdcmLinkedTrainResult, StdcmLinkedPathStep } from '../types';
+import type { StdcmLinkedTrainResult, StdcmLinkedTrainExtremity } from '../types';
 import computeOpSchedules from '../utils/computeOpSchedules';
 
 const useLinkedTrainSearch = () => {
@@ -96,11 +96,14 @@ const useLinkedTrainSearch = () => {
           if (opDetails === undefined) return undefined;
           return {
             trainName: result.train_name,
-            origin: { ...opDetails.origin, ...computedOpSchedules.origin } as StdcmLinkedPathStep,
+            origin: {
+              ...opDetails.origin,
+              ...computedOpSchedules.origin,
+            } as StdcmLinkedTrainExtremity,
             destination: {
               ...opDetails.destination,
               ...computedOpSchedules.destination,
-            } as StdcmLinkedPathStep,
+            } as StdcmLinkedTrainExtremity,
           };
         })
       );

diff --git a/front/src/applications/stdcm/types.ts b/front/src/applications/stdcm/types.ts
@@ -82,12 +82,12 @@ export type StdcmResults = {
 };
 
 export type LinkedTrains = {
-  anteriorPath?: {
+  anteriorTrain?: {
     date: string;
     time: string;
     trainName: string;
   };
-  posteriorPath?: {
+  posteriorTrain?: {
     date: string;
     time: string;
     trainName: string;
@@ -181,7 +181,7 @@ export enum StdcmStopTypes {
   SERVICE_STOP = 'serviceStop',
 }
 
-export type StdcmLinkedPathStep = {
+export type StdcmLinkedTrainExtremity = {
   ch: string;
   date: string;
   geographic: GeoJsonPoint;
@@ -194,8 +194,8 @@ export type StdcmLinkedPathStep = {
 };
 
 export type StdcmLinkedTrainResult = {
-  destination: StdcmLinkedPathStep;
-  origin: StdcmLinkedPathStep;
+  destination: StdcmLinkedTrainExtremity;
+  origin: StdcmLinkedTrainExtremity;
   trainName: string;
 };
 

diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -6,7 +6,7 @@ import {
   ArrivalTimeTypes,
   StdcmStopTypes,
   type ExtremityPathStepType,
-  type StdcmLinkedPathStep,
+  type StdcmLinkedTrainExtremity,
 } from 'applications/stdcm/types';
 import { defaultCommonConf, buildCommonConfReducers } from 'reducers/osrdconf/osrdConfCommon';
 import type { OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types';
@@ -25,8 +25,8 @@ export const stdcmConfInitialState: OsrdStdcmConfState = {
   maxSpeed: undefined,
   towedRollingStockID: undefined,
   linkedTrains: {
-    anteriorPath: undefined,
-    posteriorPath: undefined,
+    anteriorTrain: undefined,
+    posteriorTrain: undefined,
   },
   ...defaultCommonConf,
 };
@@ -153,16 +153,16 @@ export const stdcmConfSlice = createSlice({
         (pathStep) => pathStep.id !== action.payload
       );
     },
-    updateLinkedPathStep(
+    updateLinkedTrainExtremity(
       state: Draft<OsrdStdcmConfState>,
       action: PayloadAction<{
-        linkedPathStep: ExtremityPathStepType;
+        linkedTrainExtremity: ExtremityPathStepType;
         trainName: string;
-        pathStep: StdcmLinkedPathStep;
+        pathStep: StdcmLinkedTrainExtremity;
         pathStepId: string;
       }>
     ) {
-      const { linkedPathStep, trainName, pathStep, pathStepId } = action.payload;
+      const { linkedTrainExtremity, trainName, pathStep, pathStepId } = action.payload;
       const { name, ch, uic, geographic, isoArrivalTime, date, time, trigram } = pathStep;
       const newPathStep = {
         name,
@@ -172,15 +172,15 @@ export const stdcmConfSlice = createSlice({
         coordinates: geographic.coordinates,
         arrival: isoArrivalTime,
         trigram,
-        ...(linkedPathStep === 'origin' && { arrivalType: ArrivalTimeTypes.PRECISE_TIME }),
+        ...(linkedTrainExtremity === 'origin' && { arrivalType: ArrivalTimeTypes.PRECISE_TIME }),
       };
 
       const newLinkedTrain = { date, time, trainName };
 
-      if (linkedPathStep === 'destination') {
-        state.linkedTrains.anteriorPath = newLinkedTrain;
+      if (linkedTrainExtremity === 'destination') {
+        state.linkedTrains.anteriorTrain = newLinkedTrain;
       } else {
-        state.linkedTrains.posteriorPath = newLinkedTrain;
+        state.linkedTrains.posteriorTrain = newLinkedTrain;
       }
       const newPathSteps = state.stdcmPathSteps.map((step) =>
         step.id === action.payload.pathStepId