Skip to content

Commit

Permalink
Move to vis types part 1 (elastic#107535)
Browse files Browse the repository at this point in the history
* Move to vis types part 1

* Fix types

* fix more types

* Fix paths

* Update readme file

Co-authored-by: Kibana Machine <[email protected]>
# Conflicts:
#	.github/CODEOWNERS
  • Loading branch information
stratoula committed Aug 20, 2021
1 parent 01f38a7 commit 82ffabd
Show file tree
Hide file tree
Showing 424 changed files with 384 additions and 355 deletions.
6 changes: 3 additions & 3 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,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",
Expand Down
6 changes: 3 additions & 3 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,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.
Expand All @@ -318,11 +318,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.
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand Down
1 change: 1 addition & 0 deletions src/dev/typescript/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
24 changes: 0 additions & 24 deletions src/plugins/vis_type_pie/tsconfig.json

This file was deleted.

26 changes: 0 additions & 26 deletions src/plugins/vis_type_vislib/tsconfig.json

This file was deleted.

24 changes: 0 additions & 24 deletions src/plugins/vis_type_xy/tsconfig.json

This file was deleted.

19 changes: 19 additions & 0 deletions src/plugins/vis_types/README.md
Original file line number Diff line number Diff line change
@@ -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.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
};
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ExpressionFunctionDefinition,
Datatable,
ExpressionValueBoxed,
} from '../../../expressions/public';
} from '../../../../expressions/public';

interface Arguments {
show: boolean;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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[] => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { EuiPopover } from '@elastic/eui';
import { mountWithIntl } from '@kbn/test/jest';
import { ComponentType, ReactWrapper } from 'enzyme';
import { getColorPicker } from './get_color_picker';
import { ColorPicker } from '../../../charts/public';
import type { PersistedState } from '../../../visualizations/public';
import { ColorPicker } from '../../../../charts/public';
import type { PersistedState } from '../../../../visualizations/public';
import { createMockBucketColumns, createMockVisData } from '../mocks';

const bucketColumns = createMockBucketColumns();
Expand Down
Loading

0 comments on commit 82ffabd

Please sign in to comment.