Merge in DNS/adguard-home from ADG-9415 to master Squashed commit of the following: commit76bf99499aMerge:29529970a0389515eeAuthor: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 26 18:31:41 2025 +0300 Merge branch 'master' into ADG-9415 commit29529970a3Merge:b49790daf782a1a982Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 24 15:44:38 2025 +0300 Merge branch 'master' into ADG-9415 commitb49790daf8Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 15:30:18 2025 +0300 fix default lease duration value commitcb307472ecAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:35:26 2025 +0300 fix default response status commit115e743e1aAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:32:46 2025 +0300 fix upstream description commit26b0eddacaAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:40:41 2025 +0300 use const for test config file commit58faa7c537Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:31:04 2025 +0300 fix install config commit0a3346d911Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 17 15:25:23 2025 +0300 fix install check config commit17c4c26ea8Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 17:18:20 2025 +0300 fix query log commit14a2685ae3Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 15:52:36 2025 +0300 fix dhcp initial values commite7a8db7afdAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:37:24 2025 +0300 fix encryption form values commit1c8917f7acAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:07:29 2025 +0300 fix blocked services submit commit4dfa536ceaAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 13:50:47 2025 +0300 dns config ip validation commit4fee83fe13Author: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 12 17:49:54 2025 +0300 add playwright warning commit8c2f36e7a6Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 18:36:18 2025 +0300 fix config file name commit83db5f33dcAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 16:16:43 2025 +0300 temp config file commit9080c1620fAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 15:01:46 2025 +0300 update readme commitee1520307fMerge:fd12e33c02fe2d254bAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 14:44:06 2025 +0300 Merge branch 'master' into ADG-9415 commitfd12e33c06Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 10:29:43 2025 +0100 added typecheck on build, fixed eslint commitb3849eebc4Merge:225167a8b9bf3ee128Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 09:43:32 2025 +0100 Merge branch 'ADG-9415' of https://bit.int.agrd.dev/scm/dns/adguard-home into ADG-9415 ... and 94 more commits
152 lines
5.6 KiB
TypeScript
152 lines
5.6 KiB
TypeScript
import React from 'react';
|
|
import { Controller, useForm } from 'react-hook-form';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { useDispatch, useSelector } from 'react-redux';
|
|
|
|
import i18next from 'i18next';
|
|
import { clearDnsCache } from '../../../../actions/dnsConfig';
|
|
import { CACHE_CONFIG_FIELDS, UINT32_RANGE } from '../../../../helpers/constants';
|
|
import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';
|
|
import { RootState } from '../../../../initialState';
|
|
import { Checkbox } from '../../../ui/Controls/Checkbox';
|
|
|
|
const INPUTS_FIELDS = [
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_size,
|
|
title: i18next.t('cache_size'),
|
|
description: i18next.t('cache_size_desc'),
|
|
placeholder: i18next.t('enter_cache_size'),
|
|
},
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_ttl_min,
|
|
title: i18next.t('cache_ttl_min_override'),
|
|
description: i18next.t('cache_ttl_min_override_desc'),
|
|
placeholder: i18next.t('enter_cache_ttl_min_override'),
|
|
},
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_ttl_max,
|
|
title: i18next.t('cache_ttl_max_override'),
|
|
description: i18next.t('cache_ttl_max_override_desc'),
|
|
placeholder: i18next.t('enter_cache_ttl_max_override'),
|
|
},
|
|
];
|
|
|
|
type FormData = {
|
|
cache_size: number;
|
|
cache_ttl_min: number;
|
|
cache_ttl_max: number;
|
|
cache_optimistic: boolean;
|
|
};
|
|
|
|
type CacheFormProps = {
|
|
initialValues?: Partial<FormData>;
|
|
onSubmit: (data: FormData) => void;
|
|
};
|
|
|
|
const Form = ({ initialValues, onSubmit }: CacheFormProps) => {
|
|
const { t } = useTranslation();
|
|
const dispatch = useDispatch();
|
|
|
|
const { processingSetConfig } = useSelector((state: RootState) => state.dnsConfig);
|
|
|
|
const {
|
|
register,
|
|
handleSubmit,
|
|
watch,
|
|
control,
|
|
formState: { isSubmitting, isDirty },
|
|
} = useForm<FormData>({
|
|
mode: 'onBlur',
|
|
defaultValues: {
|
|
cache_size: initialValues?.cache_size || 0,
|
|
cache_ttl_min: initialValues?.cache_ttl_min || 0,
|
|
cache_ttl_max: initialValues?.cache_ttl_max || 0,
|
|
cache_optimistic: initialValues?.cache_optimistic || false,
|
|
},
|
|
});
|
|
|
|
const cache_ttl_min = watch('cache_ttl_min');
|
|
const cache_ttl_max = watch('cache_ttl_max');
|
|
|
|
const minExceedsMax = cache_ttl_min > 0 && cache_ttl_max > 0 && cache_ttl_min > cache_ttl_max;
|
|
|
|
const handleClearCache = () => {
|
|
if (window.confirm(t('confirm_dns_cache_clear'))) {
|
|
dispatch(clearDnsCache());
|
|
}
|
|
};
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit(onSubmit)}>
|
|
<div className="row">
|
|
{INPUTS_FIELDS.map(({ name, title, description, placeholder }) => (
|
|
<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">
|
|
{title}
|
|
</label>
|
|
|
|
<div className="form__desc form__desc--top">{description}</div>
|
|
|
|
<input
|
|
type="number"
|
|
data-testid={`dns_${name}`}
|
|
className="form-control"
|
|
placeholder={placeholder}
|
|
disabled={processingSetConfig}
|
|
min={0}
|
|
max={UINT32_RANGE.MAX}
|
|
{...register(name as keyof FormData, {
|
|
valueAsNumber: true,
|
|
setValueAs: (value) => replaceZeroWithEmptyString(value),
|
|
})}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
))}
|
|
{minExceedsMax && <span className="text-danger pl-3 pb-3">{t('ttl_cache_validation')}</span>}
|
|
</div>
|
|
|
|
<div className="row">
|
|
<div className="col-12 col-md-7">
|
|
<div className="form__group form__group--settings">
|
|
<Controller
|
|
name="cache_optimistic"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Checkbox
|
|
{...field}
|
|
data-testid="dns_cache_optimistic"
|
|
title={t('cache_optimistic')}
|
|
subtitle={t('cache_optimistic_desc')}
|
|
disabled={processingSetConfig}
|
|
/>
|
|
)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<button
|
|
type="submit"
|
|
data-testid="dns_save"
|
|
className="btn btn-success btn-standard btn-large"
|
|
disabled={isSubmitting || !isDirty || processingSetConfig || minExceedsMax}>
|
|
{t('save_btn')}
|
|
</button>
|
|
|
|
<button
|
|
type="button"
|
|
data-testid="dns_clear"
|
|
className="btn btn-outline-secondary btn-standard form__button"
|
|
onClick={handleClearCache}>
|
|
{t('clear_cache')}
|
|
</button>
|
|
</form>
|
|
);
|
|
};
|
|
|
|
export default Form;
|