Updates #1273. Squashed commit of the following: commit 55b78153b1b775c855e759011141bbbe6d4b962c Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 16:55:39 2021 +0300 Update client_info in case of null commit 5c80c1438ed9d961af11617831b704d6ae15cc34 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 16:24:14 2021 +0300 querylog: always set client_info commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6 Merge: 4ed7eab523c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 16:22:08 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b Merge: dbf990eb70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 12:57:17 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit dbf990eb881116754554270e7b691b5db8e9ee34 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 2 12:56:13 2021 +0300 home: imp names commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 19:26:04 2021 +0300 Rename to whois commit e3cc4a68ee576770b1922680155308e33bed31e8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 19:03:42 2021 +0300 home: imp whois more commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 18:51:14 2021 +0300 home: imp whois resp commit fb97e0d74976723a512d6ff4c69e830fe59c8df8 Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 18:00:03 2021 +0300 Fix client_info ids prop types commit 298005189e372651ceff453e88aca19ee925a138 Author: Artem Baskal <a.baskal@adguard.com> Date: Thu Apr 1 17:58:14 2021 +0300 Adapt changes on client commit aa1769f64197d865478a66271da483babfc5dfd0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 17:18:36 2021 +0300 all: add more fields to querylog client commit 4b2a2dbd380ec410f3068d15ea16430912e03e33 Merge: cda92c3f2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 1 16:57:26 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit cda92c3f0331cbac252f3163d31457f716bc7f2c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 18:03:51 2021 +0300 querylog: fix windows tests commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2 Merge: 627e4958e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 17:45:53 2021 +0300 Merge branch 'master' into 1273-querylog-client-name commit 627e495828e82d44cc77aa393536479f23cc68b7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Mar 29 17:44:49 2021 +0300 querylog: add tests, imp code, docs commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Mar 26 16:10:47 2021 +0300 querylog: search clients by name, enrich http resp
203 lines
6.8 KiB
JavaScript
203 lines
6.8 KiB
JavaScript
import { createAction } from 'redux-actions';
|
|
|
|
import apiClient from '../api/Api';
|
|
import { normalizeLogs } from '../helpers/helpers';
|
|
import {
|
|
DEFAULT_LOGS_FILTER, FORM_NAME, QUERY_LOGS_PAGE_LIMIT,
|
|
} from '../helpers/constants';
|
|
import { addErrorToast, addSuccessToast } from './toasts';
|
|
|
|
const getLogsWithParams = async (config) => {
|
|
const { older_than, filter, ...values } = config;
|
|
const rawLogs = await apiClient.getQueryLog({
|
|
...filter,
|
|
older_than,
|
|
});
|
|
const { data, oldest } = rawLogs;
|
|
|
|
return {
|
|
logs: normalizeLogs(data),
|
|
oldest,
|
|
older_than,
|
|
filter,
|
|
...values,
|
|
};
|
|
};
|
|
|
|
export const getAdditionalLogsRequest = createAction('GET_ADDITIONAL_LOGS_REQUEST');
|
|
export const getAdditionalLogsFailure = createAction('GET_ADDITIONAL_LOGS_FAILURE');
|
|
export const getAdditionalLogsSuccess = createAction('GET_ADDITIONAL_LOGS_SUCCESS');
|
|
|
|
const shortPollQueryLogs = async (data, filter, dispatch, getState, total) => {
|
|
const { logs, oldest } = data;
|
|
const totalData = total || { logs };
|
|
|
|
const queryForm = getState().form[FORM_NAME.LOGS_FILTER];
|
|
const currentQuery = queryForm && queryForm.values.search;
|
|
const previousQuery = filter?.search;
|
|
const isQueryTheSame = typeof previousQuery === 'string'
|
|
&& typeof currentQuery === 'string'
|
|
&& previousQuery === currentQuery;
|
|
|
|
const isShortPollingNeeded = (logs.length < QUERY_LOGS_PAGE_LIMIT
|
|
|| totalData.logs.length < QUERY_LOGS_PAGE_LIMIT)
|
|
&& oldest !== '' && isQueryTheSame;
|
|
|
|
if (isShortPollingNeeded) {
|
|
dispatch(getAdditionalLogsRequest());
|
|
|
|
try {
|
|
const additionalLogs = await getLogsWithParams({
|
|
older_than: oldest,
|
|
filter,
|
|
});
|
|
if (additionalLogs.oldest.length > 0) {
|
|
return await shortPollQueryLogs(additionalLogs, filter, dispatch, getState, {
|
|
logs: [...totalData.logs, ...additionalLogs.logs],
|
|
oldest: additionalLogs.oldest,
|
|
});
|
|
}
|
|
dispatch(getAdditionalLogsSuccess());
|
|
return totalData;
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(getAdditionalLogsFailure(error));
|
|
}
|
|
}
|
|
|
|
dispatch(getAdditionalLogsSuccess());
|
|
return totalData;
|
|
};
|
|
|
|
export const toggleDetailedLogs = createAction('TOGGLE_DETAILED_LOGS');
|
|
|
|
export const getLogsRequest = createAction('GET_LOGS_REQUEST');
|
|
export const getLogsFailure = createAction('GET_LOGS_FAILURE');
|
|
export const getLogsSuccess = createAction('GET_LOGS_SUCCESS');
|
|
|
|
export const updateLogs = () => async (dispatch, getState) => {
|
|
try {
|
|
const { logs, oldest, older_than } = getState().queryLogs;
|
|
|
|
dispatch(getLogsSuccess({
|
|
logs,
|
|
oldest,
|
|
older_than,
|
|
}));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(getLogsFailure(error));
|
|
}
|
|
};
|
|
|
|
export const getLogs = () => async (dispatch, getState) => {
|
|
dispatch(getLogsRequest());
|
|
try {
|
|
const { isFiltered, filter, oldest } = getState().queryLogs;
|
|
const data = await getLogsWithParams({
|
|
older_than: oldest,
|
|
filter,
|
|
});
|
|
|
|
if (isFiltered) {
|
|
const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
|
|
const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
|
|
dispatch(getLogsSuccess(updatedData));
|
|
} else {
|
|
dispatch(getLogsSuccess(data));
|
|
}
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(getLogsFailure(error));
|
|
}
|
|
};
|
|
|
|
export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
|
|
|
|
/**
|
|
*
|
|
* @param filter
|
|
* @param {string} filter.search
|
|
* @param {string} filter.response_status 'QUERY' field of RESPONSE_FILTER object
|
|
* @returns function
|
|
*/
|
|
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
|
|
|
|
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
|
|
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
|
|
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
|
|
|
|
export const setFilteredLogs = (filter) => async (dispatch, getState) => {
|
|
dispatch(setFilteredLogsRequest());
|
|
try {
|
|
const data = await getLogsWithParams({
|
|
older_than: '',
|
|
filter,
|
|
});
|
|
const additionalData = await shortPollQueryLogs(data, filter, dispatch, getState);
|
|
const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
|
|
|
|
dispatch(setFilteredLogsSuccess({
|
|
...updatedData,
|
|
filter,
|
|
}));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(setFilteredLogsFailure(error));
|
|
}
|
|
};
|
|
|
|
export const resetFilteredLogs = () => setFilteredLogs(DEFAULT_LOGS_FILTER);
|
|
|
|
export const refreshFilteredLogs = () => async (dispatch, getState) => {
|
|
const { filter } = getState().queryLogs;
|
|
await dispatch(setFilteredLogs(filter));
|
|
};
|
|
|
|
export const clearLogsRequest = createAction('CLEAR_LOGS_REQUEST');
|
|
export const clearLogsFailure = createAction('CLEAR_LOGS_FAILURE');
|
|
export const clearLogsSuccess = createAction('CLEAR_LOGS_SUCCESS');
|
|
|
|
export const clearLogs = () => async (dispatch) => {
|
|
dispatch(clearLogsRequest());
|
|
try {
|
|
await apiClient.clearQueryLog();
|
|
dispatch(clearLogsSuccess());
|
|
dispatch(addSuccessToast('query_log_cleared'));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(clearLogsFailure(error));
|
|
}
|
|
};
|
|
|
|
export const getLogsConfigRequest = createAction('GET_LOGS_CONFIG_REQUEST');
|
|
export const getLogsConfigFailure = createAction('GET_LOGS_CONFIG_FAILURE');
|
|
export const getLogsConfigSuccess = createAction('GET_LOGS_CONFIG_SUCCESS');
|
|
|
|
export const getLogsConfig = () => async (dispatch) => {
|
|
dispatch(getLogsConfigRequest());
|
|
try {
|
|
const data = await apiClient.getQueryLogInfo();
|
|
dispatch(getLogsConfigSuccess(data));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(getLogsConfigFailure());
|
|
}
|
|
};
|
|
|
|
export const setLogsConfigRequest = createAction('SET_LOGS_CONFIG_REQUEST');
|
|
export const setLogsConfigFailure = createAction('SET_LOGS_CONFIG_FAILURE');
|
|
export const setLogsConfigSuccess = createAction('SET_LOGS_CONFIG_SUCCESS');
|
|
|
|
export const setLogsConfig = (config) => async (dispatch) => {
|
|
dispatch(setLogsConfigRequest());
|
|
try {
|
|
await apiClient.setQueryLogConfig(config);
|
|
dispatch(addSuccessToast('config_successfully_saved'));
|
|
dispatch(setLogsConfigSuccess(config));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(setLogsConfigFailure());
|
|
}
|
|
};
|