diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index 904a3134f..7236fe7d2 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -1799,7 +1799,11 @@ class ServerNode(PGChildNodeView): None """ try: - data = request.form + data = None + if request.form: + data = request.form + elif request.data: + data = json.loads(request.data) restore_point_name = data['value'] if data else None manager = get_driver(PG_DEFAULT_DRIVER).connection_manager(sid) conn = manager.connection() @@ -1812,10 +1816,10 @@ class ServerNode(PGChildNodeView): restore_point_name ) ) - if not status: - return internal_server_error( - errormsg=str(res) - ) + if not status: + return internal_server_error( + errormsg=str(res) + ) return make_json_response( data={ diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx index f4b8840b7..3792eee29 100644 --- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx +++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx @@ -376,7 +376,7 @@ export default function QueryToolDataGrid({columns, rows, totalRowCount, dataCha const dataGridExtras = useMemo(()=>({ onSelectedCellChange, handleCopy - }), []); + }), [onSelectedCellChange]); useEffect(()=>{ let initCols = initialiseColumns(columns, rows, totalRowCount, columnWidthBy);