Fixed embeds test

elastic · Mar 13, 2020 · d487046 · d487046
1 parent d694ed8
commit d487046
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -27,6 +27,7 @@ import { EmbeddableInput } from '../../expression_types';
 import { RendererHandlers } from '../../../types';
 import { canUserWrite, getFullscreen } from '../../../public/state/selectors/app';
 import { isWriteable } from '../../../public/state/selectors/workpad';
+import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../common/lib';
 
 const { embeddable: strings } = RendererStrings;
 
@@ -40,7 +41,7 @@ const embeddablesRegistry: {
 const renderEmbeddable = (embeddableObject: IEmbeddable, domNode: HTMLElement) => {
   return (
     <div
-      className="canvasEmbeddable"
+      className={CANVAS_EMBEDDABLE_CLASSNAME}
       style={{ width: domNode.offsetWidth, height: domNode.offsetHeight, cursor: 'auto' }}
     >
       <I18nContext>

diff --git a/...gins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts b/...gins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts
@@ -110,7 +110,7 @@ describe('input to expression', () => {
       const expression = embeddableInputToExpression(input, EmbeddableTypes.map);
       const ast = fromExpression(expression);
 
-      expect(ast.chain[0].arguments).toHaveProperty('title', input.title);
+      expect(ast.chain[0].arguments).toHaveProperty('title', [input.title]);
       expect(ast.chain[0].arguments).toHaveProperty('timerange');
 
       const timerangeExpression = ast.chain[0].arguments.timerange[0] as Ast;

diff --git a/x-pack/legacy/plugins/canvas/common/lib/constants.ts b/x-pack/legacy/plugins/canvas/common/lib/constants.ts
@@ -39,3 +39,4 @@ export const API_ROUTE_SHAREABLE_BASE = '/public/canvas';
 export const API_ROUTE_SHAREABLE_ZIP = '/public/canvas/zip';
 export const API_ROUTE_SHAREABLE_RUNTIME = '/public/canvas/runtime';
 export const API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD = `/public/canvas/${SHAREABLE_RUNTIME_NAME}.js`;
+export const CANVAS_EMBEDDABLE_CLASSNAME = `canvasEmbeddable`;
diff --git a/...ck/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js b/...ck/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js
@@ -19,6 +19,7 @@ import {
 } from '../../../state/actions/elements';
 import { selectToplevelNodes } from '../../../state/actions/transient';
 import { crawlTree, globalStateUpdater, shapesForNodes } from '../integration_utils';
+import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../../common/lib';
 import { InteractiveWorkpadPage as InteractiveComponent } from './interactive_workpad_page';
 import { eventHandlers } from './event_handlers';
 
@@ -79,9 +80,14 @@ const isEmbeddableBody = element => {
   const hasClosest = typeof element.closest === 'function';
 
   if (hasClosest) {
-    return element.closest('.embeddable') && !element.closest('.embPanel__header');
+    return (
+      element.closest(`.${CANVAS_EMBEDDABLE_CLASSNAME}`) && !element.closest('.embPanel__header')
+    );
   } else {
-    return closest.call(element, '.embeddable') && !closest.call(element, '.embPanel__header');
+    return (
+      closest.call(element, `.${CANVAS_EMBEDDABLE_CLASSNAME}`) &&
+      !closest.call(element, '.embPanel__header')
+    );
   }
 };