Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge:4c89cf7201085d59a6Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit4c89cf7209Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commitb943f2011fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commitcd1be2d66dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit7b8ac01fc2Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit02afed66d5Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit9c0f736f0cMerge:62c4fbf1ee04775c4fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit62c4fbf1e3Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit76b1e44a93Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commitf783e90040Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit3d4ce6554cAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commite35ba58f2aAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit1f30d4216dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit6cd4e44f07Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit2ab738b303Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
207 lines
6.9 KiB
TypeScript
207 lines
6.9 KiB
TypeScript
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: any) => {
|
|
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: any, filter: any, dispatch: any, getState: any, total?: any) => {
|
|
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: any, getState: any) => {
|
|
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: any, getState: any) => {
|
|
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: any) => 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?: any) => async (dispatch: any, getState: any) => {
|
|
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: any, getState: any) => {
|
|
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: any) => {
|
|
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: any) => {
|
|
dispatch(getLogsConfigRequest());
|
|
try {
|
|
const data = await apiClient.getQueryLogConfig();
|
|
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: any) => async (dispatch: any) => {
|
|
dispatch(setLogsConfigRequest());
|
|
try {
|
|
await apiClient.setQueryLogConfig(config);
|
|
dispatch(addSuccessToast('config_successfully_saved'));
|
|
dispatch(setLogsConfigSuccess(config));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(setLogsConfigFailure());
|
|
}
|
|
};
|