From 076ca1208cbabbac99e91a6e423606f199d85917 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Fri, 3 Mar 2017 12:05:05 -0500 Subject: [PATCH] Update doc table when auto refresh contains doc updates Backports PR #10385 **Commit 1:** Adds document version to doc table's track_by * Original sha: 747b8eda223a40e1ae63977790dd9e4356bf4023 * Authored by Matthew Bargar on 2017-02-15T22:13:04Z **Commit 2:** Add version to dashboard search source as well * Original sha: 2cd0f3131b3819696977e5732d47b9e72b57a956 * Authored by Matthew Bargar on 2017-02-17T17:45:39Z **Commit 3:** Add version to context queries * Original sha: 2db1c09ae070cabc1454eb730d0bf6e6cce562e3 * Authored by Matthew Bargar on 2017-02-28T16:17:43Z --- src/core_plugins/kibana/public/context/api/utils/queries.js | 2 ++ src/core_plugins/kibana/public/dashboard/dashboard.js | 1 + .../kibana/public/discover/controllers/discover.js | 3 ++- src/ui/public/courier/data_source/search_source.js | 3 ++- src/ui/public/doc_table/doc_table.html | 4 ++-- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core_plugins/kibana/public/context/api/utils/queries.js b/src/core_plugins/kibana/public/context/api/utils/queries.js index bcb0a07ab2365..258017e1089fc 100644 --- a/src/core_plugins/kibana/public/context/api/utils/queries.js +++ b/src/core_plugins/kibana/public/context/api/utils/queries.js @@ -1,6 +1,7 @@ function createAnchorQueryBody(uid, contextSort) { return { _source: true, + version: true, query: { terms: { _uid: [uid], @@ -13,6 +14,7 @@ function createAnchorQueryBody(uid, contextSort) { function createSuccessorsQueryBody(anchorSortValues, contextSort, size) { return { _source: true, + version: true, query: { match_all: {}, }, diff --git a/src/core_plugins/kibana/public/dashboard/dashboard.js b/src/core_plugins/kibana/public/dashboard/dashboard.js index b6600c58bd7ff..5042845d407c0 100644 --- a/src/core_plugins/kibana/public/dashboard/dashboard.js +++ b/src/core_plugins/kibana/public/dashboard/dashboard.js @@ -87,6 +87,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, timefilter.enabled = true; dash.searchSource.highlightAll(true); + dash.searchSource.version(true); courier.setRootSearchSource(dash.searchSource); // Following the "best practice" of always have a '.' in your ng-models – diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js index 2063333a357bf..5634a3d6361de 100644 --- a/src/core_plugins/kibana/public/discover/controllers/discover.js +++ b/src/core_plugins/kibana/public/discover/controllers/discover.js @@ -144,7 +144,8 @@ function discoverController($scope, config, courier, $route, $window, Notifier, $scope.indexPattern = resolveIndexPatternLoading(); $scope.searchSource .set('index', $scope.indexPattern) - .highlightAll(true); + .highlightAll(true) + .version(true); if (savedSearch.id) { docTitle.change(savedSearch.title); diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js index df87fcd7919fe..8b092ca1a5861 100644 --- a/src/ui/public/courier/data_source/search_source.js +++ b/src/ui/public/courier/data_source/search_source.js @@ -97,7 +97,8 @@ export default function SearchSourceFactory(Promise, Private, config) { 'aggs', 'from', 'size', - 'source' + 'source', + 'version' ]; SearchSource.prototype.index = function (indexPattern) { diff --git a/src/ui/public/doc_table/doc_table.html b/src/ui/public/doc_table/doc_table.html index 0982da325518b..309a14fc449c2 100644 --- a/src/ui/public/doc_table/doc_table.html +++ b/src/ui/public/doc_table/doc_table.html @@ -11,7 +11,7 @@ sorting="sorting"> - -