mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-03-14 14:38:29 +03:00
Merge in DNS/adguard-home from 1472-edns-custom-ip-api to master Updates #1472 Squashed commit of the following: commit 7605ec5bd5467ddd28a650385193eb2332653bb6 Merge: 8b2ac227194ead34
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 13:39:25 2023 +0300 Merge branch 'master' into 1472-edns-custom-ip-api commit 8b2ac22793a51d2555d32c1f5b5c118118807d1f Merge: d5ca8b6ec3edab43
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 18:26:55 2023 +0300 Merge branch 'master' into 1472-edns-custom-ip-api commit d5ca8b6e1d87480d4ee4afd346e6bf04907fca95 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 18:26:24 2023 +0300 dnsforward: imp tests commit 1302586d22812c22755ea1c7e7fcd32330d707c5 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 16:47:56 2023 +0200 client: change validation for custom edns ip commit 44e4dc6d1e47de6597ed9ee328db9639e38b4868 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 16:31:42 2023 +0200 client: implement edns custom ip commit 8a3e7ad8ebf16262818821340da23baa5f004bff Merge: 04ac1112f736d85e
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 15:04:40 2023 +0300 Merge branch 'master' into 1472-edns-custom-ip-api commit 04ac1112dda2e778243555b2f54819e5ba586e05 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 15:03:39 2023 +0300 dnsforward: imp tests commit b44f6d0ccb3ba7b7a5be07c9cf293dad9c83c794 Merge: 19c6851e48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:55:49 2023 +0300 Merge branch 'master' into 1472-edns-custom-ip-api commit 19c6851e30f30b0572334822e8639e03760de986 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 10 10:40:15 2023 +0300 all: fix chlog commit 6dcdcbd666ebf3a56a38251e8ead09c605068ce3 Merge: a7f1bf71a2053526
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 10 10:23:37 2023 +0300 Merge branch 'master' into 1472-edns-custom-ip-api commit a7f1bf715e3557c710b700b9bd923868eb07715b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 7 19:24:18 2023 +0300 home: fix default value commit 0311a9bb6571975963d747ef4ef427b59dca03bc Merge: 7e0bb3df1011b8f9
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 7 19:04:18 2023 +0300 Merge branch 'master' into 1472-edns-custom-ip-api commit 7e0bb3df78f10f4b4ae0fd49681d1aa0040521c5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 7 19:03:24 2023 +0300 all: fix chlog commit 202d7ccf4721ccf39726da01d237e07317bfaa58 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 7 11:35:41 2023 +0300 dnsforward: fix typo commit fe95e003a0c3b316a44b5ec0b848a60ddd4c85cf Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 7 11:28:21 2023 +0300 all: fix docs commit 66835a9aa22b3015f9238c1d6f5aa9bd6067db8a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 7 10:48:08 2023 +0300 dnsforward: add todo commit b58255e1e6660a8229bb9c40f2acddebb3dbdc66 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 6 15:40:02 2023 +0300 all: upd chlog commit 9b2be7facba30c815144e08a7835353cad14c405 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 11:22:19 2023 +0300 dnsforward: edns custom ip api
199 lines
7.1 KiB
JavaScript
199 lines
7.1 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { shallowEqual, useSelector } from 'react-redux';
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import {
|
|
renderInputField,
|
|
renderRadioField,
|
|
CheckboxField,
|
|
toNumber,
|
|
} from '../../../../helpers/form';
|
|
import {
|
|
validateIpv4,
|
|
validateIpv6,
|
|
validateRequiredValue,
|
|
validateIp,
|
|
} from '../../../../helpers/validators';
|
|
import { BLOCKING_MODES, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
|
|
|
|
const checkboxes = [
|
|
{
|
|
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: validateIpv4,
|
|
},
|
|
{
|
|
description: 'blocking_ipv6_desc',
|
|
name: 'blocking_ipv6',
|
|
validateIp: validateIpv6,
|
|
},
|
|
];
|
|
|
|
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}
|
|
/>
|
|
));
|
|
|
|
const Form = ({
|
|
handleSubmit, submitting, invalid, processing,
|
|
}) => {
|
|
const { t } = useTranslation();
|
|
const {
|
|
blocking_mode,
|
|
edns_cs_enabled,
|
|
edns_cs_use_custom,
|
|
} = useSelector((state) => state.form[FORM_NAME.BLOCKING_MODE].values ?? {}, shallowEqual);
|
|
|
|
return <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={validateRequiredValue}
|
|
min={UINT32_RANGE.MIN}
|
|
max={UINT32_RANGE.MAX}
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div className="col-12">
|
|
<div className="form__group form__group--settings">
|
|
<Field
|
|
name="edns_cs_enabled"
|
|
type="checkbox"
|
|
component={CheckboxField}
|
|
placeholder={t('edns_enable')}
|
|
disabled={processing}
|
|
subtitle={t('edns_cs_desc')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div className="col-12 form__group form__group--inner">
|
|
<div className="form__group ">
|
|
<Field
|
|
name="edns_cs_use_custom"
|
|
type="checkbox"
|
|
component={CheckboxField}
|
|
placeholder={t('edns_use_custom_ip')}
|
|
disabled={processing || !edns_cs_enabled}
|
|
subtitle={t('edns_use_custom_ip_desc')}
|
|
/>
|
|
</div>
|
|
|
|
{edns_cs_use_custom && (<Field
|
|
name="edns_cs_custom_ip"
|
|
component={renderInputField}
|
|
className="form-control"
|
|
placeholder={t('form_enter_ip')}
|
|
validate={[validateIp, validateRequiredValue]}
|
|
/>)}
|
|
|
|
</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={CheckboxField}
|
|
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>
|
|
{blocking_mode === BLOCKING_MODES.custom_ip && (
|
|
<>
|
|
{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, validateRequiredValue]}
|
|
/>
|
|
</div>
|
|
</div>)}
|
|
</>
|
|
)}
|
|
</div>
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard btn-large"
|
|
disabled={submitting || invalid || processing}
|
|
>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
</form>;
|
|
};
|
|
|
|
Form.propTypes = {
|
|
handleSubmit: PropTypes.func.isRequired,
|
|
submitting: PropTypes.bool.isRequired,
|
|
invalid: PropTypes.bool.isRequired,
|
|
processing: PropTypes.bool.isRequired,
|
|
};
|
|
|
|
export default reduxForm({ form: FORM_NAME.BLOCKING_MODE })(Form);
|