fix: handleModuleClick für Baugrüppenträger in dashboard.tsx
This commit is contained in:
@@ -1,26 +1,37 @@
|
|||||||
"use client";
|
"use client";
|
||||||
import React from "react";
|
import React, { useMemo } from "react";
|
||||||
|
import { useSelector } from "react-redux";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { RootState } from "../redux/store";
|
||||||
import KabelModulStatus from "./modulesStatus/KabelModulStatus";
|
import KabelModulStatus from "./modulesStatus/KabelModulStatus";
|
||||||
|
|
||||||
interface BaugruppentraegerProps {
|
const Baugruppentraeger: React.FC = () => {
|
||||||
kueOnline: number[];
|
const router = useRouter(); // useRouter für Navigation hinzufügen
|
||||||
kueVersion: (number | string)[];
|
|
||||||
kueCableBreak: number[];
|
// Redux-Variablen direkt hier abrufen
|
||||||
kueAlarm1: number[];
|
const {
|
||||||
kueAlarm2: number[];
|
kueOnline: kueOnlineRaw,
|
||||||
kueGroundFault: number[];
|
kueVersion,
|
||||||
handleModuleClick: (rackNumber: number) => void;
|
kueCableBreak,
|
||||||
}
|
kueAlarm1,
|
||||||
|
kueAlarm2,
|
||||||
|
kueGroundFault,
|
||||||
|
} = useSelector((state: RootState) => state.variables);
|
||||||
|
|
||||||
|
// `kueOnline` sicherstellen, dass es nur Zahlen enthält
|
||||||
|
const kueOnline = useMemo(
|
||||||
|
() =>
|
||||||
|
kueOnlineRaw.map((value) =>
|
||||||
|
typeof value === "string" ? parseFloat(value) || 0 : value
|
||||||
|
),
|
||||||
|
[kueOnlineRaw]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Klick-Handler für Routing
|
||||||
|
const handleModuleClick = (rackNumber: number) => {
|
||||||
|
router.push(`/kabelueberwachung?rack=${rackNumber}`);
|
||||||
|
};
|
||||||
|
|
||||||
const Baugruppentraeger: React.FC<BaugruppentraegerProps> = ({
|
|
||||||
kueOnline,
|
|
||||||
kueVersion,
|
|
||||||
kueCableBreak,
|
|
||||||
kueAlarm1,
|
|
||||||
kueAlarm2,
|
|
||||||
kueGroundFault,
|
|
||||||
handleModuleClick,
|
|
||||||
}) => {
|
|
||||||
const baugruppen: JSX.Element[] = [];
|
const baugruppen: JSX.Element[] = [];
|
||||||
const numBaugruppen = Math.ceil(kueOnline.length / 8);
|
const numBaugruppen = Math.ceil(kueOnline.length / 8);
|
||||||
|
|
||||||
|
|||||||
@@ -5,5 +5,5 @@
|
|||||||
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
||||||
|
|
||||||
*/
|
*/
|
||||||
const webVersion = "1.6.24";
|
const webVersion = "1.6.25";
|
||||||
export default webVersion;
|
export default webVersion;
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
"use client";
|
"use client";
|
||||||
import React, { useEffect, useMemo } from "react";
|
import React, { useEffect } from "react";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import "tailwindcss/tailwind.css";
|
import "tailwindcss/tailwind.css";
|
||||||
import "@fontsource/roboto";
|
import "@fontsource/roboto";
|
||||||
import "bootstrap-icons/font/bootstrap-icons.css";
|
import "bootstrap-icons/font/bootstrap-icons.css";
|
||||||
import { Icon } from "@iconify/react";
|
import { Icon } from "@iconify/react";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { RootState } from "../redux/store";
|
|
||||||
import {
|
import {
|
||||||
setOpcUaZustand,
|
setOpcUaZustand,
|
||||||
setOpcUaActiveClientCount,
|
setOpcUaActiveClientCount,
|
||||||
@@ -34,30 +33,6 @@ const Dashboard: React.FC = () => {
|
|||||||
}
|
}
|
||||||
}, [dispatch]);
|
}, [dispatch]);
|
||||||
|
|
||||||
// Redux-Variablen abrufen & Werte sicherstellen
|
|
||||||
const {
|
|
||||||
kueOnline: kueOnlineRaw,
|
|
||||||
kueVersion,
|
|
||||||
kueCableBreak,
|
|
||||||
kueAlarm1,
|
|
||||||
kueAlarm2,
|
|
||||||
kueGroundFault,
|
|
||||||
} = useSelector((state: RootState) => state.variables);
|
|
||||||
|
|
||||||
// `kueOnline` sicherstellen, dass es nur Zahlen enthält
|
|
||||||
const kueOnline = useMemo(
|
|
||||||
() =>
|
|
||||||
kueOnlineRaw.map((value) =>
|
|
||||||
typeof value === "string" ? parseFloat(value) || 0 : value
|
|
||||||
),
|
|
||||||
[kueOnlineRaw]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Modul-Klick-Handler
|
|
||||||
const handleModuleClick = (rackNumber: number) => {
|
|
||||||
router.push(`/kabelueberwachung?rack=${rackNumber}`);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col gap-3 p-4 h-[calc(100vh-13vh-8vh)] laptop:h-[calc(100vh-10vh-5vh)] xl:h-[calc(100vh-10vh-6vh)] laptop:gap-0">
|
<div className="flex flex-col gap-3 p-4 h-[calc(100vh-13vh-8vh)] laptop:h-[calc(100vh-10vh-5vh)] xl:h-[calc(100vh-10vh-6vh)] laptop:gap-0">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
@@ -82,15 +57,8 @@ const Dashboard: React.FC = () => {
|
|||||||
<VersionInfo />
|
<VersionInfo />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Baugruppentraeger
|
{/* Jetzt holt sich Baugruppentraeger die Werte selbst aus Redux */}
|
||||||
kueOnline={kueOnline}
|
<Baugruppentraeger />
|
||||||
kueVersion={kueVersion}
|
|
||||||
kueCableBreak={kueCableBreak}
|
|
||||||
kueAlarm1={kueAlarm1}
|
|
||||||
kueAlarm2={kueAlarm2}
|
|
||||||
kueGroundFault={kueGroundFault}
|
|
||||||
handleModuleClick={handleModuleClick}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user