From e8ef34cb2b26a4e7560f1e7e0271702edd0b6b1a Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Fri, 8 Nov 2024 06:59:25 +1100
Subject: [PATCH] [8.16] [AI Assistant] Enable Search in Solution View
 (#199137) (#199358)

# Backport

This will backport the following commits from `main` to `8.16`:
- [[AI Assistant] Enable Search in Solution View
(#199137)](https://github.com/elastic/kibana/pull/199137)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Sander
Philipse","email":"94373878+sphilipse@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-11-07T18:12:33Z","message":"[AI
Assistant] Enable Search in Solution View (#199137)\n\n##
Summary\r\n\r\nThis enables the Search solution in the Observability
solution view, so\r\nthat connectors (which are required for the AI
Assistant) are
available.","sha":"17db651a058795ef866ee610d950bfada91c840a","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Search","v8.16.0","backport:version","v8.17.0"],"title":"[AI
Assistant] Enable Search in Solution
View","number":199137,"url":"https://github.com/elastic/kibana/pull/199137","mergeCommit":{"message":"[AI
Assistant] Enable Search in Solution View (#199137)\n\n##
Summary\r\n\r\nThis enables the Search solution in the Observability
solution view, so\r\nthat connectors (which are required for the AI
Assistant) are
available.","sha":"17db651a058795ef866ee610d950bfada91c840a"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199137","number":199137,"mergeCommit":{"message":"[AI
Assistant] Enable Search in Solution View (#199137)\n\n##
Summary\r\n\r\nThis enables the Search solution in the Observability
solution view, so\r\nthat connectors (which are required for the AI
Assistant) are
available.","sha":"17db651a058795ef866ee610d950bfada91c840a"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Sander Philipse <94373878+sphilipse@users.noreply.github.com>
---
 .../server/capabilities/capabilities_switcher.test.ts       | 6 ++----
 .../lib/utils/space_solution_disabled_features.test.ts      | 4 ++--
 .../server/lib/utils/space_solution_disabled_features.ts    | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
index d48095638babf..d4f3457ea277c 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
@@ -366,14 +366,12 @@ describe('capabilitiesSwitcher', () => {
       {
         space.solution = 'oblt';
 
-        // It should disable enterpriseSearch and securitySolution features
-        // which correspond to feature_1 and feature_3
+        // It should disable securitySolution features
+        // which corresponds to feature_3
         const result = await switcher(request, capabilities, false);
 
         const expectedCapabilities = buildCapabilities();
 
-        expectedCapabilities.feature_1.bar = false;
-        expectedCapabilities.feature_1.foo = false;
         expectedCapabilities.feature_3.bar = false;
         expectedCapabilities.feature_3.foo = false;
 
diff --git a/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.test.ts b/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.test.ts
index 908a4ee2ced57..f19b4d585dc22 100644
--- a/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.test.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.test.ts
@@ -58,7 +58,7 @@ describe('#withSpaceSolutionDisabledFeatures', () => {
   });
 
   describe('when the space solution is "oblt"', () => {
-    test('it removes the "search" and "security" features', () => {
+    test('it removes the "security" features', () => {
       const spaceDisabledFeatures: string[] = [];
       const spaceSolution = 'oblt';
 
@@ -68,7 +68,7 @@ describe('#withSpaceSolutionDisabledFeatures', () => {
         spaceSolution
       );
 
-      expect(result).toEqual(['feature2', 'feature3']);
+      expect(result).toEqual(['feature3']);
     });
   });
 
diff --git a/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts b/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts
index 066166e7e87dd..6a7dd9168a248 100644
--- a/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts
@@ -61,7 +61,6 @@ export function withSpaceSolutionDisabledFeatures(
     ]).filter((featureId) => !enabledFeaturesPerSolution.es.includes(featureId));
   } else if (spaceSolution === 'oblt') {
     disabledFeatureKeysFromSolution = getFeatureIdsForCategories(features, [
-      'enterpriseSearch',
       'securitySolution',
     ]).filter((featureId) => !enabledFeaturesPerSolution.oblt.includes(featureId));
   } else if (spaceSolution === 'security') {