From 234608973e73b25b1351a1e83418713c091902b5 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 12 Aug 2025 09:35:19 +0200 Subject: [PATCH] =?UTF-8?q?feat(iso):=20DateRangePicker-Zeitraum=20bei=20"?= =?UTF-8?q?Daten=20laden"=20anwenden=20und=20fix=20debug=20f=C3=BCr=20buil?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 5 +++++ .../IsoMeasurementChart/IsoChartActionBar.tsx | 16 +++++++++------- package-lock.json | 4 ++-- package.json | 2 +- redux/store.ts | 6 +++--- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.env.development b/.env.development index 5cf06d0..cec5f9f 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.694 +NEXT_PUBLIC_APP_VERSION=1.6.695 NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) diff --git a/.env.production b/.env.production index afa3de2..b3e6f05 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.694 +NEXT_PUBLIC_APP_VERSION=1.6.695 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a9f9a64..124e7fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.695] – 2025-08-12 + +- feat(iso): DateRangePicker-Zeitraum bei "Daten laden" anwenden + +--- ## [1.6.694] – 2025-08-12 - feat: RSL starten in Dev mode 15 Sek. und in prod. 120 Sek. diff --git a/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx index 6801c12..6978a0c 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx @@ -2,8 +2,8 @@ // /components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx import React from "react"; import DateRangePicker from "@/components/common/DateRangePicker"; -import { useDispatch, useSelector } from "react-redux"; -import { RootState } from "@/redux/store"; +import { useSelector } from "react-redux"; +import { RootState, useAppDispatch } from "@/redux/store"; import { setIsoMeasurementCurveChartData, setSelectedMode, @@ -16,7 +16,7 @@ import { Listbox } from "@headlessui/react"; //-----------------------------------------------------------------------------------useIsoChartLoader export const useIsoChartLoader = () => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { vonDatum, bisDatum, selectedMode, slotNumber } = useSelector( (state: RootState) => state.kabelueberwachungChartSlice ); @@ -90,7 +90,7 @@ export const useIsoChartLoader = () => { //-----------------------------------------------------------------------------------useIsoDataLoader Hook export const useIsoDataLoader = () => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { vonDatum, bisDatum, selectedMode, slotNumber } = useSelector( (state: RootState) => state.kabelueberwachungChartSlice ); @@ -171,7 +171,7 @@ export const useIsoDataLoader = () => { //-----------------------------------------------------------------------------------IsoChartActionBar const IsoChartActionBar: React.FC = () => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { vonDatum, bisDatum, selectedMode, slotNumber, chartTitle } = useSelector((state: RootState) => state.kabelueberwachungChartSlice); @@ -218,7 +218,8 @@ const IsoChartActionBar: React.FC = () => { const toDate = pickerBisDatum ?? bisDatum; await dispatch(getMessagesThunk({ fromDate, toDate })).unwrap(); } catch (err) { - console.error("❌ Fehler beim Laden der Meldungen:", err); + const message = err instanceof Error ? err.message : String(err); + console.error("❌ Fehler beim Laden der Meldungen:", message); alert("❌ Fehler beim Laden der Meldungen."); } finally { dispatch(setLoading(false)); @@ -269,7 +270,8 @@ const IsoChartActionBar: React.FC = () => { dispatch(setChartOpen(false)); } } catch (err) { - console.error("❌ Fehler beim Laden der Daten:", err); + const message = err instanceof Error ? err.message : String(err); + console.error("❌ Fehler beim Laden der Daten:", message); alert("❌ Fehler beim Laden der Daten."); } finally { dispatch(setLoading(false)); diff --git a/package-lock.json b/package-lock.json index 792e3bc..5499c8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.694", + "version": "1.6.695", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.694", + "version": "1.6.695", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index 296f7f3..fea9f8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.694", + "version": "1.6.695", "private": true, "scripts": { "dev": "next dev", diff --git a/redux/store.ts b/redux/store.ts index a3a1f35..ce12868 100644 --- a/redux/store.ts +++ b/redux/store.ts @@ -84,10 +84,10 @@ const rootReducer = combineReducers({ // ✅ Store erstellen export const store = configureStore({ reducer: rootReducer, - // (optional) middleware anpassen, z. B. um Warnungen zu ignorieren: + // (optional) middleware anpassen, z. B. um Warnungen zu ignorieren: middleware: (getDefaultMiddleware) => getDefaultMiddleware({ - serializableCheck: false, // z. B. falls du redux-persist nutzt oder dispatch mit non-serializable Payloads hast + serializableCheck: false, // z. B. falls du redux-persist nutzt oder dispatch mit non-serializable Payloads hast }), }); @@ -96,5 +96,5 @@ export type RootState = ReturnType; export type AppDispatch = typeof store.dispatch; // ✅ Hooks für Typsicherheit -export const useAppDispatch: () => AppDispatch = useDispatch; +export const useAppDispatch = () => useDispatch(); export const useAppSelector: TypedUseSelectorHook = useSelector;