feat: GisSystemStatic in Redux integriert

- API-Response für GisSystemStatic in Redux Store gespeichert
- Server-IP aus `.env.local` geladen (`NEXT_PUBLIC_API_BASE_URL`)
- `idMap` und `idUser` aus URL-Parametern extrahiert
- fetchGisSystemStatic angepasst für dynamische Werte
- Redux Store aktualisiert und getestet
This commit is contained in:
Ismail Ali
2025-03-07 23:50:42 +01:00
parent 6636f841a2
commit 53ad8b3402
8 changed files with 83 additions and 16 deletions

View File

@@ -13,4 +13,5 @@ NEXT_PUBLIC_USE_MOCK_API=true
NEXT_PUBLIC_DEBUG_LOG=true NEXT_PUBLIC_DEBUG_LOG=true
# für Polylines/kabelstecken -> in Konextmenü "Station öffnen" " # für Polylines/kabelstecken -> in Konextmenü "Station öffnen" "
NEXT_PUBLIC_BASE_URL=http://192.168.10.33/talas5/devices/ NEXT_PUBLIC_BASE_URL=http://192.168.10.33/talas5/devices/
NEXT_PUBLIC_API_BASE_URL=http://192.168.10.33/talas5/ClientData/WebServiceMap.asmx

View File

@@ -12,6 +12,7 @@ import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleS
import { useSelector, useDispatch } from "react-redux"; import { useSelector, useDispatch } from "react-redux";
import { selectGisStationsStaticDistrict } from "../redux/slices/webService/gisStationsStaticDistrictSlice"; import { selectGisStationsStaticDistrict } from "../redux/slices/webService/gisStationsStaticDistrictSlice";
import { selectPolylineVisible, setPolylineVisible } from "../redux/slices/polylineLayerVisibleSlice"; import { selectPolylineVisible, setPolylineVisible } from "../redux/slices/polylineLayerVisibleSlice";
import { selectGisSystemStatic } from "../redux/slices/webService/gisSystemStaticSlice";
function DataSheet() { function DataSheet() {
const [editMode, setEditMode] = useState(false); // Zustand für editMode const [editMode, setEditMode] = useState(false); // Zustand für editMode
@@ -21,7 +22,8 @@ function DataSheet() {
const [stationListing, setStationListing] = useState([]); const [stationListing, setStationListing] = useState([]);
const [systemListing, setSystemListing] = useState([]); const [systemListing, setSystemListing] = useState([]);
const GisStationsStaticDistrict = useSelector(selectGisStationsStaticDistrict) || []; const GisStationsStaticDistrict = useSelector(selectGisStationsStaticDistrict) || [];
const GisSystemStatic = useRecoilValue(gisSystemStaticState); const GisSystemStatic = useSelector(selectGisSystemStatic) || [];
const setZoomTrigger = useSetRecoilState(zoomTriggerState); const setZoomTrigger = useSetRecoilState(zoomTriggerState);
const dispatch = useDispatch(); const dispatch = useDispatch();
const polylineVisible = useSelector(selectPolylineVisible); const polylineVisible = useSelector(selectPolylineVisible);
@@ -72,7 +74,7 @@ function DataSheet() {
}; };
useEffect(() => { useEffect(() => {
const allowedSystems = new Set(GisSystemStatic.filter((system) => system.Allow === 1).map((system) => system.IdSystem)); const allowedSystems = Array.isArray(GisSystemStatic) ? new Set(GisSystemStatic.filter((system) => system.Allow === 1).map((system) => system.IdSystem)) : new Set();
const seenNames = new Set(); const seenNames = new Set();
const filteredAreas = Array.isArray(GisStationsStaticDistrict) const filteredAreas = Array.isArray(GisStationsStaticDistrict)
@@ -93,13 +95,15 @@ function DataSheet() {
); );
const seenSystemNames = new Set(); const seenSystemNames = new Set();
const filteredSystems = GisSystemStatic.filter((item) => { const filteredSystems = Array.isArray(GisSystemStatic)
const isUnique = !seenSystemNames.has(item.Name) && item.Allow === 1; ? GisSystemStatic.filter((item) => {
if (isUnique) { const isUnique = !seenSystemNames.has(item.Name) && item.Allow === 1;
seenSystemNames.add(item.Name); if (isUnique) {
} seenSystemNames.add(item.Name);
return isUnique; }
}); return isUnique;
})
: [];
setSystemListing( setSystemListing(
filteredSystems.map((system, index) => ({ filteredSystems.map((system, index) => ({
@@ -151,6 +155,9 @@ function DataSheet() {
localStorage.setItem("standorteVisible", checked); localStorage.setItem("standorteVisible", checked);
}; };
//------------------------------ //------------------------------
useEffect(() => {
console.log("GisSystemStatic aus Redux:", GisSystemStatic); // ✅ Debugging: Ist es ein Array?
}, [GisSystemStatic]);
//--------------------------- //---------------------------
return ( return (

View File

@@ -73,6 +73,8 @@ import { useInitGisStationsStaticDistrict } from "./hooks/useInitGisStationsStat
import { selectGisStationsStaticDistrict } from "../../redux/slices/webService/gisStationsStaticDistrictSlice"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webService/gisStationsStaticDistrictSlice";
import { useInitGisStationsStatusDistrict } from "./hooks/useInitGisStationsStatusDistrict"; import { useInitGisStationsStatusDistrict } from "./hooks/useInitGisStationsStatusDistrict";
import { useInitGisStationsMeasurements } from "./hooks/useInitGisStationsMeasurements"; import { useInitGisStationsMeasurements } from "./hooks/useInitGisStationsMeasurements";
import { useInitGisSystemStatic } from "./hooks/useInitGisSystemStatic";
import { selectGisSystemStatic, setGisSystemStatic } from "../../redux/slices/webService/gisSystemStaticSlice";
const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@@ -129,7 +131,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
const GisStationsStaticDistrict = useSelector(selectGisStationsStaticDistrict); const GisStationsStaticDistrict = useSelector(selectGisStationsStaticDistrict);
const [GisStationsStatusDistrict, setGisStationsStatusDistrict] = useState([]); // Zustand für Statusdaten const [GisStationsStatusDistrict, setGisStationsStatusDistrict] = useState([]); // Zustand für Statusdaten
const [GisStationsMeasurements, setGisStationsMeasurements] = useState([]); // Zustand für Messdaten const [GisStationsMeasurements, setGisStationsMeasurements] = useState([]); // Zustand für Messdaten
const [GisSystemStatic, setGisSystemStatic] = useRecoilState(gisSystemStaticState); // Zustand für Systemdaten const GisSystemStatic = useSelector(selectGisSystemStatic);
// Konstanten für die URLs // Konstanten für die URLs
const mapGisStationsStaticDistrictUrl = config.mapGisStationsStaticDistrictUrl; const mapGisStationsStaticDistrictUrl = config.mapGisStationsStaticDistrictUrl;
const mapGisStationsStatusDistrictUrl = config.mapGisStationsStatusDistrictUrl; const mapGisStationsStatusDistrictUrl = config.mapGisStationsStatusDistrictUrl;
@@ -1005,6 +1007,8 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
useInitGisStationsStaticDistrict(); useInitGisStationsStaticDistrict();
useInitGisStationsStatusDistrict(); useInitGisStationsStatusDistrict();
useInitGisStationsMeasurements(); useInitGisStationsMeasurements();
useInitGisSystemStatic();
//-------------------------------------- //--------------------------------------
useEffect(() => { useEffect(() => {
console.log("GisStationsStaticDistrict aus Redux:", GisStationsStaticDistrict); console.log("GisStationsStaticDistrict aus Redux:", GisStationsStaticDistrict);

View File

@@ -0,0 +1,12 @@
// /components/mainComponent/hooks/useInitGisStationsMeasurements.js
import { useEffect } from "react";
import { useDispatch } from "react-redux";
import { fetchGisSystemStaticFromWebService } from "../../../redux/slices/webService/gisSystemStaticSlice";
export const useInitGisSystemStatic = () => {
const dispatch = useDispatch();
useEffect(() => {
dispatch(fetchGisSystemStaticFromWebService());
}, [dispatch]);
};

View File

@@ -1,2 +1,2 @@
// /config/appVersion // /config/appVersion
export const APP_VERSION = "1.1.25"; export const APP_VERSION = "1.1.26";

View File

@@ -0,0 +1,16 @@
// /redux/api/fromWebService/fetchGisSystemStatic.js
import { useSearchParams } from "next/navigation"; // Falls du Next.js 13+ nutzt
export async function fetchGisSystemStatic() {
const params = new URLSearchParams(window.location.search);
const idMap = params.get("idMap") || "12"; // Fallback-Wert 12
const idUser = params.get("idUser") || "484"; // Fallback-Wert 484
const apiBaseUrl = process.env.NEXT_PUBLIC_API_BASE_URL; // Dynamische Server-IP
const response = await fetch(`${apiBaseUrl}/GisSystemStatic?idMap=${idMap}&idUser=${idUser}`);
const data = await response.json();
console.log("fetchGisSystemStatic API Response:", data); // ✅ Prüfen, ob API Daten liefert
return data;
}

View File

@@ -1,7 +1,32 @@
// /redux/slices/webService/gisSystemStaticSlice.js // /redux/slices/webService/gisSystemStaticSlice.js
import { atom } from "recoil"; import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
import { fetchGisSystemStatic } from "../../api/fromWebService/fetchGisSystemStatic";
export const gisSystemStaticState = atom({ export const fetchGisSystemStaticFromWebService = createAsyncThunk("gisSystemStatic/fetchGisSystemStaticFromWebService", async () => {
key: "gisSystemStatic", // Eindeutiger Schlüssel (innerhalb des Projekts) const response = await fetchGisSystemStatic();
default: [], // Standardwert (Anfangszustand) return response.Systems || []; // ✅ Hier sicherstellen, dass nur `Systems` gespeichert wird
}); });
const gisSystemStaticSlice = createSlice({
name: "gisSystemStatic",
initialState: {
data: [], // ✅ Immer ein Array setzen
status: "idle",
error: null,
},
reducers: {
setGisSystemStatic: (state, action) => {
state.data = action.payload.Systems || []; // ✅ Falls `Systems` fehlt, leeres Array setzen
},
},
extraReducers: (builder) => {
builder.addCase(fetchGisSystemStaticFromWebService.fulfilled, (state, action) => {
state.status = "succeeded";
state.data = action.payload; // ✅ Jetzt sollte `data` direkt das `Systems`-Array enthalten
});
},
});
export const { setGisSystemStatic } = gisSystemStaticSlice.actions;
export default gisSystemStaticSlice.reducer;
export const selectGisSystemStatic = (state) => state.gisSystemStatic.data || [];

View File

@@ -6,6 +6,7 @@ import locationDevicesFromDBReducer from "./slices/db/locationDevicesFromDBSlice
import gisStationsStaticDistrictReducer from "./slices/webService/gisStationsStaticDistrictSlice"; import gisStationsStaticDistrictReducer from "./slices/webService/gisStationsStaticDistrictSlice";
import gisStationsStatusDistrictReducer from "./slices/webService/gisStationsStatusDistrictSlice"; import gisStationsStatusDistrictReducer from "./slices/webService/gisStationsStatusDistrictSlice";
import gisStationsMeasurementsReducer from "./slices/webService/gisStationsMeasurementsSlice"; import gisStationsMeasurementsReducer from "./slices/webService/gisStationsMeasurementsSlice";
import gisSystemStaticReducer from "./slices/webService/gisSystemStaticSlice";
export const store = configureStore({ export const store = configureStore({
reducer: { reducer: {
@@ -16,5 +17,6 @@ export const store = configureStore({
gisStationsStaticDistrict: gisStationsStaticDistrictReducer, gisStationsStaticDistrict: gisStationsStaticDistrictReducer,
gisStationsStatusDistrict: gisStationsStatusDistrictReducer, gisStationsStatusDistrict: gisStationsStatusDistrictReducer,
gisStationsMeasurements: gisStationsMeasurementsReducer, gisStationsMeasurements: gisStationsMeasurementsReducer,
gisSystemStatic: gisSystemStaticReducer,
}, },
}); });