decouple anomaly job creation action from Embeddable framework

x-pack/plugins/lens/public/embeddable/index.ts

@@ -7,4 +7,4 @@
 
 export * from './embeddable';
 
-export { type HasLensConfig, apiHasLensConfig } from './interfaces/has_lens_config';
+export { type HasLensConfig, type LensApi, apiHasLensConfig } from './interfaces/has_lens_config';

x-pack/plugins/lens/public/embeddable/interfaces/has_lens_config.ts

@@ -5,14 +5,25 @@
  * 2.0.
  */
 
-import { type HasType, apiIsOfType } from '@kbn/presentation-publishing';
+import type {
+  HasParentApi,
+  HasType,
+  PublishesLocalUnifiedSearch,
+  PublishesPanelTitle,
+} from '@kbn/presentation-publishing';
+import { apiIsOfType } from '@kbn/presentation-publishing';
 import { LensSavedObjectAttributes } from '../embeddable';
 
 export type HasLensConfig = HasType<'lens'> & {
   getSavedVis: () => Readonly<LensSavedObjectAttributes | undefined>;
 };
 
-export const apiHasLensConfig = (api: unknown): api is HasLensConfig => {
+export type LensApi = HasLensConfig &
+  PublishesPanelTitle &
+  PublishesLocalUnifiedSearch &
+  Partial<HasParentApi<unknown>>;
+
+export const apiHasLensConfig = (api: unknown): api is LensApi => {
   return Boolean(
     api && apiIsOfType(api, 'lens') && typeof (api as HasLensConfig).getSavedVis === 'function'
   );

x-pack/plugins/lens/public/index.ts

@@ -111,6 +111,7 @@ export type { InlineEditLensEmbeddableContext } from './trigger_actions/open_len
 
 export type {
   HasLensConfig,
+  LensApi,
   LensEmbeddableInput,
   LensSavedObjectAttributes,
   Embeddable,

x-pack/plugins/maps/public/embeddable/has_map_config.ts

@@ -0,0 +1,32 @@
+/*
+ * 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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  HasParentApi,
+  HasType,
+  PublishesDataViews,
+  PublishesPanelTitle,
+  PublishesLocalUnifiedSearch,
+} from '@kbn/presentation-publishing';
+import { apiIsOfType } from '@kbn/presentation-publishing';
+import type { ILayer } from '../classes/layers/layer';
+
+export type HasMapConfig = HasType<'map'> & {
+  getLayerList: () => ILayer[];
+};
+
+export type MapApi = HasMapConfig &
+  PublishesDataViews &
+  PublishesPanelTitle &
+  PublishesLocalUnifiedSearch &
+  Partial<HasParentApi<unknown>>;
+
+export const apiHasMapConfig = (api: unknown): api is MapApi => {
+  return Boolean(
+    api && apiIsOfType(api, 'map') && typeof (api as HasMapConfig).getLayerList === 'function'
+  );
+};

x-pack/plugins/maps/public/index.ts

@@ -28,6 +28,7 @@ export type {
 export type { MapsSetupApi, MapsStartApi } from './api';
 
 export type { MapEmbeddable, MapEmbeddableInput, MapEmbeddableOutput } from './embeddable';
+export { type HasMapConfig, type MapApi, apiHasMapConfig } from './embeddable/has_map_config';
 
 export type { EMSTermJoinConfig, SampleValuesConfig } from './ems_autosuggest';
 

x-pack/plugins/ml/public/application/jobs/new_job/job_from_dashboard/index.ts

@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { QuickJobCreatorBase, isLensEmbeddable, isMapEmbeddable } from './quick_create_job_base';
+export { QuickJobCreatorBase } from './quick_create_job_base';
 export type { CreateState } from './quick_create_job_base';

x-pack/plugins/ml/public/application/jobs/new_job/job_from_dashboard/quick_create_job_base.ts

@@ -14,26 +14,15 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { DashboardLocatorParams, DashboardStart } from '@kbn/dashboard-plugin/public';
 import type { Filter, Query, DataViewBase } from '@kbn/es-query';
 import { FilterStateStore } from '@kbn/es-query';
-import type { Embeddable } from '@kbn/lens-plugin/public';
-import type { MapEmbeddable } from '@kbn/maps-plugin/public';
 import type { ErrorType } from '@kbn/ml-error-utils';
+import type { DashboardApi } from '../../../../ui_actions/types';
 import type { MlApiServices } from '../../../services/ml_api_service';
 import type { Job, Datafeed } from '../../../../../common/types/anomaly_detection_jobs';
 import { getFiltersForDSLQuery } from '../../../../../common/util/job_utils';
 import { CREATED_BY_LABEL } from '../../../../../common/constants/new_job';
 import { createQueries } from '../utils/new_job_utils';
 import { createDatafeedId } from '../../../../../common/util/job_utils';
 
-export function isLensEmbeddable(arg: any): arg is Embeddable {
-  return arg.hasOwnProperty('type') && arg.type === 'lens';
-}
-
-export function isMapEmbeddable(arg: any): arg is MapEmbeddable {
-  return arg.hasOwnProperty('type') && arg.type === 'map';
-}
-
-export type Dashboard = Embeddable['parent'];
-
 interface CreationState {
   success: boolean;
   error?: ErrorType;
@@ -83,7 +72,7 @@ export class QuickJobCreatorBase {
     end: number | undefined;
     startJob: boolean;
     runInRealTime: boolean;
-    dashboard?: Dashboard;
+    dashboard?: DashboardApi;
   }) {
     const datafeedId = createDatafeedId(jobId);
     const datafeed = { ...datafeedConfig, job_id: jobId, datafeed_id: datafeedId };
@@ -230,23 +219,14 @@ export class QuickJobCreatorBase {
     return mergedQueries;
   }
 
-  private async createDashboardLink(dashboard: Dashboard, datafeedConfig: estypes.MlDatafeed) {
-    const dashboardTitle = dashboard?.getTitle();
-    if (dashboardTitle === undefined || dashboardTitle === '') {
-      // embeddable may have not been in a dashboard
-      // and my not have been given a title as it is unsaved.
-      return null;
-    }
-
-    const findDashboardsService = await this.dashboardService.findDashboardsService();
-    // find the dashboard from the dashboard service as the dashboard passed in may not have the correct id
-    const foundDashboard = await findDashboardsService.findByTitle(dashboardTitle);
-    if (foundDashboard === undefined) {
+  private async createDashboardLink(dashboard: DashboardApi, datafeedConfig: estypes.MlDatafeed) {
+    const savedObjectId = dashboard.savedObjectId?.value;
+    if (!savedObjectId) {
       return null;
     }
 
     const params: DashboardLocatorParams = {
-      dashboardId: foundDashboard.id,
+      dashboardId: savedObjectId,
       timeRange: {
         from: '$earliest$',
         to: '$latest$',
@@ -268,13 +248,13 @@ export class QuickJobCreatorBase {
     const url = `${location.app}${location.path}`;
     const urlName = i18n.translate('xpack.ml.newJob.fromLens.createJob.namedUrlDashboard', {
       defaultMessage: 'Open {dashboardTitle}',
-      values: { dashboardTitle },
+      values: { dashboardTitle: dashboard.panelTitle?.value ?? 'dashboard' },
     });
 
     return { url_name: urlName, url_value: url, time_range: 'auto' };
   }
 
-  private async getCustomUrls(dashboard: Dashboard, datafeedConfig: estypes.MlDatafeed) {
+  private async getCustomUrls(dashboard: DashboardApi, datafeedConfig: estypes.MlDatafeed) {
     const customUrls = await this.createDashboardLink(dashboard, datafeedConfig);
     return dashboard !== undefined && customUrls !== null ? { custom_urls: [customUrls] } : {};
   }

x-pack/plugins/ml/public/application/jobs/new_job/job_from_lens/index.ts

@@ -13,4 +13,5 @@ export {
   getJobsItemsFromEmbeddable,
   isCompatibleVisualizationType,
   redirectToADJobWizards,
+  getChartInfoFromVisualization,
 } from './utils';

x-pack/plugins/ml/public/application/jobs/new_job/job_from_lens/quick_create_job.ts

@@ -8,15 +8,14 @@
 import { i18n } from '@kbn/i18n';
 import type {
   ChartInfo,
-  Embeddable,
   LensPublicStart,
   LensSavedObjectAttributes,
 } from '@kbn/lens-plugin/public';
 import type { IUiSettingsClient } from '@kbn/core/public';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import type { Filter, Query } from '@kbn/es-query';
 import type { DashboardStart } from '@kbn/dashboard-plugin/public';
-
+import type { LensApi } from '@kbn/lens-plugin/public';
 import type { JobCreatorType } from '../common/job_creator';
 import { createEmptyJob, createEmptyDatafeed } from '../common/job_creator/util/default_configs';
 import { stashJobForCloning } from '../common/job_creator/util/general';
@@ -49,7 +48,7 @@ export class QuickLensJobCreator extends QuickJobCreatorBase {
   public async createAndSaveJob(
     jobId: string,
     bucketSpan: string,
-    embeddable: Embeddable,
+    embeddable: LensApi,
     startJob: boolean,
     runInRealTime: boolean,
     layerIndex: number

x-pack/plugins/ml/public/application/jobs/new_job/job_from_lens/utils.ts

@@ -7,18 +7,20 @@
 
 import { i18n } from '@kbn/i18n';
 import type {
-  Embeddable,
   LensPublicStart,
   DataType,
   ChartInfo,
   LensSavedObjectAttributes,
 } from '@kbn/lens-plugin/public';
+import type { Query } from '@kbn/es-query';
+import { apiIsOfType } from '@kbn/presentation-publishing';
 import type { SerializableRecord } from '@kbn/utility-types';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
 import { layerTypes } from '@kbn/lens-plugin/public';
 import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import { ML_JOB_AGGREGATION } from '@kbn/ml-anomaly-utils';
-
+import type { LensApi } from '@kbn/lens-plugin/public';
+import type { DashboardApi } from '../../../../ui_actions/types';
 import { ML_PAGES, ML_APP_LOCATOR } from '../../../../../common/constants/locator';
 
 export const COMPATIBLE_SERIES_TYPES = [
@@ -43,7 +45,7 @@ export const COMPATIBLE_SPLIT_FIELD_TYPES: DataType[] = [
 ];
 
 export async function redirectToADJobWizards(
-  embeddable: Embeddable,
+  embeddable: LensApi,
   layerIndex: number,
   share: SharePluginStart,
   lens: LensPublicStart
@@ -66,7 +68,7 @@ export async function redirectToADJobWizards(
   window.open(url, '_blank');
 }
 
-export async function getJobsItemsFromEmbeddable(embeddable: Embeddable, lens?: LensPublicStart) {
+export async function getJobsItemsFromEmbeddable(embeddable: LensApi, lens?: LensPublicStart) {
   if (!lens) {
     throw Error(
       i18n.translate('xpack.ml.newJob.fromLens.createJob.error.lensNotFound', {
@@ -75,18 +77,18 @@ export async function getJobsItemsFromEmbeddable(embeddable: Embeddable, lens?:
     );
   }
 
-  const { filters, timeRange, ...input } = embeddable.getInput();
-  const query = input.query === undefined ? { query: '', language: 'kuery' } : input.query;
+  const dashboardApi = apiIsOfType(embeddable.parentApi, 'dashboard')
+    ? (embeddable.parentApi as DashboardApi)
+    : undefined;
 
+  const timeRange = embeddable.localTimeRange?.value ?? dashboardApi?.localTimeRange?.value;
   if (timeRange === undefined) {
     throw Error(
       i18n.translate('xpack.ml.newJob.fromLens.createJob.error.noTimeRange', {
         defaultMessage: 'Time range not specified.',
       })
     );
   }
-  const { to, from } = timeRange;
-
   const vis = embeddable.getSavedVis();
 
   if (vis === undefined) {
@@ -97,17 +99,14 @@ export async function getJobsItemsFromEmbeddable(embeddable: Embeddable, lens?:
     );
   }
 
-  const chartInfo = await getChartInfoFromVisualization(lens, vis);
-  const dashboard = embeddable.parent?.type === 'dashboard' ? embeddable.parent : undefined;
-
   return {
     vis,
-    chartInfo,
-    from,
-    to,
-    query,
-    filters,
-    dashboard,
+    chartInfo: await getChartInfoFromVisualization(lens, vis),
+    from: timeRange.from,
+    to: timeRange.to,
+    query: (dashboardApi?.localQuery?.value as Query) ?? { query: '', language: 'kuery' },
+    filters: dashboardApi?.localFilters?.value ?? [],
+    dashboard: dashboardApi,
   };
 }
 
@@ -238,7 +237,7 @@ export function createDetectors(
 export async function getChartInfoFromVisualization(
   lens: LensPublicStart,
   vis: LensSavedObjectAttributes
-) {
+): Promise<ChartInfo> {
   const chartInfo = await (await (await lens.stateHelperApi()).chartInfo).getChartInfo(vis);
   if (!chartInfo) {
     throw new Error('Cannot create job, chart info is undefined');

x-pack/plugins/ml/public/application/jobs/new_job/job_from_lens/visualization_extractor.ts

@@ -5,12 +5,11 @@
  * 2.0.
  */
 
-import type { Embeddable, LensPublicStart, ChartInfo } from '@kbn/lens-plugin/public';
+import type { LensPublicStart, ChartInfo } from '@kbn/lens-plugin/public';
 import { layerTypes } from '@kbn/lens-plugin/public';
-
 import { i18n } from '@kbn/i18n';
-
 import type { ErrorType } from '@kbn/ml-error-utils';
+import type { LensApi } from '@kbn/lens-plugin/public';
 import { JOB_TYPE } from '../../../../../common/constants/new_job';
 import {
   getVisTypeFactory,
@@ -39,7 +38,7 @@ export class VisualizationExtractor {
   constructor() {}
 
   public async getResultLayersFromEmbeddable(
-    embeddable: Embeddable,
+    embeddable: LensApi,
     lens: LensPublicStart
   ): Promise<LayerResult[]> {
     const { chartInfo } = await getJobsItemsFromEmbeddable(embeddable, lens);

x-pack/plugins/ml/public/application/jobs/new_job/job_from_map/quick_create_job.ts

@@ -6,13 +6,12 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import type { MapEmbeddable } from '@kbn/maps-plugin/public';
 import type { IUiSettingsClient } from '@kbn/core/public';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import type { Filter, Query } from '@kbn/es-query';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DashboardStart } from '@kbn/dashboard-plugin/public';
-
+import type { MapApi } from '@kbn/maps-plugin/public';
 import type { MlApiServices } from '../../../services/ml_api_service';
 import { getDataViews } from '../../../util/dependency_cache';
 import {
@@ -62,7 +61,7 @@ export class QuickGeoJobCreator extends QuickJobCreatorBase {
   }: {
     jobId: string;
     bucketSpan: string;
-    embeddable: MapEmbeddable;
+    embeddable: MapApi;
     startJob: boolean;
     runInRealTime: boolean;
     dataViewId?: string;
@@ -80,8 +79,8 @@ export class QuickGeoJobCreator extends QuickJobCreatorBase {
     } = await getJobsItemsFromEmbeddable(embeddable);
 
     // Map level stuff
-    const embeddableQuery = (await embeddable.getQuery()) ?? getDefaultQuery();
-    const embeddableFilters = (await embeddable.getFilters()) ?? [];
+    const embeddableQuery = (embeddable.localQuery?.value as Query) ?? getDefaultQuery();
+    const embeddableFilters = embeddable.localFilters?.value ?? [];
 
     if (dashboardQuery === undefined || dashboardFilters === undefined) {
       throw new Error('Cannot create job, query and filters are undefined');