mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-02-20 11:44:09 +08:00
Merge 84d72cb8424bb8087e0d38dcc22196d1b9f7112b into 1e0873aa71849de9ffc6814b620dbbf920ffa9f8
This commit is contained in:
commit
d34e6a224f
@ -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>
|
||||||
);
|
);
|
||||||
|
@ -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>;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user