github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ES|QL][Lens] Sends the dashboard filters in the request (#189611)

Browse source 
## Summary

Passes the dashboard context (query, filters, timerange) to the ES|QL
query in order to calculate the results correctly
This commit is contained in:
Stratoula Kalafateli 2024-07-31 19:56:23 +02:00 • committed by GitHub
parent f5aec5de29
commit cf3c4056a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/helpers.ts
View file

@ -10,12 +10,14 @@ import {
getESQLResults,
formatESQLColumns,
} from '@kbn/esql-utils';
import type { AggregateQuery } from '@kbn/es-query';
import { type AggregateQuery, buildEsQuery } from '@kbn/es-query';
import type { ESQLRow } from '@kbn/es-types';
import { getLensAttributesFromSuggestion } from '@kbn/visualization-utils';
import type { DataViewSpec } from '@kbn/data-views-plugin/public';
import type { DataView } from '@kbn/data-views-plugin/common';
import type { DatatableColumn } from '@kbn/expressions-plugin/common';
import { getTime } from '@kbn/data-plugin/common';
import { type DataPublicPluginStart } from '@kbn/data-plugin/public';
import type { TypedLensByValueInput } from '../../../embeddable/embeddable_component';
import type { LensPluginStartDependencies } from '../../../plugin';
import type { DatasourceMap, VisualizationMap } from '../../../types';
@ -27,6 +29,21 @@ export interface ESQLDataGridAttrs {
columns: DatatableColumn[];
}
const getDSLFilter = (queryService: DataPublicPluginStart['query'], timeFieldName?: string) => {
const kqlQuery = queryService.queryString.getQuery();
const filters = queryService.filterManager.getFilters();
const timeFilter =
queryService.timefilter.timefilter.getTime() &&
getTime(undefined, queryService.timefilter.timefilter.getTime(), {
fieldName: timeFieldName,
});
return buildEsQuery(undefined, kqlQuery || [], [
...(filters ?? []),
...(timeFilter ? [timeFilter] : []),
]);
};
export const getGridAttrs = async (
query: AggregateQuery,
adHocDataViews: DataViewSpec[],
@ -38,18 +55,20 @@ export const getGridAttrs = async (
return adHoc.name === indexPattern;
});
const [results, dataView] = await Promise.all([
getESQLResults({
esqlQuery: query.esql,
search: deps.data.search.search,
signal: abortController?.signal,
dropNullColumns: true,
timeRange: deps.data.query.timefilter.timefilter.getAbsoluteTime(),
}),
dataViewSpec
? deps.dataViews.create(dataViewSpec)
: getESQLAdHocDataview(query.esql, deps.dataViews),
]);
const dataView = dataViewSpec
? await deps.dataViews.create(dataViewSpec)
: await getESQLAdHocDataview(query.esql, deps.dataViews);
const filter = getDSLFilter(deps.data.query, dataView.timeFieldName);
const results = await getESQLResults({
esqlQuery: query.esql,
search: deps.data.search.search,
signal: abortController?.signal,
filter,
dropNullColumns: true,
timeRange: deps.data.query.timefilter.timefilter.getAbsoluteTime(),
});
const columns = formatESQLColumns(results.response.columns);