From 96fc727d942ce470d78fe2d53de2f8c35833aba0 Mon Sep 17 00:00:00 2001 From: Lukas Olson Date: Tue, 14 Feb 2017 11:16:11 -0700 Subject: [PATCH 1/2] Acknowledge doc_table:highlight config even after init --- src/ui/public/highlight/__tests__/highlight_request.js | 10 ++++++++++ src/ui/public/highlight/highlight_request.js | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ui/public/highlight/__tests__/highlight_request.js b/src/ui/public/highlight/__tests__/highlight_request.js index 4011f495bc8ca..0f174dd650f03 100644 --- a/src/ui/public/highlight/__tests__/highlight_request.js +++ b/src/ui/public/highlight/__tests__/highlight_request.js @@ -79,4 +79,14 @@ describe('getHighlightRequest', () => { const request = getHighlightRequest(queryStringQuery); expect(request.fields['*']).to.not.have.property('highlight_query'); }); + + it('should enable/disable highlighting if config is changed', () => { + getHighlightRequest = getHighlightRequestProvider(config); + let request = getHighlightRequest(queryStringQuery); + expect(request).to.not.be(undefined); + + config.set('doc_table:highlight', false); + request = getHighlightRequest(queryStringQuery); + expect(request).to.be(undefined); + }); }); diff --git a/src/ui/public/highlight/highlight_request.js b/src/ui/public/highlight/highlight_request.js index dda1ca2383ff4..82b5870668774 100644 --- a/src/ui/public/highlight/highlight_request.js +++ b/src/ui/public/highlight/highlight_request.js @@ -23,11 +23,9 @@ function getHighlightQuery(query) { } export default function getHighlightRequestProvider(config) { - if (!config.get('doc_table:highlight')) { - return _.noop; - } - return function getHighlightRequest(query) { + if (!config.get('doc_table:highlight')) return; + const fieldsParams = config.get('doc_table:highlight:all_fields') ? { highlight_query: getHighlightQuery(query) } : {}; From 3c0efb9b1a6ec920cbd3bff13cf47b64caeff026 Mon Sep 17 00:00:00 2001 From: Lukas Olson Date: Tue, 14 Feb 2017 14:21:04 -0700 Subject: [PATCH 2/2] Use highlightAll on dashboard --- src/core_plugins/kibana/public/dashboard/dashboard.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core_plugins/kibana/public/dashboard/dashboard.js b/src/core_plugins/kibana/public/dashboard/dashboard.js index e4014e38ee57d..8442c627292eb 100644 --- a/src/core_plugins/kibana/public/dashboard/dashboard.js +++ b/src/core_plugins/kibana/public/dashboard/dashboard.js @@ -77,6 +77,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, let pendingVisCount = _.size(dashboardState.getPanels()); timefilter.enabled = true; + dash.searchSource.highlightAll(true); courier.setRootSearchSource(dash.searchSource); // Following the "best practice" of always have a '.' in your ng-models –