pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: dashboard datasources filter None (#14471)

This commit is contained in:
Erik Ritter 2021-05-04 15:34:38 -07:00 committed by GitHub
parent 23014e9233
commit a816655715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset/models/dashboard.py
View File

@ -171,7 +171,7 @@ class Dashboard( # pylint: disable=too-many-instance-attributes
@property
def datasources(self) -> Set[BaseDatasource]:
return {slc.datasource for slc in self.slices}
return {slc.datasource for slc in self.slices if slc.datasource}
@property
def charts(self) -> List[BaseDatasource]:

7
superset/models/slice.py
View File

@ -100,7 +100,7 @@ class Slice(
return ConnectorRegistry.sources[self.datasource_type]
@property
def datasource(self) -> "BaseDatasource":
def datasource(self) -> Optional["BaseDatasource"]:
return self.get_datasource
def clone(self) -> "Slice":
@ -160,8 +160,9 @@ class Slice(
def viz(self) -> Optional[BaseViz]:
form_data = json.loads(self.params)
viz_class = viz_types.get(self.viz_type)
if viz_class:
return viz_class(datasource=self.datasource, form_data=form_data)
datasource = self.datasource
if viz_class and datasource:
return viz_class(datasource=datasource, form_data=form_data)
return None
@property

7
superset/views/core.py
View File

@ -462,6 +462,10 @@ class Superset(BaseSupersetView): # pylint: disable=too-many-public-methods
form_data, slc = get_form_data(slice_id, use_slice_data=True)
if not slc:
return json_error_response("The slice does not exist")
if not slc.datasource:
return json_error_response("The slice's datasource does not exist")
try:
viz_obj = get_viz(
datasource_type=slc.datasource.type,
@ -1709,6 +1713,9 @@ class Superset(BaseSupersetView): # pylint: disable=too-many-public-methods
else get_dashboard_extra_filters(slc.id, dashboard_id)
)
if not slc.datasource:
raise Exception("Slice's datasource does not exist")
obj = get_viz(
datasource_type=slc.datasource.type,
datasource_id=slc.datasource.id,

4
superset/views/utils.py
View File

@ -290,7 +290,7 @@ def get_time_range_endpoints(
if not slc:
slc = db.session.query(Slice).filter_by(id=slice_id).one_or_none()
if slc:
if slc and slc.datasource:
endpoints = slc.datasource.database.get_extra().get(
"time_range_endpoints"
)
@ -533,7 +533,7 @@ def check_slice_perms(_self: Any, slice_id: int) -> None:
form_data, slc = get_form_data(slice_id, use_slice_data=True)
if slc:
if slc and slc.datasource:
try:
viz_obj = get_viz(
datasource_type=slc.datasource.type,