+ client: handle the new statistics format

client/src/components/Settings/Clients/AutoClients.js

@@ -27,8 +27,9 @@ class AutoClients extends Component {
     };
 
     getStats = (ip, stats) => {
-        if (stats && stats.top_clients) {
-            return stats.top_clients[ip];
+        if (stats) {
+            const statsForCurrentIP = stats.find(item => item.name === ip);
+            return statsForCurrentIP && statsForCurrentIP.count;
         }
 
         return '';
@@ -59,11 +60,11 @@ class AutoClients extends Component {
             Cell: this.cellWrap,
         },
         {
-            Header: this.props.t('table_statistics'),
+            Header: this.props.t('requests_count'),
             accessor: 'statistics',
             Cell: (row) => {
                 const clientIP = row.original.ip;
-                const clientStats = clientIP && this.getStats(clientIP, this.props.topStats);
+                const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
 
                 if (clientStats) {
                     return (
@@ -112,7 +113,7 @@ class AutoClients extends Component {
 AutoClients.propTypes = {
     t: PropTypes.func.isRequired,
     autoClients: PropTypes.array.isRequired,
-    topStats: PropTypes.object.isRequired,
+    topClients: PropTypes.array.isRequired,
 };
 
 export default withNamespaces()(AutoClients);

client/src/components/Settings/Clients/ClientsTable.js

@@ -63,8 +63,9 @@ class ClientsTable extends Component {
     };
 
     getStats = (ip, stats) => {
-        if (stats && stats.top_clients) {
-            return stats.top_clients[ip];
+        if (stats) {
+            const statsForCurrentIP = stats.find(item => item.name === ip);
+            return statsForCurrentIP && statsForCurrentIP.count;
         }
 
         return '';
@@ -149,11 +150,11 @@ class ClientsTable extends Component {
             },
         },
         {
-            Header: this.props.t('table_statistics'),
+            Header: this.props.t('requests_count'),
             accessor: 'statistics',
             Cell: (row) => {
                 const clientIP = row.original.ip;
-                const clientStats = clientIP && this.getStats(clientIP, this.props.topStats);
+                const clientStats = clientIP && this.getStats(clientIP, this.props.topClients);
 
                 if (clientStats) {
                     return (
@@ -276,7 +277,7 @@ class ClientsTable extends Component {
 ClientsTable.propTypes = {
     t: PropTypes.func.isRequired,
     clients: PropTypes.array.isRequired,
-    topStats: PropTypes.object.isRequired,
+    topClients: PropTypes.array.isRequired,
     toggleClientModal: PropTypes.func.isRequired,
     deleteClient: PropTypes.func.isRequired,
     addClient: PropTypes.func.isRequired,

client/src/components/Settings/Clients/index.js

@@ -10,13 +10,14 @@ import Loading from '../../ui/Loading';
 class Clients extends Component {
     componentDidMount() {
         this.props.getClients();
-        this.props.getTopStats();
+        this.props.getStats();
     }
 
     render() {
         const {
             t,
             dashboard,
+            stats,
             clients,
             addClient,
             updateClient,
@@ -27,12 +28,12 @@ class Clients extends Component {
         return (
             <Fragment>
                 <PageTitle title={t('client_settings')} />
-                {(dashboard.processingTopStats || dashboard.processingClients) && <Loading />}
-                {!dashboard.processingTopStats && !dashboard.processingClients && (
+                {(stats.processingStats || dashboard.processingClients) && <Loading />}
+                {!stats.processingStats && !dashboard.processingClients && (
                     <Fragment>
                         <ClientsTable
                             clients={dashboard.clients}
-                            topStats={dashboard.topStats}
+                            topClients={stats.topClients}
                             isModalOpen={clients.isModalOpen}
                             modalClientName={clients.modalClientName}
                             modalType={clients.modalType}
@@ -46,7 +47,7 @@ class Clients extends Component {
                         />
                         <AutoClients
                             autoClients={dashboard.autoClients}
-                            topStats={dashboard.topStats}
+                            topClients={stats.topClients}
                         />
                     </Fragment>
                 )}
@@ -58,14 +59,14 @@ class Clients extends Component {
 Clients.propTypes = {
     t: PropTypes.func.isRequired,
     dashboard: PropTypes.object.isRequired,
+    stats: PropTypes.object.isRequired,
     clients: PropTypes.object.isRequired,
     toggleClientModal: PropTypes.func.isRequired,
     deleteClient: PropTypes.func.isRequired,
     addClient: PropTypes.func.isRequired,
     updateClient: PropTypes.func.isRequired,
     getClients: PropTypes.func.isRequired,
-    getTopStats: PropTypes.func.isRequired,
-    topStats: PropTypes.object,
+    getStats: PropTypes.func.isRequired,
 };
 
 export default withNamespaces()(Clients);

client/src/components/Settings/index.js

@@ -88,7 +88,7 @@ class Settings extends Component {
                             <div className="col-md-12">
                                 <StatsConfig
                                     interval={stats.interval}
-                                    processing={stats.setConfigProcessing}
+                                    processing={stats.processingSetConfig}
                                     setStatsConfig={setStatsConfig}
                                 />
                             </div>