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

front: add placeholders in stdcm allowances inputs #5552

Merged
merged 1 commit into from
Nov 7, 2023
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
4 changes: 2 additions & 2 deletions front/src/applications/operationalStudies/consts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ export interface OsrdConfState {
destinationDate?: string;
destinationTime?: string;
featureInfoClick: { displayPopup: boolean; feature?: Feature; coordinates?: number[] };
gridMarginBefore: number;
gridMarginAfter: number;
gridMarginBefore?: number;
gridMarginAfter?: number;
trainScheduleIDsToModify: number[];
}

Expand Down
4 changes: 2 additions & 2 deletions front/src/applications/stdcm/views/OSRDStdcmConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { getSelectedTrain } from 'reducers/osrdsimulation/selectors';
import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
import STDCMAllowances from 'modules/stdcmAllowances/components/STDCMAllowances';
import StdcmAllowances from 'modules/stdcmAllowances/components/StdcmAllowances';
import { OsrdStdcmConfState } from 'applications/operationalStudies/consts';
import OSRDStdcmResults from './OSRDStdcmResults';
import RunningTime from '../components/RunningTime';
Expand Down Expand Up @@ -97,7 +97,7 @@ export default function OSRDConfig({
<SpeedLimitByTagSelector condensed />
<Itinerary />
<RunningTime />
<STDCMAllowances />
<StdcmAllowances />
<div className="osrd-config-stdcm-apply">
{/* TODO: use RTK request status */}
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import {
} from 'reducers/osrdconf';
import { StandardAllowance } from 'applications/operationalStudies/consts';
import { AllowanceValue } from 'common/api/osrdEditoastApi';
import { ALLOWANCE_UNITS_KEYS } from '../../../applications/stdcm/components/allowancesConsts';
import { convertInputStringToNumber } from 'utils/strings';
import { ALLOWANCE_UNITS_KEYS } from 'applications/stdcm/components/allowancesConsts';

const STDCMAllowances = () => {
const StdcmAllowances = () => {
const { t } = useTranslation('allowances');
const dispatch = useDispatch();
const gridMarginBefore = useSelector(getGridMarginBefore);
Expand Down Expand Up @@ -54,9 +55,11 @@ const STDCMAllowances = () => {
<InputSNCF
id="standardAllowanceTypeGridMarginBefore"
type="number"
value={gridMarginBefore}
value={gridMarginBefore || ''}
unit={ALLOWANCE_UNITS_KEYS.time}
onChange={(e) => dispatch(updateGridMarginBefore(+e.target.value || 0))}
onChange={(e) =>
dispatch(updateGridMarginBefore(convertInputStringToNumber(e.target.value)))
}
sm
noMargin
label={t('allowances:gridMarginBeforeAfter')}
Expand All @@ -67,9 +70,11 @@ const STDCMAllowances = () => {
<InputSNCF
id="standardAllowanceTypeGridMarginAfter"
type="number"
value={gridMarginAfter}
value={gridMarginAfter || ''}
unit={ALLOWANCE_UNITS_KEYS.time}
onChange={(e) => dispatch(updateGridMarginAfter(+e.target.value || 0))}
onChange={(e) =>
dispatch(updateGridMarginAfter(convertInputStringToNumber(e.target.value)))
}
sm
noMargin
label=" "
Expand All @@ -82,8 +87,8 @@ const STDCMAllowances = () => {
id="standardAllowanceTypeSelect"
options={standardAllowanceTypes}
handleType={onchangeType}
value={stdcmStandardAllowance?.value || 0}
type={stdcmStandardAllowance?.type || ''}
value={stdcmStandardAllowance?.value || ''}
type={stdcmStandardAllowance?.type || 'percentage'}
orientation="right"
typeValue="number"
condensed
Expand All @@ -95,4 +100,4 @@ const STDCMAllowances = () => {
);
};

export default STDCMAllowances;
export default StdcmAllowances;
4 changes: 2 additions & 2 deletions front/src/reducers/osrdconf/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ const defaultCommonConf = {
trainCompo: undefined,
geojson: undefined,
featureInfoClick: { displayPopup: false },
gridMarginBefore: 0,
gridMarginAfter: 0,
gridMarginBefore: undefined,
gridMarginAfter: undefined,
trainScheduleIDsToModify: [],
};

Expand Down
4 changes: 2 additions & 2 deletions front/src/reducers/osrdconf2/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export const defaultCommonConf: OsrdConfState = {
trainCompo: undefined,
geojson: undefined,
featureInfoClick: { displayPopup: false },
gridMarginBefore: 0,
gridMarginAfter: 0,
gridMarginBefore: undefined,
gridMarginAfter: undefined,
trainScheduleIDsToModify: [],
};

Expand Down
8 changes: 8 additions & 0 deletions front/src/utils/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,11 @@ export function geti18nKeyForNull(str: string | null): string {
export function onlyDigit(str: string): string {
return str.replace(/\D/g, '');
}

/**
* Given a string, return a number or undefined
* Useful for number input
*/
export function convertInputStringToNumber(str: string) {
return str !== '' && !Number.isNaN(str) ? +str : undefined;
}