Add deprecated message to tile_map and region_map visualizations.

src/plugins/tile_map/kibana.json

@@ -10,7 +10,8 @@
  "expressions",
  "mapsLegacy",
  "kibanaLegacy",
- "data"
+ "data",
+ "share"
  ],
  "requiredBundles": [
  "kibanaUtils",

src/plugins/tile_map/public/get_deprecation_message.tsx

@@ -0,0 +1,114 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiButton, EuiLink } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { getCoreService, getQueryService, getShareService } from './services';
+import { indexPatterns } from '../../data/public';
+
+export function getDeprecationMessage(vis: Vis) {
+ const mapsTileMapUrlGenerator = getShareService().urlGenerators.getUrlGenerator(
+ 'MAPS_APP_TILE_MAP_URL_GENERATOR'
+ );
+
+ let action;
+ if (!mapsTileMapUrlGenerator) {
+ action = (
+ <FormattedMessage
+ id="tileMap.vis.defaultDistributionMessage"
+ defaultMessage="To get Maps, upgrade to the {defaultDistribution} of Elasticsearch and Kibana."
+ values={{
+ defaultDistribution: (
+ <EuiLink
+ color="accent"
+ external
+ href="https://www.elastic.co/downloads/kibana"
+ target="_blank"
+ >
+ default distribution
+ </EuiLink>
+ ),
+ }}
+ />
+ );
+ } else {
+ action = (
+ <div>
+ <EuiButton
+ onClick={async (e) => {
+ e.preventDefault();
+
+ let geoFieldName: string;
+ const bucketAggs = vis.data?.aggs.byType('buckets');
+ if (bucketAggs.length && bucketAggs[0].type.dslName === 'geohash_grid') {
+ geoFieldName = bucketAggs[0].getField()?.name;
+ } else {
+ // attempt to default to first geo point field when geohash is not configured yet
+ const geoField = vis.data.indexPattern.fields.find((field) => {
+ return (
+ !indexPatterns.isNestedField(field) &&
+ field.aggregatable &&
+ field.type === 'geo_point'
+ );
+ });
+ if (geoField) {
+ geoFieldName = geoField.name;
+ }
+ }
+
+ let metricAgg: string = 'count';
+ let metricFieldName: string;
+ const metricAggs = vis.data?.aggs.byType('metrics');
+ if (metricAggs.length) {
+ metricAgg = metricAggs[0].type.dslName;
+ metricFieldName = metricAggs[0].getField()?.name;
+ }
+
+ const query = getQueryService();
+ const url = await mapsTileMapUrlGenerator.createUrl({
+ title: vis.title,
+ mapType: vis.params.mapType,
+ indexPatternId: vis.data.indexPattern.id,
+ geoFieldName,
+ metricAgg,
+ metricFieldName,
+ filters: query.filterManager.getFilters(),
+ query: query.queryString.getQuery(),
+ timeRange: query.timefilter.timefilter.getTime(),
+ });
+ getCoreService().application.navigateToUrl(url);
+ }}
+ size="s"
+ >
+ <FormattedMessage id="tileMap.vis.viewInMaps" defaultMessage="View in Maps" />
+ </EuiButton>
+ </div>
+ );
+ }
+
+ return (
+ <FormattedMessage
+ id="tileMap.vis.deprecationMessage"
+ defaultMessage="Coordinate map will migrate to Maps in 8.0. With Maps, you can add multiple layers and indices, plot individual documents, symbolize features from data values, and more. {action}"
+ values={{ action }}
+ />
+ );
+}

src/plugins/tile_map/public/plugin.ts

@@ -34,8 +34,15 @@ import { createTileMapFn } from './tile_map_fn';
 import { createTileMapTypeDefinition } from './tile_map_type';
 import { IServiceSettings, MapsLegacyPluginSetup } from '../../maps_legacy/public';
 import { DataPublicPluginStart } from '../../data/public';
-import { setFormatService, setQueryService, setKibanaLegacy } from './services';
+import {
+ setCoreService,
+ setFormatService,
+ setQueryService,
+ setKibanaLegacy,
+ setShareService,
+} from './services';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
+import { SharePluginSetup, SharePluginStart } from '../../share/public';
 
 export interface TileMapConfigType {
  tilemap: any;
@@ -61,6 +68,7 @@ export interface TileMapPluginSetupDependencies {
 export interface TileMapPluginStartDependencies {
  data: DataPublicPluginStart;
  kibanaLegacy: KibanaLegacyStart;
+ share: SharePluginStart;
 }
 
 export interface TileMapPluginSetup {
@@ -100,10 +108,12 @@ export class TileMapPlugin implements Plugin<TileMapPluginSetup, TileMapPluginSt
  };
  }
 
- public start(core: CoreStart, { data, kibanaLegacy }: TileMapPluginStartDependencies) {
- setFormatService(data.fieldFormats);
- setQueryService(data.query);
- setKibanaLegacy(kibanaLegacy);
+ public start(core: CoreStart, plugins: TileMapPluginStartDependencies) {
+ setFormatService(plugins.data.fieldFormats);
+ setQueryService(plugins.data.query);
+ setKibanaLegacy(plugins.kibanaLegacy);
+ setShareService(plugins.share);
+ setCoreService(core);
  return {};
  }
 }

src/plugins/tile_map/public/services.ts

@@ -17,9 +17,13 @@
  * under the License.
  */
 
+import { CoreStart } from 'kibana/public';
 import { createGetterSetter } from '../../kibana_utils/public';
 import { DataPublicPluginStart } from '../../data/public';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
+import { SharePluginSetup, SharePluginStart } from '../../share/public';
+
+export const [getCoreService, setCoreService] = createGetterSetter<CoreStart>('Core');
 
 export const [getFormatService, setFormatService] = createGetterSetter<
  DataPublicPluginStart['fieldFormats']
@@ -29,6 +33,8 @@ export const [getQueryService, setQueryService] = createGetterSetter<
  DataPublicPluginStart['query']
 >('Query');
 
+export const [getShareService, setShareService] = createGetterSetter<SharePluginSetup>('Share');
+
 export const [getKibanaLegacy, setKibanaLegacy] = createGetterSetter<KibanaLegacyStart>(
  'KibanaLegacy'
 );

src/plugins/tile_map/public/tile_map_type.js

@@ -25,13 +25,16 @@ import { createTileMapVisualization } from './tile_map_visualization';
 import { TileMapOptions } from './components/tile_map_options';
 import { supportsCssFilters } from './css_filters';
 import { truncatedColorSchemas } from '../../charts/public';
+import { getDeprecationMessage } from './get_deprecation_message';
 
 export function createTileMapTypeDefinition(dependencies) {
  const CoordinateMapsVisualization = createTileMapVisualization(dependencies);
  const { uiSettings, serviceSettings } = dependencies;
 
  return {
  name: 'tile_map',
+ isDeprecated: true,
+ getDeprecationMessage,
  title: i18n.translate('tileMap.vis.mapTitle', {
  defaultMessage: 'Coordinate Map',
  }),

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

@@ -18,6 +18,7 @@
  */
 
 import _ from 'lodash';
+import { ReactElement } from 'react';
 import { VisToExpressionAst, VisualizationControllerConstructor } from '../types';
 import { TriggerContextMapping } from '../../../ui_actions/public';
 import { Adapters } from '../../../inspector/public';
@@ -43,6 +44,8 @@ export interface BaseVisTypeOptions {
  useCustomNoDataScreen?: boolean;
  inspectorAdapters?: Adapters | (() => Adapters);
  toExpressionAst?: VisToExpressionAst;
+ isDeprecated?: boolean;
+ getDeprecationMessage?: (vis: Vis) => ReactElement<any>;
 }
 
 export class BaseVisType {
@@ -68,6 +71,8 @@ export class BaseVisType {
  useCustomNoDataScreen: boolean;
  inspectorAdapters?: Adapters | (() => Adapters);
  toExpressionAst?: VisToExpressionAst;
+ isDeprecated: boolean;
+ getDeprecationMessage?: (vis: Vis) => ReactElement<any>;
 
  constructor(opts: BaseVisTypeOptions) {
  if (!opts.icon && !opts.image) {
@@ -105,6 +110,8 @@ export class BaseVisType {
  this.useCustomNoDataScreen = opts.useCustomNoDataScreen || false;
  this.inspectorAdapters = opts.inspectorAdapters;
  this.toExpressionAst = opts.toExpressionAst;
+ this.isDeprecated = opts.isDeprecated || false;
+ this.getDeprecationMessage = opts.getDeprecationMessage;
  }
 
  public get schemas() {

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

@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { ReactElement } from 'react';
+import { EuiCallOut } from '@elastic/eui';
+
+export function DeprecatedVisInfo({ message }: ReactElement<any>) {
+ return (
+ <EuiCallOut
+ className="hide-for-sharing"
+ data-test-subj="deprecatedVisInfo"
+ size="s"
+ title={message}
+ />
+ );
+}

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

@@ -22,6 +22,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiScreenReaderOnly } from '@elastic/eui';
 import { VisualizeTopNav } from './visualize_top_nav';
 import { ExperimentalVisInfo } from './experimental_vis_info';
+import { DeprecatedVisInfo } from './deprecated_vis_info';
 import {
  SavedVisInstance,
  VisualizeAppState,
@@ -79,6 +80,9 @@ export const VisualizeEditorCommon = ({
  />
  )}
  {visInstance?.vis?.type?.isExperimental && <ExperimentalVisInfo />}
+ {visInstance?.vis?.type?.isDeprecated && visInstance?.vis?.type?.getDeprecationMessage && (
+ <DeprecatedVisInfo message={visInstance.vis.type.getDeprecationMessage(visInstance?.vis)} />
+ )}
  {visInstance && (
  <EuiScreenReaderOnly>
  <h1>