[Discover] replace primary time field for sorting

elastic · Nov 17, 2021 · 63252f6 · 63252f6
1 parent 60dcfa8
commit 63252f6
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts b/src/plugins/discover/public/application/main/utils/get_switch_index_pattern_app_state.ts
@@ -29,19 +29,16 @@ export function getSwitchIndexPatternAppState(
     : currentColumns;
   const columns = nextColumns.length ? nextColumns : [];
 
-  // remove prev time field sort
-  let nextSort = getSortArray(currentSort, nextIndexPattern).filter(
-    (value) => value[0] !== currentIndexPattern.timeFieldName
-  );
-
-  // append default sorting if indexPattern has time field
-  if (nextIndexPattern.timeFieldName) {
-    nextSort = [[nextIndexPattern.timeFieldName, sortDirection], ...nextSort];
+  let nextSort = getSortArray(currentSort, nextIndexPattern);
+  const [first, ...restSorting] = nextSort;
+  // replace primary timeFieldName if it was sorted
+  if (nextIndexPattern.timeFieldName && first && first[0] === currentIndexPattern.timeFieldName) {
+    nextSort = [[nextIndexPattern.timeFieldName, sortDirection], ...restSorting];
   }
 
   return {
     index: nextIndexPattern.id,
     columns,
-    sort: nextSort,
+    sort: !nextSort.length ? [[nextIndexPattern.timeFieldName, sortDirection]] : nextSort,
   };
 }