mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-18 11:36:17 +00:00
Update AppImage
This commit is contained in:
@@ -153,6 +153,7 @@ export function NetworkMetrics() {
|
|||||||
|
|
||||||
const [selectedInterface, setSelectedInterface] = useState<NetworkInterface | null>(null)
|
const [selectedInterface, setSelectedInterface] = useState<NetworkInterface | null>(null)
|
||||||
const [timeframe, setTimeframe] = useState<"hour" | "day" | "week" | "month" | "year">("day")
|
const [timeframe, setTimeframe] = useState<"hour" | "day" | "week" | "month" | "year">("day")
|
||||||
|
const [interfaceTimeframe, setInterfaceTimeframe] = useState<"hour" | "day" | "week" | "month" | "year">("day")
|
||||||
const [networkTotals, setNetworkTotals] = useState<{ received: number; sent: number }>({ received: 0, sent: 0 })
|
const [networkTotals, setNetworkTotals] = useState<{ received: number; sent: number }>({ received: 0, sent: 0 })
|
||||||
|
|
||||||
const { data: interfaceHistoricalData } = useSWR<any>(`/api/node/metrics?timeframe=${timeframe}`, fetcher, {
|
const { data: interfaceHistoricalData } = useSWR<any>(`/api/node/metrics?timeframe=${timeframe}`, fetcher, {
|
||||||
@@ -160,6 +161,15 @@ export function NetworkMetrics() {
|
|||||||
revalidateOnFocus: false,
|
revalidateOnFocus: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const { data: selectedInterfaceData, isLoading: interfaceDataLoading } = useSWR<any>(
|
||||||
|
selectedInterface ? `/api/network/${selectedInterface.name}/history?timeframe=${interfaceTimeframe}` : null,
|
||||||
|
fetcher,
|
||||||
|
{
|
||||||
|
refreshInterval: 30000,
|
||||||
|
revalidateOnFocus: false,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
@@ -642,6 +652,22 @@ export function NetworkMetrics() {
|
|||||||
|
|
||||||
{selectedInterface && (
|
{selectedInterface && (
|
||||||
<div className="space-y-6">
|
<div className="space-y-6">
|
||||||
|
{/* Timeframe Selector */}
|
||||||
|
<div className="flex justify-end">
|
||||||
|
<Select value={interfaceTimeframe} onValueChange={(value: any) => setInterfaceTimeframe(value)}>
|
||||||
|
<SelectTrigger className="w-[180px] bg-card border-border">
|
||||||
|
<SelectValue />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="hour">1 Hour</SelectItem>
|
||||||
|
<SelectItem value="day">24 Hours</SelectItem>
|
||||||
|
<SelectItem value="week">7 Days</SelectItem>
|
||||||
|
<SelectItem value="month">30 Days</SelectItem>
|
||||||
|
<SelectItem value="year">1 Year</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Basic Information */}
|
{/* Basic Information */}
|
||||||
<div>
|
<div>
|
||||||
<h3 className="text-sm font-semibold text-muted-foreground mb-3">Basic Information</h3>
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3">Basic Information</h3>
|
||||||
@@ -773,6 +799,39 @@ export function NetworkMetrics() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Network Traffic Chart */}
|
||||||
|
{selectedInterfaceData && (
|
||||||
|
<div>
|
||||||
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3">
|
||||||
|
Network Traffic -{" "}
|
||||||
|
{interfaceTimeframe === "hour"
|
||||||
|
? "1 Hour"
|
||||||
|
: interfaceTimeframe === "day"
|
||||||
|
? "24 Hours"
|
||||||
|
: interfaceTimeframe === "week"
|
||||||
|
? "7 Days"
|
||||||
|
: interfaceTimeframe === "month"
|
||||||
|
? "30 Days"
|
||||||
|
: "1 Year"}
|
||||||
|
</h3>
|
||||||
|
{interfaceDataLoading ? (
|
||||||
|
<div className="text-center py-8 text-muted-foreground">
|
||||||
|
<div className="text-sm">Loading historical data...</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="rounded-lg border border-border/30 bg-background/50 p-4">
|
||||||
|
<NetworkTrafficChart
|
||||||
|
timeframe={interfaceTimeframe}
|
||||||
|
interfaceName={selectedInterface.name}
|
||||||
|
onTotalsCalculated={(totals) => {
|
||||||
|
// Optional: update totals if needed
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Traffic Statistics */}
|
{/* Traffic Statistics */}
|
||||||
<div>
|
<div>
|
||||||
<h3 className="text-sm font-semibold text-muted-foreground mb-3">Traffic since last boot</h3>
|
<h3 className="text-sm font-semibold text-muted-foreground mb-3">Traffic since last boot</h3>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ interface NetworkMetricsData {
|
|||||||
|
|
||||||
interface NetworkTrafficChartProps {
|
interface NetworkTrafficChartProps {
|
||||||
timeframe: string
|
timeframe: string
|
||||||
|
interfaceName?: string // Added optional interfaceName prop for specific interface data
|
||||||
onTotalsCalculated?: (totals: { received: number; sent: number }) => void
|
onTotalsCalculated?: (totals: { received: number; sent: number }) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ const CustomNetworkTooltip = ({ active, payload, label }: any) => {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
export function NetworkTrafficChart({ timeframe, onTotalsCalculated }: NetworkTrafficChartProps) {
|
export function NetworkTrafficChart({ timeframe, interfaceName, onTotalsCalculated }: NetworkTrafficChartProps) {
|
||||||
const [data, setData] = useState<NetworkMetricsData[]>([])
|
const [data, setData] = useState<NetworkMetricsData[]>([])
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
@@ -47,7 +48,7 @@ export function NetworkTrafficChart({ timeframe, onTotalsCalculated }: NetworkTr
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchMetrics()
|
fetchMetrics()
|
||||||
}, [timeframe])
|
}, [timeframe, interfaceName])
|
||||||
|
|
||||||
const fetchMetrics = async () => {
|
const fetchMetrics = async () => {
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
@@ -56,12 +57,15 @@ export function NetworkTrafficChart({ timeframe, onTotalsCalculated }: NetworkTr
|
|||||||
try {
|
try {
|
||||||
const baseUrl =
|
const baseUrl =
|
||||||
typeof window !== "undefined" ? `${window.location.protocol}//${window.location.hostname}:8008` : ""
|
typeof window !== "undefined" ? `${window.location.protocol}//${window.location.hostname}:8008` : ""
|
||||||
const apiUrl = `${baseUrl}/api/node/metrics?timeframe=${timeframe}`
|
|
||||||
|
const apiUrl = interfaceName
|
||||||
|
? `${baseUrl}/api/network/${interfaceName}/history?timeframe=${timeframe}`
|
||||||
|
: `${baseUrl}/api/node/metrics?timeframe=${timeframe}`
|
||||||
|
|
||||||
const response = await fetch(apiUrl)
|
const response = await fetch(apiUrl)
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`Failed to fetch node metrics: ${response.status}`)
|
throw new Error(`Failed to fetch network metrics: ${response.status}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await response.json()
|
const result = await response.json()
|
||||||
|
|||||||
Reference in New Issue
Block a user