Merge branch 'master' into deps/upgrade-react

src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_app_state_mock.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { AppStateClass } from 'ui/state_management/app_state';
+import { AppStateClass } from '../legacy_imports';
 
 /**
  * A poor excuse for a mock just to get some basic tests to run in jest without requiring the injector.

src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss

@@ -1,7 +1,7 @@
 .dshAppContainer {
-  flex: 1;
   display: flex;
   flex-direction: column;
+  height: 100%;
 }
 
 .dshStartScreen {

src/legacy/core_plugins/kibana/public/dashboard/application.ts

@@ -0,0 +1,228 @@
+/*
+ * 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.
+ */
+
+import { EuiConfirmModal, EuiIcon } from '@elastic/eui';
+import angular, { IModule } from 'angular';
+import { IPrivate } from 'ui/private';
+import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
+import {
+  AppMountContext,
+  ChromeStart,
+  LegacyCoreStart,
+  SavedObjectsClientContract,
+  UiSettingsClientContract,
+} from 'kibana/public';
+import { Storage } from '../../../../../plugins/kibana_utils/public';
+import {
+  GlobalStateProvider,
+  StateManagementConfigProvider,
+  AppStateProvider,
+  PrivateProvider,
+  EventsProvider,
+  PersistedState,
+  createTopNavDirective,
+  createTopNavHelper,
+  PromiseServiceCreator,
+  KbnUrlProvider,
+  RedirectWhenMissingProvider,
+  confirmModalFactory,
+  configureAppAngularModule,
+} from './legacy_imports';
+
+// @ts-ignore
+import { initDashboardApp } from './legacy_app';
+import { DataStart } from '../../../data/public';
+import { EmbeddablePublicPlugin } from '../../../../../plugins/embeddable/public';
+import { NavigationStart } from '../../../navigation/public';
+import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
+import { SharePluginStart } from '../../../../../plugins/share/public';
+
+export interface RenderDeps {
+  core: LegacyCoreStart;
+  indexPatterns: DataStart['indexPatterns']['indexPatterns'];
+  dataStart: DataStart;
+  npDataStart: NpDataStart;
+  navigation: NavigationStart;
+  savedObjectsClient: SavedObjectsClientContract;
+  savedObjectRegistry: any;
+  dashboardConfig: any;
+  savedDashboards: any;
+  dashboardCapabilities: any;
+  uiSettings: UiSettingsClientContract;
+  chrome: ChromeStart;
+  addBasePath: (path: string) => string;
+  savedQueryService: DataStart['search']['services']['savedQueryService'];
+  embeddables: ReturnType<EmbeddablePublicPlugin['start']>;
+  localStorage: Storage;
+  share: SharePluginStart;
+}
+
+let angularModuleInstance: IModule | null = null;
+
+export const renderApp = (element: HTMLElement, appBasePath: string, deps: RenderDeps) => {
+  if (!angularModuleInstance) {
+    angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
+    // global routing stuff
+    configureAppAngularModule(angularModuleInstance, deps.core as LegacyCoreStart, true);
+    // custom routing stuff
+    initDashboardApp(angularModuleInstance, deps);
+  }
+  const $injector = mountDashboardApp(appBasePath, element);
+  return () => {
+    $injector.get('$rootScope').$destroy();
+  };
+};
+
+const mainTemplate = (basePath: string) => `<div style="height: 100%">
+  <base href="${basePath}" />
+  <div ng-view style="height: 100%;"></div>
+</div>
+`;
+
+const moduleName = 'app/dashboard';
+
+const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react'];
+
+function mountDashboardApp(appBasePath: string, element: HTMLElement) {
+  const mountpoint = document.createElement('div');
+  mountpoint.setAttribute('style', 'height: 100%');
+  // eslint-disable-next-line
+  mountpoint.innerHTML = mainTemplate(appBasePath);
+  // bootstrap angular into detached element and attach it later to
+  // make angular-within-angular possible
+  const $injector = angular.bootstrap(mountpoint, [moduleName]);
+  // initialize global state handler
+  element.appendChild(mountpoint);
+  return $injector;
+}
+
+function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
+  createLocalI18nModule();
+  createLocalPrivateModule();
+  createLocalPromiseModule();
+  createLocalConfigModule(core);
+  createLocalKbnUrlModule();
+  createLocalStateModule();
+  createLocalPersistedStateModule();
+  createLocalTopNavModule(navigation);
+  createLocalConfirmModalModule();
+  createLocalIconModule();
+
+  const dashboardAngularModule = angular.module(moduleName, [
+    ...thirdPartyAngularDependencies,
+    'app/dashboard/Config',
+    'app/dashboard/I18n',
+    'app/dashboard/Private',
+    'app/dashboard/PersistedState',
+    'app/dashboard/TopNav',
+    'app/dashboard/State',
+    'app/dashboard/ConfirmModal',
+    'app/dashboard/icon',
+  ]);
+  return dashboardAngularModule;
+}
+
+function createLocalIconModule() {
+  angular
+    .module('app/dashboard/icon', ['react'])
+    .directive('icon', reactDirective => reactDirective(EuiIcon));
+}
+
+function createLocalConfirmModalModule() {
+  angular
+    .module('app/dashboard/ConfirmModal', ['react'])
+    .factory('confirmModal', confirmModalFactory)
+    .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
+}
+
+function createLocalStateModule() {
+  angular
+    .module('app/dashboard/State', [
+      'app/dashboard/Private',
+      'app/dashboard/Config',
+      'app/dashboard/KbnUrl',
+      'app/dashboard/Promise',
+      'app/dashboard/PersistedState',
+    ])
+    .factory('AppState', function(Private: any) {
+      return Private(AppStateProvider);
+    })
+    .service('getAppState', function(Private: any) {
+      return Private(AppStateProvider).getAppState;
+    })
+    .service('globalState', function(Private: any) {
+      return Private(GlobalStateProvider);
+    });
+}
+
+function createLocalPersistedStateModule() {
+  angular
+    .module('app/dashboard/PersistedState', ['app/dashboard/Private', 'app/dashboard/Promise'])
+    .factory('PersistedState', (Private: IPrivate) => {
+      const Events = Private(EventsProvider);
+      return class AngularPersistedState extends PersistedState {
+        constructor(value: any, path: any) {
+          super(value, path, Events);
+        }
+      };
+    });
+}
+
+function createLocalKbnUrlModule() {
+  angular
+    .module('app/dashboard/KbnUrl', ['app/dashboard/Private', 'ngRoute'])
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
+    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+}
+
+function createLocalConfigModule(core: AppMountContext['core']) {
+  angular
+    .module('app/dashboard/Config', ['app/dashboard/Private'])
+    .provider('stateManagementConfig', StateManagementConfigProvider)
+    .provider('config', () => {
+      return {
+        $get: () => ({
+          get: core.uiSettings.get.bind(core.uiSettings),
+        }),
+      };
+    });
+}
+
+function createLocalPromiseModule() {
+  angular.module('app/dashboard/Promise', []).service('Promise', PromiseServiceCreator);
+}
+
+function createLocalPrivateModule() {
+  angular.module('app/dashboard/Private', []).provider('Private', PrivateProvider);
+}
+
+function createLocalTopNavModule(navigation: NavigationStart) {
+  angular
+    .module('app/dashboard/TopNav', ['react'])
+    .directive('kbnTopNav', createTopNavDirective)
+    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
+}
+
+function createLocalI18nModule() {
+  angular
+    .module('app/dashboard/I18n', [])
+    .provider('i18n', I18nProvider)
+    .filter('i18n', i18nFilter)
+    .directive('i18nId', i18nDirective);
+}

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html

@@ -4,11 +4,11 @@
 >
   <!-- Local nav. -->
   <kbn-top-nav
-    ng-show="chrome.getVisible()"
+    ng-show="isVisible"
     app-name="'dashboard'"
     config="topNavMenu"
 
-    show-search-bar="chrome.getVisible()"
+    show-search-bar="isVisible"
     show-filter-bar="showFilterBar()"
     show-save-query="showSaveQuery"
 
@@ -34,13 +34,21 @@
   The top nav is hidden in embed mode but the filter bar must still be present so
   we show the filter bar on its own here if the chrome is not visible.
 -->
-  <filter-bar
-    ng-if="showFilterBar() && !chrome.getVisible()"
+  <kbn-top-nav
+    ng-if="showFilterBar() && !isVisible"
     class-name="'globalFilterGroup__filterBar'"
+
+    app-name="'dashboard'"
+    show-search-bar="true"
+    show-filter-bar="true"
+    show-save-query="false"
+    show-date-picker="false"
+
     filters="model.filters"
-    on-filters-updated="onFiltersUpdated"
     index-patterns="indexPatterns"
-  ></filter-bar>
+    on-filters-updated="onFiltersUpdated"
+  >
+  </kbn-top-nav>
 
   <div ng-show="getShouldShowEditHelp() || getShouldShowViewHelp()" class="dshStartScreen">
     <div class="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--horizontalCenter">