mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-03 21:39:38 +00:00
Close #2091 #2094 #2056
Squashed commit of the following:
commit a84384bb409bfe60c4bd6477b2249c4431aa3b63
Merge: cdc5f27f a22db5f3
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 19:59:47 2020 +0300
Merge branch 'master' into fix/2091
commit cdc5f27f279f33c7d988f2927adc172e77e0a6af
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 15:41:00 2020 +0300
Fix uint32 fields validation
commit 0c6fcb90f9741ae8a33bf6c4d53bd954f2033a88
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 14:43:20 2020 +0300
Validate DNS cache configuration DNS values unit32 range
commit 1f90a1fcbc04f6c7ffb75b453e5c67e117d1c5bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Sep 14 12:11:39 2020 +0300
Remove the limit on cache-min-ttl
commit 72e961034cc5752a50a4afc57c7be6a93d652f7d
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Sep 11 16:50:19 2020 +0300
Fix translation
commit 6aebf4b87bb806ac0729b40418ba6056b3f71afa
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Sep 11 12:53:01 2020 +0300
- client: Allow change minimum TTL override in UI
93 lines
3.4 KiB
JavaScript
93 lines
3.4 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import { shallowEqual, useSelector } from 'react-redux';
|
|
import { renderInputField, toNumber } from '../../../../helpers/form';
|
|
import { validateRequiredValue } from '../../../../helpers/validators';
|
|
import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
|
|
|
|
const getInputFields = (validateRequiredValue) => [
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_size,
|
|
title: 'cache_size',
|
|
description: 'cache_size_desc',
|
|
placeholder: 'enter_cache_size',
|
|
validate: validateRequiredValue,
|
|
},
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_ttl_min,
|
|
title: 'cache_ttl_min_override',
|
|
description: 'cache_ttl_min_override_desc',
|
|
placeholder: 'enter_cache_ttl_min_override',
|
|
},
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_ttl_max,
|
|
title: 'cache_ttl_max_override',
|
|
description: 'cache_ttl_max_override_desc',
|
|
placeholder: 'enter_cache_ttl_max_override',
|
|
},
|
|
];
|
|
|
|
const Form = ({
|
|
handleSubmit, submitting, invalid,
|
|
}) => {
|
|
const { t } = useTranslation();
|
|
|
|
const { processingSetConfig } = useSelector((state) => state.dnsConfig, shallowEqual);
|
|
const {
|
|
cache_ttl_max, cache_ttl_min,
|
|
} = useSelector((state) => state.form[FORM_NAME.CACHE].values, shallowEqual);
|
|
|
|
const minExceedsMax = typeof cache_ttl_min === 'number'
|
|
&& typeof cache_ttl_max === 'number'
|
|
&& cache_ttl_min > cache_ttl_max;
|
|
|
|
const INPUTS_FIELDS = getInputFields(validateRequiredValue);
|
|
|
|
return <form onSubmit={handleSubmit}>
|
|
<div className="row">
|
|
{INPUTS_FIELDS.map(({
|
|
name, title, description, placeholder, validate, min = 0, max = UINT32_RANGE.MAX,
|
|
}) => <div className="col-12" key={name}>
|
|
<div className="col-12 col-md-7 p-0">
|
|
<div className="form__group form__group--settings">
|
|
<label htmlFor={name}
|
|
className="form__label form__label--with-desc">{t(title)}</label>
|
|
<div className="form__desc form__desc--top">{t(description)}</div>
|
|
<Field
|
|
name={name}
|
|
type="number"
|
|
component={renderInputField}
|
|
placeholder={t(placeholder)}
|
|
disabled={processingSetConfig}
|
|
normalize={toNumber}
|
|
className="form-control"
|
|
validate={validate}
|
|
min={min}
|
|
max={max}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>)}
|
|
{minExceedsMax
|
|
&& <span className="text-danger pl-3 pb-3">{t('ttl_cache_validation')}</span>}
|
|
</div>
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard btn-large"
|
|
disabled={submitting || invalid || processingSetConfig || minExceedsMax}
|
|
>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
</form>;
|
|
};
|
|
|
|
Form.propTypes = {
|
|
handleSubmit: PropTypes.func.isRequired,
|
|
submitting: PropTypes.bool.isRequired,
|
|
invalid: PropTypes.bool.isRequired,
|
|
};
|
|
|
|
export default reduxForm({ form: FORM_NAME.CACHE })(Form);
|