Ensure that the correct error message in ERD for permission denied should be shown. #5537

web/pgadmin/static/js/api_instance.js

@@ -40,6 +40,9 @@ export function parseApiError(error) {
   } else if(error.message) {
     // Something happened in setting up the request that triggered an Error
     return error.message;
+  } else if(error.errormsg) {
+    // Received response JSON in socket handle
+    return error.errormsg;
   } else {
     return error;
   }

web/pgadmin/tools/erd/__init__.py

@@ -10,7 +10,7 @@
 """A blueprint module implementing the erd tool."""
 import simplejson as json
 
-from flask import url_for, request
+from flask import url_for, request, Response
 from flask import render_template, current_app as app
 from flask_security import login_required
 from flask_babel import gettext
@@ -640,10 +640,11 @@ def tables(params):
                                                params.get('tid', None))
 
         if not status:
+            tables = tables.json if type(tables) == Response else tables
             socketio.emit('tables_failed', tables,
                           namespace=SOCKETIO_NAMESPACE,
                           to=request.sid)
-            return internal_server_error(errormsg=tables)
+            return
         socketio.emit('tables_success', tables, namespace=SOCKETIO_NAMESPACE,
                       to=request.sid)
     except Exception as e:

web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx

@@ -286,8 +286,7 @@ class ERDTool extends React.Component {
   }
 
   handleAxiosCatch(err) {
-    console.error(err);
-    Notify.alert(gettext('Error'), parseApiError(err));
+    this.context.alert(gettext('Error'), parseApiError(err));
   }
 
   async componentDidMount() {