[8.19] [AI Assistant] Security Assistant settings landed on the wrong page on basic license (#229163) (#229523)

kibanamachine · angorayc · web-flow · commit cd51bcb3845f · 2025-07-26T01:55:01.000+02:00
# Backport This will backport the following commits from `main` to `8.19`: - [[AI Assistant] Security Assistant settings landed on the wrong page on basic license (#229163)](#229163)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Angela Chuang <6295984+angorayc@users.noreply.github.com>
diff --git a/src/platform/plugins/shared/ai_assistant_management/selection/public/app_context.tsx b/src/platform/plugins/shared/ai_assistant_management/selection/public/app_context.tsx
@@ -20,6 +20,7 @@ interface ContextValue extends StartDependencies {
   navigateToApp: CoreStart['application']['navigateToApp'];
   kibanaBranch: string;
   buildFlavor: BuildFlavor;
+  securityAIAssistantEnabled: boolean;
 }
 
 const AppContext = createContext<ContextValue>(null as any);
diff --git a/src/platform/plugins/shared/ai_assistant_management/selection/public/management_section/mount_section.tsx b/src/platform/plugins/shared/ai_assistant_management/selection/public/management_section/mount_section.tsx
@@ -26,13 +26,15 @@ interface MountParams {
   mountParams: ManagementAppMountParams;
   kibanaBranch: string;
   buildFlavor: BuildFlavor;
+  securityAIAssistantEnabled: boolean;
 }
 
 export const mountManagementSection = async ({
   core,
   mountParams,
   kibanaBranch,
   buildFlavor,
+  securityAIAssistantEnabled,
 }: MountParams) => {
   const [coreStart, startDeps] = await core.getStartServices();
   const { element, history, setBreadcrumbs } = mountParams;
@@ -56,6 +58,7 @@ export const mountManagementSection = async ({
               setBreadcrumbs,
               kibanaBranch,
               buildFlavor,
+              securityAIAssistantEnabled,
             }}
           >
             <RouterProvider history={history} router={aIAssistantManagementSelectionRouter as any}>
diff --git a/src/platform/plugins/shared/ai_assistant_management/selection/public/plugin.ts b/src/platform/plugins/shared/ai_assistant_management/selection/public/plugin.ts
@@ -82,12 +82,16 @@ export class AIAssistantManagementPlugin
       order: 1,
       mount: async (mountParams) => {
         const { mountManagementSection } = await import('./management_section/mount_section');
+        const securityAIAssistantEnabled = !!management?.sections.section.kibana
+          .getAppsEnabled()
+          .find((app) => app.id === 'securityAiAssistantManagement' && app.enabled);
 
         return mountManagementSection({
           core,
           mountParams,
           kibanaBranch: this.kibanaBranch,
           buildFlavor: this.buildFlavor,
+          securityAIAssistantEnabled,
         });
       },
     });
diff --git a/src/platform/plugins/shared/ai_assistant_management/selection/public/routes/components/ai_assistant_selection_page.test.tsx b/src/platform/plugins/shared/ai_assistant_management/selection/public/routes/components/ai_assistant_selection_page.test.tsx
@@ -23,18 +23,26 @@ describe('AiAssistantSelectionPage', () => {
   const generateMockCapabilities = (hasPermission: boolean) =>
     ({
       observabilityAIAssistant: { show: hasPermission },
-      securitySolutionAssistant: { 'ai-assistant': hasPermission },
+      management: {
+        kibana: {
+          aiAssistantManagementSelection: hasPermission,
+        },
+      },
     } as unknown as CoreStart['application']['capabilities']);
 
   const testCapabilities = generateMockCapabilities(true);
 
-  const renderComponent = (capabilities: CoreStart['application']['capabilities']) => {
+  const renderComponent = (
+    capabilities: CoreStart['application']['capabilities'],
+    securityAIAssistantEnabled = true
+  ) => {
     (useAppContext as jest.Mock).mockReturnValue({
       capabilities,
       setBreadcrumbs,
       navigateToApp,
       kibanaBranch: 'main',
       buildFlavor: 'ess',
+      securityAIAssistantEnabled,
     });
     render(<AiAssistantSelectionPage />, {
       wrapper: I18nProvider,
@@ -107,10 +115,12 @@ describe('AiAssistantSelectionPage', () => {
   describe('Security AI Assistant Card', () => {
     describe('when the feature is disabled', () => {
       it('displays the disabled callout', () => {
-        renderComponent(generateMockCapabilities(false));
+        const securityAIAssistantEnabled = false;
+        renderComponent(generateMockCapabilities(false), securityAIAssistantEnabled);
         expect(
           screen.getByTestId('pluginsAiAssistantSelectionPageSecurityDocumentationCallout')
         ).toBeInTheDocument();
+        expect(screen.getByTestId('pluginsAiAssistantSelectionSecurityPageButton')).toBeDisabled();
       });
     });
 
diff --git a/src/platform/plugins/shared/ai_assistant_management/selection/public/routes/components/ai_assistant_selection_page.tsx b/src/platform/plugins/shared/ai_assistant_management/selection/public/routes/components/ai_assistant_selection_page.tsx
@@ -26,12 +26,21 @@ import { getDocLinks } from '@kbn/doc-links';
 import { useAppContext } from '../../app_context';
 
 export function AiAssistantSelectionPage() {
-  const { capabilities, setBreadcrumbs, navigateToApp, buildFlavor, kibanaBranch } =
-    useAppContext();
+  const {
+    capabilities,
+    setBreadcrumbs,
+    navigateToApp,
+    buildFlavor,
+    kibanaBranch,
+    securityAIAssistantEnabled,
+  } = useAppContext();
+  const aiAssistantManagementSelection =
+    capabilities.management.kibana.aiAssistantManagementSelection;
   const observabilityAIAssistantEnabled = capabilities.observabilityAIAssistant?.show;
-  const securityAIAssistantEnabled = capabilities.securitySolutionAssistant?.['ai-assistant'];
+
   const observabilityDoc = getDocLinks({ buildFlavor, kibanaBranch }).observability.aiAssistant;
   const securityDoc = getDocLinks({ buildFlavor, kibanaBranch }).securitySolution.aiAssistant;
+  const isSecurityAIAssistantEnabled = securityAIAssistantEnabled && aiAssistantManagementSelection;
 
   useEffect(() => {
     setBreadcrumbs([
@@ -148,7 +157,7 @@ export function AiAssistantSelectionPage() {
           <EuiCard
             description={
               <div>
-                {!securityAIAssistantEnabled ? (
+                {!isSecurityAIAssistantEnabled ? (
                   <>
                     <EuiSpacer size="s" />
                     <EuiCallOut
@@ -157,8 +166,7 @@ export function AiAssistantSelectionPage() {
                       title={i18n.translate(
                         'aiAssistantManagementSelection.aiAssistantSelectionPage.securityAi.thisFeatureIsDisabledCallOutLabel',
                         {
-                          defaultMessage:
-                            'This feature is disabled. You can enable it from from Spaces > Features.',
+                          defaultMessage: 'This feature is disabled.',
                         }
                       )}
                       size="s"
@@ -188,26 +196,27 @@ export function AiAssistantSelectionPage() {
                     }}
                   />
                 </p>
-                {securityAIAssistantEnabled && (
+                {
                   <EuiButton
                     data-test-subj="pluginsAiAssistantSelectionSecurityPageButton"
                     iconType="gear"
                     onClick={() =>
                       navigateToApp('management', { path: 'kibana/securityAiAssistantManagement' })
                     }
+                    disabled={!isSecurityAIAssistantEnabled}
                   >
                     {i18n.translate(
                       'aiAssistantManagementSelection.aiAssistantSelectionPage.securityAssistant.manageSettingsButtonLabel',
                       { defaultMessage: 'Manage Settings' }
                     )}
                   </EuiButton>
-                )}
+                }
               </div>
             }
             display="plain"
             hasBorder
             icon={<EuiIcon size="xxl" type="logoSecurity" />}
-            isDisabled={!securityAIAssistantEnabled}
+            isDisabled={!isSecurityAIAssistantEnabled}
             title={i18n.translate(
               'aiAssistantManagementSelection.aiAssistantSelectionPage.securityLabel',
               { defaultMessage: 'Elastic AI Assistant for Security' }
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.test.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.test.tsx
@@ -34,6 +34,7 @@ const mockContext = {
   assistantFeatures: { assistantModelEvaluation: true },
   assistantAvailability: {
     isAssistantEnabled: true,
+    isAssistantManagementEnabled: true,
   },
 };
 
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.tsx
@@ -49,6 +49,8 @@ export const AssistantSettingsManagement: React.FC<Props> = React.memo(
       http,
       selectedSettingsTab: contextSettingsTab,
       setSelectedSettingsTab,
+      navigateToApp,
+      assistantAvailability: { isAssistantManagementEnabled },
     } = useAssistantContext();
 
     useEffect(() => {
@@ -115,6 +117,10 @@ export const AssistantSettingsManagement: React.FC<Props> = React.memo(
       }));
     }, [onTabChange, selectedSettingsTab, tabsConfig]);
 
+    if (!isAssistantManagementEnabled) {
+      navigateToApp('management');
+    }
+
     return (
       <>
         <EuiPageTemplate.Header
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant_context/types.tsx
@@ -65,9 +65,10 @@ export interface AssistantAvailability {
   hasSearchAILakeConfigurations: boolean;
   // True when user is Enterprise, or Security Complete PLI for serverless. When false, the Assistant is disabled and unavailable
   isAssistantEnabled: boolean;
-
   // True when the Assistant is visible, i.e. the Assistant is available and the Assistant is visible in the UI
   isAssistantVisible: boolean;
+  // When true, user has `All` privilege for `Management > AI Assistant`
+  isAssistantManagementEnabled: boolean;
   // When true, the Assistant is hidden and unavailable
   hasAssistantPrivilege: boolean;
   // When true, user has `All` privilege for `Connectors and Actions` (show/execute/delete/save ui capabilities)
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/test_providers/test_providers.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/mock/test_providers/test_providers.tsx
@@ -43,6 +43,7 @@ export const mockAssistantAvailability: AssistantAvailability = {
   hasManageGlobalKnowledgeBase: true,
   isAssistantEnabled: true,
   isAssistantVisible: true,
+  isAssistantManagementEnabled: true,
 };
 
 /** A utility for wrapping children in the providers required to run tests */
diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts b/x-pack/platform/packages/shared/kbn-elastic-assistant/index.ts
@@ -193,6 +193,8 @@ export interface UseAssistantAvailability {
   isAssistantEnabled: boolean;
   // True when the Assistant is visible, i.e. the Assistant is available and the Assistant is visible in the UI
   isAssistantVisible: boolean;
+  // When true, user has `All` privilege for `Management > AI Assistant`
+  isAssistantManagementEnabled: boolean;
   // When true, the Assistant is hidden and unavailable
   hasAssistantPrivilege: boolean;
   // When true, user has `All` privilege for `Connectors and Actions` (show/execute/delete/save ui capabilities)
diff --git a/x-pack/solutions/security/packages/ecs-data-quality-dashboard/impl/data_quality_panel/mock/test_providers/test_providers.tsx b/x-pack/solutions/security/packages/ecs-data-quality-dashboard/impl/data_quality_panel/mock/test_providers/test_providers.tsx
@@ -60,6 +60,7 @@ const TestExternalProvidersComponent: React.FC<TestExternalProvidersProps> = ({
     hasManageGlobalKnowledgeBase: true,
     isAssistantEnabled: true,
     isAssistantVisible: true,
+    isAssistantManagementEnabled: true,
   };
   const queryClient = new QueryClient({
     defaultOptions: {
diff --git a/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.test.ts b/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.test.ts
@@ -55,6 +55,11 @@ describe('useAssistantAvailability', () => {
               save: true,
               delete: true,
             },
+            management: {
+              kibana: {
+                aiAssistantManagementSelection: true,
+              },
+            },
           },
         },
         aiAssistantManagementSelection: {
@@ -75,6 +80,7 @@ describe('useAssistantAvailability', () => {
       hasConnectorsReadPrivilege: true,
       isAssistantEnabled: true,
       isAssistantVisible: true,
+      isAssistantManagementEnabled: true,
       hasUpdateAIAssistantAnonymization: true,
       hasManageGlobalKnowledgeBase: true,
     });
@@ -107,6 +113,11 @@ describe('useAssistantAvailability', () => {
               save: true,
               delete: true,
             },
+            management: {
+              kibana: {
+                aiAssistantManagementSelection: true,
+              },
+            },
           },
         },
         aiAssistantManagementSelection: {
@@ -127,6 +138,7 @@ describe('useAssistantAvailability', () => {
       hasConnectorsReadPrivilege: true,
       isAssistantEnabled: true,
       isAssistantVisible: false,
+      isAssistantManagementEnabled: true,
       hasUpdateAIAssistantAnonymization: true,
       hasManageGlobalKnowledgeBase: true,
     });
@@ -155,6 +167,11 @@ describe('useAssistantAvailability', () => {
               save: false,
               delete: false,
             },
+            management: {
+              kibana: {
+                aiAssistantManagementSelection: false,
+              },
+            },
           },
         },
         featureFlags: {
@@ -172,6 +189,7 @@ describe('useAssistantAvailability', () => {
       hasConnectorsReadPrivilege: false,
       isAssistantEnabled: false,
       isAssistantVisible: false,
+      isAssistantManagementEnabled: false,
       hasUpdateAIAssistantAnonymization: false,
       hasManageGlobalKnowledgeBase: false,
     });
@@ -200,6 +218,11 @@ describe('useAssistantAvailability', () => {
               save: false,
               delete: false,
             },
+            management: {
+              kibana: {
+                aiAssistantManagementSelection: false,
+              },
+            },
           },
         },
         featureFlags: {
@@ -217,6 +240,7 @@ describe('useAssistantAvailability', () => {
       hasConnectorsReadPrivilege: true,
       isAssistantEnabled: true,
       isAssistantVisible: true,
+      isAssistantManagementEnabled: false,
       hasUpdateAIAssistantAnonymization: false,
       hasManageGlobalKnowledgeBase: false,
     });
@@ -247,6 +271,7 @@ describe('useAssistantAvailability', () => {
       hasConnectorsReadPrivilege: false,
       isAssistantEnabled: true,
       isAssistantVisible: true,
+      isAssistantManagementEnabled: false,
       hasUpdateAIAssistantAnonymization: false,
       hasManageGlobalKnowledgeBase: false,
     });
diff --git a/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.ts b/x-pack/solutions/security/plugins/elastic_assistant/public/src/hooks/assistant_availability/use_assistant_availability.ts
@@ -26,6 +26,8 @@ export const useAssistantAvailability = (): UseAssistantAvailability => {
   const hasManageGlobalKnowledgeBase =
     capabilities[ASSISTANT_FEATURE_ID]?.manageGlobalKnowledgeBaseAIAssistant === true;
   const hasSearchAILakeConfigurations = capabilities[SECURITY_FEATURE_ID]?.configurations === true;
+  const hasManageAssistantPrivilege =
+    capabilities?.management?.kibana?.aiAssistantManagementSelection === true;
 
   // Connectors & Actions capabilities as defined in x-pack/plugins/actions/server/feature.ts
   // `READ` ui capabilities defined as: { ui: ['show', 'execute'] }
@@ -44,6 +46,7 @@ export const useAssistantAvailability = (): UseAssistantAvailability => {
     hasConnectorsReadPrivilege,
     isAssistantEnabled: isEnterprise,
     isAssistantVisible: isEnterprise && isVisible,
+    isAssistantManagementEnabled: isEnterprise && hasManageAssistantPrivilege,
     hasUpdateAIAssistantAnonymization,
     hasManageGlobalKnowledgeBase,
   };
diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/mock/mock_assistant_provider.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/mock/mock_assistant_provider.tsx
@@ -41,6 +41,7 @@ export const MockAssistantProviderComponent: React.FC<Props> = ({
     hasManageGlobalKnowledgeBase: true,
     isAssistantEnabled: true,
     isAssistantVisible: true,
+    isAssistantManagementEnabled: true,
   };
   const chrome = chromeServiceMock.createStartContract();
   chrome.getChromeStyle$.mockReturnValue(of('classic'));
diff --git a/x-pack/solutions/security/plugins/security_solution/public/plugin.tsx b/x-pack/solutions/security/plugins/security_solution/public/plugin.tsx
@@ -224,6 +224,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
           productFeatureKeys?.has(ProductFeatureAssistantKey.assistant) &&
           !productFeatureKeys?.has(ProductFeatureSecurityKey.configurations) &&
           license?.hasAtLeast('enterprise');
+
         const assistantManagementApp = management?.sections.section.kibana.getApp(
           'securityAiAssistantManagement'
         );

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ interface ContextValue extends StartDependencies {`
`20`	`20`	`navigateToApp: CoreStart['application']['navigateToApp'];`
`21`	`21`	`kibanaBranch: string;`
`22`	`22`	`buildFlavor: BuildFlavor;`
	`23`	`+ securityAIAssistantEnabled: boolean;`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`const AppContext = createContext<ContextValue>(null as any);`