Skip to content

Commit

Permalink
Move input_control_vis into NP
Browse files Browse the repository at this point in the history
  • Loading branch information
sulemanof committed Apr 13, 2020
1 parent 1199c8c commit 6e0790c
Show file tree
Hide file tree
Showing 70 changed files with 60 additions and 181 deletions.
44 changes: 0 additions & 44 deletions src/legacy/core_plugins/input_control_vis/index.ts

This file was deleted.

4 changes: 0 additions & 4 deletions src/legacy/core_plugins/input_control_vis/package.json

This file was deleted.

45 changes: 0 additions & 45 deletions src/legacy/core_plugins/input_control_vis/public/legacy.ts

This file was deleted.

8 changes: 8 additions & 0 deletions src/plugins/input_control_vis/kibana.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"id": "input_control_vis",
"version": "8.0.0",
"kibanaVersion": "kibana",
"server": false,
"ui": true,
"requiredPlugins": ["data", "expressions", "visualizations"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
import { RangeControlEditor } from './range_control_editor';
import { ListControlEditor } from './list_control_editor';
import { getTitle, ControlParams, CONTROL_TYPES, ControlParamsOptions } from '../../editor_utils';
import { IIndexPattern } from '../../../../../../plugins/data/public';
import { IIndexPattern } from '../../../../data/public';
import { InputControlVisDependencies } from '../../plugin';

interface ControlEditorUiProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
import { findTestSubject } from '@elastic/eui/lib/test';
import { getDepsMock, getIndexPatternMock } from '../../test_utils';
import { ControlsTab, ControlsTabUiProps } from './controls_tab';
import { Vis } from '../../../../../../plugins/visualizations/public';
import { Vis } from '../../../../visualizations/public';

const indexPatternsMock = {
get: getIndexPatternMock,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { InjectedIntlProps } from 'react-intl';
import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';

import { IIndexPattern, IFieldType } from '../../../../../../plugins/data/public';
import { IIndexPattern, IFieldType } from '../../../../data/public';

interface FieldSelectUiState {
isLoading: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ import { EuiFormRow, EuiFieldNumber, EuiSwitch, EuiSelect } from '@elastic/eui';
import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
import { FieldSelect } from './field_select';
import { ControlParams, ControlParamsOptions } from '../../editor_utils';
import {
IIndexPattern,
IFieldType,
IndexPatternSelect,
} from '../../../../../../plugins/data/public';
import { IIndexPattern, IFieldType, IndexPatternSelect } from '../../../../data/public';
import { InputControlVisDependencies } from '../../plugin';

interface ListControlEditorState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import React from 'react';
import { shallow } from 'enzyme';
import { mountWithIntl } from 'test_utils/enzyme_helpers';

import { Vis } from '../../../../../../plugins/visualizations/public';
import { Vis } from '../../../../visualizations/public';
import { OptionsTab, OptionsTabProps } from './options_tab';

describe('OptionsTab', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
import { FieldSelect } from './field_select';
import { ControlParams, ControlParamsOptions } from '../../editor_utils';
import {
IIndexPattern,
IFieldType,
IndexPatternSelect,
} from '../../../../../../plugins/data/public';
import { IIndexPattern, IFieldType, IndexPatternSelect } from '../../../../data/public';
import { InputControlVisDependencies } from '../../plugin';

interface RangeControlEditorProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import { InputControlVis } from './input_control_vis';
import { ListControl } from '../../control/list_control_factory';
import { RangeControl } from '../../control/range_control_factory';

jest.mock('ui/new_platform');

const mockListControl: ListControl = {
id: 'mock-list-control',
isEnabled: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { CONTROL_TYPES } from '../../editor_utils';
import { ListControl } from '../../control/list_control_factory';
import { RangeControl } from '../../control/range_control_factory';
import { ListControl as ListControlComponent } from '../vis/list_control';
import { RangeControl as RangeControlComponent } from '../vis/range_control';
import { ListControl as ListControlComponent } from './list_control';
import { RangeControl as RangeControlComponent } from './range_control';

function isListControl(control: RangeControl | ListControl): control is ListControl {
return control.type === CONTROL_TYPES.LIST;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
import { RangeControl, ceilWithPrecision, floorWithPrecision } from './range_control';
import { RangeControl as RangeControlClass } from '../../control/range_control_factory';

jest.mock('ui/new_platform');

const control: RangeControlClass = {
id: 'mock-range-control',
isEnabled: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import _ from 'lodash';
import React, { PureComponent } from 'react';
import { ValidatedDualRange } from '../../../../../../../src/plugins/kibana_react/public';
import { ValidatedDualRange } from '../../../../kibana_react/public';
import { FormRow } from './form_row';
import { RangeControl as RangeControlClass } from '../../control/range_control_factory';

Expand Down
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 { SearchSourceType } from '../types';

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: SearchSourceType = {} as SearchSourceType;

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

import { Filter } from '../../../../../plugins/data/public';
import { SearchSource as SearchSourceClass } from '../legacy_imports';
import { Filter } from '../../../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';
import { FilterManager as BaseFilterManager } from './filter_manager/filter_manager';
import { SearchSourceType } from '../types';

export function noValuesDisableMsg(fieldName: string, indexPatternName: string) {
return i18n.translate('inputControl.control.noValuesDisableTooltip', {
Expand Down Expand Up @@ -62,7 +62,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 {
PhraseFilter,
IndexPattern,
TimefilterContract,
SearchSourceFields,
} from '../../../data/public';
import { SearchSourceType } from '../types';

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 @@ -20,12 +20,8 @@
import expect from '@kbn/expect';

import { FilterManager } from './filter_manager';
import { coreMock } from '../../../../../../core/public/mocks';
import {
Filter,
IndexPattern,
FilterManager as QueryFilterManager,
} from '../../../../../../plugins/data/public';
import { coreMock } from '../../../../../core/public/mocks';
import { Filter, IndexPattern, FilterManager as QueryFilterManager } from '../../../../data/public';

const setupMock = coreMock.createSetup();

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

import _ from 'lodash';

import {
FilterManager as QueryFilterManager,
IndexPattern,
Filter,
} from '../../../../../../plugins/data/public';
import { FilterManager as QueryFilterManager, IndexPattern, Filter } from '../../../../data/public';

export abstract class FilterManager {
constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@

import expect from '@kbn/expect';

import {
Filter,
IndexPattern,
FilterManager as QueryFilterManager,
} from '../../../../../../plugins/data/public';
import { Filter, IndexPattern, FilterManager as QueryFilterManager } from '../../../../data/public';
import { PhraseFilterManager } from './phrase_filter_manager';

describe('PhraseFilterManager', function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
esFilters,
IndexPattern,
FilterManager as QueryFilterManager,
} from '../../../../../../plugins/data/public';
} from '../../../../data/public';

export class PhraseFilterManager extends FilterManager {
constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
RangeFilterMeta,
IndexPattern,
FilterManager as QueryFilterManager,
} from '../../../../../../plugins/data/public';
} from '../../../../data/public';

describe('RangeFilterManager', function() {
const controlId = 'control1';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@
import _ from 'lodash';

import { FilterManager } from './filter_manager';
import {
esFilters,
RangeFilter,
RangeFilterParams,
IFieldType,
} from '../../../../../../plugins/data/public';
import { esFilters, RangeFilter, RangeFilterParams, IFieldType } from '../../../../data/public';

interface SliderValue {
min?: string | number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
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, SearchSourceFields } from '../../../data/public';
import { SearchSourceType } from '../types';

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 +86,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 +202,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
Loading

0 comments on commit 6e0790c

Please sign in to comment.