mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-10-11 12:26:18 +00:00
Update hardware.tsx
This commit is contained in:
@@ -61,45 +61,55 @@ export default function Hardware() {
|
|||||||
|
|
||||||
const [selectedGPU, setSelectedGPU] = useState<GPU | null>(null)
|
const [selectedGPU, setSelectedGPU] = useState<GPU | null>(null)
|
||||||
const [realtimeGPUData, setRealtimeGPUData] = useState<any>(null)
|
const [realtimeGPUData, setRealtimeGPUData] = useState<any>(null)
|
||||||
const [loadingGPUData, setLoadingGPUData] = useState(false)
|
const [detailsLoading, setDetailsLoading] = useState(false)
|
||||||
const [selectedPCIDevice, setSelectedPCIDevice] = useState<PCIDevice | null>(null)
|
const [selectedPCIDevice, setSelectedPCIDevice] = useState<PCIDevice | null>(null)
|
||||||
const [selectedDisk, setSelectedDisk] = useState<StorageDevice | null>(null)
|
const [selectedDisk, setSelectedDisk] = useState<StorageDevice | null>(null)
|
||||||
const [selectedNetwork, setSelectedNetwork] = useState<PCIDevice | null>(null)
|
const [selectedNetwork, setSelectedNetwork] = useState<PCIDevice | null>(null)
|
||||||
|
|
||||||
const handleGPUClick = async (gpu: GPU) => {
|
const handleGPUClick = async (gpu: GPU) => {
|
||||||
setLoadingGPUData(true)
|
console.log("[v0] GPU clicked:", gpu.name)
|
||||||
setSelectedGPU(gpu)
|
console.log("[v0] GPU slot:", gpu.slot)
|
||||||
setRealtimeGPUData(null)
|
|
||||||
|
|
||||||
const pciDevice = findPCIDeviceForGPU(gpu)
|
const pciDevice = findPCIDeviceForGPU(gpu)
|
||||||
const fullSlot = pciDevice?.slot || gpu.slot
|
const fullSlot = pciDevice?.slot || gpu.slot
|
||||||
|
|
||||||
// Validar que el slot no esté vacío
|
console.log("[v0] Full PCI slot:", fullSlot)
|
||||||
|
|
||||||
|
setSelectedGPU(gpu)
|
||||||
|
setDetailsLoading(true)
|
||||||
|
setRealtimeGPUData(null)
|
||||||
|
|
||||||
|
console.log("[v0] Modal opened, fetching realtime data...")
|
||||||
|
|
||||||
if (!fullSlot) {
|
if (!fullSlot) {
|
||||||
console.error("[v0] GPU slot is empty, cannot fetch real-time data")
|
console.log("[v0] No slot found, showing basic info only")
|
||||||
setRealtimeGPUData({ has_monitoring_tool: false })
|
setDetailsLoading(false)
|
||||||
setLoadingGPUData(false)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
console.log("[v0] Fetching real-time GPU data for slot:", fullSlot)
|
|
||||||
const response = await fetch(`http://localhost:8008/api/gpu/${fullSlot}/realtime`, {
|
const response = await fetch(`http://localhost:8008/api/gpu/${fullSlot}/realtime`, {
|
||||||
signal: AbortSignal.timeout(6000),
|
method: "GET",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
signal: AbortSignal.timeout(10000),
|
||||||
})
|
})
|
||||||
if (response.ok) {
|
|
||||||
const data = await response.json()
|
if (!response.ok) {
|
||||||
console.log("[v0] Real-time GPU data received:", data)
|
console.log("[v0] API response not OK:", response.status)
|
||||||
setRealtimeGPUData(data)
|
throw new Error(`HTTP error! status: ${response.status}`)
|
||||||
} else {
|
|
||||||
console.log("[v0] Failed to fetch real-time GPU data:", response.status)
|
|
||||||
setRealtimeGPUData({ has_monitoring_tool: false })
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const data = await response.json()
|
||||||
|
console.log("[v0] Realtime GPU data received:", data)
|
||||||
|
setRealtimeGPUData(data)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[v0] Error fetching real-time GPU data:", error)
|
console.error("[v0] Error fetching GPU realtime data:", error)
|
||||||
setRealtimeGPUData({ has_monitoring_tool: false })
|
setRealtimeGPUData({ has_monitoring_tool: false })
|
||||||
} finally {
|
} finally {
|
||||||
setLoadingGPUData(false)
|
setDetailsLoading(false)
|
||||||
|
console.log("[v0] Finished loading GPU data")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -380,32 +390,9 @@ export default function Hardware() {
|
|||||||
</Card>
|
</Card>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* GPU Detail Modal - Shows immediately with basic info, then loads real-time data */}
|
||||||
<Dialog
|
<Dialog
|
||||||
open={loadingGPUData}
|
open={selectedGPU !== null}
|
||||||
onOpenChange={() => {
|
|
||||||
// Prevent closing while loading
|
|
||||||
if (!loadingGPUData) {
|
|
||||||
setSelectedGPU(null)
|
|
||||||
setRealtimeGPUData(null)
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<DialogContent className="max-w-md">
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle className="flex items-center gap-2">
|
|
||||||
<Loader2 className="h-5 w-5 animate-spin text-primary" />
|
|
||||||
Loading GPU Data
|
|
||||||
</DialogTitle>
|
|
||||||
<DialogDescription>Fetching real-time monitoring information...</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
<div className="flex items-center justify-center py-8">
|
|
||||||
<Loader2 className="h-12 w-12 animate-spin text-primary" />
|
|
||||||
</div>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
|
|
||||||
<Dialog
|
|
||||||
open={selectedGPU !== null && !loadingGPUData && realtimeGPUData !== null}
|
|
||||||
onOpenChange={() => {
|
onOpenChange={() => {
|
||||||
setSelectedGPU(null)
|
setSelectedGPU(null)
|
||||||
setRealtimeGPUData(null)
|
setRealtimeGPUData(null)
|
||||||
@@ -414,22 +401,18 @@ export default function Hardware() {
|
|||||||
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
|
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
|
||||||
{selectedGPU && (
|
{selectedGPU && (
|
||||||
<>
|
<>
|
||||||
{hasRealtimeData()
|
<DialogHeader className="pb-4 border-b border-border">
|
||||||
? // Advanced modal with real-time data
|
|
||||||
(() => {
|
|
||||||
const pciDevice = findPCIDeviceForGPU(selectedGPU)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>{selectedGPU.name}</DialogTitle>
|
<DialogTitle>{selectedGPU.name}</DialogTitle>
|
||||||
<DialogDescription>Real-Time GPU Monitoring</DialogDescription>
|
<DialogDescription>
|
||||||
|
{detailsLoading ? "Loading real-time monitoring data..." : "GPU Information"}
|
||||||
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
<div className="space-y-4">
|
<div className="space-y-6 py-4">
|
||||||
{/* Basic Information */}
|
<div>
|
||||||
<div className="space-y-2">
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
|
||||||
<h3 className="font-semibold text-sm">Basic Information</h3>
|
Basic Information
|
||||||
|
</h3>
|
||||||
<div className="grid gap-2">
|
<div className="grid gap-2">
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
<div className="flex justify-between border-b border-border/50 pb-2">
|
||||||
<span className="text-sm text-muted-foreground">Vendor</span>
|
<span className="text-sm text-muted-foreground">Vendor</span>
|
||||||
@@ -441,30 +424,40 @@ export default function Hardware() {
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
<div className="flex justify-between border-b border-border/50 pb-2">
|
||||||
<span className="text-sm text-muted-foreground">PCI Slot</span>
|
<span className="text-sm text-muted-foreground">PCI Slot</span>
|
||||||
<span className="font-mono text-sm">{pciDevice?.slot || selectedGPU.slot}</span>
|
<span className="font-mono text-sm">
|
||||||
|
{findPCIDeviceForGPU(selectedGPU)?.slot || selectedGPU.slot}
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{(pciDevice?.driver || selectedGPU.pci_driver) && (
|
{(findPCIDeviceForGPU(selectedGPU)?.driver || selectedGPU.pci_driver) && (
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
<div className="flex justify-between border-b border-border/50 pb-2">
|
||||||
<span className="text-sm text-muted-foreground">Driver</span>
|
<span className="text-sm text-muted-foreground">Driver</span>
|
||||||
<span className="font-mono text-sm text-green-500">
|
<span className="font-mono text-sm text-green-500">
|
||||||
{pciDevice?.driver || selectedGPU.pci_driver}
|
{findPCIDeviceForGPU(selectedGPU)?.driver || selectedGPU.pci_driver}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{(pciDevice?.kernel_module || selectedGPU.pci_kernel_module) && (
|
{(findPCIDeviceForGPU(selectedGPU)?.kernel_module || selectedGPU.pci_kernel_module) && (
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
<div className="flex justify-between border-b border-border/50 pb-2">
|
||||||
<span className="text-sm text-muted-foreground">Kernel Module</span>
|
<span className="text-sm text-muted-foreground">Kernel Module</span>
|
||||||
<span className="font-mono text-sm">
|
<span className="font-mono text-sm">
|
||||||
{pciDevice?.kernel_module || selectedGPU.pci_kernel_module}
|
{findPCIDeviceForGPU(selectedGPU)?.kernel_module || selectedGPU.pci_kernel_module}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Real-Time Metrics */}
|
{detailsLoading ? (
|
||||||
<div className="space-y-2">
|
<div className="text-center py-8 text-muted-foreground">
|
||||||
<h3 className="font-semibold text-sm">Real-Time Metrics</h3>
|
<Loader2 className="h-8 w-8 animate-spin mx-auto mb-2 text-primary" />
|
||||||
|
<p>Loading real-time monitoring data...</p>
|
||||||
|
</div>
|
||||||
|
) : realtimeGPUData?.has_monitoring_tool === true ? (
|
||||||
|
<>
|
||||||
|
<div>
|
||||||
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
|
||||||
|
Real-Time Metrics
|
||||||
|
</h3>
|
||||||
<div className="grid gap-2">
|
<div className="grid gap-2">
|
||||||
{realtimeGPUData.temperature !== undefined && realtimeGPUData.temperature !== null ? (
|
{realtimeGPUData.temperature !== undefined && realtimeGPUData.temperature !== null ? (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
@@ -483,8 +476,7 @@ export default function Hardware() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{realtimeGPUData.utilization_gpu !== undefined &&
|
{realtimeGPUData.utilization_gpu !== undefined && realtimeGPUData.utilization_gpu !== null ? (
|
||||||
realtimeGPUData.utilization_gpu !== null ? (
|
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<span className="text-sm text-muted-foreground">GPU Utilization</span>
|
<span className="text-sm text-muted-foreground">GPU Utilization</span>
|
||||||
@@ -545,16 +537,16 @@ export default function Hardware() {
|
|||||||
realtimeGPUData.engine_blitter !== undefined ||
|
realtimeGPUData.engine_blitter !== undefined ||
|
||||||
realtimeGPUData.engine_video !== undefined ||
|
realtimeGPUData.engine_video !== undefined ||
|
||||||
realtimeGPUData.engine_video_enhance !== undefined) && (
|
realtimeGPUData.engine_video_enhance !== undefined) && (
|
||||||
<div className="space-y-2">
|
<div>
|
||||||
<h3 className="font-semibold text-sm">Engine Utilization</h3>
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
|
||||||
|
Engine Utilization
|
||||||
|
</h3>
|
||||||
<div className="grid gap-2">
|
<div className="grid gap-2">
|
||||||
{realtimeGPUData.engine_render !== undefined && (
|
{realtimeGPUData.engine_render !== undefined && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<span className="text-sm text-muted-foreground">Render/3D</span>
|
<span className="text-sm text-muted-foreground">Render/3D</span>
|
||||||
<span className="text-sm font-medium">
|
<span className="text-sm font-medium">{realtimeGPUData.engine_render.toFixed(2)}%</span>
|
||||||
{realtimeGPUData.engine_render.toFixed(2)}%
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<Progress value={realtimeGPUData.engine_render} className="h-2" />
|
<Progress value={realtimeGPUData.engine_render} className="h-2" />
|
||||||
</div>
|
</div>
|
||||||
@@ -574,9 +566,7 @@ export default function Hardware() {
|
|||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<span className="text-sm text-muted-foreground">Video</span>
|
<span className="text-sm text-muted-foreground">Video</span>
|
||||||
<span className="text-sm font-medium">
|
<span className="text-sm font-medium">{realtimeGPUData.engine_video.toFixed(2)}%</span>
|
||||||
{realtimeGPUData.engine_video.toFixed(2)}%
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<Progress value={realtimeGPUData.engine_video} className="h-2" />
|
<Progress value={realtimeGPUData.engine_video} className="h-2" />
|
||||||
</div>
|
</div>
|
||||||
@@ -598,8 +588,10 @@ export default function Hardware() {
|
|||||||
|
|
||||||
{/* Memory Info */}
|
{/* Memory Info */}
|
||||||
{realtimeGPUData.memory_total && (
|
{realtimeGPUData.memory_total && (
|
||||||
<div className="space-y-2">
|
<div>
|
||||||
<h3 className="font-semibold text-sm">Memory</h3>
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
|
||||||
|
Memory
|
||||||
|
</h3>
|
||||||
<div className="grid gap-2">
|
<div className="grid gap-2">
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
<div className="flex justify-between border-b border-border/50 pb-2">
|
||||||
<span className="text-sm text-muted-foreground">Total</span>
|
<span className="text-sm text-muted-foreground">Total</span>
|
||||||
@@ -628,8 +620,10 @@ export default function Hardware() {
|
|||||||
|
|
||||||
{/* Running Processes (NVIDIA) */}
|
{/* Running Processes (NVIDIA) */}
|
||||||
{realtimeGPUData.processes && realtimeGPUData.processes.length > 0 && (
|
{realtimeGPUData.processes && realtimeGPUData.processes.length > 0 && (
|
||||||
<div className="space-y-2">
|
<div>
|
||||||
<h3 className="font-semibold text-sm">Running Processes</h3>
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3 uppercase tracking-wide">
|
||||||
|
Running Processes
|
||||||
|
</h3>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{realtimeGPUData.processes.map((proc: any, idx: number) => (
|
{realtimeGPUData.processes.map((proc: any, idx: number) => (
|
||||||
<div key={idx} className="rounded-lg border border-border/30 bg-background/50 p-3">
|
<div key={idx} className="rounded-lg border border-border/30 bg-background/50 p-3">
|
||||||
@@ -643,74 +637,9 @@ export default function Hardware() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
|
||||||
</>
|
</>
|
||||||
)
|
) : (
|
||||||
})()
|
<div className="rounded-lg bg-blue-500/10 p-4 border border-blue-500/20">
|
||||||
: // Basic modal without real-time data
|
|
||||||
(() => {
|
|
||||||
const pciDevice = findPCIDeviceForGPU(selectedGPU)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>{selectedGPU.name}</DialogTitle>
|
|
||||||
<DialogDescription>PCI Device Information</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
|
|
||||||
<div className="space-y-3">
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Device Type</span>
|
|
||||||
<Badge className={getDeviceTypeColor("graphics")}>Graphics Card</Badge>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">PCI Slot</span>
|
|
||||||
<span className="font-mono text-sm">{pciDevice?.slot || selectedGPU.slot}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Device Name</span>
|
|
||||||
<span className="text-sm text-right">{selectedGPU.name}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Vendor</span>
|
|
||||||
<span className="text-sm">{selectedGPU.vendor}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{(pciDevice?.class || selectedGPU.pci_class) && (
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Class</span>
|
|
||||||
<span className="font-mono text-sm">{pciDevice?.class || selectedGPU.pci_class}</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{(pciDevice?.driver || selectedGPU.pci_driver) && (
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Driver</span>
|
|
||||||
<span className="font-mono text-sm text-green-500">
|
|
||||||
{pciDevice?.driver || selectedGPU.pci_driver}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{(pciDevice?.kernel_module || selectedGPU.pci_kernel_module) && (
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Kernel Module</span>
|
|
||||||
<span className="font-mono text-sm">
|
|
||||||
{pciDevice?.kernel_module || selectedGPU.pci_kernel_module}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="flex justify-between border-b border-border/50 pb-2">
|
|
||||||
<span className="text-sm font-medium text-muted-foreground">Type</span>
|
|
||||||
<span className="text-sm">{selectedGPU.type}</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{realtimeGPUData?.has_monitoring_tool === false && (
|
|
||||||
<div className="mt-4 rounded-lg bg-blue-500/10 p-4 border border-blue-500/20">
|
|
||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<div className="flex-shrink-0">
|
<div className="flex-shrink-0">
|
||||||
<svg className="h-5 w-5 text-blue-500" fill="currentColor" viewBox="0 0 20 20">
|
<svg className="h-5 w-5 text-blue-500" fill="currentColor" viewBox="0 0 20 20">
|
||||||
@@ -722,9 +651,7 @@ export default function Hardware() {
|
|||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h4 className="text-sm font-semibold text-blue-500 mb-1">
|
<h4 className="text-sm font-semibold text-blue-500 mb-1">Extended Monitoring Not Available</h4>
|
||||||
Extended Monitoring Not Available
|
|
||||||
</h4>
|
|
||||||
<p className="text-sm text-muted-foreground">
|
<p className="text-sm text-muted-foreground">
|
||||||
{getMonitoringToolRecommendation(selectedGPU.vendor)}
|
{getMonitoringToolRecommendation(selectedGPU.vendor)}
|
||||||
</p>
|
</p>
|
||||||
@@ -734,9 +661,6 @@ export default function Hardware() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)
|
|
||||||
})()}
|
|
||||||
</>
|
|
||||||
)}
|
)}
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
|
Reference in New Issue
Block a user