Merge in DNS/adguard-home from 1898-hide-private-key to master Squashed commit of the following: commit 542569bbc098541f8e191cc5c1e5509a65fe2c5f Merge: a07d715f756c7064Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 27 13:29:15 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit a07d715f0f0932fdad4ec3f1e1a265b43809e21b Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 19:45:39 2021 +0300 fix bug commit 9f2b70719a24aab827c2dc300fc94bf2202527a7 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 19:07:17 2021 +0300 fixes commit e79f0e620844531a737fff5a88f5c2cffc403f51 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:35:32 2021 +0300 more documentation to god of documentation commit 47790964ed05f50c075f6b6497b1517b0d974bea Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:23:08 2021 +0300 changed var named && fixed description commit d35de5a34eafb3ffbd1148982dd31735a2000377 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:11:13 2021 +0300 revert locales commit 514ab1a5d90039bf9aad1389dd0ed966fd1a7e65 Merge: 5d9b992a16092e8bAuthor: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 14:41:27 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit 5d9b992a236dec276a46a035509da6938a7da7bf Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 14:41:13 2021 +0300 here we go again commit 2e7b30df5f19953f4e055394083be62b23028ad6 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:11:49 2021 +0300 update deps commit 5e58c3e22a77c42f321deb9707f34f031b345d75 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:10:19 2021 +0300 small fix commit c2096377de0a8ecf4f36567322ad9171c5fb5ab2 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:07:45 2021 +0300 fixes && updated translations commit ada2d4784e6288b1740b8564b6ffc1ef8f0dcf68 Merge: dc5ce072550b1798Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 13:17:34 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit dc5ce0721b5c095ed79f2a302ad90d9616785f93 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 13 20:12:18 2021 +0300 tls: hide saved private key If private key saved as a string, then hide it from the answer to UI
109 lines
3.2 KiB
JavaScript
109 lines
3.2 KiB
JavaScript
import React from 'react';
|
|
import { shallowEqual, useSelector } from 'react-redux';
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import propTypes from 'prop-types';
|
|
import { renderSelectField } from '../../../helpers/form';
|
|
import { validateRequiredValue } from '../../../helpers/validators';
|
|
import { FORM_NAME } from '../../../helpers/constants';
|
|
|
|
const renderInterfaces = (interfaces) => 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,
|
|
}) => [
|
|
{
|
|
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) => ip_addresses
|
|
.map((ip) => <span key={ip} className="interface__ip">{ip}</span>),
|
|
},
|
|
];
|
|
|
|
const renderInterfaceValues = ({
|
|
gateway_ip,
|
|
hardware_address,
|
|
ip_addresses,
|
|
}) => <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 {
|
|
processingInterfaces,
|
|
interfaces,
|
|
enabled,
|
|
} = useSelector((store) => store.dhcp, shallowEqual);
|
|
|
|
const interface_name = useSelector(
|
|
(store) => store.form[FORM_NAME.DHCP_INTERFACES]?.values?.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">
|
|
<Field
|
|
name="interface_name"
|
|
component={renderSelectField}
|
|
className="form-control custom-select pl-4 col-md"
|
|
validate={[validateRequiredValue]}
|
|
label='dhcp_interface_select'
|
|
>
|
|
<option value='' disabled={enabled}>
|
|
{t('dhcp_interface_select')}
|
|
</option>
|
|
{renderInterfaces(interfaces)}
|
|
</Field>
|
|
</div>
|
|
{interfaceValue
|
|
&& renderInterfaceValues(interfaceValue)}
|
|
</div>;
|
|
};
|
|
|
|
renderInterfaceValues.propTypes = {
|
|
gateway_ip: propTypes.string.isRequired,
|
|
hardware_address: propTypes.string.isRequired,
|
|
ip_addresses: propTypes.arrayOf(propTypes.string).isRequired,
|
|
};
|
|
|
|
export default reduxForm({
|
|
form: FORM_NAME.DHCP_INTERFACES,
|
|
})(Interfaces);
|