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
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* under the License.
*/

import { TimeRange } from 'src/plugins/data/public';
import { Filter } from '@kbn/es-query';
import { TimeRange } from '../../../../../../plugins/data/public';
import { Adapters } from '../../../../../../plugins/inspector/public';
import { Query } from '../../../../../../plugins/data/public';
import { ExpressionAST } from '../../../../../../plugins/expressions/common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import React from 'react';
import ReactDOM from 'react-dom';
import { i18n } from '@kbn/i18n';
import { EuiBasicTable } from '@elastic/eui';
import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { ExpressionFunction } from '../../../../../../src/plugins/expressions/common';
import { KibanaDatatable } from '../../../../../../src/legacy/core_plugins/interpreter/public';
import { LensMultiTable } from '../types';
import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/data/public/expressions/lib/_types';
import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public';
import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';

export interface DatatableColumns {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
* you may not use this file except in compliance with the Elastic License.
*/

// import { Registry } from '@kbn/interpreter/target/common';
import { CoreSetup } from 'src/core/public';
import { getFormat, FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
import { datatableVisualization } from './visualization';
import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/data/public/expressions';
import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public';
import { setup as expressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
import { datatable, datatableColumns, getDatatableRenderer } from './expression';

export interface DatatableVisualizationPluginSetupPlugins {
Expand Down Expand Up @@ -42,7 +41,7 @@ const plugin = new DatatableVisualizationPlugin();

export const datatableVisualizationSetup = () =>
plugin.setup(null, {
expressions: dataSetup.expressions,
expressions: expressionsSetup,
fieldFormat: {
formatFactory: getFormat,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
createExpressionRendererMock,
DatasourceMock,
} from '../mocks';
import { ExpressionRenderer } from 'src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
import { DragDrop } from '../../drag_drop';
import { EuiPanel, EuiToolTip } from '@elastic/eui';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
*/

import React, { useEffect, useReducer } from 'react';
import {
ExpressionRenderer,
Query,
} from '../../../../../../../src/legacy/core_plugins/data/public';
import { Query } from '../../../../../../../src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
import { Datasource, DatasourcePublicAPI, FramePublicAPI, Visualization } from '../../types';
import { reducer, getInitialState } from './state_management';
import { DataPanelWrapper } from './data_panel_wrapper';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
DatasourceMock,
createMockFramePublicAPI,
} from '../mocks';
import { ExpressionRenderer } from 'src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
import { SuggestionPanel, SuggestionPanelProps } from './suggestion_panel';
import { getSuggestions, Suggestion } from './suggestion_helpers';
import { fromExpression } from '@kbn/interpreter/target/common';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
import { Action } from './state_management';
import { Datasource, Visualization, FramePublicAPI } from '../../types';
import { getSuggestions, Suggestion, switchToSuggestion } from './suggestion_helpers';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
import { prependDatasourceExpression, prependKibanaContext } from './expression_helpers';
import { debouncedComponent } from '../../debounced_component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React from 'react';

import { ExpressionRendererProps } from '../../../../../../../src/legacy/core_plugins/data/public';
import { ExpressionRendererProps } from '../../../../../../../src/legacy/core_plugins/expressions/public';
import { Visualization, FramePublicAPI, TableSuggestion } from '../../types';
import {
createMockVisualization,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, { useState, useEffect, useMemo, useContext } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiCodeBlock, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { toExpression } from '@kbn/interpreter/common';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
import { Action } from './state_management';
import { Datasource, Visualization, FramePublicAPI } from '../../types';
import { DragDrop, DragContext } from '../../drag_drop';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import { Embeddable } from './embeddable';
import { TimeRange } from 'src/plugins/data/public';
import { Query, ExpressionRendererProps } from 'src/legacy/core_plugins/data/public';
import { Query } from 'src/legacy/core_plugins/data/public';
import { ExpressionRendererProps } from 'src/legacy/core_plugins/expressions/public';
import { Filter } from '@kbn/es-query';
import { Document } from '../../persistence';
import { act } from 'react-dom/test-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';

import { TimeRange } from 'src/plugins/data/public';
import { Query, StaticIndexPattern, ExpressionRenderer } from 'src/legacy/core_plugins/data/public';
import { Query, StaticIndexPattern } from 'src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
import { Filter } from '@kbn/es-query';
import { Subscription } from 'rxjs';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ import { Chrome } from 'ui/chrome';

import { capabilities } from 'ui/capabilities';
import { i18n } from '@kbn/i18n';
import {
IndexPatterns,
ExpressionRenderer,
IndexPattern,
} from 'src/legacy/core_plugins/data/public';
import { IndexPatterns, IndexPattern } from 'src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
import {
EmbeddableFactory as AbstractEmbeddableFactory,
ErrorEmbeddable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiText, EuiIcon } from '@elastic/eui';
import { TimeRange } from 'src/plugins/data/public';
import { Query } from 'src/legacy/core_plugins/data/public';
import { Filter } from '@kbn/es-query';
import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/data/public';
import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';

export interface ExpressionWrapperProps {
ExpressionRenderer: ExpressionRenderer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { mergeTables } from './merge_tables';
import { KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { KibanaDatatable } from 'src/legacy/core_plugins/interpreter/public';

describe('lens_merge_tables', () => {
it('should produce a row with the nested table as defined', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
*/

import { i18n } from '@kbn/i18n';
import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/types';
import { KibanaDatatable } from '../../../../../../src/legacy/core_plugins/interpreter/public';
import { LensMultiTable } from '../types';

interface MergeTables {
Expand Down
33 changes: 18 additions & 15 deletions x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
*/

import React from 'react';
import { ExpressionRendererProps } from 'src/legacy/core_plugins/data/public';
import { ExpressionRendererProps } from 'src/legacy/core_plugins/expressions/public';
import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
import {
setup as dataSetup,
start as dataStart,
} from '../../../../../../src/legacy/core_plugins/data/public/legacy';
ExpressionsSetup,
ExpressionsStart,
} from '../../../../../../src/legacy/core_plugins/expressions/public';
import { DatasourcePublicAPI, FramePublicAPI, Visualization, Datasource } from '../types';
import { EditorFrameSetupPlugins, EditorFrameStartPlugins } from './plugin';

type DataSetup = typeof dataSetup;
type DataStart = typeof dataStart;

export function createMockVisualization(): jest.Mocked<Visualization> {
return {
Expand Down Expand Up @@ -85,11 +85,15 @@ export function createMockFramePublicAPI(): FrameMock {
type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;

export type MockedSetupDependencies = Omit<EditorFrameSetupPlugins, 'data'> & {
data: Omit<DataSetup, 'expressions'> & { expressions: jest.Mocked<DataSetup['expressions']> };
data: Omit<DataSetup, 'expressions'> & {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was in place to mock the expressions part of the data plugin, but as it's a separate plugin now you should be able to do this:

export type MockedSetupDependencies = Omit<EditorFrameSetupPlugins, 'expressions'> & {
   expressions: jest.Mocked<ExpressionsSetup>;
};

expressions: jest.Mocked<ExpressionsSetup>;
};
};

export type MockedStartDependencies = Omit<EditorFrameStartPlugins, 'data'> & {
data: Omit<DataSetup, 'expressions'> & { expressions: jest.Mocked<DataStart['expressions']> };
data: Omit<DataSetup, 'expressions'> & {
Copy link
Copy Markdown
Contributor

@flash1293 flash1293 Sep 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing here -

export type MockedSetupDependencies = Omit<EditorFrameStartPlugins, 'expressions'> & {
   expressions: jest.Mocked<ExpressionsStart>;
};

expressions: jest.Mocked<ExpressionsStart>;
};
};

export function createExpressionRendererMock(): jest.Mock<
Expand All @@ -101,11 +105,10 @@ export function createExpressionRendererMock(): jest.Mock<

export function createMockSetupDependencies() {
return ({
data: {
expressions: {
registerFunction: jest.fn(),
registerRenderer: jest.fn(),
},
data: {},
expressions: {
registerFunction: jest.fn(),
registerRenderer: jest.fn(),
},
chrome: {
getSavedObjectsClient: () => {},
Expand All @@ -116,13 +119,13 @@ export function createMockSetupDependencies() {
export function createMockStartDependencies() {
return ({
data: {
expressions: {
ExpressionRenderer: jest.fn(() => null),
},
indexPatterns: {
indexPatterns: {},
},
},
expressions: {
ExpressionRenderer: jest.fn(() => null),
},
embeddables: {
registerEmbeddableFactory: jest.fn(),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jest.mock('../../../../../../src/legacy/core_plugins/data/public/legacy', () =>
start: {},
setup: {},
}));
jest.mock('../../../../../../src/legacy/core_plugins/expressions/public/legacy', () => ({
start: {},
setup: {},
}));
jest.mock('./embeddable/embeddable_factory', () => ({
EmbeddableFactory: class Mock {},
}));
Expand Down
14 changes: 11 additions & 3 deletions x-pack/legacy/plugins/lens/public/editor_frame_plugin/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import {
setup as dataSetup,
start as dataStart,
} from '../../../../../../src/legacy/core_plugins/data/public/legacy';
import {
setup as expressionsSetup,
start as expressionsStart,
} from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
import {
Datasource,
Visualization,
Expand All @@ -29,10 +33,12 @@ import { getActiveDatasourceIdFromDoc } from './editor_frame/state_management';

export interface EditorFrameSetupPlugins {
data: typeof dataSetup;
expressions: typeof expressionsSetup;
}

export interface EditorFrameStartPlugins {
data: typeof dataStart;
expressions: typeof expressionsStart;
embeddables: ReturnType<EmbeddablePlugin['start']>;
chrome: Chrome;
}
Expand All @@ -44,7 +50,7 @@ export class EditorFramePlugin {
private readonly visualizations: Record<string, Visualization> = {};

public setup(_core: CoreSetup | null, plugins: EditorFrameSetupPlugins): EditorFrameSetup {
plugins.data.expressions.registerFunction(() => mergeTables);
plugins.expressions.registerFunction(() => mergeTables);

return {
registerDatasource: (name, datasource) => {
Expand All @@ -61,7 +67,7 @@ export class EditorFramePlugin {
'lens',
new EmbeddableFactory(
plugins.chrome,
plugins.data.expressions.ExpressionRenderer,
plugins.expressions.ExpressionRenderer,
plugins.data.indexPatterns.indexPatterns
)
);
Expand All @@ -85,7 +91,7 @@ export class EditorFramePlugin {
initialVisualizationId={
(doc && doc.visualizationType) || firstVisualizationId || null
}
ExpressionRenderer={plugins.data.expressions.ExpressionRenderer}
ExpressionRenderer={plugins.expressions.ExpressionRenderer}
doc={doc}
dateRange={dateRange}
query={query}
Expand Down Expand Up @@ -118,11 +124,13 @@ const editorFrame = new EditorFramePlugin();
export const editorFrameSetup = () =>
editorFrame.setup(null, {
data: dataSetup,
expressions: expressionsSetup,
});

export const editorFrameStart = () =>
editorFrame.start(null, {
data: dataStart,
expressions: expressionsStart,
chrome,
embeddables: embeddablePlugin,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { calculateFilterRatio } from './filter_ratio';
import { KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { KibanaDatatable } from 'src/legacy/core_plugins/interpreter/public';

describe('calculate_filter_ratio', () => {
it('should collapse two rows and columns into a single row and column', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { i18n } from '@kbn/i18n';
import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/public';

interface FilterRatioKey {
id: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { renameColumns } from './rename_columns';
import { KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { KibanaDatatable } from 'src/legacy/core_plugins/interpreter/public';

describe('rename_columns', () => {
it('should rename columns of a given datatable', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { i18n } from '@kbn/i18n';
import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/public';

interface RemapArgs {
idMap: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/types';
import { FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/data/public/expressions/lib/_types';
import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public/expressions';
import { MetricConfig } from './types';
import { LensMultiTable } from '../types';
import { AutoScale } from './auto_scale';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import { CoreSetup } from 'src/core/public';
import { FormatFactory, getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
import { metricVisualization } from './metric_visualization';
import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/data/public/expressions';
import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public';
import { setup as expressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
import { metricChart, getMetricChartRenderer } from './metric_expression';

export interface MetricVisualizationPluginSetupPlugins {
Expand Down Expand Up @@ -41,7 +41,7 @@ const plugin = new MetricVisualizationPlugin();

export const metricVisualizationSetup = () =>
plugin.setup(null, {
expressions: dataSetup.expressions,
expressions: expressionsSetup,
fieldFormat: {
formatFactory: getFormat,
},
Expand Down
3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/lens/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import { Ast } from '@kbn/interpreter/common';
import { EuiIconType } from '@elastic/eui/src/components/icon/icon';
import { Query, KibanaDatatable } from 'src/plugins/data/common';
import { Query } from 'src/plugins/data/common';
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why Query is imported using the src shortcut and KibanaDatatable is referencing it with a relative path?

import { KibanaDatatable } from '../../../../../src/legacy/core_plugins/interpreter/public';
import { DragContextState } from './drag_drop';
import { Document } from './persistence';

Expand Down
Loading