Merge branch 'master' of github.com:elastic/kibana into 2020-02-26-action-types-2

Author: Stacey Gammon

src/plugins/es_ui_shared/public/request/request.test.js

@@ -18,7 +18,7 @@
  */
 
 import sinon from 'sinon';
-import { sendRequest as sendRequestUnbound, useRequest as useRequestUnbound } from './request';
+// import { sendRequest as sendRequestUnbound, useRequest as useRequestUnbound } from './request';
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
@@ -52,6 +52,11 @@ describe.skip('request lib', () => {
   let sendRequest;
   let useRequest;
 
+  /**
+   *
+   * commented out due to hooks being called regardless of skip
+   * https://github.com/facebook/jest/issues/8379
+
   beforeEach(() => {
     sendPost = sinon.stub();
     sendPost.withArgs(successRequest.path, successRequest.body).returns(successResponse);
@@ -67,6 +72,8 @@ describe.skip('request lib', () => {
     useRequest = useRequestUnbound.bind(null, httpClient);
   });
 
+  */
+
   describe('sendRequest function', () => {
     it('uses the provided path, method, and body to send the request', async () => {
       const response = await sendRequest({ ...successRequest });

test/functional/page_objects/visualize_page.ts

@@ -79,6 +79,10 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
       await this.waitForVisualizationSelectPage();
     }
 
+    public async hasVisType(type: string) {
+      return await testSubjects.exists(`visType-${type}`);
+    }
+
     public async clickVisType(type: string) {
       await testSubjects.click(`visType-${type}`);
       await header.waitUntilLoadingHasFinished();
@@ -100,6 +104,10 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
       await this.clickVisType('region_map');
     }
 
+    public async hasRegionMap() {
+      return await this.hasVisType('region_map');
+    }
+
     public async clickMarkdownWidget() {
       await this.clickVisType('markdown');
     }
@@ -120,6 +128,10 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
       await this.clickVisType('tile_map');
     }
 
+    public async hasTileMap() {
+      return await this.hasVisType('tile_map');
+    }
+
     public async clickTagCloud() {
       await this.clickVisType('tagcloud');
     }
@@ -144,6 +156,18 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
       await this.clickVisType('input_control_vis');
     }
 
+    public async clickLensWidget() {
+      await this.clickVisType('lens');
+    }
+
+    public async clickMapsApp() {
+      await this.clickVisType('maps');
+    }
+
+    public async hasMapsApp() {
+      return await this.hasVisType('maps');
+    }
+
     public async createSimpleMarkdownViz(vizName: string) {
       await this.gotoVisualizationLandingPage();
       await this.navigateToNewVisualization();
@@ -315,10 +339,6 @@ export function VisualizePageProvider({ getService, getPageObjects }: FtrProvide
         async () => (await globalNav.getLastBreadcrumb()) === vizName
       );
     }
-
-    public async clickLensWidget() {
-      await this.clickVisType('lens');
-    }
   }
 
   return new VisualizePage();

x-pack/legacy/plugins/ml/common/license/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 { MlLicense, LicenseStatus, MINIMUM_FULL_LICENSE, MINIMUM_LICENSE } from './ml_license';

x-pack/legacy/plugins/ml/common/license/ml_license.ts

@@ -0,0 +1,78 @@
+/*
+ * 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 { Observable, Subscription } from 'rxjs';
+import { ILicense, LICENSE_CHECK_STATE } from '../../../../../plugins/licensing/common/types';
+import { PLUGIN_ID } from '../constants/app';
+
+export const MINIMUM_LICENSE = 'basic';
+export const MINIMUM_FULL_LICENSE = 'platinum';
+
+export interface LicenseStatus {
+  isValid: boolean;
+  isSecurityEnabled: boolean;
+  message?: string;
+}
+
+export class MlLicense {
+  private _licenseSubscription: Subscription | null = null;
+  private _license: ILicense | null = null;
+  private _isSecurityEnabled: boolean = false;
+  private _hasLicenseExpired: boolean = false;
+  private _isMlEnabled: boolean = false;
+  private _isMinimumLicense: boolean = false;
+  private _isFullLicense: boolean = false;
+  private _initialized: boolean = false;
+
+  public setup(
+    license$: Observable<ILicense>,
+    postInitFunctions?: Array<(lic: MlLicense) => void>
+  ) {
+    this._licenseSubscription = license$.subscribe(async license => {
+      const { isEnabled: securityIsEnabled } = license.getFeature('security');
+
+      this._license = license;
+      this._isSecurityEnabled = securityIsEnabled;
+      this._hasLicenseExpired = this._license.status === 'expired';
+      this._isMlEnabled = this._license.getFeature(PLUGIN_ID).isEnabled;
+      this._isMinimumLicense =
+        this._license.check(PLUGIN_ID, MINIMUM_LICENSE).state === LICENSE_CHECK_STATE.Valid;
+      this._isFullLicense =
+        this._license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === LICENSE_CHECK_STATE.Valid;
+
+      if (this._initialized === false && postInitFunctions !== undefined) {
+        postInitFunctions.forEach(f => f(this));
+      }
+      this._initialized = true;
+    });
+  }
+
+  public unsubscribe() {
+    if (this._licenseSubscription !== null) {
+      this._licenseSubscription.unsubscribe();
+    }
+  }
+
+  public isSecurityEnabled() {
+    return this._isSecurityEnabled;
+  }
+
+  public hasLicenseExpired() {
+    return this._hasLicenseExpired;
+  }
+
+  public isMlEnabled() {
+    return this._isMlEnabled;
+  }
+
+  public isMinimumLicense() {
+    return this._isMinimumLicense;
+  }
+
+  public isFullLicense() {
+    return this._isFullLicense;
+  }
+}

x-pack/legacy/plugins/ml/public/application/app.tsx

@@ -13,15 +13,18 @@ import { AppMountParameters, CoreStart } from 'kibana/public';
 
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { SecurityPluginSetup } from '../../../../../plugins/security/public';
+import { LicensingPluginSetup } from '../../../../../plugins/licensing/public';
 
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { setDependencyCache, clearCache } from './util/dependency_cache';
+import { setLicenseCache } from './license';
 
 import { MlRouter } from './routing';
 
 export interface MlDependencies extends AppMountParameters {
   data: DataPublicPluginStart;
   security: SecurityPluginSetup;
+  licensing: LicensingPluginSetup;
   __LEGACY: {
     XSRF: string;
   };
@@ -36,22 +39,26 @@ const App: FC<AppProps> = ({ coreStart, deps }) => {
   setDependencyCache({
     indexPatterns: deps.data.indexPatterns,
     timefilter: deps.data.query.timefilter,
+    fieldFormats: deps.data.fieldFormats,
+    autocomplete: deps.data.autocomplete,
     config: coreStart.uiSettings!,
     chrome: coreStart.chrome!,
     docLinks: coreStart.docLinks!,
     toastNotifications: coreStart.notifications.toasts,
     overlays: coreStart.overlays,
     recentlyAccessed: coreStart.chrome!.recentlyAccessed,
-    fieldFormats: deps.data.fieldFormats,
-    autocomplete: deps.data.autocomplete,
     basePath: coreStart.http.basePath,
     savedObjectsClient: coreStart.savedObjects.client,
     XSRF: deps.__LEGACY.XSRF,
     application: coreStart.application,
     http: coreStart.http,
     security: deps.security,
   });
+
+  const mlLicense = setLicenseCache(deps.licensing);
+
   deps.onAppLeave(actions => {
+    mlLicense.unsubscribe();
     clearCache();
     return actions.default();
   });

x-pack/legacy/plugins/ml/public/application/components/anomalies_table/anomalies_table.test.js

@@ -11,7 +11,7 @@ import { getColumns } from './anomalies_table_columns';
 jest.mock('../../privilege/check_privilege', () => ({
   checkPermission: () => false,
 }));
-jest.mock('../../license/check_license', () => ({
+jest.mock('../../license', () => ({
   hasLicenseExpired: () => false,
 }));
 jest.mock('../../privilege/get_privileges', () => ({

x-pack/legacy/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx

@@ -81,13 +81,18 @@ export const MainTabs: FC<Props> = ({ tabId, disableLinks }) => {
   return (
     <EuiTabs display="condensed">
       {tabs.map((tab: Tab) => {
-        const id = tab.id;
+        const { id, disabled } = tab;
         const testSubject = TAB_DATA[id].testSubject;
         const defaultPathId = TAB_DATA[id].pathId || id;
         // globalState (e.g. selected jobs and time range) should be retained when changing pages.
         // appState will not be considered.
         const fullGlobalStateString = globalState !== undefined ? `?_g=${encode(globalState)}` : '';
-        return (
+
+        return disabled ? (
+          <EuiTab key={`${id}-key`} className={'mlNavigationMenu__mainTab'} disabled={true}>
+            {tab.name}
+          </EuiTab>
+        ) : (
           <EuiLink
             data-test-subj={testSubject + (id === selectedTabId ? ' selected' : '')}
             href={`#/${defaultPathId}${fullGlobalStateString}`}
@@ -98,7 +103,6 @@ export const MainTabs: FC<Props> = ({ tabId, disableLinks }) => {
               className={'mlNavigationMenu__mainTab'}
               onClick={() => onSelectedTabChanged(id)}
               isSelected={id === selectedTabId}
-              disabled={tab.disabled}
             >
               {tab.name}
             </EuiTab>

x-pack/legacy/plugins/ml/public/application/components/navigation_menu/navigation_menu.tsx

@@ -7,7 +7,7 @@
 import React, { Fragment, FC } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 
-import { isFullLicense } from '../../license/check_license';
+import { isFullLicense } from '../../license';
 
 import { TopNav } from './top_nav';
 import { MainTabs } from './main_tabs';

x-pack/legacy/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx

@@ -22,7 +22,7 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-import { isFullLicense } from '../license/check_license';
+import { isFullLicense } from '../license';
 import { useTimefilter } from '../contexts/kibana';
 
 import { NavigationMenu } from '../components/navigation_menu';

x-pack/legacy/plugins/ml/public/application/datavisualizer/file_based/components/results_links/results_links.tsx

@@ -9,7 +9,7 @@ import moment from 'moment';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui';
 import { ml } from '../../../../services/ml_api_service';
-import { isFullLicense } from '../../../../license/check_license';
+import { isFullLicense } from '../../../../license';
 import { checkPermission } from '../../../../privilege/check_privilege';
 import { mlNodesAvailable } from '../../../../ml_nodes_check/check_ml_nodes';
 import { useMlKibana } from '../../../../contexts/kibana';