Use MapInput type from Maps plugin (#61539)

elastic · Apr 13, 2020 · 19fcc61 · 19fcc61
1 parent 1084b1c
commit 19fcc61
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
@@ -5,8 +5,6 @@
  */
 
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { TimeRange, Filter as DataFilter } from 'src/plugins/data/public';
-import { EmbeddableInput } from 'src/plugins/embeddable/public';
 import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
 import { Filter, MapCenter, TimeRange as TimeRangeArg } from '../../../types';
 import {
@@ -15,6 +13,7 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
+import { MapEmbeddableInput } from '../../../../../plugins/maps/public';
 
 interface Arguments {
   id: string;
@@ -24,32 +23,12 @@ interface Arguments {
   timerange: TimeRangeArg | null;
 }
 
-// Map embeddable is missing proper typings, so type is just to document what we
-// are expecting to pass to the embeddable
-export type SavedMapInput = EmbeddableInput & {
-  id: string;
-  isLayerTOCOpen: boolean;
-  timeRange?: TimeRange;
-  refreshConfig: {
-    isPaused: boolean;
-    interval: number;
-  };
-  hideFilterActions: true;
-  filters: DataFilter[];
-  mapCenter?: {
-    lat: number;
-    lon: number;
-    zoom: number;
-  };
-  hiddenLayers?: string[];
-};
-
 const defaultTimeRange = {
   from: 'now-15m',
   to: 'now',
 };
 
-type Output = EmbeddableExpression<SavedMapInput>;
+type Output = EmbeddableExpression<MapEmbeddableInput>;
 
 export function savedMap(): ExpressionFunctionDefinition<
   'savedMap',
@@ -108,8 +87,8 @@ export function savedMap(): ExpressionFunctionDefinition<
           filters: getQueryFilters(filters),
           timeRange: args.timerange || defaultTimeRange,
           refreshConfig: {
-            isPaused: false,
-            interval: 0,
+            pause: false,
+            value: 0,
           },
 
           mapCenter: center,

diff --git a/...lugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts b/...lugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
@@ -5,23 +5,23 @@
  */
 
 import { toExpression } from './map';
-import { SavedMapInput } from '../../../functions/common/saved_map';
+import { MapEmbeddableInput } from '../../../../../maps/public';
 import { fromExpression, Ast } from '@kbn/interpreter/common';
 
 const baseSavedMapInput = {
   id: 'embeddableId',
   filters: [],
   isLayerTOCOpen: false,
   refreshConfig: {
-    isPaused: true,
-    interval: 0,
+    pause: true,
+    value: 0,
   },
   hideFilterActions: true as true,
 };
 
 describe('toExpression', () => {
   it('converts to a savedMap expression', () => {
-    const input: SavedMapInput = {
+    const input: MapEmbeddableInput = {
       ...baseSavedMapInput,
     };
 
@@ -39,7 +39,7 @@ describe('toExpression', () => {
   });
 
   it('includes optional input values', () => {
-    const input: SavedMapInput = {
+    const input: MapEmbeddableInput = {
       ...baseSavedMapInput,
       mapCenter: {
         lat: 1,

diff --git a/...acy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/...acy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedMapInput } from '../../../functions/common/saved_map';
+import { MapEmbeddableInput } from '../../../../../maps/public';
 
-export function toExpression(input: SavedMapInput): string {
+export function toExpression(input: MapEmbeddableInput): string {
   const expressionParts = [] as string[];
 
   expressionParts.push('savedMap');