Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master Updates #2704. Updates #2829. Updates #2928. Squashed commit of the following: commit 8c42355c0093a3ac6951f79a5211e7891800f93a Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Apr 7 18:07:41 2021 +0300 dnsforward: rm errors pkg commit 7594a21a620239951039454dd5686a872e6f41a8 Merge: 830b0834908452f8Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Apr 7 18:00:03 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.3 commit 830b0834090510096061fed20b600195ab3773b8 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Apr 7 17:47:51 2021 +0300 dnsforward: reduce local upstream timeout commit 493e81d9e8bacdc690f88af29a38d211b9733c7e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 19:11:00 2021 +0300 client: private_upstream test commit a0194ac28f15114578359b8c2460cd9af621e912 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 18:36:23 2021 +0300 all: expand api, fix conflicts commit 0f4e06836fed958391aa597c8b02453564980ca3 Merge: 89cf93ad8746005dAuthor: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 18:35:04 2021 +0300 Merge branch 'master' into 2704-local-addresses-vol.3 commit 89cf93ad4f26c2bf4f1b18ecaa4d3a1e169f9b06 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:02:40 2021 +0300 client: add local ptr upstreams to upstream test commit e6dd869dddd4888474d625cbb005bad6390e4760 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 15:24:22 2021 +0300 client: add private DNS form commit b858057b9a957a416117f22b8bd0025f90e8c758 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 13:05:28 2021 +0300 aghstrings: mk cloning correct commit 8009ba60a6a7d6ceb7b6483a29f4e68d533af243 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Apr 6 12:37:46 2021 +0300 aghstrings: fix lil bug commit 0dd19f2e7cc7c0de21517c37abd8336a907e1c0d Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 20:45:01 2021 +0300 all: log changes commit eb5558d96fffa6e7bca7e14d3740d26e47382e23 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 20:18:53 2021 +0300 dnsforward: keep the style commit d6d5fcbde40a633129c0e04887b81cf0b1ce6875 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 20:02:52 2021 +0300 dnsforward: disable redundant filtering for local ptr commit 4f864c32027d10db9bcb4a264d2338df8c20afac Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 17:53:17 2021 +0300 dnsforward: imp tests commit 7848e6f2341868f8ba0bb839956a0b7444cf02ca Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Apr 5 14:52:12 2021 +0300 all: imp code commit 19ac30653800eebf8aaee499f65560ae2d458a5a Author: Eugene Burkov <e.burkov@adguard.com> Date: Sun Apr 4 16:28:05 2021 +0300 all: mv more logic to aghstrings commit fac892ec5f0d2e30d6d64def0609267bbae4a202 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 20:23:23 2021 +0300 dnsforward: use filepath commit 05a3aeef1181b914788d14c7519287d467ab301f Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 20:17:54 2021 +0300 aghstrings: introduce the pkg commit f24e1b63d6e1bf266a4ed063f46f86d7abf65663 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 20:01:23 2021 +0300 all: imp code commit 0217a0ebb341f99a90c9b68013bebf6ff73d08ae Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Apr 2 18:04:13 2021 +0300 openapi: log changes ... and 3 more commits
271 lines
9.4 KiB
JavaScript
271 lines
9.4 KiB
JavaScript
import React, { useRef } from 'react';
|
|
import { useDispatch, useSelector } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import classnames from 'classnames';
|
|
import Examples from './Examples';
|
|
import { renderRadioField, renderTextareaField, CheckboxField } from '../../../../helpers/form';
|
|
import {
|
|
DNS_REQUEST_OPTIONS,
|
|
FORM_NAME,
|
|
isFirefox,
|
|
UPSTREAM_CONFIGURATION_WIKI_LINK,
|
|
} from '../../../../helpers/constants';
|
|
import { testUpstreamWithFormValues } from '../../../../actions';
|
|
import { removeEmptyLines, trimLinesAndRemoveEmpty } from '../../../../helpers/helpers';
|
|
import { getTextareaCommentsHighlight, syncScroll } from '../../../../helpers/highlightTextareaComments';
|
|
import '../../../ui/texareaCommentsHighlight.css';
|
|
|
|
const UPSTREAM_DNS_NAME = 'upstream_dns';
|
|
const UPSTREAM_MODE_NAME = 'upstream_mode';
|
|
|
|
const renderField = ({
|
|
name, component, type, className, placeholder,
|
|
subtitle, value, normalizeOnBlur, containerClass, onScroll,
|
|
}) => {
|
|
const { t } = useTranslation();
|
|
const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
|
|
const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);
|
|
|
|
return (
|
|
<div
|
|
key={placeholder}
|
|
className={classnames('col-12 mb-4', containerClass)}
|
|
>
|
|
<Field
|
|
id={name}
|
|
value={value}
|
|
name={name}
|
|
component={component}
|
|
type={type}
|
|
className={className}
|
|
placeholder={t(placeholder)}
|
|
subtitle={t(subtitle)}
|
|
disabled={processingSetConfig || processingTestUpstream}
|
|
normalizeOnBlur={normalizeOnBlur}
|
|
onScroll={onScroll}
|
|
/>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
renderField.propTypes = {
|
|
name: PropTypes.string.isRequired,
|
|
component: PropTypes.element.isRequired,
|
|
type: PropTypes.string.isRequired,
|
|
className: PropTypes.string,
|
|
placeholder: PropTypes.string.isRequired,
|
|
subtitle: PropTypes.string,
|
|
value: PropTypes.string,
|
|
normalizeOnBlur: PropTypes.func,
|
|
containerClass: PropTypes.string,
|
|
onScroll: PropTypes.func,
|
|
};
|
|
|
|
const renderTextareaWithHighlightField = (props) => {
|
|
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
|
|
const upstream_dns_file = useSelector((state) => state.dnsConfig.upstream_dns_file);
|
|
const ref = useRef(null);
|
|
|
|
const onScroll = (e) => syncScroll(e, ref);
|
|
|
|
return <>
|
|
{renderTextareaField({
|
|
...props,
|
|
disabled: !!upstream_dns_file,
|
|
onScroll,
|
|
normalizeOnBlur: trimLinesAndRemoveEmpty,
|
|
})}
|
|
{getTextareaCommentsHighlight(ref, upstream_dns)}
|
|
</>;
|
|
};
|
|
|
|
renderTextareaWithHighlightField.propTypes = {
|
|
className: PropTypes.string.isRequired,
|
|
disabled: PropTypes.bool,
|
|
id: PropTypes.string.isRequired,
|
|
input: PropTypes.object,
|
|
meta: PropTypes.object,
|
|
normalizeOnBlur: PropTypes.func,
|
|
onScroll: PropTypes.func,
|
|
placeholder: PropTypes.string.isRequired,
|
|
subtitle: PropTypes.string.isRequired,
|
|
type: PropTypes.string.isRequired,
|
|
};
|
|
|
|
const INPUT_FIELDS = [
|
|
{
|
|
name: UPSTREAM_DNS_NAME,
|
|
type: 'text',
|
|
component: renderTextareaWithHighlightField,
|
|
className: classnames('form-control form-control--textarea font-monospace text-input', {
|
|
'text-input--larger': isFirefox,
|
|
}),
|
|
containerClass: classnames('text-edit-container', {
|
|
'mb-4': !isFirefox,
|
|
'mb-6': isFirefox,
|
|
}),
|
|
placeholder: 'upstream_dns',
|
|
normalizeOnBlur: removeEmptyLines,
|
|
},
|
|
{
|
|
name: UPSTREAM_MODE_NAME,
|
|
type: 'radio',
|
|
value: DNS_REQUEST_OPTIONS.LOAD_BALANCING,
|
|
component: renderRadioField,
|
|
subtitle: 'load_balancing_desc',
|
|
placeholder: 'load_balancing',
|
|
},
|
|
{
|
|
name: UPSTREAM_MODE_NAME,
|
|
type: 'radio',
|
|
value: DNS_REQUEST_OPTIONS.PARALLEL,
|
|
component: renderRadioField,
|
|
subtitle: 'upstream_parallel',
|
|
placeholder: 'parallel_requests',
|
|
},
|
|
{
|
|
name: UPSTREAM_MODE_NAME,
|
|
type: 'radio',
|
|
value: DNS_REQUEST_OPTIONS.FASTEST_ADDR,
|
|
component: renderRadioField,
|
|
subtitle: 'fastest_addr_desc',
|
|
placeholder: 'fastest_addr',
|
|
},
|
|
];
|
|
|
|
const Form = ({
|
|
submitting, invalid, handleSubmit,
|
|
}) => {
|
|
const dispatch = useDispatch();
|
|
const { t } = useTranslation();
|
|
const upstream_dns = useSelector((store) => store.form[FORM_NAME.UPSTREAM].values.upstream_dns);
|
|
const processingTestUpstream = useSelector((state) => state.settings.processingTestUpstream);
|
|
const processingSetConfig = useSelector((state) => state.dnsConfig.processingSetConfig);
|
|
|
|
const handleUpstreamTest = () => dispatch(testUpstreamWithFormValues());
|
|
|
|
const testButtonClass = classnames('btn btn-primary btn-standard mr-2', {
|
|
'btn-loading': processingTestUpstream,
|
|
});
|
|
|
|
const components = {
|
|
a: <a href={UPSTREAM_CONFIGURATION_WIKI_LINK} target="_blank"
|
|
rel="noopener noreferrer" />,
|
|
};
|
|
|
|
return <form onSubmit={handleSubmit} className="form--upstream">
|
|
<div className="row">
|
|
<label className="col form__label" htmlFor={UPSTREAM_DNS_NAME}>
|
|
<Trans components={components}>upstream_dns_help</Trans>
|
|
{' '}
|
|
<Trans components={[
|
|
<a
|
|
href="https://kb.adguard.com/general/dns-providers"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="0"
|
|
>
|
|
DNS providers
|
|
</a>,
|
|
]}>
|
|
dns_providers
|
|
</Trans>
|
|
</label>
|
|
{INPUT_FIELDS.map(renderField)}
|
|
<div className="col-12">
|
|
<Examples />
|
|
<hr />
|
|
</div>
|
|
<div className="col-12 mb-4">
|
|
<label
|
|
className="form__label form__label--with-desc"
|
|
htmlFor="bootstrap_dns"
|
|
>
|
|
<Trans>bootstrap_dns</Trans>
|
|
</label>
|
|
<div className="form__desc form__desc--top">
|
|
<Trans>bootstrap_dns_desc</Trans>
|
|
</div>
|
|
<Field
|
|
id="bootstrap_dns"
|
|
name="bootstrap_dns"
|
|
component={renderTextareaField}
|
|
type="text"
|
|
className="form-control form-control--textarea form-control--textarea-small font-monospace"
|
|
placeholder={t('bootstrap_dns')}
|
|
disabled={processingSetConfig}
|
|
normalizeOnBlur={removeEmptyLines}
|
|
/>
|
|
</div>
|
|
<div className="col-12">
|
|
<hr />
|
|
</div>
|
|
<div className="col-12 mb-4">
|
|
<label
|
|
className="form__label form__label--with-desc"
|
|
htmlFor="local_ptr"
|
|
>
|
|
<Trans>local_ptr_title</Trans>
|
|
</label>
|
|
<div className="form__desc form__desc--top">
|
|
<Trans>local_ptr_desc</Trans>
|
|
</div>
|
|
<Field
|
|
id="local_ptr_upstreams"
|
|
name="local_ptr_upstreams"
|
|
component={renderTextareaField}
|
|
type="text"
|
|
className="form-control form-control--textarea form-control--textarea-small font-monospace"
|
|
placeholder={t('local_ptr_placeholder')}
|
|
disabled={processingSetConfig}
|
|
normalizeOnBlur={removeEmptyLines}
|
|
/>
|
|
</div>
|
|
<div className="col-12 mb-4">
|
|
<Field
|
|
name="resolve_clients"
|
|
type="checkbox"
|
|
component={CheckboxField}
|
|
placeholder={t('resolve_clients_title')}
|
|
subtitle={t('resolve_clients_desc')}
|
|
disabled={processingSetConfig}
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div className="card-actions">
|
|
<div className="btn-list">
|
|
<button
|
|
type="button"
|
|
className={testButtonClass}
|
|
onClick={handleUpstreamTest}
|
|
disabled={!upstream_dns || processingTestUpstream}
|
|
>
|
|
<Trans>test_upstream_btn</Trans>
|
|
</button>
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard"
|
|
disabled={
|
|
submitting || invalid || processingSetConfig || processingTestUpstream
|
|
}
|
|
>
|
|
<Trans>apply_btn</Trans>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>;
|
|
};
|
|
|
|
Form.propTypes = {
|
|
handleSubmit: PropTypes.func,
|
|
submitting: PropTypes.bool,
|
|
invalid: PropTypes.bool,
|
|
initialValues: PropTypes.object,
|
|
upstream_dns: PropTypes.string,
|
|
bootstrap_dns: PropTypes.string,
|
|
};
|
|
|
|
export default reduxForm({ form: FORM_NAME.UPSTREAM })(Form);
|