Remove injectedMetadata in vega (#132521)

* Remove injectedMetadata in vega * [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix' Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
elastic · May 20, 2022 · 968f7a9 · 968f7a9
1 parent 569e10a
commit 968f7a9
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 17 deletions.
diff --git a/src/plugins/vis_types/vega/public/data_model/search_api.ts b/src/plugins/vis_types/vega/public/data_model/search_api.ts
@@ -8,7 +8,7 @@
 
 import { combineLatest, from } from 'rxjs';
 import { map, tap, switchMap } from 'rxjs/operators';
-import type { CoreStart, IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
+import type { IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
 import {
   getSearchParamsFromRequest,
   SearchRequest,
@@ -47,7 +47,6 @@ export const extendSearchParamsWithRuntimeFields = async (
 
 export interface SearchAPIDependencies {
   uiSettings: IUiSettingsClient;
-  injectedMetadata: CoreStart['injectedMetadata'];
   search: DataPublicPluginStart['search'];
   indexPatterns: DataViewsPublicPluginStart;
 }

diff --git a/src/plugins/vis_types/vega/public/plugin.ts b/src/plugins/vis_types/vega/public/plugin.ts
@@ -20,7 +20,6 @@ import {
   setDataViews,
   setInjectedVars,
   setUISettings,
-  setInjectedMetadata,
   setDocLinks,
   setMapsEms,
 } from './services';
@@ -73,7 +72,6 @@ export class VegaPlugin implements Plugin<void, void> {
   ) {
     setInjectedVars({
       enableExternalUrls: this.initializerContext.config.get().enableExternalUrls,
-      emsTileLayerId: core.injectedMetadata.getInjectedVar('emsTileLayerId', true),
     });
 
     setUISettings(core.uiSettings);
@@ -98,7 +96,6 @@ export class VegaPlugin implements Plugin<void, void> {
     setNotifications(core.notifications);
     setData(data);
     setDataViews(dataViews);
-    setInjectedMetadata(core.injectedMetadata);
     setDocLinks(core.docLinks);
     setMapsEms(mapsEms);
   }

diff --git a/src/plugins/vis_types/vega/public/services.ts b/src/plugins/vis_types/vega/public/services.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { CoreStart, NotificationsStart, IUiSettingsClient, DocLinksStart } from '@kbn/core/public';
+import { NotificationsStart, IUiSettingsClient, DocLinksStart } from '@kbn/core/public';
 
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
@@ -24,12 +24,8 @@ export const [getNotifications, setNotifications] =
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 export const [getMapsEms, setMapsEms] = createGetterSetter<MapsEmsPluginPublicStart>('mapsEms');
 
-export const [getInjectedMetadata, setInjectedMetadata] =
-  createGetterSetter<CoreStart['injectedMetadata']>('InjectedMetadata');
-
 export const [getInjectedVars, setInjectedVars] = createGetterSetter<{
   enableExternalUrls: boolean;
-  emsTileLayerId: unknown;
 }>('InjectedVars');
 
 export const getEnableExternalUrls = () => getInjectedVars().enableExternalUrls;

diff --git a/src/plugins/vis_types/vega/public/vega_request_handler.ts b/src/plugins/vis_types/vega/public/vega_request_handler.ts
@@ -15,7 +15,7 @@ import { TimeCache } from './data_model/time_cache';
 
 import { VegaVisualizationDependencies } from './plugin';
 import { VisParams } from './vega_fn';
-import { getData, getInjectedMetadata, getDataViews } from './services';
+import { getData, getDataViews } from './services';
 import { VegaInspectorAdapters } from './vega_inspector';
 
 interface VegaRequestHandlerParams {
@@ -57,7 +57,6 @@ export function createVegaRequestHandler(
           uiSettings,
           search,
           indexPatterns: dataViews,
-          injectedMetadata: getInjectedMetadata(),
         },
         context.abortSignal,
         context.inspectorAdapters,

diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/view.test.ts
@@ -116,7 +116,6 @@ describe('vega_map_view/view', () => {
     let vegaParser: VegaParser;
 
     setInjectedVars({
-      emsTileLayerId: {},
       enableExternalUrls: true,
     });
     setData(dataPluginStart);
@@ -150,7 +149,6 @@ describe('vega_map_view/view', () => {
           search: dataPluginStart.search,
           indexPatterns: dataViewsStart,
           uiSettings: coreStart.uiSettings,
-          injectedMetadata: coreStart.injectedMetadata,
         }),
         new TimeCache(dataPluginStart.query.timefilter.timefilter, 0),
         {},

diff --git a/src/plugins/vis_types/vega/public/vega_visualization.test.js b/src/plugins/vis_types/vega/public/vega_visualization.test.js
@@ -56,7 +56,6 @@ describe('VegaVisualizations', () => {
 
   beforeEach(() => {
     setInjectedVars({
-      emsTileLayerId: {},
       enableExternalUrls: true,
     });
     setData(dataPluginStart);
@@ -97,7 +96,6 @@ describe('VegaVisualizations', () => {
             search: dataPluginStart.search,
             indexPatterns: dataViewsPluginStart,
             uiSettings: coreStart.uiSettings,
-            injectedMetadata: coreStart.injectedMetadata,
           }),
           0,
           0,
@@ -130,7 +128,6 @@ describe('VegaVisualizations', () => {
             search: dataPluginStart.search,
             indexPatterns: dataViewsPluginStart,
             uiSettings: coreStart.uiSettings,
-            injectedMetadata: coreStart.injectedMetadata,
           }),
           0,
           0,