Pull request #2231: ADG-8368 Frontend rewritten in TypeScript, added Node 18 support

Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge: 4c89cf720 1085d59a6 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit 4c89cf7209 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commit b943f2011f Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commit cd1be2d66d Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit 7b8ac01fc2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit 02afed66d5 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit 9c0f736f0c Merge: 62c4fbf1e e04775c4f Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit 62c4fbf1e3 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit 76b1e44a93 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commit f783e90040 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit 3d4ce6554c Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commit e35ba58f2a Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit 1f30d4216d Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit 6cd4e44f07 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit 2ab738b303 Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
2024-06-10 18:42:23 +03:00
parent 1085d59a65
commit 1afe226ce8
296 changed files with 32122 additions and 32651 deletions
--- a/client/src/components/Settings/Dhcp/StaticLeases/Modal.tsx
+++ b/client/src/components/Settings/Dhcp/StaticLeases/Modal.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { Trans, withTranslation } from 'react-i18next';
+
+import ReactModal from 'react-modal';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
+
+import Form from './Form';
+
+import { toggleLeaseModal } from '../../../../actions';
+import { MODAL_TYPE } from '../../../../helpers/constants';
+import { RootState } from '../../../../initialState';
+
+interface ModalProps {
+    isModalOpen: boolean;
+    modalType: string;
+    handleSubmit: (values: any) => void;
+    processingAdding: boolean;
+    cidr: string;
+    gatewayIp?: string;
+}
+
+const Modal = ({
+    isModalOpen,
+    modalType,
+    handleSubmit,
+    processingAdding,
+    cidr,
+    gatewayIp,
+}: ModalProps) => {
+    const dispatch = useDispatch();
+
+    const toggleModal = () => dispatch(toggleLeaseModal());
+
+    const leaseInitialData = useSelector((state: RootState) => state.dhcp.leaseModalConfig, shallowEqual);
+
+    return (
+        <ReactModal
+            className="Modal__Bootstrap modal-dialog modal-dialog-centered modal-dialog--clients"
+            closeTimeoutMS={0}
+            isOpen={isModalOpen}
+            onRequestClose={toggleModal}>
+            <div className="modal-content">
+                <div className="modal-header">
+                    <h4 className="modal-title">
+                        {modalType === MODAL_TYPE.EDIT_LEASE ? (
+                            <Trans>dhcp_edit_static_lease</Trans>
+                        ) : (
+                            <Trans>dhcp_new_static_lease</Trans>
+                        )}
+                    </h4>
+
+                    <button type="button" className="close" onClick={toggleModal}>
+                        <span className="sr-only">Close</span>
+                    </button>
+                </div>
+
+                <Form
+                    initialValues={{
+                        mac: leaseInitialData?.mac ?? '',
+                        ip: leaseInitialData?.ip ?? '',
+                        hostname: leaseInitialData?.hostname ?? '',
+                        cidr,
+                        gatewayIp,
+                    }}
+                    onSubmit={handleSubmit}
+                    processingAdding={processingAdding}
+                    cidr={cidr}
+                    isEdit={modalType === MODAL_TYPE.EDIT_LEASE}
+                />
+            </div>
+        </ReactModal>
+    );
+};
+
+export default withTranslation()(Modal);