Enable ML embeddables in Canvas

Fixed conditional Restore ml embeddable options
elastic · Oct 14, 2021 · c1fd1d7 · c1fd1d7
1 parent 1ec23f6
commit c1fd1d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/editor_menu.tsx
@@ -123,12 +123,7 @@ export const EditorMenu: FC<Props> = ({ addElement }) => {
  const factories = embeddablesService
  ? Array.from(embeddablesService.getEmbeddableFactories()).filter(
  ({ type, isEditable, canCreateNew, isContainerType }) =>
- isEditable() &&
- !isContainerType &&
- canCreateNew() &&
- !['visualization', 'ml'].some((factoryType) => {
- return type.includes(factoryType);
- })
+ isEditable() && !isContainerType && canCreateNew() && type !== 'visualization'
  )
  : [];
 

diff --git a/x-pack/plugins/canvas/public/index.ts b/x-pack/plugins/canvas/public/index.ts
@@ -9,9 +9,9 @@ import { PluginInitializerContext } from 'kibana/public';
 import { CoreStart } from '../../../../src/core/public';
 import { CanvasServices } from './services';
 import { CanvasSetup, CanvasStart, CanvasStartDeps, CanvasPlugin } from './plugin';
+export { CANVAS_APP } from '../common/lib/constants';
 
 export { CanvasSetup, CanvasStart };
-
 export interface WithKibanaProps {
  kibana: {
  services: CoreStart & CanvasStartDeps & { canvas: CanvasServices };

diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
@@ -33,6 +33,7 @@
  "server": true,
  "ui": true,
  "requiredBundles": [
+ "canvas",
  "esUiShared",
  "kibanaUtils",
  "kibanaReact",

diff --git a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
@@ -16,6 +16,7 @@ import {
 } from '../../../../../../src/plugins/kibana_react/public';
 import { getMlGlobalServices } from '../../application/app';
 import { DashboardConstants } from '../../../../../../src/plugins/dashboard/public';
+import { CANVAS_APP } from '../../../../../../x-pack/plugins/canvas/public';
 import { JobId } from '../../../common/types/anomaly_detection_jobs';
 import { JobSelectorFlyout } from './components/job_selector_flyout';
 
@@ -90,8 +91,8 @@ export async function resolveJobSelection(
  }
  ); // Close the flyout when user navigates out of the dashboard plugin
 
- currentAppId$.pipe(takeUntil(from(flyoutSession.onClose))).subscribe((appId) => {
- if (appId !== DashboardConstants.DASHBOARDS_ID) {
+ currentAppId$.pipe(takeUntil(from(flyoutSession.onClose))).subscribe((appId = '') => {
+ if (![DashboardConstants.DASHBOARDS_ID, CANVAS_APP].includes(appId)) {
  flyoutSession.close();
  }
  });