From 2b55e56306284105876d38508c245b491ba2eafe Mon Sep 17 00:00:00 2001 From: Hermholtz <15248889+Hermholtz@users.noreply.github.com> Date: Sat, 14 Dec 2024 15:43:12 +0100 Subject: [PATCH 1/2] Format values in General Statistics --- client/src/components/Dashboard/Counters.tsx | 14 +++++++------- client/src/helpers/helpers.tsx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/components/Dashboard/Counters.tsx b/client/src/components/Dashboard/Counters.tsx index e68ce417..d281086d 100644 --- a/client/src/components/Dashboard/Counters.tsx +++ b/client/src/components/Dashboard/Counters.tsx @@ -23,7 +23,7 @@ interface RowProps { const Row = ({ label, count, response_status, tooltipTitle, translationComponents }: RowProps) => { const content = response_status ? ( - {formatNumber(count)} + {count} ) : ( count ); @@ -77,16 +77,16 @@ const Counters = ({ refreshButton, subtitle }: CountersProps) => { ? t('number_of_dns_query_hours', { count: msToHours(interval) }) : t('number_of_dns_query_days', { count: msToDays(interval) }); - const rows = [ + const rows: RowProps[] = [ { label: 'dns_query', - count: numDnsQueries.toString(), + count: formatNumber(numDnsQueries), tooltipTitle: dnsQueryTooltip, response_status: RESPONSE_FILTER.ALL.QUERY, }, { label: 'blocked_by', - count: numBlockedFiltering.toString(), + count: formatNumber(numBlockedFiltering), tooltipTitle: 'number_of_dns_query_blocked_24_hours', response_status: RESPONSE_FILTER.BLOCKED.QUERY, @@ -98,19 +98,19 @@ const Counters = ({ refreshButton, subtitle }: CountersProps) => { }, { label: 'stats_malware_phishing', - count: numReplacedSafebrowsing.toString(), + count: formatNumber(numReplacedSafebrowsing), tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec', response_status: RESPONSE_FILTER.BLOCKED_THREATS.QUERY, }, { label: 'stats_adult', - count: numReplacedParental.toString(), + count: formatNumber(numReplacedParental), tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult', response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.QUERY, }, { label: 'enforced_save_search', - count: numReplacedSafesearch.toString(), + count: formatNumber(numReplacedSafesearch), tooltipTitle: 'number_of_dns_query_to_safe_search', response_status: RESPONSE_FILTER.SAFE_SEARCH.QUERY, }, diff --git a/client/src/helpers/helpers.tsx b/client/src/helpers/helpers.tsx index 1a0f368b..26169121 100644 --- a/client/src/helpers/helpers.tsx +++ b/client/src/helpers/helpers.tsx @@ -524,7 +524,7 @@ export const getObjDiff = (initialValues: any, values: any) => * @param num {number} to format * @returns {string} Returns a string with a language-sensitive representation of this number */ -export const formatNumber = (num: any) => { +export const formatNumber = (num: number): string => { const currentLanguage = i18n.languages[0] || DEFAULT_LANGUAGE; return num.toLocaleString(currentLanguage); }; From efe2ed1304bce5a0ee4ff06e04dceab341902a1b Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Tue, 17 Dec 2024 16:20:12 +0300 Subject: [PATCH 2/2] all: upd chlog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbffff1f..f0a1c812 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,12 @@ See also the [v0.107.56 GitHub milestone][ms-v0.107.56]. NOTE: Add new changes BELOW THIS COMMENT. --> +### Fixed + +- The formatting of large numbers on the dashboard ([#7329]). + +[#7329]: https://github.com/AdguardTeam/AdGuardHome/issues/7329 +