diff --git a/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx index c4050ef..7e3993f 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx @@ -1,7 +1,7 @@ // components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx "use client"; -import React, { useEffect, useRef } from "react"; +import React, { useEffect, useRef, useMemo } from "react"; import { RootState } from "../../../../../../redux/store"; import { useSelector } from "react-redux"; import { Chart, registerables } from "chart.js"; @@ -23,9 +23,20 @@ const TDRChart: React.FC<{ isFullScreen: boolean }> = ({ isFullScreen }) => { const selectedChartType = useSelector( (state: RootState) => state.kueChartMode.activeMode ); - const tdrChartData = useSelector((state: RootState) => - selectedId !== null ? state.tdrDataById.dataById[selectedId] || [] : [] + const tdrDataById = useSelector( + (state: RootState) => state.tdrDataById.dataById ); + const tdrInitialData = useSelector((state: RootState) => + selectedSlot !== null ? state.tdrChart.data[selectedSlot] || [] : [] + ); + + // Kombinierte Logik: ID hat Vorrang, sonst Initial-Daten für Slot + const tdrChartData = useMemo(() => { + if (selectedId !== null && tdrDataById[selectedId]) { + return tdrDataById[selectedId]; + } + return tdrInitialData; + }, [selectedId, tdrDataById, tdrInitialData]); const referenceChartData = useSelector((state: RootState) => selectedSlot !== null diff --git a/config/webVersion.ts b/config/webVersion.ts index 517a2c7..765f722 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.152"; +const webVersion = "1.6.153"; export default webVersion;