mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-03 23:59:33 +00:00
Close #1625 Squashed commit of the following: commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 15:50:15 2020 +0300 minor commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab Merge: 702c55ed fecf5494 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 13 15:32:44 2020 +0300 Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625 commit 702c55edc1ba2ab330eda8189498dfff33c92f5f Author: Andrey Meshkov <am@adguard.com> Date: Mon Jul 13 15:32:41 2020 +0300 fix makefile when there's no gopath commit fecf5494b8c1719cb70044f336fe99c341802d25 Merge: d4c811f98a417604Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 15:30:21 2020 +0300 Merge branch 'master' into feature/1625 commit d4c811f9630dee448012434e2f50f34ab8b8b899 Merge: b0a037daa33164bfAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 12:35:16 2020 +0300 Merge branch 'master' into feature/1625 commit b0a037daf48913fd8a4cda16d520835630072520 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 12:34:42 2020 +0300 Simplify sync logs action creators commit eeeb620ae100a554f59783fc2a14fad525ce1a82 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jul 13 11:17:08 2020 +0300 Review changes commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 15:23:37 2020 +0300 Update tracker tooltip class commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 13:46:10 2020 +0300 Replace depricated addListener commit 2ac0843239853da1725d2e038b5e4cbaef253732 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 13:39:45 2020 +0300 Validate response_status url param commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jul 10 12:58:18 2020 +0300 Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action commit 4b11c6a34049bd133077bad035d267f87cdec141 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 19:41:48 2020 +0300 Normalize input search commit 3fded3575b21bdd017723f5e487c268074599e4f Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 18:20:05 2020 +0300 Optimize search commit 9073e032e4aadcdef9d826f16a10c300ee46b30e Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 14:28:41 2020 +0300 Update url string params commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jul 9 12:55:50 2020 +0300 Fix reset search commit 33f769aed56369aacedd29ffd52b527b527d4a59 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 8 19:13:21 2020 +0300 WIP: Add permlinks commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jul 8 14:42:28 2020 +0300 Refactor Counters, add response_status links to query log commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jul 7 19:33:04 2020 +0300 Delete unnecessary file commit b20816e9dad79866e3ec04d3093c972967b3b226 Merge: 6281084e d2c3af5c Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jul 7 19:30:44 2020 +0300 Resolve conflict commit d2c3af5cf227d76f876d6d94ca016d4b242b2515 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jul 7 17:14:51 2020 +0300 + client: Add git hooks ... and 5 more commits
257 lines
8.6 KiB
JavaScript
257 lines
8.6 KiB
JavaScript
import React, { Fragment, useEffect, useState } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { Trans } from 'react-i18next';
|
|
import Modal from 'react-modal';
|
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
|
import { useHistory } from 'react-router-dom';
|
|
import queryString from 'query-string';
|
|
import {
|
|
BLOCK_ACTIONS,
|
|
TABLE_DEFAULT_PAGE_SIZE,
|
|
TABLE_FIRST_PAGE,
|
|
smallScreenSize,
|
|
} from '../../helpers/constants';
|
|
import Loading from '../ui/Loading';
|
|
import Filters from './Filters';
|
|
import Table from './Table';
|
|
import Disabled from './Disabled';
|
|
import { getFilteringStatus } from '../../actions/filtering';
|
|
import { getClients } from '../../actions';
|
|
import { getDnsConfig } from '../../actions/dnsConfig';
|
|
import {
|
|
getLogsConfig,
|
|
refreshFilteredLogs,
|
|
resetFilteredLogs,
|
|
setFilteredLogs,
|
|
} from '../../actions/queryLogs';
|
|
import { addSuccessToast } from '../../actions/toasts';
|
|
import './Logs.css';
|
|
|
|
export const processContent = (data, buttonType) => Object.entries(data)
|
|
.map(([key, value]) => {
|
|
if (!value) {
|
|
return null;
|
|
}
|
|
|
|
const isTitle = value === 'title';
|
|
const isButton = key === buttonType;
|
|
const isBoolean = typeof value === 'boolean';
|
|
const isHidden = isBoolean && value === false;
|
|
|
|
let keyClass = 'key-colon';
|
|
|
|
if (isTitle) {
|
|
keyClass = 'title--border';
|
|
}
|
|
if (isButton || isBoolean) {
|
|
keyClass = '';
|
|
}
|
|
|
|
return isHidden ? null : <Fragment key={key}>
|
|
<div
|
|
className={`key__${key} ${keyClass} ${(isBoolean && value === true) ? 'font-weight-bold' : ''}`}>
|
|
<Trans>{isButton ? value : key}</Trans>
|
|
</div>
|
|
<div className={`value__${key} text-pre text-truncate`}>
|
|
<Trans>{(isTitle || isButton || isBoolean) ? '' : value || '—'}</Trans>
|
|
</div>
|
|
</Fragment>;
|
|
});
|
|
|
|
|
|
const Logs = (props) => {
|
|
const dispatch = useDispatch();
|
|
const history = useHistory();
|
|
|
|
const {
|
|
response_status: response_status_url_param = '',
|
|
search: search_url_param = '',
|
|
} = queryString.parse(history.location.search);
|
|
|
|
const { filter } = useSelector((state) => state.queryLogs, shallowEqual);
|
|
|
|
const search = filter?.search || search_url_param;
|
|
const response_status = filter?.response_status || response_status_url_param;
|
|
|
|
const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < smallScreenSize);
|
|
const [detailedDataCurrent, setDetailedDataCurrent] = useState({});
|
|
const [buttonType, setButtonType] = useState(BLOCK_ACTIONS.BLOCK);
|
|
const [isModalOpened, setModalOpened] = useState(false);
|
|
const [isLoading, setIsLoading] = useState(false);
|
|
|
|
|
|
useEffect(() => {
|
|
(async () => {
|
|
setIsLoading(true);
|
|
await dispatch(setFilteredLogs({
|
|
search,
|
|
response_status,
|
|
}));
|
|
setIsLoading(false);
|
|
})();
|
|
}, [response_status, search]);
|
|
|
|
const {
|
|
filtering,
|
|
setLogsPage,
|
|
setLogsPagination,
|
|
toggleDetailedLogs,
|
|
dashboard,
|
|
dnsConfig,
|
|
queryLogs: {
|
|
enabled,
|
|
processingGetConfig,
|
|
processingAdditionalLogs,
|
|
processingGetLogs,
|
|
oldest,
|
|
logs,
|
|
pages,
|
|
page,
|
|
isDetailed,
|
|
},
|
|
} = props;
|
|
|
|
const mediaQuery = window.matchMedia(`(max-width: ${smallScreenSize}px)`);
|
|
const mediaQueryHandler = (e) => {
|
|
setIsSmallScreen(e.matches);
|
|
if (e.matches) {
|
|
toggleDetailedLogs(false);
|
|
}
|
|
};
|
|
|
|
const closeModal = () => setModalOpened(false);
|
|
|
|
const getLogs = (older_than, page, initial) => {
|
|
if (enabled) {
|
|
props.getLogs({
|
|
older_than,
|
|
page,
|
|
pageSize: TABLE_DEFAULT_PAGE_SIZE,
|
|
initial,
|
|
});
|
|
}
|
|
};
|
|
|
|
useEffect(() => {
|
|
mediaQuery.addEventListener('change', mediaQueryHandler);
|
|
|
|
(async () => {
|
|
setIsLoading(true);
|
|
dispatch(setLogsPage(TABLE_FIRST_PAGE));
|
|
dispatch(getFilteringStatus());
|
|
dispatch(getClients());
|
|
try {
|
|
await Promise.all([
|
|
dispatch(getLogsConfig()),
|
|
dispatch(getDnsConfig()),
|
|
]);
|
|
} catch (err) {
|
|
console.error(err);
|
|
} finally {
|
|
setIsLoading(false);
|
|
}
|
|
})();
|
|
|
|
return () => {
|
|
mediaQuery.removeEventListener('change', mediaQueryHandler);
|
|
dispatch(resetFilteredLogs());
|
|
};
|
|
}, []);
|
|
|
|
const refreshLogs = async () => {
|
|
setIsLoading(true);
|
|
await Promise.all([
|
|
dispatch(setLogsPage(TABLE_FIRST_PAGE)),
|
|
dispatch(refreshFilteredLogs()),
|
|
]);
|
|
dispatch(addSuccessToast('query_log_updated'));
|
|
setIsLoading(false);
|
|
};
|
|
|
|
return (
|
|
<>
|
|
{enabled && processingGetConfig && <Loading />}
|
|
{enabled && !processingGetConfig && (
|
|
<>
|
|
<Filters
|
|
filter={{
|
|
response_status,
|
|
search,
|
|
}}
|
|
setIsLoading={setIsLoading}
|
|
processingGetLogs={processingGetLogs}
|
|
processingAdditionalLogs={processingAdditionalLogs}
|
|
refreshLogs={refreshLogs}
|
|
/>
|
|
<Table
|
|
isLoading={isLoading}
|
|
setIsLoading={setIsLoading}
|
|
logs={logs}
|
|
pages={pages}
|
|
page={page}
|
|
autoClients={dashboard.autoClients}
|
|
oldest={oldest}
|
|
filtering={filtering}
|
|
processingGetLogs={processingGetLogs}
|
|
processingGetConfig={processingGetConfig}
|
|
isDetailed={isDetailed}
|
|
setLogsPagination={setLogsPagination}
|
|
setLogsPage={setLogsPage}
|
|
toggleDetailedLogs={toggleDetailedLogs}
|
|
getLogs={getLogs}
|
|
setRules={props.setRules}
|
|
addSuccessToast={props.addSuccessToast}
|
|
getFilteringStatus={props.getFilteringStatus}
|
|
dnssec_enabled={dnsConfig.dnssec_enabled}
|
|
setDetailedDataCurrent={setDetailedDataCurrent}
|
|
setButtonType={setButtonType}
|
|
setModalOpened={setModalOpened}
|
|
isSmallScreen={isSmallScreen}
|
|
/>
|
|
<Modal portalClassName='grid' isOpen={isSmallScreen && isModalOpened}
|
|
onRequestClose={closeModal}
|
|
style={{
|
|
content: {
|
|
width: '100%',
|
|
height: 'fit-content',
|
|
left: 0,
|
|
top: 47,
|
|
padding: '1rem 1.5rem 1rem',
|
|
},
|
|
overlay: {
|
|
backgroundColor: 'rgba(0,0,0,0.5)',
|
|
},
|
|
}}
|
|
>
|
|
<svg
|
|
className="icon icon--small icon-cross d-block d-md-none cursor--pointer"
|
|
onClick={closeModal}>
|
|
<use xlinkHref="#cross" />
|
|
</svg>
|
|
{processContent(detailedDataCurrent, buttonType)}
|
|
</Modal>
|
|
</>
|
|
)}
|
|
{!enabled && !processingGetConfig && (
|
|
<Disabled />
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
Logs.propTypes = {
|
|
getLogs: PropTypes.func.isRequired,
|
|
queryLogs: PropTypes.object.isRequired,
|
|
dashboard: PropTypes.object.isRequired,
|
|
getFilteringStatus: PropTypes.func.isRequired,
|
|
filtering: PropTypes.object.isRequired,
|
|
setRules: PropTypes.func.isRequired,
|
|
addSuccessToast: PropTypes.func.isRequired,
|
|
setLogsPagination: PropTypes.func.isRequired,
|
|
setLogsPage: PropTypes.func.isRequired,
|
|
toggleDetailedLogs: PropTypes.func.isRequired,
|
|
dnsConfig: PropTypes.object.isRequired,
|
|
};
|
|
|
|
export default Logs;
|