Merge branch 'master' into implement/plugins-declare-required-bundles

.eslintrc.js

@@ -906,6 +906,18 @@ module.exports = {
       },
     },
 
+    /**
+     * Enterprise Search overrides
+     */
+    {
+      files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
+      excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'],
+      rules: {
+        'react-hooks/exhaustive-deps': 'off',
+        '@typescript-eslint/no-explicit-any': 'error',
+      },
+    },
+
     /**
      * disable jsx-a11y for kbn-ui-framework
      */

.github/CODEOWNERS

@@ -201,6 +201,11 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Design
 **/*.scss  @elastic/kibana-design
 
+# Enterprise Search
+/x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
+/x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
+
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui
 /src/plugins/console/  @elastic/es-ui

docs/management/managing-licenses.asciidoc

@@ -1,28 +1,27 @@
 [[managing-licenses]]
 == License Management
 
-When you install the default distribution of {kib}, you receive a basic license
-with no expiration date. For the full list of free features that are included in
-the basic license, refer to https://www.elastic.co/subscriptions[the subscription page].
+When you install the default distribution of {kib}, you receive free features
+with no expiration date. For the full list of features, refer to
+{subscriptions}.
 
-If you want to try out the full set of platinum features, you can activate a
-30-day trial license. To view the
-status of your license, start a trial, or install a new license, open the menu, then go to *Stack Management > {es} > License Management*.
+If you want to try out the full set of features, you can activate a free 30-day
+trial. To view the status of your license, start a trial, or install a new
+license, open the menu, then go to *Stack Management > {es} > License Management*.
 
 NOTE: You can start a trial only if your cluster has not already activated a
 trial license for the current major product version. For example, if you have
 already activated a trial for 6.0, you cannot start a new trial until
-7.0. You can, however, contact `info@elastic.co` to request an extended trial
-license.
+7.0. You can, however, request an extended trial at {extendtrial}.
 
 When you activate a new license level, new features appear in *Stack Management*.
 
 [role="screenshot"]
 image::images/management-license.png[]
 
-At the end of the trial period, the platinum features operate in a
-<<license-expiration,degraded mode>>. You can revert to a basic license,
-extend the trial, or purchase a subscription.
+At the end of the trial period, some features operate in a
+<<license-expiration,degraded mode>>. You can revert to Basic, extend the trial,
+or purchase a subscription.
 
 TIP: If {security-features} are enabled, unless you have a trial license,
 you must configure Transport Layer Security (TLS) in {es}.

packages/kbn-test/src/functional_test_runner/lib/config/schema.ts

@@ -148,7 +148,7 @@ export const schema = Joi.object()
 
     browser: Joi.object()
       .keys({
-        type: Joi.string().valid('chrome', 'firefox', 'ie', 'msedge').default('chrome'),
+        type: Joi.string().valid('chrome', 'firefox', 'msedge').default('chrome'),
 
         logPollingMs: Joi.number().default(100),
         acceptInsecureCerts: Joi.boolean().default(false),

src/core/public/public.api.md

@@ -582,6 +582,12 @@ export const DEFAULT_APP_CATEGORIES: Readonly<{
         euiIconType: string;
         order: number;
     };
+    enterpriseSearch: {
+        id: string;
+        label: string;
+        order: number;
+        euiIconType: string;
+    };
     observability: {
         id: string;
         label: string;

src/core/server/server.api.md

@@ -566,6 +566,12 @@ export const DEFAULT_APP_CATEGORIES: Readonly<{
         euiIconType: string;
         order: number;
     };
+    enterpriseSearch: {
+        id: string;
+        label: string;
+        order: number;
+        euiIconType: string;
+    };
     observability: {
         id: string;
         label: string;

src/core/utils/default_app_categories.ts

@@ -29,20 +29,28 @@ export const DEFAULT_APP_CATEGORIES = Object.freeze({
     euiIconType: 'logoKibana',
     order: 1000,
   },
+  enterpriseSearch: {
+    id: 'enterpriseSearch',
+    label: i18n.translate('core.ui.enterpriseSearchNavList.label', {
+      defaultMessage: 'Enterprise Search',
+    }),
+    order: 2000,
+    euiIconType: 'logoEnterpriseSearch',
+  },
   observability: {
     id: 'observability',
     label: i18n.translate('core.ui.observabilityNavList.label', {
       defaultMessage: 'Observability',
     }),
     euiIconType: 'logoObservability',
-    order: 2000,
+    order: 3000,
   },
   security: {
     id: 'security',
     label: i18n.translate('core.ui.securityNavList.label', {
       defaultMessage: 'Security',
     }),
-    order: 3000,
+    order: 4000,
     euiIconType: 'logoSecurity',
   },
   management: {

test/functional/apps/home/_navigation.ts

@@ -26,21 +26,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'header', 'home', 'timePicker']);
   const appsMenu = getService('appsMenu');
   const esArchiver = getService('esArchiver');
-  const kibanaServer = getService('kibanaServer');
 
   describe('Kibana browser back navigation should work', function describeIndexTests() {
     before(async () => {
       await esArchiver.loadIfNeeded('discover');
       await esArchiver.loadIfNeeded('logstash_functional');
-      if (browser.isInternetExplorer) {
-        await kibanaServer.uiSettings.replace({ 'state:storeInSessionStorage': false });
-      }
-    });
-
-    after(async () => {
-      if (browser.isInternetExplorer) {
-        await kibanaServer.uiSettings.replace({ 'state:storeInSessionStorage': true });
-      }
     });
 
     it('detect navigate back issues', async () => {

test/functional/page_objects/time_picker.ts

@@ -98,13 +98,6 @@ export function TimePickerProvider({ getService, getPageObjects }: FtrProviderCo
         const input = await testSubjects.find(dataTestSubj);
         await input.clearValue();
         await input.type(value);
-      } else if (browser.isInternetExplorer) {
-        const input = await testSubjects.find(dataTestSubj);
-        const currentValue = await input.getAttribute('value');
-        await input.type(browser.keys.ARROW_RIGHT.repeat(currentValue.length));
-        await input.type(browser.keys.BACK_SPACE.repeat(currentValue.length));
-        await input.type(value);
-        await input.click();
       } else {
         await testSubjects.setValue(dataTestSubj, value);
       }

test/functional/services/common/browser.ts

@@ -34,8 +34,6 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
   const log = getService('log');
   const { driver, browserType } = await getService('__webdriver__').init();
 
-  const isW3CEnabled = (driver as any).executor_.w3c === true;
-
   return new (class BrowserService {
     /**
      * Keyboard events
@@ -53,19 +51,12 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
 
     public readonly isFirefox: boolean = browserType === Browsers.Firefox;
 
-    public readonly isInternetExplorer: boolean = browserType === Browsers.InternetExplorer;
-
-    /**
-     * Is WebDriver instance W3C compatible
-     */
-    isW3CEnabled = isW3CEnabled;
-
     /**
      * Returns instance of Actions API based on driver w3c flag
      * https://seleniumhq.github.io/selenium/docs/api/javascript/module/selenium-webdriver/lib/webdriver_exports_WebDriver.html#actions
      */
     public getActions() {
-      return this.isW3CEnabled ? driver.actions() : driver.actions({ bridge: true });
+      return driver.actions();
     }
 
     /**
@@ -164,12 +155,7 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
      */
     public async getCurrentUrl() {
       // strip _t=Date query param when url is read
-      let current: string;
-      if (this.isInternetExplorer) {
-        current = await driver.executeScript('return window.document.location.href');
-      } else {
-        current = await driver.getCurrentUrl();
-      }
+      const current = await driver.getCurrentUrl();
       const currentWithoutTime = modifyUrl(current, (parsed) => {
         delete (parsed.query as any)._t;
         return void 0;
@@ -214,15 +200,8 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
      * @return {Promise<void>}
      */
     public async moveMouseTo(point: { x: number; y: number }): Promise<void> {
-      if (this.isW3CEnabled) {
-        await this.getActions().move({ x: 0, y: 0 }).perform();
-        await this.getActions().move({ x: point.x, y: point.y, origin: Origin.POINTER }).perform();
-      } else {
-        await this.getActions()
-          .pause(this.getActions().mouse)
-          .move({ x: point.x, y: point.y, origin: Origin.POINTER })
-          .perform();
-      }
+      await this.getActions().move({ x: 0, y: 0 }).perform();
+      await this.getActions().move({ x: point.x, y: point.y, origin: Origin.POINTER }).perform();
     }
 
     /**
@@ -237,44 +216,20 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
       from: { offset?: { x: any; y: any }; location: any },
       to: { offset?: { x: any; y: any }; location: any }
     ) {
-      if (this.isW3CEnabled) {
-        // The offset should be specified in pixels relative to the center of the element's bounding box
-        const getW3CPoint = (data: any) => {
-          if (!data.offset) {
-            data.offset = {};
-          }
-          return data.location instanceof WebElementWrapper
-            ? { x: data.offset.x || 0, y: data.offset.y || 0, origin: data.location._webElement }
-            : { x: data.location.x, y: data.location.y, origin: Origin.POINTER };
-        };
-
-        const startPoint = getW3CPoint(from);
-        const endPoint = getW3CPoint(to);
-        await this.getActions().move({ x: 0, y: 0 }).perform();
-        return await this.getActions().move(startPoint).press().move(endPoint).release().perform();
-      } else {
-        // The offset should be specified in pixels relative to the top-left corner of the element's bounding box
-        const getOffset: any = (offset: { x: number; y: number }) =>
-          offset ? { x: offset.x || 0, y: offset.y || 0 } : { x: 0, y: 0 };
-
-        if (from.location instanceof WebElementWrapper === false) {
-          throw new Error('Dragging point should be WebElementWrapper instance');
-        } else if (typeof to.location.x === 'number') {
-          return await this.getActions()
-            .move({ origin: from.location._webElement })
-            .press()
-            .move({ x: to.location.x, y: to.location.y, origin: Origin.POINTER })
-            .release()
-            .perform();
-        } else {
-          return await new LegacyActionSequence(driver)
-            .mouseMove(from.location._webElement, getOffset(from.offset))
-            .mouseDown()
-            .mouseMove(to.location._webElement, getOffset(to.offset))
-            .mouseUp()
-            .perform();
+      // The offset should be specified in pixels relative to the center of the element's bounding box
+      const getW3CPoint = (data: any) => {
+        if (!data.offset) {
+          data.offset = {};
         }
-      }
+        return data.location instanceof WebElementWrapper
+          ? { x: data.offset.x || 0, y: data.offset.y || 0, origin: data.location._webElement }
+          : { x: data.location.x, y: data.location.y, origin: Origin.POINTER };
+      };
+
+      const startPoint = getW3CPoint(from);
+      const endPoint = getW3CPoint(to);
+      await this.getActions().move({ x: 0, y: 0 }).perform();
+      return await this.getActions().move(startPoint).press().move(endPoint).release().perform();
     }
 
     /**
@@ -341,19 +296,11 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
      * @return {Promise<void>}
      */
     public async clickMouseButton(point: { x: number; y: number }) {
-      if (this.isW3CEnabled) {
-        await this.getActions().move({ x: 0, y: 0 }).perform();
-        await this.getActions()
-          .move({ x: point.x, y: point.y, origin: Origin.POINTER })
-          .click()
-          .perform();
-      } else {
-        await this.getActions()
-          .pause(this.getActions().mouse)
-          .move({ x: point.x, y: point.y, origin: Origin.POINTER })
-          .click()
-          .perform();
-      }
+      await this.getActions().move({ x: 0, y: 0 }).perform();
+      await this.getActions()
+        .move({ x: point.x, y: point.y, origin: Origin.POINTER })
+        .click()
+        .perform();
     }
 
     /**