scottk/OptimCloud-gw-ui
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/OptimCloud-gw-ui.git synced 2025-10-30 01:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #179 from stephb9959/dev

Browse Source 
2.6.13
This commit is contained in:
Charles
2022-04-05 19:41:41 +01:00
committed by GitHub
parent 6eaa9f8af1 6bec9f977f
commit 921d234972
3 changed files with 12 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "ucentral-client",
"version": "2.6.12",
"version": "2.6.13",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "ucentral-client",
"version": "2.6.12",
"version": "2.6.13",
"dependencies": {
"@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1",

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "ucentral-client",
"version": "2.6.12",
"version": "2.6.13",
"dependencies": {
"@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1",

47
src/components/InterfaceStatistics/StatisticsChartList.js
View File

@@ -130,48 +130,19 @@ const StatisticsChartList = ({ setOptions, section, setStart, setEnd, time }) =>
// Looping through the interfaces of the log
const version = log.data.version ?? 0;
for (const inter of log.data.interfaces) {
if (inter.ssids?.length > 0) {
let totalTx = 0;
let totalRx = 0;
for (const ssid of inter.ssids) {
if (ssid.associations) {
for (const assoc of ssid.associations) {
if (version === 0) {
if (assoc.deltas) {
totalTx += Math.max(0, assoc.deltas?.tx_bytes ?? 0);
totalRx += Math.max(0, assoc.deltas?.rx_bytes ?? 0);
} else {
totalTx += Math.max(0, assoc.tx_bytes ?? 0);
totalRx += Math.max(0, assoc.rx_bytes ?? 0);
}
} else {
totalTx += Math.max(0, assoc.tx_bytes ?? 0);
totalRx += Math.max(0, assoc.rx_bytes ?? 0);
}
}
}
}
if (version > 0) {
const tx = Math.floor(totalTx / 1024);
const rx = Math.floor(totalRx / 1024);
interfaceList[interfaceTypes[inter.name]][0].data.push(Math.max(0, tx - prevTx));
interfaceList[interfaceTypes[inter.name]][1].data.push(Math.max(0, rx - prevRx));
prevTx = tx;
prevRx = rx;
} else {
interfaceList[interfaceTypes[inter.name]][0].data.push(
Math.max(0, Math.floor(totalTx / 1024)),
);
interfaceList[interfaceTypes[inter.name]][1].data.push(
Math.max(0, Math.floor(totalRx / 1024)),
);
}
if (version > 0) {
const tx = inter.counters ? Math.floor(inter.counters.tx_bytes) : 0;
const rx = inter.counters ? Math.floor(inter.counters.rx_bytes) : 0;
interfaceList[interfaceTypes[inter.name]][0].data.push(tx - prevTx);
interfaceList[interfaceTypes[inter.name]][1].data.push(rx - prevRx);
prevTx = tx;
prevRx = rx;
} else {
interfaceList[interfaceTypes[inter.name]][0].data.push(
inter.counters ? Math.max(0, Math.floor(inter.counters.tx_bytes)) : 0,
inter.counters ? Math.floor(inter.counters.tx_bytes) : 0,
);
interfaceList[interfaceTypes[inter.name]][1].data.push(
inter.counters ? Math.max(0, Math.floor(inter.counters.rx_bytes)) : 0,
inter.counters ? Math.floor(inter.counters.rx_bytes) : 0,
);
}
}