Full rework of the query log Squashed commit of the following: commit e8a72eb223551f17e637136713dae03accf8ab9e Author: Andrey Meshkov <am@adguard.com> Date: Thu Jun 18 00:31:53 2020 +0300 fix race in whois test commit 801d28197f888fa21f83c9a0b49e3c9472c08513 Merge: 9d9787fdb1c951fb
Author: Andrey Meshkov <am@adguard.com> Date: Thu Jun 18 00:28:13 2020 +0300 Merge branch 'master' into feature/1421 commit 9d9787fd79b17f76c7baed52c12ac462fd00a5e4 Merge: 4ce337ca 08e238ab Author: Andrey Meshkov <am@adguard.com> Date: Thu Jun 18 00:27:32 2020 +0300 Merge commit 4ce337ca7aec163edf87a038bb25fb44e64f8613 Author: Andrey Meshkov <am@adguard.com> Date: Thu Jun 18 00:22:49 2020 +0300 -(home): fix whois test commit 08e238ab0e723b1e354f58245e9a8d5017b392c9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jun 18 00:13:41 2020 +0300 Add comments commit 5f108065952bcc25dce1c2eee3f9401d2641a6e9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 23:47:50 2020 +0300 Make tooltip position absolute for touch commit 4c30a583165e5d007d4b01b657de8751a7bd8c7b Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 20:39:44 2020 +0300 Prevent scroll hide for touch devices commit 62da97931f5921613762614717c62c77ddb6b8db Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 20:06:24 2020 +0300 Review changes: ipad tooltip commit 12dddcca8caca51c157b5d25dfa3ca03ba7f0c06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 16:59:16 2020 +0300 Add close tooltip event for ipad commit 62191e41d5bf67317f9f1dc6c6af08cbabb4bf90 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 16:39:40 2020 +0300 Add success toast on logs refresh commit 2ebdd6a8124269d737c8060c3247aaf35d85cb8b Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 16:01:37 2020 +0300 Fix pagination commit 5820c92bacd93d05a3d66d42ee95f099e1c5d9e9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 17 11:31:15 2020 +0300 Revert "Render table in chunks" This reverts commit cdfcd849ccddc1bc35591edac7904129431470c9. commit cdfcd849ccddc1bc35591edac7904129431470c9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 18:42:18 2020 +0300 Render table in chunks commit cc8c5e64274bf6e806e2e8a4bf305af745c3ed2a Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 17:35:24 2020 +0300 Add pagination button hover effect commit f7e134091a1556784a5fea9d83c50353536126ef Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 16:28:00 2020 +0300 Make loader position absolute commit a7b887b57d903f1f7ac967b861b5cc677728efc4 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 15:42:20 2020 +0300 Ignore clients find without params commit ecb322fefd4a161d79f28d17fe27827ee91701e4 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 15:30:48 2020 +0300 Styles changes commit 9323ce3938bf04e1290eade09201ba0790a250c0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 14:32:23 2020 +0300 Review styles changes commit e0faa04ba3643f01b2ca99524cdd52b0731725c7 Merge: 9857682315e71435
Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 16 12:08:45 2020 +0300 Merge branch '1421-new-qlog-v2' into feature/1421 commit 9857682371e8d9a3a91933cfb58a26b3470675d9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Jun 15 18:32:02 2020 +0300 Fix response cell ... and 88 more commits
176 lines
7.0 KiB
JavaScript
176 lines
7.0 KiB
JavaScript
import React, { Component, Fragment } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { Trans, withTranslation } from 'react-i18next';
|
|
|
|
import Statistics from './Statistics';
|
|
import Counters from './Counters';
|
|
import Clients from './Clients';
|
|
import QueriedDomains from './QueriedDomains';
|
|
import BlockedDomains from './BlockedDomains';
|
|
|
|
import PageTitle from '../ui/PageTitle';
|
|
import Loading from '../ui/Loading';
|
|
import { BLOCK_ACTIONS } from '../../helpers/constants';
|
|
import './Dashboard.css';
|
|
|
|
class Dashboard extends Component {
|
|
componentDidMount() {
|
|
this.getAllStats();
|
|
}
|
|
|
|
getAllStats = () => {
|
|
this.props.getAccessList();
|
|
this.props.getStats();
|
|
this.props.getStatsConfig();
|
|
};
|
|
|
|
getToggleFilteringButton = () => {
|
|
const { protectionEnabled, processingProtection } = this.props.dashboard;
|
|
const buttonText = protectionEnabled ? 'disable_protection' : 'enable_protection';
|
|
const buttonClass = protectionEnabled ? 'btn-gray' : 'btn-success';
|
|
|
|
return (
|
|
<button
|
|
type="button"
|
|
className={`btn btn-sm mr-2 ${buttonClass}`}
|
|
onClick={() => this.props.toggleProtection(protectionEnabled)}
|
|
disabled={processingProtection}
|
|
>
|
|
<Trans>{buttonText}</Trans>
|
|
</button>
|
|
);
|
|
};
|
|
|
|
toggleClientStatus = (type, ip) => {
|
|
const confirmMessage = type === BLOCK_ACTIONS.BLOCK ? 'client_confirm_block' : 'client_confirm_unblock';
|
|
|
|
if (window.confirm(this.props.t(confirmMessage, { ip }))) {
|
|
this.props.toggleClientBlock(type, ip);
|
|
}
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
dashboard, stats, access, t,
|
|
} = this.props;
|
|
const statsProcessing = stats.processingStats
|
|
|| stats.processingGetConfig
|
|
|| access.processing;
|
|
|
|
const subtitle = stats.interval === 1
|
|
? t('for_last_24_hours')
|
|
: t('for_last_days', { count: stats.interval });
|
|
|
|
const refreshFullButton = (
|
|
<button
|
|
type="button"
|
|
className="btn btn-outline-primary btn-sm"
|
|
onClick={() => this.getAllStats()}
|
|
>
|
|
<Trans>refresh_statics</Trans>
|
|
</button>
|
|
);
|
|
|
|
const refreshButton = (
|
|
<button
|
|
type="button"
|
|
className="btn btn-icon btn-outline-primary btn-sm"
|
|
onClick={() => this.getAllStats()}
|
|
>
|
|
<svg className="icons">
|
|
<use xlinkHref="#refresh" />
|
|
</svg>
|
|
</button>
|
|
);
|
|
|
|
return (
|
|
<Fragment>
|
|
<PageTitle title={t('dashboard')}>
|
|
<div className="page-title__actions">
|
|
{this.getToggleFilteringButton()}
|
|
{refreshFullButton}
|
|
</div>
|
|
</PageTitle>
|
|
{statsProcessing && <Loading />}
|
|
{!statsProcessing && (
|
|
<div className="row row-cards">
|
|
<div className="col-lg-12">
|
|
<Statistics
|
|
interval={stats.interval}
|
|
dnsQueries={stats.dnsQueries}
|
|
blockedFiltering={stats.blockedFiltering}
|
|
replacedSafebrowsing={stats.replacedSafebrowsing}
|
|
replacedParental={stats.replacedParental}
|
|
numDnsQueries={stats.numDnsQueries}
|
|
numBlockedFiltering={stats.numBlockedFiltering}
|
|
numReplacedSafebrowsing={stats.numReplacedSafebrowsing}
|
|
numReplacedParental={stats.numReplacedParental}
|
|
refreshButton={refreshButton}
|
|
/>
|
|
</div>
|
|
<div className="col-lg-6">
|
|
<Counters
|
|
subtitle={subtitle}
|
|
interval={stats.interval}
|
|
dnsQueries={stats.numDnsQueries}
|
|
blockedFiltering={stats.numBlockedFiltering}
|
|
replacedSafebrowsing={stats.numReplacedSafebrowsing}
|
|
replacedParental={stats.numReplacedParental}
|
|
replacedSafesearch={stats.numReplacedSafesearch}
|
|
avgProcessingTime={stats.avgProcessingTime}
|
|
refreshButton={refreshButton}
|
|
/>
|
|
</div>
|
|
<div className="col-lg-6">
|
|
<Clients
|
|
subtitle={subtitle}
|
|
dnsQueries={stats.numDnsQueries}
|
|
topClients={stats.topClients}
|
|
clients={dashboard.clients}
|
|
autoClients={dashboard.autoClients}
|
|
refreshButton={refreshButton}
|
|
toggleClientStatus={this.toggleClientStatus}
|
|
processingAccessSet={access.processingSet}
|
|
disallowedClients={access.disallowed_clients}
|
|
/>
|
|
</div>
|
|
<div className="col-lg-6">
|
|
<QueriedDomains
|
|
subtitle={subtitle}
|
|
dnsQueries={stats.numDnsQueries}
|
|
topQueriedDomains={stats.topQueriedDomains}
|
|
refreshButton={refreshButton}
|
|
/>
|
|
</div>
|
|
<div className="col-lg-6">
|
|
<BlockedDomains
|
|
subtitle={subtitle}
|
|
topBlockedDomains={stats.topBlockedDomains}
|
|
blockedFiltering={stats.numBlockedFiltering}
|
|
replacedSafebrowsing={stats.numReplacedSafebrowsing}
|
|
replacedParental={stats.numReplacedParental}
|
|
refreshButton={refreshButton}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</Fragment>
|
|
);
|
|
}
|
|
}
|
|
|
|
Dashboard.propTypes = {
|
|
dashboard: PropTypes.object.isRequired,
|
|
stats: PropTypes.object.isRequired,
|
|
access: PropTypes.object.isRequired,
|
|
getStats: PropTypes.func.isRequired,
|
|
getStatsConfig: PropTypes.func.isRequired,
|
|
toggleProtection: PropTypes.func.isRequired,
|
|
getClients: PropTypes.func.isRequired,
|
|
t: PropTypes.func.isRequired,
|
|
toggleClientBlock: PropTypes.func.isRequired,
|
|
getAccessList: PropTypes.func.isRequired,
|
|
};
|
|
|
|
export default withTranslation()(Dashboard);
|