Handle element changing into a filter (elastic#97890)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine · Jun 22, 2021 · dd86829 · dd86829
1 parent cf97abe
commit dd86829
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
@@ -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']);

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
@@ -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, [

diff --git a/x-pack/plugins/canvas/public/lib/create_handlers.ts b/x-pack/plugins/canvas/public/lib/create_handlers.ts
@@ -105,7 +105,7 @@ export const createDispatchedHandlerFactory = (
       },
 
       getFilter() {
-        return element.filter;
+        return element.filter || '';
       },
 
       onComplete(fn: () => void) {