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
149 lines
5.3 KiB
TypeScript
149 lines
5.3 KiB
TypeScript
import React from 'react';
|
|
import { Trans } from 'react-i18next';
|
|
import { useSelector } from 'react-redux';
|
|
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import i18next from 'i18next';
|
|
import cn from 'classnames';
|
|
|
|
import { getPathWithQueryString } from '../../../helpers/helpers';
|
|
import { CLIENT_ID_LINK, FORM_NAME, MOBILE_CONFIG_LINKS, STANDARD_HTTPS_PORT } from '../../../helpers/constants';
|
|
import { renderInputField, renderSelectField, toNumber } from '../../../helpers/form';
|
|
import {
|
|
validateConfigClientId,
|
|
validateServerName,
|
|
validatePort,
|
|
validateIsSafePort,
|
|
} from '../../../helpers/validators';
|
|
import { RootState } from '../../../initialState';
|
|
|
|
const getDownloadLink = (host: any, clientId: any, protocol: any, invalid: any) => {
|
|
if (!host || invalid) {
|
|
return (
|
|
<button type="button" className="btn btn-success btn-standard btn-large disabled">
|
|
<Trans>download_mobileconfig</Trans>
|
|
</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>
|
|
<Trans>download_mobileconfig</Trans>
|
|
</a>
|
|
);
|
|
};
|
|
|
|
interface MobileConfigFormProps {
|
|
invalid: boolean;
|
|
}
|
|
|
|
const MobileConfigForm = ({ invalid }: MobileConfigFormProps) => {
|
|
const formValues = useSelector((state: RootState) => state.form[FORM_NAME.MOBILE_CONFIG]?.values);
|
|
|
|
if (!formValues) {
|
|
return null;
|
|
}
|
|
|
|
const { host, clientId, protocol, port } = formValues;
|
|
|
|
const githubLink = (
|
|
<a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer">
|
|
text
|
|
</a>
|
|
);
|
|
|
|
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">
|
|
<label htmlFor="host" className="form__label">
|
|
{i18next.t('dhcp_table_hostname')}
|
|
</label>
|
|
|
|
<Field
|
|
name="host"
|
|
type="text"
|
|
component={renderInputField}
|
|
className="form-control"
|
|
placeholder={i18next.t('form_enter_hostname')}
|
|
validate={validateServerName}
|
|
/>
|
|
</div>
|
|
{protocol === MOBILE_CONFIG_LINKS.DOH && (
|
|
<div className="col">
|
|
<label htmlFor="port" className="form__label">
|
|
{i18next.t('encryption_https')}
|
|
</label>
|
|
|
|
<Field
|
|
name="port"
|
|
type="number"
|
|
component={renderInputField}
|
|
className="form-control"
|
|
placeholder={i18next.t('encryption_https')}
|
|
validate={[validatePort, validateIsSafePort]}
|
|
normalize={toNumber}
|
|
/>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
|
|
<div className="form__group form__group--settings">
|
|
<label htmlFor="clientId" className="form__label form__label--with-desc">
|
|
{i18next.t('client_id')}
|
|
</label>
|
|
|
|
<div className="form__desc form__desc--top">
|
|
<Trans components={{ a: githubLink }}>client_id_desc</Trans>
|
|
</div>
|
|
|
|
<Field
|
|
name="clientId"
|
|
type="text"
|
|
component={renderInputField}
|
|
className="form-control"
|
|
placeholder={i18next.t('client_id_placeholder')}
|
|
validate={validateConfigClientId}
|
|
/>
|
|
</div>
|
|
|
|
<div className="form__group form__group--settings">
|
|
<label htmlFor="protocol" className="form__label">
|
|
{i18next.t('protocol')}
|
|
</label>
|
|
|
|
<Field name="protocol" type="text" component={renderSelectField} className="form-control">
|
|
<option value={MOBILE_CONFIG_LINKS.DOT}>{i18next.t('dns_over_tls')}</option>
|
|
|
|
<option value={MOBILE_CONFIG_LINKS.DOH}>{i18next.t('dns_over_https')}</option>
|
|
</Field>
|
|
</div>
|
|
</div>
|
|
|
|
{getDownloadLink(getHostName(), clientId, protocol, invalid)}
|
|
</form>
|
|
);
|
|
};
|
|
|
|
export default reduxForm({ form: FORM_NAME.MOBILE_CONFIG })(MobileConfigForm);
|