[8.x] Hide assistant's knowledge base UI when `assistantKnowledgeBase…

…ByDefault` feature flag is disabled (#196762) (#196980) # Backport This will backport the following commits from `main` to `8.x`: - [Hide assistant's knowledge base UI when `assistantKnowledgeBaseByDefault` feature flag is disabled (#196762)](#196762)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) \n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n\n\nCo-authored-by: Ievgen Sorokopud <ievgen.sorokopud@elastic.co>"}}]}] BACKPORT-->
elastic · Oct 21, 2024 · 307a08e · 307a08e
1 parent 1f4532a
commit 307a08e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/x-pack/packages/security-solution/features/src/assistant/index.ts b/x-pack/packages/security-solution/features/src/assistant/index.ts
@@ -9,11 +9,13 @@ import type { ProductFeatureParams } from '../types';
 import { getAssistantBaseKibanaFeature } from './kibana_features';
 import {
   getAssistantBaseKibanaSubFeatureIds,
-  assistantSubFeaturesMap,
+  getAssistantSubFeaturesMap,
 } from './kibana_sub_features';
 
-export const getAssistantFeature = (): ProductFeatureParams<AssistantSubFeatureId> => ({
+export const getAssistantFeature = (
+  experimentalFeatures: Record<string, boolean>
+): ProductFeatureParams<AssistantSubFeatureId> => ({
   baseKibanaFeature: getAssistantBaseKibanaFeature(),
   baseKibanaSubFeatureIds: getAssistantBaseKibanaSubFeatureIds(),
-  subFeaturesMap: assistantSubFeaturesMap,
+  subFeaturesMap: getAssistantSubFeaturesMap(experimentalFeatures),
 });
diff --git a/x-pack/packages/security-solution/features/src/assistant/kibana_sub_features.ts b/x-pack/packages/security-solution/features/src/assistant/kibana_sub_features.ts
@@ -102,9 +102,28 @@ export const getAssistantBaseKibanaSubFeatureIds = (): AssistantSubFeatureId[] =
  * Defines all the Security Assistant subFeatures available.
  * The order of the subFeatures is the order they will be displayed
  */
-export const assistantSubFeaturesMap = Object.freeze(
-  new Map<AssistantSubFeatureId, SubFeatureConfig>([
+export const getAssistantSubFeaturesMap = (
+  experimentalFeatures: Record<string, boolean>
+): Map<AssistantSubFeatureId, SubFeatureConfig> => {
+  const assistantSubFeaturesList: Array<[AssistantSubFeatureId, SubFeatureConfig]> = [
     [AssistantSubFeatureId.updateAnonymization, updateAnonymizationSubFeature],
-    [AssistantSubFeatureId.manageGlobalKnowledgeBase, manageGlobalKnowledgeBaseSubFeature],
-  ])
-);
+  ];
+
+  // Use the following code to add feature based on feature flag
+  // if (experimentalFeatures.featureFlagName) {
+  //   assistantSubFeaturesList.push([AssistantSubFeatureId.featureId, featureSubFeature]);
+  // }
+
+  if (experimentalFeatures.assistantKnowledgeBaseByDefault) {
+    assistantSubFeaturesList.push([
+      AssistantSubFeatureId.manageGlobalKnowledgeBase,
+      manageGlobalKnowledgeBaseSubFeature,
+    ]);
+  }
+
+  const assistantSubFeaturesMap = new Map<AssistantSubFeatureId, SubFeatureConfig>(
+    assistantSubFeaturesList
+  );
+
+  return Object.freeze(assistantSubFeaturesMap);
+};
diff --git a/...plugins/security_solution/server/lib/product_features_service/product_features_service.ts b/...plugins/security_solution/server/lib/product_features_service/product_features_service.ts
@@ -62,7 +62,7 @@ export class ProductFeaturesService {
       casesFeature.baseKibanaSubFeatureIds
     );
 
-    const assistantFeature = getAssistantFeature();
+    const assistantFeature = getAssistantFeature(this.experimentalFeatures);
     this.securityAssistantProductFeatures = new ProductFeatures(
       this.logger,
       assistantFeature.subFeaturesMap,

diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts
@@ -30,6 +30,9 @@ export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProvi
         '--xpack.ruleRegistry.write.enabled=true',
         '--xpack.ruleRegistry.write.enabled=true',
         '--xpack.ruleRegistry.write.cache.enabled=false',
+        `--xpack.securitySolution.enableExperimental=${JSON.stringify([
+          'assistantKnowledgeBaseByDefault',
+        ])}`,
         '--monitoring_collection.opentelemetry.metrics.prometheus.enabled=true',
       ],
     },