Skip to content

Commit

Permalink
front: fix comments
Browse files Browse the repository at this point in the history
Signed-off-by: Achraf Mohyeddine <[email protected]>
  • Loading branch information
achrafmohye committed Jan 6, 2025
1 parent 9777b4b commit ae9c16a
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 });
Expand Down Expand Up @@ -63,7 +63,7 @@ const StdcmConsist = ({ disabled = false }: StdcmConfigCardProps) => {
searchTowedRollingStock,
searchTowedRollingStockById,
filters: towedRsFilters,
} = useFilterTowedRollingStock();
} = useFilterTowedRollingStock({ isDebugMode });

useEffect(() => {
if (towedRollingStock) {
Expand Down
15 changes: 0 additions & 15 deletions front/src/applications/stdcm/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,3 @@ export const COMPOSITION_CODES_MAX_SPEEDS: Record<string, number | undefined> =
HLP: 100,
MVGV: 200,
};

export const ALLOWED_TOWED_ROLLING_STOCKS = [
'AFAMOD',
'AFAMOD2',
'MA',
'MAL100',
'MALOUR',
'MAVIDE',
'ME100',
'ME120',
'ME140',
'ME200SER',
'MEPA',
'TRAINLOC',
];
5 changes: 5 additions & 0 deletions front/src/applications/stdcm/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ export type StdcmConfigCardProps = {
disabled?: boolean;
};

export type StdcmConsistProps = {
isDebugMode: boolean;
disabled?: boolean;
};

export enum ArrivalTimeTypes {
PRECISE_TIME = 'preciseTime',
ASAP = 'asSoonAsPossible',
Expand Down
17 changes: 15 additions & 2 deletions front/src/assets/rollingStock/freightRollingStocks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const FREIGHT_ROLLING_STOCKS = [
export const FREIGHT_ROLLING_STOCKS = [
'7200GH',
'15000',
'22200G',
Expand Down Expand Up @@ -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',
];
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -33,7 +33,7 @@ function filterTowedRollingStocks(
});
}

const useFilterTowedRollingStock = () => {
const useFilterTowedRollingStock = ({ isDebugMode }: { isDebugMode: boolean }) => {
const dispatch = useAppDispatch();
const [filters, setFilters] = useState<TowedRollingStockFilters>({ text: '' });
const [filteredTowedRollingStockList, setFilteredTowedRollingStockList] = useState<
Expand All @@ -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 });
Expand Down

0 comments on commit ae9c16a

Please sign in to comment.