front: remove some conditions in SimulationResults

Signed-off-by: Clara Ni <[email protected]>
OpenRailAssociation · Nov 25, 2024 · c6bf33a · c6bf33a
1 parent 04a742f
commit c6bf33a
Showing 1 changed file with 50 additions and 55 deletions.
diff --git a/front/src/applications/operationalStudies/views/SimulationResults.tsx b/front/src/applications/operationalStudies/views/SimulationResults.tsx
@@ -96,10 +96,6 @@ const SimulationResults = ({
     }
   }, [extViewport]);
 
-  if (!trainSimulation) return null;
-
-  if (trainSimulation.status !== 'success') return null;
-
   return (
     <div className="simulation-results">
       {/* SIMULATION : STICKY BAR */}
@@ -122,7 +118,7 @@ const SimulationResults = ({
 
       {/* SIMULATION : SPACE TIME CHART */}
       <div className="simulation-warped-map d-flex flex-row align-items-stretch mb-2">
-        {projectionData && projectionData.projectedTrains.length > 0 && pathProperties && (
+        {projectionData && projectionData.projectedTrains.length > 0 && (
           <>
             <button
               type="button"
@@ -159,25 +155,28 @@ const SimulationResults = ({
       </div>
 
       {/* TRAIN : SPACE SPEED CHART */}
-      {selectedTrainRollingStock && trainSimulation && pathProperties && selectedTrainSchedule && (
-        <div className="osrd-simulation-container speedspacechart-container">
-          <div
-            className="chart-container"
-            style={{
-              height: `${speedSpaceChartContainerHeight + HANDLE_TAB_RESIZE_HEIGHT}px`,
-            }}
-          >
-            <SpeedSpaceChartContainer
-              trainSimulation={trainSimulation}
-              selectedTrainPowerRestrictions={selectedTrainPowerRestrictions}
-              rollingStock={selectedTrainRollingStock}
-              pathProperties={pathProperties}
-              heightOfSpeedSpaceChartContainer={speedSpaceChartContainerHeight}
-              setHeightOfSpeedSpaceChartContainer={setSpeedSpaceChartContainerHeight}
-            />
+      {selectedTrainRollingStock &&
+        trainSimulation &&
+        pathProperties &&
+        selectedTrainSchedule && (
+          <div className="osrd-simulation-container speedspacechart-container">
+            <div
+              className="chart-container"
+              style={{
+                height: `${speedSpaceChartContainerHeight + HANDLE_TAB_RESIZE_HEIGHT}px`,
+              }}
+            >
+              <SpeedSpaceChartContainer
+                trainSimulation={trainSimulation}
+                selectedTrainPowerRestrictions={selectedTrainPowerRestrictions}
+                rollingStock={selectedTrainRollingStock}
+                pathProperties={pathProperties}
+                heightOfSpeedSpaceChartContainer={speedSpaceChartContainerHeight}
+                setHeightOfSpeedSpaceChartContainer={setSpeedSpaceChartContainerHeight}
+              />
+            </div>
           </div>
-        </div>
-      )}
+        )}
 
       {/* SIMULATION : MAP */}
       <div className="simulation-map">
@@ -197,43 +196,39 @@ const SimulationResults = ({
         />
       </div>
 
-      {/* TIME STOPS TABLE */}
-      {selectedTrainSchedule &&
-        trainSimulation.status === 'success' &&
-        pathProperties &&
-        operationalPoints &&
-        infraId && (
-          <div className="time-stop-outputs">
-            <p className="mt-2 mb-3 ml-3 font-weight-bold">{t('timetableOutput')}</p>
-            <TimesStopsOutput
-              simulatedTrain={trainSimulation}
-              pathProperties={pathProperties}
-              operationalPoints={operationalPoints}
-              selectedTrainSchedule={selectedTrainSchedule}
-              path={path}
-              dataIsLoading={formattedOpPointsLoading}
-            />
-          </div>
-        )}
-
-      {/* SIMULATION EXPORT BUTTONS */}
       {selectedTrainSchedule &&
         trainSimulation &&
         pathProperties &&
-        selectedTrainRollingStock &&
         operationalPoints &&
-        path &&
         infraId && (
-          <SimulationResultExport
-            path={path}
-            scenarioData={scenarioData}
-            train={selectedTrainSchedule}
-            simulatedTrain={trainSimulation}
-            pathElectrifications={pathProperties.electrifications}
-            operationalPoints={operationalPoints}
-            rollingStock={selectedTrainRollingStock}
-            mapCanvas={mapCanvas}
-          />
+          <>
+            {/* TIME STOPS TABLE */}
+            <div className="time-stop-outputs">
+              <p className="mt-2 mb-3 ml-3 font-weight-bold">{t('timetableOutput')}</p>
+              <TimesStopsOutput
+                simulatedTrain={trainSimulation}
+                pathProperties={pathProperties}
+                operationalPoints={operationalPoints}
+                selectedTrainSchedule={selectedTrainSchedule}
+                path={path}
+                dataIsLoading={formattedOpPointsLoading}
+              />
+            </div>
+
+            {/* SIMULATION EXPORT BUTTONS */}
+            {selectedTrainRollingStock && path && (
+              <SimulationResultExport
+                path={path}
+                scenarioData={scenarioData}
+                train={selectedTrainSchedule}
+                simulatedTrain={trainSimulation}
+                pathElectrifications={pathProperties.electrifications}
+                operationalPoints={operationalPoints}
+                rollingStock={selectedTrainRollingStock}
+                mapCanvas={mapCanvas}
+              />
+            )}
+          </>
         )}
     </div>
   );