legacy agg vis tag cloud convert to lens (elastic#159348)

Part of elastic#154307 Add convert to lens logic for tag cloud visualization --------- Co-authored-by: kibanamachine <[email protected]> Co-authored-by: Stratoula Kalafateli <[email protected]>
mbondyra · Jun 12, 2023 · e8e5cec · e8e5cec
1 parent 5fd356a
commit e8e5cec
Show file tree

Hide file tree

Showing 26 changed files with 336 additions and 163 deletions.
diff --git a/src/plugins/vis_types/gauge/public/convert_to_lens/gauge.ts b/src/plugins/vis_types/gauge/public/convert_to_lens/gauge.ts
@@ -7,32 +7,15 @@
  */
 
 import { v4 as uuidv4 } from 'uuid';
-import {
-  Column,
-  ColumnWithMeta,
-  PercentageModeConfigWithMinMax,
-} from '@kbn/visualizations-plugin/common';
+import { PercentageModeConfigWithMinMax } from '@kbn/visualizations-plugin/common';
 import {
   convertToLensModule,
   getDataViewByIndexPatternId,
 } from '@kbn/visualizations-plugin/public';
+import { excludeMetaFromColumn } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { getDataViewsStart } from '../services';
 import { ConvertGaugeVisToLensVisualization } from './types';
-
-export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => {
-  if ((column as ColumnWithMeta).meta) {
-    return true;
-  }
-  return false;
-};
-
-export const excludeMetaFromColumn = (column: Column) => {
-  if (isColumnWithMeta(column)) {
-    const { meta, ...rest } = column;
-    return rest;
-  }
-  return column;
-};
+import { getConfiguration } from './configurations/gauge';
 
 export const convertToLens: ConvertGaugeVisToLensVisualization = async (vis, timefilter) => {
   if (!timefilter) {
@@ -46,10 +29,8 @@ export const convertToLens: ConvertGaugeVisToLensVisualization = async (vis, tim
     return null;
   }
 
-  const [
-    { getColumnsFromVis, createStaticValueColumn, getPalette, getPercentageModeConfig },
-    { getConfiguration },
-  ] = await Promise.all([convertToLensModule, import('./configurations/gauge')]);
+  const { getColumnsFromVis, createStaticValueColumn, getPalette, getPercentageModeConfig } =
+    await convertToLensModule;
 
   const percentageModeConfig = getPercentageModeConfig(vis.params.gauge, false);
 

diff --git a/src/plugins/vis_types/gauge/public/convert_to_lens/goal.ts b/src/plugins/vis_types/gauge/public/convert_to_lens/goal.ts
@@ -7,32 +7,15 @@
  */
 
 import { v4 as uuidv4 } from 'uuid';
-import {
-  Column,
-  ColumnWithMeta,
-  PercentageModeConfigWithMinMax,
-} from '@kbn/visualizations-plugin/common';
+import { PercentageModeConfigWithMinMax } from '@kbn/visualizations-plugin/common';
 import {
   convertToLensModule,
   getDataViewByIndexPatternId,
 } from '@kbn/visualizations-plugin/public';
+import { excludeMetaFromColumn } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { getDataViewsStart } from '../services';
 import { ConvertGoalVisToLensVisualization } from './types';
-
-export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => {
-  if ((column as ColumnWithMeta).meta) {
-    return true;
-  }
-  return false;
-};
-
-export const excludeMetaFromColumn = (column: Column) => {
-  if (isColumnWithMeta(column)) {
-    const { meta, ...rest } = column;
-    return rest;
-  }
-  return column;
-};
+import { getConfiguration } from './configurations/goal';
 
 export const convertToLens: ConvertGoalVisToLensVisualization = async (vis, timefilter) => {
   if (!timefilter) {
@@ -46,10 +29,8 @@ export const convertToLens: ConvertGoalVisToLensVisualization = async (vis, time
     return null;
   }
 
-  const [
-    { getColumnsFromVis, getPalette, getPercentageModeConfig, createStaticValueColumn },
-    { getConfiguration },
-  ] = await Promise.all([convertToLensModule, import('./configurations/goal')]);
+  const { getColumnsFromVis, getPalette, getPercentageModeConfig, createStaticValueColumn } =
+    await convertToLensModule;
 
   const percentageModeConfig = getPercentageModeConfig(vis.params.gauge, false);
 

diff --git a/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx b/src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
@@ -18,7 +18,6 @@ import { toExpressionAst } from '../to_ast';
 import { getGaugeOptions } from '../editor/components';
 import { GaugeVisParams } from '../types';
 import { SplitTooltip } from './split_tooltip';
-import { convertGaugeToLens } from '../convert_to_lens';
 
 export const getGaugeVisTypeDefinition = (
   props: GaugeTypeProps
@@ -130,8 +129,12 @@ export const getGaugeVisTypeDefinition = (
     ],
   },
   requiresSearch: true,
-  navigateToLens: async (vis, timefilter) => (vis ? convertGaugeToLens(vis, timefilter) : null),
+  navigateToLens: async (vis, timefilter) => {
+    const { convertGaugeToLens } = await import('../convert_to_lens');
+    return vis ? convertGaugeToLens(vis, timefilter) : null;
+  },
   getExpressionVariables: async (vis, timeFilter) => {
+    const { convertGaugeToLens } = await import('../convert_to_lens');
     return {
       canNavigateToLens: Boolean(vis?.params ? await convertGaugeToLens(vis, timeFilter) : null),
     };

diff --git a/src/plugins/vis_types/gauge/public/vis_type/goal.tsx b/src/plugins/vis_types/gauge/public/vis_type/goal.tsx
@@ -17,7 +17,6 @@ import { getGaugeOptions } from '../editor/components';
 import { toExpressionAst } from '../to_ast';
 import { GaugeVisParams, GaugeType, GaugeTypeProps } from '../types';
 import { SplitTooltip } from './split_tooltip';
-import { convertGoalToLens } from '../convert_to_lens';
 
 export const getGoalVisTypeDefinition = (
   props: GaugeTypeProps
@@ -122,8 +121,12 @@ export const getGoalVisTypeDefinition = (
     ],
   },
   requiresSearch: true,
-  navigateToLens: async (vis, timefilter) => (vis ? convertGoalToLens(vis, timefilter) : null),
+  navigateToLens: async (vis, timefilter) => {
+    const { convertGoalToLens } = await import('../convert_to_lens');
+    return vis ? convertGoalToLens(vis, timefilter) : null;
+  },
   getExpressionVariables: async (vis, timeFilter) => {
+    const { convertGoalToLens } = await import('../convert_to_lens');
     return {
       canNavigateToLens: Boolean(vis?.params ? await convertGoalToLens(vis, timeFilter) : null),
     };

diff --git a/src/plugins/vis_types/heatmap/public/convert_to_lens/index.ts b/src/plugins/vis_types/heatmap/public/convert_to_lens/index.ts
@@ -6,31 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { Column, ColumnWithMeta } from '@kbn/visualizations-plugin/common';
 import {
   convertToLensModule,
   getDataViewByIndexPatternId,
 } from '@kbn/visualizations-plugin/public';
+import { excludeMetaFromColumn } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { v4 as uuidv4 } from 'uuid';
 import { getDataViewsStart } from '../services';
 import { getConfiguration } from './configurations';
 import { ConvertHeatmapToLensVisualization } from './types';
 
-export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => {
-  if ((column as ColumnWithMeta).meta) {
-    return true;
-  }
-  return false;
-};
-
-export const excludeMetaFromColumn = (column: Column) => {
-  if (isColumnWithMeta(column)) {
-    const { meta, ...rest } = column;
-    return rest;
-  }
-  return column;
-};
-
 export const convertToLens: ConvertHeatmapToLensVisualization = async (vis, timefilter) => {
   if (!timefilter) {
     return null;

diff --git a/src/plugins/vis_types/heatmap/public/vis_type/heatmap.ts b/src/plugins/vis_types/heatmap/public/vis_type/heatmap.ts
@@ -14,7 +14,6 @@ import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plu
 import { HeatmapTypeProps, HeatmapVisParams, AxisType, ScaleType } from '../types';
 import { toExpressionAst } from '../to_ast';
 import { getHeatmapOptions } from '../editor/components';
-import { convertToLens } from '../convert_to_lens';
 
 export const getHeatmapVisTypeDefinition = ({
   showElasticChartsOptions = false,
@@ -145,8 +144,12 @@ export const getHeatmapVisTypeDefinition = ({
     ],
   },
   requiresSearch: true,
-  navigateToLens: async (vis, timefilter) => (vis ? convertToLens(vis, timefilter) : null),
+  navigateToLens: async (vis, timefilter) => {
+    const { convertToLens } = await import('../convert_to_lens');
+    return vis ? convertToLens(vis, timefilter) : null;
+  },
   getExpressionVariables: async (vis, timeFilter) => {
+    const { convertToLens } = await import('../convert_to_lens');
     return {
       canNavigateToLens: Boolean(vis?.params ? await convertToLens(vis, timeFilter) : null),
     };

diff --git a/src/plugins/vis_types/metric/public/convert_to_lens/index.ts b/src/plugins/vis_types/metric/public/convert_to_lens/index.ts
@@ -7,28 +7,14 @@
  */
 
 import { v4 as uuidv4 } from 'uuid';
-import { Column, ColumnWithMeta } from '@kbn/visualizations-plugin/common';
 import {
   convertToLensModule,
   getDataViewByIndexPatternId,
 } from '@kbn/visualizations-plugin/public';
+import { excludeMetaFromColumn } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { getDataViewsStart } from '../services';
 import { ConvertMetricVisToLensVisualization } from './types';
-
-export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => {
-  if ((column as ColumnWithMeta).meta) {
-    return true;
-  }
-  return false;
-};
-
-export const excludeMetaFromColumn = (column: Column) => {
-  if (isColumnWithMeta(column)) {
-    const { meta, ...rest } = column;
-    return rest;
-  }
-  return column;
-};
+import { getConfiguration } from './configurations';
 
 export const convertToLens: ConvertMetricVisToLensVisualization = async (vis, timefilter) => {
   if (!timefilter) {
@@ -42,8 +28,7 @@ export const convertToLens: ConvertMetricVisToLensVisualization = async (vis, ti
     return null;
   }
 
-  const [{ getColumnsFromVis, getPalette, getPercentageModeConfig }, { getConfiguration }] =
-    await Promise.all([convertToLensModule, import('./configurations')]);
+  const { getColumnsFromVis, getPalette, getPercentageModeConfig } = await convertToLensModule;
 
   const percentageModeConfig = getPercentageModeConfig(vis.params.metric);
   const layers = getColumnsFromVis(

diff --git a/src/plugins/vis_types/metric/public/metric_vis_type.ts b/src/plugins/vis_types/metric/public/metric_vis_type.ts
@@ -13,7 +13,6 @@ import { AggGroupNames } from '@kbn/data-plugin/public';
 import { MetricVisOptions } from './components';
 import { toExpressionAst } from './to_ast';
 import { VisParams } from './types';
-import { convertToLens } from './convert_to_lens';
 
 export const createMetricVisTypeDefinition = (): VisTypeDefinition<VisParams> => ({
   name: 'metric',
@@ -103,8 +102,12 @@ export const createMetricVisTypeDefinition = (): VisTypeDefinition<VisParams> =>
     ],
   },
   requiresSearch: true,
-  navigateToLens: async (vis, timefilter) => (vis ? convertToLens(vis, timefilter) : null),
+  navigateToLens: async (vis, timefilter) => {
+    const { convertToLens } = await import('./convert_to_lens');
+    return vis ? convertToLens(vis, timefilter) : null;
+  },
   getExpressionVariables: async (vis, timeFilter) => {
+    const { convertToLens } = await import('./convert_to_lens');
     return {
       canNavigateToLens: Boolean(vis?.params ? await convertToLens(vis, timeFilter) : null),
     };

diff --git a/src/plugins/vis_types/pie/public/convert_to_lens/index.ts b/src/plugins/vis_types/pie/public/convert_to_lens/index.ts
@@ -6,31 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { Column, ColumnWithMeta } from '@kbn/visualizations-plugin/common';
 import {
   convertToLensModule,
   getDataViewByIndexPatternId,
 } from '@kbn/visualizations-plugin/public';
+import { excludeMetaFromColumn } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { v4 as uuidv4 } from 'uuid';
 import { getDataViewsStart } from '../services';
 import { getConfiguration } from './configurations';
 import { ConvertPieToLensVisualization } from './types';
 
-export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => {
-  if ((column as ColumnWithMeta).meta) {
-    return true;
-  }
-  return false;
-};
-
-export const excludeMetaFromColumn = (column: Column) => {
-  if (isColumnWithMeta(column)) {
-    const { meta, ...rest } = column;
-    return rest;
-  }
-  return column;
-};
-
 export const convertToLens: ConvertPieToLensVisualization = async (vis, timefilter) => {
   if (!timefilter) {
     return null;

diff --git a/src/plugins/vis_types/pie/public/vis_type/pie.ts b/src/plugins/vis_types/pie/public/vis_type/pie.ts
@@ -21,7 +21,6 @@ import { DEFAULT_PERCENT_DECIMALS } from '../../common';
 import { PieTypeProps } from '../types';
 import { toExpressionAst } from '../to_ast';
 import { getPieOptions } from '../editor/components';
-import { convertToLens } from '../convert_to_lens';
 
 export const getPieVisTypeDefinition = ({
   showElasticChartsOptions = false,
@@ -122,8 +121,12 @@ export const getPieVisTypeDefinition = ({
   },
   hierarchicalData: true,
   requiresSearch: true,
-  navigateToLens: async (vis, timefilter) => (vis ? convertToLens(vis, timefilter) : null),
+  navigateToLens: async (vis, timefilter) => {
+    const { convertToLens } = await import('../convert_to_lens');
+    return vis ? convertToLens(vis, timefilter) : null;
+  },
   getExpressionVariables: async (vis, timeFilter) => {
+    const { convertToLens } = await import('../convert_to_lens');
     return {
       canNavigateToLens: Boolean(vis?.params ? await convertToLens(vis, timeFilter) : null),
     };

diff --git a/src/plugins/vis_types/table/public/convert_to_lens/index.ts b/src/plugins/vis_types/table/public/convert_to_lens/index.ts
@@ -7,32 +7,18 @@
  */
 
 import { METRIC_TYPES } from '@kbn/data-plugin/common';
-import { Column, ColumnWithMeta, SchemaConfig } from '@kbn/visualizations-plugin/common';
+import { SchemaConfig } from '@kbn/visualizations-plugin/common';
 import {
   convertToLensModule,
   getVisSchemas,
   getDataViewByIndexPatternId,
 } from '@kbn/visualizations-plugin/public';
+import { excludeMetaFromColumn } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { v4 as uuidv4 } from 'uuid';
 import { getDataViewsStart } from '../services';
 import { getConfiguration } from './configurations';
 import { ConvertTableToLensVisualization } from './types';
 
-export const isColumnWithMeta = (column: Column): column is ColumnWithMeta => {
-  if ((column as ColumnWithMeta).meta) {
-    return true;
-  }
-  return false;
-};
-
-export const excludeMetaFromColumn = (column: Column) => {
-  if (isColumnWithMeta(column)) {
-    const { meta, ...rest } = column;
-    return rest;
-  }
-  return column;
-};
-
 export const convertToLens: ConvertTableToLensVisualization = async (vis, timefilter) => {
   if (!timefilter) {
     return null;

diff --git a/src/plugins/vis_types/table/public/table_vis_type.ts b/src/plugins/vis_types/table/public/table_vis_type.ts
@@ -13,7 +13,6 @@ import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '@kbn/visualizations-plu
 import { TableVisParams, VIS_TYPE_TABLE } from '../common';
 import { TableOptions } from './components/table_vis_options_lazy';
 import { toExpressionAst } from './to_ast';
-import { convertToLens } from './convert_to_lens';
 
 export const tableVisTypeDefinition: VisTypeDefinition<TableVisParams> = {
   name: VIS_TYPE_TABLE,
@@ -103,8 +102,12 @@ export const tableVisTypeDefinition: VisTypeDefinition<TableVisParams> = {
   hasPartialRows: (vis) => vis.params.showPartialRows,
   hierarchicalData: (vis) => vis.params.showPartialRows || vis.params.showMetricsAtAllLevels,
   requiresSearch: true,
-  navigateToLens: async (vis, timefilter) => (vis ? convertToLens(vis, timefilter) : null),
+  navigateToLens: async (vis, timefilter) => {
+    const { convertToLens } = await import('./convert_to_lens');
+    return vis ? convertToLens(vis, timefilter) : null;
+  },
   getExpressionVariables: async (vis, timeFilter) => {
+    const { convertToLens } = await import('./convert_to_lens');
     return {
       canNavigateToLens: Boolean(vis?.params ? await convertToLens(vis, timeFilter) : null),
     };

diff --git a/src/plugins/vis_types/tagcloud/kibana.jsonc b/src/plugins/vis_types/tagcloud/kibana.jsonc
@@ -11,11 +11,13 @@
       "data",
       "expressions",
       "visualizations",
-      "charts"
+      "charts",
+      "dataViews"
     ],
     "requiredBundles": [
       "kibanaReact",
-      "visDefaultEditor"
+      "visDefaultEditor",
+      "kibanaUtils"
     ]
   }
 }