Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge:4c89cf7201085d59a6Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit4c89cf7209Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commitb943f2011fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commitcd1be2d66dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit7b8ac01fc2Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit02afed66d5Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit9c0f736f0cMerge:62c4fbf1ee04775c4fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit62c4fbf1e3Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit76b1e44a93Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commitf783e90040Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit3d4ce6554cAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commite35ba58f2aAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit1f30d4216dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit6cd4e44f07Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit2ab738b303Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
124 lines
4.7 KiB
TypeScript
124 lines
4.7 KiB
TypeScript
import React from 'react';
|
|
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
|
|
|
import { renderInputField, toNumber, CheckboxField } from '../../../../helpers/form';
|
|
import { CACHE_CONFIG_FIELDS, FORM_NAME, UINT32_RANGE } from '../../../../helpers/constants';
|
|
|
|
import { replaceZeroWithEmptyString } from '../../../../helpers/helpers';
|
|
import { clearDnsCache } from '../../../../actions/dnsConfig';
|
|
import { RootState } from '../../../../initialState';
|
|
|
|
const INPUTS_FIELDS = [
|
|
{
|
|
name: CACHE_CONFIG_FIELDS.cache_size,
|
|
title: 'cache_size',
|
|
description: 'cache_size_desc',
|
|
placeholder: 'enter_cache_size',
|
|
},
|
|
{
|
|
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',
|
|
},
|
|
];
|
|
|
|
interface CacheFormProps {
|
|
handleSubmit: (...args: unknown[]) => string;
|
|
submitting: boolean;
|
|
invalid: boolean;
|
|
}
|
|
|
|
const Form = ({ handleSubmit, submitting, invalid }: CacheFormProps) => {
|
|
const { t } = useTranslation();
|
|
const dispatch = useDispatch();
|
|
|
|
const { processingSetConfig } = useSelector((state: RootState) => state.dnsConfig, shallowEqual);
|
|
const { cache_ttl_max, cache_ttl_min } = useSelector(
|
|
(state: RootState) => state.form[FORM_NAME.CACHE].values,
|
|
shallowEqual,
|
|
);
|
|
|
|
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}>
|
|
<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">
|
|
{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}
|
|
className="form-control"
|
|
normalizeOnBlur={replaceZeroWithEmptyString}
|
|
normalize={toNumber}
|
|
min={0}
|
|
max={UINT32_RANGE.MAX}
|
|
/>
|
|
</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">
|
|
<Field
|
|
name="cache_optimistic"
|
|
type="checkbox"
|
|
component={CheckboxField}
|
|
placeholder={t('cache_optimistic')}
|
|
disabled={processingSetConfig}
|
|
subtitle={t('cache_optimistic_desc')}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard btn-large"
|
|
disabled={submitting || invalid || processingSetConfig || minExceedsMax}>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
|
|
<button
|
|
type="button"
|
|
className="btn btn-outline-secondary btn-standard form__button"
|
|
onClick={handleClearCache}>
|
|
<Trans>clear_cache</Trans>
|
|
</button>
|
|
</form>
|
|
);
|
|
};
|
|
|
|
export default reduxForm({ form: FORM_NAME.CACHE })(Form);
|