Skip to content

Commit

Permalink
De-angularize vis tooltips (#54954) (#55432)
Browse files Browse the repository at this point in the history
* Remove angular dependencey from vis/tooltip
* Move tooltip logic into vislib
* Remove and fix all ngMock refs in vislib tests
* Add numeral to renovate config
* Add vis_type_vislib to codeowners
* Move vis_legend into vislib and fix errors
* vis_type_vislib/public imports to be only top-level
  • Loading branch information
nickofthyme authored Jan 21, 2020
1 parent 0c62eba commit 2fcac07
Show file tree
Hide file tree
Showing 123 changed files with 1,414 additions and 1,707 deletions.
4 changes: 2 additions & 2 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"interpreter": "src/legacy/core_plugins/interpreter",
"kbn": "src/legacy/core_plugins/kibana",
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
"kbnVislibVisTypes": "src/legacy/core_plugins/vis_type_vislib",
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
"kibana_react": "src/legacy/core_plugins/kibana_react",
"kibana-react": "src/plugins/kibana_react",
Expand All @@ -41,6 +40,7 @@
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
"visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
"visualizations": [
"src/plugins/visualizations",
"src/legacy/core_plugins/visualizations"
Expand All @@ -50,4 +50,4 @@
"src/legacy/ui/ui_render/ui_render_mixin.js"
],
"translations": []
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@
"@types/moment-timezone": "^0.5.12",
"@types/mustache": "^0.8.31",
"@types/node": "^10.12.27",
"@types/numeral": "^0.0.26",
"@types/opn": "^5.1.0",
"@types/pegjs": "^0.10.1",
"@types/pngjs": "^3.3.2",
Expand Down
8 changes: 8 additions & 0 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,14 @@
'@types/memoize-one',
],
},
{
groupSlug: 'numeral',
groupName: 'numeral related packages',
packageNames: [
'numeral',
'@types/numeral',
],
},
{
groupSlug: 'mime',
groupName: 'mime related packages',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';

import { FileLayerField, VectorLayer, ServiceSettings } from 'ui/vis/map/service_settings';
import { VisOptionsProps } from 'ui/vis/editors/default';
import {
NumberInputOption,
SelectOption,
SwitchOption,
} from '../../../vis_type_vislib/public/components';
import { NumberInputOption, SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
import { WmsOptions } from '../../../tile_map/public/components/wms_options';
import { RegionMapVisParams } from '../types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
RangeOption,
SelectOption,
SwitchOption,
} from '../../../vis_type_vislib/public/components';
} from '../../../vis_type_vislib/public';
import { WmsOptions } from './wms_options';
import { TileMapVisParams } from '../types';
import { MapTypes } from '../map_types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import React from 'react';
import { EuiLink, EuiSpacer, EuiText, EuiScreenReaderOnly } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

import { TextInputOption } from '../../../vis_type_vislib/public/components';
import { TextInputOption } from '../../../vis_type_vislib/public';
import { WMSOptions } from '../types';

interface WmsInternalOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { TmsLayer } from 'ui/vis/map/service_settings';
import { Vis } from 'ui/vis';
import { RegionMapVisParams } from '../../../region_map/public/types';
import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public/components';
import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
import { WmsInternalOptions } from './wms_internal_options';
import { WMSOptions, TileMapVisParams } from '../types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { EuiPanel } from '@elastic/eui';
import { i18n } from '@kbn/i18n';

import { VisOptionsProps } from 'ui/vis/editors/default';
import { RangeOption, SwitchOption } from '../../vis_type_vislib/public/components';
import { RangeOption, SwitchOption } from '../../vis_type_vislib/public';
import { MarkdownVisParams } from './types';

function SettingsOptions({ stateParams, setValue }: VisOptionsProps<MarkdownVisParams>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ import { FormattedMessage } from '@kbn/i18n/react';

import { VisOptionsProps } from '../legacy_imports';
import {
ColorModes,
ColorRanges,
ColorSchemaOptions,
SwitchOption,
RangeOption,
SetColorSchemaOptionsValue,
} from '../../../vis_type_vislib/public/components';
import { ColorModes } from '../../../vis_type_vislib/public/utils/collections';
} from '../../../vis_type_vislib/public';
import { MetricVisParam, VisParams } from '../types';
import { SetColorRangeValue } from '../../../vis_type_vislib/public/components/common/color_ranges';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
Render,
Style,
} from '../../../../plugins/expressions/public';
import { ColorModes } from '../../vis_type_vislib/public/utils/collections';
import { ColorModes } from '../../vis_type_vislib/public';
import { visType, DimensionsVisParam, VisParams } from './types';

export type Context = KibanaDatatable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import { i18n } from '@kbn/i18n';

import { MetricVisComponent } from './components/metric_vis_component';
import { MetricVisOptions } from './components/metric_vis_options';
import { ColorModes } from '../../vis_type_vislib/public';
import { Schemas, AggGroupNames, colorSchemas, ColorSchemas } from './legacy_imports';
import { ColorModes } from '../../vis_type_vislib/public/utils/collections';

export const metricVisTypeDefinition = {
name: 'metric',
Expand Down
3 changes: 1 addition & 2 deletions src/legacy/core_plugins/vis_type_metric/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
import { ColorSchemas } from './legacy_imports';
import { Range } from '../../../../plugins/expressions/public';
import { SchemaConfig } from '../../visualizations/public';
import { ColorModes } from '../../vis_type_vislib/public/utils/collections';
import { Labels, Style } from '../../vis_type_vislib/public/types';
import { ColorModes, Labels, Style } from '../../vis_type_vislib/public';

export const visType = 'metric';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';

import { tabifyGetColumns, VisOptionsProps } from '../legacy_imports';
import {
NumberInputOption,
SwitchOption,
SelectOption,
} from '../../../vis_type_vislib/public/components/common';
import { NumberInputOption, SwitchOption, SelectOption } from '../../../vis_type_vislib/public';
import { TableVisParams } from '../types';
import { totalAggregations, isAggConfigNumeric } from './utils';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';

import { ValidatedDualRange } from 'ui/validated_range';
import { VisOptionsProps } from 'ui/vis/editors/default';
import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public/components';
import { SelectOption, SwitchOption } from '../../../vis_type_vislib/public';
import { TagCloudVisParams } from '../types';

function TagCloudOptions({ stateParams, setValue, vis }: VisOptionsProps<TagCloudVisParams>) {
Expand Down
14 changes: 7 additions & 7 deletions src/legacy/core_plugins/vis_type_vislib/public/area.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ import { KbnVislibVisTypesDependencies } from './plugin';

export const createAreaVisTypeDefinition = (deps: KbnVislibVisTypesDependencies) => ({
name: 'area',
title: i18n.translate('kbnVislibVisTypes.area.areaTitle', { defaultMessage: 'Area' }),
title: i18n.translate('visTypeVislib.area.areaTitle', { defaultMessage: 'Area' }),
icon: 'visArea',
description: i18n.translate('kbnVislibVisTypes.area.areaDescription', {
description: i18n.translate('visTypeVislib.area.areaDescription', {
defaultMessage: 'Emphasize the quantity beneath a line chart',
}),
visualization: createVislibVisController(deps),
Expand Down Expand Up @@ -136,7 +136,7 @@ export const createAreaVisTypeDefinition = (deps: KbnVislibVisTypesDependencies)
{
group: AggGroupNames.Metrics,
name: 'metric',
title: i18n.translate('kbnVislibVisTypes.area.metricsTitle', {
title: i18n.translate('visTypeVislib.area.metricsTitle', {
defaultMessage: 'Y-axis',
}),
aggFilter: ['!geo_centroid', '!geo_bounds'],
Expand All @@ -146,7 +146,7 @@ export const createAreaVisTypeDefinition = (deps: KbnVislibVisTypesDependencies)
{
group: AggGroupNames.Metrics,
name: 'radius',
title: i18n.translate('kbnVislibVisTypes.area.radiusTitle', {
title: i18n.translate('visTypeVislib.area.radiusTitle', {
defaultMessage: 'Dot size',
}),
min: 0,
Expand All @@ -156,7 +156,7 @@ export const createAreaVisTypeDefinition = (deps: KbnVislibVisTypesDependencies)
{
group: AggGroupNames.Buckets,
name: 'segment',
title: i18n.translate('kbnVislibVisTypes.area.segmentTitle', {
title: i18n.translate('visTypeVislib.area.segmentTitle', {
defaultMessage: 'X-axis',
}),
min: 0,
Expand All @@ -166,7 +166,7 @@ export const createAreaVisTypeDefinition = (deps: KbnVislibVisTypesDependencies)
{
group: AggGroupNames.Buckets,
name: 'group',
title: i18n.translate('kbnVislibVisTypes.area.groupTitle', {
title: i18n.translate('visTypeVislib.area.groupTitle', {
defaultMessage: 'Split series',
}),
min: 0,
Expand All @@ -176,7 +176,7 @@ export const createAreaVisTypeDefinition = (deps: KbnVislibVisTypesDependencies)
{
group: AggGroupNames.Buckets,
name: 'split',
title: i18n.translate('kbnVislibVisTypes.area.splitTitle', {
title: i18n.translate('visTypeVislib.area.splitTitle', {
defaultMessage: 'Split chart',
}),
min: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function BasicOptions<VisParams extends BasicOptionsParams>({
return (
<>
<SelectOption
label={i18n.translate('kbnVislibVisTypes.controls.vislibBasicOptions.legendPositionLabel', {
label={i18n.translate('visTypeVislib.controls.vislibBasicOptions.legendPositionLabel', {
defaultMessage: 'Legend position',
})}
options={vis.type.editorConfig.collections.legendPositions}
Expand All @@ -46,7 +46,7 @@ function BasicOptions<VisParams extends BasicOptionsParams>({
setValue={setValue}
/>
<SwitchOption
label={i18n.translate('kbnVislibVisTypes.controls.vislibBasicOptions.showTooltipLabel', {
label={i18n.translate('visTypeVislib.controls.vislibBasicOptions.showTooltipLabel', {
defaultMessage: 'Show tooltip',
})}
paramName="addTooltip"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function ColorRanges({
return (
<RangesParamEditor
data-test-subj={dataTestSubj}
error={i18n.translate('kbnVislibVisTypes.controls.colorRanges.errorText', {
error={i18n.translate('visTypeVislib.controls.colorRanges.errorText', {
defaultMessage: 'Each range should be greater than previous.',
})}
hidePlaceholders={true}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function ColorSchemaOptions({
}}
>
<FormattedMessage
id="kbnVislibVisTypes.controls.colorSchema.resetColorsButtonLabel"
id="visTypeVislib.controls.colorSchema.resetColorsButtonLabel"
defaultMessage="Reset colors"
/>
</EuiLink>
Expand All @@ -79,11 +79,11 @@ function ColorSchemaOptions({
disabled={disabled}
helpText={
showHelpText &&
i18n.translate('kbnVislibVisTypes.controls.colorSchema.howToChangeColorsDescription', {
i18n.translate('visTypeVislib.controls.colorSchema.howToChangeColorsDescription', {
defaultMessage: 'Individual colors can be changed in the legend.',
})
}
label={i18n.translate('kbnVislibVisTypes.controls.colorSchema.colorSchemaLabel', {
label={i18n.translate('visTypeVislib.controls.colorSchema.colorSchemaLabel', {
defaultMessage: 'Color schema',
})}
labelAppend={isCustomColors && resetColorsButton}
Expand All @@ -95,7 +95,7 @@ function ColorSchemaOptions({

<SwitchOption
disabled={disabled}
label={i18n.translate('kbnVislibVisTypes.controls.colorSchema.reverseColorSchemaLabel', {
label={i18n.translate('visTypeVislib.controls.colorSchema.reverseColorSchemaLabel', {
defaultMessage: 'Reverse schema',
})}
paramName="invertColors"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function RangeOption<ParamName extends string>({
const [stateValue, setStateValue] = useState(value);
const [isValidState, setIsValidState] = useState(true);

const error = i18n.translate('kbnVislibVisTypes.controls.rangeErrorMessage', {
const error = i18n.translate('visTypeVislib.controls.rangeErrorMessage', {
defaultMessage: 'Values must be on or between {min} and {max}',
values: { min, max },
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function TruncateLabelsOption({ disabled, value = null, setValue }: TruncateLabe

return (
<EuiFormRow
label={i18n.translate('kbnVislibVisTypes.controls.truncateLabel', {
label={i18n.translate('visTypeVislib.controls.truncateLabel', {
defaultMessage: 'Truncate',
})}
fullWidth
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInter
<EuiTitle size="xs">
<h3>
<FormattedMessage
id="kbnVislibVisTypes.controls.gaugeOptions.labelsTitle"
id="visTypeVislib.controls.gaugeOptions.labelsTitle"
defaultMessage="Labels"
/>
</h3>
</EuiTitle>
<EuiSpacer size="s" />

<SwitchOption
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.showLabelsLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.showLabelsLabel', {
defaultMessage: 'Show labels',
})}
paramName="show"
Expand All @@ -52,7 +52,7 @@ function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInter

<TextInputOption
disabled={!stateParams.gauge.labels.show}
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.subTextLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.subTextLabel', {
defaultMessage: 'Sub label',
})}
paramName="subText"
Expand All @@ -64,10 +64,10 @@ function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInter

<SwitchOption
disabled={!stateParams.gauge.labels.show}
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.displayWarningsLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.displayWarningsLabel', {
defaultMessage: 'Display warnings',
})}
tooltip={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.switchWarningsTooltip', {
tooltip={i18n.translate('visTypeVislib.controls.gaugeOptions.switchWarningsTooltip', {
defaultMessage:
'Turns on/off warnings. When turned on, a warning will be shown if not all labels could be displayed.',
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function RangesPanel({
<EuiTitle size="xs">
<h3>
<FormattedMessage
id="kbnVislibVisTypes.controls.gaugeOptions.rangesTitle"
id="visTypeVislib.controls.gaugeOptions.rangesTitle"
defaultMessage="Ranges"
/>
</h3>
Expand All @@ -76,10 +76,10 @@ function RangesPanel({

<SwitchOption
disabled={stateParams.gauge.colorsRange.length < 2}
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.autoExtendRangeLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.autoExtendRangeLabel', {
defaultMessage: 'Auto extend range',
})}
tooltip={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.extendRangeTooltip', {
tooltip={i18n.translate('visTypeVislib.controls.gaugeOptions.extendRangeTooltip', {
defaultMessage: 'Extends range to the maximum value in your data.',
})}
paramName="extendRange"
Expand All @@ -89,7 +89,7 @@ function RangesPanel({

<SwitchOption
data-test-subj="gaugePercentageMode"
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.percentageModeLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.percentageModeLabel', {
defaultMessage: 'Percentage mode',
})}
paramName="percentageMode"
Expand All @@ -107,7 +107,7 @@ function RangesPanel({
/>

<SwitchOption
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.showOutline', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.showOutline', {
defaultMessage: 'Show outline',
})}
paramName="outline"
Expand All @@ -116,7 +116,7 @@ function RangesPanel({
/>

<SwitchOption
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.showLegendLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.showLegendLabel', {
defaultMessage: 'Show legend',
})}
paramName="addLegend"
Expand All @@ -125,7 +125,7 @@ function RangesPanel({
/>

<SwitchOption
label={i18n.translate('kbnVislibVisTypes.controls.gaugeOptions.showScaleLabel', {
label={i18n.translate('visTypeVislib.controls.gaugeOptions.showScaleLabel', {
defaultMessage: 'Show scale',
})}
paramName="show"
Expand Down
Loading

0 comments on commit 2fcac07

Please sign in to comment.