From 5cb64f760262321abc1274d384743a19771a75b4 Mon Sep 17 00:00:00 2001
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Fri, 24 Mar 2023 14:33:07 +0530
Subject: [PATCH] Fix Debugger restart issue.

---
 .../components/DebuggerArgumentComponent.jsx  |  5 +----
 .../js/components/DebuggerComponent.jsx       | 21 ++++---------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
index 0ef1ff20d..92d8d6507 100644
--- a/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
@@ -790,10 +790,6 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
           method: 'POST',
           data: JSON.stringify(argsValueList),
         })
-          .then(function () {
-            /* Close the debugger modal dialog */
-            props.closeModal();
-          })
           .catch(function (error) {
             props.closeModal();
             Notify.alert(
@@ -816,6 +812,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
         })
           .then(function () {
             /*This is intentional (SonarQube)*/
+            props.closeModal();
           })
           .catch(function (error) {
             setLoaderText('');
diff --git a/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx b/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx
index b4cad7b6c..c4859a4ee 100644
--- a/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx
+++ b/web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx
@@ -353,12 +353,6 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
         url: baseUrl,
         method: 'POST',
       })
-        .then(function (res) {
-          if (res.data.data.status) {
-            enableToolbarButtons();
-            pollResult(params.transId);
-          }
-        })
         .catch(raiseJSONError);
       enableToolbarButtons();
       pollResult(params.transId);
@@ -372,11 +366,6 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
         url: baseUrl,
         method: 'POST',
       })
-        .then(function (res) {
-          if (res.data.data.status) {
-            messages(params.transId);
-          }
-        })
         .catch(raiseJSONError);
       messages(params.transId);
     }
@@ -637,12 +626,10 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
       url: base_url,
       method: 'POST',
     })
-      .then(function () {
-        if (params.directDebugger.debug_type) {
-          pollEndExecutionResult(params.transId);
-        }
-      })
       .catch(raisePollingError);
+    if (params.directDebugger.debug_type) {
+      pollEndExecutionResult(params.transId);
+    }
   }
 
   const pollEndExecuteError = (res) => {
@@ -742,7 +729,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
                 /*
                 "result" is undefined only in case of EDB procedure.
                 As Once the EDB procedure execution is completed then we are
-                not getting any result so we need ignore the result.
+                not getting any result so we need to ignore the result.
                 */
                 setActiveLine(-1);
                 params.directDebugger.direct_execution_completed = true;