Add missing first() pipe operator to read license$

elastic · Mar 16, 2020 · 761e9fa · 761e9fa
1 parent 8a62038
commit 761e9fa
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/x-pack/plugins/license_management/common/constants/plugin.ts b/x-pack/plugins/license_management/common/constants/plugin.ts
@@ -9,5 +9,5 @@ export const PLUGIN = {
   title: i18n.translate('xpack.licenseMgmt.managementSectionDisplayName', {
     defaultMessage: 'License Management',
   }),
-  id: 'licenseManagement',
+  id: 'license_management',
 };
diff --git a/x-pack/plugins/license_management/kibana.json b/x-pack/plugins/license_management/kibana.json
@@ -3,10 +3,7 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": [
-    "home",
-    "management",
-    "licensing"
-  ],
+  "requiredPlugins": ["home", "licensing", "management"],
+  "optionalPlugins": ["telemetry"],
   "configPath": ["xpack", "license_management"]
 }
diff --git a/x-pack/plugins/license_management/public/application/app_context.tsx b/x-pack/plugins/license_management/public/application/app_context.tsx
@@ -20,8 +20,8 @@ export interface AppDependencies {
     breadcrumbService: BreadcrumbService;
   };
   plugins: {
-    telemetry: TelemetryPluginSetup;
     licensing: LicensingPluginSetup;
+    telemetry?: TelemetryPluginSetup;
   };
   docLinks: {
     security: string;

diff --git a/x-pack/plugins/license_management/public/index.ts b/x-pack/plugins/license_management/public/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { PluginInitializerContext } from 'src/core/public';
+
 import { LicenseManagementUIPlugin } from './plugin';
 import './application/index.scss';
 

diff --git a/x-pack/plugins/license_management/public/plugin.ts b/x-pack/plugins/license_management/public/plugin.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { first } from 'rxjs/operators';
 import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
 
 import { TelemetryPluginSetup } from '../../../../src/plugins/telemetry/public';
@@ -15,9 +15,9 @@ import { AppDependencies } from './application';
 import { BreadcrumbService } from './application/breadcrumbs';
 
 interface PluginsDependencies {
-  telemetry: TelemetryPluginSetup;
   management: ManagementSetup;
   licensing: LicensingPluginSetup;
+  telemetry?: TelemetryPluginSetup;
 }
 
 export class LicenseManagementUIPlugin implements Plugin<void, void, any, any> {
@@ -34,40 +34,45 @@ export class LicenseManagementUIPlugin implements Plugin<void, void, any, any> {
     }
 
     const { getStartServices } = coreSetup;
-    const { management } = plugins;
+    const { management, telemetry, licensing } = plugins;
 
     management.sections.getSection('elasticsearch')!.registerApp({
       id: PLUGIN.id,
       title: PLUGIN.title,
       order: 99,
       mount: async ({ element, setBreadcrumbs }) => {
         const [core] = await getStartServices();
-        const initialLicense = await plugins.licensing.license$.toPromise();
+        const initialLicense = await plugins.licensing.license$.pipe(first()).toPromise();
 
         // Setup documentation links
         const { docLinks } = core;
         const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
         const esBase = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}`;
+        const appDocLinks = {
+          security: `${esBase}/security-settings.html`,
+        };
 
         // Setup services
         this.breadcrumbService.setup(setBreadcrumbs);
 
         const appDependencies: AppDependencies = {
           core,
           config,
-          plugins,
+          plugins: {
+            licensing,
+            telemetry,
+          },
           services: {
             breadcrumbService: this.breadcrumbService,
           },
           store: {
             initialLicense,
           },
-          docLinks: {
-            security: `${esBase}/security-settings.html`,
-          },
+          docLinks: appDocLinks,
         };
 
         const { renderApp } = await import('./application');
+
         return renderApp(element, appDependencies);
       },
     });