diff --git a/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx b/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx index 959fe2a8f1c..1755e6d0738 100644 --- a/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx +++ b/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx @@ -158,110 +158,107 @@ const ScenarioV2 = () => {
-
-
- {scenario && ( -
-
- - {scenario.name} - - - - -
-
-
-
- Infra logo - {infra && } - {scenario.infra_name} - ID {scenario.infra_id} -
+
+ {scenario && ( +
+
+ + {scenario.name} + + + + +
+
+
+
+ Infra logo + {infra && } + {scenario.infra_name} + ID {scenario.infra_id}
-
-
- - - - {timetable.electrical_profile_set_id - ? timetable.electrical_profile_set_id - : t('noElectricalProfileSet')} -
+
+
+
+ + + + {timetable.electrical_profile_set_id + ? timetable.electrical_profile_set_id + : t('noElectricalProfileSet')}
- {infra && - infra.state === 'TRANSIENT_ERROR' && - (reloadCount <= 5 ? ( -
- {t('errorMessages.unableToLoadInfra', { reloadCount })} -
- ) : ( -
- {t('errorMessages.softErrorInfra')} -
- ))} - {infra && infra.state === 'ERROR' && ( +
+ {infra && + infra.state === 'TRANSIENT_ERROR' && + (reloadCount <= 5 ? (
- {t('errorMessages.hardErrorInfra')} + {t('errorMessages.unableToLoadInfra', { reloadCount })}
- )} -
{scenario.description}
-
- )} - {displayTrainScheduleManagement !== MANAGE_TRAIN_SCHEDULE_TYPES.none && infra && ( - - )} - {infra && ( - - )} -
+ ) : ( +
+ {t('errorMessages.softErrorInfra')} +
+ ))} + {infra && infra.state === 'ERROR' && ( +
+ {t('errorMessages.hardErrorInfra')} +
+ )} +
{scenario.description}
+
+ )} + {displayTrainScheduleManagement !== MANAGE_TRAIN_SCHEDULE_TYPES.none && infra && ( + + )} + {infra && ( + + )}
{(!isInfraLoaded || isUpdating) && diff --git a/front/src/styles/scss/applications/operationalStudies/_scenario.scss b/front/src/styles/scss/applications/operationalStudies/_scenario.scss index d565a78f505..ad2b3c5c50d 100644 --- a/front/src/styles/scss/applications/operationalStudies/_scenario.scss +++ b/front/src/styles/scss/applications/operationalStudies/_scenario.scss @@ -62,10 +62,11 @@ .scenario-sidemenu { padding-top: 0.5rem; padding-bottom: 0.5rem; + display: flex; + flex-direction: column; .scenario-details { display: flex; flex-direction: column; - height: 8rem; .scenario-details-name { display: flex; align-items: center; @@ -118,7 +119,7 @@ .scenario-timetable { display: flex; flex-direction: column; - height: calc(var(--content-height) - 8rem); + flex-grow: 1; .scenario-timetable-addtrains-buttons { display: flex; align-items: center;