From 86f1c1feb040b9eeca8c61d0fac2d51810e94d90 Mon Sep 17 00:00:00 2001 From: ISA Date: Wed, 21 May 2025 10:04:26 +0200 Subject: [PATCH] =?UTF-8?q?cleanup:=20veraltete=20GIS-Fetch-Dateien=20entf?= =?UTF-8?q?ernt=20=E2=80=93=20Projekt=20verwendet=20nur=20noch=20zentrale?= =?UTF-8?q?=20Thunks=20und=20Services?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 28 ++++++++++++++++++ config/appVersion.js | 2 +- .../fetchGisStationsMeasurements.js | 23 --------------- .../fromWebService/fetchGisStationsStatic.js | 29 ------------------- .../fetchGisStationsStaticDistrict.js | 23 --------------- .../fetchGisStationsStatusDistrict.js | 23 --------------- .../fromWebService/fetchGisSystemStatic.js | 20 ------------- 7 files changed, 29 insertions(+), 119 deletions(-) delete mode 100644 redux/api/fromWebService/fetchGisStationsMeasurements.js delete mode 100644 redux/api/fromWebService/fetchGisStationsStatic.js delete mode 100644 redux/api/fromWebService/fetchGisStationsStaticDistrict.js delete mode 100644 redux/api/fromWebService/fetchGisStationsStatusDistrict.js delete mode 100644 redux/api/fromWebService/fetchGisSystemStatic.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 1229a571a..3ec7b5106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,34 @@ Alle bedeutenden Änderungen an diesem Projekt werden in dieser Datei dokumentie --- +## [1.1.125] – 2025-05-21 + +### Cleanup + +- 🧼 Unnötige GIS-Fetch-Dateien entfernt: + - `fetchGisStationsMeasurements.js` + - `fetchGisStationsStatic.js` + - `fetchGisStationsStaticDistrict.js` + - `fetchGisStationsStatusDistrict.js` + - `fetchGisSystemStatic.js` +- Alle Datenquellen werden jetzt ausschließlich über zentrale Redux Thunks und zugehörige Services geladen +- Alte Fetch-Struktur (`/redux/api/fromWebService`) vollständig obsolet + +### Fixed + +- Alle GIS-Redux-Slices greifen jetzt korrekt auf die Thunks aus `redux/thunks/` zu +- `DataSheet.js` und `MapComponent.js` verwenden nur noch: + - `gisStationsMeasurements` + - `gisStationsStaticDistrict` + - `gisStationsStatusDistrict` + - `gisSystemStatic` + +### Changed + +- Versionsnummer aktualisiert auf `1.1.125` + +--- + ## [1.1.123] – 2025-05-21 ### Changed diff --git a/config/appVersion.js b/config/appVersion.js index 61e367d04..610af23f6 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.124"; +export const APP_VERSION = "1.1.126"; diff --git a/redux/api/fromWebService/fetchGisStationsMeasurements.js b/redux/api/fromWebService/fetchGisStationsMeasurements.js deleted file mode 100644 index fb0c54d81..000000000 --- a/redux/api/fromWebService/fetchGisStationsMeasurements.js +++ /dev/null @@ -1,23 +0,0 @@ -// /redux/api/fromWebService/fetchGisStationsMeasurements.js - -export const fetchGisStationsMeasurements = async () => { - const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; - - const apiBaseUrl = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80/talas5/ClientData/WebServiceMap.asmx` : `${window.location.origin}/talas5/ClientData/WebServiceMap.asmx`; - - const params = new URLSearchParams(window.location.search); - const idMap = params.get("m"); - const idUser = params.get("u"); - - const url = `${apiBaseUrl}/GisStationsMeasurements?idMap=${idMap}&idUser=${idUser}`; - console.log("🔍 fetchGisStationsMeasurements - URL:", url); - - const response = await fetch(url); - - if (!response.ok) { - throw new Error("GisStationsMeasurements konnte nicht geladen werden"); - } - - const data = await response.json(); - return data; -}; diff --git a/redux/api/fromWebService/fetchGisStationsStatic.js b/redux/api/fromWebService/fetchGisStationsStatic.js deleted file mode 100644 index 8d50e1ddf..000000000 --- a/redux/api/fromWebService/fetchGisStationsStatic.js +++ /dev/null @@ -1,29 +0,0 @@ -// /redux/api/fromWebService/fetchGisStationsStatic.js - -export const fetchGisStationsStatic = async () => { - try { - const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; - - const apiBaseUrl = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80/talas5/ClientData/WebServiceMap.asmx` : `${window.location.origin}/talas5/ClientData/WebServiceMap.asmx`; - - const params = new URLSearchParams(window.location.search); - const idMap = params.get("m"); - - const url = `${apiBaseUrl}/GisStationsStatic?idMap=${idMap}`; - console.log("🔍 fetchGisStationsStatic - URL:", url); - - const response = await fetch(url); - - const text = await response.text(); - console.log("📡 API Response Text von fetch:", text); - - if (!response.ok || !response.headers.get("content-type")?.includes("application/json")) { - throw new Error("❌ Fehler: Antwort ist kein gültiges JSON"); - } - - return JSON.parse(text); - } catch (error) { - console.error("❌ Fehler beim Abrufen der GIS Stations Static:", error); - return null; - } -}; diff --git a/redux/api/fromWebService/fetchGisStationsStaticDistrict.js b/redux/api/fromWebService/fetchGisStationsStaticDistrict.js deleted file mode 100644 index e3f2fd32b..000000000 --- a/redux/api/fromWebService/fetchGisStationsStaticDistrict.js +++ /dev/null @@ -1,23 +0,0 @@ -// /redux/api/fromWebService/fetchGisStationsStaticDistrict.js - -export const fetchGisStationsStaticDistrict = async () => { - const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; - - const apiBaseUrl = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80/talas5/ClientData/WebServiceMap.asmx` : `${window.location.origin}/talas5/ClientData/WebServiceMap.asmx`; - - const params = new URLSearchParams(window.location.search); - const idMap = params.get("m"); - const idUser = params.get("u"); - - const url = `${apiBaseUrl}/GisStationsStaticDistrict?idMap=${idMap}&idUser=${idUser}`; - console.log("🔍 fetchGisStationsStaticDistrict - URL:", url); - - const response = await fetch(url); - - if (!response.ok) { - throw new Error("GisStationsStaticDistrict konnte nicht geladen werden"); - } - - const data = await response.json(); - return data; -}; diff --git a/redux/api/fromWebService/fetchGisStationsStatusDistrict.js b/redux/api/fromWebService/fetchGisStationsStatusDistrict.js deleted file mode 100644 index 1f53ac762..000000000 --- a/redux/api/fromWebService/fetchGisStationsStatusDistrict.js +++ /dev/null @@ -1,23 +0,0 @@ -// /redux/api/fromWebService/fetchGisStationsStatusDistrict.js - -export const fetchGisStationsStatusDistrict = async () => { - const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; - - const apiBaseUrl = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80/talas5/ClientData/WebServiceMap.asmx` : `${window.location.origin}/talas5/ClientData/WebServiceMap.asmx`; - - const params = new URLSearchParams(window.location.search); - const idMap = params.get("m"); - const idUser = params.get("u"); - - const url = `${apiBaseUrl}/GisStationsStatusDistrict?idMap=${idMap}&idUser=${idUser}`; - console.log("🔍 fetchGisStationsStatusDistrict - URL:", url); - - const response = await fetch(url); - - if (!response.ok) { - throw new Error("GisStationsStatusDistrict konnte nicht geladen werden"); - } - - const data = await response.json(); - return data; -}; diff --git a/redux/api/fromWebService/fetchGisSystemStatic.js b/redux/api/fromWebService/fetchGisSystemStatic.js deleted file mode 100644 index cfdebf9fa..000000000 --- a/redux/api/fromWebService/fetchGisSystemStatic.js +++ /dev/null @@ -1,20 +0,0 @@ -// /redux/api/fromWebService/fetchGisSystemStatic.js - -export async function fetchGisSystemStatic() { - const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; - - const apiBaseUrl = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80/talas5/ClientData/WebServiceMap.asmx` : `${window.location.origin}/talas5/ClientData/WebServiceMap.asmx`; - - const params = new URLSearchParams(window.location.search); - const idMap = params.get("m"); - const idUser = params.get("u"); - console.log("🔍 fetchGisSystemStatic - idMap:", idMap); - console.log("🔍 fetchGisSystemStatic - idUser:", idUser); - console.log("🔍 fetchGisSystemStatic - URL:", `${apiBaseUrl}/GisSystemStatic?idMap=${idMap}&idUser=${idUser}`); - - const response = await fetch(`${apiBaseUrl}/GisSystemStatic?idMap=${idMap}&idUser=${idUser}`); - const data = await response.json(); - - //console.log("✅ fetchGisSystemStatic - Daten:", data); - return data; -}