Close #1597 Squashed commit of the following: commit 1eb89586dd71260e561420fe669abc8b56a506a1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 14:54:10 2020 +0300 Fix translation in install options commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed May 20 13:11:34 2020 +0300 Remove commented code commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 19:02:49 2020 +0300 Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version commit 3fcf73fb14cd9da508522d1a300b66af24da95e5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 17:30:37 2020 +0300 Remove all unused dependencies commit e761810e3e54e188ada41245bdce7414cd0f03e8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:35:24 2020 +0300 Remove unused dependencies commit d89d27da6befcaabcdc12bf5e7e94cbb24140010 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 16:14:09 2020 +0300 Update regular dependencies commit d2dfd01233d059870d5173ffd748cf61a477936f Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 15:34:10 2020 +0300 Update all dev dependancies commit 02b6fb480e9d310039fbe9b7aae062a41128f070 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 14:14:44 2020 +0300 Update all postcss packages commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:45:02 2020 +0300 Prevent git from converting linebreaks in .js files commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:43:01 2020 +0300 Prevent git from converting linebreaks in .js files commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue May 19 12:24:47 2020 +0300 Remove linebreak-style eslint rule commit df893dec53adebb1d662fe805fab508fd4ed5e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 20:55:47 2020 +0300 Add prop types commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 18:52:07 2020 +0300 Update eslint and babel, fix eslint warnings commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon May 18 16:45:49 2020 +0300 Update css loading webpack rules commit 247fa1ed548ef0706a03fdada8309c1454d191f8 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 16:13:49 2020 +0300 Suppress linebreak-style eslint error for Windows commit d6499aac507100d6918c849c06d739d80f2229f0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:55:07 2020 +0300 Suppress eslint exit code commit ae2d6c614ea23a90d515168f8752e959298894ef Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 14:05:18 2020 +0300 Edit css file warnings commit 60675050f2a5baebc679fc05da7e033e5c740d90 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 13:10:26 2020 +0300 Remove uglifyjs plugin commit a27806434dd8672e71a26c7a2e810d77e5e229fa Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:29:17 2020 +0300 Fix DefinePlugin value commit 8f2966ca59195c2f70bca5072d20515d536f42a6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Sat May 16 01:05:03 2020 +0300 Update webpack
173 lines
5.8 KiB
JavaScript
173 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, withTranslation } 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([
|
|
withTranslation(),
|
|
reduxForm({
|
|
form: 'blockingModeForm',
|
|
}),
|
|
])(Form);
|