- client: find clients by client_id

client/src/actions/queryLogs.js

@@ -8,7 +8,7 @@ import {
 import { addErrorToast, addSuccessToast } from './toasts';
 
 const enrichWithClientInfo = async (logs) => {
-    const clientsParams = getParamsForClientsSearch(logs, 'client');
+    const clientsParams = getParamsForClientsSearch(logs, 'client', 'client_id');
 
     if (Object.keys(clientsParams).length > 0) {
         const clients = await apiClient.findClients(clientsParams);

client/src/helpers/helpers.js

@@ -4,7 +4,6 @@ import dateFormat from 'date-fns/format';
 import round from 'lodash/round';
 import axios from 'axios';
 import i18n from 'i18next';
-import uniqBy from 'lodash/uniqBy';
 import ipaddr from 'ipaddr.js';
 import queryString from 'query-string';
 import React from 'react';
@@ -417,14 +416,21 @@ export const getPathWithQueryString = (path, params) => {
     return `${path}?${searchParams.toString()}`;
 };
 
-export const getParamsForClientsSearch = (data, param) => {
-    const uniqueClients = uniqBy(data, param);
-    return uniqueClients
-        .reduce((acc, item, idx) => {
-            const key = `ip${idx}`;
-            acc[key] = item[param];
-            return acc;
-        }, {});
+export const getParamsForClientsSearch = (data, param, additionalParam) => {
+    const clients = new Set();
+    data.forEach((e) => {
+        clients.add(e[param]);
+        if (e[additionalParam]) {
+            clients.add(e[additionalParam]);
+        }
+    });
+    const params = {};
+    const ids = Array.from(clients.values());
+    ids.forEach((id, i) => {
+        params[`ip${i}`] = id;
+    });
+
+    return params;
 };
 
 /**
@@ -595,6 +601,9 @@ export const countClientsStatistics = (ids, autoClients) => {
     const cidrsCount = Object.entries(autoClients)
         .reduce((acc, curr) => {
             const [id, count] = curr;
+            if (R_CLIENT_ID.test(id)) {
+                return false;
+            }
             if (cidrs.some((cidr) => isIpInCidr(id, cidr))) {
             // eslint-disable-next-line no-param-reassign
                 acc += count;