From e12343b4e660e8375a8015597fcd499b6ddfb9c4 Mon Sep 17 00:00:00 2001 From: Spencer Date: Wed, 4 Apr 2018 07:30:53 -0700 Subject: [PATCH] [6.x] [uiApp] remove unused `templateName` config option (#17484) (#17543) --- src/ui/ui_apps/__tests__/ui_app.js | 9 --------- src/ui/ui_apps/ui_app.js | 6 ------ src/ui/ui_exports/ui_export_types/ui_apps.js | 2 -- src/ui/ui_render/ui_render_mixin.js | 2 +- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/ui/ui_apps/__tests__/ui_app.js b/src/ui/ui_apps/__tests__/ui_app.js index 9c01d0412f52..de3f39bf2c54 100644 --- a/src/ui/ui_apps/__tests__/ui_app.js +++ b/src/ui/ui_apps/__tests__/ui_app.js @@ -18,7 +18,6 @@ function createStubUiAppSpec(extraParams) { linkToLastSubUrl: true, hidden: false, listed: false, - templateName: 'ui_app_test', uses: [ 'visTypes', 'chromeNavControls', @@ -73,10 +72,6 @@ describe('ui apps / UiApp', () => { expect(app.getPluginId()).to.be(undefined); }); - it('has a default template name of ui_app', () => { - expect(app.getTemplateName()).to.be('ui_app'); - }); - it('is not hidden', () => { expect(app.isHidden()).to.be(false); }); @@ -126,10 +121,6 @@ describe('ui apps / UiApp', () => { expect(app.getPluginId()).to.be(undefined); }); - it('uses the specs template', () => { - expect(app.getTemplateName()).to.be(spec.templateName); - }); - it('is not hidden', () => { expect(app.isHidden()).to.be(false); }); diff --git a/src/ui/ui_apps/ui_app.js b/src/ui/ui_apps/ui_app.js index 827ca64ed17f..4cd0fcc67bec 100644 --- a/src/ui/ui_apps/ui_app.js +++ b/src/ui/ui_apps/ui_app.js @@ -13,7 +13,6 @@ export class UiApp { hidden, linkToLastSubUrl, listed, - templateName = 'ui_app', injectVars, url = `/app/${id}`, uses = [] @@ -32,7 +31,6 @@ export class UiApp { this._linkToLastSubUrl = linkToLastSubUrl; this._hidden = hidden; this._listed = listed; - this._templateName = templateName; this._url = url; this._injectedVarsProvider = injectVars; this._pluginId = pluginId; @@ -79,10 +77,6 @@ export class UiApp { return plugin ? plugin.id : undefined; } - getTemplateName() { - return this._templateName; - } - isHidden() { return !!this._hidden; } diff --git a/src/ui/ui_exports/ui_export_types/ui_apps.js b/src/ui/ui_exports/ui_export_types/ui_apps.js index 5e801c675f60..955efa0d49b5 100644 --- a/src/ui/ui_exports/ui_export_types/ui_apps.js +++ b/src/ui/ui_exports/ui_export_types/ui_apps.js @@ -15,7 +15,6 @@ function applySpecDefaults(spec, type, pluginSpec) { hidden = false, linkToLastSubUrl = true, listed = !hidden, - templateName = 'ui_app', injectVars = noop, url = `/app/${id}`, uses = [], @@ -32,7 +31,6 @@ function applySpecDefaults(spec, type, pluginSpec) { hidden, linkToLastSubUrl, listed, - templateName, injectVars, url, uses: uniq([ diff --git a/src/ui/ui_render/ui_render_mixin.js b/src/ui/ui_render/ui_render_mixin.js index b353ac897593..1bb367ad33b0 100644 --- a/src/ui/ui_render/ui_render_mixin.js +++ b/src/ui/ui_render/ui_render_mixin.js @@ -120,7 +120,7 @@ export function uiRenderMixin(kbnServer, server, config) { const request = reply.request; const translations = await request.getUiTranslations(); - return reply.view(app.getTemplateName(), { + return reply.view('ui_app', { app, kibanaPayload: await getKibanaPayload({ app,