Address review feedback

elastic · Nov 25, 2019 · 2d1da99 · 2d1da99
1 parent 0dcc9c9
commit 2d1da99
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
@@ -202,8 +202,8 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
       return getTime(indexPattern, this.input.timeRange);
     });
 
-    this.filtersSearchSource = searchSource.create()!;
-    this.filtersSearchSource!.setParent(timeRangeSearchSource);
+    this.filtersSearchSource = searchSource.create();
+    this.filtersSearchSource.setParent(timeRangeSearchSource);
 
     searchSource.setParent(this.filtersSearchSource);
 

diff --git a/src/legacy/ui/public/agg_types/buckets/terms.ts b/src/legacy/ui/public/agg_types/buckets/terms.ts
@@ -20,12 +20,11 @@
 import chrome from 'ui/chrome';
 import { noop } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { SearchSource } from '../../courier';
+import { SearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
 import { BucketAggType, BucketAggParam } from './_bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { AggConfigOptions } from '../agg_config';
 import { IBucketAggConfig } from './_bucket_agg_type';
-import { getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
 import { createFilterTerms } from './create_filter/terms';
 import { wrapWithInlineComp } from './inline_comp_wrapper';
 import { isStringType, migrateIncludeExcludeFormat } from './migrate_include_exclude_format';

diff --git a/src/legacy/ui/public/courier/fetch/call_client.ts b/src/legacy/ui/public/courier/fetch/call_client.ts
@@ -49,7 +49,7 @@ export function callClient(
     const searchStrategy = getSearchStrategyById(searchStrategyId);
     const requests = searchStrategyMap[searchStrategyId];
 
-    const { searching, abort } = searchStrategy!.search({
+    const { searching, abort } = searchStrategy.search({
       searchRequests: requests,
       es,
       config,

diff --git a/src/legacy/ui/public/courier/fetch/errors.ts b/src/legacy/ui/public/courier/fetch/errors.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { SearchError } from '../../courier';
 import { KbnError } from '../../../../../plugins/kibana_utils/public';
 import { SearchResponse } from '../types';
 /**
@@ -26,9 +27,8 @@ import { SearchResponse } from '../types';
  */
 export class RequestFailure extends KbnError {
   public resp: SearchResponse;
-  constructor(err: any, resp?: SearchResponse) {
-    err = err || false;
-    super(`Request to Elasticsearch failed: ${JSON.stringify(resp || err.message)}`);
+  constructor(err: SearchError | null = null, resp?: SearchResponse) {
+    super(`Request to Elasticsearch failed: ${JSON.stringify(resp || err?.message)}`);
 
     this.resp = resp;
   }

diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.ts b/src/legacy/ui/public/courier/fetch/fetch_soon.ts
@@ -30,7 +30,7 @@ export async function fetchSoon(
   options: FetchOptions,
   { es, config, esShardTimeout }: FetchHandlers
 ) {
-  const msToDelay = config!.get('courier:batchSearches') ? 50 : 0;
+  const msToDelay = config.get('courier:batchSearches') ? 50 : 0;
   return delayedFetch(request, options, { es, config, esShardTimeout }, msToDelay);
 }
 

diff --git a/src/legacy/ui/public/courier/search_source/search_source.test.ts b/src/legacy/ui/public/courier/search_source/search_source.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { SearchSource } from '../search_source';
-import { IndexPattern } from '../../../../core_plugins/data/public/index_patterns';
+import { IndexPattern } from '../../../../core_plugins/data/public';
 
 jest.mock('ui/new_platform');
 

diff --git a/src/legacy/ui/public/courier/search_source/types.ts b/src/legacy/ui/public/courier/search_source/types.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 import { NameList } from 'elasticsearch';
-import { esFilters } from '../../../../../plugins/data/public';
-import { Query } from '../../../../../plugins/data/common/query';
+import { esFilters, Query } from '../../../../../plugins/data/public';
 import { IndexPattern } from '../../../../core_plugins/data/public/index_patterns';
 
 export type EsQuerySearchAfter = [string | number, string | number];

diff --git a/src/legacy/ui/public/courier/search_strategy/search_error.ts b/src/legacy/ui/public/courier/search_strategy/search_error.ts
@@ -54,7 +54,7 @@ export class SearchError extends Error {
   }
 }
 
-export function getSearchErrorType({ message }: { message: string }) {
+export function getSearchErrorType({ message }: Pick<SearchError, 'message'>) {
   const msg = message.toLowerCase();
   if (msg.indexOf('unsupported query') > -1) {
     return 'UNSUPPORTED_QUERY';

diff --git a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts b/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts
@@ -39,9 +39,10 @@ export const getSearchStrategyByViability = (indexPattern: IndexPattern) => {
 };
 
 export const getSearchStrategyById = (searchStrategyId: string) => {
-  return [...searchStrategies, noOpSearchStrategy].find(searchStrategy => {
-    return searchStrategy.id === searchStrategyId;
+  const searchStrategy = [...searchStrategies, noOpSearchStrategy].find(({ id }) => {
+    return id === searchStrategyId;
   });
+  return searchStrategy ?? noOpSearchStrategy;
 };
 
 export const getSearchStrategyForSearchRequest = (