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 some variables to stdcm store #10603

Merged
merged 4 commits into from
Feb 6, 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 @@ -48,7 +48,7 @@ type StdcmConfigProps = {
isDebugMode: boolean;
isPending: boolean;
launchStdcmRequest: () => Promise<void>;
retainedSimulationIndex: number;
retainedSimulationIndex?: number;
showBtnToLaunchSimulation: boolean;
cancelStdcmRequest: () => void;
};
Expand Down Expand Up @@ -122,7 +122,7 @@ const StdcmConfig = ({
};
}, [rollingStock, towedRollingStock, totalMass, totalLength, maxSpeed]);

const disabled = isPending || retainedSimulationIndex > -1;
const disabled = isPending || retainedSimulationIndex !== undefined;

const markersInfo = useMemo(() => extractMarkersInfo(pathSteps), [pathSteps]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@ import { useMemo } from 'react';
import { Button } from '@osrd-project/ui-core';
import { PDFDownloadLink } from '@react-pdf/renderer';
import { useTranslation, Trans } from 'react-i18next';
import { useSelector } from 'react-redux';

import useConflictsMessages from 'applications/stdcm/hooks/useConflictsMessages';
import type { StdcmSimulation } from 'applications/stdcm/types';
import { extractMarkersInfo } from 'applications/stdcm/utils';
import {
generateCodeNumber,
getOperationalPointsWithTimes,
} from 'applications/stdcm/utils/formatSimulationReportSheet';
import { hasConflicts, hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
import NewMap from 'modules/trainschedule/components/ManageTrainSchedule/NewMap';
import {
getRetainedSimulationIndex,
getSelectedSimulation,
} from 'reducers/osrdconf/stdcmConf/selectors';
import useDeploymentSettings from 'utils/hooks/useDeploymentSettings';

import SimulationReportSheet from './SimulationReportSheet';
Expand All @@ -23,43 +27,38 @@ import StdcmSimulationNavigator from './StdcmSimulationNavigator';
type StcdmResultsProps = {
isCalculationFailed: boolean;
isDebugMode: boolean;
onRetainSimulation: () => void;
onSelectSimulation: (simulationIndex: number) => void;
onStartNewQuery: () => void;
onStartNewQueryWithData: () => void;
buttonsVisible: boolean;
retainedSimulationIndex: number;
selectedSimulationIndex: number;
showStatusBanner: boolean;
simulationsList: StdcmSimulation[];
};

const StcdmResults = ({
isCalculationFailed,
isDebugMode,
onRetainSimulation,
onSelectSimulation,
onStartNewQuery,
onStartNewQueryWithData,
buttonsVisible,
retainedSimulationIndex,
selectedSimulationIndex,
showStatusBanner,
simulationsList,
}: StcdmResultsProps) => {
const { t } = useTranslation('stdcm', { keyPrefix: 'simulation.results' });
const { stdcmName } = useDeploymentSettings();

const selectedSimulation = simulationsList[selectedSimulationIndex];
const { outputs } = selectedSimulation || {};
const selectedSimulation = useSelector(getSelectedSimulation);
const retainedSimulationIndex = useSelector(getRetainedSimulationIndex);

const { outputs } = selectedSimulation;

const hasConflictResults = hasConflicts(outputs);
const hasSimulationResults = hasResults(outputs);

const { trackConflicts, workConflicts } = useConflictsMessages(t, outputs);

const simulationReportSheetNumber = generateCodeNumber();
const isSelectedSimulationRetained = selectedSimulationIndex === retainedSimulationIndex;
const isSelectedSimulationRetained =
retainedSimulationIndex !== undefined && selectedSimulation.index === retainedSimulationIndex;

const operationalPointsList = useMemo(() => {
if (!hasSimulationResults) return [];
Expand All @@ -81,8 +80,7 @@ const StcdmResults = ({
return (
<>
<StdcmSimulationNavigator
simulationsList={simulationsList}
selectedSimulationIndex={selectedSimulationIndex}
selectedSimulationIndex={selectedSimulation.index}
showStatusBanner={showStatusBanner}
isCalculationFailed={isCalculationFailed}
onSelectSimulation={onSelectSimulation}
Expand All @@ -96,7 +94,7 @@ const StcdmResults = ({
consist={selectedSimulation.inputs.consist}
isSimulationRetained={isSelectedSimulationRetained}
operationalPointsList={operationalPointsList}
onRetainSimulation={onRetainSimulation}
simulationIndex={selectedSimulation.index}
/>
{isSelectedSimulationRetained && (
<div className="get-simulation">
Expand All @@ -123,7 +121,7 @@ const StcdmResults = ({
<div className="gesico-text">{t('gesicoRequest')}</div>
</div>
)}
{retainedSimulationIndex > -1 && buttonsVisible && (
{retainedSimulationIndex !== undefined && buttonsVisible && (
<div className="start-new-query">
<Button
data-testid="start-new-query-button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,41 @@ import { useState } from 'react';
import { Button } from '@osrd-project/ui-core';
import cx from 'classnames';
import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';

import type {
StdcmResultsOperationalPoint,
StdcmSimulationInputs,
StdcmSuccessResponse,
} from 'applications/stdcm/types';
import { getStopDurationTime } from 'applications/stdcm/utils/formatSimulationReportSheet';
import { retainSimulation } from 'reducers/osrdconf/stdcmConf';

type SimulationTableProps = {
stdcmData: StdcmSuccessResponse;
consist: StdcmSimulationInputs['consist'];
isSimulationRetained: boolean;
operationalPointsList: StdcmResultsOperationalPoint[];
onRetainSimulation: () => void;
simulationIndex: number;
};

const StcdmResultsTable = ({
stdcmData,
consist,
onRetainSimulation,
isSimulationRetained,
operationalPointsList,
simulationIndex,
}: SimulationTableProps) => {
const { t } = useTranslation(['stdcm-simulation-report-sheet', 'stdcm']);
const dispatch = useDispatch();

const [showAllOP, setShowAllOP] = useState(false);
const toggleShowAllOP = () => setShowAllOP((prevState) => !prevState);

const onRetainSimulation = () => {
dispatch(retainSimulation(simulationIndex));
};

return (
<div className="table-container">
<table className="table-results">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import { CheckCircle, ChevronLeft, ChevronRight } from '@osrd-project/ui-icons';
import cx from 'classnames';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';

import useHorizontalScroll from 'applications/stdcm/hooks/useHorizontalScroll';
import type { StdcmSimulation } from 'applications/stdcm/types';
import { hasConflicts, hasResults } from 'applications/stdcm/utils/simulationOutputUtils';
import { getStdcmSimulations } from 'reducers/osrdconf/stdcmConf/selectors';
import { formatDateToString, formatTimeDifference } from 'utils/date';
import { mmToKm } from 'utils/physics';

export const SIMULATION_ITEM_CLASSNAME = 'simulation-item';
const ITEM_TO_SHOW_COUNT_ON_SCROLL = 3;

type StdcmSimulationNavigatorProps = {
simulationsList: StdcmSimulation[];
retainedSimulationIndex: number;
retainedSimulationIndex?: number;
selectedSimulationIndex: number;
showStatusBanner: boolean;
isCalculationFailed: boolean;
onSelectSimulation: (simulationIndex: number) => void;
};

const StdcmSimulationNavigator = ({
simulationsList,
retainedSimulationIndex,
selectedSimulationIndex,
showStatusBanner,
Expand All @@ -30,6 +29,8 @@ const StdcmSimulationNavigator = ({
}: StdcmSimulationNavigatorProps) => {
const { t } = useTranslation();

const simulationsList = useSelector(getStdcmSimulations);

const { scrollableRef, showLeftBtn, showRightBtn, scrollLeft, scrollRight } = useHorizontalScroll(
SIMULATION_ITEM_CLASSNAME,
ITEM_TO_SHOW_COUNT_ON_SCROLL
Expand All @@ -54,7 +55,7 @@ const StdcmSimulationNavigator = ({
</div>
)}
<div className="simulation-list" ref={scrollableRef}>
{simulationsList?.map(({ id, creationDate, outputs }, index) => {
{simulationsList.map(({ index, creationDate, outputs }) => {
let formatedTotalLength = '';
let formatedTripDuration = '';

Expand All @@ -78,15 +79,15 @@ const StdcmSimulationNavigator = ({
className={cx(SIMULATION_ITEM_CLASSNAME, {
retained: retainedSimulationIndex === index,
selected: selectedSimulationIndex === index,
anyRetained: retainedSimulationIndex !== -1,
anyRetained: retainedSimulationIndex !== undefined,
})}
onClick={() => onSelectSimulation(index)}
>
<div className="simulation-name">
<span>
{outputs && !hasConflicts(outputs)
? t('simulation.results.simulationName.withOutputs', {
id,
id: index + 1,
ns: 'stdcm',
})
: t('simulation.results.simulationName.withoutOutputs', {
Expand All @@ -97,7 +98,7 @@ const StdcmSimulationNavigator = ({
<CheckCircle className="check-circle" variant="fill" />
)}
</div>
<div className="simulation-metadata" key={id}>
<div className="simulation-metadata" key={index}>
<span className="creation-date">
{t('simulation.results.formatCreationDate', {
...formatDateToString(creationDate, true),
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/stdcm/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export type StdcmConflictsOutput = {
export type StdcmSimulationOutputs = StdcmResultsOutput | StdcmConflictsOutput;

export type StdcmSimulation = {
id: number;
index: number;
creationDate: Date;
inputs: StdcmSimulationInputs;
outputs?: StdcmSimulationOutputs;
Expand Down
Loading
Loading