From 1481626b1b7d7cdfacee6e36dda90758e6ece1d6 Mon Sep 17 00:00:00 2001
From: Charles <charles.bourque96@gmail.com>
Date: Tue, 18 Jan 2022 14:36:42 +0100
Subject: [PATCH] 2.5.29: fixes for statistics graphs

---
 package-lock.json                             |  4 +-
 package.json                                  |  2 +-
 .../StatisticsChartList.js                    | 42 +++++++++----------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c162bec..fb5c2a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.5.28",
+  "version": "2.5.29",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.5.28",
+      "version": "2.5.29",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
diff --git a/package.json b/package.json
index c5c3ff6..859211e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.5.28",
+  "version": "2.5.29",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
diff --git a/src/components/InterfaceStatistics/StatisticsChartList.js b/src/components/InterfaceStatistics/StatisticsChartList.js
index e40c0bc..54b68f4 100644
--- a/src/components/InterfaceStatistics/StatisticsChartList.js
+++ b/src/components/InterfaceStatistics/StatisticsChartList.js
@@ -117,35 +117,31 @@ const StatisticsChartList = ({ setOptions, section, setStart, setEnd, time }) =>
     for (const log of sortedData) {
       // Looping through the interfaces of the log
       for (const inter of log.data.interfaces) {
-        if (inter.counters) {
-          interfaceList[interfaceTypes[inter.name]][0].data.push(
-            inter.counters?.tx_bytes ? Math.floor(inter.counters.tx_bytes / 1024) : 0,
-          );
-          interfaceList[interfaceTypes[inter.name]][1].data.push(
-            inter.counters?.rx_bytes ? Math.floor(inter.counters.rx_bytes / 1024) : 0,
-          );
-        } else if (
-          inter.ssids.length > 0 &&
-          inter.ssids[0].associations.length > 0 &&
-          inter.ssids[0].associations[0].deltas
-        ) {
+        if (inter.ssids?.length > 0) {
           let totalTx = 0;
           let totalRx = 0;
-
           for (const ssid of inter.ssids) {
-            for (const assoc of ssid.associations) {
-              totalTx += assoc.deltas?.tx_bytes ?? 0;
-              totalRx += assoc.deltas?.rx_bytes ?? 0;
+            if (ssid.associations) {
+              for (const assoc of ssid.associations) {
+                if (assoc.deltas) {
+                  totalTx += assoc.deltas?.tx_bytes ?? 0;
+                  totalRx += assoc.deltas?.rx_bytes ?? 0;
+                } else {
+                  totalTx += assoc.counters?.tx_bytes ?? 0;
+                  totalRx += assoc.counters?.rx_bytes ?? 0;
+                }
+              }
             }
           }
-          totalTx = Math.floor(totalTx / 1024);
-          totalRx = Math.floor(totalRx / 1024);
-
-          interfaceList[interfaceTypes[inter.name]][0].data.push(totalTx);
-          interfaceList[interfaceTypes[inter.name]][1].data.push(totalRx);
+          interfaceList[interfaceTypes[inter.name]][0].data.push(Math.floor(totalTx / 1024));
+          interfaceList[interfaceTypes[inter.name]][1].data.push(Math.floor(totalRx / 1024));
         } else {
-          interfaceList[interfaceTypes[inter.name]][0].data.push(0);
-          interfaceList[interfaceTypes[inter.name]][1].data.push(0);
+          interfaceList[interfaceTypes[inter.name]][0].data.push(
+            inter.counters ? Math.floor(inter.counters.tx_bytes) : 0,
+          );
+          interfaceList[interfaceTypes[inter.name]][1].data.push(
+            inter.counters ? Math.floor(inter.counters.rx_bytes) : 0,
+          );
         }
       }
     }