+ client: Move "Blocked services" to a separate page under "Filters" menu: Merge pull request #649 in DNS/adguard-home from feature/1744 to master
Close #1744
Squashed commit of the following:
commit 912a80b8ff42c927a97d33ccb3eebf8c3ca188d9
Merge: bb5a77ff 5ce98bd2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jun 5 12:47:21 2020 +0300
Merge branch 'master' into feature/1744
commit bb5a77ff6b66743bf23c9582c523280bdf9ef63a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 4 18:07:26 2020 +0300
+ client: Move "Blocked services" to a separate page under "Filters" menu
This commit is contained in:
@@ -2,7 +2,6 @@ import React, { Component, Fragment } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
|
||||
import Services from './Services';
|
||||
import StatsConfig from './StatsConfig';
|
||||
import LogsConfig from './LogsConfig';
|
||||
import FiltersConfig from './FiltersConfig';
|
||||
@@ -35,7 +34,6 @@ class Settings extends Component {
|
||||
|
||||
componentDidMount() {
|
||||
this.props.initSettings(this.settings);
|
||||
this.props.getBlockedServices();
|
||||
this.props.getStatsConfig();
|
||||
this.props.getLogsConfig();
|
||||
this.props.getFilteringStatus();
|
||||
@@ -63,8 +61,6 @@ class Settings extends Component {
|
||||
render() {
|
||||
const {
|
||||
settings,
|
||||
services,
|
||||
setBlockedServices,
|
||||
setStatsConfig,
|
||||
resetStats,
|
||||
stats,
|
||||
@@ -77,7 +73,6 @@ class Settings extends Component {
|
||||
} = this.props;
|
||||
|
||||
const isDataReady = !settings.processing
|
||||
&& !services.processing
|
||||
&& !stats.processingGetConfig
|
||||
&& !queryLogs.processingGetConfig;
|
||||
|
||||
@@ -123,12 +118,6 @@ class Settings extends Component {
|
||||
resetStats={resetStats}
|
||||
/>
|
||||
</div>
|
||||
<div className="col-md-12">
|
||||
<Services
|
||||
services={services}
|
||||
setBlockedServices={setBlockedServices}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
@@ -147,14 +136,9 @@ Settings.propTypes = {
|
||||
setFiltersConfig: PropTypes.func.isRequired,
|
||||
getFilteringStatus: PropTypes.func.isRequired,
|
||||
t: PropTypes.func.isRequired,
|
||||
getBlockedServices: PropTypes.func,
|
||||
getLogsConfig: PropTypes.func,
|
||||
setBlockedServices: PropTypes.func,
|
||||
setLogsConfig: PropTypes.func,
|
||||
clearLogs: PropTypes.func,
|
||||
services: PropTypes.shape({
|
||||
processing: PropTypes.bool,
|
||||
}),
|
||||
stats: PropTypes.shape({
|
||||
processingGetConfig: PropTypes.bool,
|
||||
interval: PropTypes.number,
|
||||
|
||||
Reference in New Issue
Block a user