From 90a2007da4ec97efe96cf653f029bebeaa581708 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Thu, 13 Apr 2023 12:59:52 -0700 Subject: [PATCH 01/10] Use small buttons in editor toolbar Make controls button small Remove type --- .../src/buttons/add_from_library/add_from_library.tsx | 3 ++- .../buttons/icon_button_group/icon_button_group.tsx | 6 ++++-- .../src/buttons/toolbar_button/toolbar_button.tsx | 8 ++++++-- .../shared-ux/button_toolbar/src/popover/popover.tsx | 10 +++++++++- .../controls_toolbar_button.tsx | 1 + .../top_nav/dashboard_editing_toolbar.tsx | 8 +++++++- .../public/dashboard_app/top_nav/editor_menu.tsx | 1 + 7 files changed, 30 insertions(+), 7 deletions(-) diff --git a/packages/shared-ux/button_toolbar/src/buttons/add_from_library/add_from_library.tsx b/packages/shared-ux/button_toolbar/src/buttons/add_from_library/add_from_library.tsx index 87251bd19736cc..da1d3b8fc87116 100644 --- a/packages/shared-ux/button_toolbar/src/buttons/add_from_library/add_from_library.tsx +++ b/packages/shared-ux/button_toolbar/src/buttons/add_from_library/add_from_library.tsx @@ -22,12 +22,13 @@ const label = { /** * A button that acts to add an item from the library to a solution, typically through a modal. */ -export const AddFromLibraryButton = ({ onClick, ...rest }: Props) => ( +export const AddFromLibraryButton = ({ onClick, size = 'm', ...rest }: Props) => ( ); diff --git a/packages/shared-ux/button_toolbar/src/buttons/icon_button_group/icon_button_group.tsx b/packages/shared-ux/button_toolbar/src/buttons/icon_button_group/icon_button_group.tsx index ec80598328bc75..11d5192426cb63 100644 --- a/packages/shared-ux/button_toolbar/src/buttons/icon_button_group/icon_button_group.tsx +++ b/packages/shared-ux/button_toolbar/src/buttons/icon_button_group/icon_button_group.tsx @@ -42,6 +42,8 @@ export interface Props { legend: EuiButtonGroupProps['legend']; /** Array of `IconButton` */ buttons: IconButton[]; + /** Button size */ + buttonSize?: EuiButtonGroupProps['buttonSize']; } type Option = EuiButtonGroupOptionProps & Omit; @@ -49,7 +51,7 @@ type Option = EuiButtonGroupOptionProps & Omit; /** * A group of buttons each performing an action, represented by an icon. */ -export const IconButtonGroup = ({ buttons, legend }: Props) => { +export const IconButtonGroup = ({ buttons, legend, buttonSize = 'm' }: Props) => { const euiTheme = useEuiTheme(); const iconButtonGroupStyles = IconButtonGroupStyles(euiTheme); @@ -71,7 +73,7 @@ export const IconButtonGroup = ({ buttons, legend }: Props) => { return ( { + extends Pick< + EuiButtonPropsForButton, + 'onClick' | 'iconType' | 'iconSide' | 'size' | 'data-test-subj' + > { label: string; type?: ToolbarButtonTypes; } @@ -27,6 +30,7 @@ export const ToolbarButton: React.FunctionComponent = ({ label, type = 'empty', iconSide = 'left', + size = 'm', ...rest }) => { const euiTheme = useEuiTheme(); @@ -36,7 +40,7 @@ export const ToolbarButton: React.FunctionComponent = ({ : { color: 'text', css: ToolbarButtonStyles(euiTheme).emptyButton }; return ( - + {label} ); diff --git a/packages/shared-ux/button_toolbar/src/popover/popover.tsx b/packages/shared-ux/button_toolbar/src/popover/popover.tsx index 7e7f6c24e21740..89654e37c850af 100644 --- a/packages/shared-ux/button_toolbar/src/popover/popover.tsx +++ b/packages/shared-ux/button_toolbar/src/popover/popover.tsx @@ -29,7 +29,14 @@ export type Props = AllowedButtonProps & /** * A button which opens a popover of additional actions within the toolbar. */ -export const ToolbarPopover = ({ type, label, iconType, children, ...popover }: Props) => { +export const ToolbarPopover = ({ + type, + label, + iconType, + size = 'm', + children, + ...popover +}: Props) => { const [isOpen, setIsOpen] = useState(false); const onButtonClick = () => setIsOpen((status) => !status); @@ -38,6 +45,7 @@ export const ToolbarPopover = ({ type, label, iconType, children, ...popover }: const button = ( ); diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx index 22fd451e48a8da..18f13eeb461ee1 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx @@ -27,6 +27,7 @@ export function ControlsToolbarButton({ controlGroup }: { controlGroup: ControlG panelPaddingSize="none" label={getControlButtonTitle()} zIndex={Number(euiTheme.levels.header) - 1} + size="s" data-test-subj="dashboard-controls-menu-button" > {({ closePopover }: { closePopover: () => void }) => ( diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx index 708af176d785d4..89c1373e77f02d 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx @@ -176,6 +176,7 @@ export function DashboardEditingToolbar() { , dashboard.addFromLibrary()} + size="s" data-test-subj="dashboardAddPanelButton" />, ]; @@ -195,13 +196,18 @@ export function DashboardEditingToolbar() { ), iconButtonGroup: ( - + ), extraButtons, }} diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx index 084bda8fcd9e70..5f03be920110ff 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx @@ -270,6 +270,7 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => label={i18n.translate('dashboard.solutionToolbar.editorMenuButtonLabel', { defaultMessage: 'Select type', })} + size="s" panelPaddingSize="none" data-test-subj="dashboardEditorMenuButton" > From 0caec50acb3046c56c6611fd9c313fe4e930929e Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Wed, 28 Jun 2023 10:14:08 -0700 Subject: [PATCH 02/10] Remove quick buttons from editing toolbar --- .../top_nav/dashboard_editing_toolbar.tsx | 86 ++----------------- 1 file changed, 6 insertions(+), 80 deletions(-) diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx index 89c1373e77f02d..fb73392f2866e5 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx @@ -9,22 +9,13 @@ import { css } from '@emotion/react'; import React, { useCallback } from 'react'; import { METRIC_TYPE } from '@kbn/analytics'; -import { IconType, useEuiTheme } from '@elastic/eui'; - -import { - AddFromLibraryButton, - IconButton, - IconButtonGroup, - Toolbar, - ToolbarButton, -} from '@kbn/shared-ux-button-toolbar'; +import { useEuiTheme } from '@elastic/eui'; + +import { AddFromLibraryButton, Toolbar, ToolbarButton } from '@kbn/shared-ux-button-toolbar'; import { EmbeddableFactory } from '@kbn/embeddable-plugin/public'; import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public'; -import { - getCreateVisualizationButtonTitle, - getQuickCreateButtonGroupLegend, -} from '../_dashboard_app_strings'; +import { getCreateVisualizationButtonTitle } from '../_dashboard_app_strings'; import { EditorMenu } from './editor_menu'; import { useDashboardAPI } from '../dashboard_app'; import { pluginServices } from '../../services/plugin_services'; @@ -37,8 +28,8 @@ export function DashboardEditingToolbar() { usageCollection, data: { search }, notifications: { toasts }, - embeddable: { getStateTransfer, getEmbeddableFactory }, - visualizations: { get: getVisualization, getAliases: getVisTypeAliases }, + embeddable: { getStateTransfer }, + visualizations: { getAliases: getVisTypeAliases }, } = pluginServices.getServices(); const { euiTheme } = useEuiTheme(); @@ -47,13 +38,6 @@ export function DashboardEditingToolbar() { const stateTransferService = getStateTransfer(); const lensAlias = getVisTypeAliases().find(({ name }) => name === 'lens'); - const quickButtonVisTypes: Array< - { type: 'vis'; visType: string } | { type: 'embeddable'; embeddableType: string } - > = [ - { type: 'vis', visType: 'markdown' }, - { type: 'embeddable', embeddableType: 'image' }, - { type: 'vis', visType: 'maps' }, - ]; const trackUiMetric = usageCollection.reportUiCounter?.bind( usageCollection, @@ -121,57 +105,6 @@ export function DashboardEditingToolbar() { [trackUiMetric, dashboard, toasts] ); - const getVisTypeQuickButton = ( - quickButtonForType: typeof quickButtonVisTypes[0] - ): IconButton | undefined => { - if (quickButtonForType.type === 'vis') { - const visTypeName = quickButtonForType.visType; - const visType = - getVisualization(visTypeName) || - getVisTypeAliases().find(({ name }) => name === visTypeName); - - if (visType) { - if ('aliasPath' in visType) { - const { name, icon, title } = visType as VisTypeAlias; - return { - label: title, - iconType: icon, - onClick: createNewVisType(visType as VisTypeAlias), - 'data-test-subj': `dashboardQuickButton${name}`, - }; - } else { - const { name, icon, title, titleInWizard } = visType as BaseVisType & { icon: IconType }; - return { - label: titleInWizard || title, - iconType: icon, - onClick: createNewVisType(visType as BaseVisType), - 'data-test-subj': `dashboardQuickButton${name}`, - }; - } - } - } else { - const embeddableType = quickButtonForType.embeddableType; - const embeddableFactory = getEmbeddableFactory(embeddableType); - if (embeddableFactory) { - return { - label: embeddableFactory.getDisplayName(), - iconType: embeddableFactory.getIconType(), - onClick: () => { - if (embeddableFactory) { - createNewEmbeddable(embeddableFactory); - } - }, - 'data-test-subj': `dashboardQuickButton${embeddableType}`, - }; - } - } - }; - - const quickButtons: IconButton[] = quickButtonVisTypes.reduce((accumulator, type) => { - const button = getVisTypeQuickButton(type); - return button ? [...accumulator, button] : accumulator; - }, [] as IconButton[]); - const extraButtons = [ , ), - iconButtonGroup: ( - - ), extraButtons, }} From 1df3a93f97bbf102c490e5c75da6c2a20ebcede4 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Wed, 28 Jun 2023 10:14:30 -0700 Subject: [PATCH 03/10] Rename editor menu button label --- .../dashboard/public/dashboard_app/top_nav/editor_menu.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx index 5f03be920110ff..eb7e5cbd861add 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx @@ -268,9 +268,10 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => repositionOnScroll ownFocus label={i18n.translate('dashboard.solutionToolbar.editorMenuButtonLabel', { - defaultMessage: 'Select type', + defaultMessage: 'Add panel', })} size="s" + iconType="plusInCircle" panelPaddingSize="none" data-test-subj="dashboardEditorMenuButton" > From 38986d49b12254425851d4552ff28fc7b17abf7e Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Thu, 29 Jun 2023 11:06:38 -0700 Subject: [PATCH 04/10] Update icons --- .../controls_toolbar_button/add_time_slider_control_button.tsx | 2 +- .../top_nav/controls_toolbar_button/controls_toolbar_button.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/add_time_slider_control_button.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/add_time_slider_control_button.tsx index cbd514be8ba135..a3a9cf7ce73d82 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/add_time_slider_control_button.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/add_time_slider_control_button.tsx @@ -43,7 +43,7 @@ export const AddTimeSliderControlButton = ({ closePopover, controlGroup, ...rest return ( { await controlGroup.addTimeSliderControl(); dashboard.scrollToTop(); diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx index 18f13eeb461ee1..bcb193f9cc1e32 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/controls_toolbar_button/controls_toolbar_button.tsx @@ -28,6 +28,7 @@ export function ControlsToolbarButton({ controlGroup }: { controlGroup: ControlG label={getControlButtonTitle()} zIndex={Number(euiTheme.levels.header) - 1} size="s" + iconType="controlsHorizontal" data-test-subj="dashboard-controls-menu-button" > {({ closePopover }: { closePopover: () => void }) => ( From a417af23963b37baaf06210be50d8e4df6189362 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Fri, 30 Jun 2023 14:47:13 -0700 Subject: [PATCH 05/10] Remove quick button function test --- .../group1/create_and_add_embeddables.ts | 15 --------------- test/functional/services/dashboard/add_panel.ts | 11 ++++------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts b/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts index c4d3c9c6e6ad12..bc79023bd51b72 100644 --- a/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts +++ b/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts @@ -103,21 +103,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.dashboard.waitForRenderComplete(); }); - it('adds a markdown visualization via the quick button', async () => { - const originalPanelCount = await PageObjects.dashboard.getPanelCount(); - await dashboardAddPanel.clickMarkdownQuickButton(); - await PageObjects.visualize.saveVisualizationExpectSuccess( - 'visualization from markdown quick button', - { redirectToOrigin: true } - ); - - await retry.try(async () => { - const panelCount = await PageObjects.dashboard.getPanelCount(); - expect(panelCount).to.eql(originalPanelCount + 1); - }); - await PageObjects.dashboard.waitForRenderComplete(); - }); - it('saves the listing page instead of the visualization to the app link', async () => { await PageObjects.header.clickVisualize(true); const currentUrl = await browser.getCurrentUrl(); diff --git a/test/functional/services/dashboard/add_panel.ts b/test/functional/services/dashboard/add_panel.ts index f214eaf7a7b5af..c85210e06e29e2 100644 --- a/test/functional/services/dashboard/add_panel.ts +++ b/test/functional/services/dashboard/add_panel.ts @@ -38,17 +38,14 @@ export class DashboardAddPanelService extends FtrService { }); } - async clickQuickButton(visType: string) { - this.log.debug(`DashboardAddPanel.clickQuickButton${visType}`); - await this.testSubjects.click(`dashboardQuickButton${visType}`); - } - async clickMarkdownQuickButton() { - await this.clickQuickButton('markdown'); + await this.clickEditorMenuButton(); + await this.clickVisType('markdown'); } async clickMapQuickButton() { - await this.clickQuickButton('map'); + await this.clickEditorMenuButton(); + await this.clickVisType('map'); } async clickEditorMenuButton() { From 2ecbbd06d83926eb8e3ecc231ce7e0caa543d387 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Fri, 30 Jun 2023 14:52:22 -0700 Subject: [PATCH 06/10] Change order of add panel menu items --- .../dashboard_app/top_nav/editor_menu.tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx index eb7e5cbd861add..7ed106cc21ac79 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx @@ -87,16 +87,18 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => const getSortedVisTypesByGroup = (group: VisGroups) => getVisTypesByGroup(group) - .sort(({ name: a }: BaseVisType | VisTypeAlias, { name: b }: BaseVisType | VisTypeAlias) => { - if (a < b) { + .sort((a: BaseVisType | VisTypeAlias, b: BaseVisType | VisTypeAlias) => { + const labelA = 'titleInWizard' in a ? a.titleInWizard || a.title : a.title; + const labelB = 'titleInWizard' in b ? b.titleInWizard || a.title : a.title; + if (labelA < labelB) { return -1; } - if (a > b) { + if (labelA > labelB) { return 1; } return 0; }) - .filter(({ disableCreate, stage }: BaseVisType) => !disableCreate); + .filter(({ disableCreate }: BaseVisType) => !disableCreate); const promotedVisTypes = getSortedVisTypesByGroup(VisGroups.PROMOTED); const aggsBasedVisTypes = getSortedVisTypesByGroup(VisGroups.AGGBASED); @@ -106,6 +108,8 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => a === b ? 0 : a ? -1 : 1 ); + console.log({ promotedVisTypes }); + const factories = unwrappedEmbeddableFactories.filter( ({ isEditable, factory: { type, canCreateNew, isContainerType } }) => isEditable && !isContainerType && canCreateNew() && type !== 'visualization' @@ -141,6 +145,7 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => } else { ungroupedFactories.push(factory); } + console.log({ grouping }); }); const getVisTypeMenuItem = (visType: BaseVisType): EuiContextMenuPanelItemDescriptor => { @@ -220,15 +225,17 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => const getEditorMenuPanels = (closePopover: () => void) => { const initialPanelItems = [ ...visTypeAliases.map(getVisTypeAliasMenuItem), + ...toolVisTypes.map(getVisTypeMenuItem), + ...ungroupedFactories.map((factory) => { + return getEmbeddableFactoryMenuItem(factory, closePopover); + }), ...Object.values(factoryGroupMap).map(({ id, appName, icon, panelId }) => ({ name: appName, icon, panel: panelId, 'data-test-subj': `dashboardEditorMenu-${id}Group`, })), - ...ungroupedFactories.map((factory) => { - return getEmbeddableFactoryMenuItem(factory, closePopover); - }), + ...promotedVisTypes.map(getVisTypeMenuItem), ]; if (aggsBasedVisTypes.length > 0) { @@ -239,7 +246,6 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => 'data-test-subj': `dashboardEditorAggBasedMenuItem`, }); } - initialPanelItems.push(...toolVisTypes.map(getVisTypeMenuItem)); return [ { From 9f4119da463c0f85330390391276bca8949fdbc5 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Fri, 30 Jun 2023 15:19:01 -0700 Subject: [PATCH 07/10] Remove console log --- .../dashboard/public/dashboard_app/top_nav/editor_menu.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx index 7ed106cc21ac79..74187332f032e6 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx @@ -108,8 +108,6 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => a === b ? 0 : a ? -1 : 1 ); - console.log({ promotedVisTypes }); - const factories = unwrappedEmbeddableFactories.filter( ({ isEditable, factory: { type, canCreateNew, isContainerType } }) => isEditable && !isContainerType && canCreateNew() && type !== 'visualization' From aac7f06cc5639b2cbec2058522926829f73fc31c Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Fri, 30 Jun 2023 20:44:48 -0700 Subject: [PATCH 08/10] Fix image embeddable fn test --- .../dashboard_elements/image_embeddable/image_embeddable.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts b/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts index de2d962ae854df..9d99c25176c672 100644 --- a/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts +++ b/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts @@ -12,6 +12,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'dashboard', 'discover', 'header']); const testSubjects = getService('testSubjects'); + const dashboardAddPanel = getService('dashboardAddPanel'); const kibanaServer = getService('kibanaServer'); const retry = getService('retry'); @@ -36,6 +37,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should create an image embeddable', async () => { // create an image embeddable + await dashboardAddPanel.clickEditorMenuButton(); + await dashboardAddPanel.clickAddNewEmbeddableLink('image'); await testSubjects.click(`dashboardQuickButtonimage`); await testSubjects.exists(`createImageEmbeddableFlyout`); await PageObjects.common.setFileInputPath(require.resolve('./elastic_logo.png')); From e837cf30fc9f5982f2b1faa1e1db86f8fc6b395f Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Fri, 30 Jun 2023 20:45:18 -0700 Subject: [PATCH 09/10] Remove console log --- .../dashboard/public/dashboard_app/top_nav/editor_menu.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx index 74187332f032e6..9512d837e61be8 100644 --- a/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx +++ b/src/plugins/dashboard/public/dashboard_app/top_nav/editor_menu.tsx @@ -143,7 +143,6 @@ export const EditorMenu = ({ createNewVisType, createNewEmbeddable }: Props) => } else { ungroupedFactories.push(factory); } - console.log({ grouping }); }); const getVisTypeMenuItem = (visType: BaseVisType): EuiContextMenuPanelItemDescriptor => { From 254ca50aff1d437c937d2356509dd7e46602c212 Mon Sep 17 00:00:00 2001 From: Catherine Liu Date: Wed, 5 Jul 2023 08:03:38 -0700 Subject: [PATCH 10/10] Fix image embeddable test --- .../apps/dashboard_elements/image_embeddable/image_embeddable.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts b/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts index 9d99c25176c672..caf229e8335bb3 100644 --- a/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts +++ b/test/functional/apps/dashboard_elements/image_embeddable/image_embeddable.ts @@ -39,7 +39,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // create an image embeddable await dashboardAddPanel.clickEditorMenuButton(); await dashboardAddPanel.clickAddNewEmbeddableLink('image'); - await testSubjects.click(`dashboardQuickButtonimage`); await testSubjects.exists(`createImageEmbeddableFlyout`); await PageObjects.common.setFileInputPath(require.resolve('./elastic_logo.png')); await testSubjects.clickWhenNotDisabled(`imageEmbeddableEditorSave`);