diff --git a/package.json b/package.json index 07527d8..499909a 100644 --- a/package.json +++ b/package.json @@ -86,8 +86,8 @@ "test": "react-scripts test --env=jsdom", "coverage": "react-scripts test --env=jsdom --coverage", "eject": "react-scripts eject", - "format": "prettier --write \"src/**/*.tsx\"", - "check-format": "prettier --list-different \"src/**/*.tsx\"" + "format": "prettier --write \"**/*.{js,tsx}\"", + "check-format": "prettier --list-different \"**/*.{js,tsx}\"" }, "browserslist": [ ">0.2%", diff --git a/scripts/generate-language-list.js b/scripts/generate-language-list.js index 292da56..0e7e2c0 100644 --- a/scripts/generate-language-list.js +++ b/scripts/generate-language-list.js @@ -15,9 +15,9 @@ const ISO6391 = require("iso-639-1"); const languages = fs.readdirSync("public/i18n"); const languageMap = languages.map(lang => { return { - "code": lang, - "name": ISO6391.getName(lang) - } + code: lang, + name: ISO6391.getName(lang) + }; }); // Save the language list so the web interface knows what's available diff --git a/scripts/make-fake-data.js b/scripts/make-fake-data.js index 1ef623c..20fc316 100644 --- a/scripts/make-fake-data.js +++ b/scripts/make-fake-data.js @@ -56,8 +56,8 @@ function history(length) { client: isHostname ? faker.internet.domainWord() + ".local" : isIPv4 - ? faker.internet.ip() - : faker.internet.ipv6(), + ? faker.internet.ip() + : faker.internet.ipv6(), dnssec: Math.floor(Math.random() * 5.9), reply: Math.floor(Math.random() * 7.9), response_time: Math.floor(Math.random() * 100.9) @@ -87,6 +87,7 @@ function summary() { return { gravity_size: faker.random.number(), + sum_queries: total, total_queries: { A: queryTypeTotals[0], AAAA: queryTypeTotals[1], @@ -380,7 +381,7 @@ function getPreferences() { return { layout: "boxed", language: "en" - } + }; } console.log("Deleting old fake API data..."); @@ -411,14 +412,20 @@ write("public/fakeAPI/stats/top_domains", topDomains(10)); write("public/fakeAPI/stats/top_clients", topClients(10)); write("public/fakeAPI/stats/top_blocked_clients", topBlockedClients(10)); write("public/fakeAPI/stats/database/overTime/history", historyOverTime(144)); -write("public/fakeAPI/stats/database/overTime/clients", clientsOverTime(144, 5)); +write( + "public/fakeAPI/stats/database/overTime/clients", + clientsOverTime(144, 5) +); write("public/fakeAPI/stats/database/summary", summary()); write("public/fakeAPI/stats/database/query_types", queryTypes()); write("public/fakeAPI/stats/database/upstreams", upstreams(3)); write("public/fakeAPI/stats/database/top_blocked", topBlockedDomains(10)); write("public/fakeAPI/stats/database/top_domains", topDomains(10)); write("public/fakeAPI/stats/database/top_clients", topClients(10)); -write("public/fakeAPI/stats/database/top_blocked_clients", topBlockedClients(10)); +write( + "public/fakeAPI/stats/database/top_blocked_clients", + topBlockedClients(10) +); write("public/fakeAPI/auth", auth()); write("public/fakeAPI/version", getVersionInfo()); diff --git a/src/components/dashboard/SummaryStats.tsx b/src/components/dashboard/SummaryStats.tsx index f2b9a57..d26d771 100644 --- a/src/components/dashboard/SummaryStats.tsx +++ b/src/components/dashboard/SummaryStats.tsx @@ -96,9 +96,7 @@ class SummaryStats extends Component { * @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(), diff --git a/src/components/dashboard/__tests__/SummaryStats.test.tsx b/src/components/dashboard/__tests__/SummaryStats.test.tsx index a5e9907..0bc6474 100644 --- a/src/components/dashboard/__tests__/SummaryStats.test.tsx +++ b/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, diff --git a/src/types/api.d.ts b/src/types/api.d.ts index 885f083..0afb2cd 100644 --- a/src/types/api.d.ts +++ b/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;