Skip to content

Commit

Permalink
updating references
Browse files Browse the repository at this point in the history
  • Loading branch information
ppisljar committed Nov 21, 2019
1 parent de20487 commit aece1e0
Show file tree
Hide file tree
Showing 55 changed files with 153 additions and 120 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {
getRequestInspectorStats,
getResponseInspectorStats,
} from '../../../../../ui/public/courier/utils/courier_inspector_utils';
import { calculateObjectHash } from '../../../visualizations/public/np_ready/public/legacy/calculate_object_hash';
import { calculateObjectHash } from '../../../../visualizations/public/np_ready/public/legacy/calculate_object_hash';
import { getTime } from '../../../../../ui/public/timefilter';
// @ts-ignore
import { tabifyAggResponse } from '../../../../../ui/public/agg_response/tabify/tabify';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
* under the License.
*/

import { visFactory } from 'ui/vis/vis_factory';
import { VisController } from './vis_controller';
import { ControlsTab } from './components/editor/controls_tab';
import { OptionsTab } from './components/editor/options_tab';
import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
import { Status } from 'ui/vis/update_status';
import { i18n } from '@kbn/i18n';
import { setup as visualizations } from '../../visualizations/public/np_ready/public/legacy';
import { Status, visFactory, defaultFeedbackMessage } from '../../visualizations/public';


function InputControlVisProvider() {

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

import { visFactory } from 'ui/vis/vis_factory';
import { visFactory } from '../../visualizations/public';
import { i18n } from '@kbn/i18n';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import { i18n } from '@kbn/i18n';
import { visFactory } from 'ui/vis/vis_factory';
import { visFactory } from '../../visualizations/public';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
import { GaugeOptions } from './components/options';
import { getGaugeCollections, GaugeTypes, ColorModes } from './utils/collections';
import { vislibVisController } from './controller';
import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
import { visFactory } from '../../visualizations/public';

export default function GoalVisType() {

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

import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
import { visFactory } from '../../visualizations/public';
import { i18n } from '@kbn/i18n';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
import { visFactory } from '../../visualizations/public';
import { i18n } from '@kbn/i18n';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
import { visFactory } from '../../visualizations/public';
import { i18n } from '@kbn/i18n';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
import { visFactory } from '../../visualizations/public';
import { i18n } from '@kbn/i18n';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kbn_vislib_vis_types/public/pie.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
import { visFactory } from '../../visualizations/public';
import { i18n } from '@kbn/i18n';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { AggGroupNames } from 'ui/vis/editors/default';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export function getServices() {

// EXPORT legacy static dependencies
export { angular };
export { buildVislibDimensions } from 'ui/../../../visualizations/public/np_ready/public/legacy/build_pipeline';
export { buildVislibDimensions } from '../../../visualizations/public';
// @ts-ignore
export { callAfterBindingsWorkaround } from 'ui/compat';
export {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

import { Vis } from 'ui/vis';
import { uiModules } from 'ui/modules';
import { updateOldState } from 'ui/vis/vis_update_state';
import { updateOldState } from '../../../../visualizations/public';
import { VisualizeConstants } from '../visualize_constants';
import { createLegacyClass } from 'ui/utils/legacy_class';
import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
EuiSpacer,
EuiTitle,
} from '@elastic/eui';
import { memoizeLast } from 'ui/utils/memoize';
import { memoizeLast } from '../../../../../visualizations/public/np_ready/public/legacy/memoize';
import { VisType } from '../../kibana_services';
import { VisTypeAlias } from '../../../../../visualizations/public';
import { NewVisHelp } from './new_vis_help';
Expand Down
4 changes: 1 addition & 3 deletions src/legacy/core_plugins/region_map/public/region_map_type.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ import { Schemas } from 'ui/vis/editors/default/schemas';
import { colorSchemas } from 'ui/vislib/components/color/truncated_colormaps';
import { mapToLayerWithId } from './util';
import { createRegionMapVisualization } from './region_map_visualization';
import { Status } from 'ui/vis/update_status';
import { Status, visFactory } from '../../visualizations/public';
import { RegionMapOptions } from './components/region_map_options';

import { visFactory } from '../../visualizations/public';

// TODO: reference to TILE_MAP plugin should be removed
import { ORIGIN } from '../../tile_map/common/origin';

Expand Down
3 changes: 1 addition & 2 deletions src/legacy/core_plugins/tile_map/public/tile_map_type.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ import { i18n } from '@kbn/i18n';

import { supports } from 'ui/utils/supports';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { Status } from 'ui/vis/update_status';
import { colorSchemas } from 'ui/vislib/components/color/truncated_colormaps';
import { convertToGeoJson } from 'ui/vis/map/convert_to_geojson';

import { createTileMapVisualization } from './tile_map_visualization';
import { visFactory } from '../../visualizations/public';
import { visFactory, Status } from '../../visualizations/public';
import { TileMapOptions } from './components/tile_map_options';
import { MapTypes } from './map_types';

Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/vis_type_metric/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
import { RangeValues } from 'ui/vis/editors/default/controls/ranges';
import { SchemaConfig } from 'ui/../../visualizations/public/np_ready/public/legacy/build_pipeline';
import { SchemaConfig } from '../../visualizations/public';
import { ColorModes } from '../../kbn_vislib_vis_types/public/utils/collections';
import { Labels, Style } from '../../kbn_vislib_vis_types/public/types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import $ from 'jquery';
import expect from '@kbn/expect';
import ngMock from 'ng_mock';
import { legacyResponseHandlerProvider } from 'ui/vis/response_handlers/legacy';
import { Vis } from 'ui/vis';
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Vis } from '../../../visualizations/public';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import { AppStateProvider } from 'ui/state_management/app_state';
import { tabifyAggResponse } from 'ui/agg_response/tabify';
Expand All @@ -40,17 +39,11 @@ describe('Table Vis - Controller', async function () {
let AppState;
let tableAggResponse;
let tabifiedResponse;
let legacyDependencies;

ngMock.inject(function ($injector) {
Private = $injector.get('Private');
legacyDependencies = {
// eslint-disable-next-line new-cap
createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization,
};
ngMock.inject(function () {

visualizationsSetup.types.registerVisualization(() =>
createTableVisTypeDefinition(legacyDependencies)
createTableVisTypeDefinition()
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ import fixtures from 'fixtures/fake_hierarchical_data';
import sinon from 'sinon';
import { legacyResponseHandlerProvider } from 'ui/vis/response_handlers/legacy';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import { Vis } from 'ui/vis';
import { Vis } from '../../../../visualizations/public';
import { tabifyAggResponse } from 'ui/agg_response/tabify';
import { round } from 'lodash';

import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { createTableVisTypeDefinition } from '../../table_vis_type';
import { setup as visualizationsSetup } from '../../../../visualizations/public/np_ready/public/legacy';

Expand All @@ -39,7 +38,6 @@ describe('Table Vis - AggTable Directive', function () {
let indexPattern;
let settings;
let tableAggResponse;
let legacyDependencies;
const tabifiedData = {};

const init = () => {
Expand Down Expand Up @@ -98,13 +96,8 @@ describe('Table Vis - AggTable Directive', function () {
);
};

ngMock.inject(function (Private) {
legacyDependencies = {
// eslint-disable-next-line new-cap
createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization,
};

visualizationsSetup.types.registerVisualization(() => createTableVisTypeDefinition(legacyDependencies));
ngMock.inject(function () {
visualizationsSetup.types.registerVisualization(() => createTableVisTypeDefinition());
});

beforeEach(ngMock.module('kibana'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
import { i18n } from '@kbn/i18n';
import { Vis } from 'ui/vis';
// @ts-ignore
import { visFactory } from 'ui/../../visualizations/public/np_ready/public/legacy/vis_factory';

// @ts-ignore
import { Schemas } from 'ui/vis/editors/default/schemas';
// @ts-ignore
import { AngularVisController } from 'ui/vis/vis_types/angular_vis_type';
import { AggGroupNames } from 'ui/vis/editors/default';
import { visFactory } from '../../visualizations/public';
import { tableVisResponseHandler } from './table_vis_request_handler';
// @ts-ignore
import tableVisTemplate from './table_vis.html';
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/vis_type_table/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { SchemaConfig } from 'ui/../../visualizations/public/np_ready/public/legacy/build_pipeline';
import { SchemaConfig } from '../../visualizations/public';

export enum AggTypes {
SUM = 'sum',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
*/

import { i18n } from '@kbn/i18n';
import { Status } from 'ui/../../visualizations/public/np_ready/public/legacy/update_status';
// @ts-ignore
import { Schemas } from 'ui/vis/editors/default/schemas';
import { Status } from '../../visualizations/public';

import { TagCloudOptions } from './components/tag_cloud_options';
import { visFactory } from '../../visualizations/public';
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
*/

import { i18n } from '@kbn/i18n';
import { Status } from 'ui/../../visualizations/public/np_ready/public/legacy/update_status';
// @ts-ignore
import { DefaultEditorSize } from 'ui/vis/editor_size';
// @ts-ignore
import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
import { Status } from '../../visualizations/public';

import { visFactory } from '../../visualizations/public';
import { VegaVisualizationDependencies } from './plugin';
Expand Down
26 changes: 26 additions & 0 deletions src/legacy/core_plugins/visualizations/public/legacy_imports.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

export { PersistedState } from '../../../ui/public/persisted_state';
export { SearchError, SearchSource } from '../../../ui//public/courier';
export { AggConfig, AggConfigs, setBounds } from '../../../ui/public/agg_types';
export { isDateHistogramBucketAggConfig } from '../../../ui/public/agg_types/buckets/date_histogram';
export { createFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities';
export { I18nContext } from '../../../ui/public/i18n';
import '../../../ui/public/directives/bind';
20 changes: 20 additions & 0 deletions src/legacy/core_plugins/visualizations/public/legacy_mocks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

export { searchSourceMock } from '../../../ui/public/courier/search_source/mocks';
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import { get } from 'lodash';
import React from 'react';

import { PersistedState } from '../../../../../../ui/public/persisted_state';
import { memoizeLast } from '../../../../../../ui/public/utils/memoize';
import { Vis } from '../../../../../../ui/public/vis';
import { PersistedState } from '../../../legacy_imports';
import { memoizeLast } from '../legacy/memoize';
import { VisualizationChart } from './visualization_chart';
import { VisualizationNoResults } from './visualization_noresults';
import { VisualizationRequestError } from './visualization_requesterror';
import { Vis } from '..';

function shouldShowNoResultsMessage(vis: Vis, visData: any): boolean {
const requiresSearch = get(vis, 'type.requiresSearch');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import React from 'react';
import * as Rx from 'rxjs';
import { debounceTime, filter, share, switchMap } from 'rxjs/operators';

import { PersistedState } from '../../../../../../ui/public/persisted_state';
import { ResizeChecker } from '../../../../../../ui/public/resize_checker';
import { Vis, VisualizationController } from '../../../../../../ui/public/vis';
import { PersistedState } from '../../../legacy_imports';
import { Vis, VisualizationController } from '../vis';
import { getUpdateStatus } from '../legacy/update_status';
import { ResizeChecker } from '../../../../../../../plugins/kibana_utils/public';

interface VisualizationChartProps {
onInit?: () => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
import React from 'react';
import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';

interface VisualizationNoResultsProps {
onInit?: () => void;
Expand Down Expand Up @@ -58,8 +57,5 @@ export class VisualizationNoResults extends React.Component<VisualizationNoResul
if (this.props.onInit) {
this.props.onInit();
}
if (this.containerDiv.current) {
dispatchRenderComplete(this.containerDiv.current);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@

import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
import React from 'react';
import { SearchError } from 'src/legacy/ui/public/courier';
import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';
import { SearchError } from '../../../legacy_imports';

interface VisualizationRequestErrorProps {
onInit?: () => void;
Expand Down Expand Up @@ -59,8 +58,5 @@ export class VisualizationRequestError extends React.Component<VisualizationRequ
if (this.props.onInit) {
this.props.onInit();
}
if (this.containerDiv.current) {
dispatchRenderComplete(this.containerDiv.current);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import _ from 'lodash';
import moment from 'moment';
import { esFilters } from 'src/plugins/data/public';
import { esFilters } from '../../../../../../../plugins/data/public';

export function onBrushEvent(event) {
const isNumber = event.data.ordered;
Expand Down
Loading

0 comments on commit aece1e0

Please sign in to comment.