Skip to content

Commit c586622

Browse files
committed
front: remove pathTrackRanges from stdcmResults props
Signed-off-by: Clara Ni <clara.ni@outlook.fr>
1 parent bcb1ee0 commit c586622

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

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

+12-11
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import { useSelector } from 'react-redux';
44

55
import { STDCM_TRAIN_ID } from 'applications/stdcm/consts';
66
import useProjectedTrainsForStdcm from 'applications/stdcm/hooks/useProjectedTrainsForStdcm';
7-
import type { StdcmResultsOutput } from 'applications/stdcm/types';
8-
import { osrdEditoastApi, type TrackRange } from 'common/api/osrdEditoastApi';
7+
import type { StdcmSimulationOutputs } from 'applications/stdcm/types';
8+
import { hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
9+
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
910
import { useOsrdConfSelectors } from 'common/osrdContext';
1011
import ResizableSection from 'common/ResizableSection';
1112
import i18n from 'i18n';
@@ -20,16 +21,13 @@ const HANDLE_TAB_RESIZE_HEIGHT = 20;
2021
const MANCHETTE_HEIGHT_DIFF = 100;
2122

2223
type StdcmDebugResultsProps = {
23-
pathTrackRanges: TrackRange[];
24-
simulationOutputs: StdcmResultsOutput;
24+
simulationOutputs?: StdcmSimulationOutputs;
2525
};
2626

27-
const StdcmDebugResults = ({
28-
pathTrackRanges,
29-
simulationOutputs: { pathProperties, results, speedSpaceChartData },
30-
}: StdcmDebugResultsProps) => {
27+
const StdcmDebugResults = ({ simulationOutputs }: StdcmDebugResultsProps) => {
3128
const { getWorkScheduleGroupId } = useOsrdConfSelectors() as StdcmConfSelectors;
3229
const workScheduleGroupId = useSelector(getWorkScheduleGroupId);
30+
const successfulSimulation = hasResults(simulationOutputs) ? simulationOutputs : undefined;
3331

3432
const [speedSpaceChartContainerHeight, setSpeedSpaceChartContainerHeight] =
3533
useState(SPEED_SPACE_CHART_HEIGHT);
@@ -39,18 +37,21 @@ const StdcmDebugResults = ({
3937
MANCHETTE_WITH_SPACE_TIME_CHART_DEFAULT_HEIGHT
4038
);
4139

42-
const projectedData = useProjectedTrainsForStdcm(results);
40+
const projectedData = useProjectedTrainsForStdcm(successfulSimulation?.results);
4341

4442
const { data: workSchedules } = osrdEditoastApi.endpoints.postWorkSchedulesProjectPath.useQuery(
4543
{
4644
body: {
47-
path_track_ranges: pathTrackRanges,
45+
path_track_ranges: successfulSimulation?.results.path.track_section_ranges || [],
4846
work_schedule_group_id: workScheduleGroupId!,
4947
},
5048
},
51-
{ skip: !workScheduleGroupId }
49+
{ skip: !workScheduleGroupId || !successfulSimulation }
5250
);
5351

52+
if (!successfulSimulation) return null;
53+
const { pathProperties, results, speedSpaceChartData } = successfulSimulation;
54+
5455
return (
5556
<>
5657
{projectedData &&

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
getOperationalPointsWithTimes,
1313
} from 'applications/stdcm/utils/formatSimulationReportSheet';
1414
import { hasConflicts, hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
15-
import { type TrackRange } from 'common/api/osrdEditoastApi';
1615
import NewMap from 'modules/trainschedule/components/ManageTrainSchedule/NewMap';
1716
import useDeploymentSettings from 'utils/hooks/useDeploymentSettings';
1817

@@ -33,7 +32,6 @@ type StcdmResultsProps = {
3332
selectedSimulationIndex: number;
3433
showStatusBanner: boolean;
3534
simulationsList: StdcmSimulation[];
36-
pathTrackRanges?: TrackRange[];
3735
};
3836

3937
const StcdmResults = ({
@@ -48,7 +46,6 @@ const StcdmResults = ({
4846
selectedSimulationIndex,
4947
showStatusBanner,
5048
simulationsList,
51-
pathTrackRanges,
5249
}: StcdmResultsProps) => {
5350
const { t } = useTranslation('stdcm', { keyPrefix: 'simulation.results' });
5451
const { stdcmName } = useDeploymentSettings();
@@ -188,9 +185,7 @@ const StcdmResults = ({
188185
/>
189186
</div>
190187
</div>
191-
{isDebugMode && pathTrackRanges && hasSimulationResults && (
192-
<StdcmDebugResults pathTrackRanges={pathTrackRanges} simulationOutputs={outputs} />
193-
)}
188+
{isDebugMode && <StdcmDebugResults simulationOutputs={outputs} />}
194189
</>
195190
);
196191
};

front/src/applications/stdcm/views/StdcmView.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ const StdcmView = () => {
241241
selectedSimulationIndex={selectedSimulationIndex}
242242
showStatusBanner={showStatusBanner}
243243
simulationsList={simulationsList}
244-
pathTrackRanges={stdcmResults?.stdcmResponse.path.track_section_ranges}
245244
/>
246245
)}
247246
</div>

0 commit comments

Comments
 (0)