From d373cc8074b34d86c532b0e7bc46dec3bd68e3bf Mon Sep 17 00:00:00 2001
From: Daniel Vaz Gaspar <danielvazgaspar@gmail.com>
Date: Tue, 5 May 2020 14:30:24 +0100
Subject: [PATCH] perf(dashboards): improve API performance for dashboards
 (#9704)

---
 requirements.txt           |  2 +-
 setup.py                   |  2 +-
 superset/dashboards/api.py | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 85c0e4ba9b6d0..feb9b1d8393a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ cryptography==2.8         # via apache-superset (setup.py)
 dataclasses==0.6          # via apache-superset (setup.py)
 decorator==4.4.1          # via retry
 defusedxml==0.6.0         # via python3-openid
-flask-appbuilder==2.3.2   # via apache-superset (setup.py)
+flask-appbuilder==2.3.4   # via apache-superset (setup.py)
 flask-babel==1.0.0        # via flask-appbuilder
 flask-caching==1.8.0      # via apache-superset (setup.py)
 flask-compress==1.4.0     # via apache-superset (setup.py)
diff --git a/setup.py b/setup.py
index c0dd539c16792..3e9d1612a5d27 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def get_git_sha():
         "cryptography>=2.4.2",
         "dataclasses<0.7",
         "flask>=1.1.0, <2.0.0",
-        "flask-appbuilder>=2.3.2, <2.4.0",
+        "flask-appbuilder>=2.3.4, <2.4.0",
         "flask-caching",
         "flask-compress",
         "flask-talisman",
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index 4ff945be9e599..3806bbf306994 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -95,20 +95,26 @@ class DashboardRestApi(BaseSupersetModelRestApi):
     ]
     order_columns = ["dashboard_title", "changed_on", "published", "changed_by_fk"]
     list_columns = [
+        "id",
+        "published",
+        "slug",
+        "url",
+        "css",
+        "position_json",
+        "json_metadata",
+        "thumbnail_url",
+        "changed_by.first_name",
+        "changed_by.last_name",
+        "changed_by.username",
+        "changed_by.id",
         "changed_by_name",
         "changed_by_url",
-        "changed_by.username",
         "changed_on",
         "dashboard_title",
         "owners.id",
         "owners.username",
         "owners.first_name",
         "owners.last_name",
-        "id",
-        "published",
-        "slug",
-        "url",
-        "thumbnail_url",
     ]
     edit_columns = [
         "dashboard_title",