From a5411ac8201cef2d971ed5932ad432636cdf476c Mon Sep 17 00:00:00 2001 From: Poff Poffenberger Date: Tue, 28 Jan 2020 11:16:47 -0600 Subject: [PATCH] Remove injected ui app vars from Canvas --- x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js | 1 - x-pack/legacy/plugins/canvas/server/plugin.ts | 6 ------ x-pack/legacy/plugins/canvas/server/shim.ts | 2 -- 3 files changed, 9 deletions(-) diff --git a/x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js b/x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js index 141beb3d34d78..8caab5c41563c 100644 --- a/x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js +++ b/x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js @@ -23,7 +23,6 @@ export class Plugin { [this.props.name]: {}, elasticsearch: mockElasticsearch, }, - injectUiAppVars: noop, config: () => ({ get: key => get(config, key), has: key => has(config, key), diff --git a/x-pack/legacy/plugins/canvas/server/plugin.ts b/x-pack/legacy/plugins/canvas/server/plugin.ts index ac3edbabce930..13bb9fb69f5ac 100644 --- a/x-pack/legacy/plugins/canvas/server/plugin.ts +++ b/x-pack/legacy/plugins/canvas/server/plugin.ts @@ -15,12 +15,6 @@ export class Plugin { plugins.interpreter.register({ serverFunctions: functions }); - core.injectUiAppVars('canvas', async () => { - return { - ...plugins.kibana.injectedUiAppVars, - }; - }); - plugins.features.registerFeature({ id: 'canvas', name: 'Canvas', diff --git a/x-pack/legacy/plugins/canvas/server/shim.ts b/x-pack/legacy/plugins/canvas/server/shim.ts index 1ca6e28bd347e..c9d70e6a721ee 100644 --- a/x-pack/legacy/plugins/canvas/server/shim.ts +++ b/x-pack/legacy/plugins/canvas/server/shim.ts @@ -18,7 +18,6 @@ export interface CoreSetup { http: { route: Legacy.Server['route']; }; - injectUiAppVars: Legacy.Server['injectUiAppVars']; } export interface PluginsSetup { @@ -52,7 +51,6 @@ export async function createSetupShim( ...server.newPlatform.setup.core.http, route: (...args) => server.route(...args), }, - injectUiAppVars: server.injectUiAppVars, }, pluginsSetup: { // @ts-ignore: New Platform not typed