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

Handle element changing into a filter (#97890)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Corey Robertson 2021-06-22 10:56:47 -04:00 • committed by GitHub
parent 1397461aca
commit 46f43784b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
View file

@ -45,9 +45,12 @@ export const dropdownFilter: RendererFactory<Config> = () => ({
reuseDomNode: true,
height: 50,
render(domNode, config, handlers) {
const filterExpression = handlers.getFilter();
let filterExpression = handlers.getFilter();
if (filterExpression !== '') {
if (filterExpression === undefined || filterExpression.indexOf('exactly')) {
filterExpression = '';
handlers.setFilter(filterExpression);
} else if (filterExpression !== '') {
// NOTE: setFilter() will cause a data refresh, avoid calling unless required
// compare expression and filter, update filter if needed
const { changed, newAst } = syncFilterExpression(config, filterExpression, ['filterGroup']);

9
x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
View file

@ -19,6 +19,8 @@ import { RendererFactory } from '../../../../types';
const { timeFilter: strings } = RendererStrings;
const defaultTimeFilterExpression = 'timefilter column=@timestamp from=now-24h to=now';
export const timeFilterFactory: StartInitializer<RendererFactory<Arguments>> = (core, plugins) => {
const { uiSettings } = core;
@ -38,9 +40,12 @@ export const timeFilterFactory: StartInitializer<RendererFactory<Arguments>> = (
help: strings.getHelpDescription(),
reuseDomNode: true, // must be true, otherwise popovers don't work
render: async (domNode: HTMLElement, config: Arguments, handlers: RendererHandlers) => {
const filterExpression = handlers.getFilter();
let filterExpression = handlers.getFilter();
if (filterExpression !== '') {
if (filterExpression === undefined || filterExpression.indexOf('timefilter') !== 0) {
filterExpression = defaultTimeFilterExpression;
handlers.setFilter(filterExpression);
} else if (filterExpression !== '') {
// NOTE: setFilter() will cause a data refresh, avoid calling unless required
// compare expression and filter, update filter if needed
const { changed, newAst } = syncFilterExpression(config, filterExpression, [

2
x-pack/plugins/canvas/public/lib/create_handlers.ts
View file

@ -109,7 +109,7 @@ export const createDispatchedHandlerFactory = (
},
getFilter() {
return element.filter;
return element.filter || '';
},
onComplete(fn: () => void) {