Fix conflict between timelion.ui.enabled yml setting and timelion fea…

…ture control (#35266) (#35765) * Merge duplicate injectDefaultVars in timelion plugin definition. * Enable timelion app in x-pack functional tests.
elastic · Apr 30, 2019 · d0a9881 · d0a9881
1 parent 0997045
commit d0a9881
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/legacy/core_plugins/timelion/index.js b/src/legacy/core_plugins/timelion/index.js
@@ -46,33 +46,29 @@ export default function (kibana) {
         main: 'plugins/timelion/app',
       },
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      injectDefaultVars(server) {
-        return {
-          timelionUiEnabled: server.config().get('timelion.ui.enabled'),
-        };
-      },
       hacks: [
         'plugins/timelion/hacks/toggle_app_link_in_nav',
         'plugins/timelion/lib/panel_registry',
         'plugins/timelion/panels/timechart/timechart'
       ],
-      visTypes: [
-        'plugins/timelion/vis'
-      ],
-      interpreter: ['plugins/timelion/timelion_vis_fn'],
-      home: [
-        'plugins/timelion/register_feature'
-      ],
-      mappings: require('./mappings.json'),
-      injectDefaultVars() {
+      injectDefaultVars(server) {
         return {
+          timelionUiEnabled: server.config().get('timelion.ui.enabled'),
           uiCapabilities: {
             timelion: {
               save: true,
             }
           }
         };
       },
+      visTypes: [
+        'plugins/timelion/vis'
+      ],
+      interpreter: ['plugins/timelion/timelion_vis_fn'],
+      home: [
+        'plugins/timelion/register_feature'
+      ],
+      mappings: require('./mappings.json'),
       uiSettingDefaults: {
         'timelion:showTutorial': {
           name: i18n.translate('timelion.uiSettings.showTutorialLabel', {

diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
@@ -191,7 +191,8 @@ export default async function ({ readConfigFile }) {
         '--xpack.xpack_main.telemetry.enabled=false',
         '--xpack.maps.showMapsInspectorAdapter=true',
         '--xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"', // server restarts should not invalidate active sessions
-        '--xpack.code.security.enableGitCertCheck=false' // Disable git certificate check
+        '--xpack.code.security.enableGitCertCheck=false', // Disable git certificate check
+        '--timelion.ui.enabled=true',
       ],
     },
     uiSettings: {