Skip to content

Commit 3de2fda

Browse files
committed
add constraint distribution state to selecttraintoedit action
1 parent d80df13 commit 3de2fda

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

front/src/applications/operationalStudies/components/Scenario/ScenarioContent.tsx

+1-9
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,6 @@ const ScenarioContent = ({
119119
},
120120
});
121121

122-
const trainScheduleToEdit = trainSchedules?.find((schedule) => schedule.id === trainIdToEdit);
123-
const constraintDistribution = trainScheduleToEdit
124-
? trainScheduleToEdit.constraint_distribution
125-
: 'STANDARD';
126-
127122
return (
128123
<main className="mastcontainer mastcontainer-no-mastnav">
129124
<div className="scenario">
@@ -179,10 +174,7 @@ const ScenarioContent = ({
179174
{(displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add ||
180175
displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.edit) && (
181176
<div className="scenario-managetrainschedule">
182-
<ManageTrainSchedule
183-
trainIdToEdit={trainIdToEdit}
184-
constraintDistribution={constraintDistribution}
185-
/>
177+
<ManageTrainSchedule trainIdToEdit={trainIdToEdit} />
186178
</div>
187179
)}
188180
{displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.import && (

front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import allowancesPic from 'assets/pictures/components/allowances.svg';
1010
import pahtFindingPic from 'assets/pictures/components/pathfinding.svg';
1111
import simulationSettings from 'assets/pictures/components/simulationSettings.svg';
1212
import rollingStockPic from 'assets/pictures/components/train.svg';
13-
import type { Distribution } from 'common/api/osrdEditoastApi';
1413
import { useOsrdConfSelectors } from 'common/osrdContext';
1514
import { useStoreDataForSpeedLimitByTagSelector } from 'common/SpeedLimitByTagSelector/useStoreDataForSpeedLimitByTagSelector';
1615
import Tabs from 'common/Tabs';
@@ -31,19 +30,18 @@ import { formatKmValue } from 'utils/strings';
3130

3231
type ManageTrainScheduleProps = {
3332
trainIdToEdit?: number;
34-
constraintDistribution: Distribution;
3533
};
3634

37-
const ManageTrainSchedule = ({
38-
trainIdToEdit,
39-
constraintDistribution,
40-
}: ManageTrainScheduleProps) => {
35+
const ManageTrainSchedule = ({ trainIdToEdit }: ManageTrainScheduleProps) => {
4136
const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
42-
const { getOrigin, getDestination, getPathSteps, getStartTime } = useOsrdConfSelectors();
37+
const { getOrigin, getDestination, getPathSteps, getConstraintDistribution, getStartTime } =
38+
useOsrdConfSelectors();
4339
const origin = useSelector(getOrigin);
4440
const destination = useSelector(getDestination);
4541
const pathSteps = useSelector(getPathSteps);
42+
const constraintDistribution = useSelector(getConstraintDistribution);
4643
const startTime = useSelector(getStartTime);
44+
4745
const [pathProperties, setPathProperties] = useState<ManageTrainSchedulePathProperties>();
4846

4947
const { speedLimitByTag, speedLimitsByTags, dispatchUpdateSpeedLimitByTag } =

front/src/reducers/osrdconf/operationalStudiesConf/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export const operationalStudiesConfSlice = createSlice({
3030
speedLimitTag,
3131
labels,
3232
power_restrictions,
33+
constraint_distribution,
3334
} = action.payload;
3435

3536
state.rollingStockID = rollingStock?.id;
@@ -43,6 +44,7 @@ export const operationalStudiesConfSlice = createSlice({
4344
state.labels = labels;
4445
state.speedLimitByTag = speedLimitTag || undefined;
4546
state.powerRestriction = power_restrictions || [];
47+
state.constraintDistribution = constraint_distribution || 'STANDARD';
4648
},
4749
},
4850
});

0 commit comments

Comments
 (0)