Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter TowedRollingStocks to include only allowed values #10227

Merged
merged 1 commit into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,11 @@ const StdcmConfig = ({
/>
<div className="stdcm-simulation-inputs">
<div className="stdcm-consist-container">
<StdcmConsist consistErrors={consistErrors} disabled={disabled} />
<StdcmConsist
consistErrors={consistErrors}
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 @@ -4,6 +4,7 @@ import { Input, ComboBox } from '@osrd-project/ui-core';
import { useTranslation } from 'react-i18next';

import useStdcmTowedRollingStock from 'applications/stdcm/hooks/useStdcmTowedRollingStock';
import type { ConsistErrors } from 'applications/stdcm/types';
import {
CONSIST_MAX_SPEED_MIN,
CONSIST_TOTAL_LENGTH_MAX,
Expand All @@ -23,7 +24,6 @@ import { kgToT, kmhToMs, msToKmh } from 'utils/physics';

import StdcmCard from './StdcmCard';
import useStdcmConsist from '../../hooks/useStdcmConsist';
import type { StdcmConfigCardProps } from '../../types';

const ConsistCardTitle = ({
rollingStock,
Expand All @@ -39,7 +39,13 @@ const ConsistCardTitle = ({
);
};

const StdcmConsist = ({ consistErrors = {}, disabled = false }: StdcmConfigCardProps) => {
export type StdcmConsistProps = {
isDebugMode: boolean;
disabled?: boolean;
consistErrors?: ConsistErrors;
};

const StdcmConsist = ({ isDebugMode, consistErrors = {}, disabled = false }: StdcmConsistProps) => {
const { t } = useTranslation('stdcm');
const { speedLimitByTag, speedLimitsByTags, dispatchUpdateSpeedLimitByTag } =
useStoreDataForSpeedLimitByTagSelector({ isStdcm: true });
Expand Down Expand Up @@ -69,7 +75,7 @@ const StdcmConsist = ({ consistErrors = {}, disabled = false }: StdcmConfigCardP
searchTowedRollingStock,
searchTowedRollingStockById,
filters: towedRsFilters,
} = useFilterTowedRollingStock();
} = useFilterTowedRollingStock({ isDebugMode });

useEffect(() => {
if (towedRollingStock) {
Expand Down
18 changes: 16 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,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',
];
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
@@ -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';
Expand Down Expand Up @@ -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 });
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Towed-test-e2e",
"name": "TOWED-TEST-E2E",
"label": "",
"railjson_version": "3.2",
"locked": true,
Expand Down
Loading