Migrate get_sort.js test from mocha to TypeScript

elastic · Jan 27, 2020 · 09c58c2 · 09c58c2
1 parent 94297f3
commit 09c58c2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 115 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -27,7 +27,7 @@ import '../components/field_chooser/field_chooser';
 
 // doc table
 import './doc_table';
-import { getSort } from './doc_table/lib/get_sort';
+import { getSortArray } from './doc_table/lib/get_sort';
 import { getSortForSearchSource } from './doc_table/lib/get_sort_for_search_source';
 import * as columnActions from './doc_table/actions/columns';
 
@@ -522,7 +522,7 @@ function discoverController(
           language:
             localStorage.get('kibana.userQueryLanguage') || config.get('search:queryLanguage'),
         },
-      sort: getSort.array(savedSearch.sort, $scope.indexPattern),
+      sort: getSortArray(savedSearch.sort, $scope.indexPattern),
       columns:
         savedSearch.columns.length > 0 ? savedSearch.columns : config.get('defaultColumns').slice(),
       index: $scope.indexPattern.id,
@@ -534,7 +534,7 @@ function discoverController(
   }
 
   $state.index = $scope.indexPattern.id;
-  $state.sort = getSort.array($state.sort, $scope.indexPattern);
+  $state.sort = getSortArray($state.sort, $scope.indexPattern);
 
   $scope.getBucketIntervalToolTipText = () => {
     return i18n.translate('kbn.discover.bucketIntervalTooltip', {
@@ -615,10 +615,7 @@ function discoverController(
         if (!sort) return;
 
         // get the current sort from searchSource as array of arrays
-        const currentSort = getSort.array(
-          $scope.searchSource.getField('sort'),
-          $scope.indexPattern
-        );
+        const currentSort = getSortArray($scope.searchSource.getField('sort'), $scope.indexPattern);
 
         // if the searchSource doesn't know, tell it so
         if (!angular.equals(sort, currentSort)) $scope.fetch();

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
@@ -20,8 +20,17 @@
 import { IIndexPattern } from '../../../../../../../../../plugins/data/public';
 import { SortOrder } from '../components/table_header/helpers';
 
+export type SortInput =
+  | Record<string, string>
+  | SortOrder
+  | SortOrder[]
+  | Array<Record<string, string>>
+  | string[];
+
 export function getSort(
-  sort?: SortOrder[],
+  sort?: SortInput,
   indexPattern?: IIndexPattern,
-  defaultSortOrder?: SortOrder
+  defaultSortOrder?: string
 ): any;
+
+export function getSortArray(sort: SortInput, indexPattern?: IIndexPattern): any;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.js
@@ -53,10 +53,10 @@ export function getSort(sort, indexPattern) {
   return [];
 }
 
-getSort.array = function(sort, indexPattern) {
+export function getSortArray(sort, indexPattern) {
   return getSort(sort, indexPattern).map(sortPair =>
     _(sortPair)
       .pairs()
       .pop()
   );
-};
+}