From 34e57f27ff342847f024910feacfee367d1121ea Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Mon, 17 Jan 2022 18:45:40 -0600
Subject: [PATCH] New: Don't close Indexer add list when adding Indexers

---
 frontend/src/Indexer/Add/AddIndexerModal.js          |  6 ++++--
 .../Indexer/Add/AddIndexerModalContentConnector.js   |  5 +++--
 frontend/src/Indexer/Index/IndexerIndex.js           | 12 +++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Indexer/Add/AddIndexerModal.js b/frontend/src/Indexer/Add/AddIndexerModal.js
index 75cba5a17..4c4db24b9 100644
--- a/frontend/src/Indexer/Add/AddIndexerModal.js
+++ b/frontend/src/Indexer/Add/AddIndexerModal.js
@@ -4,7 +4,7 @@ import Modal from 'Components/Modal/Modal';
 import AddIndexerModalContentConnector from './AddIndexerModalContentConnector';
 import styles from './AddIndexerModal.css';
 
-function AddIndexerModal({ isOpen, onModalClose, ...otherProps }) {
+function AddIndexerModal({ isOpen, onModalClose, onSelectIndexer, ...otherProps }) {
   return (
     <Modal
       isOpen={isOpen}
@@ -14,6 +14,7 @@ function AddIndexerModal({ isOpen, onModalClose, ...otherProps }) {
       <AddIndexerModalContentConnector
         {...otherProps}
         onModalClose={onModalClose}
+        onSelectIndexer={onSelectIndexer}
       />
     </Modal>
   );
@@ -21,7 +22,8 @@ function AddIndexerModal({ isOpen, onModalClose, ...otherProps }) {
 
 AddIndexerModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
-  onModalClose: PropTypes.func.isRequired
+  onModalClose: PropTypes.func.isRequired,
+  onSelectIndexer: PropTypes.func.isRequired
 };
 
 export default AddIndexerModal;
diff --git a/frontend/src/Indexer/Add/AddIndexerModalContentConnector.js b/frontend/src/Indexer/Add/AddIndexerModalContentConnector.js
index 2d6ac9fef..0dc810608 100644
--- a/frontend/src/Indexer/Add/AddIndexerModalContentConnector.js
+++ b/frontend/src/Indexer/Add/AddIndexerModalContentConnector.js
@@ -51,7 +51,7 @@ class AddIndexerModalContentConnector extends Component {
 
   onIndexerSelect = ({ implementation, name }) => {
     this.props.selectIndexerSchema({ implementation, name });
-    this.props.onModalClose({ indexerSelected: true });
+    this.props.onSelectIndexer();
   };
 
   onSortPress = (sortKey, sortDirection) => {
@@ -76,7 +76,8 @@ AddIndexerModalContentConnector.propTypes = {
   fetchIndexerSchema: PropTypes.func.isRequired,
   selectIndexerSchema: PropTypes.func.isRequired,
   setIndexerSchemaSort: PropTypes.func.isRequired,
-  onModalClose: PropTypes.func.isRequired
+  onModalClose: PropTypes.func.isRequired,
+  onSelectIndexer: PropTypes.func.isRequired
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(AddIndexerModalContentConnector);
diff --git a/frontend/src/Indexer/Index/IndexerIndex.js b/frontend/src/Indexer/Index/IndexerIndex.js
index db56c9793..841bc1c00 100644
--- a/frontend/src/Indexer/Index/IndexerIndex.js
+++ b/frontend/src/Indexer/Index/IndexerIndex.js
@@ -193,11 +193,12 @@ class IndexerIndex extends Component {
     this.setState({ isAddIndexerModalOpen: true });
   };
 
-  onAddIndexerModalClose = ({ indexerSelected = false } = {}) => {
-    this.setState({
-      isAddIndexerModalOpen: false,
-      isEditIndexerModalOpen: indexerSelected
-    });
+  onAddIndexerModalClose = () => {
+    this.setState({ isAddIndexerModalOpen: false });
+  };
+
+  onAddIndexerSelectIndexer = () => {
+    this.setState({ isEditIndexerModalOpen: true });
   };
 
   onEditIndexerModalClose = () => {
@@ -463,6 +464,7 @@ class IndexerIndex extends Component {
         <AddIndexerModal
           isOpen={isAddIndexerModalOpen}
           onModalClose={this.onAddIndexerModalClose}
+          onSelectIndexer={this.onAddIndexerSelectIndexer}
         />
 
         <EditIndexerModalConnector