From d305a07f898cb62b0ad8b29075bb5d1b09b4d1dc Mon Sep 17 00:00:00 2001
From: ISA <Ismail.ali@littwin-systemtechnik.de>
Date: Wed, 26 Mar 2025 16:11:48 +0100
Subject: [PATCH] kueData service nutzen statt globale loadWindowVariables, um
 Netzwerklast zu reduzieren und mehr Performance zu erreichen

---
 .../kabelueberwachung/kue705FO/Kue705FO.tsx   | 24 ++++++++-----------
 .../kabelueberwachung/kue705FO/KueModal.tsx   |  2 +-
 components/main/uebersicht/VersionInfo.tsx    |  3 ++-
 config/webVersion.ts                          |  2 +-
 pages/kabelueberwachung.tsx                   |  4 ++--
 redux/slices/systemSettingsSlice.ts           |  2 ++
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
index 0f5de86..d7a1e6a 100644
--- a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
+++ b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
@@ -68,25 +68,21 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
 
   //------- Redux-Variablen abrufen--------------------------------
   const {
-    kuePSTmMinus96V,
+    pstMinus96V,
     kueVersion: reduxKueVersion,
     tdrActive,
-  } = useSelector((state: RootState) => state.variables);
+  } = useSelector((state: RootState) => state.kueData);
 
   const kueCableBreakRaw = useSelector(
-    (state: RootState) => state.variables.kueCableBreak
+    (state: RootState) => state.kueData.cableBreak
   );
   const kueGroundFaultRaw = useSelector(
-    (state: RootState) => state.variables.kueGroundFault
-  );
-  const kueAlarm1Raw = useSelector(
-    (state: RootState) => state.variables.kueAlarm1
-  );
-  const kueAlarm2Raw = useSelector(
-    (state: RootState) => state.variables.kueAlarm2
+    (state: RootState) => state.kueData.groundFault
   );
+  const kueAlarm1Raw = useSelector((state: RootState) => state.kueData.alarm1);
+  const kueAlarm2Raw = useSelector((state: RootState) => state.kueData.alarm2);
   const kueOverflowRaw = useSelector(
-    (state: RootState) => state.variables.kueOverflow
+    (state: RootState) => state.kueData.overflow
   );
 
   const kueCableBreak = useMemo(
@@ -130,7 +126,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
   );
   const isoDisplayValue = useIsoDisplay(
     slotIndex,
-    kuePSTmMinus96V,
+    pstMinus96V,
     kueCableBreak,
     kueGroundFault,
     kueAlarm1,
@@ -235,7 +231,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
               <div className="text-center">
                 <span
                   className={
-                    Number(kuePSTmMinus96V?.[slotIndex]) === 1 ||
+                    Number(pstMinus96V?.[slotIndex]) === 1 ||
                     Number(kueCableBreak?.[slotIndex]) === 1 ||
                     Number(kueGroundFault?.[slotIndex]) === 1 ||
                     Number(kueAlarm1?.[slotIndex]) === 1 ||
@@ -249,7 +245,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
                   {isoDisplayValue}
                 </span>
 
-                {Number(kuePSTmMinus96V?.[slotIndex]) !== 1 &&
+                {Number(pstMinus96V?.[slotIndex]) !== 1 &&
                   Number(kueCableBreak?.[slotIndex]) !== 1 &&
                   Number(kueGroundFault?.[slotIndex]) !== 1 &&
                   Number(kueAlarm1?.[slotIndex]) !== 1 &&
diff --git a/components/main/kabelueberwachung/kue705FO/KueModal.tsx b/components/main/kabelueberwachung/kue705FO/KueModal.tsx
index 71cb3c0..384ec92 100644
--- a/components/main/kabelueberwachung/kue705FO/KueModal.tsx
+++ b/components/main/kabelueberwachung/kue705FO/KueModal.tsx
@@ -62,7 +62,7 @@ function KueModal({
     kueLimit2Low,
     kueLimit2High,
     kueLoopInterval,
-  } = useSelector((state: any) => state.variables);
+  } = useSelector((state: any) => state.kueData);
 
   const handleSaveWrapper = () => {
     handleSave({
diff --git a/components/main/uebersicht/VersionInfo.tsx b/components/main/uebersicht/VersionInfo.tsx
index 8974c99..8e96189 100644
--- a/components/main/uebersicht/VersionInfo.tsx
+++ b/components/main/uebersicht/VersionInfo.tsx
@@ -6,7 +6,8 @@ import { RootState } from "../../../redux/store";
 
 const VersionInfo: React.FC = () => {
   const appVersion =
-    useSelector((state: RootState) => state.variables.appVersion) ||
+    //useSelector((state: RootState) => state.variables.appVersion) ||
+    useSelector((state: RootState) => state.systemSettings.appVersion) ||
     "Unbekannt";
   const webVersion = useSelector(
     (state: RootState) => state.webVersion.version
diff --git a/config/webVersion.ts b/config/webVersion.ts
index 989a182..3878b2a 100644
--- a/config/webVersion.ts
+++ b/config/webVersion.ts
@@ -6,5 +6,5 @@
 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
 
 */
-const webVersion = "1.6.169";
+const webVersion = "1.6.170";
 export default webVersion;
diff --git a/pages/kabelueberwachung.tsx b/pages/kabelueberwachung.tsx
index 5a5303e..7fd26e6 100644
--- a/pages/kabelueberwachung.tsx
+++ b/pages/kabelueberwachung.tsx
@@ -1,4 +1,4 @@
-"use client";
+"use client"; // /pages/kabelueberwachung.tsx
 import React, { useState, useEffect } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
 import Kue705FO from "../components/main/kabelueberwachung/kue705FO/Kue705FO";
@@ -28,7 +28,7 @@ function Kabelueberwachung() {
     kueResidence,
     kueCableBreak,
     kueGroundFault,
-  } = useSelector((state) => state.variables);
+  } = useSelector((state) => state.kueData);
 
   //----------------------------------------------------------------
   // 🚀 **TDR-Daten bereits in Redux abrufen**
diff --git a/redux/slices/systemSettingsSlice.ts b/redux/slices/systemSettingsSlice.ts
index d061240..e636d94 100644
--- a/redux/slices/systemSettingsSlice.ts
+++ b/redux/slices/systemSettingsSlice.ts
@@ -13,6 +13,7 @@ interface SystemSettingsState {
   ntp3: string | null;
   ntpTimezone: string | null;
   ntpActive: boolean | null;
+  appVersion: string | null;
 }
 
 const initialState: SystemSettingsState = {
@@ -27,6 +28,7 @@ const initialState: SystemSettingsState = {
   ntp3: "",
   ntpTimezone: "",
   ntpActive: false,
+  appVersion: "",
 };
 
 const systemSettingsSlice = createSlice({