fixed bug open region on load

BTE-Germany · Jan 24, 2024 · 94a6197 · 94a6197
1 parent 17446e3
commit 94a6197
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/backend/src/controllers/RegionsController.ts b/backend/src/controllers/RegionsController.ts
@@ -123,7 +123,6 @@ class RegionsController {
         }
     }
 
-
     public async editRegion(request: Request, response: Response) {
         let region = await this.core.getPrisma().region.update({
             where: {
@@ -147,7 +146,6 @@ class RegionsController {
         }
     }
 
-
     public async reportRegion(request: Request, response: Response) {
         const errors = validationResult(request);
         if (!errors.isEmpty()) {

diff --git a/frontend/src/components/Map.jsx b/frontend/src/components/Map.jsx
@@ -196,18 +196,13 @@ const Map = forwardRef(({openDialog, setRegionViewData, updateMap, setUpdateMap}
                     let b = generate3DLayer(building.id, JSON.parse(building.origin), building.altitude, JSON.parse(building.rotate), building.fileURL, mapInstance);
                     mapInstance.addLayer(b);
                 });
-
-
             });
         });
 
-
         const popup = new mapboxgl.Popup({
             closeButton: false,
             closeOnClick: false
         });
-
-
     });
 
     useEffect(() => {
@@ -224,16 +219,10 @@ const Map = forwardRef(({openDialog, setRegionViewData, updateMap, setUpdateMap}
 
     useEffect(() => {
         if (map) {
-            map.on('load', () => {
-                addLayer(map).then(() => testQuery());
-            });
+            map.on('load', () => testQuery());
         }
     }, [map]);
 
-    useEffect(() => {
-        testQuery();
-    }, [query]);
-
     const testQuery = async () => {
         if (query.get("region")) {
             let regionId = query.get("region");

diff --git a/frontend/src/components/RegionView.jsx b/frontend/src/components/RegionView.jsx
@@ -302,7 +302,7 @@ const RegionView = ({data, open, setOpen, setUpdateMap}) => {
             };
             await axios.post(`api/v1/region/${data.id}/edit`, params, {headers: {authorization: "Bearer " + keycloak.token}});
         } catch (error) {
-            alert("User does not exist! Error: " + error);
+            alert("Error on Region-Save: " + error);
             return;
         }
         setUpdateMap(true);

diff --git a/frontend/src/pages/Home.jsx b/frontend/src/pages/Home.jsx
@@ -6,11 +6,11 @@
  + This project is released under the MIT license.                            +
  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 
-import React, { useRef, useState } from 'react';
+import React, {useRef, useState} from 'react';
 import Map from "../components/Map";
 import NavHeader from "../components/NavHeader";
-import { Box, LoadingOverlay } from "@mantine/core";
-import { RegionView } from "../components/RegionView";
+import {Box, LoadingOverlay} from "@mantine/core";
+import {RegionView} from "../components/RegionView";
 
 const Home = props => {
 
@@ -23,21 +23,21 @@ const Home = props => {
     const [updateMap, setUpdateMap] = useState(false);
 
     const openDialog = (data) => {
-        setRegionViewData(data)
+        setRegionViewData(data);
         setOpenRegionView(true);
-    }
+    };
 
     const mapRef = useRef();
 
     return (
-        <Box sx={{ display: "flex", flexDirection: "column", height: "100vh" }}>
+        <Box sx={{display: "flex", flexDirection: "column", height: "100vh"}}>
             <NavHeader mapRef={mapRef} />
             <RegionView data={regionViewData} setOpen={setOpenRegionView} open={openRegionView}
                 setUpdateMap={setUpdateMap} />
             <Map openDialog={openDialog} updateMap={updateMap} setUpdateMap={setUpdateMap} ref={mapRef} />
 
         </Box>
     );
-}
+};
 
-export default Home
+export default Home;