Merge pull request #72 from Telecominfraproject/hotfix/WIFI-1043

hotfix/WIFI-1043: Usage info on dashboard shows total sum of traffic
This commit is contained in:
Sean Macfarlane
2020-11-05 16:16:28 -05:00
committed by GitHub

View File

@@ -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,
{ {
@@ -135,6 +138,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);
} }
); );
@@ -203,8 +209,6 @@ const Dashboard = () => {
totalProvisionedEquipment, totalProvisionedEquipment,
equipmentInServiceCount, equipmentInServiceCount,
equipmentWithClientsCount, equipmentWithClientsCount,
trafficBytesDownstream,
trafficBytesUpstream,
} = status; } = status;
const clientRadios = {}; const clientRadios = {};
@@ -237,9 +241,9 @@ const Dashboard = () => {
...clientRadios, ...clientRadios,
}, },
{ {
title: 'Usage Information', title: 'Usage Information (24 hours)',
'Total Traffic (US)': formatBytes(trafficBytesUpstream), 'Total Traffic (US)': formatBytes(totalUpstreamTraffic),
'Total Traffic (DS)': formatBytes(trafficBytesDownstream), 'Total Traffic (DS)': formatBytes(totalDownstreamTraffic),
}, },
]; ];
}, [data]); }, [data]);