[8.19] [Data Discovery] Remove SO client usages (elastic#224495) (elastic#224978)

davismcphee · web-flow · commit c05e1899ab09 · 2025-06-24T08:58:19.000+02:00
# Backport This will backport the following commits from `main` to `8.19`: - [[Data Discovery] Remove SO client usages (elastic#224495)](elastic#224495)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)
diff --git a/examples/discover_customization_examples/kibana.jsonc b/examples/discover_customization_examples/kibana.jsonc
@@ -12,7 +12,8 @@
       "discover",
       "embeddable",
       "kibanaUtils",
-      "data"
+      "data",
+      "savedSearch"
     ]
   }
 }
diff --git a/examples/discover_customization_examples/public/plugin.tsx b/examples/discover_customization_examples/public/plugin.tsx
@@ -25,6 +25,9 @@ import { Route, Router, Routes } from '@kbn/shared-ux-router';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import { SavedSearchPublicPluginStart } from '@kbn/saved-search-plugin/public';
+import type { SOWithMetadata } from '@kbn/content-management-utils';
+import type { SavedSearchAttributes } from '@kbn/saved-search-plugin/common';
 import image from './discover_customization_examples.png';
 
 export interface DiscoverCustomizationExamplesSetupPlugins {
@@ -35,6 +38,7 @@ export interface DiscoverCustomizationExamplesSetupPlugins {
 export interface DiscoverCustomizationExamplesStartPlugins {
   discover: DiscoverStart;
   data: DataPublicPluginStart;
+  savedSearch: SavedSearchPublicPluginStart;
 }
 
 const PLUGIN_ID = 'discoverCustomizationExamples';
@@ -112,15 +116,13 @@ export class DiscoverCustomizationExamplesPlugin implements Plugin {
           const togglePopover = () => setIsPopoverOpen((open) => !open);
           const closePopover = () => setIsPopoverOpen(false);
           const [savedSearches, setSavedSearches] = useState<
-            Array<SimpleSavedObject<{ title: string }>>
+            Array<SOWithMetadata<SavedSearchAttributes>>
           >([]);
 
           useEffect(() => {
-            core.savedObjects.client
-              .find<{ title: string }>({ type: 'search' })
-              .then((response) => {
-                setSavedSearches(response.savedObjects);
-              });
+            plugins.savedSearch.getAll().then((response) => {
+              setSavedSearches(response);
+            });
           }, []);
 
           const currentSavedSearch = useObservable(
@@ -154,7 +156,7 @@ export class DiscoverCustomizationExamplesPlugin implements Plugin {
                       id: 0,
                       title: 'Saved logs views',
                       items: savedSearches.map((savedSearch) => ({
-                        name: savedSearch.get('title'),
+                        name: savedSearch.attributes.title,
                         onClick: () => stateContainer.actions.onOpenSavedSearch(savedSearch.id),
                         icon: savedSearch.id === currentSavedSearch.id ? 'check' : 'empty',
                         'data-test-subj': `logsViewSelectorOption-${savedSearch.attributes.title.replace(
diff --git a/examples/discover_customization_examples/tsconfig.json b/examples/discover_customization_examples/tsconfig.json
@@ -13,6 +13,8 @@
     "@kbn/i18n-react",
     "@kbn/react-kibana-context-theme",
     "@kbn/data-plugin",
+    "@kbn/saved-search-plugin",
+    "@kbn/content-management-utils",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/src/platform/plugins/shared/discover/public/application/main/state_management/discover_state.test.ts b/src/platform/plugins/shared/discover/public/application/main/state_management/discover_state.test.ts
@@ -398,32 +398,6 @@ describe('Test discover state actions', () => {
     discoverServiceMock.data.search.searchSource.create = jest
       .fn()
       .mockReturnValue(savedSearchMock.searchSource);
-    discoverServiceMock.core.savedObjects.client.resolve = jest.fn().mockReturnValue({
-      saved_object: {
-        attributes: {
-          kibanaSavedObjectMeta: {
-            searchSourceJSON:
-              '{"query":{"query":"","language":"kuery"},"filter":[],"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
-          },
-          title: 'The saved search that will save the world',
-          sort: [],
-          columns: ['test123'],
-          description: 'description',
-          hideChart: false,
-        },
-        id: 'the-saved-search-id',
-        type: 'search',
-        references: [
-          {
-            name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-            id: 'the-data-view-id',
-            type: 'index-pattern',
-          },
-        ],
-        namespaces: ['default'],
-      },
-      outcome: 'exactMatch',
-    });
   });
 
   afterEach(() => {
diff --git a/src/platform/plugins/shared/saved_search/public/services/saved_searches/types.ts b/src/platform/plugins/shared/saved_search/public/services/saved_searches/types.ts
@@ -8,15 +8,15 @@
  */
 
 import type { Reference } from '@kbn/content-management-utils';
-import type { ResolvedSimpleSavedObject } from '@kbn/core/public';
+import type { SavedObjectsResolveResponse } from '@kbn/core-saved-objects-api-server';
 import type { SavedSearch as SavedSearchCommon, SavedSearchAttributes } from '../../../common';
 
 /** @public **/
 export interface SavedSearch extends SavedSearchCommon {
   sharingSavedObjectProps?: {
-    outcome?: ResolvedSimpleSavedObject['outcome'];
-    aliasTargetId?: ResolvedSimpleSavedObject['alias_target_id'];
-    aliasPurpose?: ResolvedSimpleSavedObject['alias_purpose'];
+    outcome?: SavedObjectsResolveResponse['outcome'];
+    aliasTargetId?: SavedObjectsResolveResponse['alias_target_id'];
+    aliasPurpose?: SavedObjectsResolveResponse['alias_purpose'];
     errorJSON?: string;
   };
 }
diff --git a/src/platform/plugins/shared/saved_search/tsconfig.json b/src/platform/plugins/shared/saved_search/tsconfig.json
@@ -28,6 +28,7 @@
     "@kbn/utility-types",
     "@kbn/search-types",
     "@kbn/unified-data-table",
+    "@kbn/core-saved-objects-api-server",
   ],
   "exclude": ["target/**/*"]
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`"discover",`
`13`	`13`	`"embeddable",`
`14`	`14`	`"kibanaUtils",`
`15`		`- "data"`
	`15`	`+ "data",`
	`16`	`+ "savedSearch"`
`16`	`17`	`]`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`"@kbn/i18n-react",`
`14`	`14`	`"@kbn/react-kibana-context-theme",`
`15`	`15`	`"@kbn/data-plugin",`
	`16`	`+ "@kbn/saved-search-plugin",`
	`17`	`+ "@kbn/content-management-utils",`
`16`	`18`	`],`
`17`	`19`	`"exclude": ["target/*/"]`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`"@kbn/utility-types",`
`29`	`29`	`"@kbn/search-types",`
`30`	`30`	`"@kbn/unified-data-table",`
	`31`	`+ "@kbn/core-saved-objects-api-server",`
`31`	`32`	`],`
`32`	`33`	`"exclude": ["target/*/"]`
`33`	`34`	`}`