...

elastic · Apr 21, 2020 · 6c223c3 · 6c223c3
1 parent 0553da9
commit 6c223c3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
@@ -39,7 +39,7 @@ const mockField = {
 };
 
 describe('createFiltersFromValueClick', () => {
-  let dataPoints: ValueClickTriggerContext['data'];
+  let dataPoints: ValueClickTriggerContext['data']['data'];
 
   beforeEach(() => {
     dataPoints = [

diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.ts
@@ -114,7 +114,7 @@ const createFilter = async (
 export const createFiltersFromValueClickAction = async ({
   data,
   negate,
-}: ValueClickTriggerContext) => {
+}: ValueClickTriggerContext['data']) => {
   const filters: Filter[] = [];
 
   await Promise.all(

diff --git a/src/plugins/data/public/actions/value_click_action.ts b/src/plugins/data/public/actions/value_click_action.ts
@@ -36,7 +36,7 @@ export type ValueClickActionContext = ValueClickTriggerContext;
 
 async function isCompatible(context: ValueClickActionContext) {
   try {
-    const filters: Filter[] = await createFiltersFromValueClickAction(context);
+    const filters: Filter[] = await createFiltersFromValueClickAction(context.data);
     return filters.length > 0;
   } catch {
     return false;
@@ -61,7 +61,7 @@ export function valueClickAction(
         throw new IncompatibleActionError();
       }
 
-      const filters: Filter[] = await createFiltersFromValueClickAction(context);
+      const filters: Filter[] = await createFiltersFromValueClickAction(context.data);
 
       let selectedFilters = filters;
 

diff --git a/src/plugins/embeddable/public/lib/triggers/triggers.ts b/src/plugins/embeddable/public/lib/triggers/triggers.ts
@@ -35,8 +35,10 @@ interface EventData {
 export interface ValueClickTriggerContext {
   embeddable?: IEmbeddable;
   timeFieldName?: string;
-  data: EventData[];
-  negate?: boolean;
+  data: {
+    data: EventData[];
+    negate?: boolean;
+  };
 }
 
 export interface RangeSelectTriggerContext {

diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -263,7 +263,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
           const context = {
             embeddable: this,
             timeFieldName: this.vis.data.indexPattern!.timeFieldName!,
-            ...event.data,
+            data: event.data,
           };
           getUiActions()
             .getTrigger(triggerId)

diff --git a/src/plugins/visualizations/public/expressions/vis.ts b/src/plugins/visualizations/public/expressions/vis.ts
@@ -71,7 +71,12 @@ export class ExprVis extends EventEmitter {
           if (!this.eventsSubject) return;
           this.eventsSubject.next({
             name: 'filterBucket',
-            data: data.data ? data : { data: [data] },
+            data: data.data
+              ? {
+                  data: data.data,
+                  negate: data.negate,
+                }
+              : { data: [data] },
           });
         },
         brush: (data: any) => {