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
115 lines
3.8 KiB
TypeScript
115 lines
3.8 KiB
TypeScript
import React from 'react';
|
|
|
|
import { Field, reduxForm } from 'redux-form';
|
|
import { Trans, useTranslation } from 'react-i18next';
|
|
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
|
|
|
|
import { renderInputField, normalizeMac } from '../../../../helpers/form';
|
|
import {
|
|
validateIpv4,
|
|
validateMac,
|
|
validateRequiredValue,
|
|
validateIpv4InCidr,
|
|
validateIpGateway,
|
|
} from '../../../../helpers/validators';
|
|
import { FORM_NAME } from '../../../../helpers/constants';
|
|
|
|
import { toggleLeaseModal } from '../../../../actions';
|
|
import { RootState } from '../../../../initialState';
|
|
|
|
interface FormStaticLeaseProps {
|
|
initialValues?: {
|
|
mac?: string;
|
|
ip?: string;
|
|
hostname?: string;
|
|
cidr?: string;
|
|
gatewayIp?: string;
|
|
};
|
|
pristine: boolean;
|
|
handleSubmit: (...args: unknown[]) => string;
|
|
reset: () => void;
|
|
submitting: boolean;
|
|
processingAdding?: boolean;
|
|
cidr?: string;
|
|
isEdit?: boolean;
|
|
}
|
|
|
|
const Form = ({ handleSubmit, reset, pristine, submitting, processingAdding, cidr, isEdit }: FormStaticLeaseProps) => {
|
|
const { t } = useTranslation();
|
|
const dispatch = useDispatch();
|
|
|
|
const dynamicLease = useSelector((store: RootState) => store.dhcp.leaseModalConfig, shallowEqual);
|
|
|
|
const onClick = () => {
|
|
reset();
|
|
dispatch(toggleLeaseModal());
|
|
};
|
|
|
|
return (
|
|
<form onSubmit={handleSubmit}>
|
|
<div className="modal-body">
|
|
<div className="form__group">
|
|
<Field
|
|
id="mac"
|
|
name="mac"
|
|
component={renderInputField}
|
|
type="text"
|
|
className="form-control"
|
|
placeholder={t('form_enter_mac')}
|
|
normalize={normalizeMac}
|
|
validate={[validateRequiredValue, validateMac]}
|
|
disabled={isEdit}
|
|
/>
|
|
</div>
|
|
|
|
<div className="form__group">
|
|
<Field
|
|
id="ip"
|
|
name="ip"
|
|
component={renderInputField}
|
|
type="text"
|
|
className="form-control"
|
|
placeholder={t('form_enter_subnet_ip', { cidr })}
|
|
validate={[validateRequiredValue, validateIpv4, validateIpv4InCidr, validateIpGateway]}
|
|
/>
|
|
</div>
|
|
|
|
<div className="form__group">
|
|
<Field
|
|
id="hostname"
|
|
name="hostname"
|
|
component={renderInputField}
|
|
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}
|
|
onClick={onClick}>
|
|
<Trans>cancel_btn</Trans>
|
|
</button>
|
|
|
|
<button
|
|
type="submit"
|
|
className="btn btn-success btn-standard"
|
|
disabled={submitting || processingAdding || (pristine && !dynamicLease)}>
|
|
<Trans>save_btn</Trans>
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
);
|
|
};
|
|
|
|
export default reduxForm<
|
|
Record<string, any>,
|
|
Omit<FormStaticLeaseProps, 'submitting' | 'handleSubmit' | 'reset' | 'pristine'>
|
|
>({ form: FORM_NAME.LEASE })(Form);
|