Skip to content

Commit c68c197

Browse files
Move shared vislib components into Charts plugin (#62957)
* Closes #56310 Move shared vislib components into Charts plugin * Fixed imports in tests * Changed i18n IDs to match charts namespace * Renamed ColorSchemaVislibParams to ColorSchemaParams, added enums and got rid of useValidation function * Renamed ColorSchemaVislibParams to ColorSchemaParams and got rid of useValidation function * Fixed merge conflict * Replaced enums with objects again
1 parent 7796800 commit c68c197

57 files changed

Lines changed: 215 additions & 169 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/legacy/core_plugins/region_map/public/components/region_map_options.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
2424

2525
import { FileLayerField, VectorLayer, ServiceSettings } from 'ui/vis/map/service_settings';
2626
import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
27-
import { NumberInputOption, SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
27+
import {
28+
NumberInputOption,
29+
SelectOption,
30+
SwitchOption,
31+
} from '../../../../../plugins/charts/public';
2832
import { WmsOptions } from '../../../tile_map/public/components/wms_options';
2933
import { RegionMapVisParams } from '../types';
3034

src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
RangeOption,
2828
SelectOption,
2929
SwitchOption,
30-
} from '../../../vis_type_vislib/public';
30+
} from '../../../../../plugins/charts/public';
3131
import { WmsOptions } from './wms_options';
3232
import { TileMapVisParams } from '../types';
3333
import { MapTypes } from '../map_types';

src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import React from 'react';
2121
import { EuiLink, EuiSpacer, EuiText, EuiScreenReaderOnly } from '@elastic/eui';
2222
import { FormattedMessage } from '@kbn/i18n/react';
2323

24-
import { TextInputOption } from '../../../vis_type_vislib/public';
24+
import { TextInputOption } from '../../../../../plugins/charts/public';
2525
import { WMSOptions } from '../types';
2626

2727
interface WmsInternalOptions {

src/legacy/core_plugins/tile_map/public/components/wms_options.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
2525
import { TmsLayer } from 'ui/vis/map/service_settings';
2626
import { Vis } from '../../../../../plugins/visualizations/public';
2727
import { RegionMapVisParams } from '../../../region_map/public/types';
28-
import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
28+
import { SelectOption, SwitchOption } from '../../../../../plugins/charts/public';
2929
import { WmsInternalOptions } from './wms_internal_options';
3030
import { WMSOptions, TileMapVisParams } from '../types';
3131

src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { EuiPanel } from '@elastic/eui';
2222
import { i18n } from '@kbn/i18n';
2323

2424
import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
25-
import { RangeOption, SwitchOption } from '../../vis_type_vislib/public';
25+
import { RangeOption, SwitchOption } from '../../../../plugins/charts/public';
2626
import { MarkdownVisParams } from './types';
2727

2828
function SettingsOptions({ stateParams, setValue }: VisOptionsProps<MarkdownVisParams>) {

src/legacy/core_plugins/vis_type_metric/public/components/metric_vis_options.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import {
3737
SwitchOption,
3838
RangeOption,
3939
SetColorSchemaOptionsValue,
40-
} from '../../../vis_type_vislib/public';
40+
SetColorRangeValue,
41+
} from '../../../../../plugins/charts/public';
4142
import { MetricVisParam, VisParams } from '../types';
42-
import { SetColorRangeValue } from '../../../vis_type_vislib/public/components/common/color_ranges';
4343

4444
function MetricVisOptions({
4545
stateParams,

src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ import {
2626
Render,
2727
Style,
2828
} from '../../../../plugins/expressions/public';
29-
import { ColorModes } from '../../vis_type_vislib/public';
3029
import { visType, DimensionsVisParam, VisParams } from './types';
31-
import { ColorSchemas, vislibColorMaps } from '../../../../plugins/charts/public';
30+
import { ColorSchemas, vislibColorMaps, ColorModes } from '../../../../plugins/charts/public';
3231

3332
export type Input = KibanaDatatable;
3433

src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import { i18n } from '@kbn/i18n';
2121

2222
import { MetricVisComponent } from './components/metric_vis_component';
2323
import { MetricVisOptions } from './components/metric_vis_options';
24-
import { ColorModes } from '../../vis_type_vislib/public';
25-
import { ColorSchemas, colorSchemas } from '../../../../plugins/charts/public';
24+
import { ColorSchemas, colorSchemas, ColorModes } from '../../../../plugins/charts/public';
2625
import { AggGroupNames } from '../../../../plugins/data/public';
2726
import { Schemas } from '../../../../plugins/vis_default_editor/public';
2827

src/legacy/core_plugins/vis_type_metric/public/types.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
import { Range } from '../../../../plugins/expressions/public';
2121
import { SchemaConfig } from '../../../../plugins/visualizations/public';
22-
import { ColorModes, Labels, Style } from '../../vis_type_vislib/public';
23-
import { ColorSchemas } from '../../../../plugins/charts/public';
22+
import { ColorModes, ColorSchemas, Labels, Style } from '../../../../plugins/charts/public';
2423

2524
export const visType = 'metric';
2625

src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
2525

2626
import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
2727
import { search } from '../../../../../plugins/data/public';
28-
import { NumberInputOption, SwitchOption, SelectOption } from '../../../vis_type_vislib/public';
28+
import {
29+
SwitchOption,
30+
SelectOption,
31+
NumberInputOption,
32+
} from '../../../../../plugins/charts/public';
2933
import { TableVisParams } from '../types';
3034
import { totalAggregations } from './utils';
3135

0 commit comments

Comments
 (0)