Skip to content

Commit

Permalink
WIP [Regression] Histogram aggregation always shows an error message
Browse files Browse the repository at this point in the history
  • Loading branch information
alexwizp committed Apr 13, 2020
1 parent 36b4ad9 commit 4ffb0d4
Show file tree
Hide file tree
Showing 16 changed files with 446 additions and 437 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import expect from '@kbn/expect';
import { Control } from './control';
import { ControlParams } from '../editor_utils';
import { FilterManager as BaseFilterManager } from './filter_manager/filter_manager';
import { SearchSource } from '../legacy_imports';
import { ISearchSource } from '../../../../../plugins/data/public';

function createControlParams(id: string, label: string): ControlParams {
return {
Expand Down Expand Up @@ -51,7 +51,7 @@ class ControlMock extends Control<BaseFilterManager> {

destroy() {}
}
const mockKbnApi: SearchSource = {} as SearchSource;
const mockKbnApi: ISearchSource = {} as ISearchSource;

describe('hasChanged', () => {
let control: ControlMock;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';

import { Filter } from '../../../../../plugins/data/public';
import { SearchSource as SearchSourceClass } from '../legacy_imports';
import { Filter, SearchSourceType } from '../../../../../plugins/data/public';
import { ControlParams, ControlParamsOptions, CONTROL_TYPES } from '../editor_utils';
import { RangeFilterManager } from './filter_manager/range_filter_manager';
import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
Expand Down Expand Up @@ -62,7 +61,7 @@ export abstract class Control<FilterManager extends BaseFilterManager> {
public controlParams: ControlParams,
public filterManager: FilterManager,
public useTimeFilter: boolean,
public SearchSource: SearchSourceClass
public SearchSource: SearchSourceType
) {
this.id = controlParams.id;
this.controlParams = controlParams;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@
* under the License.
*/

import { PhraseFilter, IndexPattern, TimefilterContract } from '../../../../../plugins/data/public';
import { SearchSource as SearchSourceClass, SearchSourceFields } from '../legacy_imports';
import {
SearchSourceFields,
SearchSourceType,
PhraseFilter,
IndexPattern,
TimefilterContract,
} from '../../../../../plugins/data/public';

export function createSearchSource(
SearchSource: SearchSourceClass,
SearchSource: SearchSourceType,
initialState: SearchSourceFields | null,
indexPattern: IndexPattern,
aggs: any,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@

import _ from 'lodash';
import { i18n } from '@kbn/i18n';

import { SearchSource as SearchSourceClass, SearchSourceFields } from '../legacy_imports';
import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
import { createSearchSource } from './create_search_source';
import { ControlParams } from '../editor_utils';
import { InputControlVisDependencies } from '../plugin';
import { IFieldType, TimefilterContract } from '../../../../../plugins/data/public';
import {
IFieldType,
TimefilterContract,
SearchSourceType,
SearchSourceFields,
} from '../../../../../plugins/data/public';

function getEscapedQuery(query = '') {
// https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
Expand Down Expand Up @@ -86,7 +89,7 @@ export class ListControl extends Control<PhraseFilterManager> {
controlParams: ControlParams,
filterManager: PhraseFilterManager,
useTimeFilter: boolean,
SearchSource: SearchSourceClass,
SearchSource: SearchSourceType,
deps: InputControlVisDependencies
) {
super(controlParams, filterManager, useTimeFilter, SearchSource);
Expand Down Expand Up @@ -202,7 +205,7 @@ export class ListControl extends Control<PhraseFilterManager> {
export async function listControlFactory(
controlParams: ControlParams,
useTimeFilter: boolean,
SearchSource: SearchSourceClass,
SearchSource: SearchSourceType,
deps: InputControlVisDependencies
) {
const [, { data: dataPluginStart }] = await deps.core.getStartServices();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';

import { SearchSource as SearchSourceClass } from '../legacy_imports';
import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
import { RangeFilterManager } from './filter_manager/range_filter_manager';
import { createSearchSource } from './create_search_source';
import { ControlParams } from '../editor_utils';
import { InputControlVisDependencies } from '../plugin';
import { IFieldType, TimefilterContract } from '../.../../../../../../plugins/data/public';
import {
IFieldType,
TimefilterContract,
SearchSourceType,
} from '../.../../../../../../plugins/data/public';

const minMaxAgg = (field?: IFieldType) => {
const aggBody: any = {};
Expand Down Expand Up @@ -61,7 +64,7 @@ export class RangeControl extends Control<RangeFilterManager> {
controlParams: ControlParams,
filterManager: RangeFilterManager,
useTimeFilter: boolean,
SearchSource: SearchSourceClass,
SearchSource: SearchSourceType,
deps: InputControlVisDependencies
) {
super(controlParams, filterManager, useTimeFilter, SearchSource);
Expand Down
26 changes: 0 additions & 26 deletions src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* under the License.
*/

import { SearchSource } from '../legacy_imports';
import { ISearchSource } from '../../../../../plugins/data/public';

export const getSearchSourceMock = (esSearchResponse?: any): SearchSource =>
jest.fn().mockImplementation(() => ({
export const getSearchSourceMock = (esSearchResponse?: any) =>
(jest.fn().mockImplementation(() => ({
setParent: jest.fn(),
setField: jest.fn(),
fetch: jest.fn().mockResolvedValue(
Expand All @@ -43,4 +43,4 @@ export const getSearchSourceMock = (esSearchResponse?: any): SearchSource =>
},
}
),
}));
})) as unknown) as ISearchSource;
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ import React from 'react';
import { render, unmountComponentAtNode } from 'react-dom';

import { I18nStart } from 'kibana/public';
import { SearchSource } from './legacy_imports';

import { InputControlVis } from './components/vis/input_control_vis';
import { getControlFactory } from './control/control_factory';
import { getLineageMap } from './lineage';
import { ControlParams } from './editor_utils';
import { RangeControl } from './control/range_control_factory';
import { ListControl } from './control/list_control_factory';
import { InputControlVisDependencies } from './plugin';
import { FilterManager, Filter } from '../../../../plugins/data/public';
import { FilterManager, Filter, getSearchSource } from '../../../../plugins/data/public';
import { VisParams, Vis } from '../../../../plugins/visualizations/public';

export const createInputControlVisController = (deps: InputControlVisDependencies) => {
Expand Down Expand Up @@ -100,8 +98,14 @@ export const createInputControlVisController = (deps: InputControlVisDependencie
}
);

const [coreStart, { data }] = await deps.core.getStartServices();
const controlFactoryPromises = controlParamsList.map(controlParams => {
const factory = getControlFactory(controlParams);
const SearchSource = getSearchSource({
searchService: data.search,
uiSettings: coreStart.uiSettings,
injectedMetadata: coreStart.injectedMetadata,
});
return factory(controlParams, this.visParams?.useTimeFilter, SearchSource, deps);
});
const controls = await Promise.all<RangeControl | ListControl>(controlFactoryPromises);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ import {
IUiSettingsClient,
} from 'kibana/public';
import {
getSearchSource,
FilterManager,
TimefilterContract,
IndexPatternsContract,
DataPublicPluginStart,
SearchSourceType,
} from 'src/plugins/data/public';

import { DiscoverStartPlugins } from './plugin';
Expand Down Expand Up @@ -64,6 +66,7 @@ export interface DiscoverServices {
getSavedSearchUrlById: (id: string) => Promise<string>;
uiSettings: IUiSettingsClient;
visualizations: VisualizationsStart;
SearchSource: SearchSourceType;
}
export async function buildServices(
core: CoreStart,
Expand Down Expand Up @@ -99,5 +102,10 @@ export async function buildServices(
toastNotifications: core.notifications.toasts,
uiSettings: core.uiSettings,
visualizations: plugins.visualizations,
SearchSource: getSearchSource({
searchService: plugins.data.search,
uiSettings: core.uiSettings,
injectedMetadata: core.injectedMetadata,
}),
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ export {
IndexPattern,
indexPatterns,
IFieldType,
SearchSource,
ISearchSource,
EsQuerySortValue,
SortDirection,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import {
Filter,
IndexPatternsContract,
IndexPattern,
SearchSource,
} from '../../../../../../../../../plugins/data/public';
import { getServices } from '../../../../kibana_services';

export type SurrDocType = 'successors' | 'predecessors';
export interface EsHitRecord {
Expand Down Expand Up @@ -115,6 +115,8 @@ function fetchContextProvider(indexPatterns: IndexPatternsContract) {
}

async function createSearchSource(indexPattern: IndexPattern, filters: Filter[]) {
const { SearchSource } = getServices();

return new SearchSource()
.setParent(undefined)
.setField('index', indexPattern)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import _ from 'lodash';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { getServices, SearchSource } from '../../../../kibana_services';
import { getServices } from '../../../../kibana_services';

import { fetchAnchorProvider } from '../api/anchor';
import { fetchContextProvider } from '../api/context';
Expand All @@ -29,7 +29,7 @@ import { FAILURE_REASONS, LOADING_STATUS } from './constants';
import { MarkdownSimple } from '../../../../../../../../../plugins/kibana_react/public';

export function QueryActionsProvider(Promise) {
const { filterManager, indexPatterns } = getServices();
const { filterManager, indexPatterns, SearchSource } = getServices();
const fetchAnchor = fetchAnchorProvider(indexPatterns, new SearchSource());
const { fetchSurroundingDocs } = fetchContextProvider(indexPatterns);
const { setPredecessorCount, setQueryParameters, setSuccessorCount } = getQueryParameterActions(
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/data/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@ export {
SearchError,
SearchStrategyProvider,
ISearchSource,
SearchSource,
SearchSourceType,
getSearchSource,
createSearchSource,
SearchSourceFields,
EsQuerySortValue,
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/data/public/search/expressions/esaggs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { PersistedState } from '../../../../../plugins/visualizations/public';
import { Adapters } from '../../../../../plugins/inspector/public';

import { IAggConfigs } from '../aggs';
import { ISearchSource, SearchSource } from '../search_source';
import { ISearchSource, getSearchSource } from '../search_source';
import { tabifyAggResponse } from '../tabify';
import { Filter, Query, serializeFieldFormat, TimeRange } from '../../../common';
import { FilterManager, getTime } from '../../query';
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/data/public/search/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ export { SearchError, SearchStrategyProvider, getSearchErrorType } from './searc

export {
ISearchSource,
SearchSource,
SearchSourceType,
getSearchSource,
SearchSourceFields,
EsQuerySortValue,
SortDirection,
Expand Down
Loading

0 comments on commit 4ffb0d4

Please sign in to comment.