fix ai settings showing in EASE

stephmilovic · stephmilovic · commit 00a841c32892 · 2025-12-12T12:07:58.000-07:00
diff --git a/x-pack/solutions/security/plugins/security_solution/public/app/links/app_links.ts b/x-pack/solutions/security/plugins/security_solution/public/app/links/app_links.ts
@@ -5,10 +5,13 @@
  * 2.0.
  */
 import type { CoreStart } from '@kbn/core/public';
+import { firstValueFrom, take } from 'rxjs';
+import { AIChatExperience } from '@kbn/ai-assistant-common';
+import { AI_CHAT_EXPERIENCE_TYPE } from '@kbn/management-settings-ids';
 
 import { ATTACKS_ALERTS_ALIGNMENT_ENABLED } from '../../../common/constants';
 import { aiValueLinks } from '../../reports/links';
-import { configurationsLinks } from '../../configurations/links';
+import { configurationsLinks, getConfigurationsLinks } from '../../configurations/links';
 import { links as attackDiscoveryLinks } from '../../attack_discovery/links';
 import { links as assetInventoryLinks } from '../../asset_inventory/links';
 import { siemReadinessLinks } from '../../siem_readiness/links';
@@ -54,6 +57,13 @@ export const getFilteredLinks = async (
 ): Promise<AppLinkItems> => {
   const managementFilteredLinks = await getManagementFilteredLinks(core, plugins);
 
+  const chatExperience$ = core.uiSettings.client.get$<AIChatExperience>(
+    AI_CHAT_EXPERIENCE_TYPE,
+    AIChatExperience.Classic
+  );
+  const chatExperience = await firstValueFrom(chatExperience$.pipe(take(1)));
+  const filteredConfigurationsLinks = getConfigurationsLinks(chatExperience);
+
   return Object.freeze([
     dashboardsLinks,
     core.featureFlags.getBooleanValue(ATTACKS_ALERTS_ALIGNMENT_ENABLED, false)
@@ -63,7 +73,7 @@ export const getFilteredLinks = async (
     attackDiscoveryLinks,
     findingsLinks,
     casesLinks,
-    configurationsLinks,
+    filteredConfigurationsLinks,
     timelinesLinks,
     indicatorsLinks,
     exploreLinks,
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/links.ts b/x-pack/solutions/security/plugins/security_solution/public/configurations/links.ts
@@ -9,13 +9,14 @@ import {
   RULES_UI_READ_PRIVILEGE,
   SECURITY_UI_SHOW_PRIVILEGE,
 } from '@kbn/security-solution-features/constants';
+import { AIChatExperience } from '@kbn/ai-assistant-common';
 import { ConfigurationTabs } from './constants';
 import * as i18n from './translations';
 import type { LinkItem } from '..';
 import { CONFIGURATIONS_PATH, SECURITY_FEATURE_ID, SecurityPageName } from '../../common/constants';
 import { CONFIGURATIONS } from '../app/translations';
 
-export const configurationsLinks: LinkItem = {
+const baseConfigurationsLinks: LinkItem = {
   capabilities: [[SECURITY_UI_SHOW_PRIVILEGE, `${SECURITY_FEATURE_ID}.configurations`]],
   globalNavPosition: 3,
   globalSearchKeywords: [i18n.CONFIGURATIONS],
@@ -49,3 +50,19 @@ export const configurationsLinks: LinkItem = {
     },
   ],
 };
+
+export const getConfigurationsLinks = (
+  chatExperience: AIChatExperience = AIChatExperience.Classic
+): LinkItem => {
+  if (chatExperience === AIChatExperience.Agent) {
+    return {
+      ...baseConfigurationsLinks,
+      links: baseConfigurationsLinks.links?.filter(
+        (link) => link.id !== SecurityPageName.configurationsAiSettings
+      ),
+    };
+  }
+  return baseConfigurationsLinks;
+};
+
+export const configurationsLinks: LinkItem = baseConfigurationsLinks;
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/page/ai_settings_route_guard.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/page/ai_settings_route_guard.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect } from 'react';
+import { Redirect } from 'react-router-dom';
+import { AISettings } from '../tabs/ai_settings';
+import { useAgentBuilderAvailability } from '../../agent_builder/hooks/use_agent_builder_availability';
+import { useNavigation } from '../../common/lib/kibana';
+import { SecurityPageName } from '@kbn/security-solution-navigation';
+import { CONFIGURATIONS_PATH } from '../../../common/constants';
+import { ConfigurationTabs } from '../constants';
+
+export const AISettingsRouteGuard: React.FC = React.memo(() => {
+  const { isAgentChatExperienceEnabled } = useAgentBuilderAvailability();
+  const { navigateTo } = useNavigation();
+
+  useEffect(() => {
+    if (isAgentChatExperienceEnabled) {
+      navigateTo({
+        deepLinkId: SecurityPageName.configurationsIntegrations,
+      });
+    }
+  }, [isAgentChatExperienceEnabled, navigateTo]);
+
+  if (isAgentChatExperienceEnabled) {
+    return <Redirect to={`${CONFIGURATIONS_PATH}/${ConfigurationTabs.integrations}`} />;
+  }
+
+  return <AISettings />;
+});
+
+AISettingsRouteGuard.displayName = 'AISettingsRouteGuard';
+
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_router.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_router.test.tsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MemoryRouter } from '@kbn/shared-ux-router';
+import { ConfigurationsRouter } from './configuration_router';
+import { TestProviders } from '../../common/mock';
+import { CONFIGURATIONS_PATH } from '../../../common/constants';
+import { ConfigurationTabs } from '../constants';
+import { useAgentBuilderAvailability } from '../../agent_builder/hooks/use_agent_builder_availability';
+import { useKibana, useNavigation } from '../../common/lib/kibana';
+import { SecurityPageName } from '@kbn/security-solution-navigation';
+
+jest.mock('../../agent_builder/hooks/use_agent_builder_availability');
+jest.mock('../../common/lib/kibana', () => ({
+  useKibana: jest.fn(),
+  useNavigation: jest.fn(),
+}));
+jest.mock('../../common/hooks/use_space_id', () => ({
+  useSpaceId: jest.fn().mockReturnValue('default'),
+}));
+
+const mockNavigateTo = jest.fn();
+
+describe('ConfigurationsRouter', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useAgentBuilderAvailability as jest.Mock).mockReturnValue({
+      isAgentChatExperienceEnabled: false,
+    });
+    (useNavigation as jest.Mock).mockReturnValue({
+      navigateTo: mockNavigateTo,
+    });
+    (useKibana as jest.Mock).mockReturnValue({
+      services: {
+        application: {
+          navigateToApp: jest.fn(),
+          capabilities: {
+            securitySolutionAssistant: { 'ai-assistant': true },
+          },
+        },
+        data: { dataViews: {} },
+      },
+    });
+  });
+
+  it('renders AISettings component when isAgentChatExperienceEnabled is false', () => {
+    const { getByTestId } = render(
+      <MemoryRouter initialEntries={[`${CONFIGURATIONS_PATH}/${ConfigurationTabs.aiSettings}`]}>
+        <TestProviders>
+          <ConfigurationsRouter />
+        </TestProviders>
+      </MemoryRouter>
+    );
+
+    // The AISettingsRouteGuard will render AISettings when Agent experience is disabled
+    // We can verify this by checking that the route guard component exists
+    expect(getByTestId('SearchAILakeConfigurationsSettingsManagement')).toBeInTheDocument();
+  });
+
+  it('redirects when isAgentChatExperienceEnabled is true', () => {
+    (useAgentBuilderAvailability as jest.Mock).mockReturnValue({
+      isAgentChatExperienceEnabled: true,
+    });
+
+    render(
+      <MemoryRouter initialEntries={[`${CONFIGURATIONS_PATH}/${ConfigurationTabs.aiSettings}`]}>
+        <TestProviders>
+          <ConfigurationsRouter />
+        </TestProviders>
+      </MemoryRouter>
+    );
+
+    // The route guard should redirect to integrations
+    expect(mockNavigateTo).toHaveBeenCalledWith({
+      deepLinkId: SecurityPageName.configurationsIntegrations,
+    });
+  });
+});
+
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_router.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_router.tsx
@@ -14,6 +14,7 @@ import { PromotionRules } from '../tabs/promotion_rules';
 import { CONFIGURATIONS_PATH } from '../../../common/constants';
 import { ConfigurationTabs } from '../constants';
 import { LazyConfigurationsIntegrationsHome } from '../tabs/integrations';
+import { AISettingsRouteGuard } from './ai_settings_route_guard';
 
 export const ConfigurationsRouter = React.memo(() => {
   return (
@@ -24,7 +25,7 @@ export const ConfigurationsRouter = React.memo(() => {
       />
       <Route
         path={`${CONFIGURATIONS_PATH}/:tab(${ConfigurationTabs.aiSettings})`}
-        component={AISettings}
+        component={AISettingsRouteGuard}
       />
       <Route
         path={`${CONFIGURATIONS_PATH}/:tab(${ConfigurationTabs.basicRules})`}
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_tabs.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_tabs.test.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MemoryRouter } from '@kbn/shared-ux-router';
+import { ConfigurationsTabs } from './configuration_tabs';
+import { useNavigation } from '../../common/lib/kibana';
+import { TestProviders } from '../../common/mock';
+import { ConfigurationTabs } from '../constants';
+import { useAgentBuilderAvailability } from '../../agent_builder/hooks/use_agent_builder_availability';
+
+jest.mock('../../common/lib/kibana');
+jest.mock('../../agent_builder/hooks/use_agent_builder_availability');
+
+const mockNavigateTo = jest.fn();
+
+describe('ConfigurationsTabs', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useNavigation as jest.Mock).mockReturnValue({
+      navigateTo: mockNavigateTo,
+    });
+    (useAgentBuilderAvailability as jest.Mock).mockReturnValue({
+      isAgentChatExperienceEnabled: false,
+    });
+  });
+
+  it('renders all tabs including AI Settings when isAgentChatExperienceEnabled is false', () => {
+    const { getByText } = render(
+      <MemoryRouter initialEntries={[`/configurations/${ConfigurationTabs.integrations}`]}>
+        <TestProviders>
+          <ConfigurationsTabs />
+        </TestProviders>
+      </MemoryRouter>
+    );
+
+    expect(getByText('Integrations')).toBeInTheDocument();
+    expect(getByText('Rules')).toBeInTheDocument();
+    expect(getByText('AI settings')).toBeInTheDocument();
+  });
+
+  it('does not render AI Settings tab when isAgentChatExperienceEnabled is true', () => {
+    (useAgentBuilderAvailability as jest.Mock).mockReturnValue({
+      isAgentChatExperienceEnabled: true,
+    });
+
+    const { getByText, queryByText } = render(
+      <MemoryRouter initialEntries={[`/configurations/${ConfigurationTabs.integrations}`]}>
+        <TestProviders>
+          <ConfigurationsTabs />
+        </TestProviders>
+      </MemoryRouter>
+    );
+
+    expect(getByText('Integrations')).toBeInTheDocument();
+    expect(getByText('Rules')).toBeInTheDocument();
+    expect(queryByText('AI settings')).not.toBeInTheDocument();
+  });
+});
+
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_tabs.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/page/configuration_tabs.tsx
@@ -5,13 +5,14 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { EuiTab, EuiTabs } from '@elastic/eui';
 import { useParams } from 'react-router-dom';
 import { SecurityPageName } from '@kbn/security-solution-navigation';
 import { useNavigation } from '../../common/lib/kibana';
 import { ConfigurationTabs } from '../constants';
 import * as i18n from '../translations';
+import { useAgentBuilderAvailability } from '../../agent_builder/hooks/use_agent_builder_availability';
 
 const CONFIGURATION_TABS = [
   {
@@ -33,6 +34,15 @@ const CONFIGURATION_TABS = [
 export const ConfigurationsTabs = React.memo(() => {
   const { navigateTo } = useNavigation();
   const params: { tab: ConfigurationTabs } = useParams();
+  const { isAgentChatExperienceEnabled } = useAgentBuilderAvailability();
+
+  const filteredTabs = useMemo(
+    () =>
+      CONFIGURATION_TABS.filter(
+        (tab) => !isAgentChatExperienceEnabled || tab.tabId !== ConfigurationTabs.aiSettings
+      ),
+    [isAgentChatExperienceEnabled]
+  );
 
   const onSelectedTabChanged = useCallback(
     (deepLinkId: SecurityPageName) => {
@@ -43,7 +53,7 @@ export const ConfigurationsTabs = React.memo(() => {
 
   return (
     <EuiTabs size="m" bottomBorder>
-      {CONFIGURATION_TABS.map((tab) => (
+      {filteredTabs.map((tab) => (
         <EuiTab
           key={tab.deepLinkId}
           onClick={() => onSelectedTabChanged(tab.deepLinkId)}
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/tabs/ai_settings.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/tabs/ai_settings.test.tsx
@@ -13,12 +13,16 @@ import { useKibana, useNavigation } from '../../common/lib/kibana';
 import { TestProviders } from '../../common/mock';
 import { CONVERSATIONS_TAB } from '@kbn/elastic-assistant';
 import { SecurityPageName } from '@kbn/deeplinks-security';
+import { useAgentBuilderAvailability } from '../../agent_builder/hooks/use_agent_builder_availability';
 
 const mockNavigateTo = jest.fn();
 jest.mock('../../common/lib/kibana');
 jest.mock('../../common/hooks/use_space_id', () => ({
   useSpaceId: jest.fn().mockReturnValue('default'),
 }));
+jest.mock('../../agent_builder/hooks/use_agent_builder_availability', () => ({
+  useAgentBuilderAvailability: jest.fn(),
+}));
 
 describe('AISettings', () => {
   beforeEach(() => {
@@ -37,6 +41,9 @@ describe('AISettings', () => {
     (useNavigation as jest.Mock).mockReturnValue({
       navigateTo: mockNavigateTo,
     });
+    (useAgentBuilderAvailability as jest.Mock).mockReturnValue({
+      isAgentChatExperienceEnabled: false,
+    });
   });
 
   it('renders the SearchAILakeConfigurationsSettingsManagement component wiht default Conversations tab when securityAIAssistantEnabled is true', () => {
@@ -90,4 +97,22 @@ describe('AISettings', () => {
 
     expect(mockNavigateToApp).toHaveBeenCalledWith('home');
   });
+
+  it('navigates to integrations when isAgentChatExperienceEnabled is true', () => {
+    (useAgentBuilderAvailability as jest.Mock).mockReturnValue({
+      isAgentChatExperienceEnabled: true,
+    });
+
+    render(
+      <MemoryRouter>
+        <TestProviders>
+          <AISettings />
+        </TestProviders>
+      </MemoryRouter>
+    );
+
+    expect(mockNavigateTo).toHaveBeenCalledWith({
+      deepLinkId: SecurityPageName.configurationsIntegrations,
+    });
+  });
 });
diff --git a/x-pack/solutions/security/plugins/security_solution/public/configurations/tabs/ai_settings.tsx b/x-pack/solutions/security/plugins/security_solution/public/configurations/tabs/ai_settings.tsx
diff --git a/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/ai_navigation/ai_navigation_tree.ts b/x-pack/solutions/security/plugins/security_solution_serverless/public/navigation/ai_navigation/ai_navigation_tree.ts
