From 6b85e74e64a0174d481499e38b9924b8cc9bbd1d Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 20 May 2025 09:51:42 +0200 Subject: [PATCH] refactor: useInitGisStationsStatic in DataSheet.js entfernt, Redux-Dispatch direkt verwendet --- components/DataSheet.js | 12 +++++++++-- components/mainComponent/MapComponent.js | 12 +++++++++-- .../webServices/useInitGisStationsStatic.js | 21 ------------------- config/appVersion.js | 2 +- 4 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 components/mainComponent/hooks/webServices/useInitGisStationsStatic.js diff --git a/components/DataSheet.js b/components/DataSheet.js index 02fde7493..1c623fbb2 100644 --- a/components/DataSheet.js +++ b/components/DataSheet.js @@ -5,7 +5,8 @@ import EditModeToggle from "./EditModeToggle"; 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 } 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"; @@ -39,6 +40,7 @@ function DataSheet() { const [bereicheVisible, setBereicheVisible] = useState(false); // NEU: Bereiche-Status const [standordVisible, setStandorteVisible] = useState(false); // NEU: Standorte-Status + useEffect(() => { // LocalStorage Werte laden const storedPoiVisible = localStorage.getItem("poiVisible"); @@ -153,7 +155,13 @@ function DataSheet() { // console.log("GisSystemStatic aus Redux:", GisSystemStatic); // βœ… Debugging: Ist es ein Array? }, [GisSystemStatic]); //----------------------------- - useInitGisStationsStatic(); + + useEffect(() => { + if (!GisStationsStatic || GisStationsStatic === null) { + dispatch(fetchGisStationsStatic()); + } + }, [GisStationsStatic, dispatch]); + //--------------------------- useEffect(() => { console.log("πŸ” GisStationsStatic Inhalt:", GisStationsStatic); diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 3d8ca13db..782277b2b 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -47,7 +47,9 @@ import { fetchGisStationsMeasurementsFromWebService } from "../../redux/slices/w import { useInitGisSystemStatic } from "./hooks/webServices/useInitGisSystemStatic"; import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webService/gisSystemStaticSlice"; import ShowAddStationPopup from "../AddPOIModal.js"; -import { useInitGisStationsStatic } from "../mainComponent/hooks/webServices/useInitGisStationsStatic"; + +import { fetchGisStationsStatic } from "../../redux/slices/webService/gisStationsStaticSlice"; + import AddPOIOnPolyline from "../AddPOIOnPolyline"; import { enablePolylineEvents, disablePolylineEvents } from "../../utils/polylines/eventHandlers"; import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; @@ -880,7 +882,13 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { dispatch(fetchGisStationsMeasurementsFromWebService()); }, [dispatch]); useInitGisSystemStatic(); - useInitGisStationsStatic(); + const gisStationsStatic = useSelector((state) => state.gisStationsStatic.data); + + useEffect(() => { + if (!gisStationsStatic) { + dispatch(fetchGisStationsStatic()); + } + }, [gisStationsStatic, dispatch]); //-------------------------------------- useEffect(() => { diff --git a/components/mainComponent/hooks/webServices/useInitGisStationsStatic.js b/components/mainComponent/hooks/webServices/useInitGisStationsStatic.js deleted file mode 100644 index 7c4596e45..000000000 --- a/components/mainComponent/hooks/webServices/useInitGisStationsStatic.js +++ /dev/null @@ -1,21 +0,0 @@ -// /components/mainComponent/hooks/useInitGisStationsStatic.js -//Bereiche/Area-Name Dropdownmenu fΓΌr Datasheet wird hier initialisiert und in der Komponente verwendet -import { useEffect } from "react"; -import { useDispatch, useSelector } from "react-redux"; -import { fetchGisStationsStatic, selectGisStationsStatic } from "../../../../redux/slices/webService/gisStationsStaticSlice"; - -export const useInitGisStationsStatic = () => { - const dispatch = useDispatch(); - const gisStationsStatic = useSelector(selectGisStationsStatic); - - useEffect(() => { - // console.log("πŸ” useInitGisStationsStatic - Aktueller Wert:", gisStationsStatic); - - if (!gisStationsStatic || gisStationsStatic === null) { - //console.log("πŸš€ Starte fetchGisStationsStatic..."); - dispatch(fetchGisStationsStatic()); - } - }, [gisStationsStatic, dispatch]); - - return gisStationsStatic; -}; diff --git a/config/appVersion.js b/config/appVersion.js index 276363f7c..4ef2e26e8 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.110"; +export const APP_VERSION = "1.1.111";