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: refacto stdcm op schedule #10192

Merged
merged 6 commits into from
Jan 9, 2025
Merged
Changes from 1 commit
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
Next Next commit
front: move main actions from parent component in StdcmOpSchedule
Signed-off-by: Clara Ni <clara.ni@outlook.fr>
clarani committed Jan 9, 2025
commit c48617f142c8a1b8c3f29e1c2c97b0e3d6dc2bc8
Original file line number Diff line number Diff line change
@@ -5,26 +5,21 @@ import { useSelector } from 'react-redux';

import { getTimesInfoFromDate } from 'applications/stdcm/utils';
import DestinationIcon from 'assets/pictures/mapMarkers/destination.svg';
import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
import { useOsrdConfSelectors } from 'common/osrdContext';
import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
import { useAppDispatch } from 'store';

import StdcmCard from './StdcmCard';
import StdcmOperationalPoint from './StdcmOperationalPoint';
import StdcmOpSchedule from './StdcmOpSchedule';
import type { ArrivalTimeTypes, ScheduleConstraint, StdcmConfigCardProps } from '../../types';
import type { StdcmConfigCardProps } from '../../types';

const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
const { t } = useTranslation('stdcm');
const dispatch = useAppDispatch();

const { getStdcmDestination } = useOsrdConfSelectors() as StdcmConfSelectors;

const destination = useSelector(getStdcmDestination);

const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;

const { destinationArrival, destinationToleranceValues } = useMemo(
() => ({
destinationArrival: getTimesInfoFromDate(destination.arrival),
@@ -36,35 +31,6 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
[destination]
);

const onArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
date.setHours(hours, minutes);
dispatch(
updateStdcmPathStep({
id: destination.id,
updates: { arrival: date },
})
);
};

const onArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
dispatch(updateStdcmPathStep({ id: destination.id, updates: { arrivalType } }));
};

const onToleranceChange = ({
toleranceBefore,
toleranceAfter,
}: {
toleranceBefore: number;
toleranceAfter: number;
}) => {
dispatch(
updateStdcmPathStep({
id: destination.id,
updates: { tolerances: { before: toleranceBefore, after: toleranceAfter } },
})
);
};

return (
<StdcmCard
data-testid="destination-card"
@@ -79,9 +45,7 @@ const StdcmDestination = ({ disabled = false }: StdcmConfigCardProps) => {
disabled={disabled}
/>
<StdcmOpSchedule
onArrivalChange={onArrivalChange}
onArrivalTypeChange={onArrivalTypeChange}
onArrivalToleranceChange={onToleranceChange}
pathStep={destination}
opTimingData={destinationArrival}
opToleranceValues={destinationToleranceValues}
opScheduleTimeType={destination.arrivalType}
Original file line number Diff line number Diff line change
@@ -4,23 +4,18 @@ import { DatePicker, Select, TimePicker, TolerancePicker } from '@osrd-project/u
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';

import { useOsrdConfSelectors } from 'common/osrdContext';
import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
import type { StdcmPathStep } from 'reducers/osrdconf/types';
import { useAppDispatch } from 'store';
import { formatDateString, isArrivalDateInSearchTimeWindow } from 'utils/date';
import { createStringSelectOptions } from 'utils/uiCoreHelpers';

import type { ArrivalTimeTypes, ScheduleConstraint } from '../../types';

type StdcmOpScheduleProps = {
disabled: boolean;
onArrivalChange: ({ date, hours, minutes }: ScheduleConstraint) => void;
onArrivalTypeChange: (arrivalType: ArrivalTimeTypes) => void;
onArrivalToleranceChange: ({
toleranceBefore,
toleranceAfter,
}: {
toleranceBefore: number;
toleranceAfter: number;
}) => void;
pathStep: Extract<StdcmPathStep, { isVia: false }>;
opScheduleTimeType: ArrivalTimeTypes;
opTimingData?: {
date: Date;
@@ -45,16 +40,17 @@ const defaultDate = (date?: Date) => {

const StdcmOpSchedule = ({
disabled,
onArrivalChange,
onArrivalTypeChange,
onArrivalToleranceChange,
pathStep,
opTimingData,
opScheduleTimeType,
opToleranceValues,
opId,
isOrigin = false,
}: StdcmOpScheduleProps) => {
const { t } = useTranslation('stdcm');
const dispatch = useAppDispatch();

const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;
const { getSearchDatetimeWindow } = useOsrdConfSelectors();
const searchDatetimeWindow = useSelector(getSearchDatetimeWindow);

@@ -101,6 +97,20 @@ const StdcmOpSchedule = ({
[t, searchDatetimeWindow]
);

const onArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
date.setHours(hours, minutes);
dispatch(
updateStdcmPathStep({
id: pathStep.id,
updates: { arrival: date },
})
);
};

const onArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
dispatch(updateStdcmPathStep({ id: pathStep.id, updates: { arrivalType } }));
};

useEffect(() => {
if (
(!isArrivalDateInSearchTimeWindow(arrivalDate, searchDatetimeWindow) ||
@@ -174,10 +184,12 @@ const StdcmOpSchedule = ({
toleranceValues={arrivalToleranceValues}
onChange={() => {}}
onToleranceChange={({ minusTolerance, plusTolerance }) => {
onArrivalToleranceChange({
toleranceBefore: minusTolerance,
toleranceAfter: plusTolerance,
});
dispatch(
updateStdcmPathStep({
id: pathStep.id,
updates: { tolerances: { before: minusTolerance, after: plusTolerance } },
})
);
}}
disabled={disabled}
/>
Original file line number Diff line number Diff line change
@@ -5,25 +5,20 @@ import { useSelector } from 'react-redux';

import { getTimesInfoFromDate } from 'applications/stdcm/utils';
import OriginIcon from 'assets/pictures/mapMarkers/start.svg';
import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
import { useOsrdConfSelectors } from 'common/osrdContext';
import type { StdcmConfSelectors } from 'reducers/osrdconf/stdcmConf/selectors';
import { useAppDispatch } from 'store';

import StdcmCard from './StdcmCard';
import StdcmOperationalPoint from './StdcmOperationalPoint';
import StdcmOpSchedule from './StdcmOpSchedule';
import type { ArrivalTimeTypes, ScheduleConstraint, StdcmConfigCardProps } from '../../types';
import type { StdcmConfigCardProps } from '../../types';

const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
const { t } = useTranslation('stdcm');
const dispatch = useAppDispatch();

const { getStdcmOrigin } = useOsrdConfSelectors() as StdcmConfSelectors;
const origin = useSelector(getStdcmOrigin);

const { updateStdcmPathStep } = useOsrdConfActions() as StdcmConfSliceActions;

const { originArrival, originToleranceValues } = useMemo(
() => ({
originArrival: getTimesInfoFromDate(origin.arrival),
@@ -35,40 +30,6 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
[origin]
);

const onOriginArrivalChange = ({ date, hours, minutes }: ScheduleConstraint) => {
date.setHours(hours, minutes);
dispatch(
updateStdcmPathStep({
id: origin.id,
updates: { arrival: date },
})
);
};

const onOriginArrivalTypeChange = (arrivalType: ArrivalTimeTypes) => {
dispatch(
updateStdcmPathStep({
id: origin.id,
updates: { arrivalType },
})
);
};

const onOriginToleranceChange = ({
toleranceBefore,
toleranceAfter,
}: {
toleranceBefore: number;
toleranceAfter: number;
}) => {
dispatch(
updateStdcmPathStep({
id: origin.id,
updates: { tolerances: { before: toleranceBefore, after: toleranceAfter } },
})
);
};

return (
<StdcmCard
name={t('trainPath.origin')}
@@ -83,9 +44,7 @@ const StdcmOrigin = ({ disabled = false }: StdcmConfigCardProps) => {
disabled={disabled}
/>
<StdcmOpSchedule
onArrivalChange={onOriginArrivalChange}
onArrivalTypeChange={onOriginArrivalTypeChange}
onArrivalToleranceChange={onOriginToleranceChange}
pathStep={origin}
opTimingData={originArrival}
opToleranceValues={originToleranceValues}
opScheduleTimeType={origin.arrivalType}