selectedChartData slice erstellt
This commit is contained in:
@@ -37,8 +37,9 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
||||
`Rendering Kue705FO - SlotIndex: ${slotIndex}, ModulName: ${modulName}`
|
||||
); */
|
||||
const selectedChartData = useSelector(
|
||||
(state: RootState) => state.variables.selectedChartData
|
||||
(state: RootState) => state.selectedChartData.selectedChartData
|
||||
);
|
||||
|
||||
const dispatch = useDispatch();
|
||||
|
||||
const chartRef = useRef(null);
|
||||
|
||||
@@ -6,7 +6,6 @@ import { RootState } from "../../../redux/store";
|
||||
|
||||
const VersionInfo: React.FC = () => {
|
||||
const appVersion =
|
||||
//useSelector((state: RootState) => state.variables.appVersion) ||
|
||||
useSelector((state: RootState) => state.systemSettings.appVersion) ||
|
||||
"Unbekannt";
|
||||
const webVersion = useSelector(
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
||||
|
||||
*/
|
||||
const webVersion = "1.6.171";
|
||||
const webVersion = "1.6.172";
|
||||
export default webVersion;
|
||||
|
||||
22
redux/slices/selectedChartDataSlice.ts
Normal file
22
redux/slices/selectedChartDataSlice.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
|
||||
|
||||
interface SelectedChartDataState {
|
||||
selectedChartData: any;
|
||||
}
|
||||
|
||||
const initialState: SelectedChartDataState = {
|
||||
selectedChartData: null,
|
||||
};
|
||||
|
||||
const selectedChartDataSlice = createSlice({
|
||||
name: "selectedChartData",
|
||||
initialState,
|
||||
reducers: {
|
||||
setSelectedChartData(state, action: PayloadAction<any>) {
|
||||
state.selectedChartData = action.payload;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
export const { setSelectedChartData } = selectedChartDataSlice.actions;
|
||||
export default selectedChartDataSlice.reducer;
|
||||
@@ -19,6 +19,7 @@ import loopChartReducer from "./slices/loopChartSlice";
|
||||
import tdmChartReducer from "./slices/tdmChartSlice";
|
||||
import tdrDataByIdReducer from "./slices/tdrDataByIdSlice";
|
||||
import kueDataReducer from "./slices/kueDataSlice";
|
||||
import selectedChartDataReducer from "./slices/selectedChartDataSlice";
|
||||
|
||||
const store = configureStore({
|
||||
reducer: {
|
||||
@@ -40,6 +41,7 @@ const store = configureStore({
|
||||
tdmChart: tdmChartReducer,
|
||||
tdrDataById: tdrDataByIdReducer,
|
||||
kueData: kueDataReducer,
|
||||
selectedChartData: selectedChartDataReducer,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -1,36 +1,49 @@
|
||||
// /services/fetchSystemSettings.ts
|
||||
|
||||
export const fetchSystemSettings = async () => {
|
||||
if (typeof window === "undefined") return null;
|
||||
try {
|
||||
if (typeof window === "undefined") return null;
|
||||
|
||||
// ✅ System.js nur bei Bedarf nachladen (Pfad abhängig von Umgebung)
|
||||
const scriptSrc =
|
||||
process.env.NODE_ENV === "production"
|
||||
? "/CPL?/CPL/SERVICE/System.js"
|
||||
: "/CPLmockData/SERVICE/System.js";
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const script = document.createElement("script");
|
||||
script.src = "/CPLmockData/SERVICE/System.js"; // ggf. anpassen
|
||||
script.async = true;
|
||||
script.onload = () => resolve();
|
||||
script.onerror = () => reject("❌ Fehler beim Laden von System.js");
|
||||
document.body.appendChild(script);
|
||||
});
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const script = document.createElement("script");
|
||||
script.src = scriptSrc;
|
||||
script.async = true;
|
||||
script.onload = () => resolve();
|
||||
script.onerror = () => reject("❌ Fehler beim Laden von System.js");
|
||||
document.body.appendChild(script);
|
||||
});
|
||||
const {
|
||||
win_deviceName,
|
||||
win_mac1,
|
||||
win_ip,
|
||||
win_subnet,
|
||||
win_gateway,
|
||||
win_cplInternalTimestamp,
|
||||
win_ntp1,
|
||||
win_ntp2,
|
||||
win_ntp3,
|
||||
win_ntpTimezone,
|
||||
win_ntpActive,
|
||||
win_appVersion,
|
||||
} = window as any;
|
||||
|
||||
const win = window as any;
|
||||
|
||||
return {
|
||||
deviceName: win.win_deviceName || "",
|
||||
mac1: win.win_mac1 || "",
|
||||
ip: win.win_ip || "",
|
||||
subnet: win.win_subnet || "",
|
||||
gateway: win.win_gateway || "",
|
||||
cplInternalTimestamp: win.win_cplInternalTimestamp || "",
|
||||
ntp1: win.win_ntp1 || "",
|
||||
ntp2: win.win_ntp2 || "",
|
||||
ntp3: win.win_ntp3 || "",
|
||||
ntpTimezone: win.win_ntpTimezone || "",
|
||||
ntpActive: win.win_ntpActive || false,
|
||||
};
|
||||
return {
|
||||
deviceName: win_deviceName,
|
||||
mac1: win_mac1,
|
||||
ip: win_ip,
|
||||
subnet: win_subnet,
|
||||
gateway: win_gateway,
|
||||
cplInternalTimestamp: win_cplInternalTimestamp,
|
||||
ntp1: win_ntp1,
|
||||
ntp2: win_ntp2,
|
||||
ntp3: win_ntp3,
|
||||
ntpTimezone: win_ntpTimezone,
|
||||
ntpActive: win_ntpActive === "1",
|
||||
appVersion: win_appVersion, // ✅ jetzt korrekt
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("❌ Fehler beim Laden der Systemdaten:", error);
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user