UI/API changes to facilitate disabling features within spaces (#24235)

* Restructure user profile for granular app privs (#23750) merging to feature branch for further development * Introducing uiCapabilities, removing config providers & user profile (#25387) ## Summary Introduces the concept of "UI Capabilities", which allows Kibana applications to declare capabilities via the `uiCapabilities` injected var, and then use them client-side via the `ui/capabilities` module to inform their rendering decisions. * GAP - Actions Restructured and Extensible (#25347) * Restructure user profile for granular app privs (#23750) merging to feature branch for further development * Fixing saved object capability checking * Beginning to restructure actions to be used for all action building * Using actions to build ui capabilities * dropping /read from client-side userprovide ui capabilities * Adding some actions * Using different syntax which will hopefully help with allowing apps to specify the privileges themselves * Exposing all saved object operations in the capabilities * Using actions in security's onPostAuth * Only loading the default index pattern when it's required * Only using the navlinks for the "ui capabilities" * Redirecting from the discover application if the user can't access kibana:discover * Redirecting from dashboard if they're hidden * Features register their privileges now * Introducing a FeaturesPrivilegesBuilder * REmoving app from the feature definition * Adding navlink specific ations * Beginning to break out the serializer * Exposing privileges from the authorization service * Restructuring the privilege/resource serialization to support features * Adding actions unit tests * Adding features privileges builders tests * Adding PrivilegeSerializer tests * Renaming missed usages * Adding tests for the privileges serializer * Adding privileges tests * Adding registerPrivilegesWithCluster tests * Better tests * Fixing authorization service tests * Adding ResourceSerializer tests * Fixing Privileges tests * Some PUT role tests * Fixing read ui/api actions * Exposing features from xpackMainPlugin * Adding navlink:* to the "reserved privileges" * navlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_linknavlink -> navLink | nav_link * Automatically determining navlink based ui capabilities * Backing out changes that got left behind * Using ui actions for navlinks * Adding TODOs * Ui -> UI * Deleting unused file * Removing api: [] as it's not necessary anymore * Fixing graph saved object privileges * Privileges are now async * Pushing the asycnchronicity to the privileges "service" * Adding TODO * Providing initial value for reduce * adds uiCapabilities to test_entry_template * Adding config to APM/ML feature privileges * Commenting out obviously failing test so we can get CI greeenn * Fixing browser tests * Goodbyyeee * Adding app actions to the reserved privileges * Begin to allow features to be disabled within spaces typescript fixes additional cleanup attempt to resolve build error fix tests more ts updates fix typedefs on manage_spaces_button more import fixes test fixes move user profile into xpack common Restructure space management screen fix SASS references design edits remove Yes/No language from feature toggles fix casing removed unused imports update snapshot fix sass reference for collapsible panel Fix sass reference, take 2 * Restructure user profile for granular app privs (#23750) merging to feature branch for further development * extract migration logic into testable unit * Introducing uiCapabilities, removing config providers & user profile (#25387) ## Summary Introduces the concept of "UI Capabilities", which allows Kibana applications to declare capabilities via the `uiCapabilities` injected var, and then use them client-side via the `ui/capabilities` module to inform their rendering decisions. * Design edits (#12) enables customize avatar popover update tests, and simplify editing space identifier remove references to user profile remove unused test suite remove unnecessary sass import removes security's capability_decorator * fix i18n * updates toggleUiCapabilities to use new feature definitions * cleanup and testing * remove references to old feature interface * readd lost spacer * adds feature route testing * additional i18n * snapshot update * copy edits * fix ml app icon * add missing export * remove unnecessary sass import * attempt to fix build * fix spaces api tests * esArchiver mapping updates * rename toggleUiCapabilities -> toggleUICapabilities * removes shared collapsible_panel component in favor of plugin-specific components * some copy and style adjustments * fix test following rebase * add lost types file * design edits * remove stale export * feature feedback; fixes cached disabled features
elastic · Nov 29, 2018 · 4a0f760 · 4a0f760
1 parent aeac093
commit 4a0f760
Show file tree

Hide file tree

Showing 93 changed files with 1,523 additions and 441 deletions.
diff --git a/src/es_archiver/lib/indices/kibana_index.js b/src/es_archiver/lib/indices/kibana_index.js
@@ -146,6 +146,7 @@ export async function createDefaultSpace({ index, client }) {
       space: {
         name: 'Default Space',
         description: 'This is the default space',
+        disabledFeatures: [],
         _reserved: true
       }
     }

diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
@@ -13,6 +13,7 @@ export function createJestConfig({
     roots: [
       "<rootDir>/plugins",
       "<rootDir>/server",
+      "<rootDir>/public",
     ],
     moduleFileExtensions: [
       "js",

diff --git a/x-pack/plugins/ml/index.js b/x-pack/plugins/ml/index.js
@@ -66,7 +66,7 @@ export const ml = (kibana) => {
       xpackMainPlugin.registerFeature({
         id: 'ml',
         name: 'Machine Learning',
-        icon: 'mlApp',
+        icon: 'machineLearningApp',
         navLinkId: 'ml',
         privileges: {
           all: {

diff --git a/...apshots__/collapsible_panel.test.tsx.snap → ...apshots__/collapsible_panel.test.tsx.snap b/...apshots__/collapsible_panel.test.tsx.snap → ...apshots__/collapsible_panel.test.tsx.snap
@@ -24,12 +24,14 @@ exports[`it renders without blowing up 1`] = `
         textTransform="none"
       >
         <h2>
-          <EuiIcon
-            className="collapsiblePanel__logo"
-            size="xl"
-            type="logoElasticsearch"
-          />
-           
+          <React.Fragment>
+            <EuiIcon
+              className="collapsiblePanel__logo"
+              size="xl"
+              type="logoElasticsearch"
+            />
+             
+          </React.Fragment>
           Elasticsearch
         </h2>
       </EuiTitle>

diff --git a/...it_role/components/collapsible_panel.scss → ...collapsible_panel/_collapsible_panel.scss b/...it_role/components/collapsible_panel.scss → ...collapsible_panel/_collapsible_panel.scss
diff --git a/...ole/components/collapsible_panel.test.tsx → ...lapsible_panel/collapsible_panel.test.tsx b/...ole/components/collapsible_panel.test.tsx → ...lapsible_panel/collapsible_panel.test.tsx
diff --git a/...dit_role/components/collapsible_panel.tsx → ...s/collapsible_panel/collapsible_panel.tsx b/...dit_role/components/collapsible_panel.tsx → ...s/collapsible_panel/collapsible_panel.tsx
@@ -12,13 +12,15 @@ import {
   EuiPanel,
   EuiSpacer,
   EuiTitle,
+  IconType,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React, { Component, Fragment } from 'react';
+import React, { Component, Fragment, ReactNode } from 'react';
 
 interface Props {
-  iconType: string | any;
-  title: string;
+  iconType?: IconType;
+  title: string | ReactNode;
+  initiallyCollapsed?: boolean;
 }
 
 interface State {
@@ -30,6 +32,13 @@ export class CollapsiblePanel extends Component<Props, State> {
     collapsed: false,
   };
 
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      collapsed: props.initiallyCollapsed || false,
+    };
+  }
+
   public render() {
     return (
       <EuiPanel>
@@ -46,11 +55,15 @@ export class CollapsiblePanel extends Component<Props, State> {
         <EuiFlexItem grow={false}>
           <EuiTitle>
             <h2>
-              <EuiIcon
-                type={this.props.iconType}
-                size={'xl'}
-                className={'collapsiblePanel__logo'}
-              />{' '}
+              {this.props.iconType && (
+                <Fragment>
+                  <EuiIcon
+                    type={this.props.iconType}
+                    size={'xl'}
+                    className={'collapsiblePanel__logo'}
+                  />{' '}
+                </Fragment>
+              )}
               {this.props.title}
             </h2>
           </EuiTitle>

diff --git a/.../plugins/security/public/views/management/edit_role/components/collapsible_panel/index.ts b/.../plugins/security/public/views/management/edit_role/components/collapsible_panel/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { CollapsiblePanel } from './collapsible_panel';
diff --git a/...ment/edit_role/components/privileges/kibana/__snapshots__/kibana_privileges.test.tsx.snap b/...ment/edit_role/components/privileges/kibana/__snapshots__/kibana_privileges.test.tsx.snap
@@ -32,10 +32,12 @@ exports[`<KibanaPrivileges> renders without crashing 1`] = `
         Array [
           Object {
             "_reserved": true,
+            "disabledFeatures": Array [],
             "id": "default",
             "name": "Default Space",
           },
           Object {
+            "disabledFeatures": Array [],
             "id": "marketing",
             "name": "Marketing",
           },

diff --git a/...t/edit_role/components/privileges/kibana/__snapshots__/privilege_space_form.test.tsx.snap b/...t/edit_role/components/privileges/kibana/__snapshots__/privilege_space_form.test.tsx.snap
@@ -35,11 +35,13 @@ exports[`<PrivilegeSpaceForm> renders without crashing 1`] = `
             Object {
               "_reserved": true,
               "description": "",
+              "disabledFeatures": Array [],
               "id": "default",
               "name": "Default Space",
             },
             Object {
               "description": "",
+              "disabledFeatures": Array [],
               "id": "marketing",
               "name": "Marketing",
             },

diff --git a/...c/views/management/edit_role/components/privileges/kibana/impacted_spaces_flyout.test.tsx b/...c/views/management/edit_role/components/privileges/kibana/impacted_spaces_flyout.test.tsx
@@ -28,11 +28,13 @@ const buildProps = (customProps = {}) => {
       {
         id: 'default',
         name: 'Default Space',
+        disabledFeatures: [],
         _reserved: true,
       },
       {
         id: 'marketing',
         name: 'Marketing',
+        disabledFeatures: [],
       },
     ],
     kibanaAppPrivileges: [

diff --git a/...public/views/management/edit_role/components/privileges/kibana/impacted_spaces_flyout.tsx b/...public/views/management/edit_role/components/privileges/kibana/impacted_spaces_flyout.tsx
@@ -14,13 +14,12 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
-import { PrivilegeSpaceTable } from './privilege_space_table';
-
 import { Space } from '../../../../../../../../spaces/common/model/space';
 import { ManageSpacesButton } from '../../../../../../../../spaces/public/components';
 import { KibanaPrivilege } from '../../../../../../../common/model/kibana_privilege';
 import { Role } from '../../../../../../../common/model/role';
 import { NO_PRIVILEGE_VALUE } from '../../../lib/constants';
+import { PrivilegeSpaceTable } from './privilege_space_table';
 
 interface Props {
   role: Role;

diff --git a/...public/views/management/edit_role/components/privileges/kibana/kibana_privileges.test.tsx b/...public/views/management/edit_role/components/privileges/kibana/kibana_privileges.test.tsx
@@ -31,11 +31,13 @@ const buildProps = (customProps = {}) => {
       {
         id: 'default',
         name: 'Default Space',
+        disabledFeatures: [],
         _reserved: true,
       },
       {
         id: 'marketing',
         name: 'Marketing',
+        disabledFeatures: [],
       },
     ],
     uiCapabilities: {

diff --git a/...lic/views/management/edit_role/components/privileges/kibana/privilege_space_form.test.tsx b/...lic/views/management/edit_role/components/privileges/kibana/privilege_space_form.test.tsx
@@ -20,12 +20,14 @@ const buildProps = (customProps = {}) => {
         id: 'default',
         name: 'Default Space',
         description: '',
+        disabledFeatures: [],
         _reserved: true,
       },
       {
         id: 'marketing',
         name: 'Marketing',
         description: '',
+        disabledFeatures: [],
       },
     ],
     selectedSpaceIds: [],

diff --git a/x-pack/plugins/security/public/views/management/edit_role/edit_role.scss b/x-pack/plugins/security/public/views/management/edit_role/edit_role.scss
@@ -1,3 +1,5 @@
+@import './components/collapsible_panel/collapsible_panel';
+
 #editRoleReactRoot {
   background: $euiColorLightestShade;
   min-height: calc(100vh - 70px);

diff --git a/x-pack/plugins/security/public/views/management/index.scss b/x-pack/plugins/security/public/views/management/index.scss
@@ -1,6 +1,5 @@
 // Edit role styles
 @import './edit_role/components/privileges/kibana/impacted_spaces_flyout';
-@import './edit_role/components/collapsible_panel';
 @import './edit_role/edit_role';
 
 

diff --git a/x-pack/plugins/security/server/lib/authorization/register_privileges_with_cluster.test.js b/x-pack/plugins/security/server/lib/authorization/register_privileges_with_cluster.test.js
@@ -297,20 +297,20 @@ registerPrivilegesWithClusterTest(`deletes no-longer specified privileges`, {
   assert: ({ expectUpdatedPrivileges }) => {
     expectUpdatedPrivileges({
       [application]: {
-        foo: {
+        all: {
           application,
-          name: 'foo',
+          name: 'all',
           actions: ['action:foo'],
           metadata: {},
         },
-        space_bar: {
+        space_read: {
           application,
-          name: 'space_bar',
+          name: 'space_read',
           actions: ['action:bar'],
           metadata: {},
         }
       }
-    }, [ 'quz', 'space_baz' ]);
+    }, ['read', 'space_baz']);
   }
 });
 
@@ -805,28 +805,6 @@ registerPrivilegesWithClusterTest(`throws and logs error when errors getting pri
   }
 });
 
-registerPrivilegesWithClusterTest(`throws and logs error when errors deleting privileges`, {
-  privilegeMap: {
-    global: {},
-    space: {}
-  },
-  existingPrivileges: {
-    [application]: {
-      foo: {
-        application,
-        name: 'foo',
-        actions: ['action:not-foo'],
-        metadata: {},
-      }
-    }
-  },
-  throwErrorWhenDeletingPrivileges: new Error('Error deleting privileges'),
-  errorDeletingPrivilegeName: 'foo',
-  assert: ({ expectErrorThrown }) => {
-    expectErrorThrown('Error deleting privileges');
-  }
-});
-
 registerPrivilegesWithClusterTest(`throws and logs error when errors putting privileges`, {
   privilegeMap: {
     features: {},

diff --git a/x-pack/plugins/security/server/lib/capability_decorator.ts b/x-pack/plugins/security/server/lib/capability_decorator.ts
diff --git a/x-pack/plugins/spaces/common/is_reserved_space.test.ts b/x-pack/plugins/spaces/common/is_reserved_space.test.ts
@@ -11,6 +11,7 @@ test('it returns true for reserved spaces', () => {
   const space: Space = {
     id: '',
     name: '',
+    disabledFeatures: [],
     _reserved: true,
   };
 
@@ -21,6 +22,7 @@ test('it returns false for non-reserved spaces', () => {
   const space: Space = {
     id: '',
     name: '',
+    disabledFeatures: [],
   };
 
   expect(isReservedSpace(space)).toEqual(false);

diff --git a/x-pack/plugins/spaces/common/model/space.ts b/x-pack/plugins/spaces/common/model/space.ts
@@ -10,5 +10,6 @@ export interface Space {
   description?: string;
   color?: string;
   initials?: string;
+  disabledFeatures: string[];
   _reserved?: boolean;
 }
diff --git a/x-pack/plugins/spaces/index.ts b/x-pack/plugins/spaces/index.ts
@@ -18,11 +18,12 @@ import { wrapError } from './server/lib/errors';
 import { getActiveSpace } from './server/lib/get_active_space';
 import { getSpaceSelectorUrl } from './server/lib/get_space_selector_url';
 import { getSpacesUsageCollector } from './server/lib/get_spaces_usage_collector';
+import { migrateToKibana660 } from './server/lib/migrations';
 import { spacesSavedObjectsClientWrapperFactory } from './server/lib/saved_objects_client/saved_objects_client_wrapper_factory';
 import { initSpacesRequestInterceptors } from './server/lib/space_request_interceptors';
 import { SpacesClient } from './server/lib/spaces_client';
 import { createSpacesTutorialContextFactory } from './server/lib/spaces_tutorial_context_factory';
-import { toggleUiCapabilities } from './server/lib/toggle_ui_capabilities';
+import { toggleUICapabilities } from './server/lib/toggle_ui_capabilities';
 import { initPublicSpacesApi } from './server/routes/api/public';
 import { initPrivateApis } from './server/routes/api/v1';
 
@@ -55,6 +56,11 @@ export const spaces = (kibana: any) =>
       ],
       hacks: [],
       mappings,
+      migrations: {
+        space: {
+          '6.6.0': migrateToKibana660,
+        },
+      },
       savedObjectSchemas: {
         space: {
           isNamespaceAgnostic: true,
@@ -96,7 +102,9 @@ export const spaces = (kibana: any) =>
         }
 
         if (vars.activeSpace.space) {
-          vars.uiCapabilities = await toggleUiCapabilities(
+          const features = server.plugins.xpack_main.getFeatures();
+          vars.uiCapabilities = toggleUICapabilities(
+            features,
             vars.uiCapabilities,
             vars.activeSpace.space
           );

diff --git a/x-pack/plugins/spaces/mappings.json b/x-pack/plugins/spaces/mappings.json
@@ -19,6 +19,9 @@
       "color": {
         "type": "keyword"
       },
+      "disabledFeatures": {
+        "type": "keyword"
+      },
       "_reserved": {
         "type": "boolean"
       }