From 28716bbdc2f09e447c880e668e5b7a0a7f306bf6 Mon Sep 17 00:00:00 2001
From: Tim Roes <mail@timroes.de>
Date: Tue, 29 Sep 2020 18:42:16 +0200
Subject: [PATCH] Remove isDeprecated flag on visType

---
 .../region_map/public/region_map_type.js      |  1 -
 src/plugins/tile_map/public/tile_map_type.js  |  1 -
 .../public/vis_types/base_vis_type.ts         |  6 +--
 .../components/visualize_editor_common.tsx    | 45 +++++++++----------
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/plugins/region_map/public/region_map_type.js b/src/plugins/region_map/public/region_map_type.js
index 105554f48f5502..4cd30d32698edf 100644
--- a/src/plugins/region_map/public/region_map_type.js
+++ b/src/plugins/region_map/public/region_map_type.js
@@ -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', {
diff --git a/src/plugins/tile_map/public/tile_map_type.js b/src/plugins/tile_map/public/tile_map_type.js
index 7073958a1b3184..cc19a8bbcef917 100644
--- a/src/plugins/tile_map/public/tile_map_type.js
+++ b/src/plugins/tile_map/public/tile_map_type.js
@@ -33,7 +33,6 @@ export function createTileMapTypeDefinition(dependencies) {
 
   return {
     name: 'tile_map',
-    isDeprecated: true,
     getDeprecationMessage,
     title: i18n.translate('tileMap.vis.mapTitle', {
       defaultMessage: 'Coordinate Map',
diff --git a/src/plugins/visualizations/public/vis_types/base_vis_type.ts b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
index 149146bf77e73a..de1afc254e0d39 100644
--- a/src/plugins/visualizations/public/vis_types/base_vis_type.ts
+++ b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
@@ -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;
   }
 
diff --git a/src/plugins/visualize/public/application/components/visualize_editor_common.tsx b/src/plugins/visualize/public/application/components/visualize_editor_common.tsx
index 4321d7dd1a6ca1..4b7b4dae02d0a6 100644
--- a/src/plugins/visualize/public/application/components/visualize_editor_common.tsx
+++ b/src/plugins/visualize/public/application/components/visualize_editor_common.tsx
@@ -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>
       )}