[5.x] Default to named ui public n to z #11221 (#11320)

* Merge * fix * Update resize checker which is in a different location than master
sirensolutions · Apr 19, 2017 · 72bdeee · 72bdeee
1 parent 7fa8c6e
commit 72bdeee
Show file tree

Hide file tree

Showing 368 changed files with 871 additions and 848 deletions.
diff --git a/src/core_plugins/console/public/hacks/register.js b/src/core_plugins/console/public/hacks/register.js
@@ -1,5 +1,6 @@
-import devTools from 'ui/registry/dev_tools';
-devTools.register(() => ({
+import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
+
+DevToolsRegistryProvider.register(() => ({
  order: 1,
  name: 'console',
  display: 'Console',

diff --git a/src/core_plugins/console/public/src/sense_editor_resize.js b/src/core_plugins/console/public/src/sense_editor_resize.js
@@ -1,4 +1,4 @@
-import ResizeCheckerProvider from 'ui/vislib/lib/resize_checker'
+import { ResizeCheckerProvider } from 'ui/vislib/lib/resize_checker'
 
 export function useResizeCheckerProvider(Private) {
  const ResizeChecker = Private(ResizeCheckerProvider);

diff --git a/src/core_plugins/dev_mode/public/vis_debug_spy_panel.js b/src/core_plugins/dev_mode/public/vis_debug_spy_panel.js
@@ -1,5 +1,5 @@
 import visDebugSpyPanelTemplate from 'plugins/dev_mode/vis_debug_spy_panel.html';
-import spyModesRegistry from 'ui/registry/spy_modes';
+import { SpyModesRegistryProvider } from 'ui/registry/spy_modes';
 
 function VisDetailsSpyProvider() {
  return {
@@ -16,4 +16,4 @@ function VisDetailsSpyProvider() {
 }
 
 // register the spy mode or it won't show up in the spys
-spyModesRegistry.register(VisDetailsSpyProvider);
+SpyModesRegistryProvider.register(VisDetailsSpyProvider);
diff --git a/src/core_plugins/kbn_doc_views/public/__tests__/doc_views.js b/src/core_plugins/kbn_doc_views/public/__tests__/doc_views.js
@@ -5,7 +5,7 @@ import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/render_directive';
 import 'plugins/kbn_doc_views/views/table';
-import docViewsRegistry from 'ui/registry/doc_views';
+import { DocViewsRegistryProvider } from 'ui/registry/doc_views';
 import StubbedLogstashIndexPattern from 'fixtures/stubbed_logstash_index_pattern';
 const hit = {
  '_index': 'logstash-2014.09.09',
@@ -55,7 +55,7 @@ describe('docViews', function () {
  ngMock.inject(function (Private) {
  indexPattern = Private(StubbedLogstashIndexPattern);
  flattened = indexPattern.flattenHit(hit);
- docViews = Private(docViewsRegistry);
+ docViews = Private(DocViewsRegistryProvider);
  });
  initView = function initView(view) {
  $elem.append(view.directive.template);

diff --git a/src/core_plugins/kbn_doc_views/public/views/json.js b/src/core_plugins/kbn_doc_views/public/views/json.js
@@ -1,10 +1,10 @@
 import angular from 'angular';
 import 'ace';
-import docViewsRegistry from 'ui/registry/doc_views';
+import { DocViewsRegistryProvider } from 'ui/registry/doc_views';
 
 import jsonHtml from './json.html';
 
-docViewsRegistry.register(function () {
+DocViewsRegistryProvider.register(function () {
  return {
  title: 'JSON',
  order: 20,

diff --git a/src/core_plugins/kbn_doc_views/public/views/table.js b/src/core_plugins/kbn_doc_views/public/views/table.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
-import docViewsRegistry from 'ui/registry/doc_views';
+import { DocViewsRegistryProvider } from 'ui/registry/doc_views';
 
 import tableHtml from './table.html';
 
-docViewsRegistry.register(function () {
+DocViewsRegistryProvider.register(function () {
  return {
  title: 'Table',
  order: 10,

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/area.js b/src/core_plugins/kbn_vislib_vis_types/public/area.js
@@ -1,6 +1,6 @@
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { VislibVisTypeVislibVisTypeProvider } from 'ui/vislib_vis_type/vislib_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
 import image from './images/icon-area.svg';
 

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/editors/__tests__/point_series.js b/src/core_plugins/kbn_vislib_vis_types/public/editors/__tests__/point_series.js
@@ -5,8 +5,8 @@ import ngMock from 'ng_mock';
 import $ from 'jquery';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import LineVisTypeProvider from 'plugins/kbn_vislib_vis_types/line';
-import VisProvider from 'ui/vis';
-import AggConfigProvider from 'ui/vis/agg_config';
+import { VisProvider } from 'ui/vis';
+import { VisAggConfigProvider } from 'ui/vis/agg_config';
 
 describe('point series editor', function () {
  let $parentScope;
@@ -31,7 +31,7 @@ describe('point series editor', function () {
 
  beforeEach(ngMock.module('kibana'));
  beforeEach(ngMock.inject(function ($rootScope, $compile, Private) {
- AggConfig = Private(AggConfigProvider);
+ AggConfig = Private(VisAggConfigProvider);
  lineVisType = Private(LineVisTypeProvider);
  Vis = Private(VisProvider);
  indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js b/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js
@@ -1,8 +1,8 @@
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { VislibVisTypeVislibVisTypeProvider } from 'ui/vislib_vis_type/vislib_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import heatmapTemplate from 'plugins/kbn_vislib_vis_types/editors/heatmap.html';
-import heatmapColors from 'ui/vislib/components/color/colormaps';
+import { vislibColorMaps } from 'ui/vislib/components/color/colormaps';
 import image from './images/icon-heatmap.svg';
 
 export default function HeatmapVisType(Private) {
@@ -58,7 +58,7 @@ export default function HeatmapVisType(Private) {
  text: 'bottom',
  }],
  scales: ['linear', 'log', 'square root'],
- colorSchemas: Object.keys(heatmapColors),
+ colorSchemas: Object.keys(vislibColorMaps),
  editor: heatmapTemplate
  },
  schemas: new Schemas([

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js
@@ -1,6 +1,6 @@
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { VislibVisTypeVislibVisTypeProvider } from 'ui/vislib_vis_type/vislib_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
 import image from './images/icon-vertical.svg';
 

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js b/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
@@ -1,6 +1,6 @@
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { VislibVisTypeVislibVisTypeProvider } from 'ui/vislib_vis_type/vislib_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
 import image from './images/icon-horizontal.svg';
 

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/core_plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
@@ -1,4 +1,4 @@
-import visTypes from 'ui/registry/vis_types';
+import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 
 import histogramVisTypeProvider from 'plugins/kbn_vislib_vis_types/histogram';
 import lineVisTypeProvider from 'plugins/kbn_vislib_vis_types/line';
@@ -8,10 +8,10 @@ import tileMapVisTypeProvider from 'plugins/kbn_vislib_vis_types/tile_map';
 import heatmapVisTypeProvider from 'plugins/kbn_vislib_vis_types/heatmap';
 import horizontalBarVisTypeProvider from 'plugins/kbn_vislib_vis_types/horizontal_bar';
 
-visTypes.register(histogramVisTypeProvider);
-visTypes.register(lineVisTypeProvider);
-visTypes.register(pieVisTypeProvider);
-visTypes.register(areaVisTypeProvider);
-visTypes.register(tileMapVisTypeProvider);
-visTypes.register(heatmapVisTypeProvider);
-visTypes.register(horizontalBarVisTypeProvider);
+VisTypesRegistryProvider.register(histogramVisTypeProvider);
+VisTypesRegistryProvider.register(lineVisTypeProvider);
+VisTypesRegistryProvider.register(pieVisTypeProvider);
+VisTypesRegistryProvider.register(areaVisTypeProvider);
+VisTypesRegistryProvider.register(tileMapVisTypeProvider);
+VisTypesRegistryProvider.register(heatmapVisTypeProvider);
+VisTypesRegistryProvider.register(horizontalBarVisTypeProvider);
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/line.js b/src/core_plugins/kbn_vislib_vis_types/public/line.js
@@ -1,6 +1,6 @@
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { VislibVisTypeVislibVisTypeProvider } from 'ui/vislib_vis_type/vislib_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
 import image from './images/icon-line.svg';
 

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/pie.js b/src/core_plugins/kbn_vislib_vis_types/public/pie.js
@@ -1,6 +1,6 @@
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { VislibVisTypeVislibVisTypeProvider } from 'ui/vislib_vis_type/vislib_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import pieTemplate from 'plugins/kbn_vislib_vis_types/editors/pie.html';
 import image from './images/icon-pie.svg';
 

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
@@ -1,14 +1,14 @@
-import supports from 'ui/utils/supports';
-import VisVisTypeProvider from 'ui/vis/vis_type';
-import MapsVisTypeVislibVisTypeProvider from 'ui/vis_maps/maps_vis_type';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { supports } from 'ui/utils/supports';
+import { VisVisTypeProvider } from 'ui/vis/vis_type';
+import { MapsVisTypeProvider } from 'ui/vis_maps/maps_vis_type';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import { AggResponseGeoJsonProvider } from 'ui/agg_response/geo_json/geo_json';
 import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html';
 import image from './images/icon-tilemap.svg';
 
 export default function TileMapVisType(Private, getAppState, courier, config) {
  const VisType = Private(VisVisTypeProvider);
- const MapsVisType = Private(MapsVisTypeVislibVisTypeProvider);
+ const MapsVisType = Private(MapsVisTypeProvider);
  const Schemas = Private(VisSchemasProvider);
  const geoJsonConverter = Private(AggResponseGeoJsonProvider);
 

diff --git a/src/core_plugins/kibana/public/dashboard/dashboard.js b/src/core_plugins/kibana/public/dashboard/dashboard.js
@@ -18,10 +18,10 @@ import { DocTitleProvider } from 'ui/doc_title';
 import { getTopNavConfig } from './top_nav/get_top_nav_config';
 import { DashboardConstants, createDashboardEditUrl } from './dashboard_constants';
 import { VisualizeConstants } from 'plugins/kibana/visualize/visualize_constants';
-import UtilsBrushEventProvider from 'ui/utils/brush_event';
+import { UtilsBrushEventProvider } from 'ui/utils/brush_event';
 import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
 import { DashboardState } from './dashboard_state';
-import notify from 'ui/notify';
+import { notify } from 'ui/notify';
 
 const app = uiModules.get('app/dashboard', [
  'elasticsearch',

diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_state.js b/src/core_plugins/kibana/public/dashboard/dashboard_state.js
@@ -5,7 +5,7 @@ import { DashboardViewMode } from './dashboard_view_mode';
 import { PanelUtils } from './panel/panel_utils';
 import moment from 'moment';
 
-import stateMonitorFactory from 'ui/state_management/state_monitor_factory';
+import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 import { createPanelState } from 'plugins/kibana/dashboard/panel/panel_state';
 import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state';
 

diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js
@@ -2,14 +2,14 @@ import 'plugins/kibana/dashboard/dashboard';
 import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboards';
 import 'plugins/kibana/dashboard/styles/index.less';
 import uiRoutes from 'ui/routes';
-import savedObjectRegistry from 'ui/saved_objects/saved_object_registry';
+import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import { savedDashboardRegister } from 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard_register';
 
 import dashboardListingTemplate from './listing/dashboard_listing.html';
 import { DashboardListingController } from './listing/dashboard_listing';
 import { DashboardConstants } from './dashboard_constants';
 
-savedObjectRegistry.register(savedDashboardRegister);
+SavedObjectRegistryProvider.register(savedDashboardRegister);
 
 uiRoutes
  .defaults(/dashboard/, {

diff --git a/src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js b/src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
@@ -1,4 +1,4 @@
-import SavedObjectRegistryProvider from 'ui/saved_objects/saved_object_registry';
+import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import 'ui/pager_control';
 import 'ui/pager';
 import { DashboardConstants, createDashboardEditUrl } from '../dashboard_constants';

diff --git a/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js b/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-import DevToolsRegistryProvider from 'ui/registry/dev_tools';
+import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
 import template from 'plugins/kibana/dev_tools/partials/dev_tools_app.html';
 import 'plugins/kibana/dev_tools/styles/dev_tools_app.less';
 import 'ui/kbn_top_nav';

diff --git a/src/core_plugins/kibana/public/dev_tools/hacks/hide_empty_tools.js b/src/core_plugins/kibana/public/dev_tools/hacks/hide_empty_tools.js
@@ -1,6 +1,6 @@
 import modules from 'ui/modules';
 import chrome from 'ui/chrome';
-import DevToolsRegistryProvider from 'ui/registry/dev_tools';
+import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
 
 export function hideEmptyDevTools(Private) {
  const hasTools = !!Private(DevToolsRegistryProvider).length;

diff --git a/src/core_plugins/kibana/public/dev_tools/index.js b/src/core_plugins/kibana/public/dev_tools/index.js
@@ -1,12 +1,12 @@
 import uiRoutes from 'ui/routes';
-import devTools from 'ui/registry/dev_tools';
+import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
 import 'plugins/kibana/dev_tools/directives/dev_tools_app';
 
 uiRoutes
 .when('/dev_tools', {
  resolve: {
  redirect(Private, kbnUrl) {
- const items = Private(devTools).inOrder;
+ const items = Private(DevToolsRegistryProvider).inOrder;
  kbnUrl.redirect(items[0].url.substring(1));
  }
  }

diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -15,18 +15,18 @@ import 'ui/index_patterns';
 import 'ui/state_management/app_state';
 import 'ui/timefilter';
 import 'ui/share';
-import VisProvider from 'ui/vis';
+import { VisProvider } from 'ui/vis';
 import { DocTitleProvider } from 'ui/doc_title';
-import UtilsBrushEventProvider from 'ui/utils/brush_event';
+import { UtilsBrushEventProvider } from 'ui/utils/brush_event';
 import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
 import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
 import { FilterManagerProvider } from 'ui/filter_manager';
 import { AggTypesBucketsIntervalOptionsProvider } from 'ui/agg_types/buckets/_interval_options';
-import stateMonitorFactory from 'ui/state_management/state_monitor_factory';
+import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import indexTemplate from 'plugins/kibana/discover/index.html';
-import StateProvider from 'ui/state_management/state';
+import { StateProvider } from 'ui/state_management/state';
 
 const app = uiModules.get('apps/discover', [
  'kibana/notify',

diff --git a/src/core_plugins/kibana/public/discover/index.js b/src/core_plugins/kibana/public/discover/index.js
@@ -6,7 +6,7 @@ import 'plugins/kibana/discover/components/field_chooser/field_chooser';
 import 'plugins/kibana/discover/controllers/discover';
 import 'plugins/kibana/discover/styles/main.less';
 import 'ui/doc_table/components/table_row';
-import savedObjectRegistry from 'ui/saved_objects/saved_object_registry';
+import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import { savedSearchProvider } from 'plugins/kibana/discover/saved_searches/saved_search_register';
 
-savedObjectRegistry.register(savedSearchProvider);
+SavedObjectRegistryProvider.register(savedSearchProvider);
diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js
@@ -18,7 +18,7 @@ import 'ui/vislib';
 import 'ui/agg_response';
 import 'ui/agg_types';
 import 'ui/timepicker';
-import Notifier from 'ui/notify/notifier';
+import { Notifier } from 'ui/notify/notifier';
 import 'leaflet';
 
 routes.enable();

diff --git a/...nagement/sections/indices/edit_index_pattern/source_filters_table/source_filters_table.js b/...nagement/sections/indices/edit_index_pattern/source_filters_table/source_filters_table.js
@@ -1,7 +1,7 @@
 import { find, each, escape, invoke, size, without } from 'lodash';
 
 import uiModules from 'ui/modules';
-import Notifier from 'ui/notify/notifier';
+import { Notifier } from 'ui/notify/notifier';
 import { FieldWildcardProvider } from 'ui/field_wildcard';
 
 import controlsHtml from './controls.html';

diff --git a/src/core_plugins/kibana/public/visualize/editor/__tests__/agg_params.js b/src/core_plugins/kibana/public/visualize/editor/__tests__/agg_params.js
@@ -4,9 +4,9 @@ import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'plugins/kibana/visualize/editor/agg_params';
-import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
-import VisSchemasProvider from 'ui/vis/schemas';
+import { VisProvider } from 'ui/vis';
+import { VisAggConfigProvider } from 'ui/vis/agg_config';
+import { VisSchemasProvider } from 'ui/vis/schemas';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 

diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_add.js b/src/core_plugins/kibana/public/visualize/editor/agg_add.js
@@ -1,4 +1,4 @@
-import VisAggConfigProvider from 'ui/vis/agg_config';
+import { VisAggConfigProvider } from 'ui/vis/agg_config';
 import uiModules from 'ui/modules';
 import aggAddTemplate from 'plugins/kibana/visualize/editor/agg_add.html';
 

diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_params.js b/src/core_plugins/kibana/public/visualize/editor/agg_params.js
@@ -5,7 +5,7 @@ import aggSelectHtml from 'plugins/kibana/visualize/editor/agg_select.html';
 import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.html';
 import 'ui/filters/match_any';
 import 'plugins/kibana/visualize/editor/agg_param';
-import AggTypesIndexProvider from 'ui/agg_types/index';
+import { AggTypesIndexProvider } from 'ui/agg_types/index';
 import uiModules from 'ui/modules';
 import aggParamsTemplate from 'plugins/kibana/visualize/editor/agg_params.html';
 

diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -7,13 +7,13 @@ import 'ui/collapsible_sidebar';
 import 'ui/share';
 import chrome from 'ui/chrome';
 import angular from 'angular';
-import Notifier from 'ui/notify/notifier';
-import RegistryVisTypesProvider from 'ui/registry/vis_types';
+import { Notifier } from 'ui/notify/notifier';
+import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
 import { DocTitleProvider } from 'ui/doc_title';
-import UtilsBrushEventProvider from 'ui/utils/brush_event';
+import { UtilsBrushEventProvider } from 'ui/utils/brush_event';
 import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
 import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler';
-import stateMonitorFactory from 'ui/state_management/state_monitor_factory';
+import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import editorTemplate from 'plugins/kibana/visualize/editor/editor.html';
@@ -25,7 +25,7 @@ uiRoutes
  template: editorTemplate,
  resolve: {
  savedVis: function (savedVisualizations, courier, $route, Private) {
- const visTypes = Private(RegistryVisTypesProvider);
+ const visTypes = Private(VisTypesRegistryProvider);
  const visType = _.find(visTypes, { name: $route.current.params.type });
  if (visType.requiresSearch && !$route.current.params.indexPattern && !$route.current.params.savedSearchId) {
  throw new Error('You must provide either an indexPattern or a savedSearchId');