From 8354bce72add9070d69e2cca9ad4e6c8eb60bcad Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 23 Feb 2016 00:21:38 -0800 Subject: [PATCH] [courier] rename providers --- src/ui/public/agg_types/buckets/filters.js | 4 +- src/ui/public/config/config.js | 4 +- src/ui/public/courier/courier.js | 51 ++++++++++--------- .../data_source/__tests__/decorate_query.js | 4 +- .../__tests__/normalize_sort_request.js | 6 +-- .../public/courier/data_source/_abstract.js | 19 ++++--- .../courier/data_source/_decorate_query.js | 1 + .../courier/data_source/_doc_send_to_es.js | 9 ++-- .../data_source/_normalize_sort_request.js | 2 +- .../data_source/_root_search_source.js | 4 +- .../public/courier/data_source/doc_source.js | 18 ++++--- .../courier/data_source/search_source.js | 24 +++++---- src/ui/public/courier/looper/_looper.js | 6 ++- src/ui/public/courier/looper/doc.js | 14 ++--- src/ui/public/courier/looper/search.js | 16 +++--- .../courier/saved_object/saved_object.js | 17 ++++--- .../__tests__/_index_pattern.js | 4 +- .../public/index_patterns/_index_pattern.js | 4 +- src/ui/public/parse_query/lib/from_user.js | 4 +- 19 files changed, 114 insertions(+), 97 deletions(-) diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js index b5f5fd4c01e3a..af54504c8fa31 100644 --- a/src/ui/public/agg_types/buckets/filters.js +++ b/src/ui/public/agg_types/buckets/filters.js @@ -2,12 +2,12 @@ import _ from 'lodash'; import angular from 'angular'; import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type'; import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/create_filter/filters'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; +import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; import filtersTemplate from 'ui/agg_types/controls/filters.html'; export default function FiltersAggDefinition(Private, Notifier) { var BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider); var createFilter = Private(AggTypesBucketsCreateFilterFiltersProvider); - var decorateQuery = Private(CourierDataSourceDecorateQueryProvider); + var decorateQuery = Private(DecorateQueryProvider); var notif = new Notifier({ location: 'Filters Agg' }); return new BucketAggType({ diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js index 486e5c4929b20..8bb289a0aae7f 100644 --- a/src/ui/public/config/config.js +++ b/src/ui/public/config/config.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import ConfigDefaultsProvider from 'ui/config/defaults'; import ConfigDelayedUpdaterProvider from 'ui/config/_delayed_updater'; import ConfigValsProvider from 'ui/config/_vals'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; +import DocSourceProvider from 'ui/courier/data_source/doc_source'; import uiRoutes from 'ui/routes'; import uiModules from 'ui/modules'; import Notifier from 'ui/notify/notifier'; @@ -30,7 +30,7 @@ module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, bu // update once it is requested by calling #set() or #clear(). var updater; - var DocSource = Private(CourierDataSourceDocSourceProvider); + var DocSource = Private(DocSourceProvider); var doc = (new DocSource()) .index(kbnIndex) .type('config') diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js index 6fdc80e00d4d5..486d5bcb20e88 100644 --- a/src/ui/public/courier/courier.js +++ b/src/ui/public/courier/courier.js @@ -1,45 +1,48 @@ -import errors from 'ui/errors'; import _ from 'lodash'; + +import errors from 'ui/errors'; import 'ui/es'; import 'ui/promises'; import 'ui/safe_confirm'; import 'ui/index_patterns'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierErrorHandlersProvider from 'ui/courier/_error_handlers'; -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierLooperDocProvider from 'ui/courier/looper/doc'; -import CourierLooperSearchProvider from 'ui/courier/looper/search'; -import CourierDataSourceRootSearchSourceProvider from 'ui/courier/data_source/_root_search_source'; -import CourierSavedObjectSavedObjectProvider from 'ui/courier/saved_object/saved_object'; -import CourierRedirectWhenMissingProvider from 'ui/courier/_redirect_when_missing'; import uiModules from 'ui/modules'; +import Notifier from 'ui/notify/notifier'; + +import DocSourceProvider from './data_source/doc_source'; +import SearchSourceProvider from './data_source/search_source'; +import SearchStrategyProvider from './fetch/strategy/search'; +import RequestQueueProvider from './_request_queue'; +import ErrorHandlersProvider from './_error_handlers'; +import FetchProvider from './fetch'; +import DocLooperProvider from './looper/doc'; +import SearchLooperProvider from './looper/search'; +import RootSearchSourceProvider from './data_source/_root_search_source'; +import SavedObjectProvider from './saved_object'; +import RedirectWhenMissingProvider from './_redirect_when_missing'; uiModules.get('kibana/courier') -.service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) { +.service('courier', function ($rootScope, Private, Promise, indexPatterns) { function Courier() { var self = this; - var DocSource = Private(CourierDataSourceDocSourceProvider); - var SearchSource = Private(CourierDataSourceSearchSourceProvider); - var searchStrategy = Private(CourierFetchStrategySearchProvider); + var DocSource = Private(DocSourceProvider); + var SearchSource = Private(SearchSourceProvider); + var searchStrategy = Private(SearchStrategyProvider); - var requestQueue = Private(CourierRequestQueueProvider); - var errorHandlers = Private(CourierErrorHandlersProvider); + var requestQueue = Private(RequestQueueProvider); + var errorHandlers = Private(ErrorHandlersProvider); - var fetch = Private(CourierFetchFetchProvider); - var docLooper = self.docLooper = Private(CourierLooperDocProvider); - var searchLooper = self.searchLooper = Private(CourierLooperSearchProvider); + var fetch = Private(FetchProvider); + var docLooper = self.docLooper = Private(DocLooperProvider); + var searchLooper = self.searchLooper = Private(SearchLooperProvider); // expose some internal modules - self.setRootSearchSource = Private(CourierDataSourceRootSearchSourceProvider).set; + self.setRootSearchSource = Private(RootSearchSourceProvider).set; - self.SavedObject = Private(CourierSavedObjectSavedObjectProvider); + self.SavedObject = Private(SavedObjectProvider); self.indexPatterns = indexPatterns; - self.redirectWhenMissing = Private(CourierRedirectWhenMissingProvider); + self.redirectWhenMissing = Private(RedirectWhenMissingProvider); self.DocSource = DocSource; self.SearchSource = SearchSource; diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js index 68faabfe947eb..c6aab0007cd88 100644 --- a/src/ui/public/courier/data_source/__tests__/decorate_query.js +++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js @@ -2,7 +2,7 @@ import moment from 'moment'; import expect from 'expect.js'; import ngMock from 'ngMock'; import _ from 'lodash'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; +import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; describe('Query decorator', function () { @@ -29,7 +29,7 @@ describe('Query decorator', function () { beforeEach(ngMock.inject(function (Private, $injector, _config_) { config = _config_; - fn = Private(CourierDataSourceDecorateQueryProvider); + fn = Private(DecorateQueryProvider); })); it('should be a function', function () { diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js index 1c255c8383db5..00cdcc8f26052 100644 --- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js +++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js @@ -1,19 +1,17 @@ import 'ui/private'; import ngMock from 'ngMock'; import expect from 'expect.js'; -import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request'; +import NormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; describe('SearchSource#normalizeSortRequest', function () { - - var normalizeSortRequest; var indexPattern; var normalizedSort; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { - normalizeSortRequest = Private(CourierDataSourceNormalizeSortRequestProvider); + normalizeSortRequest = Private(NormalizeSortRequestProvider); indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); normalizedSort = [{ diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js index 0475e2cd32a0a..d666db7ff5c55 100644 --- a/src/ui/public/courier/data_source/_abstract.js +++ b/src/ui/public/courier/data_source/_abstract.js @@ -1,14 +1,17 @@ import _ from 'lodash'; import angular from 'angular'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierErrorHandlersProvider from 'ui/courier/_error_handlers'; -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; + +import 'ui/promises'; + +import RequestQueueProvider from '../_request_queue'; +import ErrorHandlersProvider from '../_error_handlers'; +import FetchProvider from '../fetch'; +import DecorateQueryProvider from './_decorate_query'; export default function SourceAbstractFactory(Private, Promise, PromiseEmitter) { - var requestQueue = Private(CourierRequestQueueProvider); - var errorHandlers = Private(CourierErrorHandlersProvider); - var courierFetch = Private(CourierFetchFetchProvider); + var requestQueue = Private(RequestQueueProvider); + var errorHandlers = Private(ErrorHandlersProvider); + var courierFetch = Private(FetchProvider); function SourceAbstract(initialState, strategy) { var self = this; @@ -268,7 +271,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter) .then(function () { if (type === 'search') { // This is down here to prevent the circular dependency - var decorateQuery = Private(CourierDataSourceDecorateQueryProvider); + var decorateQuery = Private(DecorateQueryProvider); flatState.body = flatState.body || {}; diff --git a/src/ui/public/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js index 4de2f9c8258c7..a97740b0508ba 100644 --- a/src/ui/public/courier/data_source/_decorate_query.js +++ b/src/ui/public/courier/data_source/_decorate_query.js @@ -1,4 +1,5 @@ import _ from 'lodash'; + export default function DecorateQuery(config) { /** * Decorate queries with default parameters diff --git a/src/ui/public/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js index 2b1652e8bcc8a..97a2ce64004e2 100644 --- a/src/ui/public/courier/data_source/_doc_send_to_es.js +++ b/src/ui/public/courier/data_source/_doc_send_to_es.js @@ -1,11 +1,12 @@ import _ from 'lodash'; + import errors from 'ui/errors'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; +import RequestQueueProvider from 'ui/courier/_request_queue'; +import FetchProvider from 'ui/courier/fetch/fetch'; export default function (Promise, Private, es) { - var requestQueue = Private(CourierRequestQueueProvider); - var courierFetch = Private(CourierFetchFetchProvider); + var requestQueue = Private(RequestQueueProvider); + var courierFetch = Private(FetchProvider); /** * Backend for doUpdate and doIndex diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js index 220ca70c6fa30..f43a4fc2ccbe3 100644 --- a/src/ui/public/courier/data_source/_normalize_sort_request.js +++ b/src/ui/public/courier/data_source/_normalize_sort_request.js @@ -1,4 +1,5 @@ import _ from 'lodash'; + export default function normalizeSortRequest(config) { var defaultSortOptions = config.get('sort:options'); @@ -48,4 +49,3 @@ export default function normalizeSortRequest(config) { return normalized; } }; - diff --git a/src/ui/public/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js index 385cdea478472..128f922b8a6cf 100644 --- a/src/ui/public/courier/data_source/_root_search_source.js +++ b/src/ui/public/courier/data_source/_root_search_source.js @@ -1,7 +1,7 @@ -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; +import SearchSourceProvider from 'ui/courier/data_source/search_source'; export default function RootSearchSource(Private, $rootScope, timefilter, Notifier) { - var SearchSource = Private(CourierDataSourceSearchSourceProvider); + var SearchSource = Private(SearchSourceProvider); var notify = new Notifier({ location: 'Root Search Source' }); diff --git a/src/ui/public/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js index 6d93ac0c5b9c2..c2725309bfb7e 100644 --- a/src/ui/public/courier/data_source/doc_source.js +++ b/src/ui/public/courier/data_source/doc_source.js @@ -1,16 +1,18 @@ import _ from 'lodash'; -import CourierDataSourceDocSendToEsProvider from 'ui/courier/data_source/_doc_send_to_es'; -import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract'; -import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc'; -import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc'; + import 'ui/es'; import 'ui/storage'; +import DocSendToEsProvider from './_doc_send_to_es'; +import AbstractDataSourceProvider from './_abstract'; +import DocRequestProvider from '../fetch/request/doc'; +import DocStrategyProvider from '../fetch/strategy/doc'; + export default function DocSourceFactory(Private, Promise, es, sessionStorage) { - var sendToEs = Private(CourierDataSourceDocSendToEsProvider); - var SourceAbstract = Private(CourierDataSourceAbstractProvider); - var DocRequest = Private(CourierFetchRequestDocProvider); - var docStrategy = Private(CourierFetchStrategyDocProvider); + var sendToEs = Private(DocSendToEsProvider); + var SourceAbstract = Private(AbstractDataSourceProvider); + var DocRequest = Private(DocRequestProvider); + var docStrategy = Private(DocStrategyProvider); _.class(DocSource).inherits(SourceAbstract); function DocSource(initialState) { diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js index c01f606376c04..0cd2a14d749be 100644 --- a/src/ui/public/courier/data_source/search_source.js +++ b/src/ui/public/courier/data_source/search_source.js @@ -1,16 +1,18 @@ import _ from 'lodash'; -import rootSearchSource from 'ui/courier/data_source/_root_search_source'; -import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract'; -import CourierFetchRequestSearchProvider from 'ui/courier/fetch/request/search'; -import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request'; + +import NormalizeSortRequestProvider from './_normalize_sort_request'; +import rootSearchSource from './_root_search_source'; +import AbstractDataSourceProvider from './_abstract'; +import SearchRequestProvider from '../fetch/request/search'; +import SegmentedRequestProvider from '../fetch/request/segmented'; +import SearchStrategyProvider from '../fetch/strategy/search'; + export default function SearchSourceFactory(Promise, Private) { - var SourceAbstract = Private(CourierDataSourceAbstractProvider); - var SearchRequest = Private(CourierFetchRequestSearchProvider); - var SegmentedRequest = Private(CourierFetchRequestSegmentedProvider); - var searchStrategy = Private(CourierFetchStrategySearchProvider); - var normalizeSortRequest = Private(CourierDataSourceNormalizeSortRequestProvider); + var SourceAbstract = Private(AbstractDataSourceProvider); + var SearchRequest = Private(SearchRequestProvider); + var SegmentedRequest = Private(SegmentedRequestProvider); + var searchStrategy = Private(SearchStrategyProvider); + var normalizeSortRequest = Private(NormalizeSortRequestProvider); _.class(SearchSource).inherits(SourceAbstract); function SearchSource(initialState) { diff --git a/src/ui/public/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js index 1f76b872407d2..fcb25511e6a14 100644 --- a/src/ui/public/courier/looper/_looper.js +++ b/src/ui/public/courier/looper/_looper.js @@ -1,5 +1,9 @@ import _ from 'lodash'; -export default function LooperFactory($timeout, Notifier, Promise) { + +import 'ui/promises'; +import Notifier from 'ui/notify/notifier'; + +export default function LooperFactory($timeout, Promise) { var notify = new Notifier(); function Looper(ms, fn) { diff --git a/src/ui/public/courier/looper/doc.js b/src/ui/public/courier/looper/doc.js index 0a37f334fca7e..a1c6104ce20aa 100644 --- a/src/ui/public/courier/looper/doc.js +++ b/src/ui/public/courier/looper/doc.js @@ -1,18 +1,18 @@ -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierLooperLooperProvider from 'ui/courier/looper/_looper'; -import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc'; +import FetchProvider from '../fetch'; +import LooperProvider from './_looper'; +import DocStrategyProvider from '../fetch/strategy/doc'; export default function DocLooperService(Private) { - var fetch = Private(CourierFetchFetchProvider); - var Looper = Private(CourierLooperLooperProvider); - var docStrategy = Private(CourierFetchStrategyDocProvider); + var fetch = Private(FetchProvider); + var Looper = Private(LooperProvider); + var DocStrategy = Private(DocStrategyProvider); /** * The Looper which will manage the doc fetch interval * @type {Looper} */ var docLooper = new Looper(1500, function () { - fetch.fetchQueued(docStrategy); + fetch.fetchQueued(DocStrategy); }); return docLooper; diff --git a/src/ui/public/courier/looper/search.js b/src/ui/public/courier/looper/search.js index a3f5dfd57e3b9..cb3914c601c0e 100644 --- a/src/ui/public/courier/looper/search.js +++ b/src/ui/public/courier/looper/search.js @@ -1,14 +1,14 @@ -import CourierFetchFetchProvider from 'ui/courier/fetch/fetch'; -import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search'; -import CourierRequestQueueProvider from 'ui/courier/_request_queue'; -import CourierLooperLooperProvider from 'ui/courier/looper/_looper'; +import FetchProvider from '../fetch'; +import SearchStrategyProvider from '../fetch/strategy/search'; +import RequestQueueProvider from '../_request_queue'; +import LooperProvider from './_looper'; export default function SearchLooperService(Private, Promise, Notifier, $rootScope) { - var fetch = Private(CourierFetchFetchProvider); - var searchStrategy = Private(CourierFetchStrategySearchProvider); - var requestQueue = Private(CourierRequestQueueProvider); + var fetch = Private(FetchProvider); + var searchStrategy = Private(SearchStrategyProvider); + var requestQueue = Private(RequestQueueProvider); - var Looper = Private(CourierLooperLooperProvider); + var Looper = Private(LooperProvider); var notif = new Notifier({ location: 'Search Looper' }); /** diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js index ea568383410c1..4aae5a210cd18 100644 --- a/src/ui/public/courier/saved_object/saved_object.js +++ b/src/ui/public/courier/saved_object/saved_object.js @@ -1,15 +1,18 @@ import angular from 'angular'; -import errors from 'ui/errors'; import _ from 'lodash'; + +import errors from 'ui/errors'; import slugifyId from 'ui/utils/slugify_id'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; -import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source'; -import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; +import MappingSetupProvider from 'ui/utils/mapping_setup'; + +import DocSourceProvider from '../data_source/doc_source'; +import SearchSourceProvider from '../data_source/search_source'; + export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, safeConfirm, indexPatterns) { - var DocSource = Private(CourierDataSourceDocSourceProvider); - var SearchSource = Private(CourierDataSourceSearchSourceProvider); - var mappingSetup = Private(UtilsMappingSetupProvider); + var DocSource = Private(DocSourceProvider); + var SearchSource = Private(SearchSourceProvider); + var mappingSetup = Private(MappingSetupProvider); function SavedObject(config) { if (!_.isObject(config)) config = {}; diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js index 79585e3728c1a..d8785a8c714af 100644 --- a/src/ui/public/index_patterns/__tests__/_index_pattern.js +++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js @@ -7,7 +7,7 @@ import errors from 'ui/errors'; import IndexedArray from 'ui/IndexedArray'; import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields'; import FixturesStubbedDocSourceResponseProvider from 'fixtures/stubbed_doc_source_response'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; +import DocSourceProvider from 'ui/courier/data_source/doc_source'; import IndexPatternsMapperProvider from 'ui/index_patterns/_mapper'; import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; @@ -33,7 +33,7 @@ describe('index pattern', function () { mockLogstashFields = Private(FixturesLogstashFieldsProvider); docSourceResponse = Private(FixturesStubbedDocSourceResponseProvider); - DocSource = Private(CourierDataSourceDocSourceProvider); + DocSource = Private(DocSourceProvider); sinon.stub(DocSource.prototype, 'doIndex'); sinon.stub(DocSource.prototype, 'fetch'); diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js index f673b356be337..5cf219dbc67d1 100644 --- a/src/ui/public/index_patterns/_index_pattern.js +++ b/src/ui/public/index_patterns/_index_pattern.js @@ -7,7 +7,7 @@ import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; import IndexPatternsGetIdsProvider from 'ui/index_patterns/_get_ids'; import IndexPatternsMapperProvider from 'ui/index_patterns/_mapper'; import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals'; -import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source'; +import DocSourceProvider from 'ui/courier/data_source/doc_source'; import UtilsMappingSetupProvider from 'ui/utils/mapping_setup'; import IndexPatternsFieldListProvider from 'ui/index_patterns/_field_list'; import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit'; @@ -19,7 +19,7 @@ export default function IndexPatternFactory(Private, timefilter, Notifier, confi var getIds = Private(IndexPatternsGetIdsProvider); var mapper = Private(IndexPatternsMapperProvider); var intervals = Private(IndexPatternsIntervalsProvider); - var DocSource = Private(CourierDataSourceDocSourceProvider); + var DocSource = Private(DocSourceProvider); var mappingSetup = Private(UtilsMappingSetupProvider); var FieldList = Private(IndexPatternsFieldListProvider); diff --git a/src/ui/public/parse_query/lib/from_user.js b/src/ui/public/parse_query/lib/from_user.js index 42f76da0b16b1..c2eefd85c483a 100644 --- a/src/ui/public/parse_query/lib/from_user.js +++ b/src/ui/public/parse_query/lib/from_user.js @@ -1,7 +1,7 @@ import _ from 'lodash'; -import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; +import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query'; export default function GetQueryFromUser(es, Private) { - var decorateQuery = Private(CourierDataSourceDecorateQueryProvider); + var decorateQuery = Private(DecorateQueryProvider); /** * Take text from the user and make it into a query object