fix(ui): Exception when changing cluster on TopicList (#962)

close ##835
tchiotludo · Dec 22, 2021 · 9f526fd · 9f526fd
1 parent 4e29c28
commit 9f526fd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/client/src/containers/Connect/ConnectList/ConnectList.jsx b/client/src/containers/Connect/ConnectList/ConnectList.jsx
@@ -49,7 +49,7 @@ class ConnectList extends Root {
     const query =  new URLSearchParams(this.props.location.search);
     this.setState({
       searchData: { search: (query.get('search'))? query.get('search') : searchData.search },
-      pageNumber: (query.get('page'))? parseInt(query.get('page')) : parseInt(pageNumber)
+      pageNumber: (query.get('page')) ? parseInt(query.get('page')) : parseInt(pageNumber)
     }, () => {
       this.getConnectDefinitions();
     });
@@ -60,7 +60,9 @@ class ConnectList extends Root {
       this.cancelAxiosRequests();
       this.renewCancelToken();
 
-      this.componentDidMount();
+      this.setState({ pageNumber: 1 }, () => {
+        this.componentDidMount();
+      });
     }
   }
 

diff --git a/client/src/containers/Topic/TopicList/TopicList.jsx b/client/src/containers/Topic/TopicList/TopicList.jsx
@@ -62,7 +62,9 @@ class TopicList extends Root {
       this.cancelAxiosRequests();
       this.renewCancelToken();
 
-      this._initializeVars(this.getTopics);
+      this.setState({ pageNumber: 1 }, () => {
+        this._initializeVars(this.getTopics);
+      });
     }
   }