[GitHub] timifasubaa closed pull request #5194: pass error message separately

[GitBox <gi...@apache.org>]

timifasubaa closed pull request #5194: pass error message separately
URL: https://github.com/apache/incubator-superset/pull/5194
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/superset/assets/src/components/StackTraceMessage.jsx b/superset/assets/src/components/StackTraceMessage.jsx
index ee190b7c5c..71b0972c25 100644
--- a/superset/assets/src/components/StackTraceMessage.jsx
+++ b/superset/assets/src/components/StackTraceMessage.jsx
@@ -25,6 +25,10 @@ class StackTraceMessage extends React.PureComponent {
     return this.props.queryResponse && this.props.queryResponse.stacktrace;
   }
 
+  hasLink() {
+    return this.props.queryResponse && this.props.queryResponse.link;
+  }
+
   render() {
     return (
       <div className={`stack-trace-container${this.hasTrace() ? ' has-trace' : ''}`}>
@@ -33,6 +37,9 @@ class StackTraceMessage extends React.PureComponent {
           onClick={() => this.setState({ showStackTrace: !this.state.showStackTrace })}
         >
           {this.props.message}
+          {this.hasLink() &&
+          <a href={this.props.queryResponse.link}> (Request Access) </a>
+       }
         </Alert>
         {this.hasTrace() &&
           <Collapse in={this.state.showStackTrace}>
diff --git a/superset/views/base.py b/superset/views/base.py
index dc2e48f43a..d3fd1a4e06 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -41,11 +41,13 @@ def get_error_msg():
     return error_msg
 
 
-def json_error_response(msg=None, status=500, stacktrace=None, payload=None):
+def json_error_response(msg=None, status=500, stacktrace=None, payload=None, link=None):
     if not payload:
         payload = {'error': str(msg)}
         if stacktrace:
             payload['stacktrace'] = stacktrace
+        if link:
+            payload['link'] = link
     return Response(
         json.dumps(payload, default=utils.json_iso_dttm_ser),
         status=status, mimetype='application/json')
diff --git a/superset/views/core.py b/superset/views/core.py
index 14380c50ab..0ceefe79fc 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -68,14 +68,7 @@
 ACCESS_REQUEST_MISSING_ERR = __(
     'The access requests seem to have been deleted')
 USER_MISSING_ERR = __('The user seems to have been deleted')
-perms_instruction_link = config.get('PERMISSION_INSTRUCTIONS_LINK')
-if perms_instruction_link:
-    DATASOURCE_ACCESS_ERR = __(
-        "You don't have access to this datasource. <a href='{}'>(Gain access)</a>"
-        .format(perms_instruction_link),
-    )
-else:
-    DATASOURCE_ACCESS_ERR = __("You don't have access to this datasource")
+DATASOURCE_ACCESS_ERR = __("You don't have access to this datasource")
 
 FORM_DATA_KEY_BLACKLIST = []
 if not config.get('ENABLE_JAVASCRIPT_CONTROLS'):
@@ -1090,7 +1083,9 @@ def generate_json(self, datasource_type, datasource_id, form_data,
                 stacktrace=traceback.format_exc())
 
         if not security_manager.datasource_access(viz_obj.datasource, g.user):
-            return json_error_response(DATASOURCE_ACCESS_ERR, status=404)
+            return json_error_response(
+                DATASOURCE_ACCESS_ERR, status=404, link=config.get(
+                    'PERMISSION_INSTRUCTIONS_LINK'))
 
         if csv:
             return CsvResponse(
@@ -2708,7 +2703,9 @@ def sliceQuery(self, slice_id):
         """
         viz_obj = self.get_viz(slice_id)
         if not security_manager.datasource_access(viz_obj.datasource):
-            return json_error_response(DATASOURCE_ACCESS_ERR, status=401)
+            return json_error_response(
+                DATASOURCE_ACCESS_ERR, status=401, link=config.get(
+                    'PERMISSION_INSTRUCTIONS_LINK'))
         return self.get_query_string_response(viz_obj)
 
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org