From 8bbae02bf82ce8a08b45a2df87393847812565e1 Mon Sep 17 00:00:00 2001
From: Kavin Venkatachalam
 <50441969+kavinvenkatachalam@users.noreply.github.com>
Date: Fri, 26 May 2023 18:00:43 +0530
Subject: [PATCH] Fixed rename issue on draft query (#6568)

---
 frontend/src/Editor/QueryManager/QueryManager.jsx | 13 ++++---------
 frontend/src/Editor/QueryPanel/QueryCard.jsx      |  1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Editor/QueryManager/QueryManager.jsx b/frontend/src/Editor/QueryManager/QueryManager.jsx
index af37985dcc..b3678064a6 100644
--- a/frontend/src/Editor/QueryManager/QueryManager.jsx
+++ b/frontend/src/Editor/QueryManager/QueryManager.jsx
@@ -177,15 +177,6 @@ class QueryManagerComponent extends React.Component {
       }
     );
   };
-  componentDidUpdate(prevState) {
-    if (this.state?.selectedQuery?.id == prevState?.selectedQuery?.id) {
-      if (prevState?.selectedQuery?.name !== this.state?.selectedQuery?.name) {
-        this.setState({
-          queryName: this.state.selectedQuery?.name,
-        });
-      }
-    }
-  }
 
   UNSAFE_componentWillReceiveProps(nextProps) {
     if (useDataSourcesStore.getState().loadingDataSources) return;
@@ -234,6 +225,10 @@ class QueryManagerComponent extends React.Component {
       return;
     }
 
+    if (Object.keys(diffProps).length === 1 && nextProps.mode === 'create' && diffProps?.selectedQuery?.name) {
+      return this.setState({ queryName: nextProps.selectedQuery?.name });
+    }
+
     this.setStateFromProps(nextProps);
   }
 
diff --git a/frontend/src/Editor/QueryPanel/QueryCard.jsx b/frontend/src/Editor/QueryPanel/QueryCard.jsx
index c31627e071..588c90565b 100644
--- a/frontend/src/Editor/QueryPanel/QueryCard.jsx
+++ b/frontend/src/Editor/QueryPanel/QueryCard.jsx
@@ -66,6 +66,7 @@ export const QueryCard = ({
       if (id === 'draftQuery') {
         toast.success('Query Name Updated');
         setDraftQuery((query) => ({ ...query, name: newName }));
+        setSelectedQuery('draftQuery', { ...dataQuery, name: newName });
       } else {
         renameQuery(dataQuery?.id, newName, fetchDataQueries);
       }