Skip to content

Commit

Permalink
[Lens] Move visualizations under the visualizations folder (#137950)
Browse files Browse the repository at this point in the history
* [Lens] Move visualizations under the visualizations folder

* Move datatable visualization
  • Loading branch information
stratoula committed Aug 4, 2022
1 parent bd2361d commit 6325eb8
Show file tree
Hide file tree
Showing 123 changed files with 291 additions and 276 deletions.
20 changes: 10 additions & 10 deletions x-pack/plugins/lens/public/async_services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
* This file causes all of them to be served in a single request.
*/

export * from './datatable_visualization/datatable_visualization';
export * from './datatable_visualization';
export * from './metric_visualization/metric_visualization';
export * from './metric_visualization';
export * from './visualizations/datatable/datatable_visualization';
export * from './visualizations/datatable';
export * from './visualizations/legacy_metric/metric_visualization';
export * from './visualizations/legacy_metric';
export * from './visualizations/metric/metric_visualization';
export * from './visualizations/metric';
export * from './pie_visualization/pie_visualization';
export * from './pie_visualization';
export * from './xy_visualization/xy_visualization';
export * from './xy_visualization';
export * from './heatmap_visualization/heatmap_visualization';
export * from './heatmap_visualization';
export * from './visualizations/partition/pie_visualization';
export * from './visualizations/partition';
export * from './visualizations/xy/xy_visualization';
export * from './visualizations/xy';
export * from './visualizations/heatmap/heatmap_visualization';
export * from './visualizations/heatmap';
export * from './visualizations/gauge/gauge_visualization';
export * from './visualizations/gauge';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import {
import type { LensByReferenceInput, LensByValueInput } from './embeddable';
import type { Document } from '../persistence';
import type { IndexPatternPersistedState } from '../indexpattern_datasource/types';
import type { XYState } from '../xy_visualization/types';
import type { XYState } from '../visualizations/xy/types';
import type { PieVisualizationState, MetricState } from '../../common';
import type { DatatableVisualizationState } from '../datatable_visualization/visualization';
import type { HeatmapVisualizationState } from '../heatmap_visualization/types';
import type { DatatableVisualizationState } from '../visualizations/datatable/visualization';
import type { HeatmapVisualizationState } from '../visualizations/heatmap/types';
import type { GaugeVisualizationState } from '../visualizations/gauge/constants';

type LensAttributes<TVisType, TVisState> = Omit<
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/lens/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export type {
YAxisMode,
SeriesType,
YConfig,
} from './xy_visualization/types';
} from './visualizations/xy/types';
export type {
DatasourcePublicAPI,
DataType,
Expand All @@ -39,8 +39,8 @@ export type {
SharedPieLayerState,
} from '../common/types';

export type { DatatableVisualizationState } from './datatable_visualization/visualization';
export type { HeatmapVisualizationState } from './heatmap_visualization/types';
export type { DatatableVisualizationState } from './visualizations/datatable/visualization';
export type { HeatmapVisualizationState } from './visualizations/heatmap/types';
export type { GaugeVisualizationState } from './visualizations/gauge/constants';
export type {
IndexPatternPersistedState,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/lens/public/mocks/lens_plugin_mock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { createFormulaPublicApi } from '../async_services';
import { LensPublicStart } from '..';
import { visualizationTypes } from '../xy_visualization/types';
import { visualizationTypes } from '../visualizations/xy/types';

type Start = jest.Mocked<LensPublicStart>;

Expand Down
12 changes: 6 additions & 6 deletions x-pack/plugins/lens/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@ import type {
import type {
XyVisualization as XyVisualizationType,
XyVisualizationPluginSetupPlugins,
} from './xy_visualization';
} from './visualizations/xy';
import type {
LegacyMetricVisualization as LegacyMetricVisualizationType,
LegacyMetricVisualizationPluginSetupPlugins,
} from './metric_visualization';
} from './visualizations/legacy_metric';
import type { MetricVisualization as MetricVisualizationType } from './visualizations/metric';
import type {
DatatableVisualization as DatatableVisualizationType,
DatatableVisualizationPluginSetupPlugins,
} from './datatable_visualization';
} from './visualizations/datatable';
import type {
PieVisualization as PieVisualizationType,
PieVisualizationPluginSetupPlugins,
} from './pie_visualization';
import type { HeatmapVisualization as HeatmapVisualizationType } from './heatmap_visualization';
} from './visualizations/partition';
import type { HeatmapVisualization as HeatmapVisualizationType } from './visualizations/heatmap';
import type { GaugeVisualization as GaugeVisualizationType } from './visualizations/gauge';

import { APP_ID, getEditPath, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../common/constants';
Expand Down Expand Up @@ -504,7 +504,7 @@ export class LensPlugin {
return Boolean(core.application.capabilities.visualize?.show);
},
getXyVisTypes: async () => {
const { visualizationTypes } = await import('./xy_visualization/types');
const { visualizationTypes } = await import('./visualizations/xy/types');
return visualizationTypes;
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useCallback, useMemo } from 'react';
import { EuiSpacer, EuiFormRow } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { AxesSettingsConfig } from '../xy_visualization/types';
import { AxesSettingsConfig } from '../visualizations/xy/types';
import { LabelMode, useDebouncedValue, VisLabel } from '.';

type AxesSettingsConfigKeys = keyof AxesSettingsConfig;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/lens/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import type {
LensResizeActionData,
LensToggleActionData,
LensPagesizeActionData,
} from './datatable_visualization/components/types';
} from './visualizations/datatable/components/types';

import {
LENS_EDIT_SORT_ACTION,
LENS_EDIT_RESIZE_ACTION,
LENS_TOGGLE_ACTION,
LENS_EDIT_PAGESIZE_ACTION,
} from './datatable_visualization/components/constants';
} from './visualizations/datatable/components/constants';
import type { LensInspector } from './lens_inspector_service';

export type ErrorCallback = (e: { message: string }) => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Datatable } from '@kbn/expressions-plugin/public';
import { IUiSettingsClient } from '@kbn/core/public';
import { act } from 'react-dom/test-utils';
import { ReactWrapper } from 'enzyme';
import { DatatableArgs, ColumnConfigArg } from '../../../common/expressions';
import { DatatableArgs, ColumnConfigArg } from '../../../../common/expressions';
import { DataContextType } from './types';
import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import React, { useContext, useEffect } from 'react';
import type { EuiDataGridCellValueElementProps } from '@elastic/eui';
import type { IUiSettingsClient } from '@kbn/core/public';
import classNames from 'classnames';
import type { FormatFactory } from '../../../common';
import { getOriginalId } from '../../../common/expressions';
import type { ColumnConfig } from '../../../common/expressions';
import type { FormatFactory } from '../../../../common';
import { getOriginalId } from '../../../../common/expressions';
import type { ColumnConfig } from '../../../../common/expressions';
import type { DataContextType } from './types';
import { getContrastColor, getNumericValue } from '../../shared_components/coloring/utils';
import { getContrastColor, getNumericValue } from '../../../shared_components/coloring/utils';

export const createGridCell = (
formatters: Record<string, ReturnType<FormatFactory>>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import type {
DatatableColumn,
DatatableColumnMeta,
} from '@kbn/expressions-plugin/common';
import type { FormatFactory } from '../../../common';
import type { ColumnConfig } from '../../../common/expressions';
import type { FormatFactory } from '../../../../common';
import type { ColumnConfig } from '../../../../common/expressions';

export const createGridColumns = (
bucketColumns: string[],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import {
FramePublicAPI,
OperationDescriptor,
VisualizationDimensionEditorProps,
} from '../../types';
} from '../../../types';
import { DatatableVisualizationState } from '../visualization';
import { createMockDatasource, createMockFramePublicAPI } from '../../mocks';
import { createMockDatasource, createMockFramePublicAPI } from '../../../mocks';
import { mountWithIntl } from '@kbn/test-jest-helpers';
import { TableDimensionEditor } from './dimension_editor';
import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
import { act } from 'react-dom/test-utils';
import { PalettePanelContainer } from '../../shared_components';
import { layerTypes } from '../../../common';
import { PalettePanelContainer } from '../../../shared_components';
import { layerTypes } from '../../../../common';

describe('data table dimension editor', () => {
let frame: FramePublicAPI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ import {
EuiButtonEmpty,
} from '@elastic/eui';
import { CustomizablePalette, PaletteRegistry, FIXED_PROGRESSION } from '@kbn/coloring';
import { VisualizationDimensionEditorProps } from '../../types';
import { VisualizationDimensionEditorProps } from '../../../types';
import { DatatableVisualizationState } from '../visualization';

import {
applyPaletteParams,
defaultPaletteParams,
PalettePanelContainer,
findMinMaxByColumnId,
} from '../../shared_components';
import { isNumericFieldForDatatable, getOriginalId } from '../../../common/expressions';
} from '../../../shared_components';
import { isNumericFieldForDatatable, getOriginalId } from '../../../../common/expressions';

import './dimension_editor.scss';
import { CollapseSetting } from '../../shared_components/collapse_setting';
import { CollapseSetting } from '../../../shared_components/collapse_setting';

const idPrefix = htmlIdGenerator()();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
import React from 'react';
import { EuiComboBox, EuiFieldText } from '@elastic/eui';
import type { PaletteRegistry } from '@kbn/coloring';
import { FramePublicAPI, VisualizationDimensionEditorProps } from '../../types';
import { FramePublicAPI, VisualizationDimensionEditorProps } from '../../../types';
import { DatatableVisualizationState } from '../visualization';
import { createMockDatasource, createMockFramePublicAPI } from '../../mocks';
import { createMockDatasource, createMockFramePublicAPI } from '../../../mocks';
import { mountWithIntl } from '@kbn/test-jest-helpers';
import { TableDimensionEditorAdditionalSection } from './dimension_editor_addtional_section';
import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
import { layerTypes } from '../../../common';
import { layerTypes } from '../../../../common';

describe('data table dimension editor additional section', () => {
let frame: FramePublicAPI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import { i18n } from '@kbn/i18n';
import { css } from '@emotion/react';
import { EuiFormRow, EuiFieldText, EuiText, useEuiTheme, EuiComboBox } from '@elastic/eui';
import { PaletteRegistry } from '@kbn/coloring';
import { VisualizationDimensionEditorProps } from '../../types';
import { VisualizationDimensionEditorProps } from '../../../types';
import { DatatableVisualizationState } from '../visualization';

import { useDebouncedValue } from '../../shared_components';
import type { ColumnState } from '../../../common/expressions';
import { useDebouncedValue } from '../../../shared_components';
import type { ColumnState } from '../../../../common/expressions';
import {
isNumericFieldForDatatable,
getDefaultSummaryLabel,
getFinalSummaryConfiguration,
getSummaryRowOptions,
} from '../../../common/expressions';
} from '../../../../common/expressions';

import './dimension_editor.scss';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
createGridHideHandler,
createTransposeColumnFilterHandler,
} from './table_actions';
import { LensGridDirection, ColumnConfig } from '../../../common/expressions';
import { LensGridDirection, ColumnConfig } from '../../../../common/expressions';

function getDefaultConfig(): ColumnConfig {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import type { EuiDataGridSorting } from '@elastic/eui';
import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
import { ClickTriggerEvent } from '@kbn/charts-plugin/public';
import type { LensResizeAction, LensSortAction, LensToggleAction } from './types';
import type { ColumnConfig, LensGridDirection } from '../../../common/expressions';
import { getOriginalId } from '../../../common/expressions';
import type { ColumnConfig, LensGridDirection } from '../../../../common/expressions';
import { getOriginalId } from '../../../../common/expressions';

export const createGridResizeHandler =
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
import { EuiDataGrid } from '@elastic/eui';
import { IAggType } from '@kbn/data-plugin/public';
import { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
import { VisualizationContainer } from '../../visualization_container';
import { VisualizationContainer } from '../../../visualization_container';
import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
import { LensIconChartDatatable } from '../../assets/chart_datatable';
import { LensIconChartDatatable } from '../../../assets/chart_datatable';
import { DataContext, DatatableComponent } from './table_basic';
import { DatatableProps } from '../../../common/expressions';
import { DatatableProps } from '../../../../common/expressions';
import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
import { IUiSettingsClient } from '@kbn/core/public';
import { Datatable, RenderMode } from '@kbn/expressions-plugin/common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import {
} from '@elastic/eui';
import { EmptyPlaceholder } from '@kbn/charts-plugin/public';
import { ClickTriggerEvent } from '@kbn/charts-plugin/public';
import type { LensTableRowContextMenuEvent } from '../../types';
import type { FormatFactory } from '../../../common';
import type { LensGridDirection } from '../../../common/expressions';
import { VisualizationContainer } from '../../visualization_container';
import { findMinMaxByColumnId } from '../../shared_components';
import { LensIconChartDatatable } from '../../assets/chart_datatable';
import type { LensTableRowContextMenuEvent } from '../../../types';
import type { FormatFactory } from '../../../../common';
import type { LensGridDirection } from '../../../../common/expressions';
import { VisualizationContainer } from '../../../visualization_container';
import { findMinMaxByColumnId } from '../../../shared_components';
import { LensIconChartDatatable } from '../../../assets/chart_datatable';
import type {
DataContextType,
DatatableRenderProps,
Expand All @@ -52,7 +52,7 @@ import {
createGridSortingConfig,
createTransposeColumnFilterHandler,
} from './table_actions';
import { getOriginalId, getFinalSummaryConfiguration } from '../../../common/expressions';
import { getOriginalId, getFinalSummaryConfiguration } from '../../../../common/expressions';

export const DataContext = React.createContext<DataContextType>({});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import React, { ChangeEvent, FormEvent } from 'react';
import { mountWithIntl } from '@kbn/test-jest-helpers';
import { DataTableToolbar } from './toolbar';
import { DatatableVisualizationState } from '../visualization';
import { FramePublicAPI, VisualizationToolbarProps } from '../../types';
import { FramePublicAPI, VisualizationToolbarProps } from '../../../types';
import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
import { ReactWrapper } from 'enzyme';
import { PagingState } from '../../../common/expressions';
import { PagingState } from '../../../../common/expressions';
import { EuiButtonGroup, EuiRange } from '@elastic/eui';

// mocking random id generator function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import React, { useCallback } from 'react';
import { i18n } from '@kbn/i18n';
import { EuiFlexGroup, EuiFormRow, EuiSwitch, EuiToolTip } from '@elastic/eui';
import { ToolbarPopover } from '../../shared_components';
import type { VisualizationToolbarProps } from '../../types';
import { ToolbarPopover } from '../../../shared_components';
import type { VisualizationToolbarProps } from '../../../types';
import type { DatatableVisualizationState } from '../visualization';
import { RowHeightSettings } from './row_height_settings';
import { DEFAULT_PAGE_SIZE } from './table_basic';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import type { PaletteRegistry } from '@kbn/coloring';
import { CustomPaletteState } from '@kbn/charts-plugin/public';
import type { IAggType } from '@kbn/data-plugin/public';
import type { Datatable, RenderMode } from '@kbn/expressions-plugin/common';
import type { ILensInterpreterRenderHandlers, LensEditEvent } from '../../types';
import type { ILensInterpreterRenderHandlers, LensEditEvent } from '../../../types';
import {
LENS_EDIT_SORT_ACTION,
LENS_EDIT_RESIZE_ACTION,
LENS_TOGGLE_ACTION,
LENS_EDIT_PAGESIZE_ACTION,
} from './constants';
import type { FormatFactory } from '../../../common';
import type { DatatableProps, LensGridDirection } from '../../../common/expressions';
import type { FormatFactory } from '../../../../common';
import type { DatatableProps, LensGridDirection } from '../../../../common/expressions';

export interface LensSortActionData {
columnId: string | undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* 2.0.
*/

import type { DatatableProps } from '../../common/expressions';
import type { DatatableProps } from '../../../common/expressions';
import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks';
import type { FormatFactory } from '../../common';
import { getDatatable } from '../../common/expressions';
import type { FormatFactory } from '../../../common';
import { getDatatable } from '../../../common/expressions';
import { Datatable } from '@kbn/expressions-plugin/common';

function sampleArgs() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import type { IAggType } from '@kbn/data-plugin/public';
import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public';
import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
import { trackUiCounterEvents } from '../lens_ui_telemetry';
import { trackUiCounterEvents } from '../../lens_ui_telemetry';
import { DatatableComponent } from './components/table_basic';

import type { ILensInterpreterRenderHandlers } from '../types';
import type { FormatFactory } from '../../common';
import type { DatatableProps } from '../../common/expressions';
import type { ILensInterpreterRenderHandlers } from '../../types';
import type { FormatFactory } from '../../../common';
import type { DatatableProps } from '../../../common/expressions';

export const getDatatableRenderer = (dependencies: {
formatFactory: FormatFactory;
Expand Down
Loading

0 comments on commit 6325eb8

Please sign in to comment.