Skip to content

Commit

Permalink
+ client: Move "Blocked services" to a separate page under "Filters" …
Browse files Browse the repository at this point in the history 
…menu: Merge pull request #649 in DNS/adguard-home from feature/1744 to master

Close #1744

Squashed commit of the following:

commit 912a80b
Merge: bb5a77f 5ce98bd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jun 5 12:47:21 2020 +0300

    Merge branch 'master' into feature/1744

commit bb5a77f
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
  • Loading branch information
@ArtemBaskal
ArtemBaskal committed Jun 5, 2020
1 parent 5ce98bd commit 4a81abb
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 103 deletions.
35 changes: 20 additions & 15 deletions client/src/components/App/index.js
View file
Expand Up @@ -34,6 +34,8 @@ import EncryptionTopline from '../ui/EncryptionTopline';
import Icons from '../ui/Icons';
import i18n from '../../i18n';
import Loading from '../ui/Loading';
import { FILTERS_URLS, MENU_URLS, SETTINGS_URLS } from '../../helpers/constants';
import Services from '../Filters/Services';

class App extends Component {
componentDidMount() {
Expand Down Expand Up @@ -99,26 +101,29 @@ class App extends Component {
<div className="col-lg-12">
<Status reloadPage={this.reloadPage}
message="dns_start"
/>
/>
<Loading />
</div>
</div>
)}
{!dashboard.processing && dashboard.isCoreRunning && (
<Fragment>
<Route path="/" exact component={Dashboard} />
<Route path="/settings" component={Settings} />
<Route path="/dns" component={Dns} />
<Route path="/encryption" component={Encryption} />
<Route path="/dhcp" component={Dhcp} />
<Route path="/clients" component={Clients} />
<Route path="/filters" component={DnsBlocklist} />
<Route path="/dns_allowlists" component={DnsAllowlist} />
<Route path="/dns_rewrites" component={DnsRewrites} />
<Route path="/custom_rules" component={CustomRules} />
<Route path="/logs" component={Logs} />
<Route path="/guide" component={SetupGuide} />
</Fragment>
<>
<Route path={MENU_URLS.root} exact component={Dashboard} />
<Route path={MENU_URLS.logs} component={Logs} />
<Route path={MENU_URLS.guide} component={SetupGuide} />
<Route path={SETTINGS_URLS.settings} component={Settings} />
<Route path={SETTINGS_URLS.dns} component={Dns} />
<Route path={SETTINGS_URLS.encryption} component={Encryption} />
<Route path={SETTINGS_URLS.dhcp} component={Dhcp} />
<Route path={SETTINGS_URLS.clients} component={Clients} />
<Route path={FILTERS_URLS.dns_blocklists}
component={DnsBlocklist} />
<Route path={FILTERS_URLS.dns_allowlists}
component={DnsAllowlist} />
<Route path={FILTERS_URLS.dns_rewrites} component={DnsRewrites} />
<Route path={FILTERS_URLS.custom_rules} component={CustomRules} />
<Route path={FILTERS_URLS.blocked_services} component={Services} />
</>
)}
</div>
<Footer
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/Filters/DnsAllowlist.js
View file
@@ -1,4 +1,4 @@
import React, { Component, Fragment } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from 'react-i18next';

Expand Down Expand Up @@ -72,7 +72,7 @@ class DnsAllowlist extends Component {
const whitelist = true;

return (
<Fragment>
<>
<PageTitle
title={t('dns_allowlists')}
subtitle={t('dns_allowlists_desc')}
Expand Down Expand Up @@ -113,7 +113,7 @@ class DnsAllowlist extends Component {
currentFilterData={currentFilterData}
whitelist={whitelist}
/>
</Fragment>
</>
);
}
}
Expand Down
0 .../src/components/Settings/Services/Form.js → ...t/src/components/Filters/Services/Form.js
View file
File renamed without changes.
64 changes: 64 additions & 0 deletions client/src/components/Filters/Services/index.js
View file
@@ -0,0 +1,64 @@
import React, { useEffect } from 'react';
import { useTranslation } from 'react-i18next';

import { useDispatch, useSelector } from 'react-redux';
import Form from './Form';
import Card from '../../ui/Card';
import { getBlockedServices, setBlockedServices } from '../../../actions/services';
import PageTitle from '../../ui/PageTitle';

const getInitialDataForServices = (initial) => (initial ? initial.reduce(
(acc, service) => {
acc.blocked_services[service] = true;
return acc;
}, { blocked_services: {} },
) : initial);

const Services = () => {
const [t] = useTranslation();
const dispatch = useDispatch();
const services = useSelector((store) => store && store.services);

useEffect(() => {
dispatch(getBlockedServices());
}, []);

const handleSubmit = (values) => {
if (!values || !values.blocked_services) {
return;
}

const blocked_services = Object
.keys(values.blocked_services)
.filter((service) => values.blocked_services[service]);

dispatch(setBlockedServices(blocked_services));
};

const initialValues = getInitialDataForServices(services.list);

return (
<>
<PageTitle
title={t('blocked_services')}
subtitle={t('blocked_services_desc')}
/>
<Card
bodyType="card-body box-body--settings"
>
<div className="form">
<Form
initialValues={initialValues}
processing={services.processing}
processingSet={services.processingSet}
onSubmit={handleSubmit}
/>
</div>
</Card>
</>
);
};

Services.propTypes = {};

export default Services;
1 change: 1 addition & 0 deletions client/src/components/Header/Menu.js
View file
Expand Up @@ -38,6 +38,7 @@ const FILTERS_ITEMS = [
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
];

class Menu extends Component {
Expand Down
69 changes: 0 additions & 69 deletions client/src/components/Settings/Services/index.js
View file

This file was deleted.

16 changes: 0 additions & 16 deletions client/src/components/Settings/index.js
View file
Expand Up @@ -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';
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -63,8 +61,6 @@ class Settings extends Component {
render() {
const {
settings,
services,
setBlockedServices,
setStatsConfig,
resetStats,
stats,
Expand All @@ -77,7 +73,6 @@ class Settings extends Component {
} = this.props;

const isDataReady = !settings.processing
&& !services.processing
&& !stats.processingGetConfig
&& !queryLogs.processingGetConfig;

Expand Down Expand Up @@ -123,12 +118,6 @@ class Settings extends Component {
resetStats={resetStats}
/>
</div>
<div className="col-md-12">
<Services
services={services}
setBlockedServices={setBlockedServices}
/>
</div>
</div>
</div>
)}
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions client/src/helpers/constants.js
View file
Expand Up @@ -161,6 +161,7 @@ export const FILTERS_URLS = {
dns_allowlists: '/dns_allowlists',
dns_rewrites: '/dns_rewrites',
custom_rules: '/custom_rules',
blocked_services: '/blocked_services',
};

export const SERVICES = [
Expand Down

0 comments on commit 4a81abb

Please sign in to comment.