fix PR comments

elastic · Dec 17, 2019 · 8c3324f · 8c3324f
1 parent 1fcf01e
commit 8c3324f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -21,7 +21,7 @@ import { get, map } from 'lodash';
 import { schema } from '@kbn/config-schema';
 import { APICaller, IRouter, KibanaRequest } from 'kibana/server';
 
-import { IFieldType, indexPatternsUtils, esFilters } from '../index';
+import { IFieldType, indexPatterns, esFilters } from '../index';
 
 export function registerValueSuggestionsRoute(
   router: IRouter,
@@ -57,12 +57,12 @@ export function registerValueSuggestionsRoute(
         terminate_after: await uiSettings.get<number>('kibana.autocompleteTerminateAfter'),
       };
 
-      const indexPattern = await indexPatternsUtils.findIndexPatternById(
+      const indexPattern = await indexPatterns.findIndexPatternById(
         context.core.savedObjects.client,
         index
       );
 
-      const field = indexPatternsUtils.getFieldByName(fieldName, indexPattern);
+      const field = indexPattern && indexPatterns.getFieldByName(fieldName, indexPattern);
       const body = await getBody(autocompleteSearchOptions, field || fieldName, query, boolFilter);
 
       try {

diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
@@ -57,7 +57,7 @@ export {
   IndexPatternsFetcher,
   FieldDescriptor,
   shouldReadFieldFromDocValues,
-  indexPatternsUtils,
+  indexPatterns,
 } from './index_patterns';
 export * from './search';
 export {

diff --git a/src/plugins/data/server/index_patterns/index.ts b/src/plugins/data/server/index_patterns/index.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as indexPatternsUtils from './utils';
+import * as indexPatterns from './utils';
 
 export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues } from './fetcher';
 export { IndexPatternsService } from './index_patterns_service';
-export { indexPatternsUtils };
+export { indexPatterns };
diff --git a/src/plugins/data/server/index_patterns/utils.ts b/src/plugins/data/server/index_patterns/utils.ts
@@ -22,16 +22,12 @@ import { IIndexPattern, IFieldType } from '../../common';
 
 export const getFieldByName = (
   fieldName: string,
-  indexPattern?: IIndexPattern
+  indexPattern: IIndexPattern
 ): IFieldType | undefined => {
-  if (indexPattern) {
-    const fields: IFieldType[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
-    const field = fields && fields.find(f => f.name === fieldName);
+  const fields: IFieldType[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
+  const field = fields && fields.find(f => f.name === fieldName);
 
-    if (field) {
-      return field;
-    }
-  }
+  return field;
 };
 
 export const findIndexPatternById = async (