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

chore: remove duplicate DashboardFilter class and change imports accordingly (#12405)

Browse Source 
* chore: remove duplicate DashboardFilter class and change imports accordingly

* fix: pre-commit isort issue
This commit is contained in:
Amit Miran
2021-01-14 13:20:00 +02:00
committed by GitHub
parent 241f380e2e
commit ec0e872523
3 changed files with 2 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
superset/views/chart/mixin.py
View File

@@ -17,8 +17,8 @@
from flask import Markup
from flask_babel import lazy_gettext as _
from superset.dashboards.filters import DashboardFilter
from superset.views.chart.filters import SliceFilter
from superset.views.dashboard.filters import DashboardFilter
class SliceMixin: # pylint: disable=too-few-public-methods

88
superset/views/dashboard/filters.py
View File

@@ -1,88 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
from typing import Any
from sqlalchemy import and_, or_
from sqlalchemy.orm.query import Query
from superset import db, security_manager
from superset.models.core import FavStar
from superset.models.dashboard import Dashboard
from superset.models.slice import Slice
from superset.views.base import BaseFilter
from ..base import get_user_roles
class DashboardFilter(BaseFilter): # pylint: disable=too-few-public-methods
"""
List dashboards with the following criteria:
1. Those which the user owns
2. Those which the user has favorited
3. Those which have been published (if they have access to at least one slice)
If the user is an admin show them all dashboards.
This means they do not get curation but can still sort by "published"
if they wish to see those dashboards which are published first
"""
def apply(self, query: Query, value: Any) -> Query:
user_roles = [role.name.lower() for role in list(get_user_roles())]
if "admin" in user_roles:
return query
datasource_perms = security_manager.user_view_menu_names("datasource_access")
schema_perms = security_manager.user_view_menu_names("schema_access")
published_dash_query = (
db.session.query(Dashboard.id)
.join(Dashboard.slices)
.filter(
and_(
Dashboard.published == True, # pylint: disable=singleton-comparison
or_(
Slice.perm.in_(datasource_perms),
Slice.schema_perm.in_(schema_perms),
security_manager.can_access_all_datasources(),
),
)
)
)
users_favorite_dash_query = db.session.query(FavStar.obj_id).filter(
and_(
FavStar.user_id == security_manager.user_model.get_user_id(),
FavStar.class_name == "Dashboard",
)
)
owner_ids_query = (
db.session.query(Dashboard.id)
.join(Dashboard.owners)
.filter(
security_manager.user_model.id
== security_manager.user_model.get_user_id()
)
)
query = query.filter(
or_(
Dashboard.id.in_(owner_ids_query),
Dashboard.id.in_(published_dash_query),
Dashboard.id.in_(users_favorite_dash_query),
)
)
return query

2
superset/views/dashboard/mixin.py
View File

@@ -16,8 +16,8 @@
# under the License.
from flask_babel import lazy_gettext as _
from ...dashboards.filters import DashboardFilter
from ..base import check_ownership
from .filters import DashboardFilter
class DashboardMixin: # pylint: disable=too-few-public-methods