From 865316358240717241191544f258ae92504d17d9 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 20 May 2025 09:36:36 +0200 Subject: [PATCH] cleanup: useInitGisStationsMeasurements entfernt, durch direkten Redux-Dispatch ersetzt --- components/DataSheet.js | 9 +---- components/mainComponent/MapComponent.js | 6 ++- .../useAutoRefreshLocationDevices.js | 38 ------------------- .../useInitGisStationsMeasurements.js | 12 ------ config/appVersion.js | 2 +- 5 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js delete mode 100644 components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js diff --git a/components/DataSheet.js b/components/DataSheet.js index a6933a257..02fde7493 100644 --- a/components/DataSheet.js +++ b/components/DataSheet.js @@ -1,20 +1,13 @@ // /componentss/DataSheet.js import React, { useEffect, useState } from "react"; -import { gisStationsStaticDistrictState } from "../redux/slices/webService/gisStationsStaticDistrictSlice"; -import { gisSystemStaticState } from "../redux/slices/webService/gisSystemStaticSlice.js"; -import { mapLayersState } from "../redux/slices/mapLayersSlice"; import { setSelectedArea } from "../redux/slices/selectedAreaSlice"; - import EditModeToggle from "./EditModeToggle"; -import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleSlice"; // Import für Polyline-Visibility import { useSelector, useDispatch } from "react-redux"; import { selectPolylineVisible, setPolylineVisible } from "../redux/slices/polylineLayerVisibleSlice"; import { selectGisSystemStatic } from "../redux/slices/webService/gisSystemStaticSlice"; import { useInitGisStationsStatic } from "../components/mainComponent/hooks/webServices/useInitGisStationsStatic"; - -import { fetchGisStationsStatic, selectGisStationsStatic } from "../redux/slices/webService/gisStationsStaticSlice"; +import { selectGisStationsStatic } from "../redux/slices/webService/gisStationsStaticSlice"; import { selectGisStationsStaticDistrict } from "../redux/slices/webService/gisStationsStaticDistrictSlice"; - import { selectMapLayersState, setLayerVisibility } from "../redux/slices/mapLayersSlice"; import { setVisible } from "../redux/slices/poiLayerVisibleSlice"; import { incrementZoomTrigger } from "../redux/slices/zoomTriggerSlice"; diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 479542642..3d8ca13db 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -43,7 +43,7 @@ import { useInitLocationDevices } from "./hooks/webServices/useInitLocationDevic import { useInitGisStationsStaticDistrict } from "./hooks/webServices/useInitGisStationsStaticDistrict"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webService/gisStationsStaticDistrictSlice"; import { useInitGisStationsStatusDistrict } from "./hooks/webServices/useInitGisStationsStatusDistrict"; -import { useInitGisStationsMeasurements } from "./hooks/webServices/useInitGisStationsMeasurements"; +import { fetchGisStationsMeasurementsFromWebService } from "../../redux/slices/webService/gisStationsMeasurementsSlice"; import { useInitGisSystemStatic } from "./hooks/webServices/useInitGisSystemStatic"; import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webService/gisSystemStaticSlice"; import ShowAddStationPopup from "../AddPOIModal.js"; @@ -876,7 +876,9 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { useInitLocationDevices(); useInitGisStationsStaticDistrict(); useInitGisStationsStatusDistrict(); - useInitGisStationsMeasurements(); + useEffect(() => { + dispatch(fetchGisStationsMeasurementsFromWebService()); + }, [dispatch]); useInitGisSystemStatic(); useInitGisStationsStatic(); diff --git a/components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js b/components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js deleted file mode 100644 index 5d0e146a0..000000000 --- a/components/mainComponent/hooks/webServices/useAutoRefreshLocationDevices.js +++ /dev/null @@ -1,38 +0,0 @@ -// components/mainComponent/hooks/useAutoRefreshLocationDevices.js -/* - Das ist erstmal nur so da, falls es gebraucht wird -Diese datei ist zum automatischen aktualisieren der LocationDevices gedacht -jeder 20 Sekunden wird die Funktion fetchLocationDevicesFromDB() aufgerufen -Daten werden dann in der Redux State gespeichert -*/ - -import { useEffect } from "react"; -import { useDispatch } from "react-redux"; -import { fetchLocationDevicesFromDB } from "../../../../redux/slices/db/locationDevicesFromDBSlice"; - -export const useAutoRefreshLocationDevices = (interval = 20000) => { - // alle 20 Sekunden - const dispatch = useDispatch(); - - useEffect(() => { - const fetchData = () => { - dispatch(fetchLocationDevicesFromDB()); - }; - - fetchData(); // Sofort beim Start holen - - const intervalId = setInterval(fetchData, interval); - - return () => clearInterval(intervalId); // Cleanup beim Unmount - }, [dispatch, interval]); -}; - -/* -In MapComponent.js einbinden -import { useAutoRefreshLocationDevices } from "./hooks/useAutoRefreshLocationDevices"; - -const MapComponent = () => { - useAutoRefreshLocationDevices(); - - -*/ diff --git a/components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js b/components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js deleted file mode 100644 index 2db27df07..000000000 --- a/components/mainComponent/hooks/webServices/useInitGisStationsMeasurements.js +++ /dev/null @@ -1,12 +0,0 @@ -// /components/mainComponent/hooks/useInitGisStationsMeasurements.js -import { useEffect } from "react"; -import { useDispatch } from "react-redux"; -import { fetchGisStationsMeasurementsFromWebService } from "../../../../redux/slices/webService/gisStationsMeasurementsSlice"; - -export const useInitGisStationsMeasurements = () => { - const dispatch = useDispatch(); - - useEffect(() => { - dispatch(fetchGisStationsMeasurementsFromWebService()); - }, [dispatch]); -}; diff --git a/config/appVersion.js b/config/appVersion.js index 9af96ceae..276363f7c 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.109"; +export const APP_VERSION = "1.1.110";