From bafd3cdd699482836da7fc8c28d171fb2666a54d Mon Sep 17 00:00:00 2001
From: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Date: Thu, 3 Aug 2023 17:13:27 +0530
Subject: [PATCH] fix: DS config saveAndDiscard modal discard flow update
 (#25955)

---
 app/client/src/pages/Editor/DataSourceEditor/index.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index 1df7f909b1..050e5e039e 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -251,13 +251,11 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
       this.props.switchDatasource(this.props.datasourceId);
     }
 
-    const urlObject = new URL(window.location.href);
-    const pluginId = urlObject?.searchParams.get("pluginId");
     // update block state when form becomes dirty/view mode is switched on
     if (
       prevProps.viewMode !== this.props.viewMode &&
       !this.props.viewMode &&
-      !!pluginId
+      !!this.props.pluginId
     ) {
       this.blockRoutes();
     }
@@ -312,7 +310,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
         pluginId,
       });
     }
-    if (!this.props.viewMode && !!pluginId) {
+    if (!this.props.viewMode && !!this.props.pluginId) {
       this.blockRoutes();
     }
 
@@ -448,7 +446,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
   }
 
   closeDialog() {
-    this.setState({ showDialog: false });
+    this.setState({ showDialog: false, switchFilterBlocked: false });
   }
 
   onSave() {
@@ -469,7 +467,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> {
     this.state.navigation();
     this.props.datasourceDiscardAction(this.props?.pluginId);
 
-    if (!this.props.viewMode) {
+    if (!this.props.viewMode && !this.state.switchFilterBlocked) {
       this.props.setDatasourceViewMode({
         datasourceId: this.props.datasourceId,
         viewMode: true,