Resolving merge conflicts

src/plugins/discover/public/embeddable/saved_search_embeddable.tsx

@@ -610,7 +610,6 @@ export class SavedSearchEmbeddable
     if (
       this.services.uiSettings.get(SHOW_FIELD_STATISTICS) === true &&
       viewMode === VIEW_MODE.AGGREGATED_LEVEL &&
-      savedSearch.viewMode === VIEW_MODE.AGGREGATED_LEVEL &&
       searchProps.services &&
       searchProps.dataView &&
       Array.isArray(searchProps.columns)
@@ -653,6 +652,7 @@ export class SavedSearchEmbeddable
 
     if (searchProps.services) {
       const { getTriggerCompatibleActions } = searchProps.services.uiActions;
+
       ReactDOM.render(
         <I18nProvider>
           <KibanaThemeProvider theme$={searchProps.services.core.theme.theme$}>

src/plugins/saved_search/common/service/get_saved_searches.ts

@@ -11,12 +11,10 @@ import { injectReferences, parseSearchSourceJSON } from '@kbn/data-plugin/common
 // these won't exist in on server
 import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import type { SavedObjectsTaggingApi } from '@kbn/saved-objects-tagging-oss-plugin/public';
-
 import { i18n } from '@kbn/i18n';
-import type { SavedSearch } from '../types';
-import { SavedSearchType as SAVED_SEARCH_TYPE } from '..';
 import type { Reference } from '@kbn/content-management-utils';
-import type { SavedSearchAttributes } from '../../../common';
+import type { SavedSearch, SavedSearchAttributes } from '../types';
+import { SavedSearchType as SAVED_SEARCH_TYPE } from '..';
 import { fromSavedSearchAttributes } from './saved_searches_utils';
 import type { SavedSearchCrudTypes } from '../content_management';
 
@@ -35,7 +33,7 @@ const getSavedSearchUrlConflictMessage = async (json: string) =>
 
 export const getSearchSavedObject = async (
   savedSearchId: string,
-  { searchSourceCreate, spaces, savedObjectsTagging, getSavedSrch }: GetSavedSearchDependencies
+  { spaces, getSavedSrch }: GetSavedSearchDependencies
 ) => {
   const so = await getSavedSrch(savedSearchId);
 
@@ -72,7 +70,7 @@ export const convertToSavedSearch = async (
     references: Reference[];
     sharingSavedObjectProps: SavedSearch['sharingSavedObjectProps'];
   },
-  { search, savedObjectsTagging }: GetSavedSearchDependencies
+  { searchSourceCreate, savedObjectsTagging }: GetSavedSearchDependencies
 ) => {
   const parsedSearchSourceJSON = parseSearchSourceJSON(
     attributes.kibanaSavedObjectMeta?.searchSourceJSON ?? '{}'

src/plugins/saved_search/public/services/saved_searches/create_get_saved_search_deps.ts

@@ -0,0 +1,28 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { type SavedSearchCrudTypes, SavedSearchType } from '../../../common/content_management';
+import type { GetSavedSearchDependencies } from '../../../common/service/get_saved_searches';
+import type { SavedSearchesServiceDeps } from './saved_searches_service';
+
+export const createGetSavedSearchDeps = ({
+  spaces,
+  savedObjectsTaggingOss,
+  search,
+  contentManagement,
+}: SavedSearchesServiceDeps): GetSavedSearchDependencies => ({
+  spaces,
+  savedObjectsTagging: savedObjectsTaggingOss?.getTaggingApi(),
+  searchSourceCreate: search.searchSource.create,
+  getSavedSrch: (id: string) => {
+    return contentManagement.get<SavedSearchCrudTypes['GetIn'], SavedSearchCrudTypes['GetOut']>({
+      contentTypeId: SavedSearchType,
+      id,
+    });
+  },
+});

src/plugins/saved_search/public/services/saved_searches/saved_search_attribute_service.ts

@@ -16,9 +16,13 @@ import type {
 } from './types';
 import { SEARCH_EMBEDDABLE_TYPE } from '../../../common';
 import type { SavedSearchesServiceDeps } from './saved_searches_service';
-import { getSearchSavedObject, convertToSavedSearch } from './get_saved_searches';
+import {
+  getSearchSavedObject,
+  convertToSavedSearch,
+} from '../../../common/service/get_saved_searches';
 import { checkForDuplicateTitle } from './check_for_duplicate_title';
 import { saveSearchSavedObject } from './save_saved_searches';
+import { createGetSavedSearchDeps } from './create_get_saved_search_deps';
 
 export interface SavedSearchUnwrapMetaInfo {
   sharingSavedObjectProps: SavedSearch['sharingSavedObjectProps'];
@@ -59,7 +63,7 @@ export function getSavedSearchAttributeService(
       return { id };
     },
     unwrapMethod: async (savedObjectId: string): Promise<SavedSearchUnwrapResult> => {
-      const so = await getSearchSavedObject(savedObjectId, services);
+      const so = await getSearchSavedObject(savedObjectId, createGetSavedSearchDeps(services));
 
       return {
         attributes: {
@@ -95,7 +99,7 @@ export const toSavedSearch = async (
       savedSearchId: id,
       sharingSavedObjectProps,
     },
-    services
+    createGetSavedSearchDeps(services)
   );
 };
 

src/plugins/saved_search/public/services/saved_searches/saved_searches_service.ts

@@ -14,6 +14,7 @@ import { getSavedSearch, saveSavedSearch, SaveSavedSearchOptions, getNewSavedSea
 import type { SavedSearchCrudTypes } from '../../../common/content_management';
 import { SavedSearchType } from '../../../common';
 import type { SavedSearch } from '../../../common/types';
+import { createGetSavedSearchDeps } from './create_get_saved_search_deps';
 
 export interface SavedSearchesServiceDeps {
   search: DataPublicPluginStart['search'];
@@ -26,19 +27,7 @@ export class SavedSearchesService {
   constructor(private deps: SavedSearchesServiceDeps) {}
 
   get = (savedSearchId: string) => {
-    const { search, contentManagement, spaces, savedObjectsTaggingOss } = this.deps;
-    const getViaCm = (id: string) =>
-      contentManagement.get<SavedSearchCrudTypes['GetIn'], SavedSearchCrudTypes['GetOut']>({
-        contentTypeId: SavedSearchType,
-        id,
-      });
-
-    return getSavedSearch(savedSearchId, {
-      getSavedSrch: getViaCm,
-      spaces,
-      searchSourceCreate: search.searchSource.create,
-      savedObjectsTagging: savedObjectsTaggingOss?.getTaggingApi(),
-    });
+    return getSavedSearch(savedSearchId, createGetSavedSearchDeps(this.deps));
   };
   getAll = async () => {
     const { contentManagement } = this.deps;