Reorganize Management apps into Ingest, Data, Alerts and Insights, Security, Kibana, and Stack groups

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index.js

@@ -18,6 +18,7 @@
  */
 
 import { management } from 'ui/management';
+import { ManagementSectionId } from '../../../../../../../plugins/management/public';
 import './create_index_pattern_wizard';
 import './edit_index_pattern';
 import uiRoutes from 'ui/routes';
@@ -163,10 +164,10 @@ uiModules
     };
   });
 
-management.getSection('kibana').register('index_patterns', {
+management.getSection(ManagementSectionId.Data).register('index_patterns', {
   display: i18n.translate('kbn.management.indexPattern.sectionsHeader', {
     defaultMessage: 'Index Patterns',
   }),
-  order: 0,
+  order: 1,
   url: '#/management/kibana/index_patterns/',
 });

src/plugins/advanced_settings/public/plugin.ts

@@ -18,7 +18,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { ManagementApp } from '../../management/public';
+import { ManagementApp, ManagementSectionId } from '../../management/public';
 import { ComponentRegistry } from './component_registry';
 import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
 
@@ -32,10 +32,7 @@ export class AdvancedSettingsPlugin
   implements Plugin<AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup> {
   private managementApp?: ManagementApp;
   public setup(core: CoreSetup, { management }: AdvancedSettingsPluginSetup) {
-    const kibanaSection = management.sections.getSection('kibana');
-    if (!kibanaSection) {
-      throw new Error('`kibana` management section not found.');
-    }
+    const kibanaSection = management.sections.getSection(ManagementSectionId.Kibana);
 
     this.managementApp = kibanaSection.registerApp({
       id: 'settings',

src/plugins/management/public/index.ts

@@ -28,6 +28,7 @@ export {
   ManagementSetup,
   ManagementStart,
   RegisterManagementApp,
+  ManagementSectionId,
   RegisterManagementAppArgs,
   ManagementAppMountParams,
 } from './types';

src/plugins/management/public/legacy/index.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-export { LegacyManagementAdapter } from './sections_register';
+export { LegacyManagementAdapter, sections } from './sections_register';
 export { LegacyManagementSection } from './section';

src/plugins/management/public/legacy/sections_register.js

@@ -17,8 +17,9 @@
  * under the License.
  */
 
-import { LegacyManagementSection } from './section';
 import { i18n } from '@kbn/i18n';
+import { LegacyManagementSection } from './section';
+import { managementSections } from '../management_section';
 
 export class LegacyManagementAdapter {
   main = undefined;
@@ -33,29 +34,11 @@ export class LegacyManagementAdapter {
       capabilities
     );
 
-    this.main.register('data', {
-      display: i18n.translate('management.connectDataDisplayName', {
-        defaultMessage: 'Connect Data',
-      }),
-      order: 0,
-    });
-
-    this.main.register('elasticsearch', {
-      display: 'Elasticsearch',
-      order: 20,
-      icon: 'logoElasticsearch',
-    });
-
-    this.main.register('kibana', {
-      display: 'Kibana',
-      order: 30,
-      icon: 'logoKibana',
-    });
-
-    this.main.register('logstash', {
-      display: 'Logstash',
-      order: 30,
-      icon: 'logoLogstash',
+    managementSections.forEach(({ id, title }, idx) => {
+      this.main.register(id, {
+        display: title,
+        order: idx,
+      });
     });
 
     return this.main;

src/plugins/management/public/management_section.test.ts

@@ -18,6 +18,7 @@
  */
 
 import { ManagementSection } from './management_section';
+import { ManagementSectionId } from './types';
 // @ts-ignore
 import { LegacyManagementSection } from './legacy';
 import { coreMock } from '../../../core/public/mocks';
@@ -27,7 +28,7 @@ function createSection(registerLegacyApp: () => void) {
   const getLegacySection = () => legacySection;
   const getManagementSections: () => ManagementSection[] = () => [];
 
-  const testSectionConfig = { id: 'test-section', title: 'Test Section' };
+  const testSectionConfig = { id: ManagementSectionId.Data, title: 'Test Section' };
   return new ManagementSection(
     testSectionConfig,
     getManagementSections,

src/plugins/management/public/management_section.ts

@@ -17,15 +17,42 @@
  * under the License.
  */
 
-import { CreateSection, RegisterManagementAppArgs } from './types';
+import { CreateSection, RegisterManagementAppArgs, ManagementSectionId } from './types';
 import { KibanaLegacySetup } from '../../kibana_legacy/public';
 import { StartServicesAccessor } from '../../../core/public';
 // @ts-ignore
 import { LegacyManagementSection } from './legacy';
 import { ManagementApp } from './management_app';
 
+export const managementSections = [
+  {
+    id: ManagementSectionId.Ingest,
+    title: 'Ingest',
+  },
+  {
+    id: ManagementSectionId.Data,
+    title: 'Data',
+  },
+  {
+    id: ManagementSectionId.InsightsAndAlerting,
+    title: 'Insights and Alerting',
+  },
+  {
+    id: ManagementSectionId.Security,
+    title: 'Security',
+  },
+  {
+    id: ManagementSectionId.Kibana,
+    title: 'Kibana',
+  },
+  {
+    id: ManagementSectionId.Stack,
+    title: 'Stack',
+  },
+];
+
 export class ManagementSection {
-  public readonly id: string = '';
+  public readonly id: ManagementSectionId;
   public readonly title: string = '';
   public readonly apps: ManagementApp[] = [];
   public readonly order: number;

src/plugins/management/public/management_service.test.ts

@@ -18,6 +18,7 @@
  */
 
 import { ManagementService } from './management_service';
+import { ManagementSectionId } from './types';
 import { coreMock } from '../../../core/public/mocks';
 import { npSetup } from '../../../legacy/ui/public/new_platform/__mocks__';
 
@@ -29,27 +30,11 @@ test('Provides default sections', () => {
     () => {},
     coreMock.createSetup().getStartServices
   );
-  expect(service.getAllSections().length).toEqual(2);
-  expect(service.getSection('kibana')).not.toBeUndefined();
-  expect(service.getSection('elasticsearch')).not.toBeUndefined();
-});
-
-test('Register section, enable and disable', () => {
-  const service = new ManagementService().setup(
-    npSetup.plugins.kibanaLegacy,
-    () => {},
-    coreMock.createSetup().getStartServices
-  );
-  const testSection = service.register({ id: 'test-section', title: 'Test Section' });
-  expect(service.getSection('test-section')).not.toBeUndefined();
-
-  const testApp = testSection.registerApp({
-    id: 'test-app',
-    title: 'Test App',
-    mount: () => () => {},
-  });
-  expect(testSection.getApp('test-app')).not.toBeUndefined();
-  expect(service.getSectionsEnabled().length).toEqual(1);
-  testApp.disable();
-  expect(service.getSectionsEnabled().length).toEqual(0);
+  expect(service.getAllSections().length).toEqual(6);
+  expect(service.getSection(ManagementSectionId.Ingest)).toBeDefined();
+  expect(service.getSection(ManagementSectionId.Data)).toBeDefined();
+  expect(service.getSection(ManagementSectionId.InsightsAndAlerting)).toBeDefined();
+  expect(service.getSection(ManagementSectionId.Security)).toBeDefined();
+  expect(service.getSection(ManagementSectionId.Kibana)).toBeDefined();
+  expect(service.getSection(ManagementSectionId.Stack)).toBeDefined();
 });

src/plugins/management/public/management_service.ts

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { ManagementSection } from './management_section';
+import { ManagementSection, managementSections } from './management_section';
 import { KibanaLegacySetup } from '../../kibana_legacy/public';
 // @ts-ignore
-import { LegacyManagementSection } from './legacy';
-import { CreateSection } from './types';
+import { LegacyManagementSection, sections } from './legacy';
+import { CreateSection, ManagementSectionId } from './types';
 import { StartServicesAccessor, CoreStart } from '../../../core/public';
 
 export class ManagementService {
@@ -48,8 +48,9 @@ export class ManagementService {
       return newSection;
     };
   }
-  private getSection(sectionId: ManagementSection['id']) {
-    return this.sections.find(section => section.id === sectionId);
+
+  private getSection(sectionId: ManagementSectionId): ManagementSection {
+    return this.sections.find(section => section.id === sectionId) as ManagementSection;
   }
 
   private getAllSections() {
@@ -79,16 +80,13 @@ export class ManagementService {
       getStartServices
     );
 
-    register({ id: 'kibana', title: 'Kibana', order: 30, euiIconType: 'logoKibana' });
-    register({
-      id: 'elasticsearch',
-      title: 'Elasticsearch',
-      order: 20,
-      euiIconType: 'logoElasticsearch',
-    });
+    managementSections.forEach(
+      ({ id, title }: { id: ManagementSectionId; title: string }, idx: number) => {
+        register({ id, title, order: idx });
+      }
+    );
 
     return {
-      register,
       ...this.sharedInterface,
     };
   }

src/plugins/management/public/mocks/index.ts

@@ -30,7 +30,6 @@ const createManagementSectionMock = (): jest.Mocked<PublicMethodsOf<ManagementSe
 
 const createSetupContract = (): DeeplyMockedKeys<ManagementSetup> => ({
   sections: {
-    register: jest.fn(),
     getSection: jest.fn().mockReturnValue(createManagementSectionMock()),
     getAllSections: jest.fn().mockReturnValue([]),
   },

src/plugins/management/public/types.ts

@@ -17,6 +17,25 @@
  * under the License.
  */
 
+/*
+ * 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 { IconType } from '@elastic/eui';
 import { ManagementApp } from './management_app';
 import { ManagementSection } from './management_section';
@@ -31,10 +50,18 @@ export interface ManagementStart {
   legacy: any;
 }
 
+export enum ManagementSectionId {
+  Ingest = 'ingest',
+  Data = 'data',
+  InsightsAndAlerting = 'insightsAndAlerting',
+  Security = 'security',
+  Kibana = 'kibana',
+  Stack = 'stack',
+}
+
 interface SectionsServiceSetup {
   getSection: (sectionId: ManagementSection['id']) => ManagementSection | undefined;
   getAllSections: () => ManagementSection[];
-  register: RegisterSection;
 }
 
 interface SectionsServiceStart {
@@ -44,7 +71,7 @@ interface SectionsServiceStart {
 }
 
 export interface CreateSection {
-  id: string;
+  id: ManagementSectionId;
   title: string;
   order?: number;
   euiIconType?: string; // takes precedence over `icon` property.

src/plugins/saved_objects_management/public/plugin.ts

@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
-import { ManagementSetup } from '../../management/public';
+import { ManagementSetup, ManagementSectionId } from '../../management/public';
 import { DataPublicPluginStart } from '../../data/public';
 import { DashboardStart } from '../../dashboard/public';
 import { DiscoverStart } from '../../discover/public';
@@ -87,10 +87,7 @@ export class SavedObjectsManagementPlugin
       category: FeatureCatalogueCategory.ADMIN,
     });
 
-    const kibanaSection = management.sections.getSection('kibana');
-    if (!kibanaSection) {
-      throw new Error('`kibana` management section not found.');
-    }
+    const kibanaSection = management.sections.getSection(ManagementSectionId.Kibana);
     kibanaSection.registerApp({
       id: 'objects',
       title: i18n.translate('savedObjectsManagement.managementSectionLabel', {

x-pack/legacy/plugins/beats_management/common/constants/index.ts

@@ -9,4 +9,4 @@ export { INDEX_NAMES } from './index_names';
 export { PLUGIN } from './plugin';
 export { LICENSES, REQUIRED_LICENSES, REQUIRED_ROLES } from './security';
 export { TABLE_CONFIG } from './table';
-export const BASE_PATH = '/management/beats_management';
+export const BASE_PATH = '/management/ingest/beats_management';

x-pack/legacy/plugins/beats_management/public/index.tsx

@@ -26,7 +26,7 @@ async function startApp(libs: FrontendLibs) {
     BASE_PATH,
     <ThemeProvider theme={{ eui: euiVars }}>
       <I18nContext>
-        <HashRouter basename="/management/beats_management">
+        <HashRouter basename={BASE_PATH}>
           <UnstatedProvider inject={[new BeatsContainer(libs), new TagsContainer(libs)]}>
             <BreadcrumbProvider useGlobalBreadcrumbs={libs.framework.versionGreaterThen('6.7.0')}>
               <Subscribe to={[BeatsContainer, TagsContainer]}>
@@ -52,21 +52,7 @@ async function startApp(libs: FrontendLibs) {
   await libs.framework.waitUntilFrameworkReady();
 
   if (libs.framework.licenseIsAtLeast('standard')) {
-    libs.framework.registerManagementSection({
-      id: 'beats',
-      name: i18n.translate('xpack.beatsManagement.centralManagementSectionLabel', {
-        defaultMessage: 'Beats',
-      }),
-      iconName: 'logoBeats',
-    });
-
-    libs.framework.registerManagementUI({
-      sectionId: 'beats',
-      name: i18n.translate('xpack.beatsManagement.centralManagementLinkLabel', {
-        defaultMessage: 'Central Management',
-      }),
-      basePath: BASE_PATH,
-    });
+    libs.framework.registerManagementSection();
   }
 }
 

x-pack/legacy/plugins/beats_management/public/lib/adapters/framework/adapter_types.ts

@@ -21,19 +21,7 @@ export interface FrameworkAdapter {
     component: React.ReactElement<any>,
     toController: 'management' | 'self'
   ): void;
-  registerManagementSection(settings: {
-    id?: string;
-    name: string;
-    iconName: string;
-    order?: number;
-  }): void;
-  registerManagementUI(settings: {
-    sectionId?: string;
-    name: string;
-    basePath: string;
-    visable?: boolean;
-    order?: number;
-  }): void;
+  registerManagementSection(): void;
 }
 
 export const RuntimeFrameworkInfo = t.type({