Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bugfix] Add panel flyout opens 2 flyouts #65861

Merged
merged 2 commits into from
May 11, 2020
Merged

[bugfix] Add panel flyout opens 2 flyouts #65861

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9111716
fix double flyouts in add panel flow
Dosant May 8, 2020
dd07e05
Merge branch 'master' into dev/fix-add-panel-flyout
elasticmachine May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...mbeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

import * as React from 'react';
import { EuiFlyout } from '@elastic/eui';
import { AddPanelFlyout } from './add_panel_flyout';
import {
ContactCardEmbeddableFactory,
Expand Down Expand Up @@ -75,6 +76,9 @@ test('createNewEmbeddable() add embeddable to container', async () => {
/>
) as ReactWrapper<unknown, unknown, AddPanelFlyout>;

// https://github.com/elastic/kibana/issues/64789
expect(component.exists(EuiFlyout)).toBe(false);

expect(Object.values(container.getInput().panels).length).toBe(0);
component.instance().createNewEmbeddable(CONTACT_CARD_EMBEDDABLE);
await new Promise(r => setTimeout(r, 1));
Expand Down
12 changes: 3 additions & 9 deletions ...ins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import React, { ReactElement } from 'react';
import { CoreSetup } from 'src/core/public';

import {
EuiContextMenuItem,
EuiFlyout,
EuiFlyoutBody,
EuiFlyoutHeader,
EuiTitle,
} from '@elastic/eui';
import { EuiContextMenuItem, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';

import { EmbeddableStart } from 'src/plugins/embeddable/public';
import { IContainer } from '../../../../containers';
Expand Down Expand Up @@ -152,7 +146,7 @@ export class AddPanelFlyout extends React.Component<Props, State> {
);

return (
<EuiFlyout ownFocus onClose={this.props.onClose} data-test-subj="dashboardAddPanel">
<>
<EuiFlyoutHeader hasBorder>
<EuiTitle size="m">
<h2>
Expand All @@ -161,7 +155,7 @@ export class AddPanelFlyout extends React.Component<Props, State> {
</EuiTitle>
</EuiFlyoutHeader>
<EuiFlyoutBody>{savedObjectsFinder}</EuiFlyoutBody>
</EuiFlyout>
</>
);
}
}
3 changes: 2 additions & 1 deletion ...mbeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export async function openAddPanelFlyout(options: {
/>
),
{
'data-test-subj': 'addPanelFlyout',
'data-test-subj': 'dashboardAddPanel',
ownFocus: true,
}
);
}