scottk/wlan-cloud-ui
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ui.git synced 2025-10-31 02:37:54 +00:00
Code Issues Packages Projects Releases 7 Wiki Activity

hotfix/WIFI-1043: Usage info on dashboard shows total sum of traffic

Browse Source
This commit is contained in:
chris-cosentino
2020-11-05 13:53:19 -05:00
parent ac405ae1c4
commit d9a970350b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/containers/Dashboard/index.js
View File

@@ -41,7 +41,7 @@ const lineChartConfig = [
{ key: 'clientDevices', title: 'Client Devices (24 hours)' }, { key: 'clientDevices', title: 'Client Devices (24 hours)' },
{ {
key: 'traffic', key: 'traffic',
title: 'Traffic (24 hours)', title: 'Usage Information (24 hours)',
options: { formatter: trafficLabelFormatter, tooltipFormatter: trafficTooltipFormatter }, options: { formatter: trafficLabelFormatter, tooltipFormatter: trafficTooltipFormatter },
}, },
]; ];
@@ -88,6 +88,9 @@ const Dashboard = () => {
}, },
}); });
const [totalUpstreamTraffic, setTotalUpstreamTraffic] = useState(0);
const [totalDownstreamTraffic, setTotalDownstreamTraffic] = useState(0);
const { loading: metricsLoading, error: metricsError, data: metricsData, fetchMore } = useQuery( const { loading: metricsLoading, error: metricsError, data: metricsData, fetchMore } = useQuery(
FILTER_SYSTEM_EVENTS, FILTER_SYSTEM_EVENTS,
{ {
@@ -110,7 +113,6 @@ const Dashboard = () => {
const clientDevices5GHz = []; const clientDevices5GHz = [];
const trafficBytesDownstreamData = []; const trafficBytesDownstreamData = [];
const trafficBytesUpstreamData = []; const trafficBytesUpstreamData = [];
list.forEach( list.forEach(
({ ({
eventTimestamp, eventTimestamp,
@@ -135,6 +137,9 @@ const Dashboard = () => {
trafficBytesDownstreamData.push([eventTimestamp, trafficBytesDownstream]); trafficBytesDownstreamData.push([eventTimestamp, trafficBytesDownstream]);
trafficBytesUpstreamData.push([eventTimestamp, trafficBytesUpstream]); trafficBytesUpstreamData.push([eventTimestamp, trafficBytesUpstream]);
setTotalUpstreamTraffic(previous => previous + trafficBytesUpstream);
setTotalDownstreamTraffic(previous => previous + trafficBytesDownstream);
} }
); );
@@ -197,14 +202,11 @@ const Dashboard = () => {
const statsArr = useMemo(() => { const statsArr = useMemo(() => {
const status = data?.getAllStatus?.items[0]?.detailsJSON || {}; const status = data?.getAllStatus?.items[0]?.detailsJSON || {};
const { const {
associatedClientsCountPerRadio, associatedClientsCountPerRadio,
totalProvisionedEquipment, totalProvisionedEquipment,
equipmentInServiceCount, equipmentInServiceCount,
equipmentWithClientsCount, equipmentWithClientsCount,
trafficBytesDownstream,
trafficBytesUpstream,
} = status; } = status;
const clientRadios = {}; const clientRadios = {};
@@ -238,8 +240,8 @@ const Dashboard = () => {
}, },
{ {
title: 'Usage Information', title: 'Usage Information',
'Total Traffic (US)': formatBytes(trafficBytesUpstream), 'Total Traffic (US)': formatBytes(totalUpstreamTraffic),
'Total Traffic (DS)': formatBytes(trafficBytesDownstream), 'Total Traffic (DS)': formatBytes(totalDownstreamTraffic),
}, },
]; ];
}, [data]); }, [data]);