daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 2349: 7583-clients-format

Browse Source 
Updates #7583.

* commit 'e9d4e76828261622dfb424c760246a21b73040e8':
  all: upd chlog
  refactor: Format value requests_count on client table
  refactor: Format value clientstats
This commit is contained in:
Ainar Garipov
2025-02-24 16:17:15 +03:00
parent 782a1a9820 e9d4e76828
commit d8ce5b453c
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -18,6 +18,12 @@ See also the [v0.107.58 GitHub milestone][ms-v0.107.58].
NOTE: Add new changes BELOW THIS COMMENT. NOTE: Add new changes BELOW THIS COMMENT.
--> -->
### Fixed
- The formatting of large numbers in the clients tables on the *Client settings* page ([#7583]).
[#7583]: https://github.com/AdguardTeam/AdGuardHome/issues/7583
<!-- <!--
NOTE: Add new changes ABOVE THIS COMMENT. NOTE: Add new changes ABOVE THIS COMMENT.
--> -->

4
client/src/components/Settings/Clients/AutoClients.tsx
View File

@@ -12,7 +12,7 @@ import whoisCell from './whoisCell';
import LogsSearchLink from '../../ui/LogsSearchLink'; import LogsSearchLink from '../../ui/LogsSearchLink';
import { sortIp } from '../../../helpers/helpers'; import { sortIp, formatNumber } from '../../../helpers/helpers';
import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../helpers/localStorageHelper'; import { LocalStorageHelper, LOCAL_STORAGE_KEYS } from '../../../helpers/localStorageHelper';
import { TABLES_MIN_ROWS } from '../../../helpers/constants'; import { TABLES_MIN_ROWS } from '../../../helpers/constants';
@@ -66,7 +66,7 @@ class AutoClients extends Component<AutoClientsProps> {
return ( return (
<div className="logs__row"> <div className="logs__row">
<div className="logs__text" title={clientStats}> <div className="logs__text" title={clientStats}>
<LogsSearchLink search={row.original.ip}>{clientStats}</LogsSearchLink> <LogsSearchLink search={row.original.ip}>{formatNumber(clientStats)}</LogsSearchLink>
</div> </div>
</div> </div>
); );

6
client/src/components/Settings/Clients/ClientsTable/ClientsTable.tsx
View File

@@ -12,7 +12,7 @@ import ReactTable from 'react-table';
import { getAllBlockedServices, getBlockedServices } from '../../../../actions/services'; import { getAllBlockedServices, getBlockedServices } from '../../../../actions/services';
import { initSettings } from '../../../../actions'; import { initSettings } from '../../../../actions';
import { splitByNewLine, countClientsStatistics, sortIp, getService } from '../../../../helpers/helpers'; import { splitByNewLine, countClientsStatistics, sortIp, getService, formatNumber } from '../../../../helpers/helpers';
import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE, TABLES_MIN_ROWS } from '../../../../helpers/constants'; import { MODAL_TYPE, LOCAL_TIMEZONE_VALUE, TABLES_MIN_ROWS } from '../../../../helpers/constants';
import Card from '../../../ui/Card'; import Card from '../../../ui/Card';
@@ -300,12 +300,12 @@ const ClientsTable = ({
sortMethod: (a: any, b: any) => b - a, sortMethod: (a: any, b: any) => b - a,
minWidth: 120, minWidth: 120,
Cell: (row: any) => { Cell: (row: any) => {
const content = CellWrap(row); let content = CellWrap(row);
if (!row.value) { if (!row.value) {
return content; return content;
} }
content = typeof content === "number" ? formatNumber(content) : content;
return <LogsSearchLink search={row.original.name}>{content}</LogsSearchLink>; return <LogsSearchLink search={row.original.name}>{content}</LogsSearchLink>;
}, },
}, },