mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- client: Fix DNS settings

This commit is contained in:
ArtemBaskal 2020-08-13 18:12:27 +03:00
parent 2f8e34e73b
commit 8ea1e64c7b
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/components/Settings/Dns/Upstream/Form.js
View File

@ -52,10 +52,11 @@ const Form = ({
submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit, submitting, invalid, processingSetConfig, processingTestUpstream, handleSubmit,
}) => { }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const [t] = useTranslation(); const { t } = useTranslation();
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns); const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
const bootstrap_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM] const bootstrap_dns = useSelector(
.values.bootstrap_dns); (store) => store.form[FORM_NAME.UPSTREAM].values.bootstrap_dns,
);
const handleUpstreamTest = () => dispatch(testUpstream({ const handleUpstreamTest = () => dispatch(testUpstream({
upstream_dns, upstream_dns,

44
client/src/components/Settings/Dns/Upstream/index.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { shallowEqual, useDispatch } from 'react-redux'; import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import Form from './Form'; import Form from './Form';
import Card from '../../../ui/Card'; import Card from '../../../ui/Card';
import { setDnsConfig } from '../../../../actions/dnsConfig'; import { setDnsConfig } from '../../../../actions/dnsConfig';
@ -13,7 +13,7 @@ const Upstream = () => {
bootstrap_dns, bootstrap_dns,
upstream_mode, upstream_mode,
processingSetConfig, processingSetConfig,
} = ((state) => state.dnsConfig, shallowEqual); } = useSelector((state) => state.dnsConfig, shallowEqual);
const { processingTestUpstream } = ((state) => state.settings, shallowEqual); const { processingTestUpstream } = ((state) => state.settings, shallowEqual);
@ -21,28 +21,26 @@ const Upstream = () => {
dispatch(setDnsConfig(values)); dispatch(setDnsConfig(values));
}; };
return ( return <Card
<Card title={t('upstream_dns')}
title={t('upstream_dns')} subtitle={t('upstream_dns_hint')}
subtitle={t('upstream_dns_hint')} bodyType="card-body box-body--settings"
bodyType="card-body box-body--settings" >
> <div className="row">
<div className="row"> <div className="col">
<div className="col"> <Form
<Form initialValues={{
initialValues={{ upstream_dns,
upstream_dns, bootstrap_dns,
bootstrap_dns, upstream_mode,
upstream_mode, }}
}} onSubmit={handleSubmit}
onSubmit={handleSubmit} processingTestUpstream={processingTestUpstream}
processingTestUpstream={processingTestUpstream} processingSetConfig={processingSetConfig}
processingSetConfig={processingSetConfig} />
/>
</div>
</div> </div>
</Card> </div>
); </Card>;
}; };
export default Upstream; export default Upstream;