front: correct adding settings place

OpenRailAssociation · Jun 8, 2023 · 95b9ce2 · 95b9ce2
1 parent 54136d0
commit 95b9ce2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 40 deletions.
diff --git a/...rc/applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings.tsx b/...rc/applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings.tsx
@@ -33,7 +33,7 @@ export default function TrainAddingSettings() {
   }, [debouncedTrainDelta]);
 
   return (
-    <div className="osrd-config-item-container d-flex align-items-start mb-2">
+    <div className="osrd-config-item-container d-flex align-items-start">
       <span className="mr-2">
         <InputSNCF
           type="number"

diff --git a/.../src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx b/.../src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx
@@ -6,6 +6,7 @@ import { updateTrainScheduleIDsToModify } from 'reducers/osrdconf';
 import DotsLoader from 'common/DotsLoader/DotsLoader';
 import { useDispatch, useSelector } from 'react-redux';
 import { getTrainScheduleIDsToModify } from 'reducers/osrdconf/selectors';
+import TrainAddingSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings';
 import submitConfAddTrainSchedules from '../ManageTrainSchedule/helpers/submitConfAddTrainSchedules';
 import submitConfUpdateTrainSchedules from '../ManageTrainSchedule/helpers/submitConfUpdateTrainSchedules';
 
@@ -53,31 +54,35 @@ export default function TimetableManageTrainSchedule({
             </button>
           )}
 
-        {displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add &&
-          (isWorking ? (
-            <button className="btn btn-primary disabled" type="button">
-              <DotsLoader />
-            </button>
-          ) : (
-            <button
-              className="btn btn-primary"
-              type="button"
-              onClick={() => submitConfAddTrainSchedules(dispatch, t, setIsWorking)}
-            >
-              <span className="mr-2">
-                <FaPlus />
-              </span>
-              {t('addTrainSchedule')}
-            </button>
-          ))}
+        {displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add && (
+          <>
+            {isWorking ? (
+              <button className="btn btn-primary disabled mb-2" type="button">
+                <DotsLoader />
+              </button>
+            ) : (
+              <button
+                className="btn btn-primary mb-2"
+                type="button"
+                onClick={() => submitConfAddTrainSchedules(dispatch, t, setIsWorking)}
+              >
+                <span className="mr-2">
+                  <FaPlus />
+                </span>
+                {t('addTrainSchedule')}
+              </button>
+            )}
+            <TrainAddingSettings />
+          </>
+        )}
       </div>
       <div
         className="scenario-timetable-managetrainschedule-body"
         role="button"
         tabIndex={0}
         onClick={leaveManageTrainSchedule}
       >
-        <button className="btn btn-secondary btn-block mt-2" type="button">
+        <button className="btn btn-secondary btn-block" type="button">
           <i className="icons-arrow-prev mr-2" />
           {t('returnToSimulationResults')}
         </button>

diff --git a/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx b/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
 import TrainSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainSettings';
-import TrainAddingSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings';
 import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
 import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
 import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
@@ -24,7 +23,6 @@ import Tabs from 'common/Tabs';
 import rollingStockPic from 'assets/pictures/components/train.svg';
 import pahtFindingPic from 'assets/pictures/components/pathfinding.svg';
 import simulationSettings from 'assets/pictures/components/simulationSettings.svg';
-import addingSettingsPic from 'assets/pictures/components/addingSettings.svg';
 
 export default function ManageTrainSchedule() {
   const dispatch = useDispatch();
@@ -116,17 +114,6 @@ export default function ManageTrainSchedule() {
     content: 'marges',
   }; */
 
-  const tabAddingSettings = {
-    title: (
-      <>
-        <img src={addingSettingsPic} alt="adding settings" height={24} />
-        <span className="ml-2">{t('tabs.addingSettings')}</span>
-      </>
-    ),
-    label: t('tabs.addingSettings'),
-    content: !trainScheduleIDsToModify && <TrainAddingSettings />,
-  };
-
   useEffect(() => {
     if (trainScheduleIDsToModify && trainScheduleIDsToModify.length > 0)
       getTrainScheduleById({ id: trainScheduleIDsToModify[0] })
@@ -163,11 +150,7 @@ export default function ManageTrainSchedule() {
         <TrainSettings />
       </div>
 
-      <Tabs
-        pills
-        fullWidth
-        tabs={[tabRollingStock, tabPathFinding, tabSimulationSettings, tabAddingSettings]}
-      />
+      <Tabs pills fullWidth tabs={[tabRollingStock, tabPathFinding, tabSimulationSettings]} />
     </>
   );
 }
diff --git a/front/src/assets/pictures/components/addingSettings.svg b/front/src/assets/pictures/components/addingSettings.svg
diff --git a/front/src/styles/scss/applications/operationalStudies/_scenario.scss b/front/src/styles/scss/applications/operationalStudies/_scenario.scss
@@ -65,8 +65,7 @@
     .scenario-timetable-managetrainschedule-header {
       display: flex;
       flex-direction: column;
-      height: 3rem;
-      padding: 0.5rem;
+      padding: 0.5rem 0.5rem 0;
     }
     .scenario-timetable-managetrainschedule-body {
       padding: 0.5rem;