Replace index pattern null type with undefined

Author: DianaDerevyankina

src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts

@@ -48,7 +48,7 @@ describe('FilterManager', function () {
     let filterManager: FilterManagerTest;
     beforeEach(() => {
       kbnFilters = [];
-      filterManager = new FilterManagerTest(controlId, 'field1', indexPatternMock, queryFilterMock);
+      filterManager = new FilterManagerTest(controlId, 'field1', queryFilterMock, indexPatternMock);
     });
 
     test('should not find filters that are not controlled by any visualization', function () {

src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts

@@ -25,8 +25,8 @@ export abstract class FilterManager {
   constructor(
     public controlId: string,
     public fieldName: string,
-    public indexPattern: IndexPattern | null,
-    public queryFilter: QueryFilterManager
+    public queryFilter: QueryFilterManager,
+    public indexPattern?: IndexPattern
   ) {}
 
   /**
@@ -41,7 +41,7 @@ export abstract class FilterManager {
 
   abstract getValueFromFilterBar(): any;
 
-  getIndexPattern(): IndexPattern | null {
+  getIndexPattern(): IndexPattern | undefined {
     return this.indexPattern;
   }
 

src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts

@@ -48,8 +48,8 @@ describe('PhraseFilterManager', function () {
       filterManager = new PhraseFilterManager(
         controlId,
         'field1',
-        indexPatternMock,
-        queryFilterMock
+        queryFilterMock,
+        indexPatternMock
       );
     });
 
@@ -89,10 +89,10 @@ describe('PhraseFilterManager', function () {
       constructor(
         id: string,
         fieldName: string,
-        indexPattern: IndexPattern,
-        queryFilter: QueryFilterManager
+        queryFilter: QueryFilterManager,
+        indexPattern?: IndexPattern
       ) {
-        super(id, fieldName, indexPattern, queryFilter);
+        super(id, fieldName, queryFilter, indexPattern);
         this.mockFilters = [];
       }
 
@@ -112,8 +112,8 @@ describe('PhraseFilterManager', function () {
       filterManager = new MockFindFiltersPhraseFilterManager(
         controlId,
         'field1',
-        indexPatternMock,
-        queryFilterMock
+        queryFilterMock,
+        indexPatternMock
       );
     });
 

src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts

@@ -31,25 +31,25 @@ export class PhraseFilterManager extends FilterManager {
   constructor(
     controlId: string,
     fieldName: string,
-    indexPattern: IndexPattern | null,
-    queryFilter: QueryFilterManager
+    queryFilter: QueryFilterManager,
+    indexPattern?: IndexPattern
   ) {
-    super(controlId, fieldName, indexPattern, queryFilter);
+    super(controlId, fieldName, queryFilter, indexPattern);
   }
 
   createFilter(phrases: any): PhraseFilter {
-    if (!this.indexPattern) return {} as PhraseFilter;
+    const indexPattern = this.indexPattern!;
     let newFilter: PhraseFilter;
-    const value = this.indexPattern.fields.getByName(this.fieldName);
+    const value = indexPattern.fields.getByName(this.fieldName);
 
     if (!value) {
       throw new Error(`Unable to find field with name: ${this.fieldName} on indexPattern`);
     }
 
     if (phrases.length === 1) {
-      newFilter = esFilters.buildPhraseFilter(value, phrases[0], this.indexPattern);
+      newFilter = esFilters.buildPhraseFilter(value, phrases[0], indexPattern);
     } else {
-      newFilter = esFilters.buildPhrasesFilter(value, phrases, this.indexPattern);
+      newFilter = esFilters.buildPhrasesFilter(value, phrases, indexPattern);
     }
 
     newFilter.meta.key = this.fieldName;

src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts

@@ -52,8 +52,8 @@ describe('RangeFilterManager', function () {
       filterManager = new RangeFilterManager(
         controlId,
         'field1',
-        indexPatternMock,
-        queryFilterMock
+        queryFilterMock,
+        indexPatternMock
       );
     });
 
@@ -75,10 +75,10 @@ describe('RangeFilterManager', function () {
       constructor(
         id: string,
         fieldName: string,
-        indexPattern: IndexPattern,
-        queryFilter: QueryFilterManager
+        queryFilter: QueryFilterManager,
+        indexPattern?: IndexPattern
       ) {
-        super(id, fieldName, indexPattern, queryFilter);
+        super(id, fieldName, queryFilter, indexPattern);
         this.mockFilters = [];
       }
 
@@ -98,8 +98,8 @@ describe('RangeFilterManager', function () {
       filterManager = new MockFindFiltersRangeFilterManager(
         controlId,
         'field1',
-        indexPatternMock,
-        queryFilterMock
+        queryFilterMock,
+        indexPatternMock
       );
     });
 

src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts

@@ -61,12 +61,12 @@ export class RangeFilterManager extends FilterManager {
    * @return {object} range filter
    */
   createFilter(value: SliderValue): RangeFilter {
-    if (!this.indexPattern) return {} as RangeFilter;
+    const indexPattern = this.indexPattern!;
     const newFilter = esFilters.buildRangeFilter(
       // TODO: Fix type to be required
-      this.indexPattern.fields.getByName(this.fieldName) as IFieldType,
+      indexPattern.fields.getByName(this.fieldName) as IFieldType,
       toRange(value),
-      this.indexPattern
+      indexPattern
     );
     newFilter.meta.key = this.fieldName;
     newFilter.meta.controlledBy = this.controlId;

src/plugins/input_control_vis/public/control/list_control_factory.ts

@@ -218,7 +218,7 @@ export async function listControlFactory(
   try {
     indexPattern = await dataPluginStart.indexPatterns.get(controlParams.indexPattern);
   } catch (e) {
-    indexPattern = null;
+    // invalid index pattern id
   }
 
   // dynamic options are only allowed on String fields but the setting defaults to true so it could
@@ -234,8 +234,8 @@ export async function listControlFactory(
     new PhraseFilterManager(
       controlParams.id,
       controlParams.fieldName,
-      indexPattern,
-      deps.data.query.filterManager
+      deps.data.query.filterManager,
+      indexPattern
     ),
     useTimeFilter,
     dataPluginStart.search.searchSource,

src/plugins/input_control_vis/public/control/range_control_factory.ts

@@ -139,16 +139,16 @@ export async function rangeControlFactory(
   try {
     indexPattern = await dataPluginStart.indexPatterns.get(controlParams.indexPattern);
   } catch (e) {
-    indexPattern = null;
+    // invalid index pattern id
   }
 
   return new RangeControl(
     controlParams,
     new RangeFilterManager(
       controlParams.id,
       controlParams.fieldName,
-      indexPattern,
-      deps.data.query.filterManager
+      deps.data.query.filterManager,
+      indexPattern
     ),
     useTimeFilter,
     dataPluginStart.search.searchSource,