mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-04-14 13:23:32 +03:00
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
174 lines
5.8 KiB
JavaScript
174 lines
5.8 KiB
JavaScript
import React, { Fragment } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { connect } from 'react-redux';
|
|
import { Field, reduxForm, formValueSelector } from 'redux-form';
|
|
import { Trans, withNamespaces } from 'react-i18next';
|
|
import flow from 'lodash/flow';
|
|
|
|
import {
|
|
renderInputField,
|
|
renderRadioField,
|
|
renderSelectField,
|
|
required,
|
|
ipv4,
|
|
ipv6,
|
|
biggerOrEqualZero,
|
|
toNumber,
|
|
} from '../../../../helpers/form';
|
|
import { BLOCKING_MODES } from '../../../../helpers/constants';
|
|
|
|
const checkboxes = [{
|
|
name: 'edns_cs_enabled',
|
|
placeholder: 'edns_enable',
|
|
subtitle: 'edns_cs_desc',
|
|
},
|
|
{
|
|
name: 'dnssec_enabled',
|
|
placeholder: 'dnssec_enable',
|
|
subtitle: 'dnssec_enable_desc',
|
|
},
|
|
{
|
|
name: 'disable_ipv6',
|
|
placeholder: 'disable_ipv6',
|
|
subtitle: 'disable_ipv6_desc',
|
|
}];
|
|
|
|
const customIps = [{
|
|
description: 'blocking_ipv4_desc',
|
|
name: 'blocking_ipv4',
|
|
validateIp: ipv4,
|
|
},
|
|
{
|
|
description: 'blocking_ipv6_desc',
|
|
name: 'blocking_ipv6',
|
|
validateIp: ipv6,
|
|
}];
|
|
|
|
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
|
|
.map(mode => (
|
|
<Field
|
|
key={mode}
|
|
name="blocking_mode"
|
|
type="radio"
|
|
component={renderRadioField}
|
|
value={mode}
|
|
placeholder={t(mode)}
|
|
disabled={processing}
|
|
/>
|
|
));
|
|
|
|
let Form = ({
|
|
handleSubmit, submitting, invalid, processing, blockingMode, t,
|
|
}) =>
|
|
<form onSubmit={handleSubmit}>
|
|
<div className="row">
|
|
<div className="col-12 col-sm-6">
|
|
<div className="form__group form__group--settings">
|
|
<label htmlFor="ratelimit"
|
|
className="form__label form__label--with-desc">
|
|
<Trans>rate_limit</Trans>
|
|
</label>
|
|
<div className="form__desc form__desc--top">
|
|
<Trans>rate_limit_desc</Trans>
|
|
</div>
|
|
<Field
|
|
name="ratelimit"
|
|
type="number"
|
|
component={renderInputField}
|
|
className="form-control"
|
|
placeholder={t('form_enter_rate_limit')}
|
|
normalize={toNumber}
|
|
validate={[required, biggerOrEqualZero]}
|
|
/>
|
|
</div>
|
|
</div>
|
|
{checkboxes.map(({ name, placeholder, subtitle }) =>
|
|
<div className="col-12" key={name}>
|
|
<div className="form__group form__group--settings">
|
|
<Field
|
|
name={name}
|
|
type="checkbox"
|
|
component={renderSelectField}
|
|
placeholder={t(placeholder)}
|
|
disabled={processing}
|
|
subtitle={t(subtitle)}
|
|
/>
|
|
</div>
|
|
</div>)}
|
|
<div className="col-12">
|
|
<div className="form__group form__group--settings mb-4">
|
|
<label className="form__label form__label--with-desc">
|
|
<Trans>blocking_mode</Trans>
|
|
</label>
|
|
<div className="form__desc form__desc--top">
|
|
{Object.values(BLOCKING_MODES)
|
|
.map(mode => (
|
|
<li key={mode}>
|
|
<Trans>{`blocking_mode_${mode}`}</Trans>
|
|
</li>
|
|
))}
|
|
</div>
|
|
<div className="custom-controls-stacked">
|
|
{getFields(processing, t)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{blockingMode === BLOCKING_MODES.custom_ip && (
|
|
<Fragment>
|
|
{customIps.map(({
|
|
description,
|
|
name,
|
|
validateIp,
|
|
}) => <div className="col-12 col-sm-6" key={name}>
|
|
<div className="form__group form__group--settings">
|
|
<label className="form__label form__label--with-desc"
|
|
htmlFor={name}><Trans>{name}</Trans>
|
|
</label>
|
|
<div className="form__desc form__desc--top">
|
|
<Trans>{description}</Trans>
|
|
</div>
|
|
<Field
|
|
name={name}
|
|
component={renderInputField}
|
|
className="form-control"
|
|
placeholder={t('form_enter_ip')}
|
|
validate={[validateIp, required]}
|
|
/>
|
|
</div>
|
|
</div>)}
|
|
</Fragment>
|
|
)}
|
|
</div>
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard btn-large"
|
|
disabled={submitting || invalid || processing}
|
|
>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
</form>;
|
|
|
|
Form.propTypes = {
|
|
blockingMode: PropTypes.string.isRequired,
|
|
handleSubmit: PropTypes.func.isRequired,
|
|
submitting: PropTypes.bool.isRequired,
|
|
invalid: PropTypes.bool.isRequired,
|
|
processing: PropTypes.bool.isRequired,
|
|
t: PropTypes.func.isRequired,
|
|
};
|
|
|
|
const selector = formValueSelector('blockingModeForm');
|
|
|
|
Form = connect((state) => {
|
|
const blockingMode = selector(state, 'blocking_mode');
|
|
return {
|
|
blockingMode,
|
|
};
|
|
})(Form);
|
|
|
|
export default flow([
|
|
withNamespaces(),
|
|
reduxForm({
|
|
form: 'blockingModeForm',
|
|
}),
|
|
])(Form);
|