From 7abe3e518298ec896b60e28a8de63e444053e69b Mon Sep 17 00:00:00 2001
From: Bogdan <b.kyryliuk@gmail.com>
Date: Mon, 13 Jul 2020 18:06:33 -0700
Subject: [PATCH] Add more fields to the log API (#10271)

Co-authored-by: bogdan kyryliuk <bogdankyryliuk@dropbox.com>
---
 superset/views/log/api.py | 12 +++++++++++-
 tests/log_api_tests.py    | 19 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/superset/views/log/api.py b/superset/views/log/api.py
index f132c349a..7f14112b1 100644
--- a/superset/views/log/api.py
+++ b/superset/views/log/api.py
@@ -28,5 +28,15 @@ class LogRestApi(LogMixin, BaseSupersetModelRestApi):
     class_permission_name = "LogModelView"
     resource_name = "log"
     allow_browser_login = True
-    list_columns = ["user.username", "action", "dttm"]
+    list_columns = [
+        "user.username",
+        "action",
+        "dttm",
+        "json",
+        "slice_id",
+        "dashboard_id",
+        "user_id",
+        "duration_ms",
+        "referrer",
+    ]
     show_columns = list_columns
diff --git a/tests/log_api_tests.py b/tests/log_api_tests.py
index f13d5c9e5..98535c422 100644
--- a/tests/log_api_tests.py
+++ b/tests/log_api_tests.py
@@ -29,6 +29,19 @@ from superset.models.core import Log
 from .base_tests import SupersetTestCase
 
 
+EXPECTED_COLUMNS = [
+    "action",
+    "dashboard_id",
+    "dttm",
+    "duration_ms",
+    "json",
+    "referrer",
+    "slice_id",
+    "user",
+    "user_id",
+]
+
+
 class TestLogApi(SupersetTestCase):
     def insert_log(
         self,
@@ -63,8 +76,7 @@ class TestLogApi(SupersetTestCase):
         rv = self.client.get(uri)
         self.assertEqual(rv.status_code, 200)
         response = json.loads(rv.data.decode("utf-8"))
-        expected_columns = ["action", "dttm", "user"]
-        self.assertEqual(list(response["result"][0].keys()), expected_columns)
+        self.assertEqual(list(response["result"][0].keys()), EXPECTED_COLUMNS)
         self.assertEqual(response["result"][0]["action"], "some_action")
         self.assertEqual(response["result"][0]["user"], {"username": "admin"})
         db.session.delete(log)
@@ -96,8 +108,7 @@ class TestLogApi(SupersetTestCase):
         self.assertEqual(rv.status_code, 200)
         response = json.loads(rv.data.decode("utf-8"))
 
-        expected_columns = ["action", "dttm", "user"]
-        self.assertEqual(list(response["result"].keys()), expected_columns)
+        self.assertEqual(list(response["result"].keys()), EXPECTED_COLUMNS)
         self.assertEqual(response["result"]["action"], "some_action")
         self.assertEqual(response["result"]["user"], {"username": "admin"})
         db.session.delete(log)