Skip to content

Commit 4369e5d

Browse files
committed
fixup! fixup! fixup! front: adapt e2e tests to use tsv2
1 parent 5274097 commit 4369e5d

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

front/src/modules/rollingStock/components/RollingStockCard/RollingStockCardButtons.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,16 @@ const RollingStockCardButtons = ({
2626
const { t } = useTranslation(['rollingstock']);
2727
const { closeModal } = useContext(ModalContext);
2828

29-
const { getRollingStockComfort } = useOsrdConfSelectors();
30-
const currentComfortInStore = useSelector(getRollingStockComfort);
31-
const [comfort, setComfort] = useState('STANDARD');
29+
const { getRollingStockComfortV2 } = useOsrdConfSelectors();
30+
const currentComfortInStore = useSelector(getRollingStockComfortV2);
31+
const [comfort, setComfort] = useState(currentComfortInStore as string);
3232

3333
const { updateRollingStockComfortV2, updateRollingStockID } = useOsrdConfActions();
3434

3535
const selectRollingStock = () => {
3636
setOpenedRollingStockCardId(undefined);
3737
dispatch(updateRollingStockID(id));
38-
dispatch(
39-
updateRollingStockComfortV2((comfort === 'AC' ? 'AIR_CONDITIONING' : comfort) as Comfort)
40-
);
38+
dispatch(updateRollingStockComfortV2(comfort as Comfort));
4139
closeModal();
4240
};
4341

@@ -58,7 +56,7 @@ const RollingStockCardButtons = ({
5856
}
5957
if (curvesComfortList.includes('AC')) {
6058
options.push({
61-
value: 'AC',
59+
value: 'AIR_CONDITIONING',
6260
label: (
6361
<span data-testid="comfort-ac-button" className="rollingstock-footer-button-with-picto">
6462
{comfort2pictogram('AIR_CONDITIONING')} {t('comfortTypes.AIR_CONDITIONING')}

front/src/modules/rollingStock/consts.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { RollingStockComfortType } from 'common/api/osrdEditoastApi';
1+
import type { Comfort, RollingStockComfortType } from 'common/api/osrdEditoastApi';
22
import { isElectric } from 'modules/rollingStock/helpers/electric';
33
import type {
44
ElectricalProfileByMode,
@@ -303,9 +303,9 @@ export const CONVERSION_FACTORS_SCHEMA: Partial<
303303
'kN/(km/h)²': { 'N/(m/s)²': 1000 * 3.6 ** 2, 'N/(km/h)²': 1000 },
304304
};
305305

306-
const ComfortLevels = {
306+
export const ComfortLevels: Record<Comfort, Comfort> = {
307307
STANDARD: 'STANDARD',
308-
AC: 'AC',
308+
AIR_CONDITIONING: 'AIR_CONDITIONING',
309309
HEATING: 'HEATING',
310310
};
311311

0 commit comments

Comments
 (0)