diff --git a/components/main/uebersicht/Last20MessagesTable.tsx b/components/main/uebersicht/Last20MessagesTable.tsx index 6444575..710d032 100644 --- a/components/main/uebersicht/Last20MessagesTable.tsx +++ b/components/main/uebersicht/Last20MessagesTable.tsx @@ -1,13 +1,35 @@ "use client"; import React from "react"; +import { useSelector } from "react-redux"; +import { RootState } from "../../../redux/store"; -interface Last20MessagesTableProps { - last20Messages: string[][]; -} +const Last20MessagesTable: React.FC = () => { + const rawLast20Messages = useSelector( + (state: RootState) => state.variables.last20Messages + ); + + // Hilfsfunktion zum Parsen der Nachrichten + const parseMessages = (messages: string | null) => { + if (typeof messages === "string") { + messages = messages + .replace(//g, "\n") + .replace(/<\/?td>/g, "") + .replace(/<\/tr>/g, "") + .trim(); + const rows = messages.split("\n"); + return rows.map((row) => [ + row.substring(0, 5), + row.substring(5, 10), + row.substring(10, 29), + row.substring(33, row.length - 1), + row.substring(row.length - 1), + ]); + } + return []; + }; + + const last20Messages = parseMessages(rawLast20Messages); -const Last20MessagesTable: React.FC = ({ - last20Messages, -}) => { return (
diff --git a/config/webVersion.ts b/config/webVersion.ts index 26711bd..aad6439 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -5,5 +5,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.20"; +const webVersion = "1.6.21"; export default webVersion; diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx index 2ac2407..1b78dc6 100644 --- a/pages/dashboard.tsx +++ b/pages/dashboard.tsx @@ -159,7 +159,7 @@ function Dashboard() {
- +