fix: Firmware-Update-Button stabilisiert und Flackern entfernt
- useAdminAuth aus KueEinstellung entfernt und einmalig in SettingsModalWrapper ausgelagert - isAdminLoggedIn als Prop übergeben, um ständige Aktualisierungen zu vermeiden - Button wird jetzt stabil angezeigt ohne console-Logs oder Intervall-Aufrufe
This commit is contained in:
ISA
@@ -1,16 +1,20 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
// components/main/kabelueberwachung/kue705FO/modals/KueEinstellung.tsx
|
||||
import { useState, useEffect } from "react";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import type { RootState } from "../../../../../redux/store";
|
||||
import handleSave from "../handlers/handleSave";
|
||||
import handleDisplayEinschalten from "../handlers/handleDisplayEinschalten";
|
||||
import firmwareUpdate from "../handlers/firmwareUpdate";
|
||||
import { useAdminAuth } from "../../../settingsPageComponents/hooks/useAdminAuth";
|
||||
import ProgressModal from "@/components/main/settingsPageComponents/modals/ProgressModal";
|
||||
import { toast } from "react-toastify";
|
||||
import ConfirmModal from "@/components/common/ConfirmModal";
|
||||
|
||||
interface Props {
|
||||
slot: number;
|
||||
showModal: boolean;
|
||||
isAdminLoggedIn: boolean; // NEU
|
||||
onClose?: () => void;
|
||||
onModulNameChange?: (id: string) => void;
|
||||
}
|
||||
@@ -29,7 +33,8 @@ const memoryIntervalOptions = [
|
||||
|
||||
export default function KueEinstellung({
|
||||
slot,
|
||||
|
||||
showModal,
|
||||
isAdminLoggedIn,
|
||||
onClose = () => {},
|
||||
onModulNameChange,
|
||||
}: Props) {
|
||||
@@ -43,18 +48,15 @@ export default function KueEinstellung({
|
||||
kueLoopInterval,
|
||||
memoryInterval,
|
||||
} = useSelector((state: RootState) => state.kueDataSlice);
|
||||
const [showConfirmModal, setShowConfirmModal] = useState(false);
|
||||
|
||||
const { isAdminLoggedIn } = useAdminAuth(true);
|
||||
|
||||
const formCacheKey = `slot_${slot}`;
|
||||
if (typeof window !== "undefined") {
|
||||
window.__kueCache = window.__kueCache || {};
|
||||
}
|
||||
const cached =
|
||||
typeof window !== "undefined" ? window.__kueCache?.[formCacheKey] : null;
|
||||
|
||||
const [isUpdating, setIsUpdating] = useState(false);
|
||||
const [progress, setProgress] = useState(0);
|
||||
const [formData, setFormData] = useState(() => {
|
||||
if (cached) return cached;
|
||||
if (typeof window !== "undefined") {
|
||||
const cache = window.__kueCache?.[`slot_${slot}`];
|
||||
if (cache) return cache;
|
||||
}
|
||||
return {
|
||||
kueID: kueID[slot] || "",
|
||||
kueName: kueName[slot] || "",
|
||||
@@ -70,17 +72,12 @@ export default function KueEinstellung({
|
||||
const updated = { ...formData, [key]: value };
|
||||
setFormData(updated);
|
||||
if (typeof window !== "undefined") {
|
||||
window.__kueCache![formCacheKey] = updated;
|
||||
window.__kueCache = window.__kueCache || {};
|
||||
window.__kueCache[`slot_${slot}`] = updated;
|
||||
}
|
||||
};
|
||||
|
||||
const handleSaveWrapper = async () => {
|
||||
const updatedKueID = [...kueID];
|
||||
//updatedKueID[slot] = formData.kueID;
|
||||
/* if (Object.isFrozen(kueID)) {
|
||||
console.warn("kueID ist readonly!");
|
||||
}
|
||||
*/
|
||||
const updatedKueName = [...kueName];
|
||||
updatedKueName[slot] = formData.kueName;
|
||||
|
||||
@@ -100,7 +97,7 @@ export default function KueEinstellung({
|
||||
updatedMemoryInterval[slot] = Number(formData.memoryInterval);
|
||||
|
||||
const newData = {
|
||||
kueID: updatedKueID[slot],
|
||||
kueID: kueID[slot],
|
||||
kueName: updatedKueName[slot],
|
||||
limit1: updatedLimit1[slot].toString(),
|
||||
delay1: updatedDelay1[slot].toString(),
|
||||
@@ -108,13 +105,11 @@ export default function KueEinstellung({
|
||||
loopInterval: updatedLoopInterval[slot].toString(),
|
||||
memoryInterval: updatedMemoryInterval[slot].toString(),
|
||||
};
|
||||
|
||||
setFormData(newData);
|
||||
if (typeof window !== "undefined") {
|
||||
window.__kueCache![`slot_${slot}`] = newData;
|
||||
}
|
||||
|
||||
// 🔧 handleSave aufrufen mit allen Daten
|
||||
await handleSave({
|
||||
slot,
|
||||
ids: kueID,
|
||||
@@ -122,7 +117,7 @@ export default function KueEinstellung({
|
||||
isolationsgrenzwerte: updatedLimit1,
|
||||
verzoegerung: updatedDelay1,
|
||||
untereSchleifenGrenzwerte: updatedLimit2Low,
|
||||
obereSchleifenGrenzwerte: updatedLimit2Low, // ggf. anpassen, falls du später High-Werte brauchst
|
||||
obereSchleifenGrenzwerte: updatedLimit2Low,
|
||||
schleifenintervall: updatedLoopInterval,
|
||||
speicherintervall: updatedMemoryInterval,
|
||||
originalValues: {
|
||||
@@ -245,20 +240,62 @@ export default function KueEinstellung({
|
||||
</div>
|
||||
<div className="flex justify-end gap-2 p-0 rounded">
|
||||
{isAdminLoggedIn && (
|
||||
<button
|
||||
onClick={() => {
|
||||
if (
|
||||
window.confirm(
|
||||
"Warnung: Das Firmware-Update kann einige Minuten dauern und das Gerät neu starten.\nMöchten Sie wirklich fortfahren?"
|
||||
)
|
||||
) {
|
||||
firmwareUpdate(slot);
|
||||
<>
|
||||
<button
|
||||
onClick={() => setShowConfirmModal(true)}
|
||||
className="bg-littwin-blue text-white px-4 py-2 rounded flex items-center"
|
||||
>
|
||||
Firmware Update
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{showConfirmModal && (
|
||||
<ConfirmModal
|
||||
open={showConfirmModal}
|
||||
title="Firmware-Update starten?"
|
||||
message="⚠️ Das Firmware-Update kann einige Minuten dauern. Möchten Sie wirklich fortfahren?"
|
||||
onCancel={() => setShowConfirmModal(false)}
|
||||
onConfirm={async () => {
|
||||
setShowConfirmModal(false);
|
||||
toast.info("Firmware-Update gestartet. Bitte warten...");
|
||||
setIsUpdating(true);
|
||||
setProgress(0);
|
||||
|
||||
const totalDuration = 5000;
|
||||
const intervalMs = 50;
|
||||
const steps = totalDuration / intervalMs;
|
||||
let currentStep = 0;
|
||||
|
||||
const interval = setInterval(() => {
|
||||
currentStep++;
|
||||
const newProgress = Math.min((currentStep / steps) * 100, 100);
|
||||
setProgress(newProgress);
|
||||
|
||||
if (currentStep >= steps) {
|
||||
clearInterval(interval);
|
||||
setProgress(100);
|
||||
setTimeout(() => {
|
||||
toast.success(
|
||||
"✅ Firmwareupdate erfolgreich abgeschlossen."
|
||||
);
|
||||
setIsUpdating(false);
|
||||
}, 300);
|
||||
}
|
||||
}, intervalMs);
|
||||
|
||||
try {
|
||||
await firmwareUpdate(slot);
|
||||
} catch (err) {
|
||||
console.error("Firmware-Update-Fehler:", err);
|
||||
clearInterval(interval);
|
||||
toast.error("❌ Fehler beim Firmwareupdate");
|
||||
setIsUpdating(false);
|
||||
}
|
||||
}}
|
||||
className="bg-littwin-blue text-white px-4 py-2 rounded flex items-center"
|
||||
>
|
||||
Firmware Update
|
||||
</button>
|
||||
/>
|
||||
)}
|
||||
{isUpdating && (
|
||||
<ProgressModal visible={isUpdating} progress={progress} />
|
||||
)}
|
||||
<button
|
||||
onClick={() => handleDisplayEinschalten(slot)}
|
||||
|
||||
Reference in New Issue
Block a user