Skip to content

Commit

Permalink
add relative imports in editor
Browse files Browse the repository at this point in the history
  • Loading branch information
clarani committed Jan 8, 2024
1 parent 509e683 commit 6b59d52
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 48 deletions.
7 changes: 4 additions & 3 deletions front/src/applications/editor/components/EntitySumUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import type {
TrackSectionEntity,
} from 'types';
import { getSpeedSectionsNameString } from 'common/Map/Layers/SpeedLimits';
import { EditoastType } from 'applications/editor/tools/types';
import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import { getEntities, getEntity } from 'applications/editor/data/api';

import { EditoastType } from '../tools/types';
import { NEW_ENTITY_ID } from '../data/utils';
import { getEntities, getEntity } from '../data/api';
import { InfraError } from './InfraErrors/types';
import InfraErrorIcon from './InfraErrors/InfraErrorIcon';
import InfraErrorTypeLabel from './InfraErrors/InfraErrorTypeLabel';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import { LngLatBoundsLike, MapRef } from 'react-map-gl/maplibre';
import { BsExclamationOctagon } from 'react-icons/bs';
import { useTranslation } from 'react-i18next';

import useKeyboardShortcuts from 'utils/hooks/useKeyboardShortcuts';
import { getEditorState } from 'reducers/editor/selectors';
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
import { EditorContextType } from 'applications/editor/tools/editorContextTypes';
import { getEntityBbox, selectEntity } from 'applications/editor/tools/utils';
import { getEntity } from 'applications/editor/data/api';
import { getEditorState } from 'reducers/editor/selectors';
import useKeyboardShortcuts from 'utils/hooks/useKeyboardShortcuts';

import { EditorContextType } from '../../tools/editorContextTypes';
import { getEntityBbox, selectEntity } from '../../tools/utils';
import { getEntity } from '../../data/api';
import InfraErrorsModal from './InfraErrorsModal';
import { InfraError } from './types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import { isNil, sortBy, uniqueId } from 'lodash';
import { FaDiamondTurnRight } from 'react-icons/fa6';
import { useDispatch, useSelector } from 'react-redux';

import { getEditorIssues } from 'reducers/editor/selectors';
import { updateFiltersIssue } from 'reducers/editor';
import { LoaderFill, Spinner } from 'common/Loader';
import OptionsSNCF from 'common/BootstrapSNCF/OptionsSNCF';
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
import { EDITOAST_TYPES } from 'applications/editor/tools/types';
import OptionsSNCF from 'common/BootstrapSNCF/OptionsSNCF';
import { LoaderFill, Spinner } from 'common/Loader';
import { updateFiltersIssue } from 'reducers/editor';
import { getEditorIssues } from 'reducers/editor/selectors';

import { EDITOAST_TYPES } from '../../tools/types';
import { InfraErrorBox } from './InfraError';
import {
InfraError,
Expand Down
3 changes: 2 additions & 1 deletion front/src/applications/editor/data/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
Operation,
PostInfraByIdObjectsAndObjectTypeApiResponse,
} from 'common/api/osrdEditoastApi';
import { EditoastType } from 'applications/editor/tools/types';

import { EditoastType } from '../tools/types';

// Quick helper to get a "promised" setTimeout:
export function setTimeoutPromise(ms: number) {
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/commonToolState.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Feature } from 'geojson';
import { InfraError } from 'applications/editor/components/InfraErrors/types';
import { InfraError } from '../components/InfraErrors/types';
import { EditoastType } from './types';

export interface CommonToolState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ import { Map } from 'maplibre-gl';
import { Feature, LineString, Point } from 'geojson';
import nearestPointOnLine from '@turf/nearest-point-on-line';

import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import { getEntity } from 'applications/editor/data/api';
import { LAYER_TO_EDITOAST_DICT, LayerType } from 'applications/editor/tools/types';
import { Tool } from 'applications/editor/tools/editorContextTypes';
import { DEFAULT_COMMON_TOOL_STATE } from 'applications/editor/tools/commonToolState';
import { approximateDistanceWithEditoastData } from 'applications/editor/tools/utils';
import { ConfirmModal } from 'common/BootstrapSNCF/ModalSNCF';
import { getNearestPoint } from 'utils/mapHelper';
import { save } from 'reducers/editor';
Expand All @@ -25,6 +19,13 @@ import {
TrackSectionEntity,
} from 'types';

import { NEW_ENTITY_ID } from '../../data/utils';
import { getEntity } from '../../data/api';
import { LAYER_TO_EDITOAST_DICT, LayerType } from '../types';
import { Tool } from '../editorContextTypes';
import { DEFAULT_COMMON_TOOL_STATE } from '../commonToolState';
import { approximateDistanceWithEditoastData } from '../utils';

import { getPointEditionLeftPanel, POINT_LAYER_ID, PointEditionMessages } from './components';
import { PointEditionState } from './types';

Expand Down
4 changes: 2 additions & 2 deletions front/src/applications/editor/tools/pointEdition/types.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Feature, Point } from 'geojson';

import { EditorEntity } from 'types';
import { CommonToolState } from 'applications/editor/tools/commonToolState';
import { LayerType } from 'applications/editor/tools/types';
import { CommonToolState } from '../commonToolState';
import { LayerType } from '../types';

export type PointEditionState<E extends EditorEntity> = CommonToolState & {
initialEntity: E;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { cloneDeep } from 'lodash';
import React, { useContext } from 'react';
import { useTranslation } from 'react-i18next';
import EditorContext from 'applications/editor/context';
import { CatenaryEntity } from 'types';
import { GiElectric } from 'react-icons/gi';
import { cloneDeep } from 'lodash';

import SelectImprovedSNCF from 'common/BootstrapSNCF/SelectImprovedSNCF';
import { ExtendedEditorContextType } from 'applications/editor/tools/editorContextTypes';
import { CatenaryEntity } from 'types';

import EditorContext from '../../../context';
import { ExtendedEditorContextType } from '../../editorContextTypes';
import { RangeEditionState } from '../types';

const CatenaryMetadataForm = ({ voltages }: { voltages: string[] }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import React, { useMemo } from 'react';
import { cloneDeep, compact } from 'lodash';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';

import {
PSLExtension,
PSLSign,
SpeedSectionEntity,
SpeedSectionPslEntity,
TrackSectionEntity,
} from 'types';
import { useTranslation } from 'react-i18next';
import { removeDuplicates } from 'utils/array';
import { PartialOrReducer } from 'applications/editor/tools/editorContextTypes';

import { PartialOrReducer } from '../../editorContextTypes';
import { PslSignInformation, PSL_SIGN_TYPES, RangeEditionState, TrackState } from '../types';
import { msToKmh, selectPslSign } from '../utils';
import PslSignCard from './PslSignCard';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { FaTimes } from 'react-icons/fa';
import { MdSpeed } from 'react-icons/md';
import { cloneDeep, isEmpty, map, mapKeys, omit } from 'lodash';

import EditorContext from 'applications/editor/context';
import { ExtendedEditorContextType } from 'applications/editor/tools/editorContextTypes';
import EditorContext from '../../../context';
import { ExtendedEditorContextType } from '../../editorContextTypes';
import { RangeEditionState } from '../types';
import SpeedInput from './SpeedInput';

Expand Down
8 changes: 4 additions & 4 deletions front/src/applications/editor/tools/rangeEdition/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { Feature, feature, lineString, LineString, point } from '@turf/helpers';
import lineSliceAlong from '@turf/line-slice-along';
import { MapLayerMouseEvent } from 'maplibre-gl';

import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import {
CatenaryEntity,
PSLExtension,
Expand All @@ -18,13 +17,14 @@ import {
} from 'types';
import { getNearestPoint } from 'utils/mapHelper';

import { NEW_ENTITY_ID } from '../../data/utils';
import {
approximateDistanceWithEditoastData,
getHoveredTrackRanges,
getTrackSectionEntityFromNearestPoint,
} from 'applications/editor/tools/utils';
import { DEFAULT_COMMON_TOOL_STATE } from 'applications/editor/tools/commonToolState';
import { PartialOrReducer } from 'applications/editor/tools/editorContextTypes';
} from '../utils';
import { DEFAULT_COMMON_TOOL_STATE } from '../commonToolState';
import { PartialOrReducer } from '../editorContextTypes';
import {
PSL_SIGN_TYPE,
PSL_SIGN_TYPES,
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/routeEdition/tool.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { GiPathDistance } from 'react-icons/gi';
import { WayPointEntity } from 'types';
import { Tool } from 'applications/editor/tools/editorContextTypes';
import { Tool } from '../editorContextTypes';
import { RouteEditionLayers, RouteEditionLeftPanel, RouteMessages } from './components';
import { getEmptyCreateRouteState } from './utils';
import { RouteEditionState } from './types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { LineString, Point, Position } from 'geojson';
import length from '@turf/length';
import { lineString } from '@turf/helpers';

import { editoastToEditorEntity } from 'applications/editor/data/utils';
import { DetectorEntity, TrackSectionEntity } from 'types';
import { editoastToEditorEntity } from '../../data/utils';
import { computeRouteGeometry, removeDuplicatePoints } from './utils';

const p1: Position = [-1.1, 49.5];
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/selection/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EditorEntity } from 'types';
import { CommonToolState } from 'applications/editor/tools/commonToolState';
import { CommonToolState } from '../commonToolState';

export type SelectionState = CommonToolState & {
selectionState:
Expand Down
6 changes: 3 additions & 3 deletions front/src/applications/editor/tools/switchEdition/tool.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import { GoPlusCircle, GoTrash } from 'react-icons/go';
import { save } from 'reducers/editor';
import { SwitchEntity, SwitchType } from 'types';
import { ConfirmModal } from 'common/BootstrapSNCF/ModalSNCF';
import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import { Tool } from 'applications/editor/tools/editorContextTypes';
import { DEFAULT_COMMON_TOOL_STATE } from 'applications/editor/tools/commonToolState';

import { NEW_ENTITY_ID } from '../../data/utils';
import { Tool } from '../editorContextTypes';
import { DEFAULT_COMMON_TOOL_STATE } from '../commonToolState';
import { SwitchEditionLayers, SwitchEditionLeftPanel, SwitchMessages } from './components';
import { SwitchEditionState } from './types';
import { getNewSwitch } from './utils';
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/switchEdition/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { JSONSchema7 } from 'json-schema';
import { omit, omitBy, without } from 'lodash';
import { Point } from 'geojson';

import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import { EditorEntity, SwitchEntity, SwitchType, TrackEndpoint } from 'types';
import { NEW_ENTITY_ID } from '../../data/utils';

export function getNewSwitch(type: SwitchType): Partial<SwitchEntity> {
return {
Expand Down
6 changes: 3 additions & 3 deletions front/src/applications/editor/tools/trackEdition/tool.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import { featureCollection } from '@turf/helpers';
import getNearestPoint from '@turf/nearest-point';
import nearestPointOnLine, { NearestPointOnLine } from '@turf/nearest-point-on-line';

import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import { Tool } from 'applications/editor/tools/editorContextTypes';
import { DEFAULT_COMMON_TOOL_STATE } from 'applications/editor/tools/commonToolState';
import { entityDoUpdate, getLineStringDistance } from 'common/IntervalsDataViz/data';
import { ConfirmModal } from 'common/BootstrapSNCF/ModalSNCF';
import { save } from 'reducers/editor';
import { getMapMouseEventNearestFeature } from 'utils/mapHelper';

import { NEW_ENTITY_ID } from '../../data/utils';
import { Tool } from '../editorContextTypes';
import { DEFAULT_COMMON_TOOL_STATE } from '../commonToolState';
import {
POINTS_LAYER_ID,
TRACK_LAYER_ID,
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/trackEdition/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Feature, Point } from 'geojson';

import { TrackSectionEntity } from 'types';
import { CommonToolState } from 'applications/editor/tools/commonToolState';
import { CommonToolState } from '../commonToolState';

export type TrackEditionState = CommonToolState & {
track: TrackSectionEntity;
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/editor/tools/trackEdition/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NEW_ENTITY_ID } from 'applications/editor/data/utils';
import { LinearMetadataItem } from 'common/IntervalsDataViz/types';
import { EditorEntity, TrackSectionEntity } from 'types';
import { NEW_ENTITY_ID } from '../../data/utils';

export function getNewLine(points: [number, number][]): TrackSectionEntity {
return {
Expand Down

0 comments on commit 6b59d52

Please sign in to comment.