Skip to content

Commit 8b2e384

Browse files
committed
front: move NGE logic to dedicated component directory
Move low-level NGE details to a separate directory to make sure it stays clearly split from the OSRD-specific logic.
1 parent fa9ff3a commit 8b2e384

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

front/src/applications/operationalStudies/components/MacroEditor/ngeToOsrd.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
import type { AppDispatch } from 'store';
77

88
import nodeStore from './nodeStore';
9-
import type { NetzgrafikDto, NGEEvent, TrainrunSection, Node, Trainrun } from './types';
9+
import type { NetzgrafikDto, NGEEvent, TrainrunSection, Node, Trainrun } from '../NGE/types';
1010

1111
const createdTrainrun = new Map<number, number>();
1212

front/src/applications/operationalStudies/components/MacroEditor/osrdToNge.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type {
88
import type { AppDispatch } from 'store';
99

1010
import nodeStore from './nodeStore';
11+
import { findOpFromPathItem, addDurationToDate } from './utils';
1112
import type {
1213
Node,
1314
Port,
@@ -18,9 +19,8 @@ import type {
1819
TrainrunFrequency,
1920
TrainrunTimeCategory,
2021
NetzgrafikDto,
21-
} from './types';
22-
import { PortAlignment } from './types';
23-
import { findOpFromPathItem, addDurationToDate } from './utils';
22+
} from '../NGE/types';
23+
import { PortAlignment } from '../NGE/types';
2424

2525
// TODO: make this optional in NGE since it's SBB-specific
2626
const TRAINRUN_CATEGORY_HALTEZEITEN = {

front/src/applications/operationalStudies/components/MacroEditor/NGE.tsx front/src/applications/operationalStudies/components/NGE/NGE.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ const frameSrc = `
3434
</html>
3535
`;
3636

37+
/**
38+
* Standalone NetzGraphik Editor component.
39+
*
40+
* Abstracts away low-level NGE details. Doesn't contain any OSRD-specific
41+
* logic.
42+
*/
3743
const NGE = ({ dto, onOperation }: NGEProps) => {
3844
const frameRef = useRef<HTMLIFrameElement>(null);
3945

front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ import { GiElectric } from 'react-icons/gi';
77
import { useSelector } from 'react-redux';
88

99
import BreadCrumbs from 'applications/operationalStudies/components/BreadCrumbs';
10-
import NGE from 'applications/operationalStudies/components/MacroEditor/NGE';
1110
import handleOperation from 'applications/operationalStudies/components/MacroEditor/ngeToOsrd';
1211
import importTimetableToNGE from 'applications/operationalStudies/components/MacroEditor/osrdToNge';
13-
import type {
14-
NetzgrafikDto,
15-
NGEEvent,
16-
} from 'applications/operationalStudies/components/MacroEditor/types';
1712
import MicroMacroSwitch from 'applications/operationalStudies/components/MicroMacroSwitch';
13+
import NGE from 'applications/operationalStudies/components/NGE/NGE';
14+
import type { NetzgrafikDto, NGEEvent } from 'applications/operationalStudies/components/NGE/types';
1815
import InfraLoadingState from 'applications/operationalStudies/components/Scenario/InfraLoadingState';
1916
import { MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
2017
import infraLogo from 'assets/pictures/components/tracks.svg';

0 commit comments

Comments
 (0)