Skip to content

feat: Update libraries for map-view #585

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.

Sign up for GitHub

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

Merged
jforsman merged 1 commit into from
Apr 3, 2025
Merged

feat: Update libraries for map-view #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions map-view/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@types/node": "^12.0.0",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@eslint/compat": "^1.2.7",
"@mui/icons-material": "^7.0.1",
"@mui/material": "^7.0.1",
"@mui/styles": "^6.4.8",
"@types/node": "^22.14.0",
"@types/ol": "^6.3.1",
"@types/react": "^16.9.0",
"@types/react-dom": "^16.9.0",
"@types/react": "^19.1.0",
"@types/react-dom": "^19.1.0",
"@vitejs/plugin-react": "^4.3.4",
"vite-plugin-eslint": "^1.8.1",
"@eslint/compat": "^1.2.7",
"eslint-config-react-app": "^7.0.1",
"i18next": "^19.8.3",
"i18next": "^24.2.3",
"i18next-browser-languagedetector": "^6.0.1",
"ol": "^6.4.3",
"prettier": "^2.1.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-i18next": "^11.7.3",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-i18next": "^15.3.1",
"typescript": "^5.8.2",
"vite": "^6.2.4"
"vite": "^6.2.4",
"vite-plugin-eslint": "^1.8.1"
},
"scripts": {
"start": "vite",
Expand Down Expand Up @@ -49,8 +52,9 @@
]
},
"devDependencies": {
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^9.3.2",
"@testing-library/react": "^16.2.0",
"@testing-library/user-event": "^7.1.2",
"@vitest/coverage-v8": "3.0.9",
"eslint": "^9.23.0",
Expand Down
86 changes: 47 additions & 39 deletions map-view/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Drawer } from "@material-ui/core";
import Fab from "@material-ui/core/Fab";
import { createStyles, Theme, WithStyles, withStyles } from "@material-ui/core/styles";
import LayersIcon from "@material-ui/icons/Layers";
import { Drawer } from "@mui/material";
import Fab from "@mui/material/Fab";
import { Theme } from "@mui/material/styles";
import { createStyles, withStyles, WithStyles } from "@mui/styles";
import LayersIcon from "@mui/icons-material/Layers";
import "ol/ol.css";
import React from "react";
import MapConfigAPI from "./api/MapConfigAPI";
Expand Down Expand Up @@ -63,44 +64,51 @@ class App extends React.Component<AppProps, AppState> {
const { classes } = this.props;
const { open, mapConfig, features } = this.state;
return (
<div className="App">
<div id={this.mapId} />
{features.length > 0 && mapConfig && (
<FeatureInfo
features={features}
onSelectFeature={(feature: Feature) => Map.showPlanOfRealDevice(feature, mapConfig)}
onClose={() => {
this.setState({ features: [] });
Map.clearExtraVectorLayer();
}}
/>
)}
<Fab size="medium" color="primary" onClick={() => this.setState({ open: !open })} className={classes.mapButton}>
<LayersIcon />
</Fab>
<Drawer
className={classes.drawer}
variant="persistent"
anchor="right"
open={open}
classes={{
paper: classes.drawerPaper,
}}
>
{mapConfig && (
<LayerSwitcher
mapConfig={mapConfig}
onClose={() => this.setState({ open: false })}
onOverlayToggle={(checked) => {
if (!checked) {
this.setState({ features: [] });
Map.clearExtraVectorLayer();
}
<React.StrictMode>
<div className="App">
<div id={this.mapId} />
{features.length > 0 && mapConfig && (
<FeatureInfo
features={features}
onSelectFeature={(feature: Feature) => Map.showPlanOfRealDevice(feature, mapConfig)}
onClose={() => {
this.setState({ features: [] });
Map.clearExtraVectorLayer();
}}
/>
)}
</Drawer>
</div>
<Fab
size="medium"
color="primary"
onClick={() => this.setState({ open: !open })}
className={classes.mapButton}
>
<LayersIcon />
</Fab>
<Drawer
className={classes.drawer}
variant="persistent"
anchor="right"
open={open}
classes={{
paper: classes.drawerPaper,
}}
>
{mapConfig && (
<LayerSwitcher
mapConfig={mapConfig}
onClose={() => this.setState({ open: false })}
onOverlayToggle={(checked) => {
if (!checked) {
this.setState({ features: [] });
Map.clearExtraVectorLayer();
}
}}
/>
)}
</Drawer>
</div>
</React.StrictMode>
);
}
}
Expand Down
8 changes: 0 additions & 8 deletions map-view/src/components/FeatureInfo.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ import React from "react";
import FeatureInfo from "./FeatureInfo";
import { Feature } from "../models";

vi.mock("react-i18next", () => ({
withTranslation: () => (Component: any) => {
// Ignore the translation by returning the searched string
Component.defaultProps = { ...Component.defaultProps, t: (str: string) => str };
return Component;
},
}));

test("renders feature info", () => {
const mockFeatures: Feature[] = [
{
Expand Down
23 changes: 10 additions & 13 deletions map-view/src/components/FeatureInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { createStyles, Theme, withStyles, WithStyles } from "@material-ui/core";
import Button from "@material-ui/core/Button";
import Card from "@material-ui/core/Card";
import CardActions from "@material-ui/core/CardActions";
import CardContent from "@material-ui/core/CardContent";
import IconButton from "@material-ui/core/IconButton";
import Typography from "@material-ui/core/Typography";
import NavigateBefore from "@material-ui/icons/NavigateBefore";
import NavigateNext from "@material-ui/icons/NavigateNext";
import { Theme } from "@mui/material";
import { createStyles, withStyles, WithStyles } from "@mui/styles";
import Button from "@mui/material/Button";
import Card from "@mui/material/Card";
import CardActions from "@mui/material/CardActions";
import CardContent from "@mui/material/CardContent";
import IconButton from "@mui/material/IconButton";
import Typography from "@mui/material/Typography";
import NavigateBefore from "@mui/icons-material/NavigateBefore";
import NavigateNext from "@mui/icons-material/NavigateNext";
import React from "react";
import { APIBaseUrl } from "../consts";
import { Feature } from "../models";
Expand Down Expand Up @@ -54,10 +55,6 @@ class FeatureInfo extends React.Component<FeatureInfoProps, FeatureInfoState> {
};
}

UNSAFE_componentWillReceiveProps() {
this.setState({ featureIndex: 0, realPlanDistance: undefined });
}

getAdminLink(feature: Feature) {
const app_name = feature["app_name"];
const fid = feature["id_"];
Expand Down
25 changes: 13 additions & 12 deletions map-view/src/components/LayerSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { createStyles, TextField, Theme, withStyles, WithStyles } from "@material-ui/core";
import AppBar from "@material-ui/core/AppBar";
import Checkbox from "@material-ui/core/Checkbox";
import FormControl from "@material-ui/core/FormControl";
import FormControlLabel from "@material-ui/core/FormControlLabel";
import FormGroup from "@material-ui/core/FormGroup";
import IconButton from "@material-ui/core/IconButton";
import Radio from "@material-ui/core/Radio";
import RadioGroup from "@material-ui/core/RadioGroup";
import Toolbar from "@material-ui/core/Toolbar";
import Typography from "@material-ui/core/Typography";
import CloseIcon from "@material-ui/icons/Close";
import { TextField, Theme } from "@mui/material";
import { createStyles, withStyles, WithStyles } from "@mui/styles";
import AppBar from "@mui/material/AppBar";
import Checkbox from "@mui/material/Checkbox";
import FormControl from "@mui/material/FormControl";
import FormControlLabel from "@mui/material/FormControlLabel";
import FormGroup from "@mui/material/FormGroup";
import IconButton from "@mui/material/IconButton";
import Radio from "@mui/material/Radio";
import RadioGroup from "@mui/material/RadioGroup";
import Toolbar from "@mui/material/Toolbar";
import Typography from "@mui/material/Typography";
import CloseIcon from "@mui/icons-material/Close";
import React from "react";
import Map from "../common/Map";
import { MapConfig } from "../models";
Expand Down
12 changes: 7 additions & 5 deletions map-view/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from "react";
import ReactDOM from "react-dom";
import { createRoot } from "react-dom/client";
import "./index.css";
import App from "./App";
import { StyledEngineProvider } from "@mui/material/styles";

import "./i18n"; // needs to be bundled

ReactDOM.render(
<React.StrictMode>
const container = document.getElementById("root");
const root = createRoot(container!);
root.render(
<StyledEngineProvider injectFirst>
<App />
</React.StrictMode>,
document.getElementById("root")
</StyledEngineProvider>
);
Loading
Loading