fix

OpenRailAssociation · Jul 17, 2024 · f90f9d8 · f90f9d8
1 parent 4062bff
commit f90f9d8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/front/src/applications/stdcmV2/components/StdcmResults/StdcmResults.tsx b/front/src/applications/stdcmV2/components/StdcmResults/StdcmResults.tsx
@@ -17,9 +17,14 @@ import StcdmResultsTable from './StdcmResultsTable';
 type StcdmResultsV2Props = {
   stdcmData: StdcmV2SuccessResponse;
   pathProperties?: ManageTrainSchedulePathProperties;
+  setInteractedResultsElements: (interactedResultsElements: boolean) => void;
 };
 
-const StcdmResults = ({ stdcmData, pathProperties }: StcdmResultsV2Props) => {
+const StcdmResults = ({
+  stdcmData,
+  pathProperties,
+  setInteractedResultsElements,
+}: StcdmResultsV2Props) => {
   const { t } = useTranslation('stdcm');
   const withoutTime = false;
   const date = dateTimeFormatting(stdcmData.creationDate, withoutTime, 'alternate');
@@ -60,9 +65,10 @@ const StcdmResults = ({ stdcmData, pathProperties }: StcdmResultsV2Props) => {
         <div className="results-and-sheet">
           <StcdmResultsTable
             stdcmData={stdcmData}
-            setIsSimulationSelected={setIsSimulationSelected}
-            isSimulationSelected={isSimulationSelected}
             operationalPointsList={operationalPointsList}
+            isSimulationSelected={isSimulationSelected}
+            setIsSimulationSelected={setIsSimulationSelected}
+            setInteractedResultsElements={setInteractedResultsElements}
           />
           {isSimulationSelected && (
             <div className="get-simulation">

diff --git a/front/src/applications/stdcmV2/components/StdcmResults/StdcmResultsTable.tsx b/front/src/applications/stdcmV2/components/StdcmResults/StdcmResultsTable.tsx
@@ -11,33 +11,37 @@ import { getStopDurationTime } from 'applications/stdcm/utils';
 
 type SimulationTableProps = {
   stdcmData: StdcmV2SuccessResponse;
-  setIsSimulationSelected: (simulationSelected: boolean) => void;
-  isSimulationSelected: boolean;
   operationalPointsList: StdcmResultsOperationalPointsList;
+  isSimulationSelected: boolean;
+  setIsSimulationSelected: (simulationSelected: boolean) => void;
+  setInteractedResultsElements: (interactedResultsElements: boolean) => void;
 };
 
 const StcdmResultsTable = ({
   stdcmData,
-  setIsSimulationSelected,
-  isSimulationSelected,
   operationalPointsList,
+  isSimulationSelected,
+  setIsSimulationSelected,
+  setInteractedResultsElements,
 }: SimulationTableProps) => {
   const { t } = useTranslation(['stdcm-simulation-report-sheet', 'stdcm']);
 
   const [showAllOP, setShowAllOP] = useState(false);
 
   const selectSimulation = () => {
     setIsSimulationSelected(true);
+    setInteractedResultsElements(true);
   };
 
-  useEffect(() => {
-    setIsSimulationSelected(false);
-  }, [stdcmData]);
-
   const handleShowAllClick = () => {
     setShowAllOP((prevState) => !prevState);
+    setInteractedResultsElements(true);
   };
 
+  useEffect(() => {
+    setIsSimulationSelected(false);
+  }, [stdcmData]);
+
   return (
     <div className="table-container">
       <table className="table-results">

diff --git a/front/src/applications/stdcmV2/views/StdcmViewV2.tsx b/front/src/applications/stdcmV2/views/StdcmViewV2.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
@@ -22,11 +22,17 @@ const StdcmViewV2 = () => {
     StdcmSimulationResult['input'] | undefined
   >(undefined);
 
+  const [interactedResultsElements, setInteractedResultsElements] = useState(false);
+
+  useEffect(() => {
+    setInteractedResultsElements(false);
+  }, [currentSimulationInputs]);
+
   return (
     <div className="stdcm-v2">
       <StdcmHeader />
       <div
-        className={`stdcm-container ${!isPending && !currentSimulationInputs ? 'simulation-visible' : ''}`}
+        className={`stdcm-container ${!isPending && !currentSimulationInputs && !interactedResultsElements ? 'simulation-visible' : ''}`}
       >
         {scenarioID && (
           <StdcmConfig
@@ -38,7 +44,7 @@ const StdcmViewV2 = () => {
             setCurrentSimulationInputs={setCurrentSimulationInputs}
           />
         )}
-        {scenarioID && !isPending && !currentSimulationInputs && (
+        {scenarioID && !isPending && !currentSimulationInputs && !interactedResultsElements && (
           <div className="simulation-available">
             <span>{t('simulation.available')}</span>
           </div>
@@ -48,6 +54,7 @@ const StdcmViewV2 = () => {
             // TODO: Next step : use currentSimulationInputs instead of stdcmSimulationResults to handle multiple simulation results
             stdcmData={stdcmV2Results.stdcmResponse}
             pathProperties={pathProperties}
+            setInteractedResultsElements={setInteractedResultsElements}
           />
         )}
       </div>