change relationship (#14435)

(cherry picked from commit efcdc8cb9b)

requirements/base.txt

@@ -66,7 +66,7 @@ dnspython==2.0.0
 # via email-validator
 email-validator==1.1.1
 # via flask-appbuilder
-flask-appbuilder==3.2.1
+flask-appbuilder==3.2.3
 # via apache-superset
 flask-babel==1.0.0
 # via flask-appbuilder

setup.py

@@ -75,7 +75,7 @@ setup(
         "cron-descriptor",
         "cryptography>=3.2.1",
         "flask>=1.1.0, <2.0.0",
-        "flask-appbuilder>=3.2.1, <4.0.0",
+        "flask-appbuilder>=3.2.3, <4.0.0",
         "flask-caching",
         "flask-compress",
         "flask-talisman",

superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx

@@ -420,7 +420,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         Header: t('Database'),
         id: 'database',
         input: 'select',
-        operator: FilterOperator.relationManyMany,
+        operator: FilterOperator.relationOneMany,
         unfilteredLabel: 'All',
         fetchSelects: createFetchRelated(
           'dataset',

superset/views/utils.py

@@ -40,7 +40,7 @@ from superset.exceptions import (
     SupersetException,
     SupersetSecurityException,
 )
-from superset.extensions import cache_manager
+from superset.extensions import cache_manager, security_manager
 from superset.legacy import update_time_range
 from superset.models.core import Database
 from superset.models.dashboard import Dashboard
@@ -87,20 +87,15 @@ def get_permissions(
     if not user.roles:
         raise AttributeError("User object does not have roles")
 
-    roles = {}
+    roles = defaultdict(list)
     permissions = defaultdict(set)
+
     for role in user.roles:
-        perms = set()
+        permissions_ = security_manager.get_role_permissions(role)
-        for perm in role.permissions:
+        for permission in permissions_:
-            if perm.permission and perm.view_menu:
+            if permission[0] in ("datasource_access", "database_access"):
-                perms.add((perm.permission.name, perm.view_menu.name))
+                permissions[permission[0]].add(permission[1])
-                if perm.permission.name in ("datasource_access", "database_access"):
+            roles[role.name].append([permission[0], permission[1]])
-                    permissions[perm.permission.name].add(perm.view_menu.name)
-        roles[role.name] = [
-            [perm.permission.name, perm.view_menu.name]
-            for perm in role.permissions
-            if perm.permission and perm.view_menu
-        ]
 
     return roles, permissions