From ea33af627d36f53efdd884abc39649c965b7f7b9 Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Tue, 10 Mar 2020 18:19:27 +0300
Subject: [PATCH 1/9] Move redirect_when_missing to kibana utils

---
 .../public/visualize/np_ready/application.ts  |  4 +-
 .../visualize/np_ready/editor/editor.js       | 15 ++--
 .../public/visualize/np_ready/legacy_app.js   | 37 ++++++---
 .../kibana_utils/public/history/index.ts      |  1 +
 .../public/history/redirect_when_missing.tsx  | 83 +++++++++++++++++++
 src/plugins/kibana_utils/public/index.ts      |  2 +-
 6 files changed, 120 insertions(+), 22 deletions(-)
 create mode 100644 src/plugins/kibana_utils/public/history/redirect_when_missing.tsx

diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
index 8ef63ec5778e2..c7c3286bb5c71 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
@@ -24,7 +24,6 @@ import { AppMountContext } from 'kibana/public';
 import {
   configureAppAngularModule,
   KbnUrlProvider,
-  RedirectWhenMissingProvider,
   IPrivate,
   PrivateProvider,
   PromiseServiceCreator,
@@ -102,8 +101,7 @@ function createLocalAngularModule(core: AppMountContext['core'], navigation: Nav
 function createLocalKbnUrlModule() {
   angular
     .module('app/visualize/KbnUrl', ['app/visualize/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
-    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
 }
 
 function createLocalPromiseModule() {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index e1a20e3381331..ce264bc772860 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -30,7 +30,7 @@ import { VisualizeConstants } from '../visualize_constants';
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
+import { unhashUrl, redirectWhenMissing } from '../../../../../../../plugins/kibana_utils/public';
 import { kbnBaseUrl } from '../../../../../../../plugins/kibana_legacy/public';
 import {
   SavedObjectSaveModal,
@@ -75,7 +75,6 @@ function VisualizeAppController(
   $injector,
   $timeout,
   kbnUrl,
-  redirectWhenMissing,
   kbnUrlStateStorage,
   history
 ) {
@@ -319,10 +318,16 @@ function VisualizeAppController(
   if (!_.isEqual(stateContainer.getState().vis, stateDefaults.vis)) {
     try {
       vis.setState(stateContainer.getState().vis);
-    } catch {
-      redirectWhenMissing({
-        'index-pattern-field': '/visualize',
+    } catch (error) {
+      const redirect = redirectWhenMissing({
+        history,
+        mapping: {
+          'index-pattern-field': '/visualize',
+        },
+        toastNotifications,
       });
+
+      redirect(error);
     }
   }
 
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
index 7079023e5bfa3..77f2840b537bb 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
@@ -21,7 +21,10 @@ import { find } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { createHashHistory } from 'history';
 
-import { createKbnUrlStateStorage } from '../../../../../../plugins/kibana_utils/public';
+import {
+  createKbnUrlStateStorage,
+  redirectWhenMissing,
+} from '../../../../../../plugins/kibana_utils/public';
 
 import editorTemplate from './editor/editor.html';
 import visualizeListingTemplate from './listing/visualize_listing.html';
@@ -100,8 +103,8 @@ export function initVisualizeApp(app, deps) {
         template: editorTemplate,
         k7Breadcrumbs: getCreateBreadcrumbs,
         resolve: {
-          savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
-            const { core, data, savedVisualizations, visualizations } = deps;
+          savedVis: function($route, $rootScope, kbnUrl, history) {
+            const { core, data, savedVisualizations, visualizations, toastNotifications } = deps;
             const visTypes = visualizations.types.all();
             const visType = find(visTypes, { name: $route.current.params.type });
             const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
@@ -128,7 +131,11 @@ export function initVisualizeApp(app, deps) {
               })
               .catch(
                 redirectWhenMissing({
-                  '*': '/visualize',
+                  history,
+                  mapping: {
+                    '*': '/visualize',
+                  },
+                  toastNotifications,
                 })
               );
           },
@@ -139,8 +146,8 @@ export function initVisualizeApp(app, deps) {
         template: editorTemplate,
         k7Breadcrumbs: getEditBreadcrumbs,
         resolve: {
-          savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
-            const { chrome, core, data, savedVisualizations } = deps;
+          savedVis: function($route, $rootScope, kbnUrl, history) {
+            const { chrome, core, data, savedVisualizations, toastNotifications } = deps;
             return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
               .then(() => savedVisualizations.get($route.current.params.id))
               .then(savedVis => {
@@ -155,13 +162,17 @@ export function initVisualizeApp(app, deps) {
               })
               .catch(
                 redirectWhenMissing({
-                  visualization: '/visualize',
-                  search:
-                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
-                  'index-pattern':
-                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
-                  'index-pattern-field':
-                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                  history,
+                  mapping: {
+                    visualization: '/visualize',
+                    search:
+                      '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                    'index-pattern':
+                      '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                    'index-pattern-field':
+                      '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                  },
+                  toastNotifications,
                 })
               );
           },
diff --git a/src/plugins/kibana_utils/public/history/index.ts b/src/plugins/kibana_utils/public/history/index.ts
index b4b5658c1c886..bb13ea09f928a 100644
--- a/src/plugins/kibana_utils/public/history/index.ts
+++ b/src/plugins/kibana_utils/public/history/index.ts
@@ -18,3 +18,4 @@
  */
 
 export { removeQueryParam } from './remove_query_param';
+export { redirectWhenMissing } from './redirect_when_missing';
diff --git a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
new file mode 100644
index 0000000000000..47d7f6010c711
--- /dev/null
+++ b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
@@ -0,0 +1,83 @@
+/*
+ * 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 React from 'react';
+import { History } from 'history';
+import { i18n } from '@kbn/i18n';
+
+import { ToastsSetup } from 'kibana/public';
+import { MarkdownSimple, toMountPoint } from '../../../kibana_react/public';
+import { SavedObjectNotFound } from '../errors';
+
+interface Mapping {
+  [key: string]: string;
+}
+
+/**
+ * Creates an error handler that will redirect to a url when a SavedObjectNotFound
+ * error is thrown
+ */
+export function redirectWhenMissing({
+  history,
+  mapping,
+  toastNotifications,
+}: {
+  history: History;
+  /**
+   * a mapping of url's to redirect to based on the saved object that
+   * couldn't be found, or just a string that will be used for all types
+   */
+  mapping: string | Mapping;
+  /**
+   * Toast notifications service to show toasts in error cases.
+   */
+  toastNotifications: ToastsSetup;
+}) {
+  let localMappingObject: Mapping;
+
+  if (typeof mapping === 'string') {
+    localMappingObject = { '*': mapping };
+  } else {
+    localMappingObject = mapping;
+  }
+
+  return (error: SavedObjectNotFound | Error) => {
+    // if this error is not "404", rethrow
+    if (!(error instanceof SavedObjectNotFound)) {
+      throw error;
+    }
+
+    const unknownVisType = error.message.indexOf('Invalid type') === 0;
+    if (unknownVisType) {
+      error.savedObjectType = 'visualization';
+    }
+
+    let url = localMappingObject[error.savedObjectType] || localMappingObject['*'] || '/';
+    url += (url.indexOf('?') >= 0 ? '&' : '?') + `notFound=${error.savedObjectType}`;
+
+    toastNotifications.addWarning({
+      title: i18n.translate('common.ui.url.savedObjectIsMissingNotificationMessage', {
+        defaultMessage: 'Saved object is missing',
+      }),
+      text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
+    });
+
+    history.replace(url);
+  };
+}
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 6971d96e471bd..607dd76a3bc7d 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -72,5 +72,5 @@ export {
   StartSyncStateFnType,
   StopSyncStateFnType,
 } from './state_sync';
-export { removeQueryParam } from './history';
+export { removeQueryParam, redirectWhenMissing } from './history';
 export { applyDiff } from './state_management/utils/diff_object';

From ad3590a0239c6bcdf85c2e4dbb56a09e7983e0ea Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Tue, 10 Mar 2020 18:39:35 +0300
Subject: [PATCH 2/9] Replace redirectWhenMissing in dashboard

---
 .../kibana/public/dashboard/legacy_imports.ts |  2 +-
 .../public/dashboard/np_ready/application.ts  |  3 +--
 .../public/dashboard/np_ready/legacy_app.js   | 23 +++++++++++++------
 .../kibana/public/visualize/legacy_imports.ts |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index beadcda595288..a095935afa8d2 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -28,7 +28,7 @@ export { npSetup, npStart } from 'ui/new_platform';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 export { KbnUrl } from 'ui/url/kbn_url';
 // @ts-ignore
-export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url/index';
+export { KbnUrlProvider } from 'ui/url/index';
 export { IInjector } from 'ui/chrome';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 9ca84735cac16..4d216f5ca7462 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -146,8 +146,7 @@ function createLocalIconModule() {
 function createLocalKbnUrlModule() {
   angular
     .module('app/dashboard/KbnUrl', ['app/dashboard/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
-    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
 }
 
 function createLocalConfigModule(core: AppMountContext['core']) {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
index 35b510894179d..f7baba663da75 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -28,6 +28,7 @@ import { initDashboardAppDirective } from './dashboard_app';
 import { createDashboardEditUrl, DashboardConstants } from './dashboard_constants';
 import {
   createKbnUrlStateStorage,
+  redirectWhenMissing,
   InvalidJSONProperty,
   SavedObjectNotFound,
 } from '../../../../../../plugins/kibana_utils/public';
@@ -136,7 +137,7 @@ export function initDashboardApp(app, deps) {
           });
         },
         resolve: {
-          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl, history) {
+          dash: function($rootScope, $route, kbnUrl, history) {
             return ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl).then(() => {
               const savedObjectsClient = deps.savedObjectsClient;
               const title = $route.current.params.title;
@@ -171,14 +172,18 @@ export function initDashboardApp(app, deps) {
         controller: createNewDashboardCtrl,
         requireUICapability: 'dashboard.createNew',
         resolve: {
-          dash: function(redirectWhenMissing, $rootScope, kbnUrl) {
+          dash: function($rootScope, kbnUrl, history) {
             return ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl)
               .then(() => {
                 return deps.savedDashboards.get();
               })
               .catch(
                 redirectWhenMissing({
-                  dashboard: DashboardConstants.LANDING_PAGE_PATH,
+                  history,
+                  mapping: {
+                    dashboard: DashboardConstants.LANDING_PAGE_PATH,
+                  },
+                  toastNotifications: deps.core.notifications.toasts,
                 })
               );
           },
@@ -189,7 +194,7 @@ export function initDashboardApp(app, deps) {
         template: dashboardTemplate,
         controller: createNewDashboardCtrl,
         resolve: {
-          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl, history) {
+          dash: function($rootScope, $route, kbnUrl, history) {
             const id = $route.current.params.id;
 
             return ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl)
@@ -207,7 +212,7 @@ export function initDashboardApp(app, deps) {
               .catch(error => {
                 // A corrupt dashboard was detected (e.g. with invalid JSON properties)
                 if (error instanceof InvalidJSONProperty) {
-                  deps.toastNotifications.addDanger(error.message);
+                  deps.core.notifications.toasts.addDanger(error.message);
                   kbnUrl.redirect(DashboardConstants.LANDING_PAGE_PATH);
                   return;
                 }
@@ -221,7 +226,7 @@ export function initDashboardApp(app, deps) {
                     pathname: DashboardConstants.CREATE_NEW_DASHBOARD_URL,
                   });
 
-                  deps.toastNotifications.addWarning(
+                  deps.core.notifications.toasts.addWarning(
                     i18n.translate('kbn.dashboard.urlWasRemovedInSixZeroWarningMessage', {
                       defaultMessage:
                         'The url "dashboard/create" was removed in 6.0. Please update your bookmarks.',
@@ -234,7 +239,11 @@ export function initDashboardApp(app, deps) {
               })
               .catch(
                 redirectWhenMissing({
-                  dashboard: DashboardConstants.LANDING_PAGE_PATH,
+                  history,
+                  mapping: {
+                    dashboard: DashboardConstants.LANDING_PAGE_PATH,
+                  },
+                  toastNotifications: deps.core.notifications.toasts,
                 })
               );
           },
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index 66a7bd6f33373..cf483d0032e1e 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -26,7 +26,7 @@
 
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
-export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
+export { KbnUrlProvider } from 'ui/url';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export { KibanaParsedUrl } from 'ui/url/kibana_parsed_url';
 export { wrapInI18nContext } from 'ui/i18n';

From d8ff50c364b7e99b358557a6444707eec34f7a62 Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Tue, 10 Mar 2020 18:50:31 +0300
Subject: [PATCH 3/9] Replace redirectWhenMissing in discover

---
 .../kibana/public/dashboard/np_ready/application.ts  |  1 -
 .../kibana/public/discover/get_inner_angular.ts      |  5 ++---
 .../kibana/public/discover/kibana_services.ts        |  2 +-
 .../public/discover/np_ready/angular/discover.js     | 12 ++++++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 4d216f5ca7462..3e4c17ece61bd 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -35,7 +35,6 @@ import {
   KbnUrlProvider,
   PrivateProvider,
   PromiseServiceCreator,
-  RedirectWhenMissingProvider,
 } from '../legacy_imports';
 // @ts-ignore
 import { initDashboardApp } from './legacy_app';
diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index 9c29e182c55d6..16d04ea762a47 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -33,7 +33,7 @@ import { GlobalStateProvider } from 'ui/state_management/global_state';
 // @ts-ignore
 import { StateManagementConfigProvider } from 'ui/state_management/config_provider';
 // @ts-ignore
-import { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
+import { KbnUrlProvider } from 'ui/url';
 import { DataPublicPluginStart } from '../../../../../plugins/data/public';
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
@@ -194,8 +194,7 @@ export function createLocalGlobalStateModule() {
 function createLocalKbnUrlModule() {
   angular
     .module('discoverKbnUrl', ['discoverPrivate', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
-    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
 }
 
 function createLocalConfigModule(uiSettings: IUiSettingsClient) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 91b5c7f13dc95..0482d55444be3 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -59,7 +59,7 @@ export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
 export { timezoneProvider } from 'ui/vis/lib/timezone';
 export { tabifyAggResponse } from '../../../data/public';
-export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
+export { unhashUrl, redirectWhenMissing } from '../../../../../plugins/kibana_utils/public';
 export {
   migrateLegacyQuery,
   ensureDefaultIndexPattern,
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index fb4158a6e3e03..6a7c9557549c5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -59,6 +59,7 @@ import {
   getAngularModule,
   ensureDefaultIndexPattern,
   registerTimefilterWithGlobalStateFactory,
+  redirectWhenMissing,
 } from '../../kibana_services';
 
 const {
@@ -119,7 +120,7 @@ app.config($routeProvider => {
     template: indexTemplate,
     reloadOnSearch: false,
     resolve: {
-      savedObjects: function(redirectWhenMissing, $route, kbnUrl, Promise, $rootScope, State) {
+      savedObjects: function($route, kbnUrl, Promise, $rootScope, State) {
         const indexPatterns = getServices().indexPatterns;
         const savedSearchId = $route.current.params.id;
         return ensureDefaultIndexPattern(core, getServices().data, $rootScope, kbnUrl).then(() => {
@@ -162,9 +163,12 @@ app.config($routeProvider => {
               })
               .catch(
                 redirectWhenMissing({
-                  search: '/discover',
-                  'index-pattern':
-                    '/management/kibana/objects/savedSearches/' + $route.current.params.id,
+                  mapping: {
+                    search: '/discover',
+                    'index-pattern':
+                      '/management/kibana/objects/savedSearches/' + $route.current.params.id,
+                  },
+                  toastNotifications,
                 })
               ),
           });

From 0bdeb07f4bebb150e3f673714748b0ecd1f9f59f Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Wed, 11 Mar 2020 12:31:00 +0300
Subject: [PATCH 4/9] Remove redirect in monitoring

---
 .../public/discover/np_ready/angular/discover.js     | 12 +++++++++---
 .../discover/np_ready/angular/discover_state.test.ts |  2 +-
 .../discover/np_ready/angular/discover_state.ts      |  8 ++++----
 .../public/history/redirect_when_missing.tsx         |  2 +-
 .../monitoring/public/np_imports/angular/modules.ts  |  4 +---
 .../monitoring/public/np_imports/legacy_imports.ts   |  2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index c717fb327d249..39eb842904b78 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -24,6 +24,7 @@ import { debounceTime } from 'rxjs/operators';
 import moment from 'moment';
 import dateMath from '@elastic/datemath';
 import { i18n } from '@kbn/i18n';
+import { createHashHistory } from 'history';
 import { getState, splitState } from './discover_state';
 
 import { RequestAdapter } from '../../../../../../../plugins/inspector/public';
@@ -87,6 +88,8 @@ const fetchStatuses = {
 
 const app = getAngularModule();
 
+app.factory('history', () => createHashHistory());
+
 app.config($routeProvider => {
   const defaults = {
     requireDefaultIndex: true,
@@ -114,10 +117,10 @@ app.config($routeProvider => {
     template: indexTemplate,
     reloadOnSearch: false,
     resolve: {
-      savedObjects: function($route, kbnUrl, Promise, $rootScope) {
+      savedObjects: function($route, kbnUrl, Promise, $rootScope, history) {
         const savedSearchId = $route.current.params.id;
         return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl).then(() => {
-          const { appStateContainer } = getState({});
+          const { appStateContainer } = getState({ history });
           const { index } = appStateContainer.getState();
           return Promise.props({
             ip: indexPatterns.getCache().then(indexPatternList => {
@@ -152,6 +155,7 @@ app.config($routeProvider => {
               })
               .catch(
                 redirectWhenMissing({
+                  history,
                   mapping: {
                     search: '/discover',
                     'index-pattern':
@@ -185,7 +189,8 @@ function discoverController(
   config,
   kbnUrl,
   localStorage,
-  uiCapabilities
+  uiCapabilities,
+  history
 ) {
   const { isDefault: isDefaultType } = indexPatternsUtils;
   const subscriptions = new Subscription();
@@ -211,6 +216,7 @@ function discoverController(
   } = getState({
     defaultAppState: getStateDefaults(),
     storeInSessionStorage: config.get('state:storeInSessionStorage'),
+    history,
   });
   if (appStateContainer.getState().index !== $scope.indexPattern.id) {
     //used index pattern is different than the given by url/state which is invalid
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.test.ts
index af772cb5c76f1..3840fd0c2e3be 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.test.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.test.ts
@@ -30,7 +30,7 @@ describe('Test discover state', () => {
     history.push('/');
     state = getState({
       defaultAppState: { index: 'test' },
-      hashHistory: history,
+      history,
     });
     await state.replaceUrlAppState({});
     await state.startSync();
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts
index 10e7cd1d0c49d..106cebe1d6153 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts
@@ -65,9 +65,9 @@ interface GetStateParams {
    */
   storeInSessionStorage?: boolean;
   /**
-   * Browser history used for testing
+   * Browser history
    */
-  hashHistory?: History;
+  history: History;
 }
 
 export interface GetStateReturn {
@@ -121,11 +121,11 @@ const APP_STATE_URL_KEY = '_a';
 export function getState({
   defaultAppState = {},
   storeInSessionStorage = false,
-  hashHistory,
+  history,
 }: GetStateParams): GetStateReturn {
   const stateStorage = createKbnUrlStateStorage({
     useHash: storeInSessionStorage,
-    history: hashHistory ? hashHistory : createHashHistory(),
+    history,
   });
 
   const appStateFromUrl = stateStorage.get(APP_STATE_URL_KEY) as AppState;
diff --git a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
index 47d7f6010c711..f498543ef47e2 100644
--- a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
+++ b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
@@ -72,7 +72,7 @@ export function redirectWhenMissing({
     url += (url.indexOf('?') >= 0 ? '&' : '?') + `notFound=${error.savedObjectType}`;
 
     toastNotifications.addWarning({
-      title: i18n.translate('common.ui.url.savedObjectIsMissingNotificationMessage', {
+      title: i18n.translate('kibana_utils.history.savedObjectIsMissingNotificationMessage', {
         defaultMessage: 'Saved object is missing',
       }),
       text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
diff --git a/x-pack/legacy/plugins/monitoring/public/np_imports/angular/modules.ts b/x-pack/legacy/plugins/monitoring/public/np_imports/angular/modules.ts
index c14b64a32fb5c..b506784bf15ee 100644
--- a/x-pack/legacy/plugins/monitoring/public/np_imports/angular/modules.ts
+++ b/x-pack/legacy/plugins/monitoring/public/np_imports/angular/modules.ts
@@ -19,7 +19,6 @@ import {
   StateManagementConfigProvider,
   AppStateProvider,
   KbnUrlProvider,
-  RedirectWhenMissingProvider,
   npStart,
 } from '../legacy_imports';
 
@@ -79,8 +78,7 @@ function createLocalStateModule() {
 function createLocalKbnUrlModule() {
   angular
     .module('monitoring/KbnUrl', ['monitoring/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
-    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider));
 }
 
 function createLocalConfigModule(core: AppMountContext['core']) {
diff --git a/x-pack/legacy/plugins/monitoring/public/np_imports/legacy_imports.ts b/x-pack/legacy/plugins/monitoring/public/np_imports/legacy_imports.ts
index a2ebe8231456f..208b7e2acdb0f 100644
--- a/x-pack/legacy/plugins/monitoring/public/np_imports/legacy_imports.ts
+++ b/x-pack/legacy/plugins/monitoring/public/np_imports/legacy_imports.ts
@@ -18,5 +18,5 @@ export { AppStateProvider } from 'ui/state_management/app_state';
 // @ts-ignore
 export { EventsProvider } from 'ui/events';
 // @ts-ignore
-export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
+export { KbnUrlProvider } from 'ui/url';
 export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';

From 1082371ff8b51eb1168e6dc8703c50fca9c56544 Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Wed, 11 Mar 2020 13:38:58 +0300
Subject: [PATCH 5/9] Remove extra import

---
 .../kibana/public/discover/np_ready/angular/discover_state.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts
index 106cebe1d6153..981855d1ee774 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover_state.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { isEqual } from 'lodash';
-import { createHashHistory, History } from 'history';
+import { History } from 'history';
 import {
   createStateContainer,
   createKbnUrlStateStorage,

From 8149cac6bc701f5c6bdb17e6d8c5bd9ec60c6aaa Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Wed, 11 Mar 2020 16:18:49 +0300
Subject: [PATCH 6/9] Cutover ensure_default_index_pattern to kibana_utils

---
 .../kibana/public/dashboard/legacy_imports.ts |  1 -
 .../public/dashboard/np_ready/legacy_app.js   | 25 +++++-------
 .../kibana/public/discover/kibana_services.ts |  8 ++--
 .../discover/np_ready/angular/discover.js     |  2 +-
 .../kibana/public/visualize/legacy_imports.ts |  1 -
 .../public/visualize/np_ready/legacy_app.js   | 16 ++++----
 src/legacy/ui/public/legacy_compat/index.ts   |  5 +--
 .../kibana_legacy/public/angular/index.ts     |  1 -
 .../history}/ensure_default_index_pattern.tsx | 40 ++++++++-----------
 .../kibana_utils/public/history/index.ts      |  1 +
 src/plugins/kibana_utils/public/index.ts      |  2 +-
 11 files changed, 42 insertions(+), 60 deletions(-)
 rename src/plugins/{kibana_legacy/public/angular => kibana_utils/public/history}/ensure_default_index_pattern.tsx (77%)

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index a095935afa8d2..8ac5eb7dadbf8 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -33,7 +33,6 @@ export { IInjector } from 'ui/chrome';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export {
   configureAppAngularModule,
-  ensureDefaultIndexPattern,
   IPrivate,
   migrateLegacyQuery,
   PrivateProvider,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
index f7baba663da75..64abbdfb87d58 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -23,11 +23,11 @@ import dashboardTemplate from './dashboard_app.html';
 import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.html';
 import { createHashHistory } from 'history';
 
-import { ensureDefaultIndexPattern } from '../legacy_imports';
 import { initDashboardAppDirective } from './dashboard_app';
 import { createDashboardEditUrl, DashboardConstants } from './dashboard_constants';
 import {
   createKbnUrlStateStorage,
+  ensureDefaultIndexPattern,
   redirectWhenMissing,
   InvalidJSONProperty,
   SavedObjectNotFound,
@@ -137,8 +137,8 @@ export function initDashboardApp(app, deps) {
           });
         },
         resolve: {
-          dash: function($rootScope, $route, kbnUrl, history) {
-            return ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl).then(() => {
+          dash: function($route, history) {
+            return ensureDefaultIndexPattern(deps.core, deps.data, history).then(() => {
               const savedObjectsClient = deps.savedObjectsClient;
               const title = $route.current.params.title;
               if (title) {
@@ -172,11 +172,9 @@ export function initDashboardApp(app, deps) {
         controller: createNewDashboardCtrl,
         requireUICapability: 'dashboard.createNew',
         resolve: {
-          dash: function($rootScope, kbnUrl, history) {
-            return ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl)
-              .then(() => {
-                return deps.savedDashboards.get();
-              })
+          dash: history =>
+            ensureDefaultIndexPattern(deps.core, deps.data, history)
+              .then(() => deps.savedDashboards.get())
               .catch(
                 redirectWhenMissing({
                   history,
@@ -185,8 +183,7 @@ export function initDashboardApp(app, deps) {
                   },
                   toastNotifications: deps.core.notifications.toasts,
                 })
-              );
-          },
+              ),
         },
       })
       .when(createDashboardEditUrl(':id'), {
@@ -194,13 +191,11 @@ export function initDashboardApp(app, deps) {
         template: dashboardTemplate,
         controller: createNewDashboardCtrl,
         resolve: {
-          dash: function($rootScope, $route, kbnUrl, history) {
+          dash: function($route, kbnUrl, history) {
             const id = $route.current.params.id;
 
-            return ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl)
-              .then(() => {
-                return deps.savedDashboards.get(id);
-              })
+            return ensureDefaultIndexPattern(deps.core, deps.data, history)
+              .then(() => deps.savedDashboards.get(id))
               .then(savedDashboard => {
                 deps.chrome.recentlyAccessed.add(
                   savedDashboard.getFullPath(),
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index e162d0fb6201d..919968a14c547 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -57,12 +57,12 @@ export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
 export { timezoneProvider } from 'ui/vis/lib/timezone';
 export { tabifyAggResponse } from '../../../data/public';
-export { unhashUrl, redirectWhenMissing } from '../../../../../plugins/kibana_utils/public';
 export {
+  unhashUrl,
+  redirectWhenMissing,
   ensureDefaultIndexPattern,
-  formatMsg,
-  formatStack,
-} from '../../../../../plugins/kibana_legacy/public';
+} from '../../../../../plugins/kibana_utils/public';
+export { formatMsg, formatStack } from '../../../../../plugins/kibana_legacy/public';
 
 // EXPORT types
 export {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 39eb842904b78..67896126a2178 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -119,7 +119,7 @@ app.config($routeProvider => {
     resolve: {
       savedObjects: function($route, kbnUrl, Promise, $rootScope, history) {
         const savedSearchId = $route.current.params.id;
-        return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl).then(() => {
+        return ensureDefaultIndexPattern(core, data, history).then(() => {
           const { appStateContainer } = getState({ history });
           const { index } = appStateContainer.getState();
           return Promise.props({
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index cf483d0032e1e..197d622e3f878 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -34,7 +34,6 @@ export { DashboardConstants } from '../dashboard/np_ready/dashboard_constants';
 export { VisSavedObject, VISUALIZE_EMBEDDABLE_TYPE } from '../../../visualizations/public/';
 export {
   configureAppAngularModule,
-  ensureDefaultIndexPattern,
   IPrivate,
   migrateLegacyQuery,
   PrivateProvider,
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
index b17e8ba95b8cc..d9e63bfabb772 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
@@ -24,6 +24,7 @@ import { createHashHistory } from 'history';
 import {
   createKbnUrlStateStorage,
   redirectWhenMissing,
+  ensureDefaultIndexPattern,
 } from '../../../../../../plugins/kibana_utils/public';
 
 import editorTemplate from './editor/editor.html';
@@ -32,7 +33,6 @@ import visualizeListingTemplate from './listing/visualize_listing.html';
 import { initVisualizeAppDirective } from './visualize_app';
 import { VisualizeConstants } from './visualize_constants';
 import { VisualizeListingController } from './listing/visualize_listing';
-import { ensureDefaultIndexPattern } from '../legacy_imports';
 
 import {
   getLandingBreadcrumbs,
@@ -82,8 +82,7 @@ export function initVisualizeApp(app, deps) {
         controllerAs: 'listingController',
         resolve: {
           createNewVis: () => false,
-          hasDefaultIndex: ($rootScope, kbnUrl) =>
-            ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl),
+          hasDefaultIndex: history => ensureDefaultIndexPattern(deps.core, deps.data, history),
         },
       })
       .when(VisualizeConstants.WIZARD_STEP_1_PAGE_PATH, {
@@ -94,8 +93,7 @@ export function initVisualizeApp(app, deps) {
         controllerAs: 'listingController',
         resolve: {
           createNewVis: () => true,
-          hasDefaultIndex: ($rootScope, kbnUrl) =>
-            ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl),
+          hasDefaultIndex: history => ensureDefaultIndexPattern(deps.core, deps.data, history),
         },
       })
       .when(VisualizeConstants.CREATE_PATH, {
@@ -103,7 +101,7 @@ export function initVisualizeApp(app, deps) {
         template: editorTemplate,
         k7Breadcrumbs: getCreateBreadcrumbs,
         resolve: {
-          savedVis: function($route, $rootScope, kbnUrl, history) {
+          savedVis: function($route, history) {
             const { core, data, savedVisualizations, visualizations, toastNotifications } = deps;
             const visTypes = visualizations.all();
             const visType = find(visTypes, { name: $route.current.params.type });
@@ -121,7 +119,7 @@ export function initVisualizeApp(app, deps) {
               );
             }
 
-            return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
+            return ensureDefaultIndexPattern(core, data, history)
               .then(() => savedVisualizations.get($route.current.params))
               .then(savedVis => {
                 if (savedVis.vis.type.setup) {
@@ -146,9 +144,9 @@ export function initVisualizeApp(app, deps) {
         template: editorTemplate,
         k7Breadcrumbs: getEditBreadcrumbs,
         resolve: {
-          savedVis: function($route, $rootScope, kbnUrl, history) {
+          savedVis: function($route, history) {
             const { chrome, core, data, savedVisualizations, toastNotifications } = deps;
-            return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
+            return ensureDefaultIndexPattern(core, data, history)
               .then(() => savedVisualizations.get($route.current.params.id))
               .then(savedVis => {
                 chrome.recentlyAccessed.add(savedVis.getFullPath(), savedVis.title, savedVis.id);
diff --git a/src/legacy/ui/public/legacy_compat/index.ts b/src/legacy/ui/public/legacy_compat/index.ts
index 3b700c8d59399..2067fa6489304 100644
--- a/src/legacy/ui/public/legacy_compat/index.ts
+++ b/src/legacy/ui/public/legacy_compat/index.ts
@@ -17,7 +17,4 @@
  * under the License.
  */
 
-export {
-  configureAppAngularModule,
-  ensureDefaultIndexPattern,
-} from '../../../../plugins/kibana_legacy/public';
+export { configureAppAngularModule } from '../../../../plugins/kibana_legacy/public';
diff --git a/src/plugins/kibana_legacy/public/angular/index.ts b/src/plugins/kibana_legacy/public/angular/index.ts
index 0b234b7042850..b85982bcbc148 100644
--- a/src/plugins/kibana_legacy/public/angular/index.ts
+++ b/src/plugins/kibana_legacy/public/angular/index.ts
@@ -21,6 +21,5 @@ export { PromiseServiceCreator } from './promises';
 // @ts-ignore
 export { watchMultiDecorator } from './watch_multi';
 export * from './angular_config';
-export { ensureDefaultIndexPattern } from './ensure_default_index_pattern';
 // @ts-ignore
 export { createTopNavDirective, createTopNavHelper, loadKbnTopNavDirectives } from './kbn_top_nav';
diff --git a/src/plugins/kibana_legacy/public/angular/ensure_default_index_pattern.tsx b/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
similarity index 77%
rename from src/plugins/kibana_legacy/public/angular/ensure_default_index_pattern.tsx
rename to src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
index 1a3bb84ae7575..193a1a0a001cb 100644
--- a/src/plugins/kibana_legacy/public/angular/ensure_default_index_pattern.tsx
+++ b/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
@@ -18,14 +18,13 @@
  */
 
 import { contains } from 'lodash';
-import { IRootScopeService } from 'angular';
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { History } from 'history';
 import { i18n } from '@kbn/i18n';
-import { I18nProvider } from '@kbn/i18n/react';
 import { EuiCallOut } from '@elastic/eui';
 import { CoreStart } from 'kibana/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
+import { toMountPoint } from '../../../kibana_react/public';
 
 let bannerId: string;
 let timeoutId: NodeJS.Timeout | undefined;
@@ -41,8 +40,7 @@ let timeoutId: NodeJS.Timeout | undefined;
 export async function ensureDefaultIndexPattern(
   newPlatform: CoreStart,
   data: DataPublicPluginStart,
-  $rootScope: IRootScopeService,
-  kbnUrl: any
+  history: History
 ) {
   const patterns = await data.indexPatterns.getIds();
   let defaultId = newPlatform.uiSettings.get('defaultIndex');
@@ -73,22 +71,19 @@ export async function ensureDefaultIndexPattern(
 
     // Avoid being hostile to new users who don't have an index pattern setup yet
     // give them a friendly info message instead of a terse error message
-    bannerId = newPlatform.overlays.banners.replace(bannerId, (element: HTMLElement) => {
-      ReactDOM.render(
-        <I18nProvider>
-          <EuiCallOut
-            color="warning"
-            iconType="iInCircle"
-            title={i18n.translate('kibana_legacy.indexPattern.bannerLabel', {
-              defaultMessage:
-                "In order to visualize and explore data in Kibana, you'll need to create an index pattern to retrieve data from Elasticsearch.",
-            })}
-          />
-        </I18nProvider>,
-        element
-      );
-      return () => ReactDOM.unmountComponentAtNode(element);
-    });
+    bannerId = newPlatform.overlays.banners.replace(
+      bannerId,
+      toMountPoint(
+        <EuiCallOut
+          color="warning"
+          iconType="iInCircle"
+          title={i18n.translate('kibana_legacy.indexPattern.bannerLabel', {
+            defaultMessage:
+              "In order to visualize and explore data in Kibana, you'll need to create an index pattern to retrieve data from Elasticsearch.",
+          })}
+        />
+      )
+    );
 
     // hide the message after the user has had a chance to acknowledge it -- so it doesn't permanently stick around
     timeoutId = setTimeout(() => {
@@ -96,8 +91,7 @@ export async function ensureDefaultIndexPattern(
       timeoutId = undefined;
     }, 15000);
 
-    kbnUrl.change(redirectTarget);
-    $rootScope.$digest();
+    history.push(redirectTarget);
 
     // return never-resolving promise to stop resolving and wait for the url change
     return new Promise(() => {});
diff --git a/src/plugins/kibana_utils/public/history/index.ts b/src/plugins/kibana_utils/public/history/index.ts
index bb13ea09f928a..1a73bbb6b04a1 100644
--- a/src/plugins/kibana_utils/public/history/index.ts
+++ b/src/plugins/kibana_utils/public/history/index.ts
@@ -19,3 +19,4 @@
 
 export { removeQueryParam } from './remove_query_param';
 export { redirectWhenMissing } from './redirect_when_missing';
+export { ensureDefaultIndexPattern } from './ensure_default_index_pattern';
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 607dd76a3bc7d..6cec339824c4a 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -72,5 +72,5 @@ export {
   StartSyncStateFnType,
   StopSyncStateFnType,
 } from './state_sync';
-export { removeQueryParam, redirectWhenMissing } from './history';
+export { removeQueryParam, redirectWhenMissing, ensureDefaultIndexPattern } from './history';
 export { applyDiff } from './state_management/utils/diff_object';

From 2f8afe6c28c0f5ff294ead3ba7af7c25cd9607e1 Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Thu, 12 Mar 2020 16:34:07 +0300
Subject: [PATCH 7/9] Move invalid vistype check into editor.js

---
 .../visualize/np_ready/editor/editor.js       | 29 ++++++++++++-------
 .../public/history/redirect_when_missing.tsx  |  5 ----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index ce264bc772860..4f1d0964c5187 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -30,8 +30,9 @@ import { VisualizeConstants } from '../visualize_constants';
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { unhashUrl, redirectWhenMissing } from '../../../../../../../plugins/kibana_utils/public';
+import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
 import { kbnBaseUrl } from '../../../../../../../plugins/kibana_legacy/public';
+import { MarkdownSimple, toMountPoint } from '../../../../../../../plugins/kibana_react/public';
 import {
   SavedObjectSaveModal,
   showSaveModal,
@@ -312,6 +313,12 @@ function VisualizeAppController(
     }
   );
 
+  const stopAllSyncing = () => {
+    stopStateSync();
+    stopSyncingQueryServiceStateWithUrl();
+    stopSyncingAppFilters();
+  };
+
   // The savedVis is pulled from elasticsearch, but the appState is pulled from the url, with the
   // defaults applied. If the url was from a previous session which included modifications to the
   // appState then they won't be equal.
@@ -319,15 +326,16 @@ function VisualizeAppController(
     try {
       vis.setState(stateContainer.getState().vis);
     } catch (error) {
-      const redirect = redirectWhenMissing({
-        history,
-        mapping: {
-          'index-pattern-field': '/visualize',
-        },
-        toastNotifications,
+      stopAllSyncing();
+
+      toastNotifications.addWarning({
+        title: i18n.translate('kbn.visualize.visualizationTypeInvalidNotificationMessage', {
+          defaultMessage: 'Invalid visualization type',
+        }),
+        text: toMountPoint(<MarkdownSimple>{error.message}</MarkdownSimple>),
       });
 
-      redirect(error);
+      history.replace('/notFound=visualization');
     }
   }
 
@@ -503,9 +511,8 @@ function VisualizeAppController(
 
       unsubscribePersisted();
       unsubscribeStateUpdates();
-      stopStateSync();
-      stopSyncingQueryServiceStateWithUrl();
-      stopSyncingAppFilters();
+
+      stopAllSyncing();
     });
 
     $timeout(() => {
diff --git a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
index f498543ef47e2..69e8dda396008 100644
--- a/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
+++ b/src/plugins/kibana_utils/public/history/redirect_when_missing.tsx
@@ -63,11 +63,6 @@ export function redirectWhenMissing({
       throw error;
     }
 
-    const unknownVisType = error.message.indexOf('Invalid type') === 0;
-    if (unknownVisType) {
-      error.savedObjectType = 'visualization';
-    }
-
     let url = localMappingObject[error.savedObjectType] || localMappingObject['*'] || '/';
     url += (url.indexOf('?') >= 0 ? '&' : '?') + `notFound=${error.savedObjectType}`;
 

From aea85309f092e1872c77d55fc61a3cbce510259e Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Tue, 17 Mar 2020 15:45:03 +0300
Subject: [PATCH 8/9] Fix conflicts

---
 .../core_plugins/kibana/public/discover/kibana_services.ts | 7 +++++--
 .../kibana/public/discover/np_ready/angular/discover.js    | 4 ++--
 .../public/history/ensure_default_index_pattern.tsx        | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 9eb51224f8069..92af9a2253143 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -56,7 +56,6 @@ export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggRes
 export { shortenDottedString } from '../../common/utils/shorten_dotted_string';
 // @ts-ignore
 export { intervalOptions } from 'ui/agg_types';
-export { subscribeWithScope } from '../../../../../plugins/kibana_legacy/public';
 // @ts-ignore
 export { timezoneProvider } from 'ui/vis/lib/timezone';
 export {
@@ -64,7 +63,11 @@ export {
   redirectWhenMissing,
   ensureDefaultIndexPattern,
 } from '../../../../../plugins/kibana_utils/public';
-export { formatMsg, formatStack } from '../../../../../plugins/kibana_legacy/public';
+export {
+  formatMsg,
+  formatStack,
+  subscribeWithScope,
+} from '../../../../../plugins/kibana_legacy/public';
 
 // EXPORT types
 export {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 6978781fe6696..9a383565f4f43 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -115,9 +115,9 @@ app.config($routeProvider => {
     template: indexTemplate,
     reloadOnSearch: false,
     resolve: {
-      savedObjects: function($route, kbnUrl, Promise, $rootScope) {
+      savedObjects: function($route, Promise) {
         const savedSearchId = $route.current.params.id;
-        return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl).then(() => {
+        return ensureDefaultIndexPattern(core, data, history).then(() => {
           const { appStateContainer } = getState({ history });
           const { index } = appStateContainer.getState();
           return Promise.props({
diff --git a/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx b/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
index 193a1a0a001cb..ae789db10551e 100644
--- a/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
+++ b/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
@@ -77,7 +77,7 @@ export async function ensureDefaultIndexPattern(
         <EuiCallOut
           color="warning"
           iconType="iInCircle"
-          title={i18n.translate('kibana_legacy.indexPattern.bannerLabel', {
+          title={i18n.translate('kibana_utils.indexPattern.bannerLabel', {
             defaultMessage:
               "In order to visualize and explore data in Kibana, you'll need to create an index pattern to retrieve data from Elasticsearch.",
           })}

From a06df267c1e20bb0040417ff6497899847dcf33f Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Wed, 18 Mar 2020 16:17:01 +0300
Subject: [PATCH 9/9] Proper name for argument

---
 .../history/ensure_default_index_pattern.tsx      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx b/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
index ae789db10551e..7992f650cb372 100644
--- a/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
+++ b/src/plugins/kibana_utils/public/history/ensure_default_index_pattern.tsx
@@ -38,17 +38,17 @@ let timeoutId: NodeJS.Timeout | undefined;
  * resolve to wait for the URL change to happen.
  */
 export async function ensureDefaultIndexPattern(
-  newPlatform: CoreStart,
+  core: CoreStart,
   data: DataPublicPluginStart,
   history: History
 ) {
   const patterns = await data.indexPatterns.getIds();
-  let defaultId = newPlatform.uiSettings.get('defaultIndex');
+  let defaultId = core.uiSettings.get('defaultIndex');
   let defined = !!defaultId;
   const exists = contains(patterns, defaultId);
 
   if (defined && !exists) {
-    newPlatform.uiSettings.remove('defaultIndex');
+    core.uiSettings.remove('defaultIndex');
     defaultId = defined = false;
   }
 
@@ -59,10 +59,9 @@ export async function ensureDefaultIndexPattern(
   // If there is any index pattern created, set the first as default
   if (patterns.length >= 1) {
     defaultId = patterns[0];
-    newPlatform.uiSettings.set('defaultIndex', defaultId);
+    core.uiSettings.set('defaultIndex', defaultId);
   } else {
-    const canManageIndexPatterns =
-      newPlatform.application.capabilities.management.kibana.index_patterns;
+    const canManageIndexPatterns = core.application.capabilities.management.kibana.index_patterns;
     const redirectTarget = canManageIndexPatterns ? '/management/kibana/index_pattern' : '/home';
 
     if (timeoutId) {
@@ -71,7 +70,7 @@ export async function ensureDefaultIndexPattern(
 
     // Avoid being hostile to new users who don't have an index pattern setup yet
     // give them a friendly info message instead of a terse error message
-    bannerId = newPlatform.overlays.banners.replace(
+    bannerId = core.overlays.banners.replace(
       bannerId,
       toMountPoint(
         <EuiCallOut
@@ -87,7 +86,7 @@ export async function ensureDefaultIndexPattern(
 
     // hide the message after the user has had a chance to acknowledge it -- so it doesn't permanently stick around
     timeoutId = setTimeout(() => {
-      newPlatform.overlays.banners.remove(bannerId);
+      core.overlays.banners.remove(bannerId);
       timeoutId = undefined;
     }, 15000);