github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove isDeprecated flag on visType (#78820)

Browse source
This commit is contained in:
Tim Roes 2020-09-30 10:46:17 +02:00 • committed by GitHub
parent f8d796aec6
commit 14c7a5e41a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/plugins/region_map/public/region_map_type.js
View file

@ -32,7 +32,6 @@ export function createRegionMapTypeDefinition(dependencies) {
return {
name: 'region_map',
isDeprecated: true,
getDeprecationMessage,
title: i18n.translate('regionMap.mapVis.regionMapTitle', { defaultMessage: 'Region Map' }),
description: i18n.translate('regionMap.mapVis.regionMapDescription', {

1
src/plugins/tile_map/public/tile_map_type.js
View file

@ -33,7 +33,6 @@ export function createTileMapTypeDefinition(dependencies) {
return {
name: 'tile_map',
isDeprecated: true,
getDeprecationMessage,
title: i18n.translate('tileMap.vis.mapTitle', {
defaultMessage: 'Coordinate Map',

6
src/plugins/visualizations/public/vis_types/base_vis_type.ts
View file

@ -44,7 +44,7 @@ interface CommonBaseVisTypeOptions {
useCustomNoDataScreen?: boolean;
inspectorAdapters?: Adapters | (() => Adapters);
isDeprecated?: boolean;
getDeprecationMessage?: (vis: Vis) => ReactElement<any>;
getDeprecationMessage?: (vis: Vis) => ReactElement<{}>;
}
interface ExpressionBaseVisTypeOptions<TVisParams> extends CommonBaseVisTypeOptions {
@ -84,8 +84,7 @@ export class BaseVisType<TVisParams = VisParams> {
useCustomNoDataScreen: boolean;
inspectorAdapters?: Adapters | (() => Adapters);
toExpressionAst?: VisToExpressionAst<TVisParams>;
isDeprecated: boolean;
getDeprecationMessage?: (vis: Vis) => ReactElement<any>;
getDeprecationMessage?: (vis: Vis) => ReactElement<{}>;
constructor(opts: BaseVisTypeOptions<TVisParams>) {
if (!opts.icon && !opts.image) {
@ -123,7 +122,6 @@ export class BaseVisType<TVisParams = VisParams> {
this.useCustomNoDataScreen = opts.useCustomNoDataScreen || false;
this.inspectorAdapters = opts.inspectorAdapters;
this.toExpressionAst = opts.toExpressionAst;
this.isDeprecated = opts.isDeprecated || false;
this.getDeprecationMessage = opts.getDeprecationMessage;
}

45
src/plugins/visualize/public/application/components/visualize_editor_common.tsx
View file

@ -79,34 +79,29 @@ export const VisualizeEditorCommon = ({
/>
)}
{visInstance?.vis?.type?.isExperimental && <ExperimentalVisInfo />}
{visInstance?.vis?.type?.isDeprecated &&
visInstance?.vis?.type?.getDeprecationMessage &&
visInstance.vis.type.getDeprecationMessage(visInstance?.vis)}
{visInstance?.vis?.type?.getDeprecationMessage?.(visInstance.vis)}
{visInstance && (
<EuiScreenReaderOnly>
<h1>
{
// @ts-expect-error
'savedVis' in visInstance && visInstance.savedVis.id ? (
<FormattedMessage
id="visualize.pageHeading"
defaultMessage="{chartName} {chartType} visualization"
values={{
chartName: (visInstance as SavedVisInstance).savedVis.title,
chartType: (visInstance as SavedVisInstance).vis.type.title,
}}
/>
) : (
<FormattedMessage
id="visualize.byValue_pageHeading"
defaultMessage="Visualization of type {chartType} embedded into {originatingApp} app"
values={{
chartType: visInstance.vis.type.title,
originatingApp: originatingApp || 'dashboards',
}}
/>
)
}
{'savedVis' in visInstance && visInstance.savedVis.id ? (
<FormattedMessage
id="visualize.pageHeading"
defaultMessage="{chartName} {chartType} visualization"
values={{
chartName: (visInstance as SavedVisInstance).savedVis.title,
chartType: (visInstance as SavedVisInstance).vis.type.title,
}}
/>
) : (
<FormattedMessage
id="visualize.byValue_pageHeading"
defaultMessage="Visualization of type {chartType} embedded into {originatingApp} app"
values={{
chartType: visInstance.vis.type.title,
originatingApp: originatingApp || 'dashboards',
}}
/>
)}
</h1>
</EuiScreenReaderOnly>
)}