Skip to content

Commit 5c8674c

Browse files
SarahBellahaSarahBellaha
committed
front: rename linkedPath as linkedTrain
Signed-off-by: SarahBellaha <[email protected]>
1 parent c3d0409 commit 5c8674c

File tree

13 files changed

+67
-67
lines changed

13 files changed

+67
-67
lines changed

‎front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { useAppDispatch } from 'store';
1616

1717
import StdcmConsist from './StdcmConsist';
1818
import StdcmDestination from './StdcmDestination';
19-
import StdcmLinkedPathSearch from './StdcmLinkedPathSearch';
19+
import StdcmLinkedTrainSearch from './StdcmLinkedTrainSearch';
2020
import StdcmOrigin from './StdcmOrigin';
2121
import useStaticPathfinding from '../../hooks/useStaticPathfinding';
2222
import type { StdcmConfigErrors } from '../../types';
@@ -143,7 +143,7 @@ const StdcmConfig = ({
143143
)}
144144
<div className="d-flex">
145145
<div className="d-flex flex-column">
146-
<StdcmLinkedPathSearch
146+
<StdcmLinkedTrainSearch
147147
disabled={disabled}
148148
defaultCardText={t('indicateAnteriorPath')}
149149
cardName={t('trainPath.anteriorPath')}
@@ -160,7 +160,7 @@ const StdcmConfig = ({
160160
<StdcmOrigin disabled={disabled} />
161161
<StdcmVias disabled={disabled} />
162162
<StdcmDestination disabled={disabled} />
163-
<StdcmLinkedPathSearch
163+
<StdcmLinkedTrainSearch
164164
disabled={disabled}
165165
defaultCardText={t('indicatePosteriorPath')}
166166
cardName={t('trainPath.posteriorPath')}

‎front/src/applications/stdcm/components/StdcmForm/StdcmLinkedPathResults.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmLinkedTrainResults.tsx

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,40 @@ import { useDispatch } from 'react-redux';
55
import { useOsrdConfActions } from 'common/osrdContext';
66
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
77

8-
import type { StdcmLinkedPathResult, ExtremityPathStepType } from '../../types';
8+
import type { StdcmLinkedTrainResult, ExtremityPathStepType } from '../../types';
99

10-
type StdcmLinkedPathResultsProps = {
11-
linkedPathResults: StdcmLinkedPathResult[];
10+
type StdcmLinkedTrainResultsProps = {
11+
linkedTrainResults: StdcmLinkedTrainResult[];
1212
linkedOp: { extremityType: ExtremityPathStepType; id: string };
1313
};
1414

15-
const StdcmLinkedPathResults = ({
16-
linkedPathResults,
15+
const StdcmLinkedTrainResults = ({
16+
linkedTrainResults,
1717
linkedOp: { extremityType, id },
18-
}: StdcmLinkedPathResultsProps) => {
18+
}: StdcmLinkedTrainResultsProps) => {
1919
const dispatch = useDispatch();
2020
const { updateLinkedPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
2121
return (
2222
<div className="stdcm-linked-path-results">
23-
{linkedPathResults.map(({ trainName, origin, destination }, index) => (
23+
{linkedTrainResults.map(({ trainName, origin, destination }, index) => (
2424
<button
2525
key={`linked-path-${index}`}
2626
tabIndex={0}
2727
type="button"
2828
className="linked-path-result-infos"
2929
onClick={() => {
30-
if (linkedPathResults.length === 1)
30+
if (linkedTrainResults.length === 1)
3131
dispatch(
3232
updateLinkedPathStep({
3333
linkedPathStep: extremityType,
3434
trainName,
35-
pathStep: linkedPathResults[0][extremityType],
35+
pathStep: linkedTrainResults[0][extremityType],
3636
pathStepId: id,
3737
})
3838
);
3939
}}
4040
>
41-
{linkedPathResults.length > 1 ? (
41+
{linkedTrainResults.length > 1 ? (
4242
<RadioButton
4343
label={trainName}
4444
id={`${extremityType}-${index}`}
@@ -50,7 +50,7 @@ const StdcmLinkedPathResults = ({
5050
updateLinkedPathStep({
5151
linkedPathStep: extremityType,
5252
trainName,
53-
pathStep: linkedPathResults[resultIndex][extremityType],
53+
pathStep: linkedTrainResults[resultIndex][extremityType],
5454
pathStepId: id,
5555
})
5656
);
@@ -62,7 +62,7 @@ const StdcmLinkedPathResults = ({
6262
{[origin, destination].map((opPoint) => (
6363
<div
6464
key={`linked-op-${opPoint.obj_id}-${index}`}
65-
className={cx('d-flex', { 'ml-4 pl-1': linkedPathResults.length > 1 })}
65+
className={cx('d-flex', { 'ml-4 pl-1': linkedTrainResults.length > 1 })}
6666
>
6767
<p className="opDetails grey50">{opPoint.date}</p>
6868
<p className="opDetails info60">{opPoint.time}</p>
@@ -76,4 +76,4 @@ const StdcmLinkedPathResults = ({
7676
);
7777
};
7878

79-
export default StdcmLinkedPathResults;
79+
export default StdcmLinkedTrainResults;

‎front/src/applications/stdcm/components/StdcmForm/StdcmLinkedPathSearch.tsx ‎front/src/applications/stdcm/components/StdcmForm/StdcmLinkedTrainSearch.tsx

+19-19
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { DatePicker, Input } from '@osrd-project/ui-core';
44
import { Gear } from '@osrd-project/ui-icons';
55
import { useTranslation } from 'react-i18next';
66

7-
import useLinkedPathSearch from 'applications/stdcm/hooks/useLinkedPathSearch';
7+
import useLinkedTrainSearch from 'applications/stdcm/hooks/useLinkedTrainSearch';
88

99
import StdcmCard from './StdcmCard';
1010
import StdcmDefaultCard from './StdcmDefaultCard';
11-
import StdcmLinkedPathResults from './StdcmLinkedPathResults';
11+
import StdcmLinkedTrainResults from './StdcmLinkedTrainResults';
1212
import type { ExtremityPathStepType } from '../../types';
1313

14-
type StdcmLinkedPathSearchProps = {
14+
type StdcmLinkedTrainSearchProps = {
1515
disabled: boolean;
1616
cardIcon: ReactNode;
1717
cardName: string;
@@ -20,34 +20,34 @@ type StdcmLinkedPathSearchProps = {
2020
linkedOp: { extremityType: ExtremityPathStepType; id: string };
2121
};
2222

23-
const StdcmLinkedPathSearch = ({
23+
const StdcmLinkedTrainSearch = ({
2424
disabled,
2525
cardIcon,
2626
cardName,
2727
className = '',
2828
defaultCardText,
2929
linkedOp,
30-
}: StdcmLinkedPathSearchProps) => {
30+
}: StdcmLinkedTrainSearchProps) => {
3131
const { t } = useTranslation('stdcm');
32-
const [displayLinkedPathSearch, setShowLinkedPathSearch] = useState(false);
32+
const [displayLinkedTrainSearch, setShowLinkedTrainSearch] = useState(false);
3333

3434
const {
3535
displaySearchButton,
3636
hasSearchBeenLaunched,
3737
launchTrainScheduleSearch,
38-
linkedPathDate,
39-
linkedPathResults,
38+
linkedTrainDate,
39+
linkedTrainResults,
4040
selectableSlot,
4141
setDisplaySearchButton,
42-
setLinkedPathDate,
42+
setLinkedTrainDate,
4343
setTrainNameInput,
4444
trainNameInput,
45-
} = useLinkedPathSearch();
45+
} = useLinkedTrainSearch();
4646

4747
return (
4848
<div className={`stdcm-linked-path-search-container ${className}`}>
49-
{!displayLinkedPathSearch ? (
50-
<div tabIndex={0} role="button" onClick={() => setShowLinkedPathSearch(true)}>
49+
{!displayLinkedTrainSearch ? (
50+
<div tabIndex={0} role="button" onClick={() => setShowLinkedTrainSearch(true)}>
5151
<StdcmDefaultCard
5252
disabled={disabled}
5353
text={defaultCardText}
@@ -60,7 +60,7 @@ const StdcmLinkedPathSearch = ({
6060
disabled={disabled}
6161
name={cardName}
6262
title={
63-
<button type="button" onClick={() => setShowLinkedPathSearch(false)}>
63+
<button type="button" onClick={() => setShowLinkedTrainSearch(false)}>
6464
{t('translation:common.delete').toLowerCase()}
6565
</button>
6666
}
@@ -84,9 +84,9 @@ const StdcmLinkedPathSearch = ({
8484
name: 'op-date',
8585
}}
8686
selectableSlot={selectableSlot}
87-
value={linkedPathDate}
87+
value={linkedTrainDate}
8888
onDateChange={(date) => {
89-
setLinkedPathDate(date);
89+
setLinkedTrainDate(date);
9090
}}
9191
/>
9292
</div>
@@ -99,13 +99,13 @@ const StdcmLinkedPathSearch = ({
9999
{t('find')}
100100
</button>
101101
)}
102-
{!displaySearchButton && !linkedPathResults.length && (
102+
{!displaySearchButton && !linkedTrainResults.length && (
103103
<div className="stdcm-linked-path-button white">
104104
<Gear size="lg" className="stdcm-linked-path-loading" />
105105
</div>
106106
)}
107-
{linkedPathResults.length > 0 ? (
108-
<StdcmLinkedPathResults linkedPathResults={linkedPathResults} linkedOp={linkedOp} />
107+
{linkedTrainResults.length > 0 ? (
108+
<StdcmLinkedTrainResults linkedTrainResults={linkedTrainResults} linkedOp={linkedOp} />
109109
) : (
110110
hasSearchBeenLaunched && (
111111
<p className="text-center mb-0">{t('noCorrespondingResults')}</p>
@@ -117,4 +117,4 @@ const StdcmLinkedPathSearch = ({
117117
);
118118
};
119119

120-
export default StdcmLinkedPathSearch;
120+
export default StdcmLinkedTrainSearch;

‎front/src/applications/stdcm/components/StdcmResults/SimulationReportSheet.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type { SimulationReportSheetProps } from '../../types';
1616
import { base64ToJpeg, getStopDurationTime } from '../../utils/formatSimulationReportSheet';
1717

1818
const SimulationReportSheet = ({
19-
stdcmLinkedPaths,
19+
stdcmLinkedTrains,
2020
stdcmData,
2121
consist,
2222
simulationReportSheetNumber,
@@ -27,7 +27,7 @@ const SimulationReportSheet = ({
2727
let renderedIndex = 0;
2828

2929
const { rollingStock, speedLimitByTag, departure_time: departureTime, creationDate } = stdcmData;
30-
const { anteriorPath, posteriorPath } = stdcmLinkedPaths;
30+
const { anteriorPath, posteriorPath } = stdcmLinkedTrains;
3131

3232
const convoyMass = consist?.totalMass ?? rollingStock.mass / 1000;
3333
const convoyLength = consist?.totalLength ?? rollingStock.length;

‎front/src/applications/stdcm/components/StdcmResults/StdcmResults.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ const StcdmResults = ({
9797
<PDFDownloadLink
9898
document={
9999
<SimulationReportSheet
100-
stdcmLinkedPaths={selectedSimulation.inputs.linkedPaths}
100+
stdcmLinkedTrains={selectedSimulation.inputs.linkedTrains}
101101
stdcmData={outputs.results}
102102
consist={selectedSimulation.inputs.consist}
103103
simulationReportSheetNumber={simulationReportSheetNumber}

‎front/src/applications/stdcm/hooks/useLinkedPathSearch.ts ‎front/src/applications/stdcm/hooks/useLinkedTrainSearch.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
88
import { useOsrdConfSelectors } from 'common/osrdContext';
99
import { isEqualDate } from 'utils/date';
1010

11-
import type { StdcmLinkedPathResult, StdcmLinkedPathStep } from '../types';
11+
import type { StdcmLinkedTrainResult, StdcmLinkedPathStep } from '../types';
1212
import computeOpSchedules from '../utils/computeOpSchedules';
1313

14-
const useLinkedPathSearch = () => {
14+
const useLinkedTrainSearch = () => {
1515
const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();
1616

1717
const { getTimetableID, getSearchDatetimeWindow } = useOsrdConfSelectors();
@@ -31,8 +31,8 @@ const useLinkedPathSearch = () => {
3131
const [displaySearchButton, setDisplaySearchButton] = useState(true);
3232
const [hasSearchBeenLaunched, setHasSearchBeenLaunched] = useState(false);
3333
const [trainNameInput, setTrainNameInput] = useState('');
34-
const [linkedPathDate, setLinkedPathDate] = useState(selectableSlot.start);
35-
const [linkedPathResults, setLinkedPathResults] = useState<StdcmLinkedPathResult[]>([]);
34+
const [linkedTrainDate, setLinkedTrainDate] = useState(selectableSlot.start);
35+
const [linkedTrainResults, setLinkedTrainResults] = useState<StdcmLinkedTrainResult[]>([]);
3636

3737
const getExtremitiesDetails = useCallback(
3838
async (pathItemList: PathItem[]) => {
@@ -64,7 +64,7 @@ const useLinkedPathSearch = () => {
6464

6565
const launchTrainScheduleSearch = useCallback(async () => {
6666
setDisplaySearchButton(false);
67-
setLinkedPathResults([]);
67+
setLinkedTrainResults([]);
6868
try {
6969
const results = (await postSearch({
7070
searchPayload: {
@@ -78,15 +78,15 @@ const useLinkedPathSearch = () => {
7878
pageSize: 25,
7979
}).unwrap()) as SearchResultItemTrainSchedule[];
8080
const filteredResults = results.filter((result) =>
81-
isEqualDate(linkedPathDate, new Date(result.start_time))
81+
isEqualDate(linkedTrainDate, new Date(result.start_time))
8282
);
8383

8484
if (!filteredResults.length) {
8585
setDisplaySearchButton(true);
8686
return;
8787
}
8888

89-
const newLinkedPathResults = await Promise.all(
89+
const newLinkedTrainResults = await Promise.all(
9090
filteredResults.map(async (result) => {
9191
const opDetails = await getExtremitiesDetails(result.path);
9292
const computedOpSchedules = computeOpSchedules(
@@ -104,26 +104,26 @@ const useLinkedPathSearch = () => {
104104
};
105105
})
106106
);
107-
setLinkedPathResults(compact(newLinkedPathResults));
107+
setLinkedTrainResults(compact(newLinkedTrainResults));
108108
setHasSearchBeenLaunched(true);
109109
} catch (error) {
110110
console.error('Train schedule search failed:', error);
111111
setDisplaySearchButton(true);
112112
}
113-
}, [postSearch, trainNameInput, timetableId, linkedPathDate, getExtremitiesDetails]);
113+
}, [postSearch, trainNameInput, timetableId, linkedTrainDate, getExtremitiesDetails]);
114114

115115
return {
116116
displaySearchButton,
117117
hasSearchBeenLaunched,
118118
launchTrainScheduleSearch,
119-
linkedPathDate,
120-
linkedPathResults,
119+
linkedTrainDate,
120+
linkedTrainResults,
121121
selectableSlot,
122122
setDisplaySearchButton,
123-
setLinkedPathDate,
123+
setLinkedTrainDate,
124124
setTrainNameInput,
125125
trainNameInput,
126126
};
127127
};
128128

129-
export default useLinkedPathSearch;
129+
export default useLinkedTrainSearch;

‎front/src/applications/stdcm/hooks/useStdcmForm.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const useStdcmForm = (): StdcmSimulationInputs => {
1717
getTotalMass,
1818
getTotalLength,
1919
getMaxSpeed,
20-
getLinkedPaths,
20+
getLinkedTrains,
2121
getStdcmOrigin,
2222
} = useOsrdConfSelectors() as StdcmConfSelectors;
2323

@@ -26,7 +26,7 @@ const useStdcmForm = (): StdcmSimulationInputs => {
2626
const totalMass = useSelector(getTotalMass);
2727
const totalLength = useSelector(getTotalLength);
2828
const maxSpeed = useSelector(getMaxSpeed);
29-
const linkedPaths = useSelector(getLinkedPaths);
29+
const linkedTrains = useSelector(getLinkedTrains);
3030
const origin = useSelector(getStdcmOrigin);
3131
const { rollingStock } = useStoreDataForRollingStockSelector();
3232
const towedRollingStock = useStdcmTowedRollingStock();
@@ -46,7 +46,7 @@ const useStdcmForm = (): StdcmSimulationInputs => {
4646
maxSpeed,
4747
speedLimitByTag,
4848
},
49-
linkedPaths,
49+
linkedTrains,
5050
};
5151
}, [
5252
pathSteps,
@@ -56,7 +56,7 @@ const useStdcmForm = (): StdcmSimulationInputs => {
5656
totalMass,
5757
totalLength,
5858
maxSpeed,
59-
linkedPaths,
59+
linkedTrains,
6060
]);
6161

6262
return currentSimulationInputs;

‎front/src/applications/stdcm/types.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export type StdcmPathProperties = {
5252
};
5353

5454
export type SimulationReportSheetProps = {
55-
stdcmLinkedPaths: LinkedPaths;
55+
stdcmLinkedTrains: LinkedTrains;
5656
stdcmData: StdcmSuccessResponse;
5757
consist: StdcmSimulationInputs['consist'];
5858
simulationReportSheetNumber: string;
@@ -81,7 +81,7 @@ export type StdcmResults = {
8181
spaceTimeData: TrainSpaceTimeData[] | null;
8282
};
8383

84-
export type LinkedPaths = {
84+
export type LinkedTrains = {
8585
anteriorPath?: {
8686
date: string;
8787
time: string;
@@ -123,7 +123,7 @@ export type StdcmSimulationInputs = {
123123
maxSpeed?: number;
124124
speedLimitByTag?: string;
125125
};
126-
linkedPaths: LinkedPaths;
126+
linkedTrains: LinkedTrains;
127127
};
128128

129129
export type StdcmResultsOutput = {
@@ -193,7 +193,7 @@ export type StdcmLinkedPathStep = {
193193
uic: number;
194194
};
195195

196-
export type StdcmLinkedPathResult = {
196+
export type StdcmLinkedTrainResult = {
197197
destination: StdcmLinkedPathStep;
198198
origin: StdcmLinkedPathStep;
199199
trainName: string;

0 commit comments

Comments
 (0)