fix: revert 0497ac4e2e961ac141307a3ab7e6790e9bd31705 (#309)

splunk · Mar 9, 2023 · e77242f · e77242f
1 parent 9b845e8
commit e77242f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 54 deletions.
diff --git a/ui/src/main/webapp/components/ConfigurationTable.jsx b/ui/src/main/webapp/components/ConfigurationTable.jsx
@@ -34,19 +34,6 @@ function ConfigurationTable({ selectedTab, updateIsPageOpen }) {
         setEntity({ ...entity, open: false });
     };
 
-    // Custom logic to close modal if esc pressed
-    useEffect(() => {
-        function handleKeyboardEvent(e) {
-            if (e && e.keyCode === 27 && entity.open) {
-                handleModalDialogClose();
-            }
-        }
-        window.addEventListener('keydown', handleKeyboardEvent);
-        return () => {
-            window.removeEventListener('keydown', handleKeyboardEvent);
-        };
-    });
-
     // generate modal style dialog
     const generateModalDialog = () => (
         <EntityModal

diff --git a/ui/src/main/webapp/components/ErrorModal.jsx b/ui/src/main/webapp/components/ErrorModal.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import Modal from '@splunk/react-ui/Modal';
 import Message from '@splunk/react-ui/Message';
 import styled from 'styled-components';
@@ -18,19 +18,6 @@ function ErrorModal(props) {
         setOpen(false);
     };
 
-    // Custom logic to close modal if esc pressed
-    useEffect(() => {
-        function handleKeyboardEvent(e) {
-            if (e && e.keyCode === 27) {
-                if (open) handleRequestClose();
-            }
-        }
-        window.addEventListener('keydown', handleKeyboardEvent);
-        return () => {
-            window.removeEventListener('keydown', handleKeyboardEvent);
-        };
-    });
-
     return (
         <ModalWrapper open={open}>
             <Modal.Header onRequestClose={handleRequestClose} title={getFormattedMessage(104)} />

diff --git a/ui/src/main/webapp/components/table/CustomTable.jsx b/ui/src/main/webapp/components/table/CustomTable.jsx
@@ -109,20 +109,6 @@ function CustomTable({
         setDeleteModal({ ...deleteModal, open: false });
     };
 
-    // Custom logic to close modal if esc pressed
-    useEffect(() => {
-        function handleKeyboardEvent(e) {
-            if (e && e.keyCode === 27) {
-                if (deleteModal) handleDeleteClose();
-                if (entityModal) handleEntityClose();
-            }
-        }
-        window.addEventListener('keydown', handleKeyboardEvent);
-        return () => {
-            window.removeEventListener('keydown', handleKeyboardEvent);
-        };
-    });
-
     const handleCloneActionClick = useCallback(
         (selectedRow) => {
             if (serviceToStyleMap[selectedRow.serviceName] === STYLE_PAGE) {

diff --git a/ui/src/main/webapp/pages/Input/InputPage.jsx b/ui/src/main/webapp/pages/Input/InputPage.jsx
@@ -127,19 +127,6 @@ function InputPage() {
         setEntity({ ...entity, open: false });
     };
 
-    // Custom logic to close modal if esc pressed
-    useEffect(() => {
-        function handleKeyboardEvent(e) {
-            if (e && e.keyCode === 27) {
-                if (entity) handleModalDialogClose();
-            }
-        }
-        window.addEventListener('keydown', handleKeyboardEvent);
-        return () => {
-            window.removeEventListener('keydown', handleKeyboardEvent);
-        };
-    });
-
     // generate modal style dialog
     const generateModalDialog = () => (
         <EntityModal