From b5b0538fe36c779946d6f55edab708c76fc37c27 Mon Sep 17 00:00:00 2001 From: Pravesh Sharma Date: Fri, 31 May 2024 11:19:44 +0530 Subject: [PATCH] Fixed an issue where canceling a query without privilege does not display any message on query tool. #7480 --- web/pgadmin/tools/sqleditor/__init__.py | 2 ++ .../sqleditor/static/js/components/sections/ResultSet.jsx | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 9b6b61db1..46a63a5b9 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -1687,6 +1687,8 @@ def cancel_transaction(trans_id): status, result = _check_and_cancel_transaction(trans_obj, delete_connection, conn, manager) + if not status: + return internal_server_error(errormsg=result) else: status = False result = gettext( diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx index 083530c82..f793d4bd8 100644 --- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx +++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx @@ -888,11 +888,11 @@ export function ResultSet() { eventBus.registerListener(QUERY_TOOL_EVENTS.TRIGGER_STOP_EXECUTION, async ()=>{ try { await rsu.current.stopExecution(); + eventBus.fireEvent(QUERY_TOOL_EVENTS.SET_CONNECTION_STATUS, CONNECTION_STATUS.TRANSACTION_STATUS_IDLE); + eventBus.fireEvent(QUERY_TOOL_EVENTS.EXECUTION_END); } catch(e) { - eventBus.fireEvent(QUERY_TOOL_EVENTS.HANDLE_API_ERROR, e); + pgAdmin.Browser.notifier.error(parseApiError(e)); } - eventBus.fireEvent(QUERY_TOOL_EVENTS.SET_CONNECTION_STATUS, CONNECTION_STATUS.TRANSACTION_STATUS_IDLE); - eventBus.fireEvent(QUERY_TOOL_EVENTS.EXECUTION_END); }); eventBus.registerListener(QUERY_TOOL_EVENTS.EXECUTION_END, ()=>{