Merge pull request #445 from pi-hole/tweak/sum_queries

Use new field "sum_queries"

scripts/make-fake-data.js

@@ -87,6 +87,7 @@ function summary() {
 
   return {
     gravity_size: faker.random.number(),
+    sum_queries: total,
     total_queries: {
       A: queryTypeTotals[0],
       AAAA: queryTypeTotals[1],

src/components/dashboard/SummaryStats.tsx

@@ -96,9 +96,7 @@ class SummaryStats extends Component<SummaryStatsProps & WithTranslation, {}> {
  * @returns {*} the transformed props
  */
 export const transformData = (data: ApiSummary): SummaryStatsProps => ({
-  totalQueries: Object.keys(data.total_queries)
-    .reduce((total, queryType) => total + data.total_queries[queryType], 0)
-    .toLocaleString(),
+  totalQueries: data.sum_queries.toLocaleString(),
   blockedQueries: data.blocked_queries.toLocaleString(),
   percentBlocked: data.percent_blocked.toFixed(2).toLocaleString() + "%",
   gravityDomains: data.gravity_size.toLocaleString(),

src/components/dashboard/__tests__/SummaryStats.test.tsx

@@ -20,6 +20,7 @@ const tick = global.tick;
 
 const fakeData: ApiSummary = {
   active_clients: 2,
+  sum_queries: 22813,
   blocked_queries: 2281,
   cached_queries: 3573,
   forwarded_queries: 19154,

src/types/api.d.ts

@@ -134,6 +134,7 @@ interface ApiQueryType {
 
 interface ApiSummary {
   gravity_size: number;
+  sum_queries: number;
   total_queries: {
     A: number;
     AAAA: number;