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
191 lines
7.0 KiB
TypeScript
191 lines
7.0 KiB
TypeScript
import React from 'react';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import { Controller, useForm } from 'react-hook-form';
|
|
import i18next from 'i18next';
|
|
import cn from 'classnames';
|
|
|
|
import { getPathWithQueryString } from '../../../helpers/helpers';
|
|
import { CLIENT_ID_LINK, MOBILE_CONFIG_LINKS, STANDARD_HTTPS_PORT } from '../../../helpers/constants';
|
|
import { toNumber } from '../../../helpers/form';
|
|
import {
|
|
validateConfigClientId,
|
|
validateServerName,
|
|
validatePort,
|
|
validateIsSafePort,
|
|
} from '../../../helpers/validators';
|
|
import { Input } from '../Controls/Input';
|
|
import { Select } from '../Controls/Select';
|
|
|
|
const getDownloadLink = (host: string, clientId: string, protocol: string, invalid: boolean) => {
|
|
if (!host || invalid) {
|
|
return (
|
|
<button type="button" className="btn btn-success btn-standard btn-large disabled">
|
|
{i18next.t('download_mobileconfig')}
|
|
</button>
|
|
);
|
|
}
|
|
|
|
const linkParams: { host: string; client_id?: string } = { host };
|
|
|
|
if (clientId) {
|
|
linkParams.client_id = clientId;
|
|
}
|
|
|
|
return (
|
|
<a
|
|
href={getPathWithQueryString(protocol, linkParams)}
|
|
className={cn('btn btn-success btn-standard btn-large')}
|
|
download>
|
|
{i18next.t('download_mobileconfig')}
|
|
</a>
|
|
);
|
|
};
|
|
|
|
type FormValues = {
|
|
host: string;
|
|
clientId: string;
|
|
protocol: string;
|
|
port?: number;
|
|
};
|
|
|
|
type Props = {
|
|
initialValues?: FormValues;
|
|
};
|
|
|
|
const defaultFormValues = {
|
|
host: '',
|
|
clientId: '',
|
|
protocol: MOBILE_CONFIG_LINKS.DOT,
|
|
port: undefined,
|
|
};
|
|
|
|
export const MobileConfigForm = ({ initialValues }: Props) => {
|
|
const { t } = useTranslation();
|
|
|
|
const {
|
|
watch,
|
|
control,
|
|
formState: { isValid },
|
|
} = useForm<FormValues>({
|
|
mode: 'onBlur',
|
|
defaultValues: {
|
|
...defaultFormValues,
|
|
...initialValues,
|
|
},
|
|
});
|
|
|
|
const protocol = watch('protocol');
|
|
const host = watch('host');
|
|
const clientId = watch('clientId');
|
|
const port = watch('port');
|
|
|
|
const getHostName = () => {
|
|
if (port && port !== STANDARD_HTTPS_PORT && protocol === MOBILE_CONFIG_LINKS.DOH) {
|
|
return `${host}:${port}`;
|
|
}
|
|
|
|
return host;
|
|
};
|
|
|
|
return (
|
|
<form onSubmit={(e) => e.preventDefault()}>
|
|
<div>
|
|
<div className="form__group form__group--settings">
|
|
<div className="row">
|
|
<div className="col">
|
|
<Controller
|
|
name="host"
|
|
control={control}
|
|
rules={{ validate: validateServerName }}
|
|
render={({ field, fieldState }) => (
|
|
<Input
|
|
{...field}
|
|
type="text"
|
|
data-testid="mobile_config_host"
|
|
label={t('dhcp_table_hostname')}
|
|
placeholder={t('form_enter_hostname')}
|
|
error={fieldState.error?.message}
|
|
/>
|
|
)}
|
|
/>
|
|
</div>
|
|
{protocol === MOBILE_CONFIG_LINKS.DOH && (
|
|
<div className="col">
|
|
<Controller
|
|
name="port"
|
|
control={control}
|
|
rules={{
|
|
validate: {
|
|
range: (value) => validatePort(value) || true,
|
|
safety: (value) => validateIsSafePort(value) || true,
|
|
},
|
|
}}
|
|
render={({ field, fieldState }) => (
|
|
<Input
|
|
{...field}
|
|
type="number"
|
|
data-testid="mobile_config_port"
|
|
label={t('encryption_https')}
|
|
placeholder={t('encryption_https')}
|
|
error={fieldState.error?.message}
|
|
onChange={(e) => {
|
|
const { value } = e.target;
|
|
field.onChange(toNumber(value));
|
|
}}
|
|
/>
|
|
)}
|
|
/>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
|
|
<div className="form__group form__group--settings">
|
|
<label htmlFor="clientId" className="form__label form__label--with-desc">
|
|
{t('client_id')}
|
|
</label>
|
|
|
|
<div className="form__desc form__desc--top">
|
|
<Trans
|
|
components={{ a: <a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer" /> }}>
|
|
client_id_desc
|
|
</Trans>
|
|
</div>
|
|
|
|
<Controller
|
|
name="clientId"
|
|
control={control}
|
|
rules={{
|
|
validate: validateConfigClientId,
|
|
}}
|
|
render={({ field, fieldState }) => (
|
|
<Input
|
|
{...field}
|
|
type="text"
|
|
data-testid="mobile_config_client_id"
|
|
placeholder={t('client_id_placeholder')}
|
|
error={fieldState.error?.message}
|
|
/>
|
|
)}
|
|
/>
|
|
</div>
|
|
|
|
<div className="form__group form__group--settings">
|
|
<Controller
|
|
name="protocol"
|
|
control={control}
|
|
render={({ field }) => (
|
|
<Select {...field} label={t('protocol')} data-testid="mobile_config_protocol">
|
|
<option value={MOBILE_CONFIG_LINKS.DOT}>{t('dns_over_tls')}</option>
|
|
<option value={MOBILE_CONFIG_LINKS.DOH}>{t('dns_over_https')}</option>
|
|
</Select>
|
|
)}
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
{getDownloadLink(getHostName(), clientId, protocol, !isValid)}
|
|
</form>
|
|
);
|
|
};
|