fix(query): sorting by user for Query History list view (#11897)

* fix: sorting by user for Query History list view * fix filter exception
apache · Dec 3, 2020 · 8c063ef · 8c063ef
1 parent 71c567b
commit 8c063ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
@@ -277,7 +277,7 @@ function QueryList({ addDangerToast, addSuccessToast }: QueryListProps) {
         disableSortBy: true,
       },
       {
-        accessor: QueryObjectColumns.user,
+        accessor: QueryObjectColumns.user_first_name,
         Header: t('User'),
         size: 'xl',
         Cell: ({
@@ -286,6 +286,10 @@ function QueryList({ addDangerToast, addSuccessToast }: QueryListProps) {
           },
         }: any) => `${user.first_name} ${user.last_name}`,
       },
+      {
+        accessor: QueryObjectColumns.user,
+        hidden: true,
+      },
       {
         accessor: QueryObjectColumns.rows,
         Header: t('Rows'),

diff --git a/superset-frontend/src/views/CRUD/types.ts b/superset-frontend/src/views/CRUD/types.ts
@@ -104,6 +104,7 @@ export enum QueryObjectColumns {
   status = 'status',
   tab_name = 'tab_name',
   user = 'user',
+  user_first_name = 'user.first_name',
   start_time = 'start_time',
   end_time = 'end_time',
   rows = 'rows',