Just pass a default order

elastic · Aug 29, 2017 · faba375 · faba375
1 parent 2b7c73e
commit faba375
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -253,7 +253,7 @@ function discoverController(
   function getStateDefaults() {
     return {
       query: $scope.searchSource.get('query') || { query: '', language: config.get('search:queryLanguage') },
-      sort: getSort.array(savedSearch.sort, $scope.indexPattern, { order: config.get('discover:sort:defaultOrder') }),
+      sort: getSort.array(savedSearch.sort, $scope.indexPattern, config.get('discover:sort:defaultOrder')),
       columns: savedSearch.columns.length > 0 ? savedSearch.columns : config.get('defaultColumns').slice(),
       index: $scope.indexPattern.id,
       interval: 'auto',

diff --git a/src/ui/public/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js
@@ -6,7 +6,7 @@ import _ from 'lodash';
  * @param {object} indexPattern used for determining default sort
  * @returns {object} a sort object suitable for returning to elasticsearch
  */
-export function getSort(sort, indexPattern, sortOptions = {}) {
+export function getSort(sort, indexPattern, defaultSortOrder = 'desc') {
   const sortObj = {};
   let field;
   let direction;
@@ -21,7 +21,7 @@ export function getSort(sort, indexPattern, sortOptions = {}) {
     direction = sort[1];
   } else if (indexPattern.timeFieldName && isSortable(indexPattern.timeFieldName)) {
     field = indexPattern.timeFieldName;
-    direction = sortOptions.order || 'desc';
+    direction = defaultSortOrder;
   }
 
   if (field) {
@@ -35,7 +35,7 @@ export function getSort(sort, indexPattern, sortOptions = {}) {
   return sortObj;
 }
 
-getSort.array = function (sort, indexPattern, sortOptions) {
-  return _(getSort(sort, indexPattern, sortOptions)).pairs().pop();
+getSort.array = function (sort, indexPattern, defaultSortOrder) {
+  return _(getSort(sort, indexPattern, defaultSortOrder)).pairs().pop();
 };