Fix conflict between timelion.ui.enabled yml setting and timelion feature control (#35266)

* Merge duplicate injectDefaultVars in timelion plugin definition.

* Enable timelion app in x-pack functional tests.

src/legacy/core_plugins/timelion/index.js

@@ -46,16 +46,21 @@ 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'
       ],
+      injectDefaultVars(server) {
+        return {
+          timelionUiEnabled: server.config().get('timelion.ui.enabled'),
+          uiCapabilities: {
+            timelion: {
+              save: true,
+            }
+          }
+        };
+      },
       visTypes: [
         'plugins/timelion/vis'
       ],
@@ -64,15 +69,6 @@ export default function (kibana) {
         'plugins/timelion/register_feature'
       ],
       mappings: require('./mappings.json'),
-      injectDefaultVars() {
-        return {
-          uiCapabilities: {
-            timelion: {
-              save: true,
-            }
-          }
-        };
-      },
       uiSettingDefaults: {
         'timelion:showTutorial': {
           name: i18n.translate('timelion.uiSettings.showTutorialLabel', {

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: {