diff --git a/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts b/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts index 71bbdf7..f369f42 100644 --- a/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts +++ b/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts @@ -1,5 +1,5 @@ // components/modales/kueModal/handlers/handleSave.ts -import { setVariables } from "../../../../../redux/slices/variablesSlice"; +import { setKueData } from "../../../../../redux/slices/kueDataSlice"; export interface OriginalValues { kueID: string[]; @@ -95,7 +95,7 @@ const handleSave = ({ onModulNameChange(ids[slot]); dispatch( - setVariables({ + setKueData({ kueID: [...ids], kueBezeichnungen: [...bezeichnungen], isolationsgrenzwerte: [...isolationsgrenzwerte], diff --git a/components/main/kabelueberwachung/kue705FO/hooks/useChartData.ts b/components/main/kabelueberwachung/kue705FO/hooks/useChartData.ts index 98a95e4..d3c173a 100644 --- a/components/main/kabelueberwachung/kue705FO/hooks/useChartData.ts +++ b/components/main/kabelueberwachung/kue705FO/hooks/useChartData.ts @@ -1,6 +1,6 @@ import { useEffect } from "react"; import { useDispatch } from "react-redux"; -import { setSelectedChartData } from "../../../../../redux/slices/variablesSlice"; +import { setSelectedChartData } from "../../../../../redux/slices/selectedChartDataSlice"; const useChartData = (loopMeasurementCurveChartData: any) => { const dispatch = useDispatch(); diff --git a/config/webVersion.ts b/config/webVersion.ts index 673074b..1a8bfde 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.172"; +const webVersion = "1.6.173"; export default webVersion; diff --git a/pages/_app.tsx b/pages/_app.tsx index a71d989..55daf44 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -11,7 +11,6 @@ import Footer from "../components/footer/Footer"; import WindowVariablesInitializer from "../components/WindowVariablesInitializer"; import "../styles/globals.css"; import { AppProps } from "next/app"; -import { setVariables } from "../redux/slices/variablesSlice"; function MyApp({ Component, pageProps }: AppProps) { return ( @@ -35,8 +34,6 @@ function AppContent({ Component, pageProps }: AppProps) { const { ...restVariables } = variables; - dispatch(setVariables(restVariables)); - setSessionExpired(false); } catch (error) { console.error("❌ Fehler beim Laden der Sitzung:", error); diff --git a/redux/slices/kueDataSlice.ts b/redux/slices/kueDataSlice.ts index 53c6377..db1974e 100644 --- a/redux/slices/kueDataSlice.ts +++ b/redux/slices/kueDataSlice.ts @@ -2,6 +2,18 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; interface KueDataState { + //--------------------- + kueBezeichnungen: string[]; + isolationsgrenzwerte: number[]; + verzoegerung: number[]; + untereSchleifenGrenzwerte: number[]; + obereSchleifenGrenzwerte: number[]; + schleifenintervall: number[]; + //--------------- + counter: number | null; + flutter: string | null; + //----------------------- + //----------------------- kueOnline: number[]; kueID: string[]; kuePSTmMinus96V: number[]; @@ -30,6 +42,18 @@ interface KueDataState { } const initialState: KueDataState = { + //--------------------- + kueBezeichnungen: [], + isolationsgrenzwerte: [], + verzoegerung: [], + untereSchleifenGrenzwerte: [], + obereSchleifenGrenzwerte: [], + schleifenintervall: [], + //--------------- + counter: null, + flutter: null, + //----------------------- + //----------------------- kueOnline: [], kueID: [], kuePSTmMinus96V: [], diff --git a/redux/slices/variablesSlice.ts b/redux/slices/variablesSlice.ts deleted file mode 100644 index e5ea8f4..0000000 --- a/redux/slices/variablesSlice.ts +++ /dev/null @@ -1,110 +0,0 @@ -// redux/slices/variablesSlice.ts -import { createSlice, PayloadAction } from "@reduxjs/toolkit"; - -// Typ für den State -export interface VariablesState { - selectedChartData: any; - kueBezeichnungen: string[]; - isolationsgrenzwerte: number[]; - verzoegerung: number[]; - untereSchleifenGrenzwerte: number[]; - obereSchleifenGrenzwerte: number[]; - schleifenintervall: number[]; - //--------------- - counter: number | null; - flutter: string | null; - kueOnline: string[] | number[]; - kueID: string[]; - kueIso: string[]; - kuePSTmMinus96V: number[]; - kueAlarm1: number[]; - kueAlarm2: number[]; - kueResidence: string[]; - kueCableBreak: string[]; - kueGroundFault: string[]; - kueLimit1: number | null; - kueLimit2Low: number | null; - kueDelay1: number | null; - kueLoopInterval: number | null; - kueVersion: number[] | string[]; - tdrAtten: number | null; - tdrPulse: number | null; - tdrSpeed: number | null; - tdrAmp: number | null; - tdrTrigger: number | null; - tdrLocation: number | null; - tdrActive: boolean | null; - kueOverflow: number[] | null; - tdrLast: string | null; - appVersion: string | null; -} - -// Initialer Zustand -const initialState: VariablesState = { - selectedChartData: null, - kueBezeichnungen: [], - isolationsgrenzwerte: [], - verzoegerung: [], - untereSchleifenGrenzwerte: [], - obereSchleifenGrenzwerte: [], - schleifenintervall: [], - counter: null, - flutter: null, - kueOnline: [], - kueID: [], - kueIso: [], - kuePSTmMinus96V: [], - kueAlarm1: [], - kueAlarm2: [], - kueResidence: [], - kueCableBreak: [], - kueGroundFault: [], - kueLimit1: null, - kueLimit2Low: null, - kueDelay1: null, - kueLoopInterval: null, - kueVersion: [], - tdrAtten: null, - tdrPulse: null, - tdrSpeed: null, - tdrAmp: null, - tdrTrigger: null, - tdrLocation: null, - tdrActive: null, - kueOverflow: null, - tdrLast: null, - appVersion: null, -}; - -// Slice erstellen -const variablesSlice = createSlice({ - name: "variables", - initialState, - reducers: { - setSelectedChartData(state, action: PayloadAction) { - state.selectedChartData = action.payload; - }, - setVariable( - state, - action: PayloadAction<{ - key: keyof VariablesState; - value: VariablesState[keyof VariablesState]; - }> - ) { - const { key, value } = action.payload; - (state[key] as VariablesState[keyof VariablesState]) = value; - }, - setVariables(state, action: PayloadAction>) { - Object.entries(action.payload).forEach(([key, value]) => { - (state[ - key as keyof VariablesState - ] as VariablesState[keyof VariablesState]) = value!; - }); - }, - }, -}); - -export const { setSelectedChartData, setVariable, setVariables } = - variablesSlice.actions; - -export default variablesSlice.reducer; diff --git a/redux/store.ts b/redux/store.ts index 21cd12a..6d3c18a 100644 --- a/redux/store.ts +++ b/redux/store.ts @@ -2,7 +2,6 @@ import { configureStore } from "@reduxjs/toolkit"; import { useDispatch } from "react-redux"; import authReducer from "./slices/authSlice"; -import variablesReducer from "./slices/variablesSlice"; import kueChartModeReducer from "./slices/kueChartModeSlice"; import webVersionReducer from "./slices/webVersionSlice"; import kabelueberwachungChartReducer from "./slices/kabelueberwachungChartSlice"; @@ -24,7 +23,6 @@ import selectedChartDataReducer from "./slices/selectedChartDataSlice"; const store = configureStore({ reducer: { auth: authReducer, - variables: variablesReducer, kueChartMode: kueChartModeReducer, webVersion: webVersionReducer, digitalInputs: digitalInputsReducer,