From 1dc4c4746eb4f20f4ac72d167458beb3683dd8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CA=88=E1=B5=83=E1=B5=A2?= <tdupreetan@gmail.com>
Date: Thu, 12 Nov 2020 11:10:45 -1000
Subject: [PATCH] fix(dashboard): ordering for add chart widget (#11672)

---
 .../src/dashboard/actions/sliceEntities.js    | 19 +++++++++----------
 superset/charts/api.py                        |  2 ++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/superset-frontend/src/dashboard/actions/sliceEntities.js b/superset-frontend/src/dashboard/actions/sliceEntities.js
index 289129274..5f86b6ced 100644
--- a/superset-frontend/src/dashboard/actions/sliceEntities.js
+++ b/superset-frontend/src/dashboard/actions/sliceEntities.js
@@ -49,20 +49,19 @@ export function fetchAllSlices(userId) {
       return SupersetClient.get({
         endpoint: `/api/v1/chart/?q=${rison.encode({
           columns: [
-            'changed_on_humanized',
-            'changed_on',
+            'changed_on_delta_humanized',
+            'changed_on_utc',
             'datasource_id',
             'datasource_type',
-            'datasource_link',
+            'datasource_url',
             'datasource_name_text',
             'description_markeddown',
             'description',
             'edit_url',
             'id',
-            'modified',
             'params',
             'slice_name',
-            'slice_url',
+            'url',
             'viz_type',
           ],
           filters: [{ col: 'owners', opr: 'rel_m_m', value: userId }],
@@ -89,18 +88,18 @@ export function fetchAllSlices(userId) {
             if (['markup', 'separator'].indexOf(slice.viz_type) === -1) {
               slices[slice.id] = {
                 slice_id: slice.id,
-                slice_url: slice.slice_url,
+                slice_url: slice.url,
                 slice_name: slice.slice_name,
                 edit_url: slice.edit_url,
                 form_data,
                 datasource_name: slice.datasource_name_text,
-                datasource_link: slice.datasource_link,
-                changed_on: new Date(slice.changed_on).getTime(),
+                datasource_url: slice.datasource_url,
+                changed_on: new Date(slice.changed_on_utc).getTime(),
                 description: slice.description,
                 description_markdown: slice.description_markeddown,
                 viz_type: slice.viz_type,
-                modified: slice.modified,
-                changed_on_humanized: slice.changed_on_humanized,
+                modified: slice.changed_on_delta_humanized,
+                changed_on_humanized: slice.changed_on_delta_humanized,
               };
             }
           });
diff --git a/superset/charts/api.py b/superset/charts/api.py
index 94dd3757f..2327ed8aa 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -122,6 +122,8 @@ class ChartRestApi(BaseSupersetModelRestApi):
         "datasource_type",
         "datasource_url",
         "description",
+        "description_markeddown",
+        "edit_url",
         "id",
         "owners.first_name",
         "owners.id",