diff --git a/app/(main)/traffic/page.tsx b/app/(main)/traffic/page.tsx index a12551b2..8fb12402 100644 --- a/app/(main)/traffic/page.tsx +++ b/app/(main)/traffic/page.tsx @@ -762,8 +762,8 @@ const toLiveServer = (s: LiveTrafficServer): ServerTraffic => { rxTotal: s.rxTotal, txTotal: s.txTotal, sessions: s.sessions, - rxSeries: s.rxSeries.length ? s.rxSeries : Array(60).fill(0), - txSeries: s.txSeries.length ? s.txSeries : Array(60).fill(0), + rxSeries: s.rxSeries, + txSeries: s.txSeries, boundIfaces: [], } } @@ -771,8 +771,8 @@ const toLiveServer = (s: LiveTrafficServer): ServerTraffic => { const toLiveBound = (c: BoundIfaceTraffic): BoundIfaceTraffic => ({ ...c, interfaceType: (["ether", "gre", "wg", "other"].includes(c.interfaceType) ? c.interfaceType : "other") as InterfaceType, - rxSeries: c.rxSeries.length ? c.rxSeries : Array(60).fill(0), - txSeries: c.txSeries.length ? c.txSeries : Array(60).fill(0), + rxSeries: c.rxSeries, + txSeries: c.txSeries, }) const toLiveUser = (u: UserTraffic & { interfaces?: BoundIfaceTraffic[] }): UserTraffic => { @@ -781,8 +781,8 @@ const toLiveUser = (u: UserTraffic & { interfaces?: BoundIfaceTraffic[] }): User ...u, role: ROLE_LABEL[u.role as keyof typeof ROLE_LABEL] ?? u.role, interfaces: ifaces, - rxSeries: u.rxSeries.length ? u.rxSeries : Array(60).fill(0), - txSeries: u.txSeries.length ? u.txSeries : Array(60).fill(0), + rxSeries: u.rxSeries, + txSeries: u.txSeries, } } diff --git a/components/reui-kit/traffic-rx-tx-chart.tsx b/components/reui-kit/traffic-rx-tx-chart.tsx index 8ed4d624..7f6f039d 100644 --- a/components/reui-kit/traffic-rx-tx-chart.tsx +++ b/components/reui-kit/traffic-rx-tx-chart.tsx @@ -60,8 +60,8 @@ function toChartData(rx: number[], tx: number[], rangeMinutes: number) { const minutesAgo = Math.round((1 - i / denom) * rangeMinutes) return { time: formatRangeAgo(minutesAgo), - rx: rx[i] ?? 0, - tx: tx[i] ?? 0, + rx: Number.isFinite(rx[i]) && rx[i] >= 0 ? rx[i] : null, + tx: Number.isFinite(tx[i]) && tx[i] >= 0 ? tx[i] : null, } }) } @@ -82,8 +82,11 @@ export function TrafficRxTxChart({ const data = toChartData(rx, tx, rangeMinutes) const tickEvery = Math.max(1, Math.ceil(data.length / 6)) - const chart = ( -
Нет исторических измерений за выбранный период
+ ) : ( +