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

Security/Spaces - cleanup react warnings #53287

Merged
merged 2 commits into from
Dec 19, 2019
Merged

Security/Spaces - cleanup react warnings #53287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f24c65f
cleanup react warnings
legrego Dec 17, 2019
e9d8451
Merge branch 'master' into security/cleanup-react-warnings
elasticmachine Dec 18, 2019
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
2 changes: 1 addition & 1 deletion ...k/legacy/plugins/security/public/views/management/edit_role/components/edit_role_page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class EditRolePageUI extends Component<Props, State> {
};
}

public UNSAFE_componentWillMount() {
public componentDidMount() {
if (this.props.action === 'clone' && isReservedRole(this.props.role)) {
this.backToRoleList();
}
Expand Down
1 change: 1 addition & 0 deletions ...e/components/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const buildProps = (customProps: any = {}) => {
id: 'feature1',
name: 'Feature 1',
app: ['app'],
icon: 'spacesApp',
privileges: {
all: {
app: ['app'],
Expand Down
11 changes: 6 additions & 5 deletions ...iews/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
import { AdvancedSettingsSubtitle } from './advanced_settings_subtitle';
import { EuiCallOut } from '@elastic/eui';
import { act } from '@testing-library/react';

describe('AdvancedSettingsSubtitle', () => {
it('renders as expected', async () => {
Expand All @@ -21,10 +22,10 @@ describe('AdvancedSettingsSubtitle', () => {
);

// Wait for active space to resolve before requesting the component to update
await Promise.resolve();
await Promise.resolve();

wrapper.update();
await act(async () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's much better!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I came across that utility when writing tests for the role management UI. I thought you'd appreciate that change!

await nextTick();
wrapper.update();
});

expect(wrapper.find(EuiCallOut)).toHaveLength(1);
});
Expand Down
11 changes: 7 additions & 4 deletions ...blic/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/
import React from 'react';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
import { AdvancedSettingsTitle } from './advanced_settings_title';
import { SpaceAvatar } from '../../../../components';
import { act } from '@testing-library/react';

describe('AdvancedSettingsTitle', () => {
it('renders without crashing', async () => {
Expand All @@ -20,9 +21,11 @@ describe('AdvancedSettingsTitle', () => {
<AdvancedSettingsTitle getActiveSpace={() => Promise.resolve(space)} />
);

await Promise.resolve();
await Promise.resolve();
wrapper.update();
await act(async () => {
await nextTick();
wrapper.update();
});

expect(wrapper.find(SpaceAvatar)).toHaveLength(1);
});
});
75 changes: 37 additions & 38 deletions ...lic/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
import React from 'react';
import Boom from 'boom';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
import { mockManagementPlugin } from '../../../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
import { CopySavedObjectsToSpaceFlyout } from './copy_to_space_flyout';
import { CopyToSpaceForm } from './copy_to_space_form';
Expand Down Expand Up @@ -93,9 +93,10 @@ const setup = async (opts: SetupOpts = {}) => {

if (!opts.returnBeforeSpacesLoad) {
// Wait for spaces manager to complete and flyout to rerender
await Promise.resolve();
await Promise.resolve();
wrapper.update();
await act(async () => {
await nextTick();
wrapper.update();
});
}

return { wrapper, onClose, mockSpacesManager, mockToastNotifications, savedObjectToCopy };
Expand All @@ -113,8 +114,10 @@ describe('CopyToSpaceFlyout', () => {
expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(1);

await Promise.resolve();
wrapper.update();
await act(async () => {
await nextTick();
wrapper.update();
});

expect(wrapper.find(CopyToSpaceForm)).toHaveLength(1);
expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
Expand Down Expand Up @@ -160,14 +163,13 @@ describe('CopyToSpaceFlyout', () => {
});

const startButton = findTestSubject(wrapper, 'cts-initiate-button');
act(() => {

await act(async () => {
startButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();

wrapper.update();

expect(mockSpacesManager.copySavedObjects).toHaveBeenCalled();
expect(mockToastNotifications.addError).toHaveBeenCalled();
});
Expand Down Expand Up @@ -214,13 +216,13 @@ describe('CopyToSpaceFlyout', () => {
});

const startButton = findTestSubject(wrapper, 'cts-initiate-button');
act(() => {

await act(async () => {
startButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();
wrapper.update();

expect(mockSpacesManager.copySavedObjects).toHaveBeenCalled();
expect(mockToastNotifications.addError).not.toHaveBeenCalled();

Expand All @@ -231,13 +233,13 @@ describe('CopyToSpaceFlyout', () => {
overwriteButton.simulate('click');

const finishButton = findTestSubject(wrapper, 'cts-finish-button');
act(() => {

await act(async () => {
finishButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();
wrapper.update();

expect(mockSpacesManager.resolveCopySavedObjectsErrors).toHaveBeenCalled();
expect(mockToastNotifications.addError).toHaveBeenCalled();
});
Expand Down Expand Up @@ -275,14 +277,13 @@ describe('CopyToSpaceFlyout', () => {
});

const startButton = findTestSubject(wrapper, 'cts-initiate-button');
act(() => {

await act(async () => {
startButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();

wrapper.update();

expect(mockSpacesManager.copySavedObjects).toHaveBeenCalledWith(
[{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
['space-1', 'space-2'],
Expand Down Expand Up @@ -350,14 +351,13 @@ describe('CopyToSpaceFlyout', () => {
});

const startButton = findTestSubject(wrapper, 'cts-initiate-button');
act(() => {

await act(async () => {
startButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();

wrapper.update();

expect(wrapper.find(CopyToSpaceForm)).toHaveLength(0);
expect(wrapper.find(ProcessingCopyToSpace)).toHaveLength(1);

Expand All @@ -368,13 +368,13 @@ describe('CopyToSpaceFlyout', () => {
overwriteButton.simulate('click');

const finishButton = findTestSubject(wrapper, 'cts-finish-button');
act(() => {

await act(async () => {
finishButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();
wrapper.update();

expect(mockSpacesManager.resolveCopySavedObjectsErrors).toHaveBeenCalledWith(
[{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
{
Expand Down Expand Up @@ -420,14 +420,13 @@ describe('CopyToSpaceFlyout', () => {
});

const startButton = findTestSubject(wrapper, 'cts-initiate-button');
act(() => {

await act(async () => {
startButton.simulate('click');
await nextTick();
wrapper.update();
});

await Promise.resolve();

wrapper.update();

expect(wrapper.find(CopyToSpaceForm)).toHaveLength(0);
expect(wrapper.find(ProcessingCopyToSpace)).toHaveLength(1);

Expand Down
2 changes: 2 additions & 0 deletions ...views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ...gins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ const features: Feature[] = [
{
id: 'feature-1',
name: 'Feature 1',
icon: 'spacesApp',
app: [],
privileges: {},
},
{
id: 'feature-2',
name: 'Feature 2',
icon: 'spacesApp',
app: [],
privileges: {},
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
jest.mock('ui/kfetch', () => ({
kfetch: () => Promise.resolve([{ id: 'feature-1', name: 'feature 1' }]),
kfetch: () => Promise.resolve([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]),
}));
import '../../../__mocks__/xpack_info';
import { EuiButton, EuiLink, EuiSwitch } from '@elastic/eui';
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class NavControlPopover extends Component<Props, State> {
};
}

public componentWillMount() {
public componentDidMount() {
this.activeSpace$ = this.props.spacesManager.onActiveSpaceChange$.subscribe({
next: activeSpace => {
this.setState({
Expand Down