From 64994c7fcb42c3caaf17eac91b59ef0b1f01b59c Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Fri, 7 Mar 2025 16:42:37 +0300 Subject: [PATCH] Pull request: ADG-9715 formatting of elapsed times less than one millisecond Merge in DNS/adguard-home from ADG-9715 to master Squashed commit of the following: commit d972608ad5429810e0f5ad430f11e037cd05ee40 Author: Ildar Kamalov Date: Thu Mar 6 12:46:29 2025 +0300 ADG-9715 formatting of elapsed times less than one millisecond --- CHANGELOG.md | 1 + client/src/helpers/helpers.tsx | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ec11c7a..d97b4f5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed +- Formatting of elapsed times less than one millisecond. - Changes to global upstream DNS settings not applying to custom client upstream configurations. - The formatting of large numbers in the clients tables on the *Client settings* page ([#7583]). diff --git a/client/src/helpers/helpers.tsx b/client/src/helpers/helpers.tsx index ba18b1c0..74f50ee7 100644 --- a/client/src/helpers/helpers.tsx +++ b/client/src/helpers/helpers.tsx @@ -669,15 +669,17 @@ export const countClientsStatistics = (ids: any, autoClients: any) => { * @returns {string} */ export const formatElapsedMs = (elapsedMs: string, t: (key: string) => string) => { - const parsedElapsedMs = parseInt(elapsedMs, 10); + const parsedElapsedMs = parseFloat(elapsedMs); if (Number.isNaN(parsedElapsedMs)) { return elapsedMs; } - const formattedMs = formatNumber(parsedElapsedMs); + const formattedValue = parsedElapsedMs < 1 + ? parsedElapsedMs.toFixed(2) + : Math.floor(parsedElapsedMs).toString(); - return `${formattedMs} ${t('milliseconds_abbreviation')}`; + return `${formattedValue} ${t('milliseconds_abbreviation')}`; }; /**