wip

OpenRailAssociation · Jul 5, 2024 · 4101fd4 · 4101fd4
1 parent 0707ff9
commit 4101fd4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 106 deletions.
diff --git a/front/src/applications/stdcm/views/StdcmResultsV2.tsx b/front/src/applications/stdcm/views/StdcmResultsV2.tsx
@@ -24,7 +24,7 @@ type StcdmResultsProps = {
   creationDate?: Date;
 };
 
-const simulationReportSheetNumber = generateCodeNumber();
+const codeNumber = generateCodeNumber();
 
 // TODO TS2 : Adapt StdcmResult to trainSchedule v2 (SpaceTimeChart and SpeedSpaceChart)
 
@@ -107,12 +107,12 @@ const StcdmResultsV2 = ({
                   pathProperties={pathProperties}
                   rollingStockData={rollingStockData}
                   speedLimitByTag={speedLimitByTag}
-                  simulationReportSheetNumber={simulationReportSheetNumber}
+                  simulationReportSheetNumber={codeNumber}
                   mapCanvas={mapCanvas}
                   creationDate={creationDate}
                 />
               }
-              fileName={`STDCM-${simulationReportSheetNumber}.pdf`}
+              fileName={`STDCM-${codeNumber}.pdf`}
             >
               {t('stdcmSimulationReport')}
             </PDFDownloadLink>

diff --git a/front/src/applications/stdcmV2/components/StdcmConfig.tsx b/front/src/applications/stdcmV2/components/StdcmConfig.tsx
@@ -98,7 +98,7 @@ const StdcmConfig = ({
             disabled={isPending}
             setCurrentSimulationInputs={setCurrentSimulationInputs}
           />
-          <StdcmVias disabled={isPending} setCurrentSimulationInputs={setCurrentSimulationInputs} />
+          <StdcmVias disabled={isPending} />
           <StdcmDestination
             disabled={isPending}
             setCurrentSimulationInputs={setCurrentSimulationInputs}

diff --git a/front/src/applications/stdcmV2/components/StdcmDestination.tsx b/front/src/applications/stdcmV2/components/StdcmDestination.tsx
@@ -11,7 +11,6 @@ import { useAppDispatch } from 'store';
 
 import StdcmCard from './StdcmCard';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
-import type { StdcmSimulationResult } from '../views/StdcmViewV2';
 import type { StdcmConfigCardProps } from '../types';
 
 const StdcmDestination = ({

diff --git a/front/src/applications/stdcmV2/components/StdcmOperationalPoint.tsx b/front/src/applications/stdcmV2/components/StdcmOperationalPoint.tsx
@@ -78,7 +78,6 @@ const StdcmOperationalPoint = ({ updatePoint, point, disabled }: StdcmOperationa
         }
       : null;
     updatePoint(newPoint);
-    updatePoint(newPoint);
   };
 
   const onInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {

diff --git a/front/src/applications/stdcmV2/components/StdcmVias.tsx b/front/src/applications/stdcmV2/components/StdcmVias.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useMemo } from 'react';
 
 import { Location } from '@osrd-project/ui-icons';
 import { useTranslation } from 'react-i18next';
@@ -15,17 +15,8 @@ import { formatDurationAsISO8601 } from 'utils/timeManipulation';
 import StdcmCard from './StdcmCard';
 import StdcmInputVia from './StdcmInputVia';
 import StdcmOperationalPoint from './StdcmOperationalPoint';
-import type { StdcmSimulationResult } from '../views/StdcmViewV2';
 
-const StdcmVias = ({
-  disabled = false,
-  setCurrentSimulationInputs,
-}: {
-  disabled?: boolean;
-  setCurrentSimulationInputs: React.Dispatch<
-    React.SetStateAction<StdcmSimulationResult['input'] | undefined>
-  >;
-}) => {
+const StdcmVias = ({ disabled = false }: { disabled?: boolean }) => {
   const { t } = useTranslation('stdcm');
   const dispatch = useAppDispatch();
   const { getPathSteps } = useOsrdConfSelectors();
@@ -50,22 +41,15 @@ const StdcmVias = ({
     );
   };
 
-  const deletePathStep = (index: number) => {
-    dispatch(updatePathSteps(pathSteps.filter((_, i) => i !== index)));
-  };
-
-  useEffect(() => {
-    setCurrentSimulationInputs((prevState) => ({
-      ...prevState,
-      pathSteps,
-    }));
-  }, [pathSteps]);
-
   return (
     <div className="stdcm-v2-vias-list">
       {intermediatePoints.length > 0 &&
         intermediatePoints.map((pathStep, index) => {
           const pathStepId = index + 1;
+          function deleteViaV2(index: number): any {
+            throw new Error('Function not implemented.');
+          }
+
           return (
             <StdcmCard
               key={pathStepId}
@@ -75,11 +59,11 @@ const StdcmVias = ({
                   <span>
                     <img src={IntermediatePointIcon} alt="intermediate-point" />
                   </span>
-                  <button type="button" onClick={() => deletePathStep(pathStepId)}>
+                  <button type="button" onClick={() => dispatch(deleteViaV2(index))}>
                     {t('translation:common.delete')}
                   </button>
                 </div>
-              } // TODO: Remove icon and clear button -> replace them by the "numbered point" icon
+              }
               hasTip
               disabled={disabled}
             >

diff --git a/front/src/modules/pathfinding/components/Pathfinding/PathfindingV2.tsx b/front/src/modules/pathfinding/components/Pathfinding/PathfindingV2.tsx
@@ -33,10 +33,7 @@ const Pathfinding = ({ pathProperties, setPathProperties }: PathfindingProps) =>
   const {
     pathfindingState,
     infraInfos: { infra, reloadCount },
-  } = usePathfindingV2({
-    pathProperties,
-    setPathProperties,
-  });
+  } = usePathfindingV2(setPathProperties, pathProperties);
 
   const missingElements = conditionalStringConcat([
     [!origin, t('origin')],

diff --git a/front/src/modules/pathfinding/hook/useInfra.ts b/front/src/modules/pathfinding/hook/useInfra.ts