Spaces - Client NP Migration, Phase 1

x-pack/legacy/plugins/security/public/views/management/edit_role/index.js

@@ -18,7 +18,6 @@ import 'plugins/security/services/shield_indices';
 
 import { IndexPatternsProvider } from 'ui/index_patterns/index_patterns';
 import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
-import { SpacesManager } from '../../../../../spaces/public/lib';
 import { ROLES_PATH, CLONE_ROLES_PATH, EDIT_ROLES_PATH } from '../management_urls';
 import { getEditRoleBreadcrumbs, getCreateRoleBreadcrumbs } from '../breadcrumbs';
 
@@ -83,7 +82,7 @@ const routeDefinition = (action) => ({
     },
     spaces(spacesEnabled) {
       if (spacesEnabled) {
-        return new SpacesManager().getSpaces();
+        return kfetch({ method: 'get', pathname: '/api/spaces/space' });
       }
       return [];
     },

x-pack/legacy/plugins/spaces/index.ts

@@ -11,9 +11,6 @@ import { createOptionalPlugin } from '../../server/lib/optional_plugin';
 // @ts-ignore
 import { AuditLogger } from '../../server/lib/audit_logger';
 import mappings from './mappings.json';
-import { wrapError } from './server/lib/errors';
-import { getActiveSpace } from './server/lib/get_active_space';
-import { getSpaceSelectorUrl } from './server/lib/get_space_selector_url';
 import { migrateToKibana660 } from './server/lib/migrations';
 import { plugin } from './server/new_platform';
 import {
@@ -51,7 +48,6 @@ export const spaces = (kibana: Record<string, any>) =>
     },
 
     uiExports: {
-      chromeNavControls: ['plugins/spaces/views/nav_control'],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       managementSections: ['plugins/spaces/views/management'],
       apps: [
@@ -75,38 +71,7 @@ export const spaces = (kibana: Record<string, any>) =>
           isNamespaceAgnostic: true,
         },
       },
-      home: ['plugins/spaces/register_feature'],
-      injectDefaultVars(server: any) {
-        return {
-          spaces: [],
-          activeSpace: null,
-          spaceSelectorURL: getSpaceSelectorUrl(server.config()),
-        };
-      },
-      async replaceInjectedVars(
-        vars: Record<string, any>,
-        request: Record<string, any>,
-        server: Record<string, any>
-      ) {
-        const spacesClient = await server.plugins.spaces.getScopedSpacesClient(request);
-        try {
-          vars.activeSpace = {
-            valid: true,
-            space: await getActiveSpace(
-              spacesClient,
-              request.getBasePath(),
-              server.config().get('server.basePath')
-            ),
-          };
-        } catch (e) {
-          vars.activeSpace = {
-            valid: false,
-            error: wrapError(e).output.payload,
-          };
-        }
-
-        return vars;
-      },
+      home: ['plugins/spaces/legacy'],
     },
 
     async init(server: Server) {

x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx

@@ -4,37 +4,40 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { setMockCapabilities } from '../__mocks__/ui_capabilities';
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ManageSpacesButton } from './manage_spaces_button';
 
 describe('ManageSpacesButton', () => {
   it('renders as expected', () => {
-    setMockCapabilities({
-      navLinks: {},
-      management: {},
-      catalogue: {},
-      spaces: {
-        manage: true,
-      },
-    });
-
-    const component = <ManageSpacesButton />;
+    const component = (
+      <ManageSpacesButton
+        capabilities={{
+          navLinks: {},
+          management: {},
+          catalogue: {},
+          spaces: {
+            manage: true,
+          },
+        }}
+      />
+    );
     expect(shallowWithIntl(component)).toMatchSnapshot();
   });
 
   it(`doesn't render if user profile forbids managing spaces`, () => {
-    setMockCapabilities({
-      navLinks: {},
-      management: {},
-      catalogue: {},
-      spaces: {
-        manage: false,
-      },
-    });
-
-    const component = <ManageSpacesButton />;
+    const component = (
+      <ManageSpacesButton
+        capabilities={{
+          navLinks: {},
+          management: {},
+          catalogue: {},
+          spaces: {
+            manage: false,
+          },
+        }}
+      />
+    );
     expect(shallowWithIntl(component)).toMatchSnapshot();
   });
 });

x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx

@@ -7,20 +7,21 @@
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, CSSProperties } from 'react';
-import { capabilities } from 'ui/capabilities';
-import { MANAGE_SPACES_URL } from '../lib/constants';
+import { Capabilities } from 'src/core/public';
+import { getManageSpacesUrl } from '../lib/constants';
 
 interface Props {
   isDisabled?: boolean;
   className?: string;
   size?: 's' | 'l';
   style?: CSSProperties;
   onClick?: () => void;
+  capabilities: Capabilities;
 }
 
 export class ManageSpacesButton extends Component<Props, {}> {
   public render() {
-    if (!capabilities.get().spaces.manage) {
+    if (!this.props.capabilities.spaces.manage) {
       return null;
     }
 
@@ -44,6 +45,6 @@ export class ManageSpacesButton extends Component<Props, {}> {
     if (this.props.onClick) {
       this.props.onClick();
     }
-    window.location.replace(MANAGE_SPACES_URL);
+    window.location.replace(getManageSpacesUrl());
   };
 }

x-pack/legacy/plugins/spaces/public/index.ts

@@ -0,0 +1,11 @@
+/*
+ * 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.
+ */
+import { PluginInitializerContext } from 'src/core/public';
+import { SpacesPlugin } from './plugin';
+
+export const plugin = (initializerContext: PluginInitializerContext) => {
+  return new SpacesPlugin(initializerContext);
+};

x-pack/legacy/plugins/spaces/public/legacy.ts

@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+import { npSetup, npStart } from 'ui/new_platform';
+import { FeatureCatalogueRegistryProvider } from 'ui/registry/feature_catalogue';
+import { plugin } from './index';
+import { SpacesPlugin, PluginsSetup } from './plugin';
+
+const spacesPlugin: SpacesPlugin = plugin({});
+
+const plugins: PluginsSetup = {
+  kibana: {
+    registerCatalogueFeature: fn => {
+      FeatureCatalogueRegistryProvider.register(fn);
+    },
+  },
+};
+
+export const setup = spacesPlugin.setup(npSetup.core);
+export const start = spacesPlugin.start(npStart.core, plugins);

x-pack/legacy/plugins/spaces/public/lib/constants.ts

@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import chrome from 'ui/chrome';
+import { npSetup } from 'ui/new_platform';
 
 let spacesFeatureDescription: string;
 
@@ -20,4 +20,5 @@ export const getSpacesFeatureDescription = () => {
   return spacesFeatureDescription;
 };
 
-export const MANAGE_SPACES_URL = chrome.addBasePath(`/app/kibana#/management/spaces/list`);
+export const getManageSpacesUrl = () =>
+  npSetup.core.http.basePath.prepend(`/app/kibana#/management/spaces/list`);

x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts

@@ -10,6 +10,7 @@ function createSpacesManagerMock() {
   return ({
     getSpaces: jest.fn().mockResolvedValue([]),
     getSpace: jest.fn().mockResolvedValue(undefined),
+    getActiveSpace: jest.fn().mockResolvedValue(undefined),
     createSpace: jest.fn().mockResolvedValue(undefined),
     updateSpace: jest.fn().mockResolvedValue(undefined),
     deleteSpace: jest.fn().mockResolvedValue(undefined),

x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts

@@ -4,58 +4,64 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { toastNotifications } from 'ui/notify';
 import { EventEmitter } from 'events';
-import { kfetch } from 'ui/kfetch';
+import { NotificationsSetup, HttpSetup } from 'src/core/public';
 import { Space } from '../../common/model/space';
 
 export class SpacesManager extends EventEmitter {
-  private spaceSelectorURL: string;
+  private activeSpace: Space | undefined;
 
-  constructor(spaceSelectorURL: string) {
+  constructor(
+    private readonly spaceSelectorURL: string,
+    private readonly http: HttpSetup,
+    private readonly notifications: NotificationsSetup
+  ) {
     super();
-    this.spaceSelectorURL = spaceSelectorURL;
   }
 
   public async getSpaces(): Promise<Space[]> {
-    return await kfetch({ pathname: '/api/spaces/space' });
+    return await this.http.get('/api/spaces/space');
   }
 
   public async getSpace(id: string): Promise<Space> {
-    return await kfetch({ pathname: `/api/spaces/space/${encodeURIComponent(id)}` });
+    return await this.http.get(`/api/spaces/space/${encodeURIComponent(id)}`);
+  }
+
+  public async getActiveSpace(forceRefresh: boolean = false): Promise<Space> {
+    if (!this.activeSpace || forceRefresh) {
+      this.activeSpace = (await this.http.get('/api/spaces/v1/activeSpace')) as Space;
+    }
+    return this.activeSpace;
   }
 
   public async createSpace(space: Space) {
-    return await kfetch({
-      pathname: `/api/spaces/space`,
-      method: 'POST',
-      body: JSON.stringify(space),
-    });
+    return this.http
+      .post(`/api/spaces/space`, {
+        body: JSON.stringify(space),
+      })
+      .then(() => this.requestRefresh());
   }
 
   public async updateSpace(space: Space) {
-    return await kfetch({
-      pathname: `/api/spaces/space/${encodeURIComponent(space.id)}`,
-      query: {
-        overwrite: true,
-      },
-      method: 'PUT',
-      body: JSON.stringify(space),
-    });
+    return this.http
+      .put(`/api/spaces/space/${encodeURIComponent(space.id)}`, {
+        query: {
+          overwrite: true,
+        },
+        body: JSON.stringify(space),
+      })
+      .then(() => this.requestRefresh());
   }
 
   public async deleteSpace(space: Space) {
-    return await kfetch({
-      pathname: `/api/spaces/space/${encodeURIComponent(space.id)}`,
-      method: 'DELETE',
-    });
+    return this.http
+      .delete(`/api/spaces/space/${encodeURIComponent(space.id)}`)
+      .then(() => this.requestRefresh());
   }
 
   public async changeSelectedSpace(space: Space) {
-    await kfetch({
-      pathname: `/api/spaces/v1/space/${encodeURIComponent(space.id)}/select`,
-      method: 'POST',
-    })
+    await this.http
+      .post(`/api/spaces/v1/space/${encodeURIComponent(space.id)}/select`)
       .then(response => {
         if (response.location) {
           window.location = response.location;
@@ -75,7 +81,7 @@ export class SpacesManager extends EventEmitter {
   }
 
   public _displayError() {
-    toastNotifications.addDanger({
+    this.notifications.toasts.addDanger({
       title: i18n.translate('xpack.spaces.spacesManager.unableToChangeSpaceWarningTitle', {
         defaultMessage: 'Unable to change your Space',
       }),

x-pack/legacy/plugins/spaces/public/plugin.tsx

@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
+import { FeatureCatalogueRegistryFunction } from 'ui/registry/feature_catalogue';
+import { SpacesManager } from './lib';
+import { initSpacesNavControl } from './views/nav_control';
+import { createSpacesFeatureCatalogueEntry } from './register_feature';
+
+export interface SpacesPluginStart {
+  spacesManager: SpacesManager;
+}
+
+export interface PluginsSetup {
+  kibana: {
+    registerCatalogueFeature: (fn: FeatureCatalogueRegistryFunction) => void;
+  };
+}
+
+export class SpacesPlugin implements Plugin<{}, SpacesPluginStart, PluginsSetup> {
+  private spacesManager: SpacesManager | undefined;
+
+  // @ts-ignore
+  constructor(private readonly initializerContext: PluginInitializerContext) {}
+
+  public async start(core: CoreStart, plugins: PluginsSetup) {
+    const { spaceSelectorUrl } = await core.http.get('/api/spaces/v1/npStart');
+    this.spacesManager = new SpacesManager(spaceSelectorUrl, core.http, core.notifications);
+
+    initSpacesNavControl(this.spacesManager, core);
+    plugins.kibana.registerCatalogueFeature(createSpacesFeatureCatalogueEntry);
+
+    return {
+      spacesManager: this.spacesManager,
+    };
+  }
+
+  public async setup(core: CoreSetup) {}
+}