fix FeatureConfig & Feature compatibility

elastic · Jun 25, 2020 · 923e842 · 923e842
1 parent a58916d
commit 923e842
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/x-pack/plugins/features/common/feature.ts b/x-pack/plugins/features/common/feature.ts
@@ -49,7 +49,9 @@ export interface FeatureConfig {
    * This does not restrict access to your feature based on license.
    * Its only purpose is to inform the space and roles UIs on which features to display.
    */
-  validLicenses?: Array<'basic' | 'standard' | 'gold' | 'platinum' | 'enterprise' | 'trial'>;
+  validLicenses?: ReadonlyArray<
+    'basic' | 'standard' | 'gold' | 'platinum' | 'enterprise' | 'trial'
+  >;
 
   /**
    * An optional EUI Icon to be used when displaying your feature.

diff --git a/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -154,7 +154,7 @@ export class ManageSpacePage extends Component<Props, State> {
 
         <EnabledFeatures
           space={this.state.space}
-          features={this.state.features.map((f) => f.toRaw())}
+          features={this.state.features}
           onChange={this.onSpaceChange}
           getUrlForApp={this.props.getUrlForApp}
           securityEnabled={this.props.securityEnabled}

diff --git a/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx b/x-pack/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -21,7 +21,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ApplicationStart, Capabilities, NotificationsStart, ScopedHistory } from 'src/core/public';
-import { FeatureConfig, FeaturesPluginStart } from '../../../../features/public';
+import { Feature, FeaturesPluginStart } from '../../../../features/public';
 import { isReservedSpace } from '../../../common';
 import { DEFAULT_SPACE_ID } from '../../../common/constants';
 import { Space } from '../../../common/model/space';
@@ -46,7 +46,7 @@ interface Props {
 
 interface State {
   spaces: Space[];
-  features: FeatureConfig[];
+  features: Feature[];
   loading: boolean;
   showConfirmDeleteModal: boolean;
   selectedSpace: Space | null;
@@ -228,7 +228,7 @@ export class SpacesGridPage extends Component<Props, State> {
       this.setState({
         loading: false,
         spaces,
-        features: features.map((f) => f.toRaw()),
+        features,
       });
     } catch (error) {
       this.setState({