Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge:4c89cf7201085d59a6Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit4c89cf7209Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commitb943f2011fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commitcd1be2d66dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit7b8ac01fc2Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit02afed66d5Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit9c0f736f0cMerge:62c4fbf1ee04775c4fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit62c4fbf1e3Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit76b1e44a93Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commitf783e90040Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit3d4ce6554cAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commite35ba58f2aAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit1f30d4216dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit6cd4e44f07Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit2ab738b303Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
77 lines
2.3 KiB
TypeScript
77 lines
2.3 KiB
TypeScript
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';
|
|
import { RootState } from '../../../../initialState';
|
|
|
|
const Upstream = () => {
|
|
const { t } = useTranslation();
|
|
const dispatch = useDispatch();
|
|
const {
|
|
upstream_dns,
|
|
fallback_dns,
|
|
bootstrap_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
} = useSelector((state: RootState) => state.dnsConfig, shallowEqual);
|
|
|
|
const upstream_dns_file = useSelector((state: RootState) => state.dnsConfig.upstream_dns_file);
|
|
|
|
const handleSubmit = (values: any) => {
|
|
const {
|
|
fallback_dns,
|
|
bootstrap_dns,
|
|
upstream_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
} = values;
|
|
|
|
const dnsConfig = {
|
|
fallback_dns,
|
|
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,
|
|
fallback_dns,
|
|
bootstrap_dns,
|
|
upstream_mode,
|
|
resolve_clients,
|
|
local_ptr_upstreams,
|
|
use_private_ptr_resolvers,
|
|
}}
|
|
onSubmit={handleSubmit}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</Card>
|
|
);
|
|
};
|
|
|
|
export default Upstream;
|