Skip to content

Commit c114687

Browse files
author
Tim Roes
authored
Remove isDeprecated flag on visType (#78820) (#78914)
1 parent 56cb430 commit c114687

File tree

4 files changed

+22
-31
lines changed

4 files changed

+22
-31
lines changed

src/plugins/region_map/public/region_map_type.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export function createRegionMapTypeDefinition(dependencies) {
3232

3333
return {
3434
name: 'region_map',
35-
isDeprecated: true,
3635
getDeprecationMessage,
3736
title: i18n.translate('regionMap.mapVis.regionMapTitle', { defaultMessage: 'Region Map' }),
3837
description: i18n.translate('regionMap.mapVis.regionMapDescription', {

src/plugins/tile_map/public/tile_map_type.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export function createTileMapTypeDefinition(dependencies) {
3333

3434
return {
3535
name: 'tile_map',
36-
isDeprecated: true,
3736
getDeprecationMessage,
3837
title: i18n.translate('tileMap.vis.mapTitle', {
3938
defaultMessage: 'Coordinate Map',

src/plugins/visualizations/public/vis_types/base_vis_type.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ interface CommonBaseVisTypeOptions {
4444
useCustomNoDataScreen?: boolean;
4545
inspectorAdapters?: Adapters | (() => Adapters);
4646
isDeprecated?: boolean;
47-
getDeprecationMessage?: (vis: Vis) => ReactElement<any>;
47+
getDeprecationMessage?: (vis: Vis) => ReactElement<{}>;
4848
}
4949

5050
interface ExpressionBaseVisTypeOptions<TVisParams> extends CommonBaseVisTypeOptions {
@@ -84,8 +84,7 @@ export class BaseVisType<TVisParams = VisParams> {
8484
useCustomNoDataScreen: boolean;
8585
inspectorAdapters?: Adapters | (() => Adapters);
8686
toExpressionAst?: VisToExpressionAst<TVisParams>;
87-
isDeprecated: boolean;
88-
getDeprecationMessage?: (vis: Vis) => ReactElement<any>;
87+
getDeprecationMessage?: (vis: Vis) => ReactElement<{}>;
8988

9089
constructor(opts: BaseVisTypeOptions<TVisParams>) {
9190
if (!opts.icon && !opts.image) {
@@ -123,7 +122,6 @@ export class BaseVisType<TVisParams = VisParams> {
123122
this.useCustomNoDataScreen = opts.useCustomNoDataScreen || false;
124123
this.inspectorAdapters = opts.inspectorAdapters;
125124
this.toExpressionAst = opts.toExpressionAst;
126-
this.isDeprecated = opts.isDeprecated || false;
127125
this.getDeprecationMessage = opts.getDeprecationMessage;
128126
}
129127

src/plugins/visualize/public/application/components/visualize_editor_common.tsx

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,29 @@ export const VisualizeEditorCommon = ({
7979
/>
8080
)}
8181
{visInstance?.vis?.type?.isExperimental && <ExperimentalVisInfo />}
82-
{visInstance?.vis?.type?.isDeprecated &&
83-
visInstance?.vis?.type?.getDeprecationMessage &&
84-
visInstance.vis.type.getDeprecationMessage(visInstance?.vis)}
82+
{visInstance?.vis?.type?.getDeprecationMessage?.(visInstance.vis)}
8583
{visInstance && (
8684
<EuiScreenReaderOnly>
8785
<h1>
88-
{
89-
// @ts-expect-error
90-
'savedVis' in visInstance && visInstance.savedVis.id ? (
91-
<FormattedMessage
92-
id="visualize.pageHeading"
93-
defaultMessage="{chartName} {chartType} visualization"
94-
values={{
95-
chartName: (visInstance as SavedVisInstance).savedVis.title,
96-
chartType: (visInstance as SavedVisInstance).vis.type.title,
97-
}}
98-
/>
99-
) : (
100-
<FormattedMessage
101-
id="visualize.byValue_pageHeading"
102-
defaultMessage="Visualization of type {chartType} embedded into {originatingApp} app"
103-
values={{
104-
chartType: visInstance.vis.type.title,
105-
originatingApp: originatingApp || 'dashboards',
106-
}}
107-
/>
108-
)
109-
}
86+
{'savedVis' in visInstance && visInstance.savedVis.id ? (
87+
<FormattedMessage
88+
id="visualize.pageHeading"
89+
defaultMessage="{chartName} {chartType} visualization"
90+
values={{
91+
chartName: (visInstance as SavedVisInstance).savedVis.title,
92+
chartType: (visInstance as SavedVisInstance).vis.type.title,
93+
}}
94+
/>
95+
) : (
96+
<FormattedMessage
97+
id="visualize.byValue_pageHeading"
98+
defaultMessage="Visualization of type {chartType} embedded into {originatingApp} app"
99+
values={{
100+
chartType: visInstance.vis.type.title,
101+
originatingApp: originatingApp || 'dashboards',
102+
}}
103+
/>
104+
)}
110105
</h1>
111106
</EuiScreenReaderOnly>
112107
)}

0 commit comments

Comments
 (0)