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
128 lines
4.1 KiB
TypeScript
128 lines
4.1 KiB
TypeScript
import React from 'react';
|
|
import { useSelector } from 'react-redux';
|
|
import { useFormContext } from 'react-hook-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
|
|
import { validateRequiredValue } from '../../../helpers/validators';
|
|
import { RootState } from '../../../initialState';
|
|
import { DhcpFormValues } from '.';
|
|
|
|
const renderInterfaces = (interfaces: any) =>
|
|
Object.keys(interfaces).map((item) => {
|
|
const option = interfaces[item];
|
|
const { name } = option;
|
|
|
|
const [interfaceIPv4] = option?.ipv4_addresses ?? [];
|
|
const [interfaceIPv6] = option?.ipv6_addresses ?? [];
|
|
|
|
const optionContent = [name, interfaceIPv4, interfaceIPv6].filter(Boolean).join(' - ');
|
|
|
|
return (
|
|
<option value={name} key={name}>
|
|
{optionContent}
|
|
</option>
|
|
);
|
|
});
|
|
|
|
const getInterfaceValues = ({ gateway_ip, hardware_address, ip_addresses }: any) => [
|
|
{
|
|
name: 'dhcp_form_gateway_input',
|
|
value: gateway_ip,
|
|
},
|
|
{
|
|
name: 'dhcp_hardware_address',
|
|
value: hardware_address,
|
|
},
|
|
{
|
|
name: 'dhcp_ip_addresses',
|
|
value: ip_addresses,
|
|
render: (ip_addresses: any) =>
|
|
ip_addresses.map((ip: any) => (
|
|
<span key={ip} className="interface__ip">
|
|
{ip}
|
|
</span>
|
|
)),
|
|
},
|
|
];
|
|
|
|
interface RenderInterfaceValuesProps {
|
|
gateway_ip: string;
|
|
hardware_address: string;
|
|
ip_addresses: string[];
|
|
}
|
|
|
|
const renderInterfaceValues = ({ gateway_ip, hardware_address, ip_addresses }: RenderInterfaceValuesProps) => (
|
|
<div className="d-flex align-items-end dhcp__interfaces-info">
|
|
<ul className="list-unstyled m-0">
|
|
{getInterfaceValues({
|
|
gateway_ip,
|
|
hardware_address,
|
|
ip_addresses,
|
|
}).map(
|
|
({ name, value, render }) =>
|
|
value && (
|
|
<li key={name}>
|
|
<span className="interface__title">
|
|
<Trans>{name}</Trans>:{' '}
|
|
</span>
|
|
{render?.(value) || value}
|
|
</li>
|
|
),
|
|
)}
|
|
</ul>
|
|
</div>
|
|
);
|
|
|
|
const Interfaces = () => {
|
|
const { t } = useTranslation();
|
|
const {
|
|
register,
|
|
watch,
|
|
formState: { errors },
|
|
} = useFormContext<DhcpFormValues>();
|
|
|
|
const { processingInterfaces, interfaces, enabled } = useSelector((store: RootState) => store.dhcp);
|
|
|
|
const interface_name = watch('interface_name');
|
|
|
|
if (processingInterfaces || !interfaces) {
|
|
return null;
|
|
}
|
|
|
|
const interfaceValue = interface_name && interfaces[interface_name];
|
|
|
|
return (
|
|
<div className="row dhcp__interfaces">
|
|
<div className="col col__dhcp">
|
|
<label htmlFor="interface_name" className="form__label">
|
|
{t('dhcp_interface_select')}
|
|
</label>
|
|
<select
|
|
id="interface_name"
|
|
data-testid="interface_name"
|
|
className="form-control custom-select pl-4 col-md"
|
|
disabled={enabled}
|
|
{...register('interface_name', {
|
|
validate: validateRequiredValue,
|
|
})}>
|
|
<option value="" disabled={enabled}>
|
|
{t('dhcp_interface_select')}
|
|
</option>
|
|
{renderInterfaces(interfaces)}
|
|
</select>
|
|
{errors.interface_name && (
|
|
<div className="form__message form__message--error">{t(errors.interface_name.message)}</div>
|
|
)}
|
|
</div>
|
|
{interfaceValue &&
|
|
renderInterfaceValues({
|
|
gateway_ip: interfaceValue.gateway_ip,
|
|
hardware_address: interfaceValue.hardware_address,
|
|
ip_addresses: interfaceValue.ip_addresses,
|
|
})}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default Interfaces;
|