From baeb7d4d25e860877cc9b09e2209104263a0ec1e Mon Sep 17 00:00:00 2001 From: Corey Robertson Date: Tue, 15 Oct 2019 14:57:48 -0400 Subject: [PATCH] [Canvas] Disable embeddables in canvas (#48102) (#48223) * Disable embeddables in canvas --- .../canvas_plugin_src/functions/common/index.ts | 14 ++++++++------ .../functions/common/saved_map.ts | 1 + .../functions/common/saved_search.ts | 1 + .../functions/common/saved_visualization.ts | 1 + .../strings/functions/function_help.ts | 4 ++++ .../components/workpad_header/workpad_header.tsx | 4 +++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts index 097aef69d4b4..894df9dc1c6b 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts @@ -47,9 +47,10 @@ import { rounddate } from './rounddate'; import { rowCount } from './rowCount'; import { repeatImage } from './repeatImage'; import { revealImage } from './revealImage'; -import { savedMap } from './saved_map'; -import { savedSearch } from './saved_search'; -import { savedVisualization } from './saved_visualization'; +// TODO: elastic/kibana#44822 Disabling pending filters work +// import { savedMap } from './saved_map'; +// import { savedSearch } from './saved_search'; +// import { savedVisualization } from './saved_visualization'; import { seriesStyle } from './seriesStyle'; import { shape } from './shape'; import { sort } from './sort'; @@ -106,9 +107,10 @@ export const functions = [ revealImage, rounddate, rowCount, - savedMap, - savedSearch, - savedVisualization, + // TODO: elastic/kibana#44822 Disabling pending filters work + // savedMap, + // savedSearch, + // savedVisualization, seriesStyle, shape, sort, diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts index c36a05e40570..8c8f53ad0d74 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts @@ -35,6 +35,7 @@ interface SavedMapInput extends EmbeddableInput { type Return = EmbeddableExpression; export function savedMap(): ExpressionFunction<'savedMap', Filter | null, Arguments, Return> { + // @ts-ignore elastic/kibana#44822 Disabling pending filters work const { help, args: argHelp } = getFunctionHelp().savedMap; return { name: 'savedMap', diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts index 40bf235761b9..72ab334e68ca 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts @@ -23,6 +23,7 @@ interface Arguments { type Return = EmbeddableExpression & { id: SearchInput['id'] }>; export function savedSearch(): ExpressionFunction<'savedSearch', Filter | null, Arguments, Return> { + // @ts-ignore elastic/kibana#44822 Disabling pending filters work const { help, args: argHelp } = getFunctionHelp().savedSearch; return { name: 'savedSearch', diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts index 930bdb74ee36..b3bc9b8ca69b 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts @@ -26,6 +26,7 @@ export function savedVisualization(): ExpressionFunction< Arguments, Return > { + // @ts-ignore elastic/kibana#44822 Disabling pending filters work const { help, args: argHelp } = getFunctionHelp().savedVisualization; return { name: 'savedVisualization', diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/strings/functions/function_help.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/strings/functions/function_help.ts index 302f97d06ebe..327865ad1c61 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/strings/functions/function_help.ts +++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/strings/functions/function_help.ts @@ -207,8 +207,12 @@ export const getFunctionHelp = (): FunctionHelpDict => ({ revealImage, rounddate, rowCount, + // TODO: elastic/kibana#44822 Disabling pending filters work + // @ts-ignore savedMap, + // @ts-ignore savedSearch, + // @ts-ignore savedVisualization, seriesStyle, shape, diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_header.tsx b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_header.tsx index 31ad0593f58b..b05e1f5b757c 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_header.tsx +++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_header.tsx @@ -13,7 +13,6 @@ import { EuiFlexGroup, EuiButtonIcon, EuiButton, - EuiButtonEmpty, EuiOverlayMask, EuiModal, EuiModalFooter, @@ -194,11 +193,14 @@ export class WorkpadHeader extends React.PureComponent { + {/* + TODO: elastic/kibana#44822 Disabling pending filters work {strings.getEmbedObjectButtonLabel()} + */}