badguardhome/client/src/components/Settings/Dhcp/StaticLeases/Form.js

110 lines
3.6 KiB
JavaScript
Raw Normal View History

2019-05-28 12:07:46 +00:00
import React from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
2020-08-19 15:23:05 +00:00
import { Trans, useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
Pull request: 2842 DHCP validation ui Closes #2842. Squashed commit of the following: commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8 Merge: a5d7187b ab85ad5a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 13 15:29:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit a5d7187bba1ae3595bbc26a362ff27aae81a7048 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 15:08:28 2021 +0300 fix: revert deleted translation commit 50169266111032f6de3bc159ba562ee9580532fb Merge: 46adf2c0 48d702f7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:39:40 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 46adf2c05b6bedd55e60475eac060347db6572b7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:13:12 2021 +0300 fix: no-bitwise commit 1afc4030a5ea885545e51748976724959f87fb26 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 13:57:43 2021 +0300 fix: IPv4 in CIDR validation commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:58:03 2021 +0300 fix: translations commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:57:27 2021 +0300 fix: MAC validation commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c Merge: 48b50ce9 65553a29 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:12:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 19:04:35 2021 +0300 Add leases ip validation commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 13:59:16 2021 +0300 Add helper for subnet to bitmap mask conversion, write test commit 80dc7a8d19b27cecc50e2c610619574374f363d3 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 17:46:27 2021 +0300 2842 Update DHCP range validation in UI
2021-04-13 12:29:28 +00:00
import { renderInputField, normalizeMac } from '../../../../helpers/form';
import {
validateIpv4,
validateMac,
validateRequiredValue,
validateIpv4InCidr,
} from '../../../../helpers/validators';
- client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master Close #1770 Squashed commit of the following: commit c1f75ea643623af78de020bd1bc49aa5b66e25c4 Merge: a5df78ad a869ec4c Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 10 18:56:24 2020 +0300 Merge branch 'master' into fix/1770 commit a5df78ad303305efcafcfa2a170ff567a3a06db5 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jun 10 12:50:50 2020 +0300 Revert "Update locales" This reverts commit 4b2b4499dea12949c53bce4ceeed595c17df84c6. commit 4b2b4499dea12949c53bce4ceeed595c17df84c6 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Jun 9 19:56:34 2020 +0300 Update locales commit 790cff0db84b5905362d2e2702b2cbca5c3c90b0 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jun 5 17:56:01 2020 +0300 Update Upstream component with new api, extract reduxForm HOC names in constant commit 72de3d5a92cc33d5b234c837879fc6990291e07b Merge: 92a4a6ae 501a4e06 Author: ArtemBaskal <a.baskal@adguard.com> Date: Fri Jun 5 15:55:39 2020 +0300 Merge remote-tracking branch 'origin/update-dnsproxy' into fix/1770 commit 501a4e06ab350e46ff78656141d925de9f2e4996 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Jun 5 12:47:13 2020 +0300 openapi commit 3930bd196572924f164ed011629356a0ac0ec631 Author: Simon Zolin <s.zolin@adguard.com> Date: Fri Jun 5 12:21:32 2020 +0300 * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests" * use dnsproxy v0.29.0 commit 92a4a6ae24793a2a9ca05ad3ef2078573fd4d059 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Jun 4 18:53:42 2020 +0300 - client: Add default mode in the DNS settings
2020-06-10 16:04:19 +00:00
import { FORM_NAME } from '../../../../helpers/constants';
2020-08-19 15:23:05 +00:00
import { toggleLeaseModal } from '../../../../actions';
2019-05-28 12:07:46 +00:00
2020-08-19 15:23:05 +00:00
const Form = ({
handleSubmit,
reset,
pristine,
submitting,
processingAdding,
Pull request: 2842 DHCP validation ui Closes #2842. Squashed commit of the following: commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8 Merge: a5d7187b ab85ad5a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 13 15:29:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit a5d7187bba1ae3595bbc26a362ff27aae81a7048 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 15:08:28 2021 +0300 fix: revert deleted translation commit 50169266111032f6de3bc159ba562ee9580532fb Merge: 46adf2c0 48d702f7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:39:40 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 46adf2c05b6bedd55e60475eac060347db6572b7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:13:12 2021 +0300 fix: no-bitwise commit 1afc4030a5ea885545e51748976724959f87fb26 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 13:57:43 2021 +0300 fix: IPv4 in CIDR validation commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:58:03 2021 +0300 fix: translations commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:57:27 2021 +0300 fix: MAC validation commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c Merge: 48b50ce9 65553a29 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:12:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 19:04:35 2021 +0300 Add leases ip validation commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 13:59:16 2021 +0300 Add helper for subnet to bitmap mask conversion, write test commit 80dc7a8d19b27cecc50e2c610619574374f363d3 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 17:46:27 2021 +0300 2842 Update DHCP range validation in UI
2021-04-13 12:29:28 +00:00
cidr,
2020-08-19 15:23:05 +00:00
}) => {
const { t } = useTranslation();
const dispatch = useDispatch();
const onClick = () => {
reset();
dispatch(toggleLeaseModal());
};
2019-05-28 12:07:46 +00:00
return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
<div className="form__group">
<Field
id="mac"
name="mac"
component={renderInputField}
2019-05-28 12:07:46 +00:00
type="text"
className="form-control"
placeholder={t('form_enter_mac')}
Pull request: 2842 DHCP validation ui Closes #2842. Squashed commit of the following: commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8 Merge: a5d7187b ab85ad5a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 13 15:29:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit a5d7187bba1ae3595bbc26a362ff27aae81a7048 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 15:08:28 2021 +0300 fix: revert deleted translation commit 50169266111032f6de3bc159ba562ee9580532fb Merge: 46adf2c0 48d702f7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:39:40 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 46adf2c05b6bedd55e60475eac060347db6572b7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:13:12 2021 +0300 fix: no-bitwise commit 1afc4030a5ea885545e51748976724959f87fb26 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 13:57:43 2021 +0300 fix: IPv4 in CIDR validation commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:58:03 2021 +0300 fix: translations commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:57:27 2021 +0300 fix: MAC validation commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c Merge: 48b50ce9 65553a29 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:12:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 19:04:35 2021 +0300 Add leases ip validation commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 13:59:16 2021 +0300 Add helper for subnet to bitmap mask conversion, write test commit 80dc7a8d19b27cecc50e2c610619574374f363d3 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 17:46:27 2021 +0300 2842 Update DHCP range validation in UI
2021-04-13 12:29:28 +00:00
normalize={normalizeMac}
validate={[validateRequiredValue, validateMac]}
2019-05-28 12:07:46 +00:00
/>
</div>
<div className="form__group">
<Field
id="ip"
name="ip"
component={renderInputField}
2019-05-28 12:07:46 +00:00
type="text"
className="form-control"
Pull request: 2842 DHCP validation ui Closes #2842. Squashed commit of the following: commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8 Merge: a5d7187b ab85ad5a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 13 15:29:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit a5d7187bba1ae3595bbc26a362ff27aae81a7048 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 15:08:28 2021 +0300 fix: revert deleted translation commit 50169266111032f6de3bc159ba562ee9580532fb Merge: 46adf2c0 48d702f7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:39:40 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 46adf2c05b6bedd55e60475eac060347db6572b7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:13:12 2021 +0300 fix: no-bitwise commit 1afc4030a5ea885545e51748976724959f87fb26 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 13:57:43 2021 +0300 fix: IPv4 in CIDR validation commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:58:03 2021 +0300 fix: translations commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:57:27 2021 +0300 fix: MAC validation commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c Merge: 48b50ce9 65553a29 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:12:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 19:04:35 2021 +0300 Add leases ip validation commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 13:59:16 2021 +0300 Add helper for subnet to bitmap mask conversion, write test commit 80dc7a8d19b27cecc50e2c610619574374f363d3 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 17:46:27 2021 +0300 2842 Update DHCP range validation in UI
2021-04-13 12:29:28 +00:00
placeholder={t('form_enter_subnet_ip', { cidr })}
validate={[validateRequiredValue, validateIpv4, validateIpv4InCidr]}
2019-05-28 12:07:46 +00:00
/>
</div>
<div className="form__group">
<Field
id="hostname"
name="hostname"
component={renderInputField}
2019-05-28 12:07:46 +00:00
type="text"
className="form-control"
placeholder={t('form_enter_hostname')}
/>
</div>
</div>
<div className="modal-footer">
<div className="btn-list">
<button
type="button"
className="btn btn-secondary btn-standard"
disabled={submitting}
2020-08-19 15:23:05 +00:00
onClick={onClick}
2019-05-28 12:07:46 +00:00
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success btn-standard"
disabled={submitting || pristine || processingAdding}
>
<Trans>save_btn</Trans>
</button>
</div>
</div>
</form>
);
};
Form.propTypes = {
Pull request: 2842 DHCP validation ui Closes #2842. Squashed commit of the following: commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8 Merge: a5d7187b ab85ad5a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 13 15:29:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit a5d7187bba1ae3595bbc26a362ff27aae81a7048 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 15:08:28 2021 +0300 fix: revert deleted translation commit 50169266111032f6de3bc159ba562ee9580532fb Merge: 46adf2c0 48d702f7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:39:40 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 46adf2c05b6bedd55e60475eac060347db6572b7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:13:12 2021 +0300 fix: no-bitwise commit 1afc4030a5ea885545e51748976724959f87fb26 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 13:57:43 2021 +0300 fix: IPv4 in CIDR validation commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:58:03 2021 +0300 fix: translations commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:57:27 2021 +0300 fix: MAC validation commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c Merge: 48b50ce9 65553a29 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:12:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 19:04:35 2021 +0300 Add leases ip validation commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 13:59:16 2021 +0300 Add helper for subnet to bitmap mask conversion, write test commit 80dc7a8d19b27cecc50e2c610619574374f363d3 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 17:46:27 2021 +0300 2842 Update DHCP range validation in UI
2021-04-13 12:29:28 +00:00
initialValues: PropTypes.shape({
mac: PropTypes.string.isRequired,
ip: PropTypes.string.isRequired,
hostname: PropTypes.string.isRequired,
cidr: PropTypes.string.isRequired,
}),
2019-05-28 12:07:46 +00:00
pristine: PropTypes.bool.isRequired,
handleSubmit: PropTypes.func.isRequired,
reset: PropTypes.func.isRequired,
submitting: PropTypes.bool.isRequired,
processingAdding: PropTypes.bool.isRequired,
Pull request: 2842 DHCP validation ui Closes #2842. Squashed commit of the following: commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8 Merge: a5d7187b ab85ad5a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 13 15:29:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit a5d7187bba1ae3595bbc26a362ff27aae81a7048 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 15:08:28 2021 +0300 fix: revert deleted translation commit 50169266111032f6de3bc159ba562ee9580532fb Merge: 46adf2c0 48d702f7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:39:40 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 46adf2c05b6bedd55e60475eac060347db6572b7 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 14:13:12 2021 +0300 fix: no-bitwise commit 1afc4030a5ea885545e51748976724959f87fb26 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 13:57:43 2021 +0300 fix: IPv4 in CIDR validation commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:58:03 2021 +0300 fix: translations commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 13 11:57:27 2021 +0300 fix: MAC validation commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c Merge: 48b50ce9 65553a29 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Apr 6 18:12:06 2021 +0300 Merge branch 'master' into 2842-dhcp-validation-ui commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 19:04:35 2021 +0300 Add leases ip validation commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1 Author: Artem Baskal <a.baskal@adguard.com> Date: Mon Apr 5 13:59:16 2021 +0300 Add helper for subnet to bitmap mask conversion, write test commit 80dc7a8d19b27cecc50e2c610619574374f363d3 Author: Artem Baskal <a.baskal@adguard.com> Date: Fri Apr 2 17:46:27 2021 +0300 2842 Update DHCP range validation in UI
2021-04-13 12:29:28 +00:00
cidr: PropTypes.string.isRequired,
2019-05-28 12:07:46 +00:00
};
2020-08-19 15:23:05 +00:00
export default reduxForm({ form: FORM_NAME.LEASE })(Form);