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] 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.",
           })}