Skip to content

Commit eb08d0e

Browse files
streamichstreamich
committed
refactor: 💡 rename trigger contexts
1 parent 98a1c5c commit eb08d0e

12 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎src/plugins/data/public/actions/filters/create_filters_from_range_select.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import moment from 'moment';
2222
import { esFilters, IFieldType, RangeFilterParams } from '../../../public';
2323
import { getIndexPatterns } from '../../../public/services';
2424
import { deserializeAggConfig } from '../../search/expressions/utils';
25-
import { RangeSelectTriggerContext } from '../../../../embeddable/public';
25+
import { RangeSelectContext } from '../../../../embeddable/public';
2626

27-
export async function createFiltersFromRangeSelectAction(event: RangeSelectTriggerContext['data']) {
27+
export async function createFiltersFromRangeSelectAction(event: RangeSelectContext['data']) {
2828
const column: Record<string, any> = event.table.columns[event.column];
2929

3030
if (!column || !column.meta) {

‎src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { dataPluginMock } from '../../../public/mocks';
2727
import { setIndexPatterns } from '../../../public/services';
2828
import { mockDataServices } from '../../../public/search/aggs/test_helpers';
2929
import { createFiltersFromValueClickAction } from './create_filters_from_value_click';
30-
import { ValueClickTriggerContext } from '../../../../embeddable/public';
30+
import { ValueClickContext } from '../../../../embeddable/public';
3131

3232
const mockField = {
3333
name: 'bytes',
@@ -39,7 +39,7 @@ const mockField = {
3939
};
4040

4141
describe('createFiltersFromValueClick', () => {
42-
let dataPoints: ValueClickTriggerContext['data']['data'];
42+
let dataPoints: ValueClickContext['data']['data'];
4343

4444
beforeEach(() => {
4545
dataPoints = [

‎src/plugins/data/public/actions/filters/create_filters_from_value_click.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { KibanaDatatable } from '../../../../../plugins/expressions/public';
2121
import { deserializeAggConfig } from '../../search/expressions';
2222
import { esFilters, Filter } from '../../../public';
2323
import { getIndexPatterns } from '../../../public/services';
24-
import { ValueClickTriggerContext } from '../../../../embeddable/public';
24+
import { ValueClickContext } from '../../../../embeddable/public';
2525

2626
/**
2727
* For terms aggregations on `__other__` buckets, this assembles a list of applicable filter
@@ -114,7 +114,7 @@ const createFilter = async (
114114
export const createFiltersFromValueClickAction = async ({
115115
data,
116116
negate,
117-
}: ValueClickTriggerContext['data']) => {
117+
}: ValueClickContext['data']) => {
118118
const filters: Filter[] = [];
119119

120120
await Promise.all(

‎src/plugins/data/public/actions/select_range_action.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import {
2424
ActionByType,
2525
} from '../../../../plugins/ui_actions/public';
2626
import { createFiltersFromRangeSelectAction } from './filters/create_filters_from_range_select';
27-
import { RangeSelectTriggerContext } from '../../../embeddable/public';
27+
import { RangeSelectContext } from '../../../embeddable/public';
2828
import { FilterManager, TimefilterContract, esFilters } from '..';
2929

3030
export const ACTION_SELECT_RANGE = 'ACTION_SELECT_RANGE';
3131

32-
export type SelectRangeActionContext = RangeSelectTriggerContext;
32+
export type SelectRangeActionContext = RangeSelectContext;
3333

3434
async function isCompatible(context: SelectRangeActionContext) {
3535
try {

‎src/plugins/data/public/actions/value_click_action.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import {
2727
import { getOverlays, getIndexPatterns } from '../services';
2828
import { applyFiltersPopover } from '../ui/apply_filters';
2929
import { createFiltersFromValueClickAction } from './filters/create_filters_from_value_click';
30-
import { ValueClickTriggerContext } from '../../../embeddable/public';
30+
import { ValueClickContext } from '../../../embeddable/public';
3131
import { Filter, FilterManager, TimefilterContract, esFilters } from '..';
3232

3333
export const ACTION_VALUE_CLICK = 'ACTION_VALUE_CLICK';
3434

35-
export type ValueClickActionContext = ValueClickTriggerContext;
35+
export type ValueClickActionContext = ValueClickContext;
3636

3737
async function isCompatible(context: ValueClickActionContext) {
3838
try {

‎src/plugins/embeddable/public/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ export {
4848
EmbeddableOutput,
4949
EmbeddablePanel,
5050
EmbeddableRoot,
51-
ValueClickTriggerContext,
52-
RangeSelectTriggerContext,
51+
ValueClickContext,
52+
RangeSelectContext,
5353
ErrorEmbeddable,
5454
IContainer,
5555
IEmbeddable,

‎src/plugins/embeddable/public/lib/triggers/triggers.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export interface EmbeddableContext {
2525
embeddable: IEmbeddable;
2626
}
2727

28-
export interface ValueClickTriggerContext<T extends IEmbeddable = IEmbeddable> {
28+
export interface ValueClickContext<T extends IEmbeddable = IEmbeddable> {
2929
embeddable?: T;
3030
data: {
3131
data: Array<{
@@ -39,7 +39,7 @@ export interface ValueClickTriggerContext<T extends IEmbeddable = IEmbeddable> {
3939
};
4040
}
4141

42-
export interface RangeSelectTriggerContext<T extends IEmbeddable = IEmbeddable> {
42+
export interface RangeSelectContext<T extends IEmbeddable = IEmbeddable> {
4343
embeddable?: T;
4444
data: {
4545
table: KibanaDatatable;
@@ -50,16 +50,16 @@ export interface RangeSelectTriggerContext<T extends IEmbeddable = IEmbeddable>
5050
}
5151

5252
export type ChartActionContext<T extends IEmbeddable = IEmbeddable> =
53-
| ValueClickTriggerContext<T>
54-
| RangeSelectTriggerContext<T>;
53+
| ValueClickContext<T>
54+
| RangeSelectContext<T>;
5555

5656
export const isValueClickTriggerContext = (
5757
context: ChartActionContext
58-
): context is ValueClickTriggerContext => context.data && 'data' in context.data;
58+
): context is ValueClickContext => context.data && 'data' in context.data;
5959

6060
export const isRangeSelectTriggerContext = (
6161
context: ChartActionContext
62-
): context is RangeSelectTriggerContext => context.data && 'range' in context.data;
62+
): context is RangeSelectContext => context.data && 'range' in context.data;
6363

6464
export const CONTEXT_MENU_TRIGGER = 'CONTEXT_MENU_TRIGGER';
6565
export const contextMenuTrigger: Trigger<'CONTEXT_MENU_TRIGGER'> = {

‎src/plugins/ui_actions/public/types.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { TriggerInternal } from './triggers/trigger_internal';
2222
import { Filter } from '../../data/public';
2323
import { SELECT_RANGE_TRIGGER, VALUE_CLICK_TRIGGER, APPLY_FILTER_TRIGGER } from './triggers';
2424
import { IEmbeddable } from '../../embeddable/public';
25-
import { RangeSelectTriggerContext, ValueClickTriggerContext } from '../../embeddable/public';
25+
import { RangeSelectContext, ValueClickContext } from '../../embeddable/public';
2626

2727
export type TriggerRegistry = Map<TriggerId, TriggerInternal<any>>;
2828
export type ActionRegistry = Map<string, ActionInternal>;
@@ -37,8 +37,8 @@ export type TriggerContext = BaseContext;
3737

3838
export interface TriggerContextMapping {
3939
[DEFAULT_TRIGGER]: TriggerContext;
40-
[SELECT_RANGE_TRIGGER]: RangeSelectTriggerContext;
41-
[VALUE_CLICK_TRIGGER]: ValueClickTriggerContext;
40+
[SELECT_RANGE_TRIGGER]: RangeSelectContext;
41+
[VALUE_CLICK_TRIGGER]: ValueClickContext;
4242
[APPLY_FILTER_TRIGGER]: {
4343
embeddable: IEmbeddable;
4444
filters: Filter[];

‎x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import { createDashboardUrlGenerator } from '../../../../../../../src/plugins/da
2222
import { UrlGeneratorsService } from '../../../../../../../src/plugins/share/public/url_generators';
2323
import { VisualizeEmbeddableContract } from '../../../../../../../src/plugins/visualizations/public';
2424
import {
25-
RangeSelectTriggerContext,
26-
ValueClickTriggerContext,
25+
RangeSelectContext,
26+
ValueClickContext,
2727
} from '../../../../../../../src/plugins/embeddable/public';
2828
import { StartDependencies } from '../../../plugin';
2929
import { SavedObjectLoader } from '../../../../../../../src/plugins/saved_objects/public';
@@ -136,8 +136,8 @@ describe('.execute() & getHref', () => {
136136
const context = ({
137137
data: {
138138
...(useRangeEvent
139-
? ({ range: {} } as RangeSelectTriggerContext['data'])
140-
: ({ data: [] } as ValueClickTriggerContext['data'])),
139+
? ({ range: {} } as RangeSelectContext['data'])
140+
: ({ data: [] } as ValueClickContext['data'])),
141141
timeFieldName: 'order_date',
142142
},
143143
embeddable: {

‎x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/types.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
*/
66

77
import {
8-
ValueClickTriggerContext,
9-
RangeSelectTriggerContext,
8+
ValueClickContext,
9+
RangeSelectContext,
1010
IEmbeddable,
1111
} from '../../../../../../../src/plugins/embeddable/public';
1212

1313
export type ActionContext<T extends IEmbeddable = IEmbeddable> =
14-
| ValueClickTriggerContext<T>
15-
| RangeSelectTriggerContext<T>;
14+
| ValueClickContext<T>
15+
| RangeSelectContext<T>;
1616

1717
export interface Config {
1818
dashboardId?: string;

0 commit comments

Comments
 (0)