Merge in DNS/adguard-home from feature/infinite_scroll_query_logs to master
Squashed commit of the following:
commit 4407ef2e7c055066257da791fbd65e6b0a495729
Merge: 40b74522 0a4781be
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 16:20:23 2020 +0300
Merge branch 'master' into feature/infinite_scroll_query_logs
commit 40b745225112cf8d664220ed8f484b0aa16e997c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 15:46:27 2020 +0300
Remove dynamic translation of toasts
commit f08fa7b8c6a243f6b10e924aebccc183ce7814fd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 13:59:53 2020 +0300
Remove renderLimitIdx, update isEntireLog
commit 0f1b02616faaa5759c0a3f6d8257117fa22094d9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:11:14 2020 +0300
Rename variables
commit 0928570c689c1fa704af775382620d68893e7c1c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:06:50 2020 +0300
Make query logs short polling function more expressive
commit 9e773cbd6c287a1c799fa2680f3462508462ea7a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:06:19 2020 +0300
Fix Toast translation interface
commit f9c57033e5adc5788954cf086b2f114dd8938bcb
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 17:01:36 2020 +0300
Do not hide loader
commit b86ba48613437f5559a748ad9aa4cf79d15db082
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 16:56:34 2020 +0300
Add dynamic translation for all toasts
commit b9d1d9b447ca90a3c179e503fa5d4abd3516321e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 16:39:29 2020 +0300
Prevent getting query logs recursion if query is not changed
commit e25189749f7912648cca4503cfa8d0ad898c4bb6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 10:13:20 2020 +0300
Decrease page limit to 20
commit 8b248ac5276899de838abf2dc9a69e47599cfc12
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 18:47:12 2020 +0300
Return checkFilteredLogs
commit bf2d65c4a3dca0da6b15f632ae11042b7c8e2045
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 18:33:51 2020 +0300
Review changes
commit 01b5250f9d9136a1f334086d3e2f00d1a928b37b
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 15:29:59 2020 +0300
Remove checkFilteredLogs
commit 25b364c41e6a1489d930c8b3b39b1ab43723f29d
Merge: 1dc66034 2c666cbd
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 14:28:47 2020 +0300
Merge branch 'feature/infinite_scroll_query_logs' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/infinite_scroll_query_logs
commit 1dc6603421cde9847e792bfe77ff6546e53fbc2a
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 14:28:01 2020 +0300
disregard maxFileScanEntries only if offset is set
commit bad741ed7f1dccf6959d43d000b8c0150f526f9e
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 11:57:45 2020 +0300
Fix search behavior when limit is specified
commit 2c666cbdde465cf17434126830dd99ceedfc4cbc
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 18:50:28 2020 +0300
Hide table ref loader during data loading
commit 8b4f7fe642ef9e87a979813dcdbd7817d64c27f9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 18:43:24 2020 +0300
Repair search
commit 26fae1ae01a789999b8a2181d60b35663a20460a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 17:59:27 2020 +0300
Resetting initial render index, change loader position on search
commit e2c97ae1a288438267eef9aec71b979319674a71
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 16:02:03 2020 +0300
Change isScrolledIntoView
... and 32 more commits
195 lines
6.7 KiB
JavaScript
195 lines
6.7 KiB
JavaScript
import { createAction } from 'redux-actions';
|
|
|
|
import apiClient from '../api/Api';
|
|
import { normalizeLogs, getParamsForClientsSearch, addClientInfo } 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;
|
|
let logs = normalizeLogs(data);
|
|
const clientsParams = getParamsForClientsSearch(logs, 'client');
|
|
|
|
if (Object.keys(clientsParams).length > 0) {
|
|
const clients = await apiClient.findClients(clientsParams);
|
|
logs = addClientInfo(logs, clients, 'client');
|
|
}
|
|
|
|
return {
|
|
logs,
|
|
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 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());
|
|
}
|
|
};
|