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

fix: 🐛 pass viz filters to embeddable #73023

Closed
wants to merge 1 commit into from
Closed

fix: 🐛 pass viz filters to embeddable #73023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ export abstract class Embeddable<
// Make sure this panel hasn't been removed immediately after it was added, but before it finished loading.
if (!parent.getInput().panels[this.id]) return;

const newInput = parent.getInputForChild<TEmbeddableInput>(this.id);
this.onResetInput(newInput);
// WARNING: This line removes vis filters filters.
// const newInput = parent.getInputForChild<TEmbeddableInput>(this.id);
// this.onResetInput(newInput);
});
}
}
Expand Down
19 changes: 19 additions & 0 deletions src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import { createVisEmbeddableFromObject } from './create_vis_embeddable_from_obje
import { StartServicesGetter } from '../../../kibana_utils/public';
import { VisualizationsStartDeps } from '../plugin';
import { VISUALIZE_ENABLE_LABS_SETTING } from '../../common/constants';
import { Filter } from '../../../data/common';

interface VisualizationAttributes extends SavedObjectAttributes {
visState: string;
Expand All @@ -52,6 +53,15 @@ export interface VisualizeEmbeddableFactoryDeps {
start: StartServicesGetter<Pick<VisualizationsStartDeps, 'inspector' | 'embeddable'>>;
}

type FilterOrFilterList = undefined | Filter | Filter[];
type SearchSourceFilters = FilterOrFilterList | (() => FilterOrFilterList);

const toFilterArray = (filters: Filter | Filter[] | undefined) =>
!filters ? [] : Array.isArray(filters) ? filters : [filters];

const getSearchSourceFilters = (filters: SearchSourceFilters): Filter[] =>
typeof filters === 'function' ? toFilterArray(filters()) : toFilterArray(filters);

export class VisualizeEmbeddableFactory
implements
EmbeddableFactoryDefinition<
Expand Down Expand Up @@ -115,6 +125,15 @@ export class VisualizeEmbeddableFactory
try {
const savedObject = await savedVisualizations.get(savedObjectId);
const visState = convertToSerializedVis(savedObject);

input = {
...input,
filters: [
...(input.filters || []),
...getSearchSourceFilters(visState.data.searchSource.filter),
],
};

const vis = new Vis(savedObject.visState.type, visState);
await vis.setState(visState);
return createVisEmbeddableFromObject(this.deps)(vis, input, parent);
Expand Down