[AI4DSOC] Hide security solution pages

x-pack/solutions/security/plugins/security_solution/common/constants.ts

@@ -101,7 +101,6 @@ export const RULES_LANDING_PATH = `${RULES_PATH}/landing` as const;
 export const RULES_ADD_PATH = `${RULES_PATH}/add_rules` as const;
 export const RULES_UPDATES = `${RULES_PATH}/updates` as const;
 export const RULES_CREATE_PATH = `${RULES_PATH}/create` as const;
-export const RULES_MANAGEMENT_PATH = `${RULES_PATH}/management` as const;
 export const EXCEPTIONS_PATH = '/exceptions' as const;
 export const EXCEPTION_LIST_DETAIL_PATH = `${EXCEPTIONS_PATH}/details/:detailName` as const;
 export const HOSTS_PATH = '/hosts' as const;

x-pack/solutions/security/plugins/security_solution/public/asset_inventory/links.ts

@@ -17,7 +17,7 @@ import {
 import type { LinkItem } from '../common/links/types';
 
 export const links: LinkItem = {
-  capabilities: [`${SECURITY_FEATURE_ID}.show`],
+  capabilities: [[`${SECURITY_FEATURE_ID}.show`, `${SECURITY_FEATURE_ID}.detections`]],
   globalNavPosition: 11,
   globalSearchKeywords: [
     i18n.translate('xpack.securitySolution.appLinks.inventory', {

x-pack/solutions/security/plugins/security_solution/public/asset_inventory/routes.tsx

@@ -12,7 +12,7 @@ import { SecurityPageName } from '../app/types';
 import { ASSET_INVENTORY_PATH } from '../../common/constants';
 import { SecuritySolutionPageWrapper } from '../common/components/page_wrapper';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
-import { SecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
+import { withSecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
 import { AssetInventoryLoading } from './components/asset_inventory_loading';
 
 const AssetsPageLazy = lazy(() => import('./pages'));
@@ -32,13 +32,11 @@ export const AssetInventoryRoutes = () => {
   return (
     <QueryClientProvider client={queryClient}>
       <PluginTemplateWrapper>
-        <SecurityRoutePageWrapper pageName={SecurityPageName.assetInventory}>
-          <SecuritySolutionPageWrapper noPadding>
-            <Suspense fallback={<AssetInventoryLoading />}>
-              <AssetsPageLazy />
-            </Suspense>
-          </SecuritySolutionPageWrapper>
-        </SecurityRoutePageWrapper>
+        <SecuritySolutionPageWrapper noPadding>
+          <Suspense fallback={<AssetInventoryLoading />}>
+            <AssetsPageLazy />
+          </Suspense>
+        </SecuritySolutionPageWrapper>
       </PluginTemplateWrapper>
     </QueryClientProvider>
   );
@@ -47,6 +45,8 @@ export const AssetInventoryRoutes = () => {
 export const routes: SecuritySubPluginRoutes = [
   {
     path: ASSET_INVENTORY_PATH,
-    component: AssetInventoryRoutes,
+    component: withSecurityRoutePageWrapper(AssetInventoryRoutes, SecurityPageName.assetInventory, {
+      redirectOnMissing: true,
+    }),
   },
 ];

x-pack/solutions/security/plugins/security_solution/public/cloud_security_posture/routes.tsx

@@ -9,15 +9,15 @@ import React from 'react';
 import { CLOUD_SECURITY_POSTURE_BASE_PATH } from '@kbn/cloud-security-posture-common';
 import type { CloudSecurityPosturePageId } from '@kbn/cloud-security-posture-plugin/public';
 import { type CspSecuritySolutionContext } from '@kbn/cloud-security-posture-plugin/public';
-import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import type { SecurityPageName, SecuritySubPluginRoutes } from '../app/types';
+import { SecurityPageName } from '../app/types';
+import type { SecuritySubPluginRoutes } from '../app/types';
 import { useKibana } from '../common/lib/kibana';
-import { SecuritySolutionPageWrapper } from '../common/components/page_wrapper';
 import { SpyRoute } from '../common/utils/route/spy_routes';
 import { FiltersGlobal } from '../common/components/filters_global';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
 import { useOnExpandableFlyoutClose } from '../flyout/shared/hooks/use_on_expandable_flyout_close';
+import { withSecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
 
 // This exists only for the type signature cast
 const CloudPostureSpyRoute = ({ pageName, ...rest }: { pageName?: CloudSecurityPosturePageId }) => (
@@ -37,11 +37,7 @@ const CloudSecurityPosture = () => {
 
   return (
     <PluginTemplateWrapper>
-      <TrackApplicationView viewId="cloud_security_posture">
-        <SecuritySolutionPageWrapper noPadding noTimeline>
-          <CloudSecurityPostureRouter securitySolutionContext={cspSecuritySolutionContext} />
-        </SecuritySolutionPageWrapper>
-      </TrackApplicationView>
+      <CloudSecurityPostureRouter securitySolutionContext={cspSecuritySolutionContext} />
     </PluginTemplateWrapper>
   );
 };
@@ -51,6 +47,13 @@ CloudSecurityPosture.displayName = 'CloudSecurityPosture';
 export const routes: SecuritySubPluginRoutes = [
   {
     path: CLOUD_SECURITY_POSTURE_BASE_PATH,
-    component: CloudSecurityPosture,
+    component: withSecurityRoutePageWrapper(
+      CloudSecurityPosture,
+      SecurityPageName.cloudSecurityPostureDashboard,
+      {
+        redirectOnMissing: true,
+        omitSpyRoute: true,
+      }
+    ),
   },
 ];

x-pack/solutions/security/plugins/security_solution/public/dashboards/links.ts

@@ -31,7 +31,7 @@ export const dashboardsLinks: LinkItem = {
   title: DASHBOARDS,
   path: DASHBOARDS_PATH,
   globalNavPosition: 1,
-  capabilities: [`${SECURITY_FEATURE_ID}.show`],
+  capabilities: [[`${SECURITY_FEATURE_ID}.show`, `${SECURITY_FEATURE_ID}.detections`]],
   globalSearchKeywords: [
     i18n.translate('xpack.securitySolution.appLinks.dashboards', {
       defaultMessage: 'Dashboards',

x-pack/solutions/security/plugins/security_solution/public/dashboards/routes.tsx

@@ -5,24 +5,24 @@
  * 2.0.
  */
 import React from 'react';
-import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 
 import { DASHBOARDS_PATH, SecurityPageName } from '../../common/constants';
 import type { SecuritySubPluginRoutes } from '../app/types';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
 import { DashboardsContainer } from './pages';
+import { withSecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
 
 export const DashboardRoutes = () => (
   <PluginTemplateWrapper>
-    <TrackApplicationView viewId={SecurityPageName.dashboards}>
-      <DashboardsContainer />
-    </TrackApplicationView>
+    <DashboardsContainer />
   </PluginTemplateWrapper>
 );
 
 export const routes: SecuritySubPluginRoutes = [
   {
     path: DASHBOARDS_PATH,
-    component: DashboardRoutes,
+    component: withSecurityRoutePageWrapper(DashboardRoutes, SecurityPageName.dashboards, {
+      redirectOnMissing: true,
+    }),
   },
 ];

x-pack/solutions/security/plugins/security_solution/public/exceptions/routes.tsx

@@ -20,7 +20,10 @@ import { SpyRoute } from '../common/utils/route/spy_routes';
 import { NotFoundPage } from '../app/404';
 import { useReadonlyHeader } from '../use_readonly_header';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
-import { SecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
+import {
+  SecurityRoutePageWrapper,
+  withSecurityRoutePageWrapper,
+} from '../common/components/security_route_page_wrapper';
 
 const ExceptionsRoutes = () => (
   <PluginTemplateWrapper>
@@ -53,11 +56,11 @@ const ExceptionsContainerComponent: React.FC = () => {
 
 const Exceptions = React.memo(ExceptionsContainerComponent);
 
-const renderExceptionsRoutes = () => <Exceptions />;
-
 export const routes = [
   {
     path: EXCEPTIONS_PATH,
-    render: renderExceptionsRoutes,
+    component: withSecurityRoutePageWrapper(Exceptions, SecurityPageName.exceptions, {
+      redirectOnMissing: true,
+    }),
   },
 ];

x-pack/solutions/security/plugins/security_solution/public/explore/links.ts

@@ -209,7 +209,7 @@ export const exploreLinks: LinkItem = {
   title: EXPLORE,
   path: EXPLORE_PATH,
   globalNavPosition: 9,
-  capabilities: [`${SECURITY_FEATURE_ID}.show`],
+  capabilities: [[`${SECURITY_FEATURE_ID}.show`, `${SECURITY_FEATURE_ID}.detections`]],
   globalSearchKeywords: [
     i18n.translate('xpack.securitySolution.appLinks.explore', {
       defaultMessage: 'Explore',

x-pack/solutions/security/plugins/security_solution/public/explore/routes.tsx

@@ -6,7 +6,6 @@
  */
 
 import React from 'react';
-import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { UsersContainer } from './users/pages';
 import { HostsContainer } from './hosts/pages';
 import { NetworkContainer } from './network/pages';
@@ -16,56 +15,60 @@ import { SecurityPageName } from '../app/types';
 import { EXPLORE_PATH, HOSTS_PATH, NETWORK_PATH, USERS_PATH } from '../../common/constants';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
 import { ExploreLandingPage } from './landing';
-import { SecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
+import { withSecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
 
 const ExploreLanding = () => (
   <PluginTemplateWrapper>
-    <SecurityRoutePageWrapper pageName={SecurityPageName.exploreLanding} redirectOnMissing>
-      <ExploreLandingPage />
-    </SecurityRoutePageWrapper>
+    <ExploreLandingPage />
   </PluginTemplateWrapper>
 );
 
 const NetworkRoutes = () => (
   <PluginTemplateWrapper>
-    <TrackApplicationView viewId={SecurityPageName.network}>
-      <NetworkContainer />
-    </TrackApplicationView>
+    <NetworkContainer />
   </PluginTemplateWrapper>
 );
 
 const UsersRoutes = () => (
   <PluginTemplateWrapper>
-    <TrackApplicationView viewId={SecurityPageName.users}>
-      <UsersContainer />
-    </TrackApplicationView>
+    <UsersContainer />
   </PluginTemplateWrapper>
 );
 
 const HostsRoutes = () => (
   <PluginTemplateWrapper>
-    <TrackApplicationView viewId={SecurityPageName.hosts}>
-      <HostsContainer />
-    </TrackApplicationView>
+    <HostsContainer />
   </PluginTemplateWrapper>
 );
 
 export const routes: SecuritySubPluginRoutes = [
   {
     path: EXPLORE_PATH,
     exact: true,
-    component: ExploreLanding,
+    component: withSecurityRoutePageWrapper(ExploreLanding, SecurityPageName.exploreLanding, {
+      redirectOnMissing: true,
+      omitSpyRoute: true,
+    }),
   },
   {
     path: NETWORK_PATH,
-    component: NetworkRoutes,
+    component: withSecurityRoutePageWrapper(NetworkRoutes, SecurityPageName.network, {
+      redirectOnMissing: true,
+      omitSpyRoute: true,
+    }),
   },
   {
     path: USERS_PATH,
-    component: UsersRoutes,
+    component: withSecurityRoutePageWrapper(UsersRoutes, SecurityPageName.users, {
+      redirectOnMissing: true,
+      omitSpyRoute: true,
+    }),
   },
   {
     path: HOSTS_PATH,
-    component: HostsRoutes,
+    component: withSecurityRoutePageWrapper(HostsRoutes, SecurityPageName.hosts, {
+      redirectOnMissing: true,
+      omitSpyRoute: true,
+    }),
   },
 ];

x-pack/solutions/security/plugins/security_solution/public/management/pages/index.tsx

@@ -37,6 +37,7 @@ import { HostIsolationExceptionsContainer } from './host_isolation_exceptions';
 import { BlocklistContainer } from './blocklist';
 import { ResponseActionsContainer } from './response_actions';
 import { PrivilegedRoute } from '../components/privileged_route';
+import { SecurityRoutePageWrapper } from '../../common/components/security_route_page_wrapper';
 
 const EndpointTelemetry = () => (
   <TrackApplicationView viewId={SecurityPageName.endpoints}>
@@ -80,11 +81,10 @@ const ResponseActionsTelemetry = () => (
   </TrackApplicationView>
 );
 
-const NotesTelemetry = () => (
-  <TrackApplicationView viewId={SecurityPageName.notes}>
+const Notes = () => (
+  <SecurityRoutePageWrapper pageName={SecurityPageName.notes} redirectOnMissing>
     <NotesContainer />
-    <SpyRoute pageName={SecurityPageName.notes} />
-  </TrackApplicationView>
+  </SecurityRoutePageWrapper>
 );
 
 export const ManagementContainer = memo(() => {
@@ -163,7 +163,7 @@ export const ManagementContainer = memo(() => {
       />
 
       {!securitySolutionNotesDisabled && (
-        <Route path={MANAGEMENT_ROUTING_NOTES_PATH} component={NotesTelemetry} />
+        <Route path={MANAGEMENT_ROUTING_NOTES_PATH} component={Notes} />
       )}
 
       {canReadEndpointList && (

x-pack/solutions/security/plugins/security_solution/public/notes/routes.tsx

@@ -7,26 +7,22 @@
 
 import React from 'react';
 import { Route, Routes } from '@kbn/shared-ux-router';
-import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { NoteManagementPage } from './pages/note_management_page';
-import { SpyRoute } from '../common/utils/route/spy_routes';
 import { NotFoundPage } from '../app/404';
 import { NOTES_PATH, SecurityPageName } from '../../common/constants';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
+import { withSecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
 
-const NotesManagementTelemetry = () => (
+const NotesManagementWrapper = () => (
   <PluginTemplateWrapper>
-    <TrackApplicationView viewId={SecurityPageName.notes}>
-      <NoteManagementPage />
-      <SpyRoute pageName={SecurityPageName.notes} />
-    </TrackApplicationView>
+    <NoteManagementPage />
   </PluginTemplateWrapper>
 );
 
 const NotesManagementContainer: React.FC = React.memo(() => {
   return (
     <Routes>
-      <Route path={NOTES_PATH} exact component={NotesManagementTelemetry} />
+      <Route path={NOTES_PATH} exact component={NotesManagementWrapper} />
       <Route component={NotFoundPage} />
     </Routes>
   );
@@ -36,6 +32,8 @@ NotesManagementContainer.displayName = 'NotesManagementContainer';
 export const routes = [
   {
     path: NOTES_PATH,
-    component: NotesManagementContainer,
+    component: withSecurityRoutePageWrapper(NotesManagementContainer, SecurityPageName.notes, {
+      redirectOnMissing: true,
+    }),
   },
 ];