Move to vis types part 1 (#107535)

* Move to vis types part 1

* Fix types

* fix more types

* Fix paths

* Update readme file

Co-authored-by: Kibana Machine <[email protected]>

.github/CODEOWNERS

@@ -29,9 +29,9 @@
 /src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/vis_type_timeseries/ @elastic/kibana-app
 /src/plugins/vis_type_vega/ @elastic/kibana-app
-/src/plugins/vis_type_vislib/ @elastic/kibana-app
-/src/plugins/vis_type_xy/ @elastic/kibana-app
-/src/plugins/vis_type_pie/ @elastic/kibana-app
+/src/plugins/vis_types/vislib/ @elastic/kibana-app
+/src/plugins/vis_types/xy/ @elastic/kibana-app
+/src/plugins/vis_types/pie/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
 /src/plugins/url_forwarding/ @elastic/kibana-app

.i18nrc.json

@@ -63,9 +63,9 @@
     "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/plugins/vis_type_timeseries",
     "visTypeVega": "src/plugins/vis_type_vega",
-    "visTypeVislib": "src/plugins/vis_type_vislib",
-    "visTypeXy": "src/plugins/vis_type_xy",
-    "visTypePie": "src/plugins/vis_type_pie",
+    "visTypeVislib": "src/plugins/vis_types/vislib",
+    "visTypeXy": "src/plugins/vis_types/xy",
+    "visTypePie": "src/plugins/vis_types/pie",
     "visualizations": "src/plugins/visualizations",
     "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",

docs/developer/plugin-list.asciidoc

@@ -290,7 +290,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_pie[visTypePie]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/pie[visTypePie]
 |WARNING: Missing README.
 
 
@@ -314,11 +314,11 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_vislib[visTypeVislib]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/vislib[visTypeVislib]
 |WARNING: Missing README.
 
 
-|{kib-repo}blob/{branch}/src/plugins/vis_type_xy[visTypeXy]
+|{kib-repo}blob/{branch}/src/plugins/vis_types/xy[visTypeXy]
 |WARNING: Missing README.
 
 

jest.config.js

@@ -13,6 +13,7 @@ module.exports = {
     '<rootDir>/packages/*/jest.config.js',
     '<rootDir>/src/*/jest.config.js',
     '<rootDir>/src/plugins/*/jest.config.js',
+    '<rootDir>/src/plugins/vis_types/*/jest.config.js',
     '<rootDir>/test/*/jest.config.js',
     '<rootDir>/x-pack/plugins/*/jest.config.js',
   ],

src/dev/typescript/projects.ts

@@ -70,6 +70,7 @@ export const PROJECTS = [
 
   ...findProjects('packages/*/tsconfig.json'),
   ...findProjects('src/plugins/*/tsconfig.json'),
+  ...findProjects('src/plugins/vis_types/*/tsconfig.json'),
   ...findProjects('x-pack/plugins/*/tsconfig.json'),
   ...findProjects('examples/*/tsconfig.json'),
   ...findProjects('x-pack/examples/*/tsconfig.json'),

src/plugins/vis_types/README.md

@@ -0,0 +1,19 @@
+# Vis types
+
+This folder contains all the legacy visualizations plugins. The legacy visualizations are:
+- TSVB
+- Vega
+- All the aggregation-based visualizations
+
+The structure is:
+```
+  └ vis_types (just a folder)
+
+    └ pie (previous vis_type_pie)
+
+    └ tagcloud (previous vis_type_tagcloud)
+
+    └ ...
+```
+
+ If their renderer/expression is not shared with any other plugin, it can be contained within the vis_types/* plugin in this folder. If it's sharing a renderer/expression with Lens or Canvas, the renderer must be extracted into the chart_expression folder.

src/plugins/vis_type_xy/jest.config.js → src/plugins/vis_types/pie/jest.config.js

@@ -8,6 +8,6 @@
 
 module.exports = {
   preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/src/plugins/vis_type_xy'],
+  rootDir: '../../../..',
+  roots: ['<rootDir>/src/plugins/vis_types/pie'],
 };

src/plugins/vis_type_pie/public/components/chart_split.tsx → src/plugins/vis_types/pie/public/components/chart_split.tsx

@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { Accessor, AccessorFn, GroupBy, GroupBySort, SmallMultiples } from '@elastic/charts';
-import { DatatableColumn } from '../../../expressions/public';
+import { DatatableColumn } from '../../../../expressions/public';
 import { SplitDimensionParams } from '../types';
 
 interface ChartSplitProps {

src/plugins/vis_type_pie/public/editor/components/index.tsx → src/plugins/vis_types/pie/public/editor/components/index.tsx

@@ -7,7 +7,7 @@
  */
 
 import React, { lazy } from 'react';
-import { VisEditorOptionsProps } from '../../../../visualizations/public';
+import { VisEditorOptionsProps } from '../../../../../visualizations/public';
 import { PieVisParams, PieTypeProps } from '../../types';
 
 const PieOptionsLazy = lazy(() => import('./pie'));

src/plugins/vis_type_pie/public/editor/components/pie.test.tsx → src/plugins/vis_types/pie/public/editor/components/pie.test.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test/jest';
 import { ReactWrapper } from 'enzyme';
 import PieOptions, { PieOptionsProps } from './pie';
-import { chartPluginMock } from '../../../../charts/public/mocks';
+import { chartPluginMock } from '../../../../../charts/public/mocks';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';
 

src/plugins/vis_type_pie/public/editor/components/pie.tsx → src/plugins/vis_types/pie/public/editor/components/pie.tsx

@@ -27,10 +27,10 @@ import {
   SelectOption,
   PalettePicker,
   LongLegendOptions,
-} from '../../../../vis_default_editor/public';
-import { VisEditorOptionsProps } from '../../../../visualizations/public';
+} from '../../../../../vis_default_editor/public';
+import { VisEditorOptionsProps } from '../../../../../visualizations/public';
 import { TruncateLabelsOption } from './truncate_labels';
-import { PaletteRegistry } from '../../../../charts/public';
+import { PaletteRegistry } from '../../../../../charts/public';
 import { DEFAULT_PERCENT_DECIMALS } from '../../../common';
 import { PieVisParams, LabelPositions, ValueFormats, PieTypeProps } from '../../types';
 import { getLabelPositions, getValuesFormats } from '../collections';

src/plugins/vis_type_pie/public/expression_functions/pie_labels.ts → src/plugins/vis_types/pie/public/expression_functions/pie_labels.ts

@@ -11,7 +11,7 @@ import {
   ExpressionFunctionDefinition,
   Datatable,
   ExpressionValueBoxed,
-} from '../../../expressions/public';
+} from '../../../../expressions/public';
 
 interface Arguments {
   show: boolean;

src/plugins/vis_type_pie/public/mocks.ts → src/plugins/vis_types/pie/public/mocks.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '../../expressions/public';
+import { Datatable } from '../../../expressions/public';
 import { BucketColumns, PieVisParams, LabelPositions, ValueFormats } from './types';
 
 export const createMockBucketColumns = (): BucketColumns[] => {

src/plugins/vis_type_pie/public/pie_component.test.tsx → src/plugins/vis_types/pie/public/pie_component.test.tsx

@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { Settings, TooltipType, SeriesIdentifier } from '@elastic/charts';
-import { chartPluginMock } from '../../charts/public/mocks';
-import { dataPluginMock } from '../../data/public/mocks';
+import { chartPluginMock } from '../../../charts/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
 import { shallow, mount } from 'enzyme';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { act } from 'react-dom/test-utils';

src/plugins/vis_type_pie/public/pie_component.tsx → src/plugins/vis_types/pie/public/pie_component.tsx

@@ -25,11 +25,15 @@ import {
   ClickTriggerEvent,
   ChartsPluginSetup,
   PaletteRegistry,
-} from '../../charts/public';
-import { DataPublicPluginStart } from '../../data/public';
-import type { FieldFormat } from '../../field_formats/common';
-import type { PersistedState } from '../../visualizations/public';
-import { Datatable, DatatableColumn, IInterpreterRenderHandlers } from '../../expressions/public';
+} from '../../../charts/public';
+import { DataPublicPluginStart } from '../../../data/public';
+import type { PersistedState } from '../../../visualizations/public';
+import {
+  Datatable,
+  DatatableColumn,
+  IInterpreterRenderHandlers,
+} from '../../../expressions/public';
+import type { FieldFormat } from '../../../field_formats/common';
 import { DEFAULT_PERCENT_DECIMALS } from '../common';
 import { PieVisParams, BucketColumns, ValueFormats, PieContainerDimensions } from './types';
 import {

src/plugins/vis_type_pie/public/pie_fn.test.ts → src/plugins/vis_types/pie/public/pie_fn.test.ts

@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '../../../expressions/common/expression_functions/specs/tests/utils';
 import { createPieVisFn } from './pie_fn';
-import { Datatable } from '../../expressions/common/expression_types/specs';
+import { Datatable } from '../../../expressions/common/expression_types/specs';
 
 describe('interpreter/functions#pie', () => {
   const fn = functionWrapper(createPieVisFn());

src/plugins/vis_type_pie/public/pie_fn.ts → src/plugins/vis_types/pie/public/pie_fn.ts

@@ -7,9 +7,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ExpressionFunctionDefinition, Datatable, Render } from '../../expressions/common';
+import { ExpressionFunctionDefinition, Datatable, Render } from '../../../expressions/common';
 import { PieVisParams, PieVisConfig } from './types';
-import { prepareLogTable } from '../../visualizations/public';
+import { prepareLogTable } from '../../../visualizations/public';
 
 export const vislibPieName = 'pie_vis';
 

src/plugins/vis_type_pie/public/pie_renderer.tsx → src/plugins/vis_types/pie/public/pie_renderer.tsx

@@ -9,9 +9,9 @@
 import React, { lazy } from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
-import { ExpressionRenderDefinition } from '../../expressions/public';
-import { VisualizationContainer } from '../../visualizations/public';
-import type { PersistedState } from '../../visualizations/public';
+import { ExpressionRenderDefinition } from '../../../expressions/public';
+import { VisualizationContainer } from '../../../visualizations/public';
+import type { PersistedState } from '../../../visualizations/public';
 import { VisTypePieDependencies } from './plugin';
 
 import { RenderValue, vislibPieName } from './pie_fn';

src/plugins/vis_type_pie/public/plugin.ts → src/plugins/vis_types/pie/public/plugin.ts

@@ -7,11 +7,11 @@
  */
 
 import { CoreSetup, DocLinksStart } from 'src/core/public';
-import { VisualizationsSetup } from '../../visualizations/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
-import { ChartsPluginSetup } from '../../charts/public';
-import { UsageCollectionSetup } from '../../usage_collection/public';
-import { DataPublicPluginStart } from '../../data/public';
+import { VisualizationsSetup } from '../../../visualizations/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../../expressions/public';
+import { ChartsPluginSetup } from '../../../charts/public';
+import { UsageCollectionSetup } from '../../../usage_collection/public';
+import { DataPublicPluginStart } from '../../../data/public';
 import { LEGACY_PIE_CHARTS_LIBRARY } from '../common';
 import { pieLabels as pieLabelsExpressionFunction } from './expression_functions/pie_labels';
 import { createPieVisFn } from './pie_fn';

src/plugins/vis_type_pie/public/to_ast.test.ts → src/plugins/vis_types/pie/public/to_ast.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../visualizations/public';
+import { Vis } from '../../../visualizations/public';
 
 import { PieVisParams } from './types';
 import { samplePieVis } from './sample_vis.test.mocks';

src/plugins/vis_type_pie/public/to_ast.ts → src/plugins/vis_types/pie/public/to_ast.ts

@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { getVisSchemas, VisToExpressionAst, SchemaConfig } from '../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { getVisSchemas, VisToExpressionAst, SchemaConfig } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
 import { PieVisParams, LabelsParams } from './types';
 import { vislibPieName, VisTypePieExpressionFunctionDefinition } from './pie_fn';
 import { getEsaggsFn } from './to_ast_esaggs';

src/plugins/vis_type_pie/public/to_ast_esaggs.ts → src/plugins/vis_types/pie/public/to_ast_esaggs.ts

@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Vis } from '../../visualizations/public';
-import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { Vis } from '../../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
 import {
   EsaggsExpressionFunctionDefinition,
   IndexPatternLoadExpressionFunctionDefinition,
-} from '../../data/public';
+} from '../../../data/public';
 
 import { PieVisParams } from './types';
 

src/plugins/vis_type_pie/public/types/types.ts → src/plugins/vis_types/pie/public/types/types.ts

@@ -8,10 +8,10 @@
 
 import { Position } from '@elastic/charts';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { DatatableColumn, SerializedFieldFormat } from '../../../expressions/public';
-import { ExpressionValueVisDimension } from '../../../visualizations/public';
+import { DatatableColumn, SerializedFieldFormat } from '../../../../expressions/public';
+import { ExpressionValueVisDimension } from '../../../../visualizations/public';
 import { ExpressionValuePieLabels } from '../expression_functions/pie_labels';
-import { PaletteOutput, ChartsPluginSetup } from '../../../charts/public';
+import { PaletteOutput, ChartsPluginSetup } from '../../../../charts/public';
 
 export interface Dimension {
   accessor: number;

src/plugins/vis_type_pie/public/utils/filter_helpers.test.ts → src/plugins/vis_types/pie/public/utils/filter_helpers.test.ts

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { DatatableColumn } from '../../../expressions/public';
+import { DatatableColumn } from '../../../../expressions/public';
 import { getFilterClickData, getFilterEventData } from './filter_helpers';
 import { createMockBucketColumns, createMockVisData } from '../mocks';
 

src/plugins/vis_type_pie/public/utils/filter_helpers.ts → src/plugins/vis_types/pie/public/utils/filter_helpers.ts

@@ -7,11 +7,11 @@
  */
 
 import { LayerValue, SeriesIdentifier } from '@elastic/charts';
-import { Datatable, DatatableColumn } from '../../../expressions/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import type { FieldFormat } from '../../../field_formats/common';
-import { ClickTriggerEvent } from '../../../charts/public';
-import { ValueClickContext } from '../../../embeddable/public';
+import { Datatable, DatatableColumn } from '../../../../expressions/public';
+import { DataPublicPluginStart } from '../../../../data/public';
+import { ClickTriggerEvent } from '../../../../charts/public';
+import { ValueClickContext } from '../../../../embeddable/public';
+import type { FieldFormat } from '../../../../field_formats/common';
 import { BucketColumns } from '../types';
 
 export const canFilter = async (