Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/plugins/embeddable/public/lib/triggers/triggers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ export interface EmbeddableContext {
}

export interface EmbeddableVisTriggerContext {
embeddable: IEmbeddable;
timeFieldName: string;
embeddable?: IEmbeddable;
timeFieldName?: string;
data: {
e: MouseEvent;
e?: MouseEvent;
data: unknown;
};
}
Expand Down
19 changes: 15 additions & 4 deletions x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,20 @@ function createMockFilterManager() {
};
}

function createMockTimefilter() {
const unsubscribe = jest.fn();

return {
getTime: jest.fn(() => ({ from: 'now-7d', to: 'now' })),
setTime: jest.fn(),
getTimeUpdate$: () => ({
subscribe: ({ next }: { next: () => void }) => {
return unsubscribe;
},
}),
};
}

describe('Lens App', () => {
let frame: jest.Mocked<EditorFrameInstance>;
let core: ReturnType<typeof coreMock['createStart']>;
Expand Down Expand Up @@ -108,10 +122,7 @@ describe('Lens App', () => {
query: {
filterManager: createMockFilterManager(),
timefilter: {
timefilter: {
getTime: jest.fn(() => ({ from: 'now-7d', to: 'now' })),
setTime: jest.fn(),
},
timefilter: createMockTimefilter(),
},
},
indexPatterns: {
Expand Down
15 changes: 15 additions & 0 deletions x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,23 @@ export function App({
trackUiEvent('app_filters_updated');
},
});

const timeSubscription = data.query.timefilter.timefilter.getTimeUpdate$().subscribe({
next: () => {
const currentRange = data.query.timefilter.timefilter.getTime();
setState(s => ({
...s,
dateRange: {
fromDate: currentRange.from,
toDate: currentRange.to,
},
}));
},
});

return () => {
filterSubscription.unsubscribe();
timeSubscription.unsubscribe();
};
}, []);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ import {
IIndexPattern,
TimefilterContract,
} from 'src/plugins/data/public';

import { Subscription } from 'rxjs';
import { ReactExpressionRendererType } from '../../../../../../../src/plugins/expressions/public';
import { VIS_EVENT_TO_TRIGGER } from '../../../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/embeddable/events';

import {
Embeddable as AbstractEmbeddable,
EmbeddableOutput,
Expand Down Expand Up @@ -90,6 +93,18 @@ export class Embeddable extends AbstractEmbeddable<LensEmbeddableInput, LensEmbe
.subscribe(this.reload.bind(this));
}

public supportedTriggers() {
switch (this.savedVis.visualizationType) {
case 'lnsXY':
// TODO: case 'lnsDatatable':
return [VIS_EVENT_TO_TRIGGER.filter];

case 'lnsMetric':
default:
return [];
}
}

onContainerStateChanged(containerState: LensEmbeddableInput) {
const cleanedFilters = containerState.filters
? containerState.filters.filter(filter => !filter.meta.disabled)
Expand Down
5 changes: 4 additions & 1 deletion x-pack/legacy/plugins/lens/public/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import {
stopReportManager,
trackUiEvent,
} from './lens_ui_telemetry';

import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
import { KibanaLegacySetup } from '../../../../../src/plugins/kibana_legacy/public';
import { NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../../../plugins/lens/common';
import {
Expand All @@ -40,7 +42,6 @@ import { EmbeddableSetup, EmbeddableStart } from '../../../../../src/plugins/emb
import { EditorFrameStart } from './types';
import { getLensAliasConfig } from './vis_type_alias';
import { VisualizationsSetup } from './legacy_imports';

export interface LensPluginSetupDependencies {
kibanaLegacy: KibanaLegacySetup;
expressions: ExpressionsSetup;
Expand All @@ -56,6 +57,7 @@ export interface LensPluginStartDependencies {
data: DataPublicPluginStart;
embeddable: EmbeddableStart;
expressions: ExpressionsStart;
uiActions: UiActionsStart;
}

export const isRisonObject = (value: RisonValue): value is RisonObject => {
Expand Down Expand Up @@ -217,6 +219,7 @@ export class LensPlugin {

start(core: CoreStart, startDependencies: LensPluginStartDependencies) {
this.createEditorFrame = this.editorFrameService.start(core, startDependencies).createInstance;
this.xyVisualization.start(core, startDependencies);
}

stop() {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion x-pack/legacy/plugins/lens/public/xy_visualization/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,27 @@
*/

import { EUI_CHARTS_THEME_DARK, EUI_CHARTS_THEME_LIGHT } from '@elastic/eui/dist/eui_charts_theme';
import { CoreSetup, IUiSettingsClient } from 'src/core/public';
import { CoreSetup, IUiSettingsClient, CoreStart } from 'src/core/public';
import moment from 'moment-timezone';
import { FormatFactory } from '../legacy_imports';
import { ExpressionsSetup } from '../../../../../../src/plugins/expressions/public';
import { xyVisualization } from './xy_visualization';
import { xyChart, getXyChartRenderer } from './xy_expression';
import { legendConfig, xConfig, layerConfig } from './types';
import { EditorFrameSetup } from '../types';
import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';
import { setExecuteTriggerActions } from './services';

export interface XyVisualizationPluginSetupPlugins {
expressions: ExpressionsSetup;
formatFactory: FormatFactory;
editorFrame: EditorFrameSetup;
}

interface XyVisualizationPluginStartPlugins {
uiActions: UiActionsStart;
}

function getTimeZone(uiSettings: IUiSettingsClient) {
const configuredTimeZone = uiSettings.get('dateFormat:tz');
if (configuredTimeZone === 'Browser') {
Expand Down Expand Up @@ -53,4 +59,7 @@ export class XyVisualization {

editorFrame.registerVisualization(xyVisualization);
}
start(core: CoreStart, { uiActions }: XyVisualizationPluginStartPlugins) {
setExecuteTriggerActions(uiActions.executeTriggerActions);
}
}
12 changes: 12 additions & 0 deletions x-pack/legacy/plugins/lens/public/xy_visualization/services.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import { createGetterSetter } from '../../../../../../src/plugins/kibana_utils/public';
import { UiActionsStart } from '../../../../../../src/plugins/ui_actions/public';

export const [getExecuteTriggerActions, setExecuteTriggerActions] = createGetterSetter<
UiActionsStart['executeTriggerActions']
>('executeTriggerActions');
Loading