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

remove double close button in dashboard add panel flyout #2

Merged
merged 1 commit into from
Jun 18, 2018
Merged

remove double close button in dashboard add panel flyout #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/add_panel.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,6 @@ exports[`render 1`] = `
</h2>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem
component="div"
grow={false}
>
<EuiButtonIcon
aria-label="close add panel"
color="primary"
data-test-subj="closeAddPanelBtn"
iconType="cross"
onClick={[Function]}
type="button"
/>
</EuiFlexItem>
</EuiFlexGroup>
<EuiTabs>
<EuiTab
Expand Down
9 changes: 0 additions & 9 deletions src/core_plugins/kibana/public/dashboard/top_nav/add_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {
EuiFlyout,
EuiFlyoutBody,
EuiButton,
EuiButtonIcon,
EuiTabs,
EuiTab,
EuiSpacer,
Expand Down Expand Up @@ -142,14 +141,6 @@ export class DashboardAddPanel extends React.Component {
<h2>Add Panels</h2>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonIcon
iconType="cross"
onClick={this.props.onClose}
aria-label="close add panel"
data-test-subj="closeAddPanelBtn"
/>
</EuiFlexItem>
</EuiFlexGroup>

<EuiTabs>
Expand Down
16 changes: 1 addition & 15 deletions src/core_plugins/kibana/public/dashboard/top_nav/add_panel.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@

import React from 'react';
import sinon from 'sinon';
import { mount, shallow } from 'enzyme';
import {
findTestSubject,
} from '@elastic/eui/lib/test';
import { shallow } from 'enzyme';

import {
DashboardAddPanel,
Expand All @@ -49,14 +46,3 @@ test('render', () => {
/>);
expect(component).toMatchSnapshot();
});

test('onClose', () => {
const component = mount(<DashboardAddPanel
onClose={onClose}
find={() => {}}
addNewPanel={() => {}}
addNewVis={() => {}}
/>);
findTestSubject(component, 'closeAddPanelBtn', false).simulate('click');
sinon.assert.calledOnce(onClose);
});
5 changes: 3 additions & 2 deletions test/functional/services/dashboard/add_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export function DashboardAddPanelProvider({ getService, getPageObjects }) {
const log = getService('log');
const retry = getService('retry');
const testSubjects = getService('testSubjects');
const remote = getService('remote');
const PageObjects = getPageObjects(['header', 'common']);

return new class DashboardAddPanel {
Expand Down Expand Up @@ -93,11 +94,11 @@ export function DashboardAddPanelProvider({ getService, getPageObjects }) {
}

async closeAddPanel() {
log.debug('closeAddPanel');
log.debug('DashboardAddPanel.closeAddPanel');
const isOpen = await this.isAddPanelOpen();
if (isOpen) {
await retry.try(async () => {
await testSubjects.click('closeAddPanelBtn');
await remote.pressKeys('\uE00C');
const isOpen = await this.isAddPanelOpen();
if (isOpen) {
throw new Error('Add panel still open, trying again.');
Expand Down