Skip to content

Commit f935259

Browse files
nreesenreese
committed
review feedback
1 parent 8aea3fa commit f935259

8 files changed

Lines changed: 22 additions & 14 deletions

File tree

‎x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_fn.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import type {
1212
ExpressionFunctionDefinition,
1313
Render,
1414
} from '../../../../../../src/plugins/expressions/public';
15-
import { RegionMapVisConfig } from './types';
15+
import { REGION_MAP_RENDER, REGION_MAP_VIS_TYPE, RegionMapVisConfig } from './types';
1616

1717
interface Arguments {
1818
visConfig: string;
1919
}
2020

2121
export interface RegionMapVisRenderValue {
22-
visType: 'region_map';
22+
visType: typeof REGION_MAP_VIS_TYPE;
2323
visConfig: RegionMapVisConfig;
2424
filters?: Filter[];
2525
query?: Query;
@@ -49,9 +49,9 @@ export const createRegionMapFn = (): RegionMapExpressionFunctionDefinition => ({
4949
async fn(input, args) {
5050
return {
5151
type: 'render',
52-
as: 'region_map_vis',
52+
as: REGION_MAP_RENDER,
5353
value: {
54-
visType: 'region_map',
54+
visType: REGION_MAP_VIS_TYPE,
5555
visConfig: JSON.parse(args.visConfig),
5656
filters: input.filters,
5757
query: Array.isArray(input.query) ? input.query[0] : input.query,

‎x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import { render, unmountComponentAtNode } from 'react-dom';
1010
import type { ExpressionRenderDefinition } from 'src/plugins/expressions';
1111
import { RegionMapVisRenderValue } from './region_map_fn';
1212
import { RegionMapVisualization } from './region_map_visualization';
13+
import { REGION_MAP_RENDER } from './types';
1314

1415
export const regionMapRenderer = {
15-
name: 'region_map_vis',
16+
name: REGION_MAP_RENDER,
1617
reuseDomNode: true,
1718
render: async (domNode, { filters, query, timeRange, visConfig }, handlers) => {
1819
handlers.onDestroy(() => {

‎x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_vis_type.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import { i18n } from '@kbn/i18n';
99
import { VisTypeDefinition } from '../../../../../../src/plugins/visualizations/public';
1010
import { toExpressionAst } from './to_ast';
11-
import { RegionMapVisParams } from './types';
11+
import { REGION_MAP_VIS_TYPE, RegionMapVisParams } from './types';
1212
import { RegionMapEditor } from './region_map_editor';
1313

1414
export const title = i18n.translate('xpack.maps.regionMapMap.vis.title', {
1515
defaultMessage: 'Region Map',
1616
});
1717

1818
export const regionMapVisType = {
19-
name: 'region_map',
19+
name: REGION_MAP_VIS_TYPE,
2020
title,
2121
icon: 'visMapRegion',
2222
description: i18n.translate('xpack.maps.regionMap.vis.description', {

‎x-pack/plugins/maps/public/legacy_visualizations/region_map/types.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
import type { CreateRegionMapLayerDescriptorParams } from '../../classes/layers/create_region_map_layer_descriptor';
99

10+
export const REGION_MAP_RENDER = 'region_map_vis';
11+
export const REGION_MAP_VIS_TYPE = 'region_map';
12+
1013
export interface RegionMapVisParams {
1114
colorSchema: string;
1215
mapZoom: number;

‎x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_fn.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import type {
1212
ExpressionFunctionDefinition,
1313
Render,
1414
} from '../../../../../../src/plugins/expressions/public';
15-
import { TileMapVisConfig } from './types';
15+
import { TILE_MAP_RENDER, TILE_MAP_VIS_TYPE, TileMapVisConfig } from './types';
1616

1717
interface Arguments {
1818
visConfig: string;
1919
}
2020

2121
export interface TileMapVisRenderValue {
22-
visType: 'tile_map';
22+
visType: typeof TILE_MAP_VIS_TYPE;
2323
visConfig: TileMapVisConfig;
2424
filters?: Filter[];
2525
query?: Query;
@@ -49,9 +49,9 @@ export const createTileMapFn = (): TileMapExpressionFunctionDefinition => ({
4949
async fn(input, args) {
5050
return {
5151
type: 'render',
52-
as: 'tile_map_vis',
52+
as: TILE_MAP_RENDER,
5353
value: {
54-
visType: 'tile_map',
54+
visType: TILE_MAP_VIS_TYPE,
5555
visConfig: JSON.parse(args.visConfig),
5656
filters: input.filters,
5757
query: Array.isArray(input.query) ? input.query[0] : input.query,

‎x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import { render, unmountComponentAtNode } from 'react-dom';
1010
import type { ExpressionRenderDefinition } from 'src/plugins/expressions';
1111
import { TileMapVisRenderValue } from './tile_map_fn';
1212
import { TileMapVisualization } from './tile_map_visualization';
13+
import { TILE_MAP_RENDER } from './types';
1314

1415
export const tileMapRenderer = {
15-
name: 'tile_map_vis',
16+
name: TILE_MAP_RENDER,
1617
reuseDomNode: true,
1718
render: async (domNode, { filters, query, timeRange, visConfig }, handlers) => {
1819
handlers.onDestroy(() => {

‎x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_vis_type.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import { i18n } from '@kbn/i18n';
99
import { VisTypeDefinition } from '../../../../../../src/plugins/visualizations/public';
1010
import { toExpressionAst } from './to_ast';
11-
import { MapTypes, TileMapVisParams } from './types';
11+
import { MapTypes, TileMapVisParams, TILE_MAP_VIS_TYPE } from './types';
1212
import { TileMapEditor } from './tile_map_editor';
1313

1414
export const title = i18n.translate('xpack.maps.tileMap.vis.title', {
1515
defaultMessage: 'Coordinate Map',
1616
});
1717

1818
export const tileMapVisType = {
19-
name: 'tile_map',
19+
name: TILE_MAP_VIS_TYPE,
2020
title,
2121
icon: 'visMapCoordinate',
2222
description: i18n.translate('xpack.maps.tileMap.vis.description', {

‎x-pack/plugins/maps/public/legacy_visualizations/tile_map/types.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
import type { CreateTileMapLayerDescriptorParams } from '../../classes/layers/create_tile_map_layer_descriptor';
99

10+
export const TILE_MAP_RENDER = 'region_map_vis';
11+
export const TILE_MAP_VIS_TYPE = 'tile_map';
12+
1013
export enum MapTypes {
1114
ScaledCircleMarkers = 'Scaled Circle Markers',
1215
ShadedCircleMarkers = 'Shaded Circle Markers',

0 commit comments

Comments
 (0)