Merge in DNS/adguard-home from 3184-disable-ptr to master Updates #3184. Squashed commit of the following: commit b78ac2eeb1b408586808ddbd1c87107f373b11b0 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 17:20:34 2021 +0300 all: rename dns config field commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26 Author: Ildar Kamalov <ik@adguard.com> Date: Wed May 26 15:55:44 2021 +0300 client: handle local ips rdns commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 14:43:13 2021 +0300 all: imp naming commit 771b7a3d5d25f91408dd97ba3287efb641028ccf Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 14:24:38 2021 +0300 all: imp docs, code commit be960893e8bbb7375a944ca0345b50c857a2d7cf Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 13:23:56 2021 +0300 all: imp docs & log changes commit 4e645a520f6bb584ef951435ee833ad30769af98 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed May 26 12:49:44 2021 +0300 all: add the field into structs commit 22b5b6163f086560a3189234532ba877be7ba940 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue May 25 15:10:31 2021 +0300 dnsforward: entitle lock, imp code
69 lines
2.0 KiB
JavaScript
69 lines
2.0 KiB
JavaScript
import React from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
|
import Form from './Form';
|
|
import Card from '../../../ui/Card';
|
|
import { setDnsConfig } from '../../../../actions/dnsConfig';
|
|
|
|
const Upstream = () => {
|
|
const { t } = useTranslation();
|
|
const dispatch = useDispatch();
|
|
const {
|
|
upstream_dns,
|
|
bootstrap_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
} = useSelector((state) => state.dnsConfig, shallowEqual);
|
|
|
|
const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
|
|
|
|
const handleSubmit = (values) => {
|
|
const {
|
|
bootstrap_dns,
|
|
upstream_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
} = values;
|
|
|
|
const dnsConfig = {
|
|
bootstrap_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
...(upstream_dns_file ? null : { upstream_dns }),
|
|
};
|
|
|
|
dispatch(setDnsConfig(dnsConfig));
|
|
};
|
|
|
|
const upstreamDns = upstream_dns_file ? t('upstream_dns_configured_in_file', { path: upstream_dns_file }) : upstream_dns;
|
|
|
|
return <Card
|
|
title={t('upstream_dns')}
|
|
bodyType="card-body box-body--settings"
|
|
>
|
|
<div className="row">
|
|
<div className="col">
|
|
<Form
|
|
initialValues={{
|
|
upstream_dns: upstreamDns,
|
|
bootstrap_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
}}
|
|
onSubmit={handleSubmit}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</Card>;
|
|
};
|
|
|
|
export default Upstream;
|