Skip to content

Commit 07097cf

Browse files
PerholehtoPerholehto
committedNov 30, 2023
Rename ModalMap to MapModal
For a more descriptive name that aligns with other modals
1 parent 50a7552 commit 07097cf

20 files changed

+73
-73
lines changed
 

‎cypress/e2e/createRoute.cy.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
RouteDirectionEnum,
99
RouteInsertInput,
1010
RouteTypeOfLineEnum,
11-
StopInsertInput,
1211
StopInJourneyPatternInsertInput,
12+
StopInsertInput,
1313
buildLine,
1414
buildRoute,
1515
buildStop,
@@ -20,7 +20,7 @@ import {
2020
} from '@hsl/jore4-test-db-manager';
2121
import { DateTime } from 'luxon';
2222
import { Tag } from '../enums';
23-
import { ModalMap, RouteEditor } from '../pageObjects';
23+
import { MapModal, RouteEditor } from '../pageObjects';
2424
import { FilterPanel } from '../pageObjects/FilterPanel';
2525
import { RouteStopsOverlay } from '../pageObjects/RouteStopsOverlay';
2626
import { UUID } from '../types';
@@ -199,7 +199,7 @@ const stopTestIds = {
199199
};
200200

201201
describe('Route creation', () => {
202-
let modalMap: ModalMap;
202+
let mapModal: MapModal;
203203
let routeStopsOverlay: RouteStopsOverlay;
204204
let routeEditor: RouteEditor;
205205
const baseDbResources = {
@@ -231,7 +231,7 @@ describe('Route creation', () => {
231231
});
232232

233233
beforeEach(() => {
234-
modalMap = new ModalMap();
234+
mapModal = new MapModal();
235235
const mapFilterPanel = new FilterPanel();
236236

237237
deleteRoutesByLabel(Object.values(testRouteLabels));
@@ -247,15 +247,15 @@ describe('Route creation', () => {
247247
// Location where all test stops and routes are visible.
248248
const mapLocation = { lng: 24.929689228090112, lat: 60.16495016651525 };
249249

250-
modalMap.map.visit({
250+
mapModal.map.visit({
251251
zoom: 15,
252252
lat: mapLocation.lat,
253253
lng: mapLocation.lng,
254254
});
255255

256256
mapFilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
257257

258-
modalMap.map.waitForLoadToComplete();
258+
mapModal.map.waitForLoadToComplete();
259259
});
260260

261261
afterEach(() => {
@@ -272,7 +272,7 @@ describe('Route creation', () => {
272272
() => {
273273
const routeName = 'Testireitti 1';
274274

275-
modalMap.createRoute({
275+
mapModal.createRoute({
276276
routeFormInfo: {
277277
finnishName: routeName,
278278
label: testRouteLabels.label1,
@@ -311,7 +311,7 @@ describe('Route creation', () => {
311311
() => {
312312
const routeName = 'Testireitti 2';
313313
const omittedStopsLabels = [stopLabels[1]];
314-
modalMap.createRoute({
314+
mapModal.createRoute({
315315
routeFormInfo: {
316316
finnishName: routeName,
317317
label: testRouteLabels.label2,
@@ -352,7 +352,7 @@ describe('Route creation', () => {
352352
() => {
353353
const routeName = 'Testireitti 3';
354354
const omittedStopsLabels = [stopLabels[1], stopLabels[2]];
355-
modalMap.createRoute({
355+
mapModal.createRoute({
356356
routeFormInfo: {
357357
finnishName: routeName,
358358
label: testRouteLabels.label3,
@@ -387,7 +387,7 @@ describe('Route creation', () => {
387387
() => {
388388
const routeName = 'Testireitti 4';
389389

390-
modalMap.createRoute({
390+
mapModal.createRoute({
391391
routeFormInfo: {
392392
finnishName: routeName,
393393
label: testRouteLabels.label4,
@@ -422,7 +422,7 @@ describe('Route creation', () => {
422422
'Should create a new route using an existing route as a template',
423423
{ tags: [Tag.Map, Tag.Routes, Tag.Network], scrollBehavior: 'bottom' },
424424
() => {
425-
modalMap.createRoute({
425+
mapModal.createRoute({
426426
routeFormInfo: {
427427
finnishName: 'Reitin pohjalta luotu reitti',
428428
label: testRouteLabels.label5,

‎cypress/e2e/createStop.cy.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
timingPlaces,
55
} from '@hsl/jore4-test-db-manager';
66
import { Tag } from '../enums';
7-
import { ChangeValidityForm, ModalMap } from '../pageObjects';
7+
import { ChangeValidityForm, MapModal } from '../pageObjects';
88
import { FilterPanel } from '../pageObjects/FilterPanel';
99
import { insertToDbHelper, removeFromDbHelper } from '../utils';
1010
import { deleteStopsByLabels } from './utils';
@@ -26,22 +26,22 @@ const clearDatabase = () => {
2626
};
2727

2828
describe('Stop creation tests', () => {
29-
let modalMap: ModalMap;
29+
let mapModal: MapModal;
3030
let mapFilterPanel: FilterPanel;
3131
let changeValidityForm: ChangeValidityForm;
3232

3333
beforeEach(() => {
3434
clearDatabase();
3535
insertToDbHelper(dbResources);
3636

37-
modalMap = new ModalMap();
37+
mapModal = new MapModal();
3838
mapFilterPanel = new FilterPanel();
3939
changeValidityForm = new ChangeValidityForm();
4040

4141
cy.setupMapTiles();
4242
cy.mockLogin();
4343

44-
modalMap.map.visit({
44+
mapModal.map.visit({
4545
zoom: 15,
4646
lat: 60.164074274478054,
4747
lng: 24.93021804533524,
@@ -56,7 +56,7 @@ describe('Stop creation tests', () => {
5656
'Should create stop on map',
5757
{ tags: [Tag.Map, Tag.Stops, Tag.Smoke], scrollBehavior: 'bottom' },
5858
() => {
59-
modalMap.createStopAtLocation({
59+
mapModal.createStopAtLocation({
6060
stopFormInfo: {
6161
label: testStopLabels.testLabel1,
6262
validityStartISODate: '2022-01-01',
@@ -68,9 +68,9 @@ describe('Stop creation tests', () => {
6868
},
6969
});
7070

71-
modalMap.gqlStopShouldBeCreatedSuccessfully();
71+
mapModal.gqlStopShouldBeCreatedSuccessfully();
7272

73-
modalMap.checkStopSubmitSuccessToast();
73+
mapModal.checkStopSubmitSuccessToast();
7474

7575
mapFilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
7676

@@ -85,7 +85,7 @@ describe('Stop creation tests', () => {
8585
{ tags: [Tag.Stops, Tag.Map], scrollBehavior: 'bottom' },
8686
() => {
8787
// Create stop
88-
modalMap.createStopAtLocation({
88+
mapModal.createStopAtLocation({
8989
stopFormInfo: {
9090
label: testStopLabels.manualCoordinatesLabel,
9191
// Actual coordinates will be on Topeliuksenkatu
@@ -100,12 +100,12 @@ describe('Stop creation tests', () => {
100100
},
101101
});
102102

103-
modalMap.gqlStopShouldBeCreatedSuccessfully();
103+
mapModal.gqlStopShouldBeCreatedSuccessfully();
104104

105-
modalMap.checkStopSubmitSuccessToast();
105+
mapModal.checkStopSubmitSuccessToast();
106106

107107
// Change map position to created stop location
108-
modalMap.map.visit({
108+
mapModal.map.visit({
109109
zoom: 15,
110110
lat: 60.1805636468358,
111111
lng: 24.918451016960763,
@@ -123,7 +123,7 @@ describe('Stop creation tests', () => {
123123
'Should create stop with end time on map',
124124
{ tags: [Tag.Stops, Tag.Map], scrollBehavior: 'bottom' },
125125
() => {
126-
modalMap.createStopAtLocation({
126+
mapModal.createStopAtLocation({
127127
stopFormInfo: {
128128
label: testStopLabels.endDateLabel,
129129
validityStartISODate: '2022-01-01',
@@ -136,17 +136,17 @@ describe('Stop creation tests', () => {
136136
},
137137
});
138138

139-
modalMap.gqlStopShouldBeCreatedSuccessfully();
139+
mapModal.gqlStopShouldBeCreatedSuccessfully();
140140

141-
modalMap.checkStopSubmitSuccessToast();
141+
mapModal.checkStopSubmitSuccessToast();
142142

143143
mapFilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
144144

145145
cy.getByTestId(
146146
`Map::Stops::stopMarker::${testStopLabels.endDateLabel}_Standard`,
147147
).click();
148148

149-
modalMap.map.stopPopUp.getEditButton().click();
149+
mapModal.map.stopPopUp.getEditButton().click();
150150

151151
changeValidityForm.getEndDateInput().should('have.value', '2040-12-31');
152152
},
@@ -161,7 +161,7 @@ describe('Stop creation tests', () => {
161161
defaultCommandTimeout: 10000,
162162
},
163163
() => {
164-
modalMap.createStopAtLocation({
164+
mapModal.createStopAtLocation({
165165
stopFormInfo: {
166166
label: testStopLabels.timingPlaceLabel,
167167
// seed timing places should always have label defined
@@ -177,19 +177,19 @@ describe('Stop creation tests', () => {
177177
},
178178
});
179179

180-
modalMap.gqlStopShouldBeCreatedSuccessfully();
180+
mapModal.gqlStopShouldBeCreatedSuccessfully();
181181

182-
modalMap.checkStopSubmitSuccessToast();
182+
mapModal.checkStopSubmitSuccessToast();
183183

184184
mapFilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
185185

186186
cy.getByTestId(
187187
`Map::Stops::stopMarker::${testStopLabels.timingPlaceLabel}_Standard`,
188188
).click();
189189

190-
modalMap.map.stopPopUp.getEditButton().click();
190+
mapModal.map.stopPopUp.getEditButton().click();
191191

192-
modalMap.stopForm
192+
mapModal.stopForm
193193
.getTimingPlaceDropdown()
194194
.should('contain', timingPlaces[0].label);
195195
},

‎cypress/e2e/editRouteShape.cy.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
RouteDirectionEnum,
88
RouteInsertInput,
99
RouteTypeOfLineEnum,
10-
StopInsertInput,
1110
StopInJourneyPatternInsertInput,
11+
StopInsertInput,
1212
buildLine,
1313
buildRoute,
1414
buildStop,
@@ -22,7 +22,7 @@ import { Tag } from '../enums';
2222
import {
2323
Map,
2424
MapFooter,
25-
ModalMap,
25+
MapModal,
2626
RouteEditor,
2727
RoutesAndLinesPage,
2828
SearchResultsPage,
@@ -186,7 +186,7 @@ describe('Edit route geometry', () => {
186186
let routeEditor: RouteEditor;
187187
let searchResultsPage: SearchResultsPage;
188188
let routesAndLinesPage: RoutesAndLinesPage;
189-
let modalMap: ModalMap;
189+
let mapModal: MapModal;
190190
let mapFooter: MapFooter;
191191

192192
const baseDbResources = {
@@ -228,7 +228,7 @@ describe('Edit route geometry', () => {
228228
routeEditor = new RouteEditor();
229229
searchResultsPage = new SearchResultsPage();
230230
routesAndLinesPage = new RoutesAndLinesPage();
231-
modalMap = new ModalMap();
231+
mapModal = new MapModal();
232232
mapFooter = new MapFooter();
233233

234234
cy.setupMapTiles();
@@ -291,7 +291,7 @@ describe('Edit route geometry', () => {
291291
lng: mapLocation.lng,
292292
});
293293

294-
modalMap.createRoute({
294+
mapModal.createRoute({
295295
routeFormInfo: {
296296
finnishName: 'Reitin pohjalta luotu reitti',
297297
label: testCreatedRouteLabels.templateRoute,

‎cypress/pageObjects/Map.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class Map {
1212
stopPopUp = new StopPopUp();
1313

1414
zoomIn(n = 1) {
15-
Cypress._.times(n, () => cy.getByTestId('modalMap').type('+'));
15+
Cypress._.times(n, () => cy.getByTestId('mapModal').type('+'));
1616
this.waitForLoadToComplete();
1717
cy.wait('@gqlGetStopsByLocation');
1818
}
@@ -30,15 +30,15 @@ export class Map {
3030
cy.getByTestId(clickPoint.mapMarkerTestId).then((mark) => {
3131
const { x } = mark[0].getBoundingClientRect();
3232
const { y } = mark[0].getBoundingClientRect();
33-
cy.getByTestId('modalMap').click(
33+
cy.getByTestId('mapModal').click(
3434
x + clickPoint.rightOffset,
3535
y + clickPoint.downOffset,
3636
);
3737
});
3838
}
3939

4040
clickAtPosition(x: number, y: number) {
41-
cy.getByTestId('modalMap').click(x, y);
41+
cy.getByTestId('mapModal').click(x, y);
4242
}
4343

4444
getNthSnappingPointHandle(nth: number) {
@@ -52,7 +52,7 @@ export class Map {
5252
clickRelativePoint(xPercentage: number, yPercentage: number) {
5353
const x = (Cypress.config('viewportWidth') / 100) * xPercentage;
5454
const y = (Cypress.config('viewportHeight') / 100) * yPercentage;
55-
cy.getByTestId('modalMap').click(x, y);
55+
cy.getByTestId('mapModal').click(x, y);
5656
}
5757

5858
getStopByStopLabelAndPriority(testStopLabel: string, priority: Priority) {

‎cypress/pageObjects/ModalMap.ts ‎cypress/pageObjects/MapModal.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { RouteStopsOverlay } from './RouteStopsOverlay';
77
import { StopForm, StopFormInfo } from './StopForm';
88
import { Toast } from './Toast';
99

10-
export class ModalMap {
10+
export class MapModal {
1111
map = new Map();
1212

1313
mapFooter = new MapFooter();

‎cypress/pageObjects/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ export * from './LineDetailsPage';
77
export * from './LineForm';
88
export * from './Map';
99
export * from './MapFooter';
10-
export * from './ModalMap';
10+
export * from './MapModal';
1111
export * from './Navbar';
1212
export * from './PassingTimesByStopSection';
1313
export * from './PreviewTimetablesPage';
1414
export * from './RouteEditor';
1515
export * from './RoutePropertiesForm';
16-
export * from './RoutesAndLinesPage';
1716
export * from './RouteStopsTable';
1817
export * from './RouteTimetablesSection';
18+
export * from './RoutesAndLinesPage';
1919
export * from './SearchResultsPage';
2020
export * from './StopForm';
2121
export * from './SubstituteDaySettingsPage';
22-
export * from './TimetablesMainPage';
23-
export * from './TimetableVersionsPage';
2422
export * from './TemplateRouteSelector';
2523
export * from './TerminusNameInputs';
24+
export * from './TimetableVersionsPage';
25+
export * from './TimetablesMainPage';
2626
export * from './Toast';
2727
export * from './VehicleScheduleDetailsPage';
2828
export * from './VehicleServiceTable';

‎ui/src/components/map/ModalMap.tsx ‎ui/src/components/map/MapModal.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ interface Props {
99
className?: string;
1010
}
1111

12-
const testIds = { modalMap: 'modalMap' };
12+
const testIds = { mapModal: 'mapModal' };
1313

1414
// magic values that can be seen with browsers devtools.
1515
// probably won't work in all corner cases, but e.g. zooming
1616
// broswer in/out doesn't seem to break anything.
1717
const mapHeaderHeight = 64;
1818
const mapFooterHeight = 82;
1919

20-
export const ModalMap: React.FC<Props> = ({ className = '' }) => {
20+
export const MapModal: React.FC<Props> = ({ className = '' }) => {
2121
const mapRef = useRef<ExplicitAny>(null);
2222

2323
const { isMapOpen, deleteMapQueryParameters } = useMapQueryParams();
2424

25-
const onCloseModalMap = () => {
25+
const onCloseMapModal = () => {
2626
deleteMapQueryParameters();
2727
};
2828

2929
return (
3030
<Dialog
3131
open={isMapOpen}
32-
onClose={onCloseModalMap}
33-
data-testid={testIds.modalMap}
32+
onClose={onCloseMapModal}
33+
data-testid={testIds.mapModal}
3434
className={`absolute left-0 top-0 z-10 h-full w-full bg-background ${className}`}
3535
>
36-
<MapHeader onClose={onCloseModalMap} />
36+
<MapHeader onClose={onCloseMapModal} />
3737
{/* Setting height of map component dynamically seems to be tricky as
3838
it doesn't respect e.g. "height: 100%" rule.
3939
As a workaround we can use css's `calc` function and magically subtract

‎ui/src/components/map/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export * from './Map';
22
export * from './MapLoader';
3-
export * from './ModalMap';
3+
export * from './MapModal';

‎ui/src/components/routes-and-lines/main/RoutesAndLinesMainPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const RoutesAndLinesMainPage = (): JSX.Element => {
2323
const toggleShowAllStops = toggleFunction(FilterType.ShowAllBusStops);
2424

2525
const createLineReactRoute = routeDetails[Path.createLine];
26-
const onOpenModalMap = () => {
26+
const onOpenMapModal = () => {
2727
dispatch(resetMapState());
2828
addMapOpenQueryParameter();
2929
/**
@@ -37,7 +37,7 @@ export const RoutesAndLinesMainPage = (): JSX.Element => {
3737
<Container>
3838
<Row>
3939
<h1>{t('routes.routes')}</h1>
40-
<SimpleButton containerClassName="ml-auto" onClick={onOpenModalMap}>
40+
<SimpleButton containerClassName="ml-auto" onClick={onOpenMapModal}>
4141
{t('map.open')}
4242
</SimpleButton>
4343
<SimpleButton

‎ui/src/redux/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
export * from './mappers';
21
export * from './ReduxProvider';
2+
export * from './mappers';
33
export * from './selectors';
44
export * from './slices/export';
55
export * from './slices/loader';
66
export * from './slices/mapFilter';
7+
export * from './slices/mapModal';
78
export * from './slices/mapRouteEditor';
89
export * from './slices/mapStopEditor';
9-
export * from './slices/modalMap';
1010
export * from './slices/modals';
1111
export * from './slices/user';
1212
export * from './store';

‎ui/src/redux/rootReducer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { AnyAction, combineReducers } from '@reduxjs/toolkit';
22
import { exportReducer } from './slices/export';
33
import { loaderReducer } from './slices/loader';
44
import { mapFilterReducer } from './slices/mapFilter';
5+
import { mapModalReducer } from './slices/mapModal';
56
import { mapRouteEditorReducer } from './slices/mapRouteEditor';
67
import { mapStopEditorReducer } from './slices/mapStopEditor';
7-
import { modalMapReducer } from './slices/modalMap';
88
import { modalsReducer } from './slices/modals';
99
import { timetableReducer } from './slices/timetable';
1010
import { loginFailedAction, userReducer } from './slices/user';
@@ -15,7 +15,7 @@ const appReducer = combineReducers({
1515
mapStopEditor: mapStopEditorReducer,
1616
mapRouteEditor: mapRouteEditorReducer,
1717
mapFilter: mapFilterReducer,
18-
modalMap: modalMapReducer,
18+
mapModal: mapModalReducer,
1919
user: userReducer,
2020
modals: modalsReducer,
2121
timetable: timetableReducer,

‎ui/src/redux/selectors/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export * from './export';
22
export * from './loader';
33
export * from './mapFilter';
4+
export * from './mapModal';
45
export * from './mapRouteEditor';
56
export * from './mapStopEditor';
6-
export * from './modalMap';
77
export * from './modals';
88
export * from './timetable';
99
export * from './user';

‎ui/src/redux/selectors/modalMap.ts ‎ui/src/redux/selectors/mapModal.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { createSelector } from '@reduxjs/toolkit';
22
import { RootState } from '../store';
33

4-
export const selectModalMap = (state: RootState) => state.modalMap;
4+
export const selectMapModal = (state: RootState) => state.mapModal;
55

66
export const selectMapViewport = createSelector(
7-
selectModalMap,
8-
(modalMap) => modalMap.viewport,
7+
selectMapModal,
8+
(mapModal) => mapModal.viewport,
99
);

‎ui/src/redux/selectors/mapRouteEditor.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ export const selectMapRouteEditor = (state: RootState) =>
88

99
export const selectIsInViewMode = createSelector(
1010
selectMapRouteEditor,
11-
(modalMap) => modalMap.drawingMode === undefined,
11+
(mapModal) => mapModal.drawingMode === undefined,
1212
);
1313

1414
export const selectHasChangesInProgress = createSelector(
1515
selectMapRouteEditor,
1616
selectIsInViewMode,
17-
(modalMap, viewMode) => modalMap.creatingNewRoute || !viewMode,
17+
(mapModal, viewMode) => mapModal.creatingNewRoute || !viewMode,
1818
);
1919

2020
export const selectEditedRouteData = createSelector(

‎ui/src/redux/slices/modalMap.ts ‎ui/src/redux/slices/mapModal.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const initialState: IState = {
1717
};
1818

1919
const slice = createSlice({
20-
name: 'modalMap',
20+
name: 'mapModal',
2121
initialState,
2222
reducers: {
2323
setViewPort: (state: IState, action: PayloadAction<Viewport>) => {
@@ -29,7 +29,7 @@ const slice = createSlice({
2929
},
3030
});
3131

32-
export const { setViewPort: setViewPortAction, reset: resetModalMapAction } =
32+
export const { setViewPort: setViewPortAction, reset: resetMapModalAction } =
3333
slice.actions;
3434

35-
export const modalMapReducer = slice.reducer;
35+
export const mapModalReducer = slice.reducer;

‎ui/src/redux/thunks/map.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { createAsyncThunk } from '@reduxjs/toolkit';
2+
import { resetMapModalAction } from '../slices/mapModal';
23
import { resetMapRouteEditorStateAction } from '../slices/mapRouteEditor';
34
import { resetMapStopEditorStateAction } from '../slices/mapStopEditor';
4-
import { resetModalMapAction } from '../slices/modalMap';
55

66
export const resetMapState = createAsyncThunk(
77
'map/resetMapState',
88
async (_, thunkAPI) => {
9-
thunkAPI.dispatch(resetModalMapAction());
9+
thunkAPI.dispatch(resetMapModalAction());
1010
thunkAPI.dispatch(resetMapRouteEditorStateAction());
1111
thunkAPI.dispatch(resetMapStopEditorStateAction());
1212
},

‎ui/src/redux/types/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1+
export * from './mapModal';
12
export * from './mapRouteEditor';
2-
export * from './modalMap';

‎ui/src/redux/types/modalMap.ts ‎ui/src/redux/types/mapModal.ts

File renamed without changes.

‎ui/src/router/Router.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
44
import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
55
import { getUserInfo } from '../api/user';
66
import { MainPage } from '../components/main/MainPage';
7-
import { MapLoader, ModalMap } from '../components/map';
7+
import { MapLoader, MapModal } from '../components/map';
88
import { JoreLoader } from '../components/map/JoreLoader';
99
import { Navbar } from '../components/navbar';
1010
import { CreateNewLinePage } from '../components/routes-and-lines/create-line/CreateNewLinePage';
@@ -171,7 +171,7 @@ export const Router: FunctionComponent = () => {
171171
/>
172172
))}
173173
</Routes>
174-
<ModalMap />
174+
<MapModal />
175175
<MapLoader />
176176
<JoreLoader />
177177
</BrowserRouter>

‎ui/src/utils/gql.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
ReusableComponentsVehicleModeEnum,
55
RouteTypeOfLineEnum,
66
} from '../generated/graphql';
7-
import { Viewport } from '../redux/types/modalMap';
7+
import { Viewport } from '../redux/types/mapModal';
88
import { Priority, TimetablePriority } from '../types/enums';
99

1010
/** Builds an object for gql to filter out all

0 commit comments

Comments
 (0)
Please sign in to comment.