[Embeddable Rebuild] [Saved Search] Migrate saved search embeddable to new embeddable framework

packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts

@@ -12,24 +12,23 @@ import { CoreStart } from '@kbn/core/public';
 import { coreMock } from '@kbn/core/public/mocks';
 import type { SearchSource } from '@kbn/data-plugin/common';
 import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { PublishesSavedSearch } from '@kbn/discover-plugin/public';
 import { dataViewMock } from '@kbn/discover-utils/src/__mocks__';
 import { LicenseCheckState } from '@kbn/licensing-plugin/public';
 import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
-import type { SavedSearch } from '@kbn/saved-search-plugin/public';
+import { EmbeddableApiContext } from '@kbn/presentation-publishing';
 import { ReportingAPIClient } from '@kbn/reporting-public';
 import type { ClientConfigType } from '@kbn/reporting-public/types';
-import {
-  ActionContext,
-  type PanelActionDependencies,
-  ReportingCsvPanelAction,
-} from './get_csv_panel_action';
+import type { SavedSearch } from '@kbn/saved-search-plugin/public';
+import { BehaviorSubject } from 'rxjs';
+import { ReportingCsvPanelAction, type PanelActionDependencies } from './get_csv_panel_action';
 
 const core = coreMock.createSetup();
 let apiClient: ReportingAPIClient;
 
 describe('GetCsvReportPanelAction', () => {
   let csvConfig: ClientConfigType['csv'];
-  let context: ActionContext;
+  let context: EmbeddableApiContext;
   let mockLicenseState: LicenseCheckState;
   let mockSearchSource: SearchSource;
   let mockStartServicesPayload: [CoreStart, PanelActionDependencies, unknown];
@@ -93,9 +92,7 @@ describe('GetCsvReportPanelAction', () => {
     context = {
       embeddable: {
         type: 'search',
-        getSavedSearch: () => {
-          return { searchSource: mockSearchSource };
-        },
+        savedSearch$: new BehaviorSubject({ searchSource: mockSearchSource }),
         getTitle: () => `The Dude`,
         getInspectorAdapters: () => null,
         getInput: () => ({
@@ -106,8 +103,11 @@ describe('GetCsvReportPanelAction', () => {
           },
         }),
         hasTimeRange: () => true,
+        parentApi: {
+          viewMode: new BehaviorSubject('view'),
+        },
       },
-    } as unknown as ActionContext;
+    } as EmbeddableApiContext;
   });
 
   afterEach(() => {
@@ -145,12 +145,10 @@ describe('GetCsvReportPanelAction', () => {
       getField: jest.fn((name) => (name === 'index' ? dataViewMock : undefined)),
       getSerializedFields: jest.fn().mockImplementation(() => ({ testData: 'testDataValue' })),
     } as unknown as SearchSource;
-    context.embeddable.getSavedSearch = () => {
-      return {
-        searchSource: mockSearchSource,
-        columns: ['column_a', 'column_b'],
-      } as unknown as SavedSearch;
-    };
+    (context.embeddable as PublishesSavedSearch).savedSearch$ = new BehaviorSubject({
+      searchSource: mockSearchSource,
+      columns: ['column_a', 'column_b'],
+    } as unknown as SavedSearch);
 
     const panel = new ReportingCsvPanelAction({
       core,

packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx

@@ -17,31 +17,34 @@ import {
   ThemeServiceSetup,
 } from '@kbn/core/public';
 import { DataPublicPluginStart, SerializedSearchSourceFields } from '@kbn/data-plugin/public';
-import type { ISearchEmbeddable } from '@kbn/discover-plugin/public';
-import { loadSharingDataHelpers, SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-plugin/public';
-import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
+import {
+  loadSharingDataHelpers,
+  SEARCH_EMBEDDABLE_TYPE,
+  apiPublishesSavedSearch,
+  PublishesSavedSearch,
+  HasTimeRange,
+} from '@kbn/discover-plugin/public';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
-import { toMountPoint } from '@kbn/react-kibana-mount';
 import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
-import type { SavedSearch } from '@kbn/saved-search-plugin/public';
+import {
+  apiCanAccessViewMode,
+  apiHasType,
+  apiIsOfType,
+  CanAccessViewMode,
+  EmbeddableApiContext,
+  getInheritedViewMode,
+  HasType,
+} from '@kbn/presentation-publishing';
+import { toMountPoint } from '@kbn/react-kibana-mount';
+import { CSV_REPORTING_ACTION, JobAppParamsCSV } from '@kbn/reporting-export-types-csv-common';
+import { SavedSearch } from '@kbn/saved-search-plugin/public';
 import type { UiActionsActionDefinition as ActionDefinition } from '@kbn/ui-actions-plugin/public';
 import { IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
-
-import { CSV_REPORTING_ACTION, JobAppParamsCSV } from '@kbn/reporting-export-types-csv-common';
 import type { ClientConfigType } from '@kbn/reporting-public/types';
 import { checkLicense } from '@kbn/reporting-public/license_check';
 import type { ReportingAPIClient } from '@kbn/reporting-public/reporting_api_client';
-import { getI18nStrings } from './strings';
-
-function isSavedSearchEmbeddable(
-  embeddable: IEmbeddable | ISearchEmbeddable
-): embeddable is ISearchEmbeddable {
-  return embeddable.type === SEARCH_EMBEDDABLE_TYPE;
-}
 
-export interface ActionContext {
-  embeddable: ISearchEmbeddable;
-}
+import { getI18nStrings } from './strings';
 
 export interface PanelActionDependencies {
   data: DataPublicPluginStart;
@@ -79,7 +82,19 @@ interface ExecutionParams {
   i18nStart: I18nStart;
 }
 
-export class ReportingCsvPanelAction implements ActionDefinition<ActionContext> {
+type GetCsvActionApi = HasType & PublishesSavedSearch & CanAccessViewMode & HasTimeRange;
+
+const compatibilityCheck = (api: EmbeddableApiContext['embeddable']): api is GetCsvActionApi => {
+  return (
+    apiHasType(api) &&
+    apiIsOfType(api, SEARCH_EMBEDDABLE_TYPE) &&
+    apiPublishesSavedSearch(api) &&
+    apiCanAccessViewMode(api) &&
+    Boolean((api as unknown as HasTimeRange).hasTimeRange)
+  );
+};
+
+export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiContext> {
   private isDownloading: boolean;
   public readonly type = '';
   public readonly id = CSV_REPORTING_ACTION;
@@ -118,10 +133,10 @@ export class ReportingCsvPanelAction implements ActionDefinition<ActionContext>
     return await getSharingData(savedSearch.searchSource, savedSearch, { uiSettings, data });
   }
 
-  public isCompatible = async (context: ActionContext) => {
+  public isCompatible = async (context: EmbeddableApiContext) => {
     const { embeddable } = context;
 
-    if (embeddable.type !== 'search') {
+    if (!compatibilityCheck(embeddable)) {
       return false;
     }
 
@@ -138,7 +153,7 @@ export class ReportingCsvPanelAction implements ActionDefinition<ActionContext>
       return false;
     }
 
-    return embeddable.getInput().viewMode !== ViewMode.EDIT;
+    return getInheritedViewMode(embeddable) !== ViewMode.EDIT;
   };
 
   /**
@@ -240,14 +255,14 @@ export class ReportingCsvPanelAction implements ActionDefinition<ActionContext>
       });
   };
 
-  public execute = async (context: ActionContext) => {
+  public execute = async (context: EmbeddableApiContext) => {
     const { embeddable } = context;
 
-    if (!isSavedSearchEmbeddable(embeddable) || !(await this.isCompatible(context))) {
+    if (!compatibilityCheck(embeddable) || !(await this.isCompatible(context))) {
       throw new IncompatibleActionError();
     }
 
-    const savedSearch = embeddable.getSavedSearch();
+    const savedSearch = embeddable.savedSearch$.getValue();
 
     if (!savedSearch || this.isDownloading) {
       return;

packages/kbn-reporting/get_csv_panel_actions/tsconfig.json

@@ -27,5 +27,6 @@
     "@kbn/ui-actions-plugin",
     "@kbn/react-kibana-mount",
     "@kbn/reporting-public",
+    "@kbn/presentation-publishing",
   ]
 }

packages/kbn-reporting/public/tsconfig.json

@@ -2,17 +2,10 @@
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
-    "types": [
-      "jest",
-      "node"
-    ]
+    "types": ["jest", "node"]
   },
-  "include": [
-    "**/*.ts", "**/*.tsx"
-  ],
-  "exclude": [
-    "target/**/*"
-  ],
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["target/**/*"],
   "kbn_references": [
     "@kbn/reporting-common",
     "@kbn/core",

packages/kbn-unified-data-table/src/components/data_table.tsx

@@ -1062,6 +1062,7 @@ export const UnifiedDataTable = ({
           data-test-subj="discoverDocTable"
           data-render-complete={isRenderComplete}
           data-shared-item=""
+          data-rendering-count={1} // TODO: Fix this as part of https://github.com/elastic/kibana/issues/179376
           data-title={searchTitle}
           data-description={searchDescription}
           data-document-number={displayedRows.length}

src/plugins/discover/common/embeddable/search_inject_extract.test.ts

@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { SavedSearchByValueAttributes } from '@kbn/saved-search-plugin/public';
 import { extract, inject } from './search_inject_extract';
 
 describe('search inject extract', () => {
@@ -65,7 +66,7 @@ describe('search inject extract', () => {
         id: 'id',
         attributes: {
           references: [{ name: 'name', type: 'type', id: '1' }],
-        },
+        } as SavedSearchByValueAttributes,
       };
       expect(extract(state)).toEqual({
         state,

src/plugins/discover/common/embeddable/search_inject_extract.ts

@@ -7,13 +7,13 @@
  */
 
 import type { SavedObjectReference } from '@kbn/core-saved-objects-server';
-import type { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
-import type { SearchByValueInput } from '@kbn/saved-search-plugin/public';
+import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
+import type { SavedSearchByValueAttributes } from '@kbn/saved-search-plugin/public';
 
 export const inject = (
   state: EmbeddableStateWithType,
   injectedReferences: SavedObjectReference[]
-): EmbeddableStateWithType => {
+): EmbeddableStateWithType & { attributes?: SavedSearchByValueAttributes } => {
   if (hasAttributes(state)) {
     // Filter out references that are not in the state
     // https://github.com/elastic/kibana/pull/119079
@@ -36,7 +36,7 @@ export const inject = (
 };
 
 export const extract = (
-  state: EmbeddableStateWithType
+  state: EmbeddableStateWithType & { attributes?: SavedSearchByValueAttributes }
 ): { state: EmbeddableStateWithType; references: SavedObjectReference[] } => {
   let references: SavedObjectReference[] = [];
 
@@ -49,4 +49,5 @@ export const extract = (
 
 const hasAttributes = (
   state: EmbeddableStateWithType
-): state is EmbeddableStateWithType & SearchByValueInput => 'attributes' in state;
+): state is EmbeddableStateWithType & { attributes: SavedSearchByValueAttributes } =>
+  'attributes' in state;

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

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { Observable, of } from 'rxjs';
+import { BehaviorSubject, Observable, of } from 'rxjs';
 import { DiscoverServices } from '../build_services';
 import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
@@ -35,6 +35,7 @@ import { TopNavMenu } from '@kbn/navigation-plugin/public';
 import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 import { LocalStorageMock } from './local_storage_mock';
 import { createDiscoverDataViewsMock } from './data_views';
 import { SearchSourceDependencies } from '@kbn/data-plugin/common';
@@ -142,6 +143,7 @@ export function createDiscoverServicesMock(): DiscoverServices {
   const theme = themeServiceMock.createSetupContract({ darkMode: false });
 
   corePluginMock.theme = theme;
+  corePluginMock.chrome.getActiveSolutionNavId$.mockReturnValue(new BehaviorSubject(null));
 
   return {
     core: corePluginMock,
@@ -163,6 +165,7 @@ export function createDiscoverServicesMock(): DiscoverServices {
       PatternAnalysisComponent: jest.fn(() => createElement('div')),
     },
     docLinks: docLinksServiceMock.createStartContract(),
+    embeddable: embeddablePluginMock.createStartContract(),
     capabilities: {
       visualize: {
         show: true,

src/plugins/discover/public/application/main/data_fetching/fetch_esql.ts

@@ -8,7 +8,7 @@
 import { pluck } from 'rxjs';
 import { lastValueFrom } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import type { Query, AggregateQuery, Filter } from '@kbn/es-query';
+import { Query, AggregateQuery, Filter, TimeRange } from '@kbn/es-query';
 import type { Adapters } from '@kbn/inspector-plugin/common';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
@@ -30,6 +30,7 @@ export function fetchEsql({
   query,
   inputQuery,
   filters,
+  inputTimeRange,
   dataView,
   abortSignal,
   inspectorAdapters,
@@ -40,14 +41,15 @@ export function fetchEsql({
   query: Query | AggregateQuery;
   inputQuery?: Query;
   filters?: Filter[];
+  inputTimeRange?: TimeRange;
   dataView: DataView;
   abortSignal?: AbortSignal;
   inspectorAdapters: Adapters;
   data: DataPublicPluginStart;
   expressions: ExpressionsStart;
   profilesManager: ProfilesManager;
 }): Promise<RecordsFetchResponse> {
-  const timeRange = data.query.timefilter.timefilter.getTime();
+  const timeRange = inputTimeRange ?? data.query.timefilter.timefilter.getTime();
   return textBasedQueryStateToAstWithValidation({
     filters,
     query,

src/plugins/discover/public/components/doc_table/doc_table_embeddable.tsx

@@ -17,7 +17,7 @@ import {
   MAX_ROWS_PER_PAGE_OPTION,
 } from './components/pager/tool_bar_pagination';
 import { DocTableProps, DocTableRenderProps, DocTableWrapper } from './doc_table_wrapper';
-import { SavedSearchEmbeddableBase } from '../../embeddable/saved_search_embeddable_base';
+import { SavedSearchEmbeddableBase } from '../../embeddable/components/saved_search_embeddable_base';
 
 export interface DocTableEmbeddableProps extends Omit<DocTableProps, 'dataTestSubj'> {
   totalHitCount?: number;