front: filter fetched towed rolling stocks to include only allowed va…

…lues Signed-off-by: Achraf Mohyeddine <[email protected]>
OpenRailAssociation · Jan 8, 2025 · d030951 · d030951
1 parent 2d1a142
commit d030951
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx
@@ -154,7 +154,7 @@ const StdcmConfig = ({
           />
           <div className="stdcm-simulation-inputs">
             <div className="stdcm-consist-container">
-              <StdcmConsist disabled={disabled} />
+              <StdcmConsist disabled={disabled} isDebugMode={isDebugMode} />
             </div>
             <div className="stdcm__separator" />
             <div ref={formRef} className="stdcm-simulation-itinerary">

diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx
@@ -17,7 +17,6 @@ import { useAppDispatch } from 'store';
 
 import StdcmCard from './StdcmCard';
 import useStdcmConsist from '../../hooks/useStdcmConsist';
-import type { StdcmConfigCardProps } from '../../types';
 
 const ConsistCardTitle = ({
   rollingStock,
@@ -33,7 +32,12 @@ const ConsistCardTitle = ({
   );
 };
 
-const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => {
+export type StdcmConsistProps = {
+  isDebugMode: boolean;
+  disabled?: boolean;
+};
+
+const StdcmConsist = ({ isDebugMode, disabled = false }: StdcmConsistProps) => {
   const { t } = useTranslation('stdcm');
   const { speedLimitByTag, speedLimitsByTags, dispatchUpdateSpeedLimitByTag } =
     useStoreDataForSpeedLimitByTagSelector({ isStdcm: true });
@@ -63,7 +67,7 @@ const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => {
     searchTowedRollingStock,
     searchTowedRollingStockById,
     filters: towedRsFilters,
-  } = useFilterTowedRollingStock();
+  } = useFilterTowedRollingStock({ isDebugMode });
 
   useEffect(() => {
     if (towedRollingStock) {

diff --git a/front/src/assets/rollingStock/freightRollingStocks.ts b/front/src/assets/rollingStock/freightRollingStocks.ts
@@ -1,4 +1,4 @@
-const FREIGHT_ROLLING_STOCKS = [
+export const FREIGHT_ROLLING_STOCKS = [
   '7200GH',
   '15000',
   '22200G',
@@ -110,4 +110,18 @@ const FREIGHT_ROLLING_STOCKS = [
   'electric_rolling_stock_test_e2e',
 ];
 
-export default FREIGHT_ROLLING_STOCKS;
+export const ALLOWED_TOWED_ROLLING_STOCKS = [
+  'AFAMOD',
+  'AFAMOD2',
+  'MA',
+  'MAL100',
+  'MALOUR',
+  'MAVIDE',
+  'ME100',
+  'ME120',
+  'ME140',
+  'ME200SER',
+  'MEPA',
+  'TRAINLOC',
+  'TOWED-TEST-E2E',
+];
diff --git a/front/src/modules/rollingStock/hooks/useFilterRollingStock.ts b/front/src/modules/rollingStock/hooks/useFilterRollingStock.ts
@@ -1,6 +1,6 @@
 import { useState, useEffect, useMemo } from 'react';
 
-import FREIGHT_ROLLING_STOCKS from 'assets/rollingStock/freightRollingStocks';
+import { FREIGHT_ROLLING_STOCKS } from 'assets/rollingStock/freightRollingStocks';
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import type { LightRollingStock, LightRollingStockWithLiveries } from 'common/api/osrdEditoastApi';
 import { setFailure } from 'reducers/main';

diff --git a/front/src/modules/towedRollingStock/hooks/useFilterTowedRollingStock.ts b/front/src/modules/towedRollingStock/hooks/useFilterTowedRollingStock.ts
@@ -1,7 +1,8 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { isEqual } from 'lodash';
 
+import { ALLOWED_TOWED_ROLLING_STOCKS } from 'assets/rollingStock/freightRollingStocks';
 import { osrdEditoastApi, type TowedRollingStock } from 'common/api/osrdEditoastApi';
 import { setFailure } from 'reducers/main';
 import { useAppDispatch } from 'store';
@@ -32,22 +33,31 @@ function filterTowedRollingStocks(
   });
 }
 
-const useFilterTowedRollingStock = () => {
+const useFilterTowedRollingStock = ({ isDebugMode }: { isDebugMode: boolean }) => {
   const dispatch = useAppDispatch();
   const [filters, setFilters] = useState<TowedRollingStockFilters>({ text: '' });
   const [filteredTowedRollingStockList, setFilteredTowedRollingStockList] = useState<
     TowedRollingStock[]
   >([]);
 
   const {
-    data: { results: allTowedRollingStocks } = { results: [] },
+    data: { results: fetchedTowedRollingStocks } = { results: [] },
     isSuccess,
     isError,
     error,
   } = osrdEditoastApi.endpoints.getTowedRollingStock.useQuery({
     pageSize: 50,
   });
 
+  const allTowedRollingStocks = useMemo(() => {
+    if (!isDebugMode) {
+      return fetchedTowedRollingStocks.filter((stock) =>
+        ALLOWED_TOWED_ROLLING_STOCKS.includes(stock.name)
+      );
+    }
+    return fetchedTowedRollingStocks;
+  }, [fetchedTowedRollingStocks, isDebugMode]);
+
   const searchTowedRollingStock = (value: string) => {
     setFilters({ id: undefined, text: value });
   };

diff --git a/front/tests/assets/stdcm/towedRollingStock/towedRollingStock.json b/front/tests/assets/stdcm/towedRollingStock/towedRollingStock.json
@@ -1,5 +1,5 @@
 {
-  "name": "Towed-test-e2e",
+  "name": "TOWED-TEST-E2E",
   "label": "",
   "railjson_version": "3.2",
   "locked": true,