From 8fa81b7fdcba14311e941d58c69b0ad327327060 Mon Sep 17 00:00:00 2001 From: Liza Katz Date: Thu, 28 Mar 2019 13:53:10 +0200 Subject: [PATCH] New platform cleanup autoload - step 1 (#33765) * Explicit dependencies to doc_title * Explicit dependencies to - kbn_top_nav - saved_object_save_as_checkbox * Explicit dependencies to filter_bar * Explicit dependency to query_bar * Removed modules from autoloades that never used implicitly: - bound_to_config_obj - debounce - filter_manager - index_patterns - parse_query - persisted_log - timefilter * Removed modules from autoload (never used implicitly) - events * Explicit dependency to bind + typo fix * Explicit dependency to fancy_forms * Explicit dependency to $listen * Explicit dependency to timepicker * Moved kbn-infinite-scroll directive to doc_table * Explicit dependency on directives - css truncate - inequality * Explicit dependecy to input_focus directive * Explicit dependency to json-input directive * Explicit dependency on directives: - input_focus - paginate * Explicit dependency on paginated-selectable-list directive * Explicit dependency on saved-object-finder directive * Moved validate_json directive into agg_types * Don't include directives implicitly --- .../src/controllers/sense_controller.js | 5 +++-- .../kibana/public/context/index.js | 1 + .../kibana/public/dashboard/dashboard_app.js | 1 + .../dashboard/dashboard_state_manager.js | 5 +---- .../kibana/public/dashboard/index.js | 1 + .../dev_tools/directives/dev_tools_app.js | 1 - .../kibana/public/dev_tools/index.js | 1 + .../public/discover/controllers/discover.js | 1 + .../core_plugins/kibana/public/kibana.js | 1 + .../kibana/public/management/index.js | 1 - .../create_edit_field/create_edit_field.js | 4 +++- .../edit_index_pattern/edit_index_pattern.js | 4 +++- .../kibana/public/visualize/editor/editor.js | 1 + .../kibana/public/visualize/index.js | 1 + .../visualize/listing/visualize_listing.js | 1 + .../metric_vis/public/metric_vis_params.js | 1 + .../core_plugins/timelion/public/app.js | 8 +++++++ src/legacy/ui/public/autoload/all.js | 1 - src/legacy/ui/public/autoload/directives.js | 21 ------------------- src/legacy/ui/public/autoload/modules.js | 17 --------------- src/legacy/ui/public/courier/courier.js | 1 + .../directives/paginated_selectable_list.js | 2 ++ .../public/directives/saved_object_finder.js | 2 ++ src/legacy/ui/public/doc_table/doc_table.js | 2 +- .../infinite_scroll.js | 2 +- .../ui/public/kbn_top_nav/kbn_top_nav.js | 1 + .../ui/public/number_list/number_list.js | 1 + .../public/number_list/number_list_input.js | 1 + .../public/paginated_table/paginated_table.js | 3 +++ .../ui/public/vis/editors/default/agg.js | 1 + .../ui/public/vis/editors/default/sidebar.js | 1 + src/legacy/ui/public/vis/vis.js | 4 +++- x-pack/plugins/graph/public/app.js | 4 ++++ .../maps/public/angular/map_controller.js | 1 + x-pack/plugins/maps/public/index.js | 2 ++ x-pack/plugins/ml/public/app.js | 1 + .../ml/public/components/nav_menu/nav_menu.js | 2 ++ .../new_job/advanced/new_job_controller.js | 1 + .../index_or_search_controller.js | 2 ++ .../public/directives/main/index.js | 1 + .../plugins/monitoring/public/monitoring.js | 1 + .../public/views/no_data/controller.js | 1 + .../duration_select/duration_select.js | 1 + .../expression_item/expression_item.js | 1 + .../components/json_editor/json_editor.js | 1 + .../components/watch_action/watch_action.js | 1 + .../watch_history_item_detail.js | 1 + 47 files changed, 67 insertions(+), 52 deletions(-) delete mode 100644 src/legacy/ui/public/autoload/directives.js rename src/legacy/ui/public/{directives => doc_table}/infinite_scroll.js (97%) diff --git a/src/legacy/core_plugins/console/public/src/controllers/sense_controller.js b/src/legacy/core_plugins/console/public/src/controllers/sense_controller.js index 58fe1df256ad..ce7e6d48aa98 100644 --- a/src/legacy/core_plugins/console/public/src/controllers/sense_controller.js +++ b/src/legacy/core_plugins/console/public/src/controllers/sense_controller.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import 'ui/doc_title'; +import { DocTitleProvider } from 'ui/doc_title'; import { applyResizeCheckerToEditors } from '../sense_editor_resize'; import $ from 'jquery'; import { initializeInput } from '../input'; @@ -34,7 +34,8 @@ module.run(function (Private, $rootScope) { }; }); -module.controller('SenseController', function SenseController(Private, $scope, $timeout, $location, docTitle, kbnUiAceKeyboardModeService) { +module.controller('SenseController', function SenseController(Private, $scope, $timeout, $location, kbnUiAceKeyboardModeService) { + const docTitle = Private(DocTitleProvider); docTitle.change('Console'); $scope.topNavController = Private(SenseTopNavController); diff --git a/src/legacy/core_plugins/kibana/public/context/index.js b/src/legacy/core_plugins/kibana/public/context/index.js index 2de49cde48c8..d1908be4bea7 100644 --- a/src/legacy/core_plugins/kibana/public/context/index.js +++ b/src/legacy/core_plugins/kibana/public/context/index.js @@ -20,6 +20,7 @@ import _ from 'lodash'; import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter'; +import 'ui/listen'; import uiRoutes from 'ui/routes'; import { i18n } from '@kbn/i18n'; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js index 5539d95c56c8..3a38a1c9c0d1 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js +++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js @@ -25,6 +25,7 @@ import chrome from 'ui/chrome'; import { wrapInI18nContext } from 'ui/i18n'; import { toastNotifications } from 'ui/notify'; +import 'ui/listen'; import 'ui/search_bar'; import 'ui/apply_filters'; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js index b40dfd4f08bf..e5d43c8de94b 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js +++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js @@ -290,7 +290,7 @@ export class DashboardStateManager { * Resets the state back to the last saved version of the dashboard. */ resetState() { - // In order to show the correct warning for the saved-object-save-as-check-box we have to store the unsaved + // In order to show the correct warning, we have to store the unsaved // title on the dashboard object. We should fix this at some point, but this is how all the other object // save panels work at the moment. this.savedDashboard.title = this.savedDashboard.lastSavedTitle; @@ -341,9 +341,6 @@ export class DashboardStateManager { setTitle(title) { this.appState.title = title; - // The saved-object-save-as-check-box shows a warning if the current object title is different then - // the existing object title. It calculates this difference by comparing this.dashboard.title to - // this.dashboard.lastSavedTitle, so we need to push the temporary, unsaved title, onto the dashboard. this.savedDashboard.title = title; this.saveState(); } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.js b/src/legacy/core_plugins/kibana/public/dashboard/index.js index a5e6bb668a7c..000f5e840a8d 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/index.js +++ b/src/legacy/core_plugins/kibana/public/dashboard/index.js @@ -22,6 +22,7 @@ import './saved_dashboard/saved_dashboards'; import './dashboard_config'; import uiRoutes from 'ui/routes'; import chrome from 'ui/chrome'; +import 'ui/filter_bar'; import { wrapInI18nContext } from 'ui/i18n'; import { toastNotifications } from 'ui/notify'; diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js b/src/legacy/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js index 1f39cdf45821..c7cb877be676 100644 --- a/src/legacy/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js +++ b/src/legacy/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js @@ -20,7 +20,6 @@ import { uiModules } from 'ui/modules'; import { DevToolsRegistryProvider } from 'ui/registry/dev_tools'; import template from '../partials/dev_tools_app.html'; -import 'ui/kbn_top_nav'; uiModules .get('apps/dev_tools') diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/index.js b/src/legacy/core_plugins/kibana/public/dev_tools/index.js index 27e388fe10e2..3218a6b82327 100644 --- a/src/legacy/core_plugins/kibana/public/dev_tools/index.js +++ b/src/legacy/core_plugins/kibana/public/dev_tools/index.js @@ -20,6 +20,7 @@ import uiRoutes from 'ui/routes'; import { DevToolsRegistryProvider } from 'ui/registry/dev_tools'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; +import 'ui/directives/kbn_href'; import './directives/dev_tools_app'; uiRoutes diff --git a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js index bbbc8802e3fc..a91ec2e5b446 100644 --- a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js +++ b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js @@ -26,6 +26,7 @@ import * as columnActions from 'ui/doc_table/actions/columns'; import * as filterActions from 'ui/doc_table/actions/filter'; import dateMath from '@elastic/datemath'; import 'ui/doc_table'; +import 'ui/listen'; import 'ui/visualize'; import 'ui/fixed_scroll'; import 'ui/filters/moment'; diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js index ed88791241d1..68998f78a245 100644 --- a/src/legacy/core_plugins/kibana/public/kibana.js +++ b/src/legacy/core_plugins/kibana/public/kibana.js @@ -47,6 +47,7 @@ import 'uiExports/autocompleteProviders'; import 'uiExports/shareContextMenuExtensions'; import 'ui/autoload/all'; +import 'ui/kbn_top_nav'; import './home'; import './discover'; import './visualize'; diff --git a/src/legacy/core_plugins/kibana/public/management/index.js b/src/legacy/core_plugins/kibana/public/management/index.js index 0045eaa4aca3..c39c24c72b27 100644 --- a/src/legacy/core_plugins/kibana/public/management/index.js +++ b/src/legacy/core_plugins/kibana/public/management/index.js @@ -33,7 +33,6 @@ import { management, SidebarNav, MANAGEMENT_BREADCRUMB } from 'ui/management'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; import { timefilter } from 'ui/timefilter'; import { EuiPageContent, EuiTitle, EuiText, EuiSpacer, EuiIcon, EuiHorizontalRule } from '@elastic/eui'; -import 'ui/kbn_top_nav'; const SIDENAV_ID = 'management-sidenav'; const LANDING_ID = 'management-landing'; diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js index 82d459238f52..b52e3b3a5a37 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/create_edit_field/create_edit_field.js @@ -19,6 +19,7 @@ import { Field } from 'ui/index_patterns/_field'; import { RegistryFieldFormatEditorsProvider } from 'ui/registry/field_format_editors'; +import { DocTitleProvider } from 'ui/doc_title'; import { KbnUrlProvider } from 'ui/url'; import uiRoutes from 'ui/routes'; import { toastNotifications } from 'ui/notify'; @@ -101,8 +102,9 @@ uiRoutes } }, controllerAs: 'fieldSettings', - controller: function FieldEditorPageController($scope, $route, $timeout, $http, Private, docTitle, config) { + controller: function FieldEditorPageController($scope, $route, $timeout, $http, Private, config) { const getConfig = (...args) => config.get(...args); + const docTitle = Private(DocTitleProvider); const fieldFormatEditors = Private(RegistryFieldFormatEditorsProvider); const kbnUrl = Private(KbnUrlProvider); diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js index a9184977dc80..c3cd781279bd 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js @@ -20,6 +20,7 @@ import _ from 'lodash'; import './index_header'; import './create_edit_field'; +import { DocTitleProvider } from 'ui/doc_title'; import { KbnUrlProvider } from 'ui/url'; import { IndicesEditSectionsProvider } from './edit_sections'; import { fatalError, toastNotifications } from 'ui/notify'; @@ -170,7 +171,7 @@ uiRoutes uiModules.get('apps/management') .controller('managementIndexPatternsEdit', function ( - $scope, $location, $route, config, indexPatterns, Private, AppState, docTitle, confirmModal) { + $scope, $location, $route, config, indexPatterns, Private, AppState, confirmModal) { const $state = $scope.state = new AppState(); const { fieldWildcardMatcher } = Private(FieldWildcardProvider); const indexPatternListProvider = Private(IndexPatternListFactory)(); @@ -182,6 +183,7 @@ uiModules.get('apps/management') $scope.indexPatternListProvider = indexPatternListProvider; $scope.indexPattern.tags = indexPatternListProvider.getIndexPatternTags($scope.indexPattern); $scope.getFieldInfo = indexPatternListProvider.getFieldInfo; + const docTitle = Private(DocTitleProvider); docTitle.change($scope.indexPattern.title); const otherPatterns = _.filter($route.current.locals.indexPatterns, pattern => { diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js index 62e764f60eae..a84a805b2f1b 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js @@ -25,6 +25,7 @@ import 'ui/visualize'; import 'ui/collapsible_sidebar'; import 'ui/search_bar'; import 'ui/apply_filters'; +import 'ui/listen'; import chrome from 'ui/chrome'; import React from 'react'; import angular from 'angular'; diff --git a/src/legacy/core_plugins/kibana/public/visualize/index.js b/src/legacy/core_plugins/kibana/public/visualize/index.js index 14c1e48d04fe..2d79e7f55c79 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/index.js +++ b/src/legacy/core_plugins/kibana/public/visualize/index.js @@ -24,6 +24,7 @@ import 'ui/draggable/draggable_handle'; import './saved_visualizations/_saved_vis'; import './saved_visualizations/saved_visualizations'; import 'ui/filters/sort_prefix_first'; +import 'ui/filter_bar'; import uiRoutes from 'ui/routes'; import visualizeListingTemplate from './listing/visualize_listing.html'; import { VisualizeListingController } from './listing/visualize_listing'; diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js index 35fa7761f3ba..b904a59e690c 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js +++ b/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js @@ -20,6 +20,7 @@ import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry'; import 'ui/pager_control'; import 'ui/pager'; +import 'ui/directives/kbn_href'; import { uiModules } from 'ui/modules'; import { timefilter } from 'ui/timefilter'; import { VisTypesRegistryProvider } from 'ui/registry/vis_types'; diff --git a/src/legacy/core_plugins/metric_vis/public/metric_vis_params.js b/src/legacy/core_plugins/metric_vis/public/metric_vis_params.js index 76a709f5df24..f51678504441 100644 --- a/src/legacy/core_plugins/metric_vis/public/metric_vis_params.js +++ b/src/legacy/core_plugins/metric_vis/public/metric_vis_params.js @@ -18,6 +18,7 @@ */ import { uiModules } from 'ui/modules'; +import 'ui/directives/inequality'; import metricVisParamsTemplate from './metric_vis_params.html'; import _ from 'lodash'; const module = uiModules.get('kibana'); diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js index 013fc4677dab..589724a77c08 100644 --- a/src/legacy/core_plugins/timelion/public/app.js +++ b/src/legacy/core_plugins/timelion/public/app.js @@ -32,6 +32,14 @@ import 'uiExports/fieldFormats'; import 'uiExports/savedObjectTypes'; require('ui/autoload/all'); + +// TODO: remove ui imports completely (move to plugins) +import 'ui/directives/input_focus'; +import 'ui/directives/saved_object_finder'; +import 'ui/listen'; +import 'ui/kbn_top_nav'; +import 'ui/saved_objects/ui/saved_object_save_as_checkbox'; + require('plugins/timelion/directives/cells/cells'); require('plugins/timelion/directives/fixed_element'); require('plugins/timelion/directives/fullscreen/fullscreen'); diff --git a/src/legacy/ui/public/autoload/all.js b/src/legacy/ui/public/autoload/all.js index b1aa11cb7249..9ecfbfcf307c 100644 --- a/src/legacy/ui/public/autoload/all.js +++ b/src/legacy/ui/public/autoload/all.js @@ -19,7 +19,6 @@ import './accessibility'; import './modules'; -import './directives'; import './filters'; import './settings'; import './styles'; diff --git a/src/legacy/ui/public/autoload/directives.js b/src/legacy/ui/public/autoload/directives.js deleted file mode 100644 index c31f62e8db6b..000000000000 --- a/src/legacy/ui/public/autoload/directives.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ - -const context = require.context('../directives', false, /[\/\\](?!\.|_)[^\/\\]+\.js/); -context.keys().forEach(key => context(key)); diff --git a/src/legacy/ui/public/autoload/modules.js b/src/legacy/ui/public/autoload/modules.js index 698d3ff8e27c..511c2eed3dd9 100644 --- a/src/legacy/ui/public/autoload/modules.js +++ b/src/legacy/ui/public/autoload/modules.js @@ -19,23 +19,10 @@ import 'angular'; import '../chrome'; -import '../bind'; -import '../kbn_top_nav'; -import '../bound_to_config_obj'; import '../config'; import '../courier'; -import '../debounce'; -import '../doc_title'; import '../es'; -import '../events'; -import '../fancy_forms'; -import '../filter_bar'; -import '../filter_manager'; -import '../index_patterns'; -import '../listen'; import '../notify'; -import '../parse_query'; -import '../persisted_log'; import '../private'; import '../promises'; import '../modals'; @@ -43,15 +30,11 @@ import '../state_management/app_state'; import '../state_management/global_state'; import '../storage'; import '../style_compile'; -import '../timefilter'; -import '../timepicker'; import '../tooltip'; import '../url'; import '../watch_multi'; -import '../saved_objects/ui/saved_object_save_as_checkbox'; import '../react_components'; import '../i18n'; -import '../query_bar/directive'; import '@elastic/ui-ace'; import { uiModules } from 'ui/modules'; diff --git a/src/legacy/ui/public/courier/courier.js b/src/legacy/ui/public/courier/courier.js index 2689f914065c..f34f47e0571b 100644 --- a/src/legacy/ui/public/courier/courier.js +++ b/src/legacy/ui/public/courier/courier.js @@ -22,6 +22,7 @@ import _ from 'lodash'; import { timefilter } from 'ui/timefilter'; import '../es'; +import '../listen'; import '../index_patterns'; import { uiModules } from '../modules'; import { addFatalErrorCallback } from '../notify'; diff --git a/src/legacy/ui/public/directives/paginated_selectable_list.js b/src/legacy/ui/public/directives/paginated_selectable_list.js index 417273668dae..7484e2a1840b 100644 --- a/src/legacy/ui/public/directives/paginated_selectable_list.js +++ b/src/legacy/ui/public/directives/paginated_selectable_list.js @@ -19,6 +19,8 @@ import _ from 'lodash'; import { uiModules } from '../modules'; +import './paginate'; +import './kbn_href'; import paginatedSelectableListTemplate from '../partials/paginated_selectable_list.html'; const module = uiModules.get('kibana'); diff --git a/src/legacy/ui/public/directives/saved_object_finder.js b/src/legacy/ui/public/directives/saved_object_finder.js index 0b107dc085f2..f73e378f8ba8 100644 --- a/src/legacy/ui/public/directives/saved_object_finder.js +++ b/src/legacy/ui/public/directives/saved_object_finder.js @@ -23,6 +23,8 @@ import { keyMap } from '../utils/key_map'; import { SavedObjectRegistryProvider } from '../saved_objects/saved_object_registry'; import { uiModules } from '../modules'; import savedObjectFinderTemplate from '../partials/saved_object_finder.html'; +import './input_focus'; +import './paginate'; const module = uiModules.get('kibana'); diff --git a/src/legacy/ui/public/doc_table/doc_table.js b/src/legacy/ui/public/doc_table/doc_table.js index 05311556869e..4c33f8a52670 100644 --- a/src/legacy/ui/public/doc_table/doc_table.js +++ b/src/legacy/ui/public/doc_table/doc_table.js @@ -20,7 +20,7 @@ import _ from 'lodash'; import html from './doc_table.html'; import { getSort } from './lib/get_sort'; -import '../directives/infinite_scroll'; +import './infinite_scroll'; import './components/table_header'; import './components/table_row'; import { dispatchRenderComplete } from '../render_complete'; diff --git a/src/legacy/ui/public/directives/infinite_scroll.js b/src/legacy/ui/public/doc_table/infinite_scroll.js similarity index 97% rename from src/legacy/ui/public/directives/infinite_scroll.js rename to src/legacy/ui/public/doc_table/infinite_scroll.js index 6f8132e1ee7d..67913062eb2a 100644 --- a/src/legacy/ui/public/directives/infinite_scroll.js +++ b/src/legacy/ui/public/doc_table/infinite_scroll.js @@ -19,7 +19,7 @@ import $ from 'jquery'; import { uiModules } from '../modules'; -const module = uiModules.get('kibana'); +const module = uiModules.get('app/discover'); module.directive('kbnInfiniteScroll', function () { return { diff --git a/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js b/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js index 5daac89f9712..24d0f612dc5f 100644 --- a/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js +++ b/src/legacy/ui/public/kbn_top_nav/kbn_top_nav.js @@ -55,6 +55,7 @@ import _ from 'lodash'; import angular from 'angular'; +import '../timepicker'; import '../watch_multi'; import '../directives/input_focus'; import { uiModules } from '../modules'; diff --git a/src/legacy/ui/public/number_list/number_list.js b/src/legacy/ui/public/number_list/number_list.js index 1102cae032ce..3d1a23bd69d2 100644 --- a/src/legacy/ui/public/number_list/number_list.js +++ b/src/legacy/ui/public/number_list/number_list.js @@ -20,6 +20,7 @@ import _ from 'lodash'; import { parseRange } from '../utils/range'; import './number_list_input'; +import '../directives/input_focus'; import { uiModules } from '../modules'; import numberListTemplate from './number_list.html'; diff --git a/src/legacy/ui/public/number_list/number_list_input.js b/src/legacy/ui/public/number_list/number_list_input.js index a055d7898bf5..98dd0d9b0be6 100644 --- a/src/legacy/ui/public/number_list/number_list_input.js +++ b/src/legacy/ui/public/number_list/number_list_input.js @@ -18,6 +18,7 @@ */ import { keyMap } from '../utils/key_map'; +import '../fancy_forms'; import { uiModules } from '../modules'; const INVALID = {}; // invalid flag diff --git a/src/legacy/ui/public/paginated_table/paginated_table.js b/src/legacy/ui/public/paginated_table/paginated_table.js index b7725fce3221..23d3c57b3daf 100644 --- a/src/legacy/ui/public/paginated_table/paginated_table.js +++ b/src/legacy/ui/public/paginated_table/paginated_table.js @@ -20,6 +20,9 @@ import _ from 'lodash'; import { uiModules } from '../modules'; import paginatedTableTemplate from './paginated_table.html'; + +import '../directives/paginate'; + uiModules .get('kibana') .directive('paginatedTable', function ($filter) { diff --git a/src/legacy/ui/public/vis/editors/default/agg.js b/src/legacy/ui/public/vis/editors/default/agg.js index c80bdc45e008..9c6493048b25 100644 --- a/src/legacy/ui/public/vis/editors/default/agg.js +++ b/src/legacy/ui/public/vis/editors/default/agg.js @@ -21,6 +21,7 @@ import './agg_params'; import './agg_add'; import { Direction } from './keyboard_move'; import _ from 'lodash'; +import '../../../fancy_forms'; import { uiModules } from '../../../modules'; import aggTemplate from './agg.html'; import { move } from '../../../utils/collection'; diff --git a/src/legacy/ui/public/vis/editors/default/sidebar.js b/src/legacy/ui/public/vis/editors/default/sidebar.js index 886de3fbd6e0..a335880bcf91 100644 --- a/src/legacy/ui/public/vis/editors/default/sidebar.js +++ b/src/legacy/ui/public/vis/editors/default/sidebar.js @@ -20,6 +20,7 @@ import _ from 'lodash'; import './agg_group'; import './vis_options'; +import 'ui/directives/css_truncate'; import { uiModules } from '../../../modules'; import sidebarTemplate from './sidebar.html'; diff --git a/src/legacy/ui/public/vis/vis.js b/src/legacy/ui/public/vis/vis.js index 7729192e2a4f..423e4b9e3a04 100644 --- a/src/legacy/ui/public/vis/vis.js +++ b/src/legacy/ui/public/vis/vis.js @@ -36,7 +36,9 @@ import { FilterBarQueryFilterProvider } from '../filter_bar/query_filter'; import { updateVisualizationConfig } from './vis_update'; import { SearchSourceProvider } from '../courier/search_source'; import { SavedObjectsClientProvider } from '../saved_objects'; -import { timefilter } from 'ui/timefilter'; + +import { timefilter } from '../timefilter'; +import '../bind'; export function VisProvider(Private, indexPatterns, getAppState) { const visTypes = Private(VisTypesRegistryProvider); diff --git a/x-pack/plugins/graph/public/app.js b/x-pack/plugins/graph/public/app.js index 173c7e9ca053..305a229a80fc 100644 --- a/x-pack/plugins/graph/public/app.js +++ b/x-pack/plugins/graph/public/app.js @@ -14,7 +14,11 @@ import 'uiExports/fieldFormats'; import 'uiExports/savedObjectTypes'; import 'ui/autoload/all'; +// TODO: remove ui imports completely (move to plugins) +import 'ui/kbn_top_nav'; import 'ui/directives/saved_object_finder'; +import 'ui/directives/input_focus'; +import 'ui/saved_objects/ui/saved_object_save_as_checkbox'; import chrome from 'ui/chrome'; import { uiModules } from 'ui/modules'; import uiRoutes from 'ui/routes'; diff --git a/x-pack/plugins/maps/public/angular/map_controller.js b/x-pack/plugins/maps/public/angular/map_controller.js index d42136e934b8..2b4616becf02 100644 --- a/x-pack/plugins/maps/public/angular/map_controller.js +++ b/x-pack/plugins/maps/public/angular/map_controller.js @@ -5,6 +5,7 @@ */ import chrome from 'ui/chrome'; +import 'ui/listen'; import React from 'react'; import { I18nProvider } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; diff --git a/x-pack/plugins/maps/public/index.js b/x-pack/plugins/maps/public/index.js index eef364498c9e..ce14e7223735 100644 --- a/x-pack/plugins/maps/public/index.js +++ b/x-pack/plugins/maps/public/index.js @@ -19,6 +19,8 @@ import 'ui/agg_types'; import chrome from 'ui/chrome'; import routes from 'ui/routes'; +import 'ui/kbn_top_nav'; +import 'ui/query_bar/directive'; import { uiModules } from 'ui/modules'; import { DocTitleProvider } from 'ui/doc_title'; import 'ui/autoload/styles'; diff --git a/x-pack/plugins/ml/public/app.js b/x-pack/plugins/ml/public/app.js index e46fccad1fda..1091300972eb 100644 --- a/x-pack/plugins/ml/public/app.js +++ b/x-pack/plugins/ml/public/app.js @@ -13,6 +13,7 @@ import 'ui/courier'; import 'ui/angular-bootstrap'; import 'ui/persisted_log'; import 'ui/autoload/all'; +import 'ui/kbn_top_nav'; import 'plugins/ml/access_denied'; import 'plugins/ml/lib/angular_bootstrap_patch'; diff --git a/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js b/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js index b5174467e98a..3ce31c49cb2f 100644 --- a/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js +++ b/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js @@ -11,6 +11,8 @@ import { isFullLicense } from '../../license/check_license'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); +import 'ui/directives/kbn_href'; + module.directive('mlNavMenu', function () { return { restrict: 'E', diff --git a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js index b3bc9fe1747f..865b511857ff 100644 --- a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js +++ b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js @@ -10,6 +10,7 @@ import _ from 'lodash'; import angular from 'angular'; import 'ace'; import 'ui/angular_ui_select'; +import 'ui/directives/input_focus'; import { parseInterval } from 'ui/utils/parse_interval'; import { timefilter } from 'ui/timefilter'; diff --git a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/index_or_search/index_or_search_controller.js b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/index_or_search/index_or_search_controller.js index 33cdfd0c3864..e7a8e7712352 100644 --- a/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/index_or_search/index_or_search_controller.js +++ b/x-pack/plugins/ml/public/jobs/new_job/wizard/steps/index_or_search/index_or_search_controller.js @@ -20,6 +20,8 @@ import { loadIndexPatterns, getIndexPatterns } from 'plugins/ml/util/index_utils import { checkMlNodesAvailable } from 'plugins/ml/ml_nodes_check/check_ml_nodes'; import template from './index_or_search.html'; import { timefilter } from 'ui/timefilter'; +import 'ui/directives/paginated_selectable_list'; +import 'ui/directives/saved_object_finder'; uiRoutes .when('/jobs/new_job', { diff --git a/x-pack/plugins/monitoring/public/directives/main/index.js b/x-pack/plugins/monitoring/public/directives/main/index.js index e68cd8c7fad4..a0e3504cf5cb 100644 --- a/x-pack/plugins/monitoring/public/directives/main/index.js +++ b/x-pack/plugins/monitoring/public/directives/main/index.js @@ -8,6 +8,7 @@ import { get } from 'lodash'; import { uiModules } from 'ui/modules'; import template from './index.html'; import { shortenPipelineHash } from '../../../common/formatting'; +import 'ui/directives/kbn_href'; /* * Manage data and provide helper methods for the "main" directive's template diff --git a/x-pack/plugins/monitoring/public/monitoring.js b/x-pack/plugins/monitoring/public/monitoring.js index 0e4528ba679c..2452c3b58e96 100644 --- a/x-pack/plugins/monitoring/public/monitoring.js +++ b/x-pack/plugins/monitoring/public/monitoring.js @@ -6,6 +6,7 @@ import uiRoutes from 'ui/routes'; import chrome from 'ui/chrome'; +import 'ui/kbn_top_nav'; import 'ui/autoload/all'; import 'plugins/monitoring/filters'; import 'plugins/monitoring/services/clusters'; diff --git a/x-pack/plugins/monitoring/public/views/no_data/controller.js b/x-pack/plugins/monitoring/public/views/no_data/controller.js index d108678cb992..c35eaf2066bd 100644 --- a/x-pack/plugins/monitoring/public/views/no_data/controller.js +++ b/x-pack/plugins/monitoring/public/views/no_data/controller.js @@ -16,6 +16,7 @@ import { render, unmountComponentAtNode } from 'react-dom'; import { NoData } from 'plugins/monitoring/components'; import { timefilter } from 'ui/timefilter'; import { I18nContext } from 'ui/i18n'; +import 'ui/listen'; const REACT_NODE_ID_NO_DATA = 'noDataReact'; diff --git a/x-pack/plugins/watcher/public/components/duration_select/duration_select.js b/x-pack/plugins/watcher/public/components/duration_select/duration_select.js index 3b2c1cf2ee6d..9fab3504ac63 100644 --- a/x-pack/plugins/watcher/public/components/duration_select/duration_select.js +++ b/x-pack/plugins/watcher/public/components/duration_select/duration_select.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'ui/fancy_forms'; import { uiModules } from 'ui/modules'; import { InitAfterBindingsWorkaround } from 'ui/compat'; import { TIME_UNITS } from 'plugins/watcher/constants'; diff --git a/x-pack/plugins/watcher/public/components/expression_builder/components/expression_item/expression_item.js b/x-pack/plugins/watcher/public/components/expression_builder/components/expression_item/expression_item.js index 24337a58d7c1..895a26280dbe 100644 --- a/x-pack/plugins/watcher/public/components/expression_builder/components/expression_item/expression_item.js +++ b/x-pack/plugins/watcher/public/components/expression_builder/components/expression_item/expression_item.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'ui/fancy_forms'; import { uiModules } from 'ui/modules'; import { keyMap } from 'ui/utils/key_map'; import template from './expression_item.html'; diff --git a/x-pack/plugins/watcher/public/components/json_editor/json_editor.js b/x-pack/plugins/watcher/public/components/json_editor/json_editor.js index dc78985ab47c..812bdaeb8a41 100644 --- a/x-pack/plugins/watcher/public/components/json_editor/json_editor.js +++ b/x-pack/plugins/watcher/public/components/json_editor/json_editor.js @@ -6,6 +6,7 @@ import { uiModules } from 'ui/modules'; import template from './json_editor.html'; +import 'ui/directives/json_input'; import 'ace'; const app = uiModules.get('xpack/watcher'); diff --git a/x-pack/plugins/watcher/public/components/watch_actions/components/watch_action/watch_action.js b/x-pack/plugins/watcher/public/components/watch_actions/components/watch_action/watch_action.js index feb49b152dd1..021d4a5ef7e1 100644 --- a/x-pack/plugins/watcher/public/components/watch_actions/components/watch_action/watch_action.js +++ b/x-pack/plugins/watcher/public/components/watch_actions/components/watch_action/watch_action.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'ui/fancy_forms'; import { uiModules } from 'ui/modules'; import template from './watch_action.html'; import angular from 'angular'; diff --git a/x-pack/plugins/watcher/public/components/watch_history_item_detail/watch_history_item_detail.js b/x-pack/plugins/watcher/public/components/watch_history_item_detail/watch_history_item_detail.js index 4c2ad500ee0b..e3e3218745d8 100644 --- a/x-pack/plugins/watcher/public/components/watch_history_item_detail/watch_history_item_detail.js +++ b/x-pack/plugins/watcher/public/components/watch_history_item_detail/watch_history_item_detail.js @@ -5,6 +5,7 @@ */ import { uiModules } from 'ui/modules'; +import 'ui/directives/json_input'; import template from './watch_history_item_detail.html'; import 'ace';