From 8d120c805de0a1a51909dd7c59d5a4dbb9c6a5bd Mon Sep 17 00:00:00 2001 From: Trevan Richins Date: Thu, 29 Oct 2015 13:18:23 -0600 Subject: [PATCH 01/50] Leaflet.heat intensity is between 0.0 and 1.0 --- .../public/vislib/__tests__/visualizations/tile_maps/markers.js | 2 +- src/ui/public/vislib/visualizations/marker_types/heatmap.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js index 4ead77f9f4953..24d8378f96a5e 100644 --- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js +++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js @@ -305,7 +305,7 @@ describe('Marker Tests', function () { var arr = markerLayer._dataToHeatArray(max); var index = _.random(mapData.features.length - 1); var feature = mapData.features[index]; - var featureValue = parseInt(feature.properties.value / max * 100); + var featureValue = feature.properties.value / max; var featureArr = feature.geometry.coordinates.slice(0).concat(featureValue); expect(arr[index]).to.eql(featureArr); }); diff --git a/src/ui/public/vislib/visualizations/marker_types/heatmap.js b/src/ui/public/vislib/visualizations/marker_types/heatmap.js index 1973053be1e9c..4272342a67208 100644 --- a/src/ui/public/vislib/visualizations/marker_types/heatmap.js +++ b/src/ui/public/vislib/visualizations/marker_types/heatmap.js @@ -199,7 +199,7 @@ export default function HeatmapMarkerFactory(Private) { heatIntensity = feature.properties.value; } else { // show bucket value normalized to max value - heatIntensity = parseInt(feature.properties.value / max * 100); + heatIntensity = feature.properties.value / max; } return [lat, lng, heatIntensity]; From a7716d7cab76e40bedcb576a2e26423c1a89e406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Qu=C3=A9m=C3=A9ner?= Date: Tue, 15 Dec 2015 12:48:54 +0100 Subject: [PATCH 02/50] Make default columns configurable --- src/plugins/kibana/public/discover/controllers/discover.js | 2 +- src/ui/public/config/defaults.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js index a7b17b5afd22c..c89b823fc8f8b 100644 --- a/src/plugins/kibana/public/discover/controllers/discover.js +++ b/src/plugins/kibana/public/discover/controllers/discover.js @@ -126,7 +126,7 @@ app.controller('discover', function ($scope, config, courier, $route, $window, N return { query: $scope.searchSource.get('query') || '', sort: getSort.array(savedSearch.sort, $scope.indexPattern), - columns: savedSearch.columns || ['_source'], + columns: savedSearch.columns.length > 0 ? savedSearch.columns : config.get('defaultColumns'), index: $scope.indexPattern.id, interval: 'auto', filters: _.cloneDeep($scope.searchSource.getOwn('filter')) diff --git a/src/ui/public/config/defaults.js b/src/ui/public/config/defaults.js index c167e814bf3e3..ef56c170dad72 100644 --- a/src/ui/public/config/defaults.js +++ b/src/ui/public/config/defaults.js @@ -50,6 +50,10 @@ export default function configDefaultsProvider() { value: null, description: 'The index to access if no index is set', }, + 'defaultColumns': { + value: ['_source'], + description: 'Columns displayed by default in the Discovery tab', + }, 'metaFields': { value: ['_source', '_id', '_type', '_index', '_score'], description: 'Fields that exist outside of _source to merge into our document when displaying it', From 8992535b31af45a7ec49a42f7b61525c5126c8f1 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Fri, 12 Feb 2016 09:42:07 -0700 Subject: [PATCH 03/50] Escape attributes, closes #6174 --- src/ui/public/utils/escape_attr.js | 7 +++++++ src/ui/public/vislib/lib/dispatch.js | 3 ++- src/ui/public/visualize/visualize_legend.js | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/ui/public/utils/escape_attr.js diff --git a/src/ui/public/utils/escape_attr.js b/src/ui/public/utils/escape_attr.js new file mode 100644 index 0000000000000..4fad6b8570128 --- /dev/null +++ b/src/ui/public/utils/escape_attr.js @@ -0,0 +1,7 @@ +export default function escapeAttribute(attr) { + const specials = ['#', '&', '~', '=', '>', '\'', ':', '"', '!', ';', ',']; + const regexSpecials = ['.', '*', '+', '|', '[', ']', '(', ')', '/', '^', '$']; + const sRE = new RegExp('(' + specials.join('|') + '|\\' + regexSpecials.join('|\\') + ')', 'g'); + + return attr.replace(sRE, '\\$1'); +} diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index 93766383b58e4..7dd8577779020 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -1,6 +1,7 @@ import d3 from 'd3'; import _ from 'lodash'; import $ from 'jquery'; +import escapeAttr from 'ui/utils/escape_attr'; import SimpleEmitter from 'ui/utils/SimpleEmitter'; import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip'; export default function DispatchClass(Private) { @@ -230,7 +231,7 @@ export default function DispatchClass(Private) { Dispatch.prototype.highlightLegend = function (element) { var label = this.getAttribute('data-label'); if (!label) return; - $('[data-label]', element.parentNode).not('[data-label="' + label + '"]').css('opacity', 0.5); + $('[data-label]', element.parentNode).not('[data-label="' + escapeAttr(label) + '"]').css('opacity', 0.5); }; /** diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js index 9d3edea59b79d..3171b8d111427 100644 --- a/src/ui/public/visualize/visualize_legend.js +++ b/src/ui/public/visualize/visualize_legend.js @@ -2,6 +2,7 @@ import _ from 'lodash'; import html from 'ui/visualize/visualize_legend.html'; import $ from 'jquery'; import d3 from 'd3'; +import escapeAttr from 'ui/utils/escape_attr'; import findByParam from 'ui/utils/find_by_param'; import VislibLibDataProvider from 'ui/vislib/lib/data'; import VislibComponentsColorColorProvider from 'ui/vislib/components/color/color'; @@ -30,7 +31,7 @@ uiModules.get('kibana') }); $scope.highlightSeries = function (label) { - $('[data-label]', $elem.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5); + $('[data-label]', $elem.siblings()).not('[data-label="' + escapeAttr(label) + '"]').css('opacity', 0.5); }; $scope.unhighlightSeries = function () { From 3791f1b2aefae442e71b3fab6f9a1d038efa5ba4 Mon Sep 17 00:00:00 2001 From: spalger Date: Sun, 14 Feb 2016 02:06:16 -0700 Subject: [PATCH 04/50] [filters/label] use _.words and _.capitalize --- src/ui/public/filters/label.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/ui/public/filters/label.js b/src/ui/public/filters/label.js index d21f98edfef7f..7c471d96c6e97 100644 --- a/src/ui/public/filters/label.js +++ b/src/ui/public/filters/label.js @@ -1,15 +1,10 @@ import uiModules from 'ui/modules'; +import { words, capitalize } from 'lodash'; + uiModules .get('kibana') .filter('label', function () { return function (str) { - var words = str.split(' '); - return words.map(capFirst).join(' '); + return words(str).map(capitalize).join(' '); }; }); - -function capFirst(str) { - var i = str[0]; - var r = new RegExp(i, 'i'); - return str.replace(r, i.toUpperCase()); -} From f9fd042eb18b5aa8a56e68c3bc1db57e7b982356 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 22 Feb 2016 20:53:47 -0800 Subject: [PATCH 05/50] [vis/editor] auto select the options when appropriate --- src/plugins/kibana/public/visualize/editor/sidebar.html | 3 +-- src/plugins/kibana/public/visualize/editor/sidebar.js | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.html b/src/plugins/kibana/public/visualize/editor/sidebar.html index d2de10a1d6c13..95725d72a16f0 100644 --- a/src/plugins/kibana/public/visualize/editor/sidebar.html +++ b/src/plugins/kibana/public/visualize/editor/sidebar.html @@ -13,7 +13,7 @@
    -
  • +
  • Data
  • @@ -66,4 +66,3 @@ - diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.js b/src/plugins/kibana/public/visualize/editor/sidebar.js index b88b6537a85f8..e9a6541aec994 100644 --- a/src/plugins/kibana/public/visualize/editor/sidebar.js +++ b/src/plugins/kibana/public/visualize/editor/sidebar.js @@ -16,7 +16,12 @@ uiModules controller: function ($scope) { $scope.$bind('vis', 'editableVis'); $scope.$bind('outputVis', 'vis'); - this.section = _.get($scope, 'vis.type.requiresSearch') ? 'data' : 'options'; + $scope.$watch('vis.type', (visType) => { + if (visType) { + this.showData = visType.schemas.buckets || visType.schemas.metrics; + this.section = this.section || (this.showData ? 'data' : 'options'); + } + }); } }; }); From 654a56cf74d01ffc87beb332b5c649fd0c7df74d Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 22 Feb 2016 21:29:38 -0800 Subject: [PATCH 06/50] [courier/fetch] drop _ prefix, use relative paths for local modules --- src/ui/public/courier/fetch/__tests__/doc.js | 5 +++-- src/ui/public/courier/fetch/__tests__/fetch.js | 7 ++++--- src/ui/public/courier/fetch/__tests__/fetch_these.js | 4 +++- .../fetch/{_call_client.js => call_client.js} | 8 +++++--- ...esponse_handlers.js => call_response_handlers.js} | 10 +++++----- ...continue_incomplete.js => continue_incomplete.js} | 2 +- src/ui/public/courier/fetch/fetch.js | 10 ++++++---- .../fetch/{_fetch_these.js => fetch_these.js} | 12 ++++++------ .../{_for_each_strategy.js => for_each_strategy.js} | 2 +- .../courier/fetch/{_is_request.js => is_request.js} | 2 +- ...icate_requests.js => merge_duplicate_requests.js} | 4 ++-- .../courier/fetch/{_notifier.js => notifier.js} | 0 .../courier/fetch/{_req_status.js => req_status.js} | 0 .../courier/fetch/request/__tests__/segmented.js | 7 ++++--- .../request/__tests__/segmented_create_queue.js | 5 ++++- .../request/__tests__/segmented_index_selection.js | 3 ++- .../request/__tests__/segmented_size_picking.js | 3 ++- src/ui/public/courier/fetch/request/doc.js | 6 ++++-- .../request/{_error_handler.js => error_handler.js} | 3 ++- src/ui/public/courier/fetch/request/request.js | 7 +++++-- src/ui/public/courier/fetch/request/search.js | 6 ++++-- src/ui/public/courier/fetch/request/segmented.js | 8 +++++--- .../{_segmented_handle.js => segmented_handle.js} | 2 ++ .../courier/fetch/strategy/__tests__/search.js | 4 +++- src/ui/public/courier/fetch/strategy/search.js | 4 +++- 25 files changed, 77 insertions(+), 47 deletions(-) rename src/ui/public/courier/fetch/{_call_client.js => call_client.js} (93%) rename src/ui/public/courier/fetch/{_call_response_handlers.js => call_response_handlers.js} (82%) rename src/ui/public/courier/fetch/{_continue_incomplete.js => continue_incomplete.js} (91%) rename src/ui/public/courier/fetch/{_fetch_these.js => fetch_these.js} (81%) rename src/ui/public/courier/fetch/{_for_each_strategy.js => for_each_strategy.js} (100%) rename src/ui/public/courier/fetch/{_is_request.js => is_request.js} (72%) rename src/ui/public/courier/fetch/{_merge_duplicate_requests.js => merge_duplicate_requests.js} (82%) rename src/ui/public/courier/fetch/{_notifier.js => notifier.js} (100%) rename src/ui/public/courier/fetch/{_req_status.js => req_status.js} (100%) rename src/ui/public/courier/fetch/request/{_error_handler.js => error_handler.js} (91%) rename src/ui/public/courier/fetch/request/{_segmented_handle.js => segmented_handle.js} (99%) diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js index 25c7e78677912..02f6ffee6bacb 100644 --- a/src/ui/public/courier/fetch/__tests__/doc.js +++ b/src/ui/public/courier/fetch/__tests__/doc.js @@ -1,8 +1,9 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; -import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc'; + +import CourierDataSourceDocSourceProvider from '../../data_source/doc_source'; +import CourierFetchRequestDocProvider from '../request/doc'; describe('Courier DocFetchRequest class', function () { diff --git a/src/ui/public/courier/fetch/__tests__/fetch.js b/src/ui/public/courier/fetch/__tests__/fetch.js index dad88dd6c93de..147630301d096 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch.js +++ b/src/ui/public/courier/fetch/__tests__/fetch.js @@ -2,11 +2,12 @@ import ngMock from 'ngMock'; import expect from 'expect.js'; import sinon from 'auto-release-sinon'; -import FetchProvider from 'ui/courier/fetch'; import IndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import searchResp from 'fixtures/search_response'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; + +import FetchProvider from '../fetch'; +import CourierDataSourceDocSourceProvider from '../../data_source/doc_source'; +import CourierDataSourceSearchSourceProvider from '../../data_source/search_source'; describe('Fetch service', function () { require('testUtils/noDigestPromises').activateForSuite(); diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js index 57d085394bb02..0e44e1e66c66b 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch_these.js +++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js @@ -2,7 +2,9 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierFetchFetchTheseProvider from 'ui/courier/fetch/_fetch_these'; + +import CourierFetchFetchTheseProvider from '../fetch/fetch_these'; + describe('ui/courier/fetch/_fetch_these', () => { let Promise; diff --git a/src/ui/public/courier/fetch/_call_client.js b/src/ui/public/courier/fetch/call_client.js similarity index 93% rename from src/ui/public/courier/fetch/_call_client.js rename to src/ui/public/courier/fetch/call_client.js index db21eaba6cb7b..10b61fa57ef40 100644 --- a/src/ui/public/courier/fetch/_call_client.js +++ b/src/ui/public/courier/fetch/call_client.js @@ -1,7 +1,9 @@ import _ from 'lodash'; -import CourierFetchIsRequestProvider from 'ui/courier/fetch/_is_request'; -import CourierFetchMergeDuplicateRequestsProvider from 'ui/courier/fetch/_merge_duplicate_requests'; -import CourierFetchReqStatusProvider from 'ui/courier/fetch/_req_status'; + +import CourierFetchIsRequestProvider from './is_request'; +import CourierFetchMergeDuplicateRequestsProvider from './merge_duplicate_requests'; +import CourierFetchReqStatusProvider from './req_status'; + export default function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) { var isRequest = Private(CourierFetchIsRequestProvider); diff --git a/src/ui/public/courier/fetch/_call_response_handlers.js b/src/ui/public/courier/fetch/call_response_handlers.js similarity index 82% rename from src/ui/public/courier/fetch/_call_response_handlers.js rename to src/ui/public/courier/fetch/call_response_handlers.js index 3dfcd33793729..a2a533e06c984 100644 --- a/src/ui/public/courier/fetch/_call_response_handlers.js +++ b/src/ui/public/courier/fetch/call_response_handlers.js @@ -1,8 +1,8 @@ -import { SearchTimeout } from 'ui/errors'; -import { RequestFailure } from 'ui/errors'; -import { ShardFailure } from 'ui/errors'; -import CourierFetchReqStatusProvider from 'ui/courier/fetch/_req_status'; -import CourierFetchNotifierProvider from 'ui/courier/fetch/_notifier'; +import { RequestFailure, SearchTimeout, ShardFailure } from 'ui/errors'; + +import CourierFetchReqStatusProvider from './req_status'; +import CourierFetchNotifierProvider from './notifier'; + export default function CourierFetchCallResponseHandlers(Private, Promise) { var ABORTED = Private(CourierFetchReqStatusProvider).ABORTED; var INCOMPLETE = Private(CourierFetchReqStatusProvider).INCOMPLETE; diff --git a/src/ui/public/courier/fetch/_continue_incomplete.js b/src/ui/public/courier/fetch/continue_incomplete.js similarity index 91% rename from src/ui/public/courier/fetch/_continue_incomplete.js rename to src/ui/public/courier/fetch/continue_incomplete.js index bff84e5ef4a9b..da516135021e9 100644 --- a/src/ui/public/courier/fetch/_continue_incomplete.js +++ b/src/ui/public/courier/fetch/continue_incomplete.js @@ -1,4 +1,4 @@ -import CourierFetchReqStatusProvider from 'ui/courier/fetch/_req_status'; +import CourierFetchReqStatusProvider from './req_status'; export default function CourierFetchContinueIncompleteRequests(Private) { var INCOMPLETE = Private(CourierFetchReqStatusProvider).INCOMPLETE; diff --git a/src/ui/public/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js index 4f34135820d42..42e10bd9ad352 100644 --- a/src/ui/public/courier/fetch/fetch.js +++ b/src/ui/public/courier/fetch/fetch.js @@ -1,8 +1,10 @@ import _ from 'lodash'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierFetchFetchTheseProvider from 'ui/courier/fetch/_fetch_these'; -import CourierFetchCallResponseHandlersProvider from 'ui/courier/fetch/_call_response_handlers'; -import CourierFetchReqStatusProvider from 'ui/courier/fetch/_req_status'; + +import CourierRequestQueueProvider from '../_request_queue'; +import CourierFetchFetchTheseProvider from './fetch_these'; +import CourierFetchCallResponseHandlersProvider from './call_response_handlers'; +import CourierFetchReqStatusProvider from './req_status'; + export default function fetchService(Private, Promise) { var requestQueue = Private(CourierRequestQueueProvider); diff --git a/src/ui/public/courier/fetch/_fetch_these.js b/src/ui/public/courier/fetch/fetch_these.js similarity index 81% rename from src/ui/public/courier/fetch/_fetch_these.js rename to src/ui/public/courier/fetch/fetch_these.js index 006f273f7880e..5dc0aeac93ec2 100644 --- a/src/ui/public/courier/fetch/_fetch_these.js +++ b/src/ui/public/courier/fetch/fetch_these.js @@ -1,9 +1,9 @@ -import CourierFetchNotifierProvider from 'ui/courier/fetch/_notifier'; -import CourierFetchForEachStrategyProvider from 'ui/courier/fetch/_for_each_strategy'; -import CourierFetchCallClientProvider from 'ui/courier/fetch/_call_client'; -import CourierFetchCallResponseHandlersProvider from 'ui/courier/fetch/_call_response_handlers'; -import CourierFetchContinueIncompleteProvider from 'ui/courier/fetch/_continue_incomplete'; -import CourierFetchReqStatusProvider from 'ui/courier/fetch/_req_status'; +import CourierFetchNotifierProvider from './notifier'; +import CourierFetchForEachStrategyProvider from './for_each_strategy'; +import CourierFetchCallClientProvider from './call_client'; +import CourierFetchCallResponseHandlersProvider from './call_response_handlers'; +import CourierFetchContinueIncompleteProvider from './continue_incomplete'; +import CourierFetchReqStatusProvider from './req_status'; export default function FetchTheseProvider(Private, Promise) { var notify = Private(CourierFetchNotifierProvider); diff --git a/src/ui/public/courier/fetch/_for_each_strategy.js b/src/ui/public/courier/fetch/for_each_strategy.js similarity index 100% rename from src/ui/public/courier/fetch/_for_each_strategy.js rename to src/ui/public/courier/fetch/for_each_strategy.js index 0bebb1a262b51..b105595ece624 100644 --- a/src/ui/public/courier/fetch/_for_each_strategy.js +++ b/src/ui/public/courier/fetch/for_each_strategy.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -export default function FetchForEachRequestStrategy(Private, Promise) { +export default function FetchForEachRequestStrategy(Private, Promise) { function forEachStrategy(requests, block) { block = Promise.method(block); var sets = []; diff --git a/src/ui/public/courier/fetch/_is_request.js b/src/ui/public/courier/fetch/is_request.js similarity index 72% rename from src/ui/public/courier/fetch/_is_request.js rename to src/ui/public/courier/fetch/is_request.js index 5f85fede43456..1e80648ff264d 100644 --- a/src/ui/public/courier/fetch/_is_request.js +++ b/src/ui/public/courier/fetch/is_request.js @@ -1,4 +1,4 @@ -import CourierFetchRequestRequestProvider from 'ui/courier/fetch/request/request'; +import CourierFetchRequestRequestProvider from './request'; export default function CourierFetchIsRequestProvider(Private) { var AbstractRequest = Private(CourierFetchRequestRequestProvider); diff --git a/src/ui/public/courier/fetch/_merge_duplicate_requests.js b/src/ui/public/courier/fetch/merge_duplicate_requests.js similarity index 82% rename from src/ui/public/courier/fetch/_merge_duplicate_requests.js rename to src/ui/public/courier/fetch/merge_duplicate_requests.js index 2f1d0c2daffb6..542cda0987a65 100644 --- a/src/ui/public/courier/fetch/_merge_duplicate_requests.js +++ b/src/ui/public/courier/fetch/merge_duplicate_requests.js @@ -1,5 +1,5 @@ -import CourierFetchIsRequestProvider from 'ui/courier/fetch/_is_request'; -import CourierFetchReqStatusProvider from 'ui/courier/fetch/_req_status'; +import CourierFetchIsRequestProvider from './is_request'; +import CourierFetchReqStatusProvider from './req_status'; export default function FetchMergeDuplicateRequests(Private) { var isRequest = Private(CourierFetchIsRequestProvider); diff --git a/src/ui/public/courier/fetch/_notifier.js b/src/ui/public/courier/fetch/notifier.js similarity index 100% rename from src/ui/public/courier/fetch/_notifier.js rename to src/ui/public/courier/fetch/notifier.js diff --git a/src/ui/public/courier/fetch/_req_status.js b/src/ui/public/courier/fetch/req_status.js similarity index 100% rename from src/ui/public/courier/fetch/_req_status.js rename to src/ui/public/courier/fetch/req_status.js diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js index 9f2a45d5ad8be..b00496b1c3d56 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js @@ -1,10 +1,11 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented'; -import CourierFetchRequestSearchProvider from 'ui/courier/fetch/request/search'; -describe('ui/courier/fetch/request/segmented', () => { +import CourierFetchRequestSegmentedProvider from '../segmented'; +import CourierFetchRequestSearchProvider from '../search'; + +describe('ui/courier/fetch/request/segmented', () => { let Promise; let $rootScope; let SegmentedReq; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js index c63cc5d0db325..946d18f984f1d 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js @@ -1,8 +1,11 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; + import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; -import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented'; + +import CourierFetchRequestSegmentedProvider from '../segmented'; + describe('ui/courier/fetch/request/segmented/_createQueue', () => { let Promise; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js index 336d7e9570839..1874e7d4d63ad 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js @@ -6,7 +6,8 @@ import sinon from 'auto-release-sinon'; import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; import NoDigestPromises from 'testUtils/noDigestPromises'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; -import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented'; + +import CourierFetchRequestSegmentedProvider from '../segmented'; describe('Segmented Request Index Selection', function () { let Promise; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js index 7e40a44dea777..1085832c6a31a 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js @@ -6,7 +6,8 @@ import sinon from 'auto-release-sinon'; import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; import NoDigestPromises from 'testUtils/noDigestPromises'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; -import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented'; + +import CourierFetchRequestSegmentedProvider from '../segmented'; describe('Segmented Request Size Picking', function () { let Promise; diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js index 0b822e1fc0c61..e58b82c2bea90 100644 --- a/src/ui/public/courier/fetch/request/doc.js +++ b/src/ui/public/courier/fetch/request/doc.js @@ -1,6 +1,8 @@ import _ from 'lodash'; -import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc'; -import CourierFetchRequestRequestProvider from 'ui/courier/fetch/request/request'; + +import CourierFetchStrategyDocProvider from '../strategy/doc'; +import CourierFetchRequestRequestProvider from './request'; + export default function DocRequestProvider(Private) { var docStrategy = Private(CourierFetchStrategyDocProvider); diff --git a/src/ui/public/courier/fetch/request/_error_handler.js b/src/ui/public/courier/fetch/request/error_handler.js similarity index 91% rename from src/ui/public/courier/fetch/request/_error_handler.js rename to src/ui/public/courier/fetch/request/error_handler.js index 69aede3ee21f4..4d285b2d7f03d 100644 --- a/src/ui/public/courier/fetch/request/_error_handler.js +++ b/src/ui/public/courier/fetch/request/error_handler.js @@ -1,6 +1,7 @@ -import CourierErrorHandlersProvider from 'ui/courier/_error_handlers'; import Notifier from 'ui/notify/notifier'; +import CourierErrorHandlersProvider from '../../_error_handlers'; + export default function RequestErrorHandlerFactory(Private) { var errHandlers = Private(CourierErrorHandlersProvider); diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index 7d828e583adfd..2c257a04aca59 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -1,8 +1,11 @@ import _ from 'lodash'; import moment from 'moment'; + import errors from 'ui/errors'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierFetchRequestErrorHandlerProvider from 'ui/courier/fetch/request/_error_handler'; + +import CourierRequestQueueProvider from '../../_request_queue'; +import CourierFetchRequestErrorHandlerProvider from './error_handler'; + export default function AbstractReqProvider(Private, Promise) { var requestQueue = Private(CourierRequestQueueProvider); var requestErrorHandler = Private(CourierFetchRequestErrorHandlerProvider); diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js index 9718124ef0c95..e4362d9065bb7 100644 --- a/src/ui/public/courier/fetch/request/search.js +++ b/src/ui/public/courier/fetch/request/search.js @@ -1,6 +1,8 @@ import _ from 'lodash'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierFetchRequestRequestProvider from 'ui/courier/fetch/request/request'; + +import CourierFetchStrategySearchProvider from '../strategy/search'; +import CourierFetchRequestRequestProvider from './request'; + export default function SearchReqProvider(Private) { var searchStrategy = Private(CourierFetchStrategySearchProvider); diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js index 67013b1caeb28..d28269aa55caa 100644 --- a/src/ui/public/courier/fetch/request/segmented.js +++ b/src/ui/public/courier/fetch/request/segmented.js @@ -1,7 +1,9 @@ -import { isNumber } from 'lodash'; import _ from 'lodash'; -import CourierFetchRequestSearchProvider from 'ui/courier/fetch/request/search'; -import CourierFetchRequestSegmentedHandleProvider from 'ui/courier/fetch/request/_segmented_handle'; +import { isNumber } from 'lodash'; + +import CourierFetchRequestSearchProvider from './search'; +import CourierFetchRequestSegmentedHandleProvider from './segmented_handle'; + export default function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter, config) { var SearchReq = Private(CourierFetchRequestSearchProvider); var SegmentedHandle = Private(CourierFetchRequestSegmentedHandleProvider); diff --git a/src/ui/public/courier/fetch/request/_segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js similarity index 99% rename from src/ui/public/courier/fetch/request/_segmented_handle.js rename to src/ui/public/courier/fetch/request/segmented_handle.js index 64739964f782b..1cf4f7ad1e844 100644 --- a/src/ui/public/courier/fetch/request/_segmented_handle.js +++ b/src/ui/public/courier/fetch/request/segmented_handle.js @@ -1,5 +1,7 @@ import _ from 'lodash'; + import EventsProvider from 'ui/events'; + export default function CourierSegmentedReqHandle(Private) { var Events = Private(EventsProvider); diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js index e714007912482..1a5c4146c4eab 100644 --- a/src/ui/public/courier/fetch/strategy/__tests__/search.js +++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js @@ -2,7 +2,9 @@ import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; + +import CourierFetchStrategySearchProvider from '../search'; + describe('ui/courier/fetch/strategy/search', () => { let Promise; diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js index 3c2972e4ec359..38273977d164d 100644 --- a/src/ui/public/courier/fetch/strategy/search.js +++ b/src/ui/public/courier/fetch/strategy/search.js @@ -1,6 +1,8 @@ -import { toJson } from 'ui/utils/aggressive_parse'; import _ from 'lodash'; import angular from 'angular'; + +import { toJson } from 'ui/utils/aggressive_parse'; + export default function FetchStrategyForSearch(Private, Promise, timefilter) { return { From 32cd30bc38ed2851c6e6e844142e079c3ad8bdd9 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 22 Feb 2016 21:39:27 -0800 Subject: [PATCH 07/50] [courier/fetch] use better provider naming With the transition to es6 modules, provider names were calculated automatically based on the require path. When using relative paths this produces pretty nice names, but since the courier used absolute ids the import names were pretty messy. --- src/ui/public/courier/fetch/__tests__/doc.js | 8 +++--- .../public/courier/fetch/__tests__/fetch.js | 8 +++--- .../courier/fetch/__tests__/fetch_these.js | 4 +-- src/ui/public/courier/fetch/call_client.js | 14 +++++----- .../courier/fetch/call_response_handlers.js | 10 +++---- .../courier/fetch/continue_incomplete.js | 4 +-- src/ui/public/courier/fetch/fetch.js | 16 +++++------ src/ui/public/courier/fetch/fetch_these.js | 28 +++++++++---------- src/ui/public/courier/fetch/is_request.js | 6 ++-- .../courier/fetch/merge_duplicate_requests.js | 8 +++--- .../fetch/request/__tests__/segmented.js | 8 +++--- .../__tests__/segmented_create_queue.js | 4 +-- .../__tests__/segmented_index_selection.js | 4 +-- .../__tests__/segmented_size_picking.js | 4 +-- src/ui/public/courier/fetch/request/doc.js | 8 +++--- .../courier/fetch/request/error_handler.js | 4 +-- .../public/courier/fetch/request/request.js | 8 +++--- src/ui/public/courier/fetch/request/search.js | 8 +++--- .../public/courier/fetch/request/segmented.js | 12 ++++---- .../fetch/strategy/__tests__/search.js | 4 +-- 20 files changed, 86 insertions(+), 84 deletions(-) diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js index 02f6ffee6bacb..657fcef50413c 100644 --- a/src/ui/public/courier/fetch/__tests__/doc.js +++ b/src/ui/public/courier/fetch/__tests__/doc.js @@ -2,8 +2,8 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierDataSourceDocSourceProvider from '../../data_source/doc_source'; -import CourierFetchRequestDocProvider from '../request/doc'; +import DocSourceProvider from '../../data_source/doc_source'; +import DocRequestProvider from '../request/doc'; describe('Courier DocFetchRequest class', function () { @@ -16,8 +16,8 @@ describe('Courier DocFetchRequest class', function () { beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, Promise, $injector) { - var DocSource = Private(CourierDataSourceDocSourceProvider); - var DocFetchRequest = Private(CourierFetchRequestDocProvider); + var DocSource = Private(DocSourceProvider); + var DocFetchRequest = Private(DocRequestProvider); storage = $injector.get('localStorage').store = diff --git a/src/ui/public/courier/fetch/__tests__/fetch.js b/src/ui/public/courier/fetch/__tests__/fetch.js index 147630301d096..1c5c6b107c9a4 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch.js +++ b/src/ui/public/courier/fetch/__tests__/fetch.js @@ -6,8 +6,8 @@ import IndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import searchResp from 'fixtures/search_response'; import FetchProvider from '../fetch'; -import CourierDataSourceDocSourceProvider from '../../data_source/doc_source'; -import CourierDataSourceSearchSourceProvider from '../../data_source/search_source'; +import DocSourceProvider from '../../data_source/doc_source'; +import SearchSourceProvider from '../../data_source/search_source'; describe('Fetch service', function () { require('testUtils/noDigestPromises').activateForSuite(); @@ -25,8 +25,8 @@ describe('Fetch service', function () { Promise = $injector.get('Promise'); fetch = Private(FetchProvider); indexPattern = Private(IndexPatternProvider); - DocSource = Private(CourierDataSourceDocSourceProvider); - SearchSource = Private(CourierDataSourceSearchSourceProvider); + DocSource = Private(DocSourceProvider); + SearchSource = Private(SearchSourceProvider); })); describe('#doc(docSource)', function () { diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js index 0e44e1e66c66b..456a9ec0e9ff1 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch_these.js +++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js @@ -3,7 +3,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierFetchFetchTheseProvider from '../fetch/fetch_these'; +import FetchTheseProvider from '../fetch/fetch_these'; describe('ui/courier/fetch/_fetch_these', () => { @@ -32,7 +32,7 @@ describe('ui/courier/fetch/_fetch_these', () => { beforeEach(ngMock.inject((Private, $injector) => { $rootScope = $injector.get('$rootScope'); Promise = $injector.get('Promise'); - fetchThese = Private(CourierFetchFetchTheseProvider); + fetchThese = Private(FetchTheseProvider); request = mockRequest(); requests = [ request ]; })); diff --git a/src/ui/public/courier/fetch/call_client.js b/src/ui/public/courier/fetch/call_client.js index 10b61fa57ef40..84d8e0b8b52d0 100644 --- a/src/ui/public/courier/fetch/call_client.js +++ b/src/ui/public/courier/fetch/call_client.js @@ -1,16 +1,16 @@ import _ from 'lodash'; -import CourierFetchIsRequestProvider from './is_request'; -import CourierFetchMergeDuplicateRequestsProvider from './merge_duplicate_requests'; -import CourierFetchReqStatusProvider from './req_status'; +import IsRequestProvider from './is_request'; +import MergeDuplicatesRequestProvider from './merge_duplicate_requests'; +import ReqStatusProvider from './req_status'; export default function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) { - var isRequest = Private(CourierFetchIsRequestProvider); - var mergeDuplicateRequests = Private(CourierFetchMergeDuplicateRequestsProvider); + var isRequest = Private(IsRequestProvider); + var mergeDuplicateRequests = Private(MergeDuplicatesRequestProvider); - var ABORTED = Private(CourierFetchReqStatusProvider).ABORTED; - var DUPLICATE = Private(CourierFetchReqStatusProvider).DUPLICATE; + var ABORTED = Private(ReqStatusProvider).ABORTED; + var DUPLICATE = Private(ReqStatusProvider).DUPLICATE; function callClient(strategy, requests) { // merging docs can change status to DUPLICATE, capture new statuses diff --git a/src/ui/public/courier/fetch/call_response_handlers.js b/src/ui/public/courier/fetch/call_response_handlers.js index a2a533e06c984..2d305835fb690 100644 --- a/src/ui/public/courier/fetch/call_response_handlers.js +++ b/src/ui/public/courier/fetch/call_response_handlers.js @@ -1,12 +1,12 @@ import { RequestFailure, SearchTimeout, ShardFailure } from 'ui/errors'; -import CourierFetchReqStatusProvider from './req_status'; -import CourierFetchNotifierProvider from './notifier'; +import ReqStatusProvider from './req_status'; +import NotifierProvider from './notifier'; export default function CourierFetchCallResponseHandlers(Private, Promise) { - var ABORTED = Private(CourierFetchReqStatusProvider).ABORTED; - var INCOMPLETE = Private(CourierFetchReqStatusProvider).INCOMPLETE; - var notify = Private(CourierFetchNotifierProvider); + var ABORTED = Private(ReqStatusProvider).ABORTED; + var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; + var notify = Private(NotifierProvider); function callResponseHandlers(requests, responses) { diff --git a/src/ui/public/courier/fetch/continue_incomplete.js b/src/ui/public/courier/fetch/continue_incomplete.js index da516135021e9..0e57d85feb420 100644 --- a/src/ui/public/courier/fetch/continue_incomplete.js +++ b/src/ui/public/courier/fetch/continue_incomplete.js @@ -1,7 +1,7 @@ -import CourierFetchReqStatusProvider from './req_status'; +import ReqStatusProvider from './req_status'; export default function CourierFetchContinueIncompleteRequests(Private) { - var INCOMPLETE = Private(CourierFetchReqStatusProvider).INCOMPLETE; + var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; function continueIncompleteRequests(strategy, requests, responses, fetchWithStrategy) { var incomplete = []; diff --git a/src/ui/public/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js index 42e10bd9ad352..f540dcd29bcea 100644 --- a/src/ui/public/courier/fetch/fetch.js +++ b/src/ui/public/courier/fetch/fetch.js @@ -1,17 +1,17 @@ import _ from 'lodash'; -import CourierRequestQueueProvider from '../_request_queue'; -import CourierFetchFetchTheseProvider from './fetch_these'; -import CourierFetchCallResponseHandlersProvider from './call_response_handlers'; -import CourierFetchReqStatusProvider from './req_status'; +import RequestQueueProvider from '../_request_queue'; +import FetchTheseProvider from './fetch_these'; +import CallResponseHandlersProvider from './call_response_handlers'; +import ReqStatusProvider from './req_status'; export default function fetchService(Private, Promise) { - var requestQueue = Private(CourierRequestQueueProvider); - var fetchThese = Private(CourierFetchFetchTheseProvider); + var requestQueue = Private(RequestQueueProvider); + var fetchThese = Private(FetchTheseProvider); - var callResponseHandlers = Private(CourierFetchCallResponseHandlersProvider); - var INCOMPLETE = Private(CourierFetchReqStatusProvider).INCOMPLETE; + var callResponseHandlers = Private(CallResponseHandlersProvider); + var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; function fetchQueued(strategy) { var requests = requestQueue.getStartable(strategy); diff --git a/src/ui/public/courier/fetch/fetch_these.js b/src/ui/public/courier/fetch/fetch_these.js index 5dc0aeac93ec2..690e83c91abd8 100644 --- a/src/ui/public/courier/fetch/fetch_these.js +++ b/src/ui/public/courier/fetch/fetch_these.js @@ -1,22 +1,22 @@ -import CourierFetchNotifierProvider from './notifier'; -import CourierFetchForEachStrategyProvider from './for_each_strategy'; -import CourierFetchCallClientProvider from './call_client'; -import CourierFetchCallResponseHandlersProvider from './call_response_handlers'; -import CourierFetchContinueIncompleteProvider from './continue_incomplete'; -import CourierFetchReqStatusProvider from './req_status'; +import NotifierProvider from './notifier'; +import ForEachStrategyProvider from './for_each_strategy'; +import CallClientProvider from './call_client'; +import CallResponseHandlersProvider from './call_response_handlers'; +import ContinueIncompleteProvider from './continue_incomplete'; +import ReqStatusProvider from './req_status'; export default function FetchTheseProvider(Private, Promise) { - var notify = Private(CourierFetchNotifierProvider); - var forEachStrategy = Private(CourierFetchForEachStrategyProvider); + var notify = Private(NotifierProvider); + var forEachStrategy = Private(ForEachStrategyProvider); // core tasks - var callClient = Private(CourierFetchCallClientProvider); - var callResponseHandlers = Private(CourierFetchCallResponseHandlersProvider); - var continueIncomplete = Private(CourierFetchContinueIncompleteProvider); + var callClient = Private(CallClientProvider); + var callResponseHandlers = Private(CallResponseHandlersProvider); + var continueIncomplete = Private(ContinueIncompleteProvider); - var ABORTED = Private(CourierFetchReqStatusProvider).ABORTED; - var DUPLICATE = Private(CourierFetchReqStatusProvider).DUPLICATE; - var INCOMPLETE = Private(CourierFetchReqStatusProvider).INCOMPLETE; + var ABORTED = Private(ReqStatusProvider).ABORTED; + var DUPLICATE = Private(ReqStatusProvider).DUPLICATE; + var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; function fetchThese(requests) { return forEachStrategy(requests, function (strategy, reqsForStrategy) { diff --git a/src/ui/public/courier/fetch/is_request.js b/src/ui/public/courier/fetch/is_request.js index 1e80648ff264d..f5fddcf07c008 100644 --- a/src/ui/public/courier/fetch/is_request.js +++ b/src/ui/public/courier/fetch/is_request.js @@ -1,7 +1,7 @@ -import CourierFetchRequestRequestProvider from './request'; +import AbstractRequestProvider from './request'; -export default function CourierFetchIsRequestProvider(Private) { - var AbstractRequest = Private(CourierFetchRequestRequestProvider); +export default function IsRequestProvider(Private) { + var AbstractRequest = Private(AbstractRequestProvider); return function isRequest(obj) { return obj instanceof AbstractRequest; diff --git a/src/ui/public/courier/fetch/merge_duplicate_requests.js b/src/ui/public/courier/fetch/merge_duplicate_requests.js index 542cda0987a65..0aa0c53f0813a 100644 --- a/src/ui/public/courier/fetch/merge_duplicate_requests.js +++ b/src/ui/public/courier/fetch/merge_duplicate_requests.js @@ -1,9 +1,9 @@ -import CourierFetchIsRequestProvider from './is_request'; -import CourierFetchReqStatusProvider from './req_status'; +import IsRequestProvider from './is_request'; +import ReqStatusProvider from './req_status'; export default function FetchMergeDuplicateRequests(Private) { - var isRequest = Private(CourierFetchIsRequestProvider); - var DUPLICATE = Private(CourierFetchReqStatusProvider).DUPLICATE; + var isRequest = Private(IsRequestProvider); + var DUPLICATE = Private(ReqStatusProvider).DUPLICATE; function mergeDuplicateRequests(requests) { // dedupe requests diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js index b00496b1c3d56..cabfae475a296 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js @@ -2,8 +2,8 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierFetchRequestSegmentedProvider from '../segmented'; -import CourierFetchRequestSearchProvider from '../search'; +import SegmentedRequestProvider from '../segmented'; +import SearchRequestProvider from '../search'; describe('ui/courier/fetch/request/segmented', () => { let Promise; @@ -17,8 +17,8 @@ describe('ui/courier/fetch/request/segmented', () => { beforeEach(ngMock.inject((Private, $injector) => { Promise = $injector.get('Promise'); $rootScope = $injector.get('$rootScope'); - SegmentedReq = Private(CourierFetchRequestSegmentedProvider); - searchReqStart = sinon.spy(Private(CourierFetchRequestSearchProvider).prototype, 'start'); + SegmentedReq = Private(SegmentedRequestProvider); + searchReqStart = sinon.spy(Private(SearchRequestProvider).prototype, 'start'); })); describe('#start()', () => { diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js index 946d18f984f1d..d15c80a822adc 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js @@ -4,7 +4,7 @@ import ngMock from 'ngMock'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; -import CourierFetchRequestSegmentedProvider from '../segmented'; +import SegmentedRequestProvider from '../segmented'; describe('ui/courier/fetch/request/segmented/_createQueue', () => { @@ -19,7 +19,7 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => { beforeEach(ngMock.inject((Private, $injector) => { Promise = $injector.get('Promise'); $rootScope = $injector.get('$rootScope'); - SegmentedReq = Private(CourierFetchRequestSegmentedProvider); + SegmentedReq = Private(SegmentedRequestProvider); MockSource = class { constructor() { diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js index 1874e7d4d63ad..89a2c1735a95c 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js @@ -7,7 +7,7 @@ import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; import NoDigestPromises from 'testUtils/noDigestPromises'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; -import CourierFetchRequestSegmentedProvider from '../segmented'; +import SegmentedRequestProvider from '../segmented'; describe('Segmented Request Index Selection', function () { let Promise; @@ -23,7 +23,7 @@ describe('Segmented Request Index Selection', function () { Promise = $injector.get('Promise'); HitSortFn = Private(HitSortFnProv); $rootScope = $injector.get('$rootScope'); - SegmentedReq = Private(CourierFetchRequestSegmentedProvider); + SegmentedReq = Private(SegmentedRequestProvider); MockSource = class { constructor() { diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js index 1085832c6a31a..3339b21d2e925 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js @@ -7,7 +7,7 @@ import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; import NoDigestPromises from 'testUtils/noDigestPromises'; import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; -import CourierFetchRequestSegmentedProvider from '../segmented'; +import SegmentedRequestProvider from '../segmented'; describe('Segmented Request Size Picking', function () { let Promise; @@ -23,7 +23,7 @@ describe('Segmented Request Size Picking', function () { Promise = $injector.get('Promise'); HitSortFn = Private(HitSortFnProv); $rootScope = $injector.get('$rootScope'); - SegmentedReq = Private(CourierFetchRequestSegmentedProvider); + SegmentedReq = Private(SegmentedRequestProvider); MockSource = class { constructor() { diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js index e58b82c2bea90..4684a5d35f31c 100644 --- a/src/ui/public/courier/fetch/request/doc.js +++ b/src/ui/public/courier/fetch/request/doc.js @@ -1,12 +1,12 @@ import _ from 'lodash'; -import CourierFetchStrategyDocProvider from '../strategy/doc'; -import CourierFetchRequestRequestProvider from './request'; +import DocStrategyProvider from '../strategy/doc'; +import AbstractRequestProvider from './request'; export default function DocRequestProvider(Private) { - var docStrategy = Private(CourierFetchStrategyDocProvider); - var AbstractRequest = Private(CourierFetchRequestRequestProvider); + var docStrategy = Private(DocStrategyProvider); + var AbstractRequest = Private(AbstractRequestProvider); _.class(DocRequest).inherits(AbstractRequest); function DocRequest(source, defer) { diff --git a/src/ui/public/courier/fetch/request/error_handler.js b/src/ui/public/courier/fetch/request/error_handler.js index 4d285b2d7f03d..8707e41d49b58 100644 --- a/src/ui/public/courier/fetch/request/error_handler.js +++ b/src/ui/public/courier/fetch/request/error_handler.js @@ -1,9 +1,9 @@ import Notifier from 'ui/notify/notifier'; -import CourierErrorHandlersProvider from '../../_error_handlers'; +import ErrorHandlersProvider from '../../_error_handlers'; export default function RequestErrorHandlerFactory(Private) { - var errHandlers = Private(CourierErrorHandlersProvider); + var errHandlers = Private(ErrorHandlersProvider); var notify = new Notifier({ location: 'Courier Fetch Error' diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index 2c257a04aca59..1f2316428dfba 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -3,12 +3,12 @@ import moment from 'moment'; import errors from 'ui/errors'; -import CourierRequestQueueProvider from '../../_request_queue'; -import CourierFetchRequestErrorHandlerProvider from './error_handler'; +import RequestQueueProvider from '../../_request_queue'; +import ErrorHandlerRequestProvider from './error_handler'; export default function AbstractReqProvider(Private, Promise) { - var requestQueue = Private(CourierRequestQueueProvider); - var requestErrorHandler = Private(CourierFetchRequestErrorHandlerProvider); + var requestQueue = Private(RequestQueueProvider); + var requestErrorHandler = Private(ErrorHandlerRequestProvider); function AbstractReq(source, defer) { if (!(this instanceof AbstractReq) || !this.constructor || this.constructor === AbstractReq) { diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js index e4362d9065bb7..08ebbb1173765 100644 --- a/src/ui/public/courier/fetch/request/search.js +++ b/src/ui/public/courier/fetch/request/search.js @@ -1,12 +1,12 @@ import _ from 'lodash'; -import CourierFetchStrategySearchProvider from '../strategy/search'; -import CourierFetchRequestRequestProvider from './request'; +import SearchStrategyProvider from '../strategy/search'; +import AbstractRequestProvider from './request'; export default function SearchReqProvider(Private) { - var searchStrategy = Private(CourierFetchStrategySearchProvider); - var AbstractRequest = Private(CourierFetchRequestRequestProvider); + var searchStrategy = Private(SearchStrategyProvider); + var AbstractRequest = Private(AbstractRequestProvider); _.class(SearchReq).inherits(AbstractRequest); var Super = SearchReq.Super; diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js index d28269aa55caa..84c23c8e2debd 100644 --- a/src/ui/public/courier/fetch/request/segmented.js +++ b/src/ui/public/courier/fetch/request/segmented.js @@ -1,12 +1,14 @@ import _ from 'lodash'; import { isNumber } from 'lodash'; -import CourierFetchRequestSearchProvider from './search'; -import CourierFetchRequestSegmentedHandleProvider from './segmented_handle'; +import Notifier from 'ui/notify/notifier'; -export default function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter, config) { - var SearchReq = Private(CourierFetchRequestSearchProvider); - var SegmentedHandle = Private(CourierFetchRequestSegmentedHandleProvider); +import SearchRequestProvider from './search'; +import SegmentedHandleProvider from './segmented_handle'; + +export default function SegmentedReqProvider(es, Private, Promise, timefilter, config) { + var SearchReq = Private(SearchRequestProvider); + var SegmentedHandle = Private(SegmentedHandleProvider); var notify = new Notifier({ location: 'Segmented Fetch' diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js index 1a5c4146c4eab..21d62a2bbb419 100644 --- a/src/ui/public/courier/fetch/strategy/__tests__/search.js +++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js @@ -3,7 +3,7 @@ import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import CourierFetchStrategySearchProvider from '../search'; +import SearchStrategyProvider from '../search'; describe('ui/courier/fetch/strategy/search', () => { @@ -17,7 +17,7 @@ describe('ui/courier/fetch/strategy/search', () => { beforeEach(ngMock.inject((Private, $injector) => { Promise = $injector.get('Promise'); $rootScope = $injector.get('$rootScope'); - search = Private(CourierFetchStrategySearchProvider); + search = Private(SearchStrategyProvider); reqsFetchParams = [ { index: ['logstash-123'], From ad991666656850fa04af82469d48ba5686e4649c Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 22 Feb 2016 21:44:17 -0800 Subject: [PATCH 08/50] [courier/fetch] var -> let,const --- src/ui/public/courier/fetch/__tests__/doc.js | 15 ++--- src/ui/public/courier/fetch/call_client.js | 22 +++---- .../courier/fetch/call_response_handlers.js | 8 +-- .../courier/fetch/continue_incomplete.js | 4 +- src/ui/public/courier/fetch/fetch.js | 12 ++-- src/ui/public/courier/fetch/fetch_these.js | 18 ++--- .../public/courier/fetch/for_each_strategy.js | 6 +- src/ui/public/courier/fetch/is_request.js | 2 +- .../courier/fetch/merge_duplicate_requests.js | 8 +-- .../__tests__/segmented_create_queue.js | 2 +- src/ui/public/courier/fetch/request/doc.js | 14 ++-- .../courier/fetch/request/error_handler.js | 6 +- .../public/courier/fetch/request/request.js | 8 +-- src/ui/public/courier/fetch/request/search.js | 6 +- .../public/courier/fetch/request/segmented.js | 66 +++++++++---------- .../courier/fetch/request/segmented_handle.js | 2 +- .../public/courier/fetch/strategy/search.js | 2 +- 17 files changed, 100 insertions(+), 101 deletions(-) diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js index 657fcef50413c..6ce8059c14ba1 100644 --- a/src/ui/public/courier/fetch/__tests__/doc.js +++ b/src/ui/public/courier/fetch/__tests__/doc.js @@ -6,18 +6,17 @@ import DocSourceProvider from '../../data_source/doc_source'; import DocRequestProvider from '../request/doc'; describe('Courier DocFetchRequest class', function () { + let storage; + let source; + let defer; + let req; - var storage; - var source; - var defer; - var req; - - var setVersion; + let setVersion; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, Promise, $injector) { - var DocSource = Private(DocSourceProvider); - var DocFetchRequest = Private(DocRequestProvider); + const DocSource = Private(DocSourceProvider); + const DocFetchRequest = Private(DocRequestProvider); storage = $injector.get('localStorage').store = diff --git a/src/ui/public/courier/fetch/call_client.js b/src/ui/public/courier/fetch/call_client.js index 84d8e0b8b52d0..2157e4420d958 100644 --- a/src/ui/public/courier/fetch/call_client.js +++ b/src/ui/public/courier/fetch/call_client.js @@ -6,26 +6,26 @@ import ReqStatusProvider from './req_status'; export default function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) { - var isRequest = Private(IsRequestProvider); - var mergeDuplicateRequests = Private(MergeDuplicatesRequestProvider); + const isRequest = Private(IsRequestProvider); + const mergeDuplicateRequests = Private(MergeDuplicatesRequestProvider); - var ABORTED = Private(ReqStatusProvider).ABORTED; - var DUPLICATE = Private(ReqStatusProvider).DUPLICATE; + const ABORTED = Private(ReqStatusProvider).ABORTED; + const DUPLICATE = Private(ReqStatusProvider).DUPLICATE; function callClient(strategy, requests) { // merging docs can change status to DUPLICATE, capture new statuses - var statuses = mergeDuplicateRequests(requests); + const statuses = mergeDuplicateRequests(requests); // get the actual list of requests that we will be fetching - var executable = statuses.filter(isRequest); - var execCount = executable.length; + const executable = statuses.filter(isRequest); + let execCount = executable.length; // resolved by respond() - var esPromise; - var defer = Promise.defer(); + let esPromise; + const defer = Promise.defer(); // for each respond with either the response or ABORTED - var respond = function (responses) { + const respond = function (responses) { responses = responses || []; return Promise.map(requests, function (req, i) { switch (statuses[i]) { @@ -45,7 +45,7 @@ export default function CourierFetchCallClient(Private, Promise, es, esShardTime // handle a request being aborted while being fetched - var requestWasAborted = Promise.method(function (req, i) { + const requestWasAborted = Promise.method(function (req, i) { if (statuses[i] === ABORTED) { defer.reject(new Error('Request was aborted twice?')); } diff --git a/src/ui/public/courier/fetch/call_response_handlers.js b/src/ui/public/courier/fetch/call_response_handlers.js index 2d305835fb690..41b4c2bc20205 100644 --- a/src/ui/public/courier/fetch/call_response_handlers.js +++ b/src/ui/public/courier/fetch/call_response_handlers.js @@ -4,9 +4,9 @@ import ReqStatusProvider from './req_status'; import NotifierProvider from './notifier'; export default function CourierFetchCallResponseHandlers(Private, Promise) { - var ABORTED = Private(ReqStatusProvider).ABORTED; - var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; - var notify = Private(NotifierProvider); + const ABORTED = Private(ReqStatusProvider).ABORTED; + const INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; + const notify = Private(NotifierProvider); function callResponseHandlers(requests, responses) { @@ -15,7 +15,7 @@ export default function CourierFetchCallResponseHandlers(Private, Promise) { return ABORTED; } - var resp = responses[i]; + let resp = responses[i]; if (resp.timed_out) { notify.warning(new SearchTimeout()); diff --git a/src/ui/public/courier/fetch/continue_incomplete.js b/src/ui/public/courier/fetch/continue_incomplete.js index 0e57d85feb420..12433548a32e7 100644 --- a/src/ui/public/courier/fetch/continue_incomplete.js +++ b/src/ui/public/courier/fetch/continue_incomplete.js @@ -1,10 +1,10 @@ import ReqStatusProvider from './req_status'; export default function CourierFetchContinueIncompleteRequests(Private) { - var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; + const INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; function continueIncompleteRequests(strategy, requests, responses, fetchWithStrategy) { - var incomplete = []; + const incomplete = []; responses.forEach(function (resp, i) { if (resp === INCOMPLETE) { diff --git a/src/ui/public/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js index f540dcd29bcea..f6bf27754073f 100644 --- a/src/ui/public/courier/fetch/fetch.js +++ b/src/ui/public/courier/fetch/fetch.js @@ -7,14 +7,14 @@ import ReqStatusProvider from './req_status'; export default function fetchService(Private, Promise) { - var requestQueue = Private(RequestQueueProvider); - var fetchThese = Private(FetchTheseProvider); + const requestQueue = Private(RequestQueueProvider); + const fetchThese = Private(FetchTheseProvider); - var callResponseHandlers = Private(CallResponseHandlersProvider); - var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; + const callResponseHandlers = Private(CallResponseHandlersProvider); + const INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; function fetchQueued(strategy) { - var requests = requestQueue.getStartable(strategy); + const requests = requestQueue.getStartable(strategy); if (!requests.length) return Promise.resolve(); else return fetchThese(requests); } @@ -22,7 +22,7 @@ export default function fetchService(Private, Promise) { this.fetchQueued = fetchQueued; function fetchASource(source, strategy) { - var defer = Promise.defer(); + const defer = Promise.defer(); fetchThese([ source._createRequest(defer) diff --git a/src/ui/public/courier/fetch/fetch_these.js b/src/ui/public/courier/fetch/fetch_these.js index 690e83c91abd8..78affdf29ac53 100644 --- a/src/ui/public/courier/fetch/fetch_these.js +++ b/src/ui/public/courier/fetch/fetch_these.js @@ -6,17 +6,17 @@ import ContinueIncompleteProvider from './continue_incomplete'; import ReqStatusProvider from './req_status'; export default function FetchTheseProvider(Private, Promise) { - var notify = Private(NotifierProvider); - var forEachStrategy = Private(ForEachStrategyProvider); + const notify = Private(NotifierProvider); + const forEachStrategy = Private(ForEachStrategyProvider); // core tasks - var callClient = Private(CallClientProvider); - var callResponseHandlers = Private(CallResponseHandlersProvider); - var continueIncomplete = Private(ContinueIncompleteProvider); + const callClient = Private(CallClientProvider); + const callResponseHandlers = Private(CallResponseHandlersProvider); + const continueIncomplete = Private(ContinueIncompleteProvider); - var ABORTED = Private(ReqStatusProvider).ABORTED; - var DUPLICATE = Private(ReqStatusProvider).DUPLICATE; - var INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; + const ABORTED = Private(ReqStatusProvider).ABORTED; + const DUPLICATE = Private(ReqStatusProvider).DUPLICATE; + const INCOMPLETE = Private(ReqStatusProvider).INCOMPLETE; function fetchThese(requests) { return forEachStrategy(requests, function (strategy, reqsForStrategy) { @@ -66,7 +66,7 @@ export default function FetchTheseProvider(Private, Promise) { } return new Promise(function (resolve) { - var action = req.started ? req.continue : req.start; + const action = req.started ? req.continue : req.start; resolve(action.call(req)); }) .catch(err => req.handleFailure(err)); diff --git a/src/ui/public/courier/fetch/for_each_strategy.js b/src/ui/public/courier/fetch/for_each_strategy.js index b105595ece624..8eababd7670a5 100644 --- a/src/ui/public/courier/fetch/for_each_strategy.js +++ b/src/ui/public/courier/fetch/for_each_strategy.js @@ -3,11 +3,11 @@ import _ from 'lodash'; export default function FetchForEachRequestStrategy(Private, Promise) { function forEachStrategy(requests, block) { block = Promise.method(block); - var sets = []; + const sets = []; requests.forEach(function (req) { - var strategy = req.strategy; - var set = _.find(sets, { 0: strategy }); + const strategy = req.strategy; + const set = _.find(sets, { 0: strategy }); if (set) set[1].push(req); else sets.push([strategy, [req]]); }); diff --git a/src/ui/public/courier/fetch/is_request.js b/src/ui/public/courier/fetch/is_request.js index f5fddcf07c008..f64ab1e1ec08d 100644 --- a/src/ui/public/courier/fetch/is_request.js +++ b/src/ui/public/courier/fetch/is_request.js @@ -1,7 +1,7 @@ import AbstractRequestProvider from './request'; export default function IsRequestProvider(Private) { - var AbstractRequest = Private(AbstractRequestProvider); + const AbstractRequest = Private(AbstractRequestProvider); return function isRequest(obj) { return obj instanceof AbstractRequest; diff --git a/src/ui/public/courier/fetch/merge_duplicate_requests.js b/src/ui/public/courier/fetch/merge_duplicate_requests.js index 0aa0c53f0813a..5c698f422834b 100644 --- a/src/ui/public/courier/fetch/merge_duplicate_requests.js +++ b/src/ui/public/courier/fetch/merge_duplicate_requests.js @@ -2,16 +2,16 @@ import IsRequestProvider from './is_request'; import ReqStatusProvider from './req_status'; export default function FetchMergeDuplicateRequests(Private) { - var isRequest = Private(IsRequestProvider); - var DUPLICATE = Private(ReqStatusProvider).DUPLICATE; + const isRequest = Private(IsRequestProvider); + const DUPLICATE = Private(ReqStatusProvider).DUPLICATE; function mergeDuplicateRequests(requests) { // dedupe requests - var index = {}; + const index = {}; return requests.map(function (req) { if (!isRequest(req)) return req; - var iid = req.source._instanceid; + const iid = req.source._instanceid; if (!index[iid]) { // this request is unique so far index[iid] = req; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js index d15c80a822adc..e7a20f988090b 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js @@ -32,7 +32,7 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => { const req = new SegmentedReq(new MockSource()); req._queueCreated = null; - var promise = req._createQueue(); + const promise = req._createQueue(); expect(req._queueCreated).to.be(false); await promise; expect(req._queueCreated).to.be(true); diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js index 4684a5d35f31c..f2a185b5067e4 100644 --- a/src/ui/public/courier/fetch/request/doc.js +++ b/src/ui/public/courier/fetch/request/doc.js @@ -5,8 +5,8 @@ import AbstractRequestProvider from './request'; export default function DocRequestProvider(Private) { - var docStrategy = Private(DocStrategyProvider); - var AbstractRequest = Private(AbstractRequestProvider); + const docStrategy = Private(DocStrategyProvider); + const AbstractRequest = Private(AbstractRequestProvider); _.class(DocRequest).inherits(AbstractRequest); function DocRequest(source, defer) { @@ -17,15 +17,15 @@ export default function DocRequestProvider(Private) { } DocRequest.prototype.canStart = function () { - var parent = DocRequest.Super.prototype.canStart.call(this); + const parent = DocRequest.Super.prototype.canStart.call(this); if (!parent) return false; - var version = this.source._version; - var storedVersion = this.source._getStoredVersion(); + const version = this.source._version; + const storedVersion = this.source._getStoredVersion(); // conditions that equal "fetch This DOC!" - var unknown = !version && !storedVersion; - var mismatch = version !== storedVersion; + const unknown = !version && !storedVersion; + const mismatch = version !== storedVersion; return Boolean(mismatch || (unknown && !this.started)); }; diff --git a/src/ui/public/courier/fetch/request/error_handler.js b/src/ui/public/courier/fetch/request/error_handler.js index 8707e41d49b58..91e6c0929df39 100644 --- a/src/ui/public/courier/fetch/request/error_handler.js +++ b/src/ui/public/courier/fetch/request/error_handler.js @@ -3,14 +3,14 @@ import Notifier from 'ui/notify/notifier'; import ErrorHandlersProvider from '../../_error_handlers'; export default function RequestErrorHandlerFactory(Private) { - var errHandlers = Private(ErrorHandlersProvider); + const errHandlers = Private(ErrorHandlersProvider); - var notify = new Notifier({ + const notify = new Notifier({ location: 'Courier Fetch Error' }); function handleError(req, error) { - var myHandlers = []; + const myHandlers = []; errHandlers.splice(0).forEach(function (handler) { (handler.source === req.source ? myHandlers : errHandlers).push(handler); diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index 1f2316428dfba..dc3fdb2389209 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -7,8 +7,8 @@ import RequestQueueProvider from '../../_request_queue'; import ErrorHandlerRequestProvider from './error_handler'; export default function AbstractReqProvider(Private, Promise) { - var requestQueue = Private(RequestQueueProvider); - var requestErrorHandler = Private(ErrorHandlerRequestProvider); + const requestQueue = Private(RequestQueueProvider); + const requestErrorHandler = Private(ErrorHandlerRequestProvider); function AbstractReq(source, defer) { if (!(this instanceof AbstractReq) || !this.constructor || this.constructor === AbstractReq) { @@ -33,7 +33,7 @@ export default function AbstractReqProvider(Private, Promise) { this.started = true; this.moment = moment(); - var source = this.source; + const source = this.source; if (source.activeFetchCount) { source.activeFetchCount += 1; } else { @@ -76,7 +76,7 @@ export default function AbstractReqProvider(Private, Promise) { }; AbstractReq.prototype.retry = function () { - var clone = this.clone(); + const clone = this.clone(); this.abort(); return clone; }; diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js index 08ebbb1173765..36f57a8dd9d74 100644 --- a/src/ui/public/courier/fetch/request/search.js +++ b/src/ui/public/courier/fetch/request/search.js @@ -5,11 +5,11 @@ import AbstractRequestProvider from './request'; export default function SearchReqProvider(Private) { - var searchStrategy = Private(SearchStrategyProvider); - var AbstractRequest = Private(AbstractRequestProvider); + const searchStrategy = Private(SearchStrategyProvider); + const AbstractRequest = Private(AbstractRequestProvider); _.class(SearchReq).inherits(AbstractRequest); - var Super = SearchReq.Super; + const Super = SearchReq.Super; function SearchReq(source, defer) { Super.call(this, source, defer); diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js index 84c23c8e2debd..f5b5969c1b6f5 100644 --- a/src/ui/public/courier/fetch/request/segmented.js +++ b/src/ui/public/courier/fetch/request/segmented.js @@ -7,10 +7,10 @@ import SearchRequestProvider from './search'; import SegmentedHandleProvider from './segmented_handle'; export default function SegmentedReqProvider(es, Private, Promise, timefilter, config) { - var SearchReq = Private(SearchRequestProvider); - var SegmentedHandle = Private(SegmentedHandleProvider); + const SearchReq = Private(SearchRequestProvider); + const SegmentedHandle = Private(SegmentedHandleProvider); - var notify = new Notifier({ + const notify = new Notifier({ location: 'Segmented Fetch' }); @@ -42,7 +42,7 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c *********/ SegmentedReq.prototype.start = function () { - var self = this; + const self = this; this._complete = []; this._active = null; @@ -77,20 +77,20 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c }; SegmentedReq.prototype.getFetchParams = function () { - var self = this; + const self = this; return self._getFlattenedSource().then(function (flatSource) { - var params = _.cloneDeep(flatSource); + const params = _.cloneDeep(flatSource); // calculate the number of indices to fetch in this request in order to prevent // more than self._maxSegments requests. We use Math.max(1, n) to ensure that each request // has at least one index pattern, and Math.floor() to make sure that if the // number of indices does not round out evenly the extra index is tacked onto the last // request, making sure the first request returns faster. - var remainingSegments = self._maxSegments - self._segments.length; - var indexCount = Math.max(1, Math.floor(self._queue.length / remainingSegments)); + const remainingSegments = self._maxSegments - self._segments.length; + const indexCount = Math.max(1, Math.floor(self._queue.length / remainingSegments)); - var indices = self._active = self._queue.splice(0, indexCount); + const indices = self._active = self._queue.splice(0, indexCount); params.index = _.pluck(indices, 'index'); if (isNumber(self._desiredSize)) { @@ -113,8 +113,8 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c }; SegmentedReq.prototype.isIncomplete = function () { - var queueNotCreated = !this._queueCreated; - var queueNotEmpty = this._queue.length > 0; + const queueNotCreated = !this._queueCreated; + const queueNotEmpty = this._queue.length > 0; return queueNotCreated || queueNotEmpty; }; @@ -181,9 +181,9 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c }; SegmentedReq.prototype._createQueue = function () { - var self = this; - var timeBounds = timefilter.getBounds(); - var indexPattern = self.source.get('index'); + const self = this; + const timeBounds = timefilter.getBounds(); + const indexPattern = self.source.get('index'); self._queueCreated = false; return indexPattern.toDetailedIndexList(timeBounds.min, timeBounds.max, self._direction) @@ -211,14 +211,14 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c }; SegmentedReq.prototype._consumeSegment = function (seg) { - var index = this._active; + const index = this._active; this._complete.push(index); if (!seg) return; // segment was ignored/filtered, don't store it - var hadHits = _.get(this._mergedResp, 'hits.hits.length') > 0; - var gotHits = _.get(seg, 'hits.hits.length') > 0; - var firstHits = !hadHits && gotHits; - var haveHits = hadHits || gotHits; + const hadHits = _.get(this._mergedResp, 'hits.hits.length') > 0; + const gotHits = _.get(seg, 'hits.hits.length') > 0; + const firstHits = !hadHits && gotHits; + const haveHits = hadHits || gotHits; this._mergeSegment(seg); this.resp = _.omit(this._mergedResp, '_bucketIndex'); @@ -229,9 +229,9 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c }; SegmentedReq.prototype._mergeHits = function (hits) { - var mergedHits = this._mergedResp.hits.hits; - var desiredSize = this._desiredSize; - var sortFn = this._sortFn; + const mergedHits = this._mergedResp.hits.hits; + const desiredSize = this._desiredSize; + const sortFn = this._sortFn; _.pushAll(hits, mergedHits); @@ -242,12 +242,12 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c } if (isNumber(desiredSize)) { - mergedHits = this._mergedResp.hits.hits = mergedHits.slice(0, desiredSize); + this._mergedResp.hits.hits = mergedHits.slice(0, desiredSize); } }; SegmentedReq.prototype._mergeSegment = notify.timed('merge response segment', function (seg) { - var merged = this._mergedResp; + const merged = this._mergedResp; this._segments.push(seg); @@ -277,7 +277,7 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c } seg.aggregations[aggKey].buckets.forEach(function (bucket) { - var mbucket = merged._bucketIndex[bucket.key]; + let mbucket = merged._bucketIndex[bucket.key]; if (mbucket) { mbucket.doc_count += bucket.doc_count; return; @@ -291,10 +291,10 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c SegmentedReq.prototype._detectHitsWindow = function (hits) { hits = hits || []; - var indexPattern = this.source.get('index'); - var desiredSize = this._desiredSize; + const indexPattern = this.source.get('index'); + const desiredSize = this._desiredSize; - var size = _.size(hits); + const size = _.size(hits); if (!isNumber(desiredSize) || size < desiredSize) { this._hitWindow = { size: size, @@ -308,8 +308,8 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c let max; hits.forEach(function (deepHit) { - var hit = indexPattern.flattenHit(deepHit); - var time = hit[indexPattern.timeFieldName]; + const hit = indexPattern.flattenHit(deepHit); + const time = hit[indexPattern.timeFieldName]; if (min == null || time < min) min = time; if (max == null || time > max) max = time; }); @@ -318,8 +318,8 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c }; SegmentedReq.prototype._pickSizeForIndices = function (indices) { - var hitWindow = this._hitWindow; - var desiredSize = this._desiredSize; + const hitWindow = this._hitWindow; + const desiredSize = this._desiredSize; if (!isNumber(desiredSize)) return null; // we don't have any hits yet, get us more info! @@ -327,7 +327,7 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c // the order of documents isn't important, just get us more if (!this._sortFn) return Math.max(desiredSize - hitWindow.size, 0); // if all of the documents in every index fall outside of our current doc set, we can ignore them. - var someOverlap = indices.some(function (index) { + const someOverlap = indices.some(function (index) { return index.min <= hitWindow.max && hitWindow.min <= index.max; }); diff --git a/src/ui/public/courier/fetch/request/segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js index 1cf4f7ad1e844..89dad12934961 100644 --- a/src/ui/public/courier/fetch/request/segmented_handle.js +++ b/src/ui/public/courier/fetch/request/segmented_handle.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import EventsProvider from 'ui/events'; export default function CourierSegmentedReqHandle(Private) { - var Events = Private(EventsProvider); + const Events = Private(EventsProvider); /** diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js index 38273977d164d..2abda799343b6 100644 --- a/src/ui/public/courier/fetch/strategy/search.js +++ b/src/ui/public/courier/fetch/strategy/search.js @@ -22,7 +22,7 @@ export default function FetchStrategyForSearch(Private, Promise, timefilter) { return indexList; } - var timeBounds = timefilter.getBounds(); + const timeBounds = timefilter.getBounds(); return indexList.toIndexList(timeBounds.min, timeBounds.max); }) .then(function (indexList) { From ed09c4f4d144a33a08c3950740b4b4ef437b9111 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 22 Feb 2016 22:05:00 -0800 Subject: [PATCH 09/50] [courier/fetch] move to class syntax --- src/ui/public/courier/fetch/request/doc.js | 49 +- .../public/courier/fetch/request/request.js | 158 +++-- src/ui/public/courier/fetch/request/search.js | 16 +- .../public/courier/fetch/request/segmented.js | 551 +++++++++--------- .../courier/fetch/request/segmented_handle.js | 35 +- 5 files changed, 407 insertions(+), 402 deletions(-) diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js index f2a185b5067e4..ac41d141c8cdd 100644 --- a/src/ui/public/courier/fetch/request/doc.js +++ b/src/ui/public/courier/fetch/request/doc.js @@ -8,37 +8,38 @@ export default function DocRequestProvider(Private) { const docStrategy = Private(DocStrategyProvider); const AbstractRequest = Private(AbstractRequestProvider); - _.class(DocRequest).inherits(AbstractRequest); - function DocRequest(source, defer) { - DocRequest.Super.call(this, source, defer); + class DocRequest extends AbstractRequest { + constructor(...args) { + super(...args); - this.type = 'doc'; - this.strategy = docStrategy; - } - - DocRequest.prototype.canStart = function () { - const parent = DocRequest.Super.prototype.canStart.call(this); - if (!parent) return false; + this.type = 'doc'; + this.strategy = docStrategy; + } - const version = this.source._version; - const storedVersion = this.source._getStoredVersion(); + canStart() { + const parent = super.canStart(); + if (!parent) return false; - // conditions that equal "fetch This DOC!" - const unknown = !version && !storedVersion; - const mismatch = version !== storedVersion; + const version = this.source._version; + const storedVersion = this.source._getStoredVersion(); - return Boolean(mismatch || (unknown && !this.started)); - }; + // conditions that equal "fetch This DOC!" + const unknown = !version && !storedVersion; + const mismatch = version !== storedVersion; - DocRequest.prototype.handleResponse = function (resp) { - if (resp.found) { - this.source._storeVersion(resp._version); - } else { - this.source._clearVersion(); + return Boolean(mismatch || (unknown && !this.started)); } - return DocRequest.Super.prototype.handleResponse.call(this, resp); - }; + handleResponse(resp) { + if (resp.found) { + this.source._storeVersion(resp._version); + } else { + this.source._clearVersion(); + } + + return super.handleResponse(resp); + } + } return DocRequest; }; diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index dc3fdb2389209..c360cf5dd94e9 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -10,109 +10,105 @@ export default function AbstractReqProvider(Private, Promise) { const requestQueue = Private(RequestQueueProvider); const requestErrorHandler = Private(ErrorHandlerRequestProvider); - function AbstractReq(source, defer) { - if (!(this instanceof AbstractReq) || !this.constructor || this.constructor === AbstractReq) { - throw new Error('The AbstractReq class should not be called directly'); - } - - this.source = source; - this.defer = defer || Promise.defer(); + const onStop = Symbol('onStopMethod'); + const whenAbortedHandlers = Symbol('whenAbortedHandlers'); - requestQueue.push(this); - } + return class AbstractReq { + constructor(source, defer) { + this.source = source; + this.defer = defer || Promise.defer(); + this[whenAbortedHandlers] = []; - AbstractReq.prototype.canStart = function () { - return Boolean(!this.stopped && !this.source._fetchDisabled); - }; + requestQueue.push(this); + } - AbstractReq.prototype.start = function () { - if (this.started) { - throw new TypeError('Unable to start request because it has already started'); + canStart() { + return Boolean(!this.stopped && !this.source._fetchDisabled); } - this.started = true; - this.moment = moment(); + start() { + if (this.started) { + throw new TypeError('Unable to start request because it has already started'); + } - const source = this.source; - if (source.activeFetchCount) { - source.activeFetchCount += 1; - } else { - source.activeFetchCount = 1; - } + this.started = true; + this.moment = moment(); - source.history = [this]; - }; + const source = this.source; + if (source.activeFetchCount) { + source.activeFetchCount += 1; + } else { + source.activeFetchCount = 1; + } - AbstractReq.prototype.getFetchParams = function () { - return this.source._flatten(); - }; + source.history = [this]; + } - AbstractReq.prototype.transformResponse = function (resp) { - return resp; - }; + getFetchParams() { + return this.source._flatten(); + } - AbstractReq.prototype.filterError = function (resp) { - return false; - }; + transformResponse(resp) { + return resp; + } - AbstractReq.prototype.handleResponse = function (resp) { - this.success = true; - this.resp = resp; - }; + filterError(resp) { + return false; + } - AbstractReq.prototype.handleFailure = function (error) { - this.success = false; - this.resp = error && error.resp; - this.retry(); - return requestErrorHandler(this, error); - }; + handleResponse(resp) { + this.success = true; + this.resp = resp; + } - AbstractReq.prototype.isIncomplete = function () { - return false; - }; + handleFailure(error) { + this.success = false; + this.resp = error && error.resp; + this.retry(); + return requestErrorHandler(this, error); + } - AbstractReq.prototype.continue = function () { - throw new Error('Unable to continue ' + this.type + ' request'); - }; + isIncomplete() { + return false; + } - AbstractReq.prototype.retry = function () { - const clone = this.clone(); - this.abort(); - return clone; - }; + continue() { + throw new Error('Unable to continue ' + this.type + ' request'); + } + + retry() { + const clone = this.clone(); + this.abort(); + return clone; + } - // don't want people overriding this, so it becomes a natural - // part of .abort() and .complete() - function stop(then) { - return function () { + [onStop]() { if (this.stopped) return; this.stopped = true; this.source.activeFetchCount -= 1; _.pull(requestQueue, this); - then.call(this); - }; - } - - AbstractReq.prototype.abort = stop(function () { - this.defer = null; - this.aborted = true; - if (this._whenAborted) _.callEach(this._whenAborted); - }); - - AbstractReq.prototype.whenAborted = function (cb) { - this._whenAborted = (this._whenAborted || []); - this._whenAborted.push(cb); - }; + } - AbstractReq.prototype.complete = stop(function () { - this.ms = this.moment.diff() * -1; - this.defer.resolve(this.resp); - }); + abort() { + this[onStop](); + this.defer = null; + this.aborted = true; + _.callEach(this[whenAbortedHandlers]); + } - AbstractReq.prototype.clone = function () { - return new this.constructor(this.source, this.defer); - }; + whenAborted(cb) { + this[whenAbortedHandlers].push(cb); + } - return AbstractReq; + completefunction() { + this[onStop](); + this.ms = this.moment.diff() * -1; + this.defer.resolve(this.resp); + } + + clone() { + return new this.constructor(this.source, this.defer); + } + }; }; diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js index 36f57a8dd9d74..3556a8aee9c42 100644 --- a/src/ui/public/courier/fetch/request/search.js +++ b/src/ui/public/courier/fetch/request/search.js @@ -8,14 +8,12 @@ export default function SearchReqProvider(Private) { const searchStrategy = Private(SearchStrategyProvider); const AbstractRequest = Private(AbstractRequestProvider); - _.class(SearchReq).inherits(AbstractRequest); - const Super = SearchReq.Super; - function SearchReq(source, defer) { - Super.call(this, source, defer); + return class SearchReq extends AbstractRequest { + constructor(...args) { + super(...args); - this.type = 'search'; - this.strategy = searchStrategy; - } - - return SearchReq; + this.type = 'search'; + this.strategy = searchStrategy; + } + }; }; diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js index f5b5969c1b6f5..71ae5e2fa8b8d 100644 --- a/src/ui/public/courier/fetch/request/segmented.js +++ b/src/ui/public/courier/fetch/request/segmented.js @@ -14,325 +14,324 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c location: 'Segmented Fetch' }); - _.class(SegmentedReq).inherits(SearchReq); - function SegmentedReq(source, defer, initFn) { - SearchReq.call(this, source, defer); + class SegmentedReq extends SearchReq { + constructor(source, defer, initFn) { + super(source, defer); - this.type = 'segmented'; + this.type = 'segmented'; - // segmented request specific state - this._initFn = initFn; + // segmented request specific state + this._initFn = initFn; - this._desiredSize = null; - this._maxSegments = config.get('courier:maxSegmentCount'); - this._direction = 'desc'; - this._sortFn = null; - this._queueCreated = false; - this._handle = new SegmentedHandle(this); + this._desiredSize = null; + this._maxSegments = config.get('courier:maxSegmentCount'); + this._direction = 'desc'; + this._sortFn = null; + this._queueCreated = false; + this._handle = new SegmentedHandle(this); - this._hitWindow = null; + this._hitWindow = null; - // prevent the source from changing between requests, - // all calls will return the same promise - this._getFlattenedSource = _.once(this._getFlattenedSource); - } + // prevent the source from changing between requests, + // all calls will return the same promise + this._getFlattenedSource = _.once(this._getFlattenedSource); + } - /********* - ** SearchReq overrides - *********/ - - SegmentedReq.prototype.start = function () { - const self = this; - - this._complete = []; - this._active = null; - this._segments = []; - this._all = []; - this._queue = []; - - this._mergedResp = { - took: 0, - hits: { - hits: [], - total: 0, - max_score: 0 - } - }; + /********* + ** SearchReq overrides + *********/ + + start() { + this._complete = []; + this._active = null; + this._segments = []; + this._all = []; + this._queue = []; + + this._mergedResp = { + took: 0, + hits: { + hits: [], + total: 0, + max_score: 0 + } + }; - // give the request consumer a chance to receive each segment and set - // parameters via the handle - if (_.isFunction(this._initFn)) this._initFn(this._handle); - return this._createQueue().then(function (queue) { - self._all = queue.slice(0); + // give the request consumer a chance to receive each segment and set + // parameters via the handle + if (_.isFunction(this._initFn)) this._initFn(this._handle); + return this._createQueue().then((queue) => { + this._all = queue.slice(0); - // Send the initial fetch status - self._reportStatus(); + // Send the initial fetch status + this._reportStatus(); - return SearchReq.prototype.start.call(self); - }); - }; + return super.start(); + }); + } - SegmentedReq.prototype.continue = function () { - return this._reportStatus(); - }; + continue() { + return this._reportStatus(); + } - SegmentedReq.prototype.getFetchParams = function () { - const self = this; + getFetchParams() { + return this._getFlattenedSource().then(flatSource => { + const params = _.cloneDeep(flatSource); - return self._getFlattenedSource().then(function (flatSource) { - const params = _.cloneDeep(flatSource); + // calculate the number of indices to fetch in this request in order to prevent + // more than this._maxSegments requests. We use Math.max(1, n) to ensure that each request + // has at least one index pattern, and Math.floor() to make sure that if the + // number of indices does not round out evenly the extra index is tacked onto the last + // request, making sure the first request returns faster. + const remainingSegments = this._maxSegments - this._segments.length; + const indexCount = Math.max(1, Math.floor(this._queue.length / remainingSegments)); - // calculate the number of indices to fetch in this request in order to prevent - // more than self._maxSegments requests. We use Math.max(1, n) to ensure that each request - // has at least one index pattern, and Math.floor() to make sure that if the - // number of indices does not round out evenly the extra index is tacked onto the last - // request, making sure the first request returns faster. - const remainingSegments = self._maxSegments - self._segments.length; - const indexCount = Math.max(1, Math.floor(self._queue.length / remainingSegments)); + const indices = this._active = this._queue.splice(0, indexCount); + params.index = _.pluck(indices, 'index'); - const indices = self._active = self._queue.splice(0, indexCount); - params.index = _.pluck(indices, 'index'); + if (isNumber(this._desiredSize)) { + params.body.size = this._pickSizeForIndices(indices); + } + + return params; + }); + } - if (isNumber(self._desiredSize)) { - params.body.size = self._pickSizeForIndices(indices); + handleResponse(resp) { + return this._consumeSegment(resp); + } + + filterError(resp) { + if (/ClusterBlockException.*index\sclosed/.test(resp.error)) { + this._consumeSegment(false); + return true; } + } - return params; - }); - }; + isIncomplete() { + const queueNotCreated = !this._queueCreated; + const queueNotEmpty = this._queue.length > 0; + return queueNotCreated || queueNotEmpty; + } + + clone() { + return new SegmentedReq(this.source, this.defer, this._initFn); + } + + complete() { + this._reportStatus(); + this._handle.emit('complete'); + return super.complete(); + } + + /********* + ** SegmentedReq specific methods + *********/ - SegmentedReq.prototype.handleResponse = function (resp) { - return this._consumeSegment(resp); - }; - SegmentedReq.prototype.filterError = function (resp) { - if (/ClusterBlockException.*index\sclosed/.test(resp.error)) { - this._consumeSegment(false); - return true; + /** + * Set the sort total number of segments to emit + * + * @param {number} + */ + setMaxSegments(maxSegments) { + this._maxSegments = Math.max(_.parseInt(maxSegments), 1); } - }; - - SegmentedReq.prototype.isIncomplete = function () { - const queueNotCreated = !this._queueCreated; - const queueNotEmpty = this._queue.length > 0; - return queueNotCreated || queueNotEmpty; - }; - - SegmentedReq.prototype.clone = function () { - return new SegmentedReq(this.source, this.defer, this._initFn); - }; - - SegmentedReq.prototype.complete = function () { - this._reportStatus(); - this._handle.emit('complete'); - return SearchReq.prototype.complete.call(this); - }; - - /********* - ** SegmentedReq specific methods - *********/ - - /** - * Set the sort total number of segments to emit - * - * @param {number} - */ - SegmentedReq.prototype.setMaxSegments = function (maxSegments) { - this._maxSegments = Math.max(_.parseInt(maxSegments), 1); - }; - - /** - * Set the sort direction for the request. - * - * @param {string} dir - one of 'asc' or 'desc' - */ - SegmentedReq.prototype.setDirection = function (dir) { - switch (dir) { - case 'asc': - case 'desc': - return (this._direction = dir); - default: - throw new TypeError('unknown sort direction "' + dir + '"'); + + /** + * Set the sort direction for the request. + * + * @param {string} dir - one of 'asc' or 'desc' + */ + setDirection(dir) { + switch (dir) { + case 'asc': + case 'desc': + return (this._direction = dir); + default: + throw new TypeError('unknown sort direction "' + dir + '"'); + } + } + + /** + * Set the function that will be used to sort the rows + * + * @param {fn} + */ + setSortFn(sortFn) { + this._sortFn = sortFn; + } + + /** + * Set the sort total number of documents to + * emit + * + * Setting to false will not limit the documents, + * if a number is set the size of the request to es + * will be updated on each new request + * + * @param {number|false} + */ + setSize(totalSize) { + this._desiredSize = _.parseInt(totalSize); + if (isNaN(this._desiredSize)) this._desiredSize = null; + } + + _createQueue() { + const timeBounds = timefilter.getBounds(); + const indexPattern = this.source.get('index'); + this._queueCreated = false; + + return indexPattern.toDetailedIndexList(timeBounds.min, timeBounds.max, this._direction) + .then(queue => { + if (!_.isArray(queue)) queue = [queue]; + + this._queue = queue; + this._queueCreated = true; + + return queue; + }); } - }; - - /** - * Set the function that will be used to sort the rows - * - * @param {fn} - */ - SegmentedReq.prototype.setSortFn = function (sortFn) { - this._sortFn = sortFn; - }; - - /** - * Set the sort total number of documents to - * emit - * - * Setting to false will not limit the documents, - * if a number is set the size of the request to es - * will be updated on each new request - * - * @param {number|false} - */ - SegmentedReq.prototype.setSize = function (totalSize) { - this._desiredSize = _.parseInt(totalSize); - if (isNaN(this._desiredSize)) this._desiredSize = null; - }; - - SegmentedReq.prototype._createQueue = function () { - const self = this; - const timeBounds = timefilter.getBounds(); - const indexPattern = self.source.get('index'); - self._queueCreated = false; - - return indexPattern.toDetailedIndexList(timeBounds.min, timeBounds.max, self._direction) - .then(function (queue) { - if (!_.isArray(queue)) queue = [queue]; - - self._queue = queue; - self._queueCreated = true; - - return queue; - }); - }; - - SegmentedReq.prototype._reportStatus = function () { - return this._handle.emit('status', { - total: this._queueCreated ? this._all.length : NaN, - complete: this._queueCreated ? this._complete.length : NaN, - remaining: this._queueCreated ? this._queue.length : NaN, - hitCount: this._queueCreated ? this._mergedResp.hits.hits.length : NaN - }); - }; - - SegmentedReq.prototype._getFlattenedSource = function () { - return this.source._flatten(); - }; - - SegmentedReq.prototype._consumeSegment = function (seg) { - const index = this._active; - this._complete.push(index); - if (!seg) return; // segment was ignored/filtered, don't store it - - const hadHits = _.get(this._mergedResp, 'hits.hits.length') > 0; - const gotHits = _.get(seg, 'hits.hits.length') > 0; - const firstHits = !hadHits && gotHits; - const haveHits = hadHits || gotHits; - - this._mergeSegment(seg); - this.resp = _.omit(this._mergedResp, '_bucketIndex'); - - if (firstHits) this._handle.emit('first', seg); - if (gotHits) this._handle.emit('segment', seg); - if (haveHits) this._handle.emit('mergedSegment', this.resp); - }; - - SegmentedReq.prototype._mergeHits = function (hits) { - const mergedHits = this._mergedResp.hits.hits; - const desiredSize = this._desiredSize; - const sortFn = this._sortFn; - - _.pushAll(hits, mergedHits); - - if (sortFn) { - notify.event('resort rows', function () { - mergedHits.sort(sortFn); + + _reportStatus() { + return this._handle.emit('status', { + total: this._queueCreated ? this._all.length : NaN, + complete: this._queueCreated ? this._complete.length : NaN, + remaining: this._queueCreated ? this._queue.length : NaN, + hitCount: this._queueCreated ? this._mergedResp.hits.hits.length : NaN }); } - if (isNumber(desiredSize)) { - this._mergedResp.hits.hits = mergedHits.slice(0, desiredSize); + _getFlattenedSource() { + return this.source._flatten(); } - }; - SegmentedReq.prototype._mergeSegment = notify.timed('merge response segment', function (seg) { - const merged = this._mergedResp; + _consumeSegment(seg) { + const index = this._active; + this._complete.push(index); + if (!seg) return; // segment was ignored/filtered, don't store it - this._segments.push(seg); + const hadHits = _.get(this._mergedResp, 'hits.hits.length') > 0; + const gotHits = _.get(seg, 'hits.hits.length') > 0; + const firstHits = !hadHits && gotHits; + const haveHits = hadHits || gotHits; - merged.took += seg.took; - merged.hits.total += seg.hits.total; - merged.hits.max_score = Math.max(merged.hits.max_score, seg.hits.max_score); + this._mergeSegment(seg); + this.resp = _.omit(this._mergedResp, '_bucketIndex'); - if (_.size(seg.hits.hits)) { - this._mergeHits(seg.hits.hits); - this._detectHitsWindow(merged.hits.hits); + if (firstHits) this._handle.emit('first', seg); + if (gotHits) this._handle.emit('segment', seg); + if (haveHits) this._handle.emit('mergedSegment', this.resp); } - if (!seg.aggregations) return; + _mergeHits(hits) { + const mergedHits = this._mergedResp.hits.hits; + const desiredSize = this._desiredSize; + const sortFn = this._sortFn; - Object.keys(seg.aggregations).forEach(function (aggKey) { + _.pushAll(hits, mergedHits); - if (!merged.aggregations) { - // start merging aggregations - merged.aggregations = {}; - merged._bucketIndex = {}; + if (sortFn) { + notify.event('resort rows', function () { + mergedHits.sort(sortFn); + }); } - if (!merged.aggregations[aggKey]) { - merged.aggregations[aggKey] = { - buckets: [] - }; + if (isNumber(desiredSize)) { + this._mergedResp.hits.hits = mergedHits.slice(0, desiredSize); } + } + + _mergeSegment(seg) { + const merged = this._mergedResp; + + this._segments.push(seg); + + merged.took += seg.took; + merged.hits.total += seg.hits.total; + merged.hits.max_score = Math.max(merged.hits.max_score, seg.hits.max_score); + + if (_.size(seg.hits.hits)) { + this._mergeHits(seg.hits.hits); + this._detectHitsWindow(merged.hits.hits); + } + + if (!seg.aggregations) return; + + Object.keys(seg.aggregations).forEach(function (aggKey) { + + if (!merged.aggregations) { + // start merging aggregations + merged.aggregations = {}; + merged._bucketIndex = {}; + } - seg.aggregations[aggKey].buckets.forEach(function (bucket) { - let mbucket = merged._bucketIndex[bucket.key]; - if (mbucket) { - mbucket.doc_count += bucket.doc_count; - return; + if (!merged.aggregations[aggKey]) { + merged.aggregations[aggKey] = { + buckets: [] + }; } - mbucket = merged._bucketIndex[bucket.key] = bucket; - merged.aggregations[aggKey].buckets.push(mbucket); + seg.aggregations[aggKey].buckets.forEach(function (bucket) { + let mbucket = merged._bucketIndex[bucket.key]; + if (mbucket) { + mbucket.doc_count += bucket.doc_count; + return; + } + + mbucket = merged._bucketIndex[bucket.key] = bucket; + merged.aggregations[aggKey].buckets.push(mbucket); + }); }); - }); - }); + } - SegmentedReq.prototype._detectHitsWindow = function (hits) { - hits = hits || []; - const indexPattern = this.source.get('index'); - const desiredSize = this._desiredSize; - - const size = _.size(hits); - if (!isNumber(desiredSize) || size < desiredSize) { - this._hitWindow = { - size: size, - min: -Infinity, - max: Infinity - }; - return; + _detectHitsWindow(hits) { + hits = hits || []; + const indexPattern = this.source.get('index'); + const desiredSize = this._desiredSize; + + const size = _.size(hits); + if (!isNumber(desiredSize) || size < desiredSize) { + this._hitWindow = { + size: size, + min: -Infinity, + max: Infinity + }; + return; + } + + let min; + let max; + + hits.forEach(function (deepHit) { + const hit = indexPattern.flattenHit(deepHit); + const time = hit[indexPattern.timeFieldName]; + if (min == null || time < min) min = time; + if (max == null || time > max) max = time; + }); + + this._hitWindow = { size, min, max }; } - let min; - let max; - - hits.forEach(function (deepHit) { - const hit = indexPattern.flattenHit(deepHit); - const time = hit[indexPattern.timeFieldName]; - if (min == null || time < min) min = time; - if (max == null || time > max) max = time; - }); - - this._hitWindow = { size, min, max }; - }; - - SegmentedReq.prototype._pickSizeForIndices = function (indices) { - const hitWindow = this._hitWindow; - const desiredSize = this._desiredSize; - - if (!isNumber(desiredSize)) return null; - // we don't have any hits yet, get us more info! - if (!hitWindow) return desiredSize; - // the order of documents isn't important, just get us more - if (!this._sortFn) return Math.max(desiredSize - hitWindow.size, 0); - // if all of the documents in every index fall outside of our current doc set, we can ignore them. - const someOverlap = indices.some(function (index) { - return index.min <= hitWindow.max && hitWindow.min <= index.max; - }); - - return someOverlap ? desiredSize : 0; - }; + _pickSizeForIndices(indices) { + const hitWindow = this._hitWindow; + const desiredSize = this._desiredSize; + + if (!isNumber(desiredSize)) return null; + // we don't have any hits yet, get us more info! + if (!hitWindow) return desiredSize; + // the order of documents isn't important, just get us more + if (!this._sortFn) return Math.max(desiredSize - hitWindow.size, 0); + // if all of the documents in every index fall outside of our current doc set, we can ignore them. + const someOverlap = indices.some(function (index) { + return index.min <= hitWindow.max && hitWindow.min <= index.max; + }); + + return someOverlap ? desiredSize : 0; + } + } + + SegmentedReq.prototype.mergedSegment = notify.timed('merge response segment', SegmentedReq.prototype.mergedSegment); return SegmentedReq; }; diff --git a/src/ui/public/courier/fetch/request/segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js index 89dad12934961..b4dda1c70a49f 100644 --- a/src/ui/public/courier/fetch/request/segmented_handle.js +++ b/src/ui/public/courier/fetch/request/segmented_handle.js @@ -5,6 +5,7 @@ import EventsProvider from 'ui/events'; export default function CourierSegmentedReqHandle(Private) { const Events = Private(EventsProvider); + const segmentedRequest = Symbol('Actual Segmented Request'); /** * Simple class for creating an object to send to the @@ -16,16 +17,26 @@ export default function CourierSegmentedReqHandle(Private) { * * @param {SegmentedRequest} - req - the requst this handle relates to */ - _.class(SegmentedHandle).inherits(Events); - function SegmentedHandle(req) { - SegmentedHandle.Super.call(this); - - // export a couple methods from the request - this.setDirection = _.bindKey(req, 'setDirection'); - this.setSize = _.bindKey(req, 'setSize'); - this.setMaxSegments = _.bindKey(req, 'setMaxSegments'); - this.setSortFn = _.bindKey(req, 'setSortFn'); - } - - return SegmentedHandle; + return class SegmentedHandle extends Events { + constructor(req) { + super(); + this[segmentedRequest] = req; + } + + setDirection(...args) { + this[segmentedRequest](...args); + } + + setSize(...args) { + this[segmentedRequest](...args); + } + + setMaxSegments(...args) { + this[segmentedRequest](...args); + } + + setSortFn(...args) { + this[segmentedRequest](...args); + } + }; }; From 91797a8679e63db1878dde2d4ceb39b56e102069 Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 25 Feb 2016 15:42:11 -0700 Subject: [PATCH 10/50] [visualize/editor] expose the savedVis object to the editor options --- src/plugins/kibana/public/visualize/editor/sidebar.html | 3 +-- src/plugins/kibana/public/visualize/editor/vis_options.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.html b/src/plugins/kibana/public/visualize/editor/sidebar.html index d2de10a1d6c13..fde25e729db9e 100644 --- a/src/plugins/kibana/public/visualize/editor/sidebar.html +++ b/src/plugins/kibana/public/visualize/editor/sidebar.html @@ -60,10 +60,9 @@
    - +
    - diff --git a/src/plugins/kibana/public/visualize/editor/vis_options.js b/src/plugins/kibana/public/visualize/editor/vis_options.js index 4fdc97ebda85c..1506d881c0cc6 100644 --- a/src/plugins/kibana/public/visualize/editor/vis_options.js +++ b/src/plugins/kibana/public/visualize/editor/vis_options.js @@ -11,6 +11,7 @@ uiModules template: visOptionsTemplate, scope: { vis: '=', + savedVis: '=', }, link: function ($scope, $el) { const $optionContainer = $el.find('.visualization-options'); From 295423042e1dd1de6f2d998b10be2e2175f2c652 Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 25 Feb 2016 16:21:24 -0700 Subject: [PATCH 11/50] [courier/es6ify] fix typo --- src/ui/public/courier/fetch/request/request.js | 2 +- src/ui/public/courier/fetch/request/segmented_handle.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index c360cf5dd94e9..bbbd688d22f95 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -101,7 +101,7 @@ export default function AbstractReqProvider(Private, Promise) { this[whenAbortedHandlers].push(cb); } - completefunction() { + complete() { this[onStop](); this.ms = this.moment.diff() * -1; this.defer.resolve(this.resp); diff --git a/src/ui/public/courier/fetch/request/segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js index b4dda1c70a49f..811267e835b1c 100644 --- a/src/ui/public/courier/fetch/request/segmented_handle.js +++ b/src/ui/public/courier/fetch/request/segmented_handle.js @@ -24,19 +24,19 @@ export default function CourierSegmentedReqHandle(Private) { } setDirection(...args) { - this[segmentedRequest](...args); + this[segmentedRequest].setDirection(...args); } setSize(...args) { - this[segmentedRequest](...args); + this[segmentedRequest].setSize(...args); } setMaxSegments(...args) { - this[segmentedRequest](...args); + this[segmentedRequest].setMaxSegments(...args); } setSortFn(...args) { - this[segmentedRequest](...args); + this[segmentedRequest].setSortFn(...args); } }; }; From 9bed7b1e39a798693abbf142449cc14df0651e1e Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 25 Feb 2016 16:21:51 -0700 Subject: [PATCH 12/50] [courier/es6ify] remove Symbol usage --- src/ui/public/courier/fetch/request/request.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index bbbd688d22f95..1c7cf35abd318 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -10,14 +10,11 @@ export default function AbstractReqProvider(Private, Promise) { const requestQueue = Private(RequestQueueProvider); const requestErrorHandler = Private(ErrorHandlerRequestProvider); - const onStop = Symbol('onStopMethod'); - const whenAbortedHandlers = Symbol('whenAbortedHandlers'); - return class AbstractReq { constructor(source, defer) { this.source = source; this.defer = defer || Promise.defer(); - this[whenAbortedHandlers] = []; + this._whenAbortedHandlers = []; requestQueue.push(this); } @@ -82,27 +79,26 @@ export default function AbstractReqProvider(Private, Promise) { return clone; } - [onStop]() { + _markStopped() { if (this.stopped) return; - this.stopped = true; this.source.activeFetchCount -= 1; _.pull(requestQueue, this); } abort() { - this[onStop](); + this._markStopped(); this.defer = null; this.aborted = true; - _.callEach(this[whenAbortedHandlers]); + _.callEach(this._whenAbortedHandlers); } whenAborted(cb) { - this[whenAbortedHandlers].push(cb); + this._whenAbortedHandlers.push(cb); } complete() { - this[onStop](); + this._markStopped(); this.ms = this.moment.diff() * -1; this.defer.resolve(this.resp); } From 1ccd13a94b68d30a80f1beae6bd6d42c12951289 Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sat, 27 Feb 2016 11:56:09 +0100 Subject: [PATCH 13/50] Fixes opacity on mouseover/mouseout in the chart --- src/ui/public/vislib/lib/dispatch.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index 93766383b58e4..71100f28c9b4b 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -106,6 +106,7 @@ export default function DispatchClass(Private) { var isClickable = this.listenerCount('click') > 0; var addEvent = this.addEvent; var $el = this.handler.el; + var defaultOpacity = this.handler._attr.defaultOpacity || 1; function hover(d, i) { // Add pointer if item is clickable @@ -113,7 +114,7 @@ export default function DispatchClass(Private) { self.addMousePointer.call(this, arguments); } - self.highlightLegend.call(this, $el); + self.highlightLegend.call(this, $el, defaultOpacity); self.emit('hover', self.eventResponse(d, i)); } @@ -129,9 +130,10 @@ export default function DispatchClass(Private) { var self = this; var addEvent = this.addEvent; var $el = this.handler.el; + var defaultOpacity = this.handler._attr.defaultOpacity || 1; function mouseout() { - self.unHighlightLegend.call(this, $el); + self.unHighlightLegend.call(this, $el, defaultOpacity); } return addEvent('mouseout', mouseout); @@ -227,10 +229,14 @@ export default function DispatchClass(Private) { * @param element {D3.Selection} * @method highlightLegend */ - Dispatch.prototype.highlightLegend = function (element) { + Dispatch.prototype.highlightLegend = function (element, defaultOpacity) { var label = this.getAttribute('data-label'); + var highlightOpacity = (defaultOpacity < 1) ? 0.8 : 1; if (!label) return; - $('[data-label]', element.parentNode).not('[data-label="' + label + '"]').css('opacity', 0.5); + + var highlightElements = $('[data-label="' + label + '"]', element.parentNode); + $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); + highlightElements.css('opacity', highlightOpacity); }; /** @@ -239,8 +245,8 @@ export default function DispatchClass(Private) { * @param element {D3.Selection} * @method unHighlightLegend */ - Dispatch.prototype.unHighlightLegend = function (element) { - $('[data-label]', element.parentNode).css('opacity', 1); + Dispatch.prototype.unHighlightLegend = function (element, defaultOpacity) { + $('[data-label]', element.parentNode).css('opacity', defaultOpacity); }; /** From 6f49e46ccd60a33097643359df861d6418ffbe0e Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sat, 27 Feb 2016 23:22:58 +0100 Subject: [PATCH 14/50] Fixes opacity when hovering the Legend. Also refactors the previous commit to be able to use the same function for both the chart and legend with area charts overlapped --- src/ui/public/vislib/lib/dispatch.js | 24 ++++++++----------- .../vislib/visualizations/area_chart.js | 15 +++++++++++- src/ui/public/visualize/visualize_legend.html | 6 ++--- src/ui/public/visualize/visualize_legend.js | 22 +++++++++++++---- 4 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index 71100f28c9b4b..6c1f41b9f2e8c 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -106,7 +106,7 @@ export default function DispatchClass(Private) { var isClickable = this.listenerCount('click') > 0; var addEvent = this.addEvent; var $el = this.handler.el; - var defaultOpacity = this.handler._attr.defaultOpacity || 1; + var highlight = this.handler.highlight || self.highlight; function hover(d, i) { // Add pointer if item is clickable @@ -114,7 +114,7 @@ export default function DispatchClass(Private) { self.addMousePointer.call(this, arguments); } - self.highlightLegend.call(this, $el, defaultOpacity); + highlight.call(this, $el); self.emit('hover', self.eventResponse(d, i)); } @@ -130,10 +130,10 @@ export default function DispatchClass(Private) { var self = this; var addEvent = this.addEvent; var $el = this.handler.el; - var defaultOpacity = this.handler._attr.defaultOpacity || 1; + var unHighlight = this.handler.unHighlight || self.unHighlight; function mouseout() { - self.unHighlightLegend.call(this, $el, defaultOpacity); + unHighlight.call(this, $el); } return addEvent('mouseout', mouseout); @@ -227,26 +227,22 @@ export default function DispatchClass(Private) { * Mouseover Behavior * * @param element {D3.Selection} - * @method highlightLegend + * @method highlight */ - Dispatch.prototype.highlightLegend = function (element, defaultOpacity) { + Dispatch.prototype.highlight = function (element) { var label = this.getAttribute('data-label'); - var highlightOpacity = (defaultOpacity < 1) ? 0.8 : 1; if (!label) return; - - var highlightElements = $('[data-label="' + label + '"]', element.parentNode); - $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); - highlightElements.css('opacity', highlightOpacity); + $('[data-label]', element.parentNode).not('[data-label="' + label + '"]').css('opacity', 0.5); }; /** * Mouseout Behavior * * @param element {D3.Selection} - * @method unHighlightLegend + * @method unHighlight */ - Dispatch.prototype.unHighlightLegend = function (element, defaultOpacity) { - $('[data-label]', element.parentNode).css('opacity', defaultOpacity); + Dispatch.prototype.unHighlight = function (element) { + $('[data-label]', element.parentNode).css('opacity', 1); }; /** diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js index a132b52ad6b80..7872cdf1d7511 100644 --- a/src/ui/public/vislib/visualizations/area_chart.js +++ b/src/ui/public/vislib/visualizations/area_chart.js @@ -33,7 +33,20 @@ export default function AreaChartFactory(Private) { if (this.isOverlapping) { // Default opacity should return to 0.6 on mouseout - handler._attr.defaultOpacity = 0.6; + var defaultOpacity = 0.6; + handler._attr.defaultOpacity = defaultOpacity; + handler.highlight = function (element) { + var label = this.getAttribute('data-label'); + if (!label) return; + + var highlightOpacity = 0.8; + var highlightElements = $('[data-label="' + label + '"]', element.parentNode); + $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); // half of the default opacity + highlightElements.css('opacity', highlightOpacity); + }; + handler.unHighlight = function (element) { + $('[data-label]', element.parentNode).css('opacity', defaultOpacity); + }; } this.checkIfEnoughData(); diff --git a/src/ui/public/visualize/visualize_legend.html b/src/ui/public/visualize/visualize_legend.html index 568541d530afc..45856c58d182a 100644 --- a/src/ui/public/visualize/visualize_legend.html +++ b/src/ui/public/visualize/visualize_legend.html @@ -6,8 +6,8 @@
  • @@ -38,4 +38,4 @@
- \ No newline at end of file + diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js index 9d3edea59b79d..5821d7501183a 100644 --- a/src/ui/public/visualize/visualize_legend.js +++ b/src/ui/public/visualize/visualize_legend.js @@ -29,12 +29,26 @@ uiModules.get('kibana') refresh(); }); - $scope.highlightSeries = function (label) { - $('[data-label]', $elem.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5); + $scope.highlightSeries = function (event) { + var el = event.currentTarget; + var handler = $scope.renderbot.vislibVis.handler; + if(handler.highlight) { + handler.highlight.call(el, handler.el); + }else{ + var label = el.getAttribute('data-label'); + if (!label) return; + $('[data-label]', el.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5); + } }; - $scope.unhighlightSeries = function () { - $('[data-label]', $elem.siblings()).css('opacity', 1); + $scope.unhighlightSeries = function (event) { + var el = event.currentTarget; + var handler = $scope.renderbot.vislibVis.handler; + if(handler.unHighlight) { + handler.unHighlight.call(el, handler.el); + }else{ + $('[data-label]', el.siblings()).css('opacity', 1); + } }; $scope.setColor = function (label, color) { From 3602964435af031bd738a16ae8a9bdfda454353d Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sun, 28 Feb 2016 01:21:18 +0100 Subject: [PATCH 15/50] Fixes an issue when hovering the legend in area charts. Also, other charts now have the same behavior --- src/ui/public/vislib/visualizations/area_chart.js | 5 ++++- src/ui/public/visualize/visualize_legend.html | 4 ++-- src/ui/public/visualize/visualize_legend.js | 10 ++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js index 7872cdf1d7511..cd18fd947e50c 100644 --- a/src/ui/public/vislib/visualizations/area_chart.js +++ b/src/ui/public/vislib/visualizations/area_chart.js @@ -45,7 +45,10 @@ export default function AreaChartFactory(Private) { highlightElements.css('opacity', highlightOpacity); }; handler.unHighlight = function (element) { - $('[data-label]', element.parentNode).css('opacity', defaultOpacity); + $('[data-label]', element).css('opacity', defaultOpacity); + + //The legend should keep max opacity + $('[data-label]', $(element).siblings()).css('opacity', 1); }; } diff --git a/src/ui/public/visualize/visualize_legend.html b/src/ui/public/visualize/visualize_legend.html index 45856c58d182a..3f8e2b4a09b39 100644 --- a/src/ui/public/visualize/visualize_legend.html +++ b/src/ui/public/visualize/visualize_legend.html @@ -6,8 +6,8 @@
  • diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js index 5821d7501183a..2cf9651650d1b 100644 --- a/src/ui/public/visualize/visualize_legend.js +++ b/src/ui/public/visualize/visualize_legend.js @@ -29,7 +29,7 @@ uiModules.get('kibana') refresh(); }); - $scope.highlightSeries = function (event) { + $scope.highlight = function (event) { var el = event.currentTarget; var handler = $scope.renderbot.vislibVis.handler; if(handler.highlight) { @@ -37,17 +37,19 @@ uiModules.get('kibana') }else{ var label = el.getAttribute('data-label'); if (!label) return; - $('[data-label]', el.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5); + var highlightElements = $('[data-label="' + label + '"]', handler.el.parentNode); + $('[data-label]', handler.el.parentNode).not(highlightElements).css('opacity', 0.5); + $(highlightElements).css('opacity', 1); } }; - $scope.unhighlightSeries = function (event) { + $scope.unhighlight = function (event) { var el = event.currentTarget; var handler = $scope.renderbot.vislibVis.handler; if(handler.unHighlight) { handler.unHighlight.call(el, handler.el); }else{ - $('[data-label]', el.siblings()).css('opacity', 1); + $('[data-label]', handler.el.parentNode).css('opacity', 1); } }; From 9c969346b1f757a8d45b4a2bde13a0846a04878e Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sun, 28 Feb 2016 01:50:59 +0100 Subject: [PATCH 16/50] Harmonizes the hover behavior --- src/ui/public/vislib/lib/dispatch.js | 12 ++++++++---- src/ui/public/visualize/visualize_legend.js | 18 ++++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index 6c1f41b9f2e8c..924fb91be4139 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -106,7 +106,9 @@ export default function DispatchClass(Private) { var isClickable = this.listenerCount('click') > 0; var addEvent = this.addEvent; var $el = this.handler.el; - var highlight = this.handler.highlight || self.highlight; + if(!this.handler.highlight) { + this.handler.highlight = self.highlight; + } function hover(d, i) { // Add pointer if item is clickable @@ -114,7 +116,7 @@ export default function DispatchClass(Private) { self.addMousePointer.call(this, arguments); } - highlight.call(this, $el); + self.handler.highlight.call(this, $el); self.emit('hover', self.eventResponse(d, i)); } @@ -130,10 +132,12 @@ export default function DispatchClass(Private) { var self = this; var addEvent = this.addEvent; var $el = this.handler.el; - var unHighlight = this.handler.unHighlight || self.unHighlight; + if(!this.handler.unHighlight) { + this.handler.unHighlight = self.unHighlight; + } function mouseout() { - unHighlight.call(this, $el); + self.handler.unHighlight.call(this, $el); } return addEvent('mouseout', mouseout); diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js index 2cf9651650d1b..1924e4e97cc09 100644 --- a/src/ui/public/visualize/visualize_legend.js +++ b/src/ui/public/visualize/visualize_legend.js @@ -32,25 +32,15 @@ uiModules.get('kibana') $scope.highlight = function (event) { var el = event.currentTarget; var handler = $scope.renderbot.vislibVis.handler; - if(handler.highlight) { - handler.highlight.call(el, handler.el); - }else{ - var label = el.getAttribute('data-label'); - if (!label) return; - var highlightElements = $('[data-label="' + label + '"]', handler.el.parentNode); - $('[data-label]', handler.el.parentNode).not(highlightElements).css('opacity', 0.5); - $(highlightElements).css('opacity', 1); - } + if(!handler) return; + handler.highlight.call(el, handler.el); }; $scope.unhighlight = function (event) { var el = event.currentTarget; var handler = $scope.renderbot.vislibVis.handler; - if(handler.unHighlight) { - handler.unHighlight.call(el, handler.el); - }else{ - $('[data-label]', handler.el.parentNode).css('opacity', 1); - } + if(!handler) return; + handler.unHighlight.call(el, handler.el); }; $scope.setColor = function (label, color) { From 59f890985318c8116dfb61fbe3d6b9c49647b1e6 Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 29 Feb 2016 09:47:30 -0600 Subject: [PATCH 17/50] [url shortener] Add base path --- src/server/http/index.js | 2 +- src/ui/public/share/lib/url_shortener.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/server/http/index.js b/src/server/http/index.js index 71830d85d72f3..c03a08ec30c52 100644 --- a/src/server/http/index.js +++ b/src/server/http/index.js @@ -111,7 +111,7 @@ module.exports = async function (kbnServer, server, config) { path: '/goto/{urlId}', handler: async function (request, reply) { const url = await shortUrlLookup.getUrl(request.params.urlId); - reply().redirect(url); + reply().redirect(config.get('server.basePath') + url); } }); diff --git a/src/ui/public/share/lib/url_shortener.js b/src/ui/public/share/lib/url_shortener.js index 3e29500d8d2f0..d20afb2a9af9e 100644 --- a/src/ui/public/share/lib/url_shortener.js +++ b/src/ui/public/share/lib/url_shortener.js @@ -1,15 +1,18 @@ +import chrome from 'ui/chrome'; + export default function createUrlShortener(Notifier, $http, $location) { const notify = new Notifier({ location: 'Url Shortener' }); - const baseUrl = `${$location.protocol()}://${$location.host()}:${$location.port()}`; + const basePath = chrome.getBasePath(); + const baseUrl = `${$location.protocol()}://${$location.host()}:${$location.port()}${basePath}`; async function shortenUrl(url) { const relativeUrl = url.replace(baseUrl, ''); const formData = { url: relativeUrl }; try { - const result = await $http.post('/shorten', formData); + const result = await $http.post(`${basePath}/shorten`, formData); return `${baseUrl}/goto/${result.data}`; } catch (err) { From 20b31849e1a034a19623e07336e88ddd1bf00517 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 29 Feb 2016 13:56:37 -0500 Subject: [PATCH 18/50] Bump node to 4.3.1 --- .node-version | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.node-version b/.node-version index 80895903a15c8..f77856a6f1af5 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -4.3.0 +4.3.1 diff --git a/package.json b/package.json index 62f50e960dbb0..f0f13dc824500 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "supertest-as-promised": "2.0.2" }, "engines": { - "node": "4.3.0", + "node": "4.3.1", "npm": "2.14.15" } } From d36231c117094942d74f9946d8f87dc14e9b4eb9 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 29 Feb 2016 13:56:57 -0500 Subject: [PATCH 19/50] Bump npm to 2.14.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0f13dc824500..8ddd9f0b1b607 100644 --- a/package.json +++ b/package.json @@ -188,6 +188,6 @@ }, "engines": { "node": "4.3.1", - "npm": "2.14.15" + "npm": "2.14.21" } } From 7bd76bef6b54c07684c8812beef103b135cd319d Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 29 Feb 2016 14:12:58 -0500 Subject: [PATCH 20/50] Makelogs as a dev dependency Different versions of makelogs are required based on the current Kibana branch/version, so we now include it as a dev dependency that we can version accordingly. There is also an npm script for makelogs so you do not need to traverse the node_modules bin directory. --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index 62f50e960dbb0..2a8b91267b666 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "elasticsearchWithPlugins": "grunt esvm:withPlugins:keepalive", "lint": "grunt eslint:source", "lintroller": "grunt eslint:fixSource", + "makelogs": "makelogs", "mocha": "mocha", "mocha:debug": "mocha --debug-brk", "sterilize": "grunt sterilize" @@ -176,6 +177,7 @@ "libesvm": "3.3.0", "license-checker": "3.1.0", "load-grunt-config": "0.7.2", + "makelogs": "3.0.0-beta3", "marked-text-renderer": "0.1.0", "mocha": "2.3.0", "nock": "2.10.0", From 4b6c643b587c2489c3cd7814638215401bc31f46 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 29 Feb 2016 14:34:28 -0500 Subject: [PATCH 21/50] [tests] Longer timeout in es routes test setup It can take longer than 10 seconds for kibana to be ready, but that doesn't mean we fail the tests. --- src/plugins/elasticsearch/lib/__tests__/routes.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js index 660ab2ff6e060..b5f94d8f3e82f 100644 --- a/src/plugins/elasticsearch/lib/__tests__/routes.js +++ b/src/plugins/elasticsearch/lib/__tests__/routes.js @@ -11,6 +11,8 @@ describe('plugins/elasticsearch', function () { let kbnServer; before(function () { + this.timeout(15000); // sometimes waiting for server takes longer than 10 + kbnServer = kbnTestServer.createServer(); return kbnServer.ready() .then(() => kbnServer.server.plugins.elasticsearch.waitUntilReady()); From 5ad9ad29ff5459482cc7572f2354204e263dc722 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 29 Feb 2016 14:48:41 -0700 Subject: [PATCH 22/50] [courier/test] fix some module ids --- src/ui/public/courier/fetch/__tests__/fetch_these.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js index 456a9ec0e9ff1..8dcd80080d650 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch_these.js +++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js @@ -1,9 +1,9 @@ -import _ from 'lodash'; +// import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; -import FetchTheseProvider from '../fetch/fetch_these'; +import FetchTheseProvider from '../fetch_these'; describe('ui/courier/fetch/_fetch_these', () => { @@ -24,9 +24,9 @@ describe('ui/courier/fetch/_fetch_these', () => { return fakeResponses; } - PrivateProvider.swap(require('ui/courier/fetch/_call_client'), FakeResponsesProvider); - PrivateProvider.swap(require('ui/courier/fetch/_call_response_handlers'), FakeResponsesProvider); - PrivateProvider.swap(require('ui/courier/fetch/_continue_incomplete'), FakeResponsesProvider); + PrivateProvider.swap(require('ui/courier/fetch/call_client'), FakeResponsesProvider); + PrivateProvider.swap(require('ui/courier/fetch/call_response_handlers'), FakeResponsesProvider); + PrivateProvider.swap(require('ui/courier/fetch/continue_incomplete'), FakeResponsesProvider); })); beforeEach(ngMock.inject((Private, $injector) => { From 810eded957d2ddadd6d1bcf216815bb22ec9f22a Mon Sep 17 00:00:00 2001 From: Mathias Arens Date: Tue, 1 Mar 2016 11:46:16 +0100 Subject: [PATCH 23/50] Fix typo in histogram visualization description --- src/plugins/kbn_vislib_vis_types/public/histogram.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/kbn_vislib_vis_types/public/histogram.js b/src/plugins/kbn_vislib_vis_types/public/histogram.js index e0879e41d7823..80851875efd83 100644 --- a/src/plugins/kbn_vislib_vis_types/public/histogram.js +++ b/src/plugins/kbn_vislib_vis_types/public/histogram.js @@ -11,7 +11,7 @@ export default function HistogramVisType(Private) { title: 'Vertical bar chart', icon: 'fa-bar-chart', description: 'The goto chart for oh-so-many needs. Great for time and non-time data. Stacked or grouped, ' + - 'exact numbers or percentages. If you are not sure which chart your need, you could do worse than to start here.', + 'exact numbers or percentages. If you are not sure which chart you need, you could do worse than to start here.', params: { defaults: { shareYAxis: true, From 705a7b44ccc383a7070426c6d3793dec2996873d Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Tue, 1 Mar 2016 10:16:27 -0700 Subject: [PATCH 24/50] Update CONTRIBUTING.md --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4e0d1bd712d3a..9cbfd8b794dd4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,6 +138,11 @@ The standard `npm run test` task runs several sub tasks and can take several min Run a one off test with the local project version of mocha, babel compilation, and optional debugging. Great for development and fixing individual tests. + +
    npm run test:dev -- --kbnServer.testsBundle.pluginId=some_special_plugin --kbnServer.plugin-path=../some_special_plugin
    +
    + Run the tests for just your particular plugin +
    Distributable packages can be found in `target/` after the build completes. From 0f07dac4f40fb193b80d5f6518c6d874b024c34b Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Tue, 1 Mar 2016 10:36:55 -0700 Subject: [PATCH 25/50] Add plugin testing notes, clean up test section formatting --- CONTRIBUTING.md | 109 ++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 59 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9cbfd8b794dd4..20499d10d616c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,99 +111,90 @@ Before running the tests you will need to install the projects dependencies as d Once that is complete just run: -```sh +``` +sh npm run test && npm run build ``` -#### Testing and debugging tests +#### Debugging unit tests The standard `npm run test` task runs several sub tasks and can take several minutes to complete, making debugging failures pretty painful. In order to ease the pain specialized tasks provide alternate methods for running the tests. -
    -
    npm run test:quick
    -
    Runs both server and browser tests, but skips linting
    - -
    npm run test:server or npm run test:browser
    -
    Runs the tests for just the server or browser
    - -
    npm run test:dev
    -
    - Initializes an environment for debugging the browser tests. Includes an dedicated instance of the kibana server for building the test bundle, and a karma server. When running this task the build is optimized for the first time and then a karma-owned instance of the browser is opened. Click the "debug" button to open a new tab that executes the unit tests. -
    - -
    - -
    npm run mocha [test file or dir] or npm run mocha:debug [test file or dir]
    -
    - Run a one off test with the local project version of mocha, babel compilation, and optional debugging. Great - for development and fixing individual tests. -
    - -
    npm run test:dev -- --kbnServer.testsBundle.pluginId=some_special_plugin --kbnServer.plugin-path=../some_special_plugin
    -
    - Run the tests for just your particular plugin -
    -
    -Distributable packages can be found in `target/` after the build completes. +`npm run test:quick` +Runs both server and browser tests, but skips linting -#### Building OS packages +`npm run test:server` +Run only the server tests -Packages are built using fpm, pleaserun, dpkg, and rpm. fpm and pleaserun can be installed using gem. Package building has only been tested on Linux and is not supported on any other platform. -```sh -gem install pleaserun -apt-get install ruby-dev -gem install fpm -npm run build:ospackages -``` +`npm run test:browser` +Run only the browser tests -To specify a package to build you can add `rpm` or `deb` as an argument. -```sh -npm run build:ospackages -- --rpm -``` +`npm run test:dev` +Initializes an environment for debugging the browser tests. Includes an dedicated instance of the kibana server for building the test bundle, and a karma server. When running this task the build is optimized for the first time and then a karma-owned instance of the browser is opened. Click the "debug" button to open a new tab that executes the unit tests. +![Browser test debugging](http://i.imgur.com/DwHxgfq.png) -### Functional UI Testing +`npm run mocha [test file or dir]` or `npm run mocha:debug [test file or dir]` +Run a one off test with the local project version of mocha, babel compilation, and optional debugging. Great +for development and fixing individual tests. -#### Handy references +#### Unit testing plugins +This should work super if you're using the [Kibana plugin generator](https://github.com/elastic/generator-kibana-plugin). If you're not using the generator, well, you're on your own. We suggest you look at how the generator works. -- https://theintern.github.io/ -- https://theintern.github.io/leadfoot/Element.html +`npm run test:dev -- --kbnServer.testsBundle.pluginId=some_special_plugin --kbnServer.plugin-path=../some_special_plugin` +Run the tests for just your particular plugin. Assuming you plugin lives outside of the `installedPlugins directory`, which it should. -#### Running tests using npm task: +#### Running browser automation tests: *The Selenium server that is started currently only runs the tests in Firefox* -To run the functional UI tests use the following commands - -
    +The following will start Kibana, Elasticsearch and Selenium for you. To run the functional UI tests use the following commands -
    npm run test:ui
    -
    Run the functional UI tests one time and exit. This is used by the CI systems and is great for quickly checking that things pass. It is essentially a combination of the next two tasks.
    +`npm run test:ui` +Run the functional UI tests one time and exit. This is used by the CI systems and is great for quickly checking that things pass. It is essentially a combination of the next two tasks. -
    npm run test:ui:server
    -
    Start the server required for the test:ui:runner tasks. Once the server is started test:ui:runner can be run multiple times without waiting for the server to start.
    +`npm run test:ui:server` +Start the server required for the `test:ui:runner` tasks. Once the server is started `test:ui:runner` can be run multiple times without waiting for the server to start. -
    npm run test:ui:runner
    -
    Execute the front-end selenium tests. This requires the server started by the test:ui:server task.
    +`npm run test:ui:runner` +Execute the front-end selenium tests. This requires the server started by the `test:ui:server` task. -
    - -#### Running tests locally with your existing (and already running) ElasticSearch, Kibana, and Selenium Server: +##### If you already have ElasticSearch, Kibana, and Selenium Server running: Set your es and kibana ports in `test/intern.js` to 9220 and 5620, respectively. You can configure your Selenium server to run the tests on Chrome,IE, or other browsers here. Once you've got the services running, execute the following: -```sh +``` +sh npm run test:ui:runner ``` -#### General notes: +#### Browser automation notes: - Using Page Objects pattern (https://theintern.github.io/intern/#writing-functional-test) - At least the initial tests for the Settings, Discover, and Visualize tabs all depend on a very specific set of logstash-type data (generated with makelogs). Since that is a static set of data, all the Discover and Visualize tests use a specific Absolute time range. This guarantees the same results each run. - These tests have been developed and tested with Chrome and Firefox browser. In theory, they should work on all browsers (that's the benefit of Intern using Leadfoot). - These tests should also work with an external testing service like https://saucelabs.com/ or https://www.browserstack.com/ but that has not been tested. +- https://theintern.github.io/ +- https://theintern.github.io/leadfoot/Element.html + +#### Building OS packages + +Packages are built using fpm, pleaserun, dpkg, and rpm. fpm and pleaserun can be installed using gem. Package building has only been tested on Linux and is not supported on any other platform. +```sh +gem install pleaserun +apt-get install ruby-dev +gem install fpm +npm run build:ospackages +``` + +To specify a package to build you can add `rpm` or `deb` as an argument. +```sh +npm run build:ospackages -- --rpm +``` + +Distributable packages can be found in `target/` after the build completes. ## Submitting a pull request From fd56bb12d72782e9d424082da29ec12c3e73faeb Mon Sep 17 00:00:00 2001 From: Patrick Fournier Date: Tue, 1 Mar 2016 15:52:49 -0500 Subject: [PATCH 26/50] Add a stacking context for .vis-editor-content. Add a z-index property to introduce a stacking context for .vis-editor-content, grouping all children in the same stacking context. --- src/plugins/kibana/public/visualize/editor/styles/_editor.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less index 36a42ac49f636..00ebb510e805b 100644 --- a/src/plugins/kibana/public/visualize/editor/styles/_editor.less +++ b/src/plugins/kibana/public/visualize/editor/styles/_editor.less @@ -57,6 +57,7 @@ &-content { .flex-parent(); + z-index: 0; // overrides for tablet and desktop @media (min-width: @screen-md-min) { From a7074da257289e9afcd8c3f2341fb900d453edb6 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Tue, 1 Mar 2016 15:43:05 -0700 Subject: [PATCH 27/50] Use a filter function instead of string concatonation --- src/ui/public/utils/escape_attr.js | 7 ------- src/ui/public/vislib/lib/dispatch.js | 3 +-- src/ui/public/visualize/visualize_legend.js | 3 +-- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 src/ui/public/utils/escape_attr.js diff --git a/src/ui/public/utils/escape_attr.js b/src/ui/public/utils/escape_attr.js deleted file mode 100644 index 4fad6b8570128..0000000000000 --- a/src/ui/public/utils/escape_attr.js +++ /dev/null @@ -1,7 +0,0 @@ -export default function escapeAttribute(attr) { - const specials = ['#', '&', '~', '=', '>', '\'', ':', '"', '!', ';', ',']; - const regexSpecials = ['.', '*', '+', '|', '[', ']', '(', ')', '/', '^', '$']; - const sRE = new RegExp('(' + specials.join('|') + '|\\' + regexSpecials.join('|\\') + ')', 'g'); - - return attr.replace(sRE, '\\$1'); -} diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index 7dd8577779020..1e3dc82711d03 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -1,7 +1,6 @@ import d3 from 'd3'; import _ from 'lodash'; import $ from 'jquery'; -import escapeAttr from 'ui/utils/escape_attr'; import SimpleEmitter from 'ui/utils/SimpleEmitter'; import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip'; export default function DispatchClass(Private) { @@ -231,7 +230,7 @@ export default function DispatchClass(Private) { Dispatch.prototype.highlightLegend = function (element) { var label = this.getAttribute('data-label'); if (!label) return; - $('[data-label]', element.parentNode).not('[data-label="' + escapeAttr(label) + '"]').css('opacity', 0.5); + $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') !== label;}).css('opacity', 0.5); }; /** diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js index 3171b8d111427..b1a32bdc5d81e 100644 --- a/src/ui/public/visualize/visualize_legend.js +++ b/src/ui/public/visualize/visualize_legend.js @@ -2,7 +2,6 @@ import _ from 'lodash'; import html from 'ui/visualize/visualize_legend.html'; import $ from 'jquery'; import d3 from 'd3'; -import escapeAttr from 'ui/utils/escape_attr'; import findByParam from 'ui/utils/find_by_param'; import VislibLibDataProvider from 'ui/vislib/lib/data'; import VislibComponentsColorColorProvider from 'ui/vislib/components/color/color'; @@ -31,7 +30,7 @@ uiModules.get('kibana') }); $scope.highlightSeries = function (label) { - $('[data-label]', $elem.siblings()).not('[data-label="' + escapeAttr(label) + '"]').css('opacity', 0.5); + $('[data-label]', $elem.siblings()).not(function (els, el) { return $(el).data('label') !== label;}).css('opacity', 0.5); }; $scope.unhighlightSeries = function () { From bd77fc9725bc86b9e5b1a7d1f0b69c5bab449a34 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Wed, 2 Mar 2016 11:11:22 -0500 Subject: [PATCH 28/50] Bump target ES version to 5.0.0 to stay in sync with ES master --- src/plugins/elasticsearch/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/elasticsearch/index.js b/src/plugins/elasticsearch/index.js index 38bdb6da95018..b9debc020ec6f 100644 --- a/src/plugins/elasticsearch/index.js +++ b/src/plugins/elasticsearch/index.js @@ -29,7 +29,7 @@ module.exports = function ({ Plugin }) { key: string() }).default(), apiVersion: Joi.string().default('master'), - engineVersion: Joi.string().valid('^3.0.0').default('^3.0.0') + engineVersion: Joi.string().valid('^5.0.0').default('^5.0.0') }).default(); }, From 419434f5c87c2daef6571492fc8c3c29092c1f26 Mon Sep 17 00:00:00 2001 From: Joe Fleming Date: Wed, 2 Mar 2016 11:37:34 -0700 Subject: [PATCH 29/50] 4.x timeout fixes applied to master see PR #6341 and #6377 Fixes #6385 --- config/kibana.yml | 2 +- src/plugins/elasticsearch/lib/create_proxy.js | 11 +++++++++-- src/plugins/elasticsearch/lib/expose_client.js | 4 ++++ src/plugins/elasticsearch/lib/health_check.js | 2 +- src/plugins/testsBundle/testsEntryTemplate.js | 1 + src/ui/index.js | 1 + src/ui/public/es.js | 4 ++-- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/config/kibana.yml b/config/kibana.yml index 721bd83bfcf8e..0f506c91579bc 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -56,7 +56,7 @@ # Time in milliseconds to wait for responses from the back end or Elasticsearch. This value # must be a positive integer. -# elasticsearch.requestTimeout: 300000 +# elasticsearch.requestTimeout: 30000 # Time in milliseconds for Elasticsearch to wait for responses from shards. Set to 0 to disable. # elasticsearch.shardTimeout: 0 diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js index 9ec30c8d93065..b2a82a07a1bca 100644 --- a/src/plugins/elasticsearch/lib/create_proxy.js +++ b/src/plugins/elasticsearch/lib/create_proxy.js @@ -1,23 +1,30 @@ import createAgent from './create_agent'; import mapUri from './map_uri'; import { resolve } from 'url'; +import { assign } from 'lodash'; function createProxy(server, method, route, config) { const options = { method: method, path: createProxy.createPath(route), + config: { + timeout: { + socket: server.config().get('elasticsearch.requestTimeout') + } + }, handler: { proxy: { mapUri: mapUri(server), passThrough: true, agent: createAgent(server), - xforward: true + xforward: true, + timeout: server.config().get('elasticsearch.requestTimeout') } }, }; - if (config) options.config = config; + assign(options.config, config); server.route(options); }; diff --git a/src/plugins/elasticsearch/lib/expose_client.js b/src/plugins/elasticsearch/lib/expose_client.js index 9a9c45b3d21be..0e82a78449174 100644 --- a/src/plugins/elasticsearch/lib/expose_client.js +++ b/src/plugins/elasticsearch/lib/expose_client.js @@ -19,6 +19,8 @@ module.exports = function (server) { clientKey: config.get('elasticsearch.ssl.key'), ca: config.get('elasticsearch.ssl.ca'), apiVersion: config.get('elasticsearch.apiVersion'), + pingTimeout: config.get('elasticsearch.pingTimeout'), + requestTimeout: config.get('elasticsearch.requestTimeout'), keepAlive: true, auth: true }); @@ -45,6 +47,8 @@ module.exports = function (server) { plugins: options.plugins, apiVersion: options.apiVersion, keepAlive: options.keepAlive, + pingTimeout: options.pingTimeout, + requestTimeout: options.requestTimeout, defer: function () { return Bluebird.defer(); }, diff --git a/src/plugins/elasticsearch/lib/health_check.js b/src/plugins/elasticsearch/lib/health_check.js index 00285903a57cc..3b4b66425faa5 100644 --- a/src/plugins/elasticsearch/lib/health_check.js +++ b/src/plugins/elasticsearch/lib/health_check.js @@ -22,7 +22,7 @@ module.exports = function (plugin, server) { plugin.status.yellow('Waiting for Elasticsearch'); function waitForPong() { - return client.ping({ requestTimeout: 1500 }).catch(function (err) { + return client.ping().catch(function (err) { if (!(err instanceof NoConnections)) throw err; plugin.status.red(format('Unable to connect to Elasticsearch at %s.', config.get('elasticsearch.url'))); diff --git a/src/plugins/testsBundle/testsEntryTemplate.js b/src/plugins/testsBundle/testsEntryTemplate.js index aff1601d50675..61127f4bfc48f 100644 --- a/src/plugins/testsBundle/testsEntryTemplate.js +++ b/src/plugins/testsBundle/testsEntryTemplate.js @@ -27,6 +27,7 @@ window.__KBN__ = { kbnIndex: '.kibana', esShardTimeout: 1500, esApiVersion: '2.0', + esRequestTimeout: '300000' } }; diff --git a/src/ui/index.js b/src/ui/index.js index 2c3981c5fadf4..28b1fc267f1a8 100644 --- a/src/ui/index.js +++ b/src/ui/index.js @@ -64,6 +64,7 @@ module.exports = async (kbnServer, server, config) => { defaultInjectedVars.kbnIndex = config.get('kibana.index'); } if (config.has('elasticsearch')) { + defaultInjectedVars.esRequestTimeout = config.get('elasticsearch.requestTimeout'); defaultInjectedVars.esShardTimeout = config.get('elasticsearch.shardTimeout'); defaultInjectedVars.esApiVersion = config.get('elasticsearch.apiVersion'); } diff --git a/src/ui/public/es.js b/src/ui/public/es.js index 4dc1b7bdc640c..0dffbbf83172c 100644 --- a/src/ui/public/es.js +++ b/src/ui/public/es.js @@ -5,13 +5,13 @@ import uiModules from 'ui/modules'; var es; // share the client amoungst all apps uiModules .get('kibana', ['elasticsearch', 'kibana/config']) - .service('es', function (esFactory, esUrl, $q, esApiVersion) { + .service('es', function (esFactory, esUrl, $q, esApiVersion, esRequestTimeout) { if (es) return es; es = esFactory({ host: esUrl, log: 'info', - requestTimeout: 0, + requestTimeout: esRequestTimeout, apiVersion: esApiVersion, plugins: [function (Client, config) { From 4899e4b177c789159573d6d435e1a8c4a098c562 Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Thu, 3 Mar 2016 00:35:36 +0100 Subject: [PATCH 30/50] Removes the duplicated folder to be watch. Watching the same folder twice hangs the watcher chokidar. All the plugins folders are watched and this folder is included by default as plugin folder and also directly in the watcher configuration. --- src/cli/cluster/cluster_manager.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index a80423be31049..bf5d7283498b9 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -86,7 +86,6 @@ module.exports = class ClusterManager { const fromRoot = require('../../utils/fromRoot'); this.watcher = chokidar.watch([ - 'src/plugins', 'src/server', 'src/ui', 'src/utils', From 7f59d754bdd9ec9eed42709b635b3c280d513cad Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 3 Mar 2016 13:33:00 -0700 Subject: [PATCH 31/50] [courier/fetch] cleanup after some feedback --- src/ui/public/courier/fetch/__tests__/fetch_these.js | 1 - src/ui/public/courier/fetch/request/doc.js | 2 -- src/ui/public/courier/fetch/request/search.js | 2 -- src/ui/public/courier/fetch/request/segmented_handle.js | 2 -- 4 files changed, 7 deletions(-) diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js index 8dcd80080d650..513373af11b7f 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch_these.js +++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js @@ -1,4 +1,3 @@ -// import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js index ac41d141c8cdd..bbe0d12e7ee6c 100644 --- a/src/ui/public/courier/fetch/request/doc.js +++ b/src/ui/public/courier/fetch/request/doc.js @@ -1,5 +1,3 @@ -import _ from 'lodash'; - import DocStrategyProvider from '../strategy/doc'; import AbstractRequestProvider from './request'; diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js index 3556a8aee9c42..9ae5b8398bc7d 100644 --- a/src/ui/public/courier/fetch/request/search.js +++ b/src/ui/public/courier/fetch/request/search.js @@ -1,5 +1,3 @@ -import _ from 'lodash'; - import SearchStrategyProvider from '../strategy/search'; import AbstractRequestProvider from './request'; diff --git a/src/ui/public/courier/fetch/request/segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js index 811267e835b1c..702378d8392ae 100644 --- a/src/ui/public/courier/fetch/request/segmented_handle.js +++ b/src/ui/public/courier/fetch/request/segmented_handle.js @@ -1,5 +1,3 @@ -import _ from 'lodash'; - import EventsProvider from 'ui/events'; export default function CourierSegmentedReqHandle(Private) { From 414ba105c4991b15a383ffe9bd958571da89a50b Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Thu, 3 Mar 2016 22:11:20 +0100 Subject: [PATCH 32/50] Update chokidar to version 1.4.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 222446e3b872c..5bafa0d690d51 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "angular-mocks": "1.4.7", "auto-release-sinon": "1.0.3", "babel-eslint": "4.1.8", - "chokidar": "1.0.5", + "chokidar": "1.4.3", "eslint": "1.10.3", "eslint-plugin-mocha": "1.1.0", "expect.js": "0.3.1", From 32f6667e3d78677c41be9243cbe549401fff24f4 Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Thu, 3 Mar 2016 22:21:04 +0100 Subject: [PATCH 33/50] Watch function now receives a uniq array of absolute paths. --- src/cli/cluster/cluster_manager.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index bf5d7283498b9..ccb591f410335 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -1,8 +1,8 @@ import cluster from 'cluster'; -const { join } = require('path'); +const { join, resolve } = require('path'); const { format: formatUrl } = require('url'); import Hapi from 'hapi'; -const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodash'); +const { debounce, compact, get, invoke, bindAll, once, sample, uniq } = require('lodash'); import Log from '../Log'; import Worker from './worker'; @@ -85,13 +85,16 @@ module.exports = class ClusterManager { const chokidar = require('chokidar'); const fromRoot = require('../../utils/fromRoot'); - this.watcher = chokidar.watch([ + const watchPaths = uniq([ + 'src/plugins', 'src/server', 'src/ui', 'src/utils', 'config', ...extraPaths - ], { + ].map(path => resolve(path))); + + this.watcher = chokidar.watch(watchPaths, { cwd: fromRoot('.'), ignored: /[\\\/](\..*|node_modules|bower_components|public|__tests__)[\\\/]/ }); From 75008a2fc92f7932c17319dd3014e5108109d445 Mon Sep 17 00:00:00 2001 From: Shelby Sturgis Date: Thu, 3 Mar 2016 15:55:51 -0800 Subject: [PATCH 34/50] Closes #6283. Fixes date format error for millisecond intervals. --- src/ui/public/config/defaults.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/config/defaults.js b/src/ui/public/config/defaults.js index c167e814bf3e3..50f2215192f2c 100644 --- a/src/ui/public/config/defaults.js +++ b/src/ui/public/config/defaults.js @@ -32,7 +32,7 @@ export default function configDefaultsProvider() { type: 'json', value: '[\n' + - ' ["", "hh:mm:ss.SSS"],\n' + + ' ["", "HH:mm:ss.SSS"],\n' + ' ["PT1S", "HH:mm:ss"],\n' + ' ["PT1M", "HH:mm"],\n' + ' ["PT1H",\n' + From e1eafc5567df1b2a284b7b1454511e01ddb07607 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Fri, 4 Mar 2016 11:08:15 -0500 Subject: [PATCH 35/50] Bump node to 4.3.2 --- .node-version | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.node-version b/.node-version index f77856a6f1af5..cc2fbe89b6c7c 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -4.3.1 +4.3.2 diff --git a/package.json b/package.json index 222446e3b872c..8777f8ae32f61 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,7 @@ "supertest-as-promised": "2.0.2" }, "engines": { - "node": "4.3.1", + "node": "4.3.2", "npm": "2.14.21" } } From 9d825ef57babafb40659c31c56bf86ac83e80f7e Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Fri, 4 Mar 2016 11:08:32 -0500 Subject: [PATCH 36/50] Bump npm to 2.14.22 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8777f8ae32f61..bc713698ef02f 100644 --- a/package.json +++ b/package.json @@ -190,6 +190,6 @@ }, "engines": { "node": "4.3.2", - "npm": "2.14.21" + "npm": "2.14.22" } } From 2faa3ee2f58f6e3e2ee839022184c3b52b94b407 Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Fri, 4 Mar 2016 15:48:14 -0500 Subject: [PATCH 37/50] Remove outdated mapping options that were copied over from logstash template --- .../kibana/server/lib/create_mappings_from_pattern_fields.js | 2 -- src/plugins/kibana/server/routes/api/ingest/register_post.js | 2 -- .../scenarios/logstashFunctional/makelogsIndexDefinition.js | 1 - test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js | 1 - 4 files changed, 6 deletions(-) diff --git a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js index db8891fb98ece..d05e650991613 100644 --- a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js +++ b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js @@ -15,8 +15,6 @@ module.exports = function createMappingsFromPatternFields(fields) { mapping = { type: 'string', index: 'analyzed', - omit_norms: true, - fielddata: {format: 'disabled'}, fields: { raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256} } diff --git a/src/plugins/kibana/server/routes/api/ingest/register_post.js b/src/plugins/kibana/server/routes/api/ingest/register_post.js index 82972768c6481..b36b778232fdd 100644 --- a/src/plugins/kibana/server/routes/api/ingest/register_post.js +++ b/src/plugins/kibana/server/routes/api/ingest/register_post.js @@ -59,8 +59,6 @@ module.exports = function registerPost(server) { mapping: { type: 'string', index: 'analyzed', - omit_norms: true, - fielddata: {format: 'disabled'}, fields: { raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256} } diff --git a/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js b/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js index 67ecf94ca3013..95b416ea852f0 100644 --- a/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js +++ b/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js @@ -21,7 +21,6 @@ module.exports = { 'mapping': { 'type': 'string', 'index': 'analyzed', - 'omit_norms': true, 'fields': { 'raw': { 'index': 'not_analyzed', diff --git a/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js b/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js index 67ecf94ca3013..95b416ea852f0 100644 --- a/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js +++ b/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js @@ -21,7 +21,6 @@ module.exports = { 'mapping': { 'type': 'string', 'index': 'analyzed', - 'omit_norms': true, 'fields': { 'raw': { 'index': 'not_analyzed', From f4d3e03ed319d819f1103e9c1ef228a47ac67067 Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sat, 5 Mar 2016 06:00:47 +0100 Subject: [PATCH 38/50] Now hightlights the hovered element --- src/ui/public/vislib/lib/dispatch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index c375583d3af34..3d75697085287 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -236,7 +236,7 @@ export default function DispatchClass(Private) { Dispatch.prototype.highlight = function (element) { var label = this.getAttribute('data-label'); if (!label) return; - $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') !== label;}).css('opacity', 0.5); + $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') === label; }).css('opacity', 0.5); }; /** From ca2264d12c04b3a0c30f5bf103fbf7a9edaf4238 Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sat, 5 Mar 2016 06:19:32 +0100 Subject: [PATCH 39/50] Prevent css application to the hovered element --- src/ui/public/vislib/lib/dispatch.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index 3d75697085287..dfc476054103c 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -236,7 +236,10 @@ export default function DispatchClass(Private) { Dispatch.prototype.highlight = function (element) { var label = this.getAttribute('data-label'); if (!label) return; - $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') === label; }).css('opacity', 0.5); + //Opacity 1 is needed to avoid the css application + $('[data-label]', element.parentNode).css('opacity', 1).not( + function (els, el) { return `${$(el).data('label')}` === label;} + ).css('opacity', 0.5); }; /** From 2d04b3a09ce9b8446e93269b3b24521c19175125 Mon Sep 17 00:00:00 2001 From: David Vega Fontelos Date: Sat, 5 Mar 2016 06:21:04 +0100 Subject: [PATCH 40/50] Change to a filter function instead of string concatenation --- src/ui/public/vislib/visualizations/area_chart.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js index cd18fd947e50c..63afcdd282265 100644 --- a/src/ui/public/vislib/visualizations/area_chart.js +++ b/src/ui/public/vislib/visualizations/area_chart.js @@ -40,7 +40,9 @@ export default function AreaChartFactory(Private) { if (!label) return; var highlightOpacity = 0.8; - var highlightElements = $('[data-label="' + label + '"]', element.parentNode); + var highlightElements = $('[data-label]', element.parentNode).filter( + function (els, el) { return `${$(el).data('label')}` === label; + }); $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); // half of the default opacity highlightElements.css('opacity', highlightOpacity); }; From 0cacfe6ddf9cfc23275f8bd8f58ccf1e8dbc8b38 Mon Sep 17 00:00:00 2001 From: Shivam Dixit Date: Mon, 7 Mar 2016 21:26:41 +0530 Subject: [PATCH 41/50] Fix typo in caution message Signed-off-by: Shivam Dixit --- src/plugins/kibana/public/settings/sections/advanced/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.html b/src/plugins/kibana/public/settings/sections/advanced/index.html index a2894631dc868..13f85f7c88194 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/index.html +++ b/src/plugins/kibana/public/settings/sections/advanced/index.html @@ -3,7 +3,7 @@

    Caution: You can break stuff here

    Be careful in here, these settings are for very advanced users only. - Tweaks you make here can break large portionsof Kibana. Some of these + Tweaks you make here can break large portions of Kibana. Some of these settings may be undocumented, unsupported or experimental. If a field has a default value, blanking the field will reset it to its default which may be unacceptable given other configuration directives. Deleting a From 5d1796bed2c44c52bd1db471b30c5dd007b223fa Mon Sep 17 00:00:00 2001 From: Spencer Date: Mon, 7 Mar 2016 13:39:34 -0700 Subject: [PATCH 42/50] [test] extend timeout to avoid false negatives --- src/plugins/elasticsearch/lib/__tests__/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js index b5f94d8f3e82f..c4bacca30d553 100644 --- a/src/plugins/elasticsearch/lib/__tests__/routes.js +++ b/src/plugins/elasticsearch/lib/__tests__/routes.js @@ -11,7 +11,7 @@ describe('plugins/elasticsearch', function () { let kbnServer; before(function () { - this.timeout(15000); // sometimes waiting for server takes longer than 10 + this.timeout(60000); // sometimes waiting for server takes longer than 10 kbnServer = kbnTestServer.createServer(); return kbnServer.ready() From befe5f30d8070488735a0e9fd6080f27f1824391 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 7 Mar 2016 13:48:45 -0700 Subject: [PATCH 43/50] [cli/clustering] resolve our paths relative to root, not CWD --- src/cli/cluster/cluster_manager.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index ccb591f410335..ca9227912404c 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -85,14 +85,17 @@ module.exports = class ClusterManager { const chokidar = require('chokidar'); const fromRoot = require('../../utils/fromRoot'); - const watchPaths = uniq([ - 'src/plugins', - 'src/server', - 'src/ui', - 'src/utils', - 'config', - ...extraPaths - ].map(path => resolve(path))); + const watchPaths = uniq( + [ + fromRoot('src/plugins'), + fromRoot('src/server'), + fromRoot('src/ui'), + fromRoot('src/utils'), + fromRoot('config'), + ...extraPaths + ] + .map(path => resolve(path)) + ); this.watcher = chokidar.watch(watchPaths, { cwd: fromRoot('.'), From bdf2c0a1a79fa558761129a878c3e33c019a5ef4 Mon Sep 17 00:00:00 2001 From: Timothy Sullivan Date: Mon, 7 Mar 2016 17:21:06 -0700 Subject: [PATCH 44/50] [elasticsearch/client] expose client logging class --- .../elasticsearch/lib/expose_client.js | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/plugins/elasticsearch/lib/expose_client.js b/src/plugins/elasticsearch/lib/expose_client.js index 0e82a78449174..0c81c07d25c7f 100644 --- a/src/plugins/elasticsearch/lib/expose_client.js +++ b/src/plugins/elasticsearch/lib/expose_client.js @@ -9,6 +9,19 @@ import callWithRequest from './call_with_request'; module.exports = function (server) { const config = server.config(); + class ElasticsearchClientLogging { + error(err) { + server.log(['error', 'elasticsearch'], err); + } + warning(message) { + server.log(['warning', 'elasticsearch'], message); + } + info() {} + debug() {} + trace() {} + close() {} + } + function createClient(options) { options = _.defaults(options || {}, { url: config.get('elasticsearch.url'), @@ -52,18 +65,7 @@ module.exports = function (server) { defer: function () { return Bluebird.defer(); }, - log: function () { - this.error = function (err) { - server.log(['error', 'elasticsearch'], err); - }; - this.warning = function (message) { - server.log(['warning', 'elasticsearch'], message); - }; - this.info = _.noop; - this.debug = _.noop; - this.trace = _.noop; - this.close = _.noop; - } + log: ElasticsearchClientLogging }); } @@ -73,6 +75,7 @@ module.exports = function (server) { const noAuthClient = createClient({ auth: false }); server.on('close', _.bindKey(noAuthClient, 'close')); + server.expose('ElasticsearchClientLogging', ElasticsearchClientLogging); server.expose('client', client); server.expose('createClient', createClient); server.expose('callWithRequestFactory', callWithRequest); From 4f72ae2c29bdf33baecf2bc685054ace6efcc429 Mon Sep 17 00:00:00 2001 From: Rashid Khan Date: Tue, 8 Mar 2016 09:11:33 -0700 Subject: [PATCH 45/50] Add step about merging the target branch --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20499d10d616c..6cbdae5c3e236 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -221,6 +221,7 @@ Remember, someone is blocked by a pull awaiting review, make it count. Be thorou 1. **Understand the issue** that is being fixed, or the feature being added. Check the description on the pull, and check out the related issue. If you don't understand something, ask the person the submitter for clarification. 1. **Reproduce the bug** (or the lack of feature I guess?) in the destination branch, usually `master`. The referenced issue will help you here. If you're unable to reproduce the issue, contact the issue submitter for clarification 1. **Check out the pull** and test it. Is the issue fixed? Does it have nasty side effects? Try to create suspect inputs. If it operates on the value of a field try things like: strings (including an empty string), null, numbers, dates. Try to think of edge cases that might break the code. +1. **Merge the target branch**. It is possible that tests or the linter have been updated in the target branch since the pull was submitted. Merging the pull could cause core to start failing. 1. **Read the code**. Understanding the changes will help you find additional things to test. Contact the submitter if you don't understand something. 1. **Go line-by-line**. Are there [style guide](https://github.com/elastic/kibana/blob/master/STYLEGUIDE.md) violations? Strangely named variables? Magic numbers? Do the abstractions make sense to you? Are things arranged in a testable way? 1. **Speaking of tests** Are they there? If a new function was added does it have tests? Do the tests, well, TEST anything? Do they just run the function or do they properly check the output? From f7f7d0ffa4a64086e9c6d4c0fa16fafd080c8a3b Mon Sep 17 00:00:00 2001 From: Matthew Bargar Date: Tue, 8 Mar 2016 11:14:25 -0500 Subject: [PATCH 46/50] fix linter errors --- src/ui/public/vislib/lib/dispatch.js | 4 ++-- src/ui/public/vislib/visualizations/area_chart.js | 5 +++-- src/ui/public/visualize/visualize_legend.js | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js index dfc476054103c..63077e894bbe0 100644 --- a/src/ui/public/vislib/lib/dispatch.js +++ b/src/ui/public/vislib/lib/dispatch.js @@ -106,7 +106,7 @@ export default function DispatchClass(Private) { var isClickable = this.listenerCount('click') > 0; var addEvent = this.addEvent; var $el = this.handler.el; - if(!this.handler.highlight) { + if (!this.handler.highlight) { this.handler.highlight = self.highlight; } @@ -132,7 +132,7 @@ export default function DispatchClass(Private) { var self = this; var addEvent = this.addEvent; var $el = this.handler.el; - if(!this.handler.unHighlight) { + if (!this.handler.unHighlight) { this.handler.unHighlight = self.unHighlight; } diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js index 63afcdd282265..cda249b458b86 100644 --- a/src/ui/public/vislib/visualizations/area_chart.js +++ b/src/ui/public/vislib/visualizations/area_chart.js @@ -41,8 +41,9 @@ export default function AreaChartFactory(Private) { var highlightOpacity = 0.8; var highlightElements = $('[data-label]', element.parentNode).filter( - function (els, el) { return `${$(el).data('label')}` === label; - }); + function (els, el) { + return `${$(el).data('label')}` === label; + }); $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); // half of the default opacity highlightElements.css('opacity', highlightOpacity); }; diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js index 1924e4e97cc09..bd2cbe281ec3c 100644 --- a/src/ui/public/visualize/visualize_legend.js +++ b/src/ui/public/visualize/visualize_legend.js @@ -32,14 +32,14 @@ uiModules.get('kibana') $scope.highlight = function (event) { var el = event.currentTarget; var handler = $scope.renderbot.vislibVis.handler; - if(!handler) return; + if (!handler) return; handler.highlight.call(el, handler.el); }; $scope.unhighlight = function (event) { var el = event.currentTarget; var handler = $scope.renderbot.vislibVis.handler; - if(!handler) return; + if (!handler) return; handler.unHighlight.call(el, handler.el); }; From af5ab8a86bf40389a04e6a42e9101d7c53fa4f24 Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 8 Mar 2016 09:22:10 -0700 Subject: [PATCH 47/50] [es/kibanaIndex] use unmapped_type rather than ignore_unmapped https://www.elastic.co/guide/en/elasticsearch/reference/1.6/search-request-sort.html#_ignoring_unmapped_fields --- .../elasticsearch/lib/create_kibana_index.js | 13 +++---------- .../elasticsearch/lib/kibana_index_mappings.js | 10 ++++++++++ src/plugins/elasticsearch/lib/migrate_config.js | 12 +++++++++--- 3 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 src/plugins/elasticsearch/lib/kibana_index_mappings.js diff --git a/src/plugins/elasticsearch/lib/create_kibana_index.js b/src/plugins/elasticsearch/lib/create_kibana_index.js index d122ef4e3214c..b35e13fa84156 100644 --- a/src/plugins/elasticsearch/lib/create_kibana_index.js +++ b/src/plugins/elasticsearch/lib/create_kibana_index.js @@ -1,5 +1,7 @@ import SetupError from './setup_error'; import { format } from 'util'; +import { mappings } from './kibana_index_mappings'; + module.exports = function (server) { const client = server.plugins.elasticsearch.client; const index = server.config().get('kibana.index'); @@ -16,16 +18,7 @@ module.exports = function (server) { settings: { number_of_shards: 1 }, - mappings: { - config: { - properties: { - buildNum: { - type: 'string', - index: 'not_analyzed' - } - } - } - } + mappings } }) .catch(handleError('Unable to create Kibana index "<%= kibana.index %>"')) diff --git a/src/plugins/elasticsearch/lib/kibana_index_mappings.js b/src/plugins/elasticsearch/lib/kibana_index_mappings.js new file mode 100644 index 0000000000000..0d0204aeeecb5 --- /dev/null +++ b/src/plugins/elasticsearch/lib/kibana_index_mappings.js @@ -0,0 +1,10 @@ +export const mappings = { + config: { + properties: { + buildNum: { + type: 'string', + index: 'not_analyzed' + } + } + } +}; diff --git a/src/plugins/elasticsearch/lib/migrate_config.js b/src/plugins/elasticsearch/lib/migrate_config.js index 0eba1e0621717..7b16990e21297 100644 --- a/src/plugins/elasticsearch/lib/migrate_config.js +++ b/src/plugins/elasticsearch/lib/migrate_config.js @@ -1,4 +1,5 @@ import upgrade from './upgrade_config'; +import { mappings } from './kibana_index_mappings'; module.exports = function (server) { const config = server.config(); @@ -8,11 +9,16 @@ module.exports = function (server) { type: 'config', body: { size: 1000, - sort: [ { buildNum: { order: 'desc', ignore_unmapped: true } } ] + sort: [ + { + buildNum: { + order: 'desc', + unmapped_type: mappings.config.properties.buildNum.type + } + } + ] } }; return client.search(options).then(upgrade(server)); }; - - From e68fdf606de73e687bd91e1930f9f478a4042fe2 Mon Sep 17 00:00:00 2001 From: Jim Unger Date: Tue, 8 Mar 2016 12:13:20 -0600 Subject: [PATCH 48/50] [share url] fixes buttons on share panel using dark theme --- src/ui/public/share/views/share_object_url.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/public/share/views/share_object_url.html b/src/ui/public/share/views/share_object_url.html index 6c1b1438e9e90..b4dbfc3277fdd 100644 --- a/src/ui/public/share/views/share_object_url.html +++ b/src/ui/public/share/views/share_object_url.html @@ -6,14 +6,14 @@ class="form-control url">