From 227413f6113fe45f1a69d55851f743ec0a466be8 Mon Sep 17 00:00:00 2001
From: Liza Katz <liza.katz@elastic.co>
Date: Thu, 21 Feb 2019 15:31:06 +0200
Subject: [PATCH] Fixing bugs from #31599

---
 src/legacy/core_plugins/kibana/public/dashboard/index.js  | 5 ++++-
 .../kibana/public/dashboard/listing/dashboard_listing.js  | 3 ++-
 .../dashboard/listing/dashboard_listing_ng_wrapper.html   | 3 ++-
 .../kibana/public/table_list_view/table_list_view.js      | 4 ++--
 .../public/visualize/listing/visualize_listing.html       | 3 ++-
 .../kibana/public/visualize/listing/visualize_listing.js  | 8 ++++++--
 .../public/visualize/listing/visualize_listing_table.js   | 3 ++-
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.js b/src/legacy/core_plugins/kibana/public/dashboard/index.js
index 33cb33b990406e..df27363866bc80 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/index.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/index.js
@@ -70,9 +70,12 @@ uiRoutes
       $scope.find = (search) => {
         return services.dashboards.find(search, $scope.listingLimit);
       };
-      $scope.edit = ({ id }) => {
+      $scope.editItem = ({ id }) => {
         kbnUrl.redirect(createDashboardEditUrl(id));
       };
+      $scope.getEditUrl = ({ id }) => {
+        return createDashboardEditUrl(id);
+      };
       $scope.delete = (ids) => {
         return services.dashboards.delete(ids);
       };
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js b/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
index b7774b99328956..317e41eb795069 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
@@ -160,7 +160,7 @@ class DashboardListingUi extends React.Component {
         sortable: true,
         render: (field, record) => (
           <EuiLink
-            onClick={() => this.props.editItem(record)}
+            href={this.props.getEditUrl(record)}
             data-test-subj={`dashboardListingTitleLink-${record.title.split(' ').join('-')}`}
           >
             {field}
@@ -185,6 +185,7 @@ DashboardListingUi.propTypes = {
   findItems: PropTypes.func.isRequired,
   deleteItems: PropTypes.func.isRequired,
   editItem: PropTypes.func.isRequired,
+  getEditUrl: PropTypes.func.isRequired,
   listingLimit: PropTypes.number.isRequired,
   hideWriteControls: PropTypes.bool.isRequired,
   initialFilter: PropTypes.string,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html b/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
index eeb17ffe915d2b..c29eda16ab27d0 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
+++ b/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
@@ -1,6 +1,7 @@
 <dashboard-listing
   create-item="create"
-  edit-item="edit"
+  get-edit-url="getEditUrl"
+  edit-item="editItem"
   find-items="find"
   delete-items="delete"
   listing-limit="listingLimit"
diff --git a/src/legacy/core_plugins/kibana/public/table_list_view/table_list_view.js b/src/legacy/core_plugins/kibana/public/table_list_view/table_list_view.js
index 92856b8099a1b9..f183ae2599155e 100644
--- a/src/legacy/core_plugins/kibana/public/table_list_view/table_list_view.js
+++ b/src/legacy/core_plugins/kibana/public/table_list_view/table_list_view.js
@@ -62,8 +62,8 @@ class TableListViewUi extends React.Component {
       showLimitError: false,
       filter: this.props.initialFilter,
       selectedIds: [],
-      sortField: 'title',
-      sortDirection: 'asc',
+      sortField: '',
+      sortDirection: '',
       page: 0,
       perPage: 20,
     };
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
index 2eaa23e1a7d673..f482fcde17de5d 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
@@ -34,7 +34,8 @@
     find-items="listingController.fetchItems"
     delete-items="listingController.deleteSelectedItems"
     create-item="listingController.createNewVis"
-    edit-item="listingController.edit"
+    get-edit-url="listingController.getEditUrl"
+    edit-item="listingController.editItem"
   ></visualize-listing-table>
 
   <new-vis-modal
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
index ad90855f4ed34e..a7db90740a1687 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
@@ -53,8 +53,12 @@ export function VisualizeListingController($injector, createNewVis) {
     this.showNewVisModal = true;
   };
 
-  this.edit = ({ id }) => {
-    kbnUrl.change(createVisualizeEditUrl(id));
+  this.editItem = ({ id }) => {
+    kbnUrl.redirect(createVisualizeEditUrl(id));
+  };
+
+  this.getEditUrl = ({ id }) => {
+    return createVisualizeEditUrl(id);
   };
 
   this.closeNewVisModal = () => {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
index a433b093603627..7e04b0ab15c2d2 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
@@ -85,7 +85,7 @@ class VisualizeListingTableUi extends Component {
         sortable: true,
         render: (field, record) => (
           <EuiLink
-            onClick={() => this.props.editItem(record)}
+            href={this.props.getEditUrl(record)}
             data-test-subj={`visListingTitleLink-${record.title.split(' ').join('-')}`}
           >
             {field}
@@ -219,6 +219,7 @@ VisualizeListingTableUi.propTypes = {
   deleteItems: PropTypes.func.isRequired,
   findItems: PropTypes.func.isRequired,
   createItem: PropTypes.func.isRequired,
+  getEditUrl: PropTypes.func.isRequired,
   editItem: PropTypes.func.isRequired,
 };