Ismail/CPLv4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kueData service nutzen statt globale loadWindowVariables, um Netzwerklast zu reduzieren und mehr Performance zu erreichen

Browse Source
This commit is contained in:
ISA
2025-03-26 16:11:48 +01:00
parent c8619f96de
commit d305a07f89
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
View File

@@ -68,25 +68,21 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
//------- Redux-Variablen abrufen-------------------------------- //------- Redux-Variablen abrufen--------------------------------
const { const {
kuePSTmMinus96V, pstMinus96V,
kueVersion: reduxKueVersion, kueVersion: reduxKueVersion,
tdrActive, tdrActive,
} = useSelector((state: RootState) => state.variables); } = useSelector((state: RootState) => state.kueData);
const kueCableBreakRaw = useSelector( const kueCableBreakRaw = useSelector(
(state: RootState) => state.variables.kueCableBreak (state: RootState) => state.kueData.cableBreak
); );
const kueGroundFaultRaw = useSelector( const kueGroundFaultRaw = useSelector(
(state: RootState) => state.variables.kueGroundFault (state: RootState) => state.kueData.groundFault
);
const kueAlarm1Raw = useSelector(
(state: RootState) => state.variables.kueAlarm1
);
const kueAlarm2Raw = useSelector(
(state: RootState) => state.variables.kueAlarm2
); );
const kueAlarm1Raw = useSelector((state: RootState) => state.kueData.alarm1);
const kueAlarm2Raw = useSelector((state: RootState) => state.kueData.alarm2);
const kueOverflowRaw = useSelector( const kueOverflowRaw = useSelector(
(state: RootState) => state.variables.kueOverflow (state: RootState) => state.kueData.overflow
); );
const kueCableBreak = useMemo( const kueCableBreak = useMemo(
@@ -130,7 +126,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
); );
const isoDisplayValue = useIsoDisplay( const isoDisplayValue = useIsoDisplay(
slotIndex, slotIndex,
kuePSTmMinus96V, pstMinus96V,
kueCableBreak, kueCableBreak,
kueGroundFault, kueGroundFault,
kueAlarm1, kueAlarm1,
@@ -235,7 +231,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
<div className="text-center"> <div className="text-center">
<span <span
className={ className={
Number(kuePSTmMinus96V?.[slotIndex]) === 1 || Number(pstMinus96V?.[slotIndex]) === 1 ||
Number(kueCableBreak?.[slotIndex]) === 1 || Number(kueCableBreak?.[slotIndex]) === 1 ||
Number(kueGroundFault?.[slotIndex]) === 1 || Number(kueGroundFault?.[slotIndex]) === 1 ||
Number(kueAlarm1?.[slotIndex]) === 1 || Number(kueAlarm1?.[slotIndex]) === 1 ||
@@ -249,7 +245,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
{isoDisplayValue} {isoDisplayValue}
</span> </span>
{Number(kuePSTmMinus96V?.[slotIndex]) !== 1 && {Number(pstMinus96V?.[slotIndex]) !== 1 &&
Number(kueCableBreak?.[slotIndex]) !== 1 && Number(kueCableBreak?.[slotIndex]) !== 1 &&
Number(kueGroundFault?.[slotIndex]) !== 1 && Number(kueGroundFault?.[slotIndex]) !== 1 &&
Number(kueAlarm1?.[slotIndex]) !== 1 && Number(kueAlarm1?.[slotIndex]) !== 1 &&

2
components/main/kabelueberwachung/kue705FO/KueModal.tsx
View File

@@ -62,7 +62,7 @@ function KueModal({
kueLimit2Low, kueLimit2Low,
kueLimit2High, kueLimit2High,
kueLoopInterval, kueLoopInterval,
} = useSelector((state: any) => state.variables); } = useSelector((state: any) => state.kueData);
const handleSaveWrapper = () => { const handleSaveWrapper = () => {
handleSave({ handleSave({

3
components/main/uebersicht/VersionInfo.tsx
View File

@@ -6,7 +6,8 @@ import { RootState } from "../../../redux/store";
const VersionInfo: React.FC = () => { const VersionInfo: React.FC = () => {
const appVersion = const appVersion =
useSelector((state: RootState) => state.variables.appVersion) || //useSelector((state: RootState) => state.variables.appVersion) ||
useSelector((state: RootState) => state.systemSettings.appVersion) ||
"Unbekannt"; "Unbekannt";
const webVersion = useSelector( const webVersion = useSelector(
(state: RootState) => state.webVersion.version (state: RootState) => state.webVersion.version

2
config/webVersion.ts
View File

@@ -6,5 +6,5 @@
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
*/ */
const webVersion = "1.6.169"; const webVersion = "1.6.170";
export default webVersion; export default webVersion;

4
pages/kabelueberwachung.tsx
View File

@@ -1,4 +1,4 @@
"use client"; "use client"; // /pages/kabelueberwachung.tsx
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import Kue705FO from "../components/main/kabelueberwachung/kue705FO/Kue705FO"; import Kue705FO from "../components/main/kabelueberwachung/kue705FO/Kue705FO";
@@ -28,7 +28,7 @@ function Kabelueberwachung() {
kueResidence, kueResidence,
kueCableBreak, kueCableBreak,
kueGroundFault, kueGroundFault,
} = useSelector((state) => state.variables); } = useSelector((state) => state.kueData);
//---------------------------------------------------------------- //----------------------------------------------------------------
// 🚀 **TDR-Daten bereits in Redux abrufen** // 🚀 **TDR-Daten bereits in Redux abrufen**

2
redux/slices/systemSettingsSlice.ts
View File

@@ -13,6 +13,7 @@ interface SystemSettingsState {
ntp3: string | null; ntp3: string | null;
ntpTimezone: string | null; ntpTimezone: string | null;
ntpActive: boolean | null; ntpActive: boolean | null;
appVersion: string | null;
} }
const initialState: SystemSettingsState = { const initialState: SystemSettingsState = {
@@ -27,6 +28,7 @@ const initialState: SystemSettingsState = {
ntp3: "", ntp3: "",
ntpTimezone: "", ntpTimezone: "",
ntpActive: false, ntpActive: false,
appVersion: "",
}; };
const systemSettingsSlice = createSlice({ const systemSettingsSlice = createSlice({