Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Discover] Use tiebreaker sort in main discover view #32426

Closed
wants to merge 1 commit into from
Closed

[Discover] Use tiebreaker sort in main discover view #32426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/legacy/core_plugins/kibana/public/discover/controllers/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
import { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/build_pipeline';
import { getFirstSortableField } from '../../context/api/utils/sorting';

const app = uiModules.get('apps/discover', [
'kibana/notify',
Expand Down Expand Up @@ -434,13 +435,16 @@ function discoverController(

$scope.uiState = $state.makeStateful('uiState');

const tiebreakerField = getFirstSortableField($scope.indexPattern, config.get('context:tieBreakerFields'));
const defaultSortOrder = config.get('discover:sort:defaultOrder');

function getStateDefaults() {
return {
query: $scope.searchSource.getField('query') || {
query: '',
language: localStorage.get('kibana.userQueryLanguage') || config.get('search:queryLanguage')
},
sort: getSort.array(savedSearch.sort, $scope.indexPattern, config.get('discover:sort:defaultOrder')),
sort: getSort.array(savedSearch.sort, $scope.indexPattern, defaultSortOrder),
columns: savedSearch.columns.length > 0 ? savedSearch.columns : config.get('defaultColumns').slice(),
index: $scope.indexPattern.id,
interval: 'auto',
Expand All @@ -449,7 +453,7 @@ function discoverController(
}

$state.index = $scope.indexPattern.id;
$state.sort = getSort.array($state.sort, $scope.indexPattern);
$state.sort = getSort.array($state.sort, $scope.indexPattern, defaultSortOrder);

$scope.getBucketIntervalToolTipText = () => {
return (
Expand Down Expand Up @@ -886,7 +890,12 @@ function discoverController(
$scope.updateDataSource = Promise.method(function updateDataSource() {
$scope.searchSource
.setField('size', $scope.opts.sampleSize)
.setField('sort', getSort($state.sort, $scope.indexPattern))
.setField('sort', [
getSort($state.sort, $scope.indexPattern),
{
[tiebreakerField]: defaultSortOrder,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No tiebreakerField (I've set the field to empty in Advanced Configuration) leads to the following sort {"undefined":{"order":"desc","unmapped_type":"boolean"}.

}
])
.setField('query', !$state.query ? null : $state.query)
.setField('filter', queryFilter.getFilters());
});
Expand Down