fix: performance issues on user and roles list (#2209)

* fix: performance issues on user and roles list

* remove dynamic from roles

* fix tests

Author: dpgaspar

flask_appbuilder/security/sqla/models.py

@@ -61,7 +61,9 @@ class Role(Model):
     id = Column(Integer, Sequence("ab_role_id_seq"), primary_key=True)
     name = Column(String(64), unique=True, nullable=False)
     permissions = relationship(
-        "PermissionView", secondary=assoc_permissionview_role, backref="role"
+        "PermissionView",
+        secondary=assoc_permissionview_role,
+        backref="role",
     )
 
     def __repr__(self):
@@ -73,9 +75,9 @@ class PermissionView(Model):
     __table_args__ = (UniqueConstraint("permission_id", "view_menu_id"),)
     id = Column(Integer, Sequence("ab_permission_view_id_seq"), primary_key=True)
     permission_id = Column(Integer, ForeignKey("ab_permission.id"))
-    permission = relationship("Permission")
+    permission = relationship("Permission", lazy="joined")
     view_menu_id = Column(Integer, ForeignKey("ab_view_menu.id"))
-    view_menu = relationship("ViewMenu")
+    view_menu = relationship("ViewMenu", lazy="joined")
 
     def __repr__(self):
         return str(self.permission).replace("_", " ") + " on " + str(self.view_menu)

flask_appbuilder/security/views.py

@@ -224,8 +224,19 @@ class UserModelView(ModelView):
             {"fields": ["first_name", "last_name", "email"], "expanded": True},
         ),
     ]
-
-    search_exclude_columns = ["password"]
+    search_columns = [
+        "first_name",
+        "last_name",
+        "username",
+        "email",
+        "active",
+        "roles",
+        "created_on",
+        "changed_on",
+        "last_login",
+        "login_count",
+        "fail_login_count",
+    ]
 
     add_columns = ["first_name", "last_name", "username", "active", "email", "roles"]
     edit_columns = ["first_name", "last_name", "username", "active", "email", "roles"]

tests/test_mvc.py

@@ -109,7 +109,11 @@ def setUp(self):
         class Model1View(ModelView):
             datamodel = SQLAInterface(Model1)
 
+        class Model2View(ModelView):
+            datamodel = SQLAInterface(Model2)
+
         self.appbuilder.add_view(Model1View, "Model1", category="Model1")
+        self.appbuilder.add_view(Model2View, "Model2", category="Model2")
 
     def test_list_filter_starts_with(self):
         """
@@ -181,8 +185,7 @@ def test_list_filter_o_m_invalid_object_type(self):
         with self.app.test_client() as c:
             self.browser_login(c, USERNAME_ADMIN, PASSWORD_ADMIN)
 
-            # Roles doesn't exists
-            rv = c.get("/users/list/?_flt_0_created_by=aaaa", follow_redirects=True)
+            rv = c.get("/model2view/list/?_flt_0_group=aaaa", follow_redirects=True)
             self.assertEqual(rv.status_code, 200)
             if self.db.session.bind.dialect.name != "mysql":
                 data = rv.data.decode("utf-8")
@@ -196,7 +199,7 @@ def test_list_filter_not_o_m_invalid_object_type(self):
             self.browser_login(c, USERNAME_ADMIN, PASSWORD_ADMIN)
 
             # Roles doesn't exists
-            rv = c.get("/users/list/?_flt_1_created_by=aaaa", follow_redirects=True)
+            rv = c.get("/model2view/list/?_flt_1_group=aaaa", follow_redirects=True)
             self.assertEqual(rv.status_code, 200)
             if self.db.session.bind.dialect.name != "mysql":
                 data = rv.data.decode("utf-8")