diff --git a/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx b/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx index 757e882bf741c..4c8617ff007b8 100644 --- a/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx +++ b/x-pack/plugins/spaces/public/management/create_space/create_space_page.test.tsx @@ -14,7 +14,6 @@ import { act } from 'react-dom/test-utils'; import { DEFAULT_APP_CATEGORIES } from '@kbn/core/public'; import { notificationServiceMock, scopedHistoryMock } from '@kbn/core/public/mocks'; -import { KibanaFeatureScope } from '@kbn/features-plugin/common'; import { KibanaFeature } from '@kbn/features-plugin/public'; import { featuresPluginMock } from '@kbn/features-plugin/public/mocks'; import { findTestSubject, mountWithIntl } from '@kbn/test-jest-helpers'; @@ -49,15 +48,6 @@ featuresStart.getFeatures.mockResolvedValue([ app: [], category: DEFAULT_APP_CATEGORIES.kibana, privileges: null, - scope: [KibanaFeatureScope.Spaces, KibanaFeatureScope.Security], - }), - new KibanaFeature({ - id: 'feature-2', - name: 'feature 2', - app: [], - category: DEFAULT_APP_CATEGORIES.kibana, - privileges: null, - scope: [KibanaFeatureScope.Security], }), ]); @@ -651,54 +641,6 @@ describe('ManageSpacePage', () => { expect(spacesManager.updateSpace).toHaveBeenCalledTimes(1); }); - - it('shows only features with space scope', async () => { - const spacesManager = spacesManagerMock.create(); - spacesManager.getSpace = jest.fn().mockResolvedValue({ - id: 'my-space', - name: 'Existing Space', - description: 'hey an existing space', - color: '#aabbcc', - initials: 'AB', - disabledFeatures: [], - }); - spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space); - - const wrapper = mountWithIntl( - - ); - - await waitFor(() => { - wrapper.update(); - expect(spacesManager.getSpace).toHaveBeenCalledWith('my-space'); - }); - - expect(wrapper.state('features')).toEqual([ - new KibanaFeature({ - id: 'feature-1', - name: 'feature 1', - app: [], - category: DEFAULT_APP_CATEGORIES.kibana, - privileges: null, - scope: [KibanaFeatureScope.Spaces, KibanaFeatureScope.Security], - }), - ]); - }); }); function updateSpace( diff --git a/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx b/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx index ed0e52edd6c4b..e8204a53fe345 100644 --- a/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx +++ b/x-pack/plugins/spaces/public/management/create_space/create_space_page.tsx @@ -22,7 +22,6 @@ import React, { Component } from 'react'; import type { Capabilities, NotificationsStart, ScopedHistory } from '@kbn/core/public'; import { SectionLoading } from '@kbn/es-ui-shared-plugin/public'; -import { KibanaFeatureScope } from '@kbn/features-plugin/common'; import type { FeaturesPluginStart, KibanaFeature } from '@kbn/features-plugin/public'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n-react'; @@ -92,10 +91,6 @@ export class CreateSpacePage extends Component { }; } - private filterSpaceFeatures = (features: KibanaFeature[]) => { - return features.filter((feature) => feature.scope?.includes(KibanaFeatureScope.Spaces)); - }; - public async componentDidMount() { if (!this.props.capabilities.spaces.manage) { return; @@ -108,8 +103,7 @@ export class CreateSpacePage extends Component { await this.loadSpace(spaceId, getFeatures()); } else { const features = await getFeatures(); - - this.setState({ isLoading: false, features: this.filterSpaceFeatures(features) }); + this.setState({ isLoading: false, features }); } } catch (e) { notifications.toasts.addError(e, { @@ -416,7 +410,6 @@ export class CreateSpacePage extends Component { spacesManager.getSpace(spaceId), featuresPromise, ]); - if (space) { if (onLoadSpace) { onLoadSpace(space); @@ -433,7 +426,7 @@ export class CreateSpacePage extends Component { !!space.initials && getSpaceInitials({ name: space.name }) !== space.initials, customAvatarColor: !!space.color && getSpaceColor({ name: space.name }) !== space.color, }, - features: this.filterSpaceFeatures(features), + features, originalSpace: space, isLoading: false, });