Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

timetable performance #10489

Merged
merged 2 commits into from
Feb 10, 2025
Merged

timetable performance #10489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a6dc17
front: timetable performance, use callback
anisometropie Feb 5, 2025
85c06fa
front: timetable performance
anisometropie Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion front/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion front/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@
"remark-gfm": "^4.0.0",
"reselect": "^5.1.0",
"uuid": "^11.0.5",
"viewport-mercator-project": "^7.0.4"
"viewport-mercator-project": "^7.0.4",
"virtua": "^0.39.3"
},
"devDependencies": {
"@apidevtools/swagger-parser": "^10.1.1",
Expand Down
80 changes: 43 additions & 37 deletions front/src/modules/trainschedule/components/Timetable/Timetable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { useMemo, useState } from 'react';
import { useMemo, useState, useCallback } from 'react';

import cx from 'classnames';
import dayjs from 'dayjs';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
import { Virtualizer } from 'virtua';

import { MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
import type { Conflict, InfraState, TrainScheduleResult } from 'common/api/osrdEditoastApi';
Expand Down Expand Up @@ -63,28 +64,31 @@ const Timetable = ({
setShowTrainDetails(!showTrainDetails);
};

const removeAndUnselectTrains = (trainIds: number[]) => {
const removeAndUnselectTrains = useCallback((trainIds: number[]) => {
removeTrains(trainIds);
setSelectedTrainIds([]);
dtoImport();
};
}, []);

const toggleConflictsListExpanded = () => {
setConflictsListExpanded(!conflictsListExpanded);
};

const handleSelectTrain = (id: number) => {
const currentSelectedTrainIds = [...selectedTrainIds];
const index = currentSelectedTrainIds.indexOf(id);
const handleSelectTrain = useCallback(
(id: number) => {
const currentSelectedTrainIds = [...selectedTrainIds];
const index = currentSelectedTrainIds.indexOf(id);

if (index === -1) {
currentSelectedTrainIds.push(id);
} else {
currentSelectedTrainIds.splice(index, 1);
}
if (index === -1) {
currentSelectedTrainIds.push(id);
} else {
currentSelectedTrainIds.splice(index, 1);
}

setSelectedTrainIds(currentSelectedTrainIds);
};
setSelectedTrainIds(currentSelectedTrainIds);
},
[selectedTrainIds]
);

const handleConflictClick = (conflict: Conflict) => {
if (conflict.train_ids.length > 0) {
Expand Down Expand Up @@ -145,30 +149,32 @@ const Timetable = ({
trainSchedules={trainSchedules}
isInSelection={selectedTrainIds.length > 0}
/>
{displayedTrainSchedules.map((train: TrainScheduleWithDetails, index) => (
<div key={`timetable-train-card-${train.id}`}>
{showDepartureDates[index] && (
<div className="scenario-timetable-departure-date">
{currentDepartureDates[index]}
</div>
)}
<TimetableTrainCard
isInSelection={selectedTrainIds.includes(train.id)}
handleSelectTrain={handleSelectTrain}
train={train}
isSelected={infraState === 'CACHED' && selectedTrainId === train.id}
isModified={train.id === trainIdToEdit}
setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
upsertTrainSchedules={upsertTrainSchedules}
setTrainIdToEdit={setTrainIdToEdit}
removeTrains={removeAndUnselectTrains}
projectionPathIsUsed={
infraState === 'CACHED' && trainIdUsedForProjection === train.id
}
dtoImport={dtoImport}
/>
</div>
))}
<Virtualizer overscan={15}>
{displayedTrainSchedules.map((train: TrainScheduleWithDetails, index) => (
<div key={`timetable-train-card-${train.id}`}>
{showDepartureDates[index] && (
<div className="scenario-timetable-departure-date">
{currentDepartureDates[index]}
</div>
)}
<TimetableTrainCard
isInSelection={selectedTrainIds.includes(train.id)}
handleSelectTrain={handleSelectTrain}
train={train}
isSelected={infraState === 'CACHED' && selectedTrainId === train.id}
isModified={train.id === trainIdToEdit}
setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
upsertTrainSchedules={upsertTrainSchedules}
setTrainIdToEdit={setTrainIdToEdit}
removeTrains={removeAndUnselectTrains}
projectionPathIsUsed={
infraState === 'CACHED' && trainIdUsedForProjection === train.id
}
dtoImport={dtoImport}
/>
</div>
))}
</Virtualizer>
<div
className={cx('bottom-timetables-trains', {
'empty-list': trainSchedulesWithDetails.length === 0,
Expand Down
Loading