Merge branch '7.6' into backport/7.6/pr-60246

elastic · Mar 18, 2020 · 85a1120 · 85a1120
2 parents 1906711 + 2eb7208
commit 85a1120
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
@@ -23,8 +23,10 @@ import { DataPublicPluginStart } from '../../../../plugins/data/public';
 
 import {
   setFieldFormats,
-  setNotifications,
+  setHttp,
   setIndexPatterns,
+  setNotifications,
+  setOverlays,
   setQueryService,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../plugins/data/public/services';
@@ -60,12 +62,17 @@ export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDe
   public setup(core: CoreSetup) {}
 
   public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
-    // This is required for when Angular code uses Field and FieldList.
+    /**
+     * We need to call all of the same setters in the legacy world, because instances
+     * set in the new platform `data/public/services` are not accessible in legacy.
+     * This can cause legacy code which relies on services utilizing these to fail.
+     */
+    setHttp(core.http);
+    setNotifications(core.notifications);
+    setOverlays(core.overlays);
     setFieldFormats(data.fieldFormats);
-    setQueryService(data.query);
     setIndexPatterns(data.indexPatterns);
-    setFieldFormats(data.fieldFormats);
-    setNotifications(core.notifications);
+    setQueryService(data.query);
 
     return {
       search: this.search.start(core),

diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
@@ -32,7 +32,14 @@ import { FieldFormatsService } from './field_formats_provider';
 import { QueryService } from './query';
 import { createIndexPatternSelect } from './ui/index_pattern_select';
 import { IndexPatterns } from './index_patterns';
-import { setNotifications, setFieldFormats, setOverlays, setIndexPatterns } from './services';
+import {
+  setFieldFormats,
+  setHttp,
+  setIndexPatterns,
+  setNotifications,
+  setOverlays,
+  setQueryService,
+} from './services';
 import { createFilterAction, GLOBAL_APPLY_FILTER_ACTION } from './actions';
 import { APPLY_FILTER_TRIGGER } from '../../embeddable/public';
 import { createSearchBar } from './ui/search_bar/create_search_bar';
@@ -72,21 +79,25 @@ export class DataPublicPlugin implements Plugin<DataPublicPluginSetup, DataPubli
   public start(core: CoreStart, { uiActions }: DataStartDependencies): DataPublicPluginStart {
     const { uiSettings, http, notifications, savedObjects, overlays } = core;
     const fieldFormats = this.fieldFormatsService.start();
+    setHttp(http);
     setNotifications(notifications);
     setFieldFormats(fieldFormats);
     setOverlays(overlays);
 
     const indexPatternsService = new IndexPatterns(uiSettings, savedObjects.client, http);
     setIndexPatterns(indexPatternsService);
 
+    const queryService = this.queryService.start(core.savedObjects);
+    setQueryService(queryService);
+
     uiActions.attachAction(APPLY_FILTER_TRIGGER, GLOBAL_APPLY_FILTER_ACTION);
 
     const dataServices = {
       autocomplete: this.autocomplete,
       getSuggestions: getSuggestionsProvider(core.uiSettings, core.http),
       search: this.searchService.start(core),
       fieldFormats,
-      query: this.queryService.start(core.savedObjects),
+      query: queryService,
       indexPatterns: indexPatternsService,
     };