From ae9c16a0fdf7cf6eb77c4aef7964717c2a79bb9b Mon Sep 17 00:00:00 2001 From: Achraf Mohyeddine Date: Mon, 6 Jan 2025 12:00:56 +0100 Subject: [PATCH] front: fix comments Signed-off-by: Achraf Mohyeddine --- .../stdcm/components/StdcmForm/StdcmConfig.tsx | 2 +- .../stdcm/components/StdcmForm/StdcmConsist.tsx | 6 +++--- front/src/applications/stdcm/consts.ts | 15 --------------- front/src/applications/stdcm/types.ts | 5 +++++ .../assets/rollingStock/freightRollingStocks.ts | 17 +++++++++++++++-- .../rollingStock/hooks/useFilterRollingStock.ts | 2 +- .../hooks/useFilterTowedRollingStock.ts | 17 +++++++++-------- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx index 51f2add8160..51b23c7a0d9 100644 --- a/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx +++ b/front/src/applications/stdcm/components/StdcmForm/StdcmConfig.tsx @@ -154,7 +154,7 @@ const StdcmConfig = ({ />
- +
diff --git a/front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx b/front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx index ec647c58123..d0ed408e47c 100644 --- a/front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx +++ b/front/src/applications/stdcm/components/StdcmForm/StdcmConsist.tsx @@ -17,7 +17,7 @@ import { useAppDispatch } from 'store'; import StdcmCard from './StdcmCard'; import useStdcmConsist from '../../hooks/useStdcmConsist'; -import type { StdcmConfigCardProps } from '../../types'; +import type { StdcmConsistProps } from '../../types'; const ConsistCardTitle = ({ rollingStock, @@ -33,7 +33,7 @@ const ConsistCardTitle = ({ ); }; -const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => { +const StdcmConsist = ({ isDebugMode, disabled = false }: StdcmConsistProps) => { const { t } = useTranslation('stdcm'); const { speedLimitByTag, speedLimitsByTags, dispatchUpdateSpeedLimitByTag } = useStoreDataForSpeedLimitByTagSelector({ isStdcm: true }); @@ -63,7 +63,7 @@ const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => { searchTowedRollingStock, searchTowedRollingStockById, filters: towedRsFilters, - } = useFilterTowedRollingStock(); + } = useFilterTowedRollingStock({ isDebugMode }); useEffect(() => { if (towedRollingStock) { diff --git a/front/src/applications/stdcm/consts.ts b/front/src/applications/stdcm/consts.ts index 14aa28b740f..76f50bdfa08 100644 --- a/front/src/applications/stdcm/consts.ts +++ b/front/src/applications/stdcm/consts.ts @@ -32,18 +32,3 @@ export const COMPOSITION_CODES_MAX_SPEEDS: Record = HLP: 100, MVGV: 200, }; - -export const ALLOWED_TOWED_ROLLING_STOCKS = [ - 'AFAMOD', - 'AFAMOD2', - 'MA', - 'MAL100', - 'MALOUR', - 'MAVIDE', - 'ME100', - 'ME120', - 'ME140', - 'ME200SER', - 'MEPA', - 'TRAINLOC', -]; diff --git a/front/src/applications/stdcm/types.ts b/front/src/applications/stdcm/types.ts index 92b97198638..17f9505c5f9 100644 --- a/front/src/applications/stdcm/types.ts +++ b/front/src/applications/stdcm/types.ts @@ -148,6 +148,11 @@ export type StdcmConfigCardProps = { disabled?: boolean; }; +export type StdcmConsistProps = { + isDebugMode: boolean; + disabled?: boolean; +}; + export enum ArrivalTimeTypes { PRECISE_TIME = 'preciseTime', ASAP = 'asSoonAsPossible', diff --git a/front/src/assets/rollingStock/freightRollingStocks.ts b/front/src/assets/rollingStock/freightRollingStocks.ts index 0adfe8807b0..d106997c637 100644 --- 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,17 @@ 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', +]; diff --git a/front/src/modules/rollingStock/hooks/useFilterRollingStock.ts b/front/src/modules/rollingStock/hooks/useFilterRollingStock.ts index 8db17146fb1..034b8fe4bd0 100644 --- 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 index df0fd46e892..f8e54c50287 100644 --- a/front/src/modules/towedRollingStock/hooks/useFilterTowedRollingStock.ts +++ b/front/src/modules/towedRollingStock/hooks/useFilterTowedRollingStock.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react'; import { isEqual } from 'lodash'; -import { ALLOWED_TOWED_ROLLING_STOCKS } from 'applications/stdcm/consts'; +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'; @@ -33,7 +33,7 @@ function filterTowedRollingStocks( }); } -const useFilterTowedRollingStock = () => { +const useFilterTowedRollingStock = ({ isDebugMode }: { isDebugMode: boolean }) => { const dispatch = useAppDispatch(); const [filters, setFilters] = useState({ text: '' }); const [filteredTowedRollingStockList, setFilteredTowedRollingStockList] = useState< @@ -49,13 +49,14 @@ const useFilterTowedRollingStock = () => { pageSize: 50, }); - const allTowedRollingStocks = useMemo( - () => - fetchedTowedRollingStocks.filter((stock) => + const allTowedRollingStocks = useMemo(() => { + if (!isDebugMode) { + return fetchedTowedRollingStocks.filter((stock) => ALLOWED_TOWED_ROLLING_STOCKS.includes(stock.name) - ), - [fetchedTowedRollingStocks] - ); + ); + } + return fetchedTowedRollingStocks; + }, [fetchedTowedRollingStocks, isDebugMode]); const searchTowedRollingStock = (value: string) => { setFilters({ id: undefined, text: value });