maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Embeddable input (#73033)

Browse source 
* refactor: 💡 move timeRange, filters and query to base embeddabl

* refactor: 💡 use new base embeddable input in explore data

* feat: 🎸 import types as types
This commit is contained in:
Vadim Dalecky 2020-08-21 11:28:37 +02:00 committed by GitHub
parent 3ddc2acd66
commit 74ab9897b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
View file

@ -22,6 +22,7 @@ import { Adapters } from '../types';
import { IContainer } from '../containers/i_container';
import { ViewMode } from '../types';
import { TriggerContextMapping } from '../../../../ui_actions/public';
import type { TimeRange, Query, Filter } from '../../../../data/common';
export interface EmbeddableError {
name: string;
@ -55,6 +56,21 @@ export interface EmbeddableInput {
*/
disableTriggers?: boolean;
/**
* Time range of the chart.
*/
timeRange?: TimeRange;
/**
* Visualization query string used to narrow down results.
*/
query?: Query;
/**
* Visualization filters used to narrow down results.
*/
filters?: Filter[];
[key: string]: unknown;
}

3
src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
View file

@ -60,9 +60,6 @@ export interface VisualizeEmbeddableConfiguration {
}
export interface VisualizeInput extends EmbeddableInput {
timeRange?: TimeRange;
query?: Query;
filters?: Filter[];
vis?: {
colors?: { [key: string]: string };
};

1
x-pack/plugins/discover_enhanced/public/actions/explore_data/abstract_explore_data_action.ts
View file

@ -59,6 +59,7 @@ export abstract class AbstractExploreDataAction<Context extends { embeddable?: I
if (!shared.hasExactlyOneIndexPattern(embeddable)) return false;
if (embeddable.getInput().viewMode !== ViewMode.VIEW) return false;
return true;
}

9
x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
View file

@ -7,9 +7,6 @@
import { Action } from '../../../../../../src/plugins/ui_actions/public';
import { DiscoverUrlGeneratorState } from '../../../../../../src/plugins/discover/public';
import {
isTimeRange,
isQuery,
isFilters,
ApplyGlobalFilterActionContext,
esFilters,
} from '../../../../../../src/plugins/data/public';
@ -64,9 +61,9 @@ export class ExploreDataChartAction extends AbstractExploreDataAction<ExploreDat
const input = embeddable.getInput();
if (isTimeRange(input.timeRange) && !state.timeRange) state.timeRange = input.timeRange;
if (isQuery(input.query)) state.query = input.query;
if (isFilters(input.filters)) state.filters = [...input.filters, ...(state.filters || [])];
if (input.timeRange && !state.timeRange) state.timeRange = input.timeRange;
if (input.query) state.query = input.query;
if (input.filters) state.filters = [...input.filters, ...(state.filters || [])];
}
const path = await urlGenerator.createUrl(state);

7
x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
View file

@ -7,7 +7,6 @@
import { Action } from '../../../../../../src/plugins/ui_actions/public';
import { EmbeddableContext } from '../../../../../../src/plugins/embeddable/public';
import { DiscoverUrlGeneratorState } from '../../../../../../src/plugins/discover/public';
import { isTimeRange, isQuery, isFilters } from '../../../../../../src/plugins/data/public';
import { KibanaURL } from './kibana_url';
import * as shared from './shared';
import { AbstractExploreDataAction } from './abstract_explore_data_action';
@ -42,9 +41,9 @@ export class ExploreDataContextMenuAction extends AbstractExploreDataAction<Embe
const input = embeddable.getInput();
if (isTimeRange(input.timeRange) && !state.timeRange) state.timeRange = input.timeRange;
if (isQuery(input.query)) state.query = input.query;
if (isFilters(input.filters)) state.filters = [...input.filters, ...(state.filters || [])];
if (input.timeRange && !state.timeRange) state.timeRange = input.timeRange;
if (input.query) state.query = input.query;
if (input.filters) state.filters = [...input.filters, ...(state.filters || [])];
}
const path = await urlGenerator.createUrl(state);