Fix types per review comment

elastic · Dec 1, 2020 · 5b84ce1 · 5b84ce1
1 parent 1cb8e36
commit 5b84ce1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_editor.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { IndexPatternDimensionEditorProps } from './dimension_panel';
 import { OperationSupportMatrix } from './operation_support';
-import { IndexPatternColumn, OperationType } from '../indexpattern';
+import { IndexPatternColumn } from '../indexpattern';
 import {
   operationDefinitionMap,
   getOperationDisplay,
@@ -113,7 +113,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
     selectedColumn && operationDefinitionMap[selectedColumn.operationType];
 
   const incompleteInfo = (state.layers[layerId].incompleteColumns ?? {})[columnId];
-  const incompleteOperation = (incompleteInfo?.operationType as OperationType) ?? null;
+  const incompleteOperation = incompleteInfo?.operationType;
   const incompleteField = incompleteInfo?.sourceField ?? null;
 
   const ParamEditor = selectedOperationDefinition?.paramEditor;

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
@@ -33,9 +33,9 @@ export interface FieldChoice {
 
 export interface FieldSelectProps extends EuiComboBoxProps<{}> {
   currentIndexPattern: IndexPattern;
-  incompleteOperation: OperationType | null;
   selectedOperationType?: OperationType;
   selectedField?: string;
+  incompleteOperation?: OperationType;
   operationSupportMatrix: OperationSupportMatrix;
   onChoose: (choice: FieldChoice) => void;
   onDeleteColumn: () => void;

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -1002,8 +1002,8 @@ describe('IndexPattern Data Source', () => {
             columnOrder: [],
             columns: {},
             incompleteColumns: {
-              col1: { operationType: 'avg' },
-              col2: { operationType: 'sum' },
+              col1: { operationType: 'avg' as const },
+              col2: { operationType: 'sum' as const },
             },
           },
         },

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts
@@ -6,6 +6,7 @@
 
 import type { Operation } from '../../../types';
 import { TimeScaleUnit } from '../../time_scale';
+import type { OperationType } from '../definitions';
 
 export interface BaseIndexPatternColumn extends Operation {
   // Private
@@ -39,6 +40,6 @@ export interface ReferenceBasedIndexPatternColumn
 
 // Used to store the temporary invalid state
 export interface IncompleteColumn {
-  operationType?: string;
+  operationType?: OperationType;
   sourceField?: string;
 }