mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-25 14:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge - client: fix logic of top clients normalization

Browse source 
Close #1294

* commit '392535ce3aad89fad52074399ec7b6986de8c4e9':
  - client: change code style of top clients normalization helper
  - client: fix logic of top clients normalization
This commit is contained in:
Artem Baskal 2020-01-15 18:21:33 +03:00
commit c23c323b1a
4 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/components/Settings/Clients/AutoClients.js
View file

@ -38,7 +38,7 @@ class AutoClients extends Component {
},
{
Header: this.props.t('requests_count'),
accessor: row => this.props.normalizedTopClients[row.ip] || 0,
accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0,
sortMethod: (a, b) => b - a,
id: 'statistics',
minWidth: COLUMN_MIN_WIDTH,

5
client/src/components/Settings/Clients/ClientsTable.js
View file

@ -40,6 +40,7 @@ class ClientsTable extends Component {
} else {
this.handleFormAdd(config);
}
this.props.getStats();
};
getClient = (name, clients) => {
@ -64,6 +65,7 @@ class ClientsTable extends Component {
// eslint-disable-next-line no-alert
if (window.confirm(this.props.t('client_confirm_delete', { key: data.name }))) {
this.props.deleteClient(data);
this.props.getStats();
}
};
@ -161,7 +163,7 @@ class ClientsTable extends Component {
{
Header: this.props.t('requests_count'),
id: 'statistics',
accessor: row => this.props.normalizedTopClients[row.name] || 0,
accessor: row => this.props.normalizedTopClients.configured[row.name] || 0,
sortMethod: (a, b) => b - a,
minWidth: 120,
Cell: (row) => {
@ -305,6 +307,7 @@ ClientsTable.propTypes = {
processingAdding: PropTypes.bool.isRequired,
processingDeleting: PropTypes.bool.isRequired,
processingUpdating: PropTypes.bool.isRequired,
getStats: PropTypes.func.isRequired,
};
export default withNamespaces()(ClientsTable);

2
client/src/components/Settings/Clients/index.js
View file

@ -23,6 +23,7 @@ class Clients extends Component {
updateClient,
deleteClient,
toggleClientModal,
getStats,
} = this.props;
return (
@ -44,6 +45,7 @@ class Clients extends Component {
processingAdding={clients.processingAdding}
processingDeleting={clients.processingDeleting}
processingUpdating={clients.processingUpdating}
getStats={getStats}
/>
<AutoClients
autoClients={dashboard.autoClients}

25
client/src/helpers/helpers.js
View file

@ -261,12 +261,27 @@ export const redirectToCurrentProtocol = (values, httpPort = 80) => {
export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n);
export const normalizeTopClients = clients => clients.reduce((accumulator, clientObj) => {
const { name, count } = clientObj;
/**
* Normalizes the topClients array
*
* @param {Object[]} topClients
* @param {string} topClients.name
* @param {number} topClients.count
* @param {Object} topClients.info
* @param {string} topClients.info.name
* @returns {Object} normalizedTopClients
* @returns {Object.<string, number>} normalizedTopClients.auto - auto clients
* @returns {Object.<string, number>} normalizedTopClients.configured - configured clients
*/
export const normalizeTopClients = topClients => topClients.reduce((nameToCountMap, clientObj) => {
const { name, count, info: { name: infoName } } = clientObj;
// eslint-disable-next-line no-param-reassign
accumulator[name] = count;
return accumulator;
}, {});
nameToCountMap.auto[name] = count;
// eslint-disable-next-line no-param-reassign
nameToCountMap.configured[infoName] = count;
return nameToCountMap;
}, { auto: {}, configured: {} });
export const getClientInfo = (clients, ip) => {
const client = clients