[TIP] Simplified TI plugin logic

Plugin is now loaded all the time, and the logic to show the indicators page or route back to the Get Started page from Security is handled within the Threat Intelligence folder

x-pack/plugins/security_solution/public/plugin.tsx

@@ -22,7 +22,6 @@ import type {
 import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '@kbn/core/public';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { TimelineState } from '@kbn/timelines-plugin/public';
-import type { ThreatIntelligence } from './threat_intelligence';
 import type {
   PluginSetup,
   PluginStart,
@@ -332,11 +331,8 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         management: new subPluginClasses.Management(),
         landingPages: new subPluginClasses.LandingPages(),
         cloudSecurityPosture: new subPluginClasses.CloudSecurityPosture(),
+        threatIntelligence: new subPluginClasses.ThreatIntelligence(),
       };
-
-      if (this.experimentalFeatures.threatIntelligenceEnabled) {
-        this._subPlugins.threatIntelligence = new subPluginClasses.ThreatIntelligence();
-      }
     }
     return this._subPlugins;
   }
@@ -350,8 +346,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     plugins: StartPlugins
   ): Promise<StartedSubPlugins> {
     const subPlugins = await this.subPlugins();
-
-    const startPlugins: StartedSubPlugins = {
+    return {
       overview: subPlugins.overview.start(),
       alerts: subPlugins.alerts.start(storage),
       cases: subPlugins.cases.start(),
@@ -365,15 +360,8 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       management: subPlugins.management.start(core, plugins),
       landingPages: subPlugins.landingPages.start(),
       cloudSecurityPosture: subPlugins.cloudSecurityPosture.start(),
+      threatIntelligence: subPlugins.threatIntelligence.start(),
     };
-
-    if (this.experimentalFeatures.threatIntelligenceEnabled) {
-      startPlugins.threatIntelligence = (
-        subPlugins.threatIntelligence as ThreatIntelligence
-      ).start();
-    }
-
-    return startPlugins;
   }
   /**
    * Lazily instantiate a `SecurityAppStore`. We lazily instantiate this because it requests large dynamic imports. We instantiate it once because each subPlugin needs to share the same reference.

x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx

@@ -6,20 +6,29 @@
  */
 
 import React from 'react';
+import { Redirect } from 'react-router-dom';
 import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { ThreatIntelligencePage } from './pages/threat_intelligence';
 import { SecurityPageName, THREAT_INTELLIGENCE_PATH } from '../../common/constants';
 import type { SecuritySubPluginRoutes } from '../app/types';
+import { useIsExperimentalFeatureEnabled } from '../common/hooks/use_experimental_features';
 
-const ThreatIntelligenceRoutes = () => (
-  <TrackApplicationView viewId={SecurityPageName.threatIntelligence}>
-    <ThreatIntelligencePage />
-  </TrackApplicationView>
-);
+const ThreatIntelligenceRoutes = () => {
+  const enabled = useIsExperimentalFeatureEnabled('threatIntelligenceEnabled');
+  if (!enabled) {
+    return <Redirect to="/" />;
+  }
+
+  return (
+    <TrackApplicationView viewId={SecurityPageName.threatIntelligence}>
+      <ThreatIntelligencePage />
+    </TrackApplicationView>
+  );
+};
 
 export const routes: SecuritySubPluginRoutes = [
   {
     path: THREAT_INTELLIGENCE_PATH,
-    render: ThreatIntelligenceRoutes,
+    component: ThreatIntelligenceRoutes,
   },
 ];

x-pack/plugins/security_solution/public/types.ts

@@ -130,7 +130,7 @@ export interface SubPlugins {
   management: Management;
   landingPages: LandingPages;
   cloudSecurityPosture: CloudSecurityPosture;
-  threatIntelligence?: ThreatIntelligence; // the Threat Intelligence plugin is temporarily hidden behind a feature flag
+  threatIntelligence: ThreatIntelligence;
 }
 
 // TODO: find a better way to defined these types
@@ -148,5 +148,5 @@ export interface StartedSubPlugins {
   management: ReturnType<Management['start']>;
   landingPages: ReturnType<LandingPages['start']>;
   cloudSecurityPosture: ReturnType<CloudSecurityPosture['start']>;
-  threatIntelligence?: ReturnType<ThreatIntelligence['start']>;
+  threatIntelligence: ReturnType<ThreatIntelligence['start']>;
 }