QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 16:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix superset error message flow (#5540)

Browse Source
This commit is contained in:
timifasubaa
2018-08-01 15:36:58 -07:00
committed by GitHub
parent 1a9c4592dc
commit 4bf69a7260
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
superset/assets/src/SqlLab/actions.js
View File

@@ -187,7 +187,7 @@ export function runQuery(query) {
if (msg.indexOf('CSRF token') > 0) { if (msg.indexOf('CSRF token') > 0) {
msg = COMMON_ERR_MESSAGES.SESSION_TIMED_OUT; msg = COMMON_ERR_MESSAGES.SESSION_TIMED_OUT;
} }
dispatch(queryFailed(query, msg, getErrorLink(msg))); dispatch(queryFailed(query, msg, getErrorLink(err)));
}, },
}); });
}; };

2
superset/assets/src/SqlLab/components/ResultSet.jsx
View File

@@ -161,7 +161,7 @@ export default class ResultSet extends React.PureComponent {
return ( return (
<Alert bsStyle="danger"> <Alert bsStyle="danger">
{query.errorMessage} {query.errorMessage}
{query.link && <a href={query.link}> {t('(Common errors and their resolutions)')} </a>} {query.link && <a href={query.link}> {t('(Request Access)')} </a>}
</Alert>); </Alert>);
} else if (query.state === 'success' && query.ctas) { } else if (query.state === 'success' && query.ctas) {
return ( return (

14
superset/security.py
View File

@@ -129,6 +129,10 @@ class SupersetSecurityManager(SecurityManager):
return """You need access to the following tables: {}, all database access or return """You need access to the following tables: {}, all database access or
`all_datasource_access` permission""".format(table_name) `all_datasource_access` permission""".format(table_name)
def get_table_access_link(self, tables):
from superset import conf
return conf.get('PERMISSION_INSTRUCTIONS_LINK')
def datasource_access_by_name( def datasource_access_by_name(
self, database, datasource_name, schema=None): self, database, datasource_name, schema=None):
from superset import db from superset import db
@@ -147,15 +151,19 @@ class SupersetSecurityManager(SecurityManager):
return True return True
return False return False
def datasource_access_by_fullname( def get_schema_and_table(self, table_in_query, schema):
self, database, full_table_name, schema): table_name_pieces = table_in_query.split('.')
table_name_pieces = full_table_name.split('.')
if len(table_name_pieces) == 2: if len(table_name_pieces) == 2:
table_schema = table_name_pieces[0] table_schema = table_name_pieces[0]
table_name = table_name_pieces[1] table_name = table_name_pieces[1]
else: else:
table_schema = schema table_schema = schema
table_name = table_name_pieces[0] table_name = table_name_pieces[0]
return (table_schema, table_name)
def datasource_access_by_fullname(
self, database, table_in_query, schema):
table_schema, table_name = self.get_schema_and_table(table_in_query, schema)
return self.datasource_access_by_name( return self.datasource_access_by_name(
database, table_name, schema=table_schema) database, table_name, schema=table_schema)

5
superset/views/base.py
View File

@@ -46,8 +46,9 @@ def json_error_response(msg=None, status=500, stacktrace=None, payload=None, lin
payload = {'error': str(msg)} payload = {'error': str(msg)}
if stacktrace: if stacktrace:
payload['stacktrace'] = stacktrace payload['stacktrace'] = stacktrace
if link: if link:
payload['link'] = link payload['link'] = link
return Response( return Response(
json.dumps(payload, default=utils.json_iso_dttm_ser), json.dumps(payload, default=utils.json_iso_dttm_ser),
status=status, mimetype='application/json') status=status, mimetype='application/json')

5
superset/views/core.py
View File

@@ -2426,9 +2426,8 @@ class Superset(BaseSupersetView):
rejected_tables = security_manager.rejected_datasources(sql, mydb, schema) rejected_tables = security_manager.rejected_datasources(sql, mydb, schema)
if rejected_tables: if rejected_tables:
return json_error_response( return json_error_response(
security_manager.get_datasource_access_error_msg('{}'.format( security_manager.get_table_access_error_msg(rejected_tables),
rejected_tables)), link=security_manager.get_table_access_link(rejected_tables))
link=security_manager.get_table_error_link(rejected_tables))
session.commit() session.commit()
select_as_cta = request.form.get('select_as_cta') == 'true' select_as_cta = request.form.get('select_as_cta') == 'true'