Squashed commit of the following: commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba Merge: a23285ece2ddc82d
Author: Simon Zolin <s.zolin@adguard.com> Date: Wed Apr 22 19:16:01 2020 +0300 Merge remote-tracking branch 'origin/master' into 715 commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Apr 22 18:30:30 2020 +0300 Review changes commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Apr 21 16:37:42 2020 +0300 + client: Add fastest addr option commit 9e713df80c5bf113c98794c0a20915c756a76938 Merge: e3bf40379b7c1181
Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Apr 21 16:02:03 2020 +0300 Merge remote-tracking branch 'origin/master' into 715-fastest-addr commit e3bf4037f49198e42bde55305d6f9077341b556a Author: Simon Zolin <s.zolin@adguard.com> Date: Tue Apr 21 15:40:49 2020 +0300 minor commit d6e6a823c5e51acc061b2850d362772efcb827e1 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Apr 17 17:56:24 2020 +0300 * API changes . removed POST /set_upstreams_config . removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers . added new fields to /dns_config and /dns_info commit 237a452d09cc48ff8f00e81c7fd35e7828bea835 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Apr 17 16:43:13 2020 +0300 * API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config commit 9976723b9725ed19e0cce152d1d1198b13c4acc1 Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Mar 23 10:28:25 2020 +0300 openapi commit 6f8ea16c6332606f29095b0094d71e8a91798f82 Merge: 36e4d4e8c8285c41
Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Mar 20 19:18:48 2020 +0300 Merge remote-tracking branch 'origin/master' into 715-fastest-addr commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Mar 20 18:13:43 2020 +0300 + DNS: add fastest_addr setting
66 lines
2.0 KiB
JavaScript
66 lines
2.0 KiB
JavaScript
import React, { Component, Fragment } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { withNamespaces } from 'react-i18next';
|
|
|
|
import Upstream from './Upstream';
|
|
import Access from './Access';
|
|
import Config from './Config';
|
|
import PageTitle from '../../ui/PageTitle';
|
|
import Loading from '../../ui/Loading';
|
|
|
|
class Dns extends Component {
|
|
componentDidMount() {
|
|
this.props.getAccessList();
|
|
this.props.getDnsConfig();
|
|
}
|
|
|
|
render() {
|
|
const {
|
|
t,
|
|
settings,
|
|
access,
|
|
setAccessList,
|
|
testUpstream,
|
|
dnsConfig,
|
|
setDnsConfig,
|
|
} = this.props;
|
|
|
|
const isDataLoading = access.processing || dnsConfig.processingGetConfig;
|
|
|
|
return (
|
|
<Fragment>
|
|
<PageTitle title={t('dns_settings')} />
|
|
{isDataLoading ?
|
|
<Loading /> :
|
|
<Fragment>
|
|
<Config
|
|
dnsConfig={dnsConfig}
|
|
setDnsConfig={setDnsConfig}
|
|
/>
|
|
<Upstream
|
|
processingTestUpstream={settings.processingTestUpstream}
|
|
testUpstream={testUpstream}
|
|
dnsConfig={dnsConfig}
|
|
setDnsConfig={setDnsConfig}
|
|
/>
|
|
<Access access={access} setAccessList={setAccessList} />
|
|
</Fragment>}
|
|
</Fragment>
|
|
);
|
|
}
|
|
}
|
|
|
|
Dns.propTypes = {
|
|
settings: PropTypes.object.isRequired,
|
|
testUpstream: PropTypes.func.isRequired,
|
|
getAccessList: PropTypes.func.isRequired,
|
|
setAccessList: PropTypes.func.isRequired,
|
|
access: PropTypes.object.isRequired,
|
|
dnsConfig: PropTypes.object.isRequired,
|
|
setDnsConfig: PropTypes.func.isRequired,
|
|
getDnsConfig: PropTypes.func.isRequired,
|
|
t: PropTypes.func.isRequired,
|
|
};
|
|
|
|
export default withNamespaces()(Dns);
|