get rid of giant union type

elastic · Nov 17, 2021 · e6426f9 · e6426f9
1 parent 349434e
commit e6426f9
Show file tree

Hide file tree

Showing 54 changed files with 812 additions and 749 deletions.
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
@@ -31,8 +31,6 @@ export type { DatatableVisualizationState } from './datatable_visualization/visu
 export type {
   IndexPatternPersistedState,
   PersistedIndexPatternLayer,
-  IndexPatternColumn,
-  FieldBasedIndexPatternColumn,
   OperationType,
   IncompleteColumn,
   FiltersIndexPatternColumn,

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
@@ -26,6 +26,7 @@ import { fieldFormatsServiceMock } from '../../../../../src/plugins/field_format
 import { indexPatternFieldEditorPluginMock } from '../../../../../src/plugins/index_pattern_field_editor/public/mocks';
 import { getFieldByNameFactory } from './pure_helpers';
 import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
+import { TermsIndexPatternColumn } from './operations';
 
 const fieldsOne = [
   {
@@ -173,7 +174,7 @@ const initialState: IndexPatternPrivateState = {
               type: 'alphabetical',
             },
           },
-        },
+        } as TermsIndexPatternColumn,
         col2: {
           label: 'My Op',
           dataType: 'number',
@@ -200,7 +201,7 @@ const initialState: IndexPatternPrivateState = {
               type: 'alphabetical',
             },
           },
-        },
+        } as TermsIndexPatternColumn,
         col2: {
           label: 'My Op',
           dataType: 'number',

diff --git a/...lugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx b/...lugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.test.tsx
@@ -8,7 +8,7 @@
 import { mount } from 'enzyme';
 import React from 'react';
 import { BucketNestingEditor } from './bucket_nesting_editor';
-import { IndexPatternColumn } from '../indexpattern';
+import { GenericIndexPatternColumn } from '../indexpattern';
 import { IndexPatternField } from '../types';
 
 const fieldMap: Record<string, IndexPatternField> = {
@@ -20,7 +20,7 @@ const fieldMap: Record<string, IndexPatternField> = {
 const getFieldByName = (name: string): IndexPatternField | undefined => fieldMap[name];
 
 describe('BucketNestingEditor', () => {
-  function mockCol(col: Partial<IndexPatternColumn> = {}): IndexPatternColumn {
+  function mockCol(col: Partial<GenericIndexPatternColumn> = {}): GenericIndexPatternColumn {
     const result = {
       dataType: 'string',
       isBucketed: true,
@@ -35,7 +35,7 @@ describe('BucketNestingEditor', () => {
       ...col,
     };
 
-    return result as IndexPatternColumn;
+    return result as GenericIndexPatternColumn;
   }
 
   it('should display the top level grouping when at the root', () => {

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/bucket_nesting_editor.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiSwitch, EuiSelect } from '@elastic/eui';
 import { IndexPatternLayer, IndexPatternField } from '../types';
 import { hasField } from '../utils';
-import { IndexPatternColumn } from '../operations';
+import { GenericIndexPatternColumn } from '../operations';
 
 function nestColumn(columnOrder: string[], outer: string, inner: string) {
   const result = columnOrder.filter((c) => c !== inner);
@@ -22,7 +22,7 @@ function nestColumn(columnOrder: string[], outer: string, inner: string) {
 }
 
 function getFieldName(
-  column: IndexPatternColumn,
+  column: GenericIndexPatternColumn,
   getFieldByName: (name: string) => IndexPatternField | undefined
 ) {
   return hasField(column)

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
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 import { IndexPatternDimensionEditorProps } from './dimension_panel';
 import { OperationSupportMatrix } from './operation_support';
-import { IndexPatternColumn } from '../indexpattern';
+import { GenericIndexPatternColumn } from '../indexpattern';
 import {
   operationDefinitionMap,
   getOperationDisplay,
@@ -62,7 +62,7 @@ import type { TemporaryState } from './dimensions_editor_helpers';
 const operationPanels = getOperationDisplay();
 
 export interface DimensionEditorProps extends IndexPatternDimensionEditorProps {
-  selectedColumn?: IndexPatternColumn;
+  selectedColumn?: GenericIndexPatternColumn;
   layerType: LayerType;
   operationSupportMatrix: OperationSupportMatrix;
   currentIndexPattern: IndexPattern;

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -27,7 +27,12 @@ import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreSetup } f
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { generateId } from '../../id_generator';
 import { IndexPatternPrivateState } from '../types';
-import { IndexPatternColumn, replaceColumn } from '../operations';
+import {
+  FiltersIndexPatternColumn,
+  GenericIndexPatternColumn,
+  replaceColumn,
+  TermsIndexPatternColumn,
+} from '../operations';
 import { documentField } from '../document_field';
 import { OperationMetadata } from '../../types';
 import { DateHistogramIndexPatternColumn } from '../operations/definitions/date_histogram';
@@ -108,7 +113,7 @@ const expectedIndexPatterns = {
   },
 };
 
-const bytesColumn: IndexPatternColumn = {
+const bytesColumn: GenericIndexPatternColumn = {
   label: 'Max of bytes',
   dataType: 'number',
   isBucketed: false,
@@ -133,7 +138,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
   let setState: jest.Mock;
   let defaultProps: IndexPatternDimensionEditorProps;
 
-  function getStateWithColumns(columns: Record<string, IndexPatternColumn>) {
+  function getStateWithColumns(columns: Record<string, GenericIndexPatternColumn>) {
     return {
       ...state,
       layers: { first: { ...state.layers.first, columns, columnOrder: Object.keys(columns) } },
@@ -171,7 +176,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
                 interval: '1d',
               },
               sourceField: 'timestamp',
-            },
+            } as DateHistogramIndexPatternColumn,
           },
           incompleteColumns: {},
         },
@@ -264,7 +269,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
             // Private
             operationType: 'filters',
             params: { filters: [] },
-          },
+          } as FiltersIndexPatternColumn,
         })}
       />
     );
@@ -427,7 +432,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
             operationType: 'date_histogram',
             sourceField: '@timestamp',
             params: { interval: 'auto' },
-          },
+          } as DateHistogramIndexPatternColumn,
           col1: {
             label: 'Counter rate',
             dataType: 'number',
@@ -464,7 +469,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
             operationType: 'date_histogram',
             sourceField: '@timestamp',
             params: { interval: 'auto' },
-          },
+          } as DateHistogramIndexPatternColumn,
           col1: {
             label: 'Cumulative sum',
             dataType: 'number',
@@ -839,7 +844,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
               // Private
               operationType: 'filters',
               params: { filters: [] },
-            },
+            } as FiltersIndexPatternColumn,
           })}
         />
       );
@@ -1066,7 +1071,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
   });
 
   describe('time scaling', () => {
-    function getProps(colOverrides: Partial<IndexPatternColumn>) {
+    function getProps(colOverrides: Partial<GenericIndexPatternColumn>) {
       return {
         ...defaultProps,
         state: getStateWithColumns({
@@ -1080,15 +1085,15 @@ describe('IndexPatternDimensionEditorPanel', () => {
             params: {
               interval: '1d',
             },
-          },
+          } as DateHistogramIndexPatternColumn,
           col2: {
             dataType: 'number',
             isBucketed: false,
             label: 'Count of records',
             operationType: 'count',
             sourceField: 'Records',
             ...colOverrides,
-          } as IndexPatternColumn,
+          } as GenericIndexPatternColumn,
         }),
         columnId: 'col2',
       };
@@ -1296,7 +1301,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
   });
 
   describe('time shift', () => {
-    function getProps(colOverrides: Partial<IndexPatternColumn>) {
+    function getProps(colOverrides: Partial<GenericIndexPatternColumn>) {
       return {
         ...defaultProps,
         state: getStateWithColumns({
@@ -1310,15 +1315,15 @@ describe('IndexPatternDimensionEditorPanel', () => {
             params: {
               interval: '1d',
             },
-          },
+          } as DateHistogramIndexPatternColumn,
           col2: {
             dataType: 'number',
             isBucketed: false,
             label: 'Count of records',
             operationType: 'count',
             sourceField: 'Records',
             ...colOverrides,
-          } as IndexPatternColumn,
+          } as GenericIndexPatternColumn,
         }),
         columnId: 'col2',
       };
@@ -1334,7 +1339,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
             label: 'Count of records',
             operationType: 'count',
             sourceField: 'Records',
-          } as IndexPatternColumn,
+          } as GenericIndexPatternColumn,
         }),
         columnId: 'col2',
       };
@@ -1483,7 +1488,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
   });
 
   describe('filtering', () => {
-    function getProps(colOverrides: Partial<IndexPatternColumn>) {
+    function getProps(colOverrides: Partial<GenericIndexPatternColumn>) {
       return {
         ...defaultProps,
         state: getStateWithColumns({
@@ -1497,15 +1502,15 @@ describe('IndexPatternDimensionEditorPanel', () => {
             params: {
               interval: '1d',
             },
-          },
+          } as DateHistogramIndexPatternColumn,
           col2: {
             dataType: 'number',
             isBucketed: false,
             label: 'Count of records',
             operationType: 'count',
             sourceField: 'Records',
             ...colOverrides,
-          } as IndexPatternColumn,
+          } as GenericIndexPatternColumn,
         }),
         columnId: 'col2',
       };
@@ -1522,7 +1527,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
               orderBy: { type: 'alphabetical' },
               size: 5,
             },
-          })}
+          } as TermsIndexPatternColumn)}
         />
       );
       expect(

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.tsx
@@ -12,7 +12,7 @@ import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { DatasourceDimensionTriggerProps, DatasourceDimensionEditorProps } from '../../types';
 import { DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { IndexPatternColumn } from '../indexpattern';
+import { GenericIndexPatternColumn } from '../indexpattern';
 import { isColumnInvalid } from '../utils';
 import { IndexPatternPrivateState } from '../types';
 import { DimensionEditor } from './dimension_editor';
@@ -56,7 +56,7 @@ export const IndexPatternDimensionTriggerComponent = function IndexPatternDimens
     [layer, columnId, currentIndexPattern, invalid]
   );
 
-  const selectedColumn: IndexPatternColumn | null = layer.columns[props.columnId] ?? null;
+  const selectedColumn: GenericIndexPatternColumn | null = layer.columns[props.columnId] ?? null;
 
   if (!selectedColumn) {
     return null;
@@ -126,7 +126,7 @@ export const IndexPatternDimensionEditorComponent = function IndexPatternDimensi
   }
   const operationSupportMatrix = getOperationSupportMatrix(props);
 
-  const selectedColumn: IndexPatternColumn | null =
+  const selectedColumn: GenericIndexPatternColumn | null =
     props.state.layers[layerId].columns[props.columnId] || null;
   return (
     <DimensionEditor

diff --git a/...plugins/lens/public/indexpattern_datasource/dimension_panel/dimensions_editor_helpers.tsx b/...plugins/lens/public/indexpattern_datasource/dimension_panel/dimensions_editor_helpers.tsx
@@ -16,7 +16,7 @@ import './dimension_editor.scss';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiFieldText, EuiTabs, EuiTab, EuiCallOut } from '@elastic/eui';
-import { IndexPatternColumn, operationDefinitionMap } from '../operations';
+import { GenericIndexPatternColumn, operationDefinitionMap } from '../operations';
 import { useDebouncedValue } from '../../shared_components';
 
 export const formulaOperationName = 'formula';
@@ -176,7 +176,7 @@ export const DimensionEditorTabs = ({ tabs }: { tabs: DimensionEditorTab[] }) =>
 };
 
 export function getErrorMessage(
-  selectedColumn: IndexPatternColumn | undefined,
+  selectedColumn: GenericIndexPatternColumn | undefined,
   incompleteOperation: boolean,
   input: 'none' | 'field' | 'fullReference' | 'managedReference' | undefined,
   fieldInvalid: boolean