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.

Sign up for GitHub

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

Jump to bottom

[Canvas] Handle element changing into a filter #97890

Merged
merged 3 commits into from
Jun 22, 2021
Merged

[Canvas] Handle element changing into a filter #97890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc0a12a
Handle element changing into a filter
Apr 21, 2021
3b9602c
Merge branch 'master' into default-time-filter-value
kibanamachine May 13, 2021
35634c6
Merge branch 'master' into default-time-filter-value
kibanamachine Jun 22, 2021
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
7 changes: 5 additions & 2 deletions x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
9 changes: 7 additions & 2 deletions x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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, [
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/public/lib/create_handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const createDispatchedHandlerFactory = (
},

getFilter() {
return element.filter;
return element.filter || '';
},

onComplete(fn: () => void) {
Expand Down