Spaces - Hiding management link

src/legacy/server/capabilities/merge_capabilities.test.ts

@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mergeCapabilities } from './merge_capabilities';
+
+const defaultProps = {
+ catalogue: {},
+ management: {},
+ navLinks: {},
+};
+
+test(`"{ foo: {} }" doesn't clobber "{ foo: { bar: true } }"`, () => {
+ const output1 = mergeCapabilities({ foo: { bar: true } }, { foo: {} });
+ expect(output1).toEqual({ ...defaultProps, foo: { bar: true } });
+
+ const output2 = mergeCapabilities({ foo: { bar: true } }, { foo: {} });
+ expect(output2).toEqual({ ...defaultProps, foo: { bar: true } });
+});
+
+test(`"{ foo: { bar: true } }" doesn't clobber "{ baz: { quz: true } }"`, () => {
+ const output1 = mergeCapabilities({ foo: { bar: true } }, { baz: { quz: true } });
+ expect(output1).toEqual({ ...defaultProps, foo: { bar: true }, baz: { quz: true } });
+
+ const output2 = mergeCapabilities({ baz: { quz: true } }, { foo: { bar: true } });
+ expect(output2).toEqual({ ...defaultProps, foo: { bar: true }, baz: { quz: true } });
+});
+
+test(`"{ foo: { bar: { baz: true } } }" doesn't clobber "{ foo: { bar: { quz: true } } }"`, () => {
+ const output1 = mergeCapabilities(
+ { foo: { bar: { baz: true } } },
+ { foo: { bar: { quz: true } } }
+ );
+ expect(output1).toEqual({ ...defaultProps, foo: { bar: { baz: true, quz: true } } });
+
+ const output2 = mergeCapabilities(
+ { foo: { bar: { quz: true } } },
+ { foo: { bar: { baz: true } } }
+ );
+ expect(output2).toEqual({ ...defaultProps, foo: { bar: { baz: true, quz: true } } });
+});
+
+test(`error is thrown if boolean and object clash`, () => {
+ expect(() => {
+ mergeCapabilities({ foo: { bar: { baz: true } } }, { foo: { bar: true } });
+ }).toThrowErrorMatchingInlineSnapshot(`"a boolean and an object can't be merged"`);
+
+ expect(() => {
+ mergeCapabilities({ foo: { bar: true } }, { foo: { bar: { baz: true } } });
+ }).toThrowErrorMatchingInlineSnapshot(`"a boolean and an object can't be merged"`);
+});
+
+test(`supports duplicates as long as the booleans are the same`, () => {
+ const output1 = mergeCapabilities({ foo: { bar: true } }, { foo: { bar: true } });
+ expect(output1).toEqual({ ...defaultProps, foo: { bar: true } });
+
+ const output2 = mergeCapabilities({ foo: { bar: false } }, { foo: { bar: false } });
+ expect(output2).toEqual({ ...defaultProps, foo: { bar: false } });
+});
+
+test(`error is thrown if merging "true" and "false"`, () => {
+ expect(() => {
+ mergeCapabilities({ foo: { bar: false } }, { foo: { bar: true } });
+ }).toThrowErrorMatchingInlineSnapshot(`"\\"true\\" and \\"false\\" can't be merged"`);
+
+ expect(() => {
+ mergeCapabilities({ foo: { bar: true } }, { foo: { bar: false } });
+ }).toThrowErrorMatchingInlineSnapshot(`"\\"true\\" and \\"false\\" can't be merged"`);
+});

src/legacy/server/capabilities/merge_capabilities.ts

@@ -17,23 +17,28 @@
  * under the License.
  */
 
+import typeDetect from 'type-detect';
+import { merge } from 'lodash';
 import { Capabilities } from '../../../core/public';
 
 export const mergeCapabilities = (...sources: Array<Partial<Capabilities>>): Capabilities =>
- sources.reduce(
- (capabilities: Capabilities, source) => {
- Object.entries(source).forEach(([key, value = {}]) => {
- capabilities[key] = {
- ...value,
- ...capabilities[key],
- };
- });
-
- return capabilities;
- },
+ merge(
  {
  navLinks: {},
  management: {},
  catalogue: {},
- } as Capabilities
+ },
+ ...sources,
+ (a: any, b: any) => {
+ if (
+ (typeDetect(a) === 'boolean' && typeDetect(b) === 'Object') ||
+ (typeDetect(b) === 'boolean' && typeDetect(a) === 'Object')
+ ) {
+ throw new Error(`a boolean and an object can't be merged`);
+ }
+
+ if (typeDetect(a) === 'boolean' && typeDetect(b) === 'boolean' && a !== b) {
+ throw new Error(`"true" and "false" can't be merged`);
+ }
+ }
  );

x-pack/plugins/security/server/lib/authorization/privileges/privileges.test.ts

@@ -318,7 +318,13 @@ describe('features', () => {
  actions.login,
  actions.version,
  ...(expectGetFeatures ? [actions.api.get('features')] : []),
- ...(expectManageSpaces ? [actions.space.manage, actions.ui.get('spaces', 'manage')] : []),
+ ...(expectManageSpaces
+ ? [
+ actions.space.manage,
+ actions.ui.get('spaces', 'manage'),
+ actions.ui.get('management', 'kibana', 'spaces'),
+ ]
+ : []),
  actions.app.get('app-1'),
  actions.app.get('app-2'),
  actions.ui.get('catalogue', 'catalogue-1'),
@@ -403,7 +409,13 @@ describe('features', () => {
  actions.login,
  actions.version,
  ...(expectGetFeatures ? [actions.api.get('features')] : []),
- ...(expectManageSpaces ? [actions.space.manage, actions.ui.get('spaces', 'manage')] : []),
+ ...(expectManageSpaces
+ ? [
+ actions.space.manage,
+ actions.ui.get('spaces', 'manage'),
+ actions.ui.get('management', 'kibana', 'spaces'),
+ ]
+ : []),
  actions.ui.get('catalogue', 'bar-catalogue-1'),
  actions.ui.get('catalogue', 'bar-catalogue-2'),
  actions.ui.get('management', 'bar-management', 'bar-management-1'),
@@ -614,7 +626,13 @@ describe('features', () => {
  actions.login,
  actions.version,
  ...(expectGetFeatures ? [actions.api.get('features')] : []),
- ...(expectManageSpaces ? [actions.space.manage, actions.ui.get('spaces', 'manage')] : []),
+ ...(expectManageSpaces
+ ? [
+ actions.space.manage,
+ actions.ui.get('spaces', 'manage'),
+ actions.ui.get('management', 'kibana', 'spaces'),
+ ]
+ : []),
  actions.allHack,
  ]);
  expect(actual).toHaveProperty(`${group}.read`, [actions.login, actions.version]);

x-pack/plugins/security/server/lib/authorization/privileges/privileges.ts

@@ -65,6 +65,7 @@ export function privilegesFactory(actions: Actions, xpackMainPlugin: XPackMainPl
  actions.api.get('features'),
  actions.space.manage,
  actions.ui.get('spaces', 'manage'),
+ actions.ui.get('management', 'kibana', 'spaces'),
  ...allActions,
  actions.allHack,
  ],

x-pack/plugins/spaces/index.ts

@@ -49,6 +49,11 @@ export const spaces = (kibana: Record<string, any>) =>
  spaces: {
  manage: true,
  },
+ management: {
+ kibana: {
+ spaces: true,
+ },
+ },
  };
  },
 

x-pack/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx

@@ -144,7 +144,7 @@ class ManageSpacePageUI extends Component<Props, State> {
  const { showAlteringActiveSpaceDialog } = this.state;
 
  return (
- <Fragment>
+ <div data-test-subj="spaces-edit-page">
  {this.getFormHeading()}
 
  <EuiSpacer size={'s'} />
@@ -188,7 +188,7 @@ class ManageSpacePageUI extends Component<Props, State> {
  }}
  />
  )}
- </Fragment>
+ </div>
  );
  };
 

x-pack/plugins/spaces/public/views/management/index.tsx

@@ -18,7 +18,7 @@ import routes from 'ui/routes';
 import { AdvancedSettingsSubtitle } from './components/advanced_settings_subtitle';
 import { AdvancedSettingsTitle } from './components/advanced_settings_title';
 
-const MANAGE_SPACES_KEY = 'manage_spaces';
+const MANAGE_SPACES_KEY = 'spaces';
 
 routes.defaults(/\/management/, {
  resolve: {

x-pack/plugins/spaces/public/views/management/page_routes.tsx

@@ -21,6 +21,7 @@ const reactRootNodeId = 'manageSpacesReactRoot';
 routes.when('/management/spaces/list', {
  template,
  k7Breadcrumbs: getListBreadcrumbs,
+ requireUICapability: 'management.kibana.spaces',
  controller(
  $scope: any,
  $http: any,
@@ -53,6 +54,7 @@ routes.when('/management/spaces/list', {
 routes.when('/management/spaces/create', {
  template,
  k7Breadcrumbs: getCreateBreadcrumbs,
+ requireUICapability: 'management.kibana.spaces',
  controller(
  $scope: any,
  $http: any,
@@ -89,6 +91,7 @@ routes.when('/management/spaces/edit', {
 routes.when('/management/spaces/edit/:spaceId', {
  template,
  k7Breadcrumbs: () => getEditBreadcrumbs(),
+ requireUICapability: 'management.kibana.spaces',
  controller(
  $scope: any,
  $http: any,

x-pack/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx

@@ -72,7 +72,7 @@ class SpacesGridPageUI extends Component<Props, State> {
 
  public render() {
  return (
- <div className="spcGridPage">
+ <div className="spcGridPage" data-test-subj="spaces-grid-page">
  <EuiPageContent horizontalPosition="center">{this.getPageContent()}</EuiPageContent>
  <SecureSpaceMessage />
  {this.getConfirmDeleteModal()}