Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

legacy agg vis tag cloud convert to lens #159348

Merged
merged 24 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1a49fee
add convert to lens functionallity for legacy tag cloud
nreese Jun 8, 2023
60df984
return lnsTagcloud
nreese Jun 8, 2023
9fdb17d
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Jun 8, 2023
4a77b04
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine Jun 8, 2023
e24fcf9
getSuggestionFromConvertToLensContext
nreese Jun 8, 2023
0e79bfa
Merge branch 'main' into tagcloud_convertotlens
kibanamachine Jun 8, 2023
95c5071
tslint
nreese Jun 8, 2023
5546f3f
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Jun 8, 2023
5765a4a
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Jun 8, 2023
d3fc04d
tslint lens plugin
nreese Jun 8, 2023
1f66a5e
eslint
nreese Jun 9, 2023
d12cf0f
reduce table vis plugin size
nreese Jun 9, 2023
60ad414
clean up vis_type/goal
nreese Jun 9, 2023
8a75918
clean up remaining vis_types
nreese Jun 9, 2023
27e7f74
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Jun 9, 2023
1eb0800
tslint
nreese Jun 9, 2023
1897a70
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Jun 9, 2023
59940dc
import from common to avoid collision with mocked package
nreese Jun 9, 2023
6940d7c
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Jun 9, 2023
a4f5385
add unit test
nreese Jun 12, 2023
da2925d
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Jun 12, 2023
da9d008
Merge branch 'main' into tagcloud_convertotlens
stratoula Jun 12, 2023
954650e
Merge branch 'main' into tagcloud_convertotlens
kibanamachine Jun 12, 2023
c6b1b4a
ignoreGlobalFilters
nreese Jun 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 5 additions & 24 deletions src/plugins/vis_types/gauge/public/convert_to_lens/gauge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);

Expand Down
29 changes: 5 additions & 24 deletions src/plugins/vis_types/gauge/public/convert_to_lens/goal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);

Expand Down
7 changes: 5 additions & 2 deletions src/plugins/vis_types/gauge/public/vis_type/gauge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
};
Expand Down
7 changes: 5 additions & 2 deletions src/plugins/vis_types/gauge/public/vis_type/goal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
};
Expand Down
17 changes: 1 addition & 16 deletions src/plugins/vis_types/heatmap/public/convert_to_lens/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions src/plugins/vis_types/heatmap/public/vis_type/heatmap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
};
Expand Down
21 changes: 3 additions & 18 deletions src/plugins/vis_types/metric/public/convert_to_lens/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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(
Expand Down
7 changes: 5 additions & 2 deletions src/plugins/vis_types/metric/public/metric_vis_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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),
};
Expand Down
17 changes: 1 addition & 16 deletions src/plugins/vis_types/pie/public/convert_to_lens/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions src/plugins/vis_types/pie/public/vis_type/pie.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
};
Expand Down
18 changes: 2 additions & 16 deletions src/plugins/vis_types/table/public/convert_to_lens/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions src/plugins/vis_types/table/public/table_vis_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
};
Expand Down
6 changes: 4 additions & 2 deletions src/plugins/vis_types/tagcloud/kibana.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
"data",
"expressions",
"visualizations",
"charts"
"charts",
"dataViews"
],
"requiredBundles": [
"kibanaReact",
"visDefaultEditor"
"visDefaultEditor",
"kibanaUtils"
]
}
}
Loading