Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
[5.x] Remaining default to named conversions in ui/public (#11323) (#…
Browse files Browse the repository at this point in the history
…11351)

* Remaining default to named conversions in ui/public (#11323)

* use named ui-modules

* x-pack conversion is checked in so no need for the default uiModules export

* Final removal of all export default in ui/public

And turned on the eslint rule for that folder.

* Moe import to top of file

* Convert remaining default exports in 5.x to get tests passing with the new rule
  • Loading branch information
stacey-gammon committed Apr 20, 2017
1 parent e322259 commit 6bab406
Show file tree
Hide file tree
Showing 221 changed files with 245 additions and 264 deletions.
2 changes: 1 addition & 1 deletion src/core_plugins/console/public/src/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let settings = require('./settings');
let utils = require('./utils');
let es = require('./es');
let history = require('./history');
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

let input;
export function initializeInput($el, $actionsEl, $copyAsCurlEl, output) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import heatmapOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/heatmap_options.html';
import _ from 'lodash';
const module = uiModules.get('kibana');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import lineInterpolationOptionTemplate from 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import vislibValueAxesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/category_axis.html';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import vislibGridTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/grid.html';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import vislibSeriesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/series.html';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import vislibValueAxesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/value_axes.html';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'ui/directives/inequality';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import pointSeriesOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series_options.html';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import vislibBasicOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html';
const module = uiModules.get('kibana');

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/context/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';

import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import contextAppTemplate from './app.html';
import './components/loading_button';
import './components/size_picker/size_picker';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import contextLoadingButtonTemplate from './loading_button.html';


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import contextSizePickerTemplate from './size_picker.html';
import './size_picker.less';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/dashboard/dashboard.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import angular from 'angular';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import uiRoutes from 'ui/routes';
import chrome from 'ui/chrome';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/dashboard/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import $ from 'jquery';
import { Binder } from 'ui/binder';
import chrome from 'ui/chrome';
import 'gridster';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import { DashboardViewMode } from 'plugins/kibana/dashboard/dashboard_view_mode';
import { PanelUtils } from 'plugins/kibana/dashboard/panel/panel_utils';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
const module = uiModules.get('app/dashboard');

/**
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/dashboard/panel/panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'ui/doc_table';
import * as columnActions from 'ui/doc_table/actions/columns';
import 'plugins/kibana/dashboard/panel/get_object_loaders_for_dashboard';
import { FilterManagerProvider } from 'ui/filter_manager';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import panelTemplate from 'plugins/kibana/dashboard/panel/panel.html';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
import { getPersistedStateId } from 'plugins/kibana/dashboard/panel/panel_state';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
const module = uiModules.get('app/dashboard');

// Used only by the savedDashboards service, usually no reason to change this
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
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';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import modules from 'ui/modules';
import { uiModules } from 'ui/modules';
import chrome from 'ui/chrome';
import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';

Expand All @@ -10,4 +10,4 @@ export function hideEmptyDevTools(Private) {
}
}

modules.get('kibana').run(hideEmptyDevTools);
uiModules.get('kibana').run(hideEmptyDevTools);
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import _ from 'lodash';
import 'ui/directives/css_truncate';
import 'ui/directives/field_name';
import detailsHtml from 'plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
const app = uiModules.get('apps/discover');


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import $ from 'jquery';
import rison from 'rison-node';
import { fieldCalculator } from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
import { IndexPatternsFieldListProvider } from 'ui/index_patterns/_field_list';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import fieldChooserTemplate from 'plugins/kibana/discover/components/field_chooser/field_chooser.html';
const app = uiModules.get('apps/discover');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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 uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/discover/index.html';
import { StateProvider } from 'ui/state_management/state';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import noResultsTemplate from '../partials/no_results.html';

uiModules
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import VislibProvider from 'ui/vislib';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
uiModules
.get('apps/discover')
.directive('discoverTimechart', function (Private) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import 'ui/notify';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';


const module = uiModules.get('discover/saved_searches', [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'plugins/kibana/discover/saved_searches/_saved_search';
import 'ui/notify';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
const module = uiModules.get('discover/saved_searches', [
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/doc/controllers/doc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'ui/doc_viewer';
import 'ui/index_patterns';
import html from 'plugins/kibana/doc/index.html';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';


const app = uiModules.get('apps/doc', [
Expand Down
4 changes: 2 additions & 2 deletions src/core_plugins/kibana/public/kibana.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import moment from 'moment-timezone';
import chrome from 'ui/chrome';
import routes from 'ui/routes';
import modules from 'ui/modules';
import { uiModules } from 'ui/modules';

import 'ui/autoload/all';
import 'plugins/kibana/discover/index';
Expand Down Expand Up @@ -48,4 +48,4 @@ chrome
}
});

modules.get('kibana').run(Notifier.pullMessageFromUrl);
uiModules.get('kibana').run(Notifier.pullMessageFromUrl);
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/management/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'plugins/kibana/management/styles/main.less';
import 'ui/filters/start_from';
import 'ui/field_editor';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import appTemplate from 'plugins/kibana/management/app.html';
import landingTemplate from 'plugins/kibana/management/landing.html';
import { management } from 'ui/management';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'ui/directives/validate_index_name';
import 'ui/directives/auto_select_if_only_one';
import { RefreshKibanaIndex } from '../refresh_kibana_index';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import template from './create_index_pattern.html';
import { getDefaultPatternForInterval } from './get_default_pattern_for_interval';
import { sendCreateIndexPatternRequest } from './send_create_index_pattern_request';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { RefreshKibanaIndex } from '../refresh_kibana_index';
import UrlProvider from 'ui/url';
import { IndicesEditSectionsProvider } from './edit_sections';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import template from './edit_index_pattern.html';

uiRoutes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import template from './index_header.html';
uiModules
.get('apps/management')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'ui/paginated_table';
import fieldNameHtml from './field_name.html';
import fieldTypeHtml from './field_type.html';
import fieldControlsHtml from '../field_controls.html';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import { FieldWildcardProvider } from 'ui/field_wildcard';
import template from './indexed_fields_table.html';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import _ from 'lodash';
import 'ui/paginated_table';
import fieldControlsHtml from '../field_controls.html';
import { dateScripts } from './date_scripts';
import uiModules from 'ui/modules';
import { getSupportedScriptingLangs } from 'ui/scripting_langs';
import { scriptedFields as docLinks } from 'ui/documentation_links/documentation_links';
import { uiModules } from 'ui/modules';
import template from './scripted_fields_table.html';

uiModules.get('apps/management')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { find, each, escape, invoke, size, without } from 'lodash';

import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import { Notifier } from 'ui/notify/notifier';
import { FieldWildcardProvider } from 'ui/field_wildcard';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { management } from 'ui/management';
import './create_index_pattern';
import './edit_index_pattern';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/management/sections/indices/index.html';

const indexPatternsResolutions = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_o
import objectIndexHTML from 'plugins/kibana/management/sections/objects/_objects.html';
import 'ui/directives/file_upload';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

uiRoutes
.when('/management/kibana/objects', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_o
import objectViewHTML from 'plugins/kibana/management/sections/objects/_view.html';
import { IndexPatternsCastMappingTypeProvider } from 'ui/index_patterns/_cast_mapping_type';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

uiRoutes
.when('/management/kibana/objects/:service/:id', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'plugins/kibana/management/sections/objects/_view';
import 'plugins/kibana/management/sections/objects/_objects';
import 'ace';
import 'ui/directives/confirm_click';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

// add the module deps to this module
uiModules.get('apps/management');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'ui/elastic_textarea';
import 'ui/filters/markdown';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import advancedRowTemplate from 'plugins/kibana/management/sections/settings/advanced_row.html';

uiModules.get('apps/management')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { toEditableConfig } from 'plugins/kibana/management/sections/settings/li
import 'plugins/kibana/management/sections/settings/advanced_row';
import { management } from 'ui/management';
import uiRoutes from 'ui/routes';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/management/sections/settings/index.html';

uiRoutes
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/visualize/editor/agg.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'plugins/kibana/visualize/editor/agg_params';
import 'plugins/kibana/visualize/editor/agg_add';
import _ from 'lodash';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import aggTemplate from 'plugins/kibana/visualize/editor/agg.html';
uiModules
.get('app/visualize')
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/visualize/editor/agg_add.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VisAggConfigProvider } from 'ui/vis/agg_config';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import aggAddTemplate from 'plugins/kibana/visualize/editor/agg_add.html';

uiModules
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { propFilter } from 'ui/filters/_prop_filter';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

uiModules
.get('kibana')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash';
import 'plugins/kibana/visualize/editor/agg';
import 'plugins/kibana/visualize/editor/agg_add';
import 'plugins/kibana/visualize/editor/nesting_indicator';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import aggGroupTemplate from 'plugins/kibana/visualize/editor/agg_group.html';

uiModules
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

uiModules
.get('app/visualize')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.
import 'ui/filters/match_any';
import 'plugins/kibana/visualize/editor/agg_param';
import { AggTypesIndexProvider } from 'ui/agg_types/index';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';
import aggParamsTemplate from 'plugins/kibana/visualize/editor/agg_params.html';

uiModules
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import dragula from 'dragula';
import uiModules from 'ui/modules';
import { uiModules } from 'ui/modules';

uiModules
.get('app/visualize')
Expand Down
Loading

0 comments on commit 6bab406

Please sign in to comment.