[Discover] Step 1 - remove SavedObjectLoader

src/plugins/discover/public/__mocks__/saved_search.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedSearch } from '../saved_searches';
+import { LegacySavedSearch } from '../saved_searches';
 import { createSearchSourceMock } from '../../../data/public/mocks';
 import { indexPatternMock } from './index_pattern';
 import { indexPatternWithTimefieldMock } from './index_pattern_with_timefield';
@@ -31,7 +31,7 @@ export const savedSearchMock = {
   migrationVersion: { search: '7.5.0' },
   error: undefined,
   searchSource: createSearchSourceMock({ index: indexPatternMock }),
-} as unknown as SavedSearch;
+} as unknown as LegacySavedSearch;
 
 export const savedSearchMockWithTimeField = {
   id: 'the-saved-search-id-with-timefield',
@@ -53,4 +53,4 @@ export const savedSearchMockWithTimeField = {
   migrationVersion: { search: '7.5.0' },
   error: undefined,
   searchSource: createSearchSourceMock({ index: indexPatternWithTimefieldMock }),
-} as unknown as SavedSearch;
+} as unknown as LegacySavedSearch;

src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx

@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { HitsCounter } from '../hits_counter';
 import { search } from '../../../../../../../data/public';
 import { TimechartHeader } from '../timechart_header';
-import { SavedSearch } from '../../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../../saved_searches';
 import { AppState, GetStateReturn } from '../../services/discover_state';
 import { DiscoverHistogram } from './histogram';
 import { DataCharts$, DataTotalHits$ } from '../../services/use_saved_search';
@@ -31,7 +31,7 @@ export function DiscoverChart({
   timefield,
 }: {
   resetSavedSearch: () => void;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   savedSearchDataChart$: DataCharts$;
   savedSearchDataTotalHits$: DataTotalHits$;
   services: DiscoverServices;

src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx

@@ -25,7 +25,7 @@ import {
 } from '../../../../../../common';
 import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
 import { IndexPattern } from '../../../../../../../data/common';
-import { SavedSearch } from '../../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../../saved_searches';
 import { DataDocumentsMsg, DataDocuments$ } from '../../services/use_saved_search';
 import { DiscoverServices } from '../../../../../build_services';
 import { AppState, GetStateReturn } from '../../services/discover_state';
@@ -52,7 +52,7 @@ function DiscoverDocumentsComponent({
   indexPattern: IndexPattern;
   navigateTo: (url: string) => void;
   onAddFilter: DocViewFilterFn;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   services: DiscoverServices;
   setExpandedDoc: (doc: ElasticSearchHit | undefined) => void;
   state: AppState;

src/plugins/discover/public/application/apps/main/components/layout/types.ts

@@ -17,7 +17,7 @@ import { ISearchSource } from '../../../../../../../data/public';
 import { AppState, GetStateReturn } from '../../services/discover_state';
 import { DataRefetch$, SavedSearchData } from '../../services/use_saved_search';
 import { DiscoverServices } from '../../../../../build_services';
-import { SavedSearch } from '../../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../../saved_searches';
 import { RequestAdapter } from '../../../../../../../inspector';
 
 export interface DiscoverLayoutProps {
@@ -28,7 +28,7 @@ export interface DiscoverLayoutProps {
   onChangeIndexPattern: (id: string) => void;
   onUpdateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
   resetSavedSearch: () => void;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   savedSearchData$: SavedSearchData;
   savedSearchRefetch$: DataRefetch$;
   searchSource: ISearchSource;

src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.ts

@@ -13,7 +13,7 @@ import { showOpenSearchPanel } from './show_open_search_panel';
 import { getSharingData, showPublicUrlSwitch } from '../../utils/get_sharing_data';
 import { unhashUrl } from '../../../../../../../kibana_utils/public';
 import { DiscoverServices } from '../../../../../build_services';
-import { SavedSearch } from '../../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../../saved_searches';
 import { onSaveSearch } from './on_save_search';
 import { GetStateReturn } from '../../services/discover_state';
 import { openOptionsPopover } from './open_options_popover';
@@ -33,7 +33,7 @@ export const getTopNavLinks = ({
 }: {
   indexPattern: IndexPattern;
   navigateTo: (url: string) => void;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   services: DiscoverServices;
   state: GetStateReturn;
   onOpenInspector: () => void;

src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx

@@ -9,7 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { SavedObjectSaveModal, showSaveModal } from '../../../../../../../saved_objects/public';
-import { SavedSearch } from '../../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../../saved_searches';
 import { IndexPattern } from '../../../../../../../data/common';
 import { DiscoverServices } from '../../../../../build_services';
 import { GetStateReturn } from '../../services/discover_state';
@@ -26,7 +26,7 @@ async function saveDataSource({
 }: {
   indexPattern: IndexPattern;
   navigateTo: (url: string) => void;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   saveOptions: {
     confirmOverwrite: boolean;
     isTitleDuplicateConfirmed: boolean;
@@ -89,7 +89,7 @@ export async function onSaveSearch({
 }: {
   indexPattern: IndexPattern;
   navigateTo: (path: string) => void;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   services: DiscoverServices;
   state: GetStateReturn;
 }) {

src/plugins/discover/public/application/apps/main/discover_main_app.tsx

@@ -14,7 +14,7 @@ import { useDiscoverState } from './services/use_discover_state';
 import { useUrl } from './services/use_url';
 import { IndexPatternAttributes, SavedObject } from '../../../../../data/common';
 import { DiscoverServices } from '../../../build_services';
-import { SavedSearch } from '../../../saved_searches';
+import { LegacySavedSearch } from '../../../saved_searches';
 
 const DiscoverLayoutMemoized = React.memo(DiscoverLayout);
 
@@ -34,7 +34,7 @@ export interface DiscoverMainProps {
   /**
    * Current instance of SavedSearch
    */
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
 }
 
 export function DiscoverMainApp(props: DiscoverMainProps) {

src/plugins/discover/public/application/apps/main/discover_main_route.tsx

@@ -11,7 +11,7 @@ import { useParams } from 'react-router-dom';
 import type { SavedObject as SavedObjectDeprecated } from 'src/plugins/saved_objects/public';
 import { IndexPatternAttributes, SavedObject } from 'src/plugins/data/common';
 import { DiscoverServices } from '../../../build_services';
-import { SavedSearch } from '../../../saved_searches';
+import { LegacySavedSearch } from '../../../saved_searches';
 import { getState } from './services/discover_state';
 import { loadIndexPattern, resolveIndexPattern } from './utils/resolve_index_pattern';
 import { DiscoverMainApp } from './discover_main_app';
@@ -47,7 +47,7 @@ export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
     http: { basePath },
   } = services;
 
-  const [savedSearch, setSavedSearch] = useState<SavedSearch>();
+  const [savedSearch, setSavedSearch] = useState<LegacySavedSearch>();
   const indexPattern = savedSearch?.searchSource?.getField('index');
   const [indexPatternList, setIndexPatternList] = useState<
     Array<SavedObject<IndexPatternAttributes>>
@@ -58,7 +58,7 @@ export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
   useEffect(() => {
     const savedSearchId = id;
 
-    async function loadDefaultOrCurrentIndexPattern(usedSavedSearch: SavedSearch) {
+    async function loadDefaultOrCurrentIndexPattern(usedSavedSearch: LegacySavedSearch) {
       await data.indexPatterns.ensureDefaultDataView();
       const { appStateContainer } = getState({ history, uiSettings: config });
       const { index } = appStateContainer.getState();

src/plugins/discover/public/application/apps/main/services/discover_state.test.ts

@@ -14,7 +14,7 @@ import {
 } from './discover_state';
 import { createBrowserHistory, History } from 'history';
 import { dataPluginMock } from '../../../../../../data/public/mocks';
-import { SavedSearch } from '../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../saved_searches';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common';
 
 let history: History;
@@ -150,7 +150,7 @@ describe('Test discover state with legacy migration', () => {
 });
 
 describe('createSearchSessionRestorationDataProvider', () => {
-  let mockSavedSearch: SavedSearch = {} as unknown as SavedSearch;
+  let mockSavedSearch: LegacySavedSearch = {} as unknown as LegacySavedSearch;
   const mockDataPlugin = dataPluginMock.createStartContract();
   const searchSessionInfoProvider = createSearchSessionRestorationDataProvider({
     data: mockDataPlugin,
@@ -167,12 +167,12 @@ describe('createSearchSessionRestorationDataProvider', () => {
     });
 
     test('Saved Search with a title returns saved search title', async () => {
-      mockSavedSearch = { id: 'id', title: 'Name' } as unknown as SavedSearch;
+      mockSavedSearch = { id: 'id', title: 'Name' } as unknown as LegacySavedSearch;
       expect(await searchSessionInfoProvider.getName()).toBe('Name');
     });
 
     test('Saved Search without a title returns default name', async () => {
-      mockSavedSearch = { id: 'id', title: undefined } as unknown as SavedSearch;
+      mockSavedSearch = { id: 'id', title: undefined } as unknown as LegacySavedSearch;
       expect(await searchSessionInfoProvider.getName()).toBe('Discover');
     });
   });

src/plugins/discover/public/application/apps/main/services/discover_state.ts

@@ -33,7 +33,7 @@ import {
 import { migrateLegacyQuery } from '../../../helpers/migrate_legacy_query';
 import { DiscoverGridSettings } from '../../../components/discover_grid/types';
 import { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState } from '../../../../url_generator';
-import { SavedSearch } from '../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../saved_searches';
 import { handleSourceColumnState } from '../../../helpers/state_helpers';
 
 export interface AppState {
@@ -336,7 +336,7 @@ export function isEqualState(stateA: AppState, stateB: AppState) {
 export function createSearchSessionRestorationDataProvider(deps: {
   appStateContainer: StateContainer<AppState>;
   data: DataPublicPluginStart;
-  getSavedSearch: () => SavedSearch;
+  getSavedSearch: () => LegacySavedSearch;
 }): SearchSessionInfoProvider {
   const getSavedSearchId = () => deps.getSavedSearch().id;
   return {

src/plugins/discover/public/application/apps/main/services/use_discover_state.ts

@@ -11,7 +11,7 @@ import { History } from 'history';
 import { getState } from './discover_state';
 import { getStateDefaults } from '../utils/get_state_defaults';
 import { DiscoverServices } from '../../../../build_services';
-import { SavedSearch } from '../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../saved_searches';
 import { loadIndexPattern } from '../utils/resolve_index_pattern';
 import { useSavedSearch as useSavedSearchData } from './use_saved_search';
 import {
@@ -31,7 +31,7 @@ export function useDiscoverState({
   savedSearch,
 }: {
   services: DiscoverServices;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   history: History;
 }) {
   const { uiSettings: config, data, filterManager, indexPatterns } = services;

src/plugins/discover/public/application/apps/main/services/use_search_session.ts

@@ -11,7 +11,7 @@ import { DiscoverSearchSessionManager } from './discover_search_session';
 import { createSearchSessionRestorationDataProvider, GetStateReturn } from './discover_state';
 import { noSearchSessionStorageCapabilityMessage } from '../../../../../../data/public';
 import { DiscoverServices } from '../../../../build_services';
-import { SavedSearch } from '../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../saved_searches';
 
 export function useSearchSession({
   services,
@@ -22,7 +22,7 @@ export function useSearchSession({
   services: DiscoverServices;
   stateContainer: GetStateReturn;
   history: History;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
 }) {
   const { data, capabilities } = services;
   /**

src/plugins/discover/public/application/apps/main/utils/fetch_all.ts

@@ -14,7 +14,7 @@ import {
   sendResetMsg,
 } from '../services/use_saved_search_messages';
 import { updateSearchSource } from './update_search_source';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { fetchDocuments } from './fetch_documents';
 import { fetchTotalHits } from './fetch_total_hits';
 import { fetchChart } from './fetch_chart';

src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts

@@ -11,7 +11,7 @@ import type { IUiSettingsClient } from 'src/core/public';
 import type { DataPublicPluginStart } from 'src/plugins/data/public';
 import type { ISearchSource } from 'src/plugins/data/common';
 import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
-import type { SavedSearch, SortOrder } from '../../../../saved_searches/types';
+import type { LegacySavedSearch, SortOrder } from '../../../../saved_searches';
 import { getSortForSearchSource } from '../components/doc_table';
 import { AppState } from '../services/discover_state';
 
@@ -20,7 +20,7 @@ import { AppState } from '../services/discover_state';
  */
 export async function getSharingData(
   currentSearchSource: ISearchSource,
-  state: AppState | SavedSearch,
+  state: AppState | LegacySavedSearch,
   services: { uiSettings: IUiSettingsClient; data: DataPublicPluginStart }
 ) {
   const { uiSettings: config, data } = services;

src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts

@@ -9,13 +9,13 @@
 import { cloneDeep } from 'lodash';
 import { IUiSettingsClient } from 'kibana/public';
 import { DEFAULT_COLUMNS_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
-import { SavedSearch } from '../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../saved_searches';
 import { DataPublicPluginStart } from '../../../../../../data/public';
 
 import { AppState } from '../services/discover_state';
 import { getDefaultSort, getSortArray } from '../components/doc_table';
 
-function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient) {
+function getDefaultColumns(savedSearch: LegacySavedSearch, config: IUiSettingsClient) {
   if (savedSearch.columns && savedSearch.columns.length > 0) {
     return [...savedSearch.columns];
   }
@@ -29,7 +29,7 @@ export function getStateDefaults({
 }: {
   config: IUiSettingsClient;
   data: DataPublicPluginStart;
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
 }) {
   const searchSource = savedSearch.searchSource;
   const indexPattern = savedSearch.searchSource.getField('index');

src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts

@@ -8,17 +8,17 @@
 
 import { updateSearchSource } from './update_search_source';
 import { IndexPattern } from '../../../../../../data/public';
-import { SavedSearch } from '../../../../saved_searches';
+import { LegacySavedSearch } from '../../../../saved_searches';
 import { AppState } from '../services/discover_state';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { SavedObjectSaveOpts } from '../../../../../../saved_objects/public';
 import { DiscoverServices } from '../../../../build_services';
 
 /**
  * Helper function to update and persist the given savedSearch
  */
 export async function persistSavedSearch(
-  savedSearch: SavedSearch,
+  savedSearch: LegacySavedSearch,
   {
     indexPattern,
     onError,
@@ -28,7 +28,7 @@ export async function persistSavedSearch(
     state,
   }: {
     indexPattern: IndexPattern;
-    onError: (error: Error, savedSearch: SavedSearch) => void;
+    onError: (error: Error, savedSearch: LegacySavedSearch) => void;
     onSuccess: (id: string) => void;
     saveOptions: SavedObjectSaveOpts;
     services: DiscoverServices;

src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts

@@ -9,7 +9,7 @@
 import { updateSearchSource } from './update_search_source';
 import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 
 describe('updateSearchSource', () => {

src/plugins/discover/public/application/apps/main/utils/update_search_source.ts

@@ -8,7 +8,7 @@
 
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
 import { IndexPattern, ISearchSource } from '../../../../../../data/common';
-import { SortOrder } from '../../../../saved_searches/types';
+import type { SortOrder } from '../../../../saved_searches';
 import { DiscoverServices } from '../../../../build_services';
 import { getSortForSearchSource } from '../components/doc_table';
 

src/plugins/discover/public/application/embeddable/helpers/update_search_source.test.ts

@@ -8,7 +8,7 @@
 import { createSearchSourceMock } from '../../../../../data/common/search/search_source/mocks';
 import { updateSearchSource } from './update_search_source';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { SortOrder } from '../../../saved_searches/types';
+import type { SortOrder } from '../../../saved_searches';
 
 describe('updateSearchSource', () => {
   const defaults = {

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

@@ -13,7 +13,7 @@ import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
 import { Container, Embeddable } from '../../../../embeddable/public';
 import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
-import { SavedSearch } from '../../saved_searches';
+import { LegacySavedSearch } from '../../saved_searches';
 import { Adapters, RequestAdapter } from '../../../../inspector/common';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 import { APPLY_FILTER_TRIGGER, esFilters, FilterManager } from '../../../../data/public';
@@ -60,7 +60,7 @@ export type SearchProps = Partial<DiscoverGridProps> &
   };
 
 interface SearchEmbeddableConfig {
-  savedSearch: SavedSearch;
+  savedSearch: LegacySavedSearch;
   editUrl: string;
   editPath: string;
   indexPatterns?: IndexPattern[];
@@ -73,7 +73,7 @@ export class SavedSearchEmbeddable
   extends Embeddable<SearchInput, SearchOutput>
   implements ISearchEmbeddable
 {
-  private readonly savedSearch: SavedSearch;
+  private readonly savedSearch: LegacySavedSearch;
   private inspectorAdapters: Adapters;
   private panelTitle: string = '';
   private filtersSearchSource!: ISearchSource;
@@ -394,7 +394,7 @@ export class SavedSearchEmbeddable
     }
   }
 
-  public getSavedSearch(): SavedSearch {
+  public getSavedSearch(): LegacySavedSearch {
     return this.savedSearch;
   }