From bdbdd27963096f4cf77a885ea29d55be0cdde9d0 Mon Sep 17 00:00:00 2001 From: ISA Date: Wed, 23 Jul 2025 13:40:43 +0200 Subject: [PATCH] feat: Add cursor wait state to AnalogInputsTable rows during data loading - Applied `cursor-wait` style to table rows (``) in AnalogInputsTable when loading is true. - Ensured consistent cursor behavior across the entire table and rows --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 9 +++++++++ .../main/analogInputs/AnalogInputsChart.tsx | 11 +++++++---- .../main/analogInputs/AnalogInputsTable.tsx | 18 ++++++++++++++---- .../main/analogInputs/AnalogInputsView.tsx | 15 +++++++++------ package-lock.json | 4 ++-- package.json | 2 +- 8 files changed, 44 insertions(+), 19 deletions(-) diff --git a/.env.development b/.env.development index 98422f5..c9a68f7 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.637 +NEXT_PUBLIC_APP_VERSION=1.6.638 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 53c8910..86a5324 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.637 +NEXT_PUBLIC_APP_VERSION=1.6.638 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e1496e..0e9c57a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.6.638] – 2025-07-23 + +- feat: Add cursor wait during chart data loading + +- Implemented cursor wait state while chart data is being loaded in `AnalogInputsChart.tsx`. +- Fixed missing dependencies in `useEffect` and defined `loading` state. +- Updated `handleFetchData` to manage + +--- ## [1.6.637] – 2025-07-23 - feat: Add cursor wait during chart data loading diff --git a/components/main/analogInputs/AnalogInputsChart.tsx b/components/main/analogInputs/AnalogInputsChart.tsx index 17eedf1..9b03ee0 100644 --- a/components/main/analogInputs/AnalogInputsChart.tsx +++ b/components/main/analogInputs/AnalogInputsChart.tsx @@ -42,7 +42,13 @@ ChartJS.register( TimeScale ); -export default function AnalogInputsChart() { +export default function AnalogInputsChart({ + setLoading, + loading, +}: { + setLoading: (loading: boolean) => void; + loading: boolean; +}) { useEffect(() => { if (typeof window !== "undefined") { import("chartjs-plugin-zoom").then((zoom) => { @@ -119,9 +125,6 @@ export default function AnalogInputsChart() { setLocalBisDatum(to); }; - // Define loading state - const [loading, setLoading] = React.useState(false); - // ✅ Button → Redux + Fetch triggern const handleFetchData = () => { if (!selectedAnalogInput?.id) return; diff --git a/components/main/analogInputs/AnalogInputsTable.tsx b/components/main/analogInputs/AnalogInputsTable.tsx index deec756..de367b6 100644 --- a/components/main/analogInputs/AnalogInputsTable.tsx +++ b/components/main/analogInputs/AnalogInputsTable.tsx @@ -14,7 +14,7 @@ import { setAutoLoad, } from "@/redux/slices/analogInputs/analogInputsHistorySlice"; -export default function AnalogInputsTable() { +export default function AnalogInputsTable({ loading }: { loading: boolean }) { const dispatch = useDispatch(); const [activeId, setActiveId] = React.useState(null); @@ -35,7 +35,11 @@ export default function AnalogInputsTable() { }; return ( -
+

- +
@@ -67,7 +75,9 @@ export default function AnalogInputsTable() { state.selectedAnalogInput ); const selectedId = useSelector( (state: RootState) => state.analogInputsHistory.selectedId ); - const isSettingsModalOpen = useSelector( - (state: RootState) => state.analogInputsUi.isSettingsModalOpen - ); const dispatch = useAppDispatch(); @@ -33,21 +32,25 @@ function AnalogInputsView() { }, [dispatch]); return ( -
+

Messwerteingänge

- +

Messkurve Messwerteingang {selectedId ?? "–"}

- +
diff --git a/package-lock.json b/package-lock.json index 28b5b63..b992d38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.637", + "version": "1.6.638", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.637", + "version": "1.6.638", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index efe9ff4..0cb889c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.637", + "version": "1.6.638", "private": true, "scripts": { "dev": "next dev",
Eingang