[Discover] Optimize Discover plugin page load bundle

packages/kbn-optimizer/limits.yml

@@ -35,7 +35,7 @@ pageLoadAssetSize:
   dataViews: 65000
   dataVisualizer: 30000
   devTools: 38637
-  discover: 99999
+  discover: 25000
   discoverEnhanced: 42730
   discoverShared: 17111
   embeddable: 24000

src/platform/plugins/shared/discover/common/app_locator.test.ts

@@ -14,9 +14,11 @@ import {
 } from '@kbn/kibana-utils-plugin/public';
 import { mockStorage } from '@kbn/kibana-utils-plugin/public/storage/hashed_item_store/mock';
 import { FilterStateStore } from '@kbn/es-query';
-import { DiscoverAppLocatorDefinition } from './app_locator';
+import type { DiscoverAppLocatorParams } from './app_locator';
+import { DISCOVER_APP_LOCATOR } from './app_locator';
 import type { SerializableRecord } from '@kbn/utility-types';
 import { createDataViewDataSource, createEsqlDataSource } from './data_sources';
+import { appLocatorGetLocationCommon } from './app_locator_get_location';
 
 const dataViewId: string = 'c367b774-a4c2-11ea-bb37-0242ac130002';
 const savedSearchId: string = '571aaf70-4c88-11e8-b3d7-01146121b73d';
@@ -26,11 +28,14 @@ interface SetupParams {
 }
 
 const setup = async ({ useHash = false }: SetupParams = {}) => {
-  const locator = new DiscoverAppLocatorDefinition({ useHash, setStateToKbnUrl });
-
-  return {
-    locator,
+  const locator = {
+    id: DISCOVER_APP_LOCATOR,
+    getLocation: (params: DiscoverAppLocatorParams) => {
+      return appLocatorGetLocationCommon({ useHash, setStateToKbnUrl }, params);
+    },
   };
+
+  return { locator };
 };
 
 beforeEach(() => {
@@ -267,7 +272,7 @@ describe('Discover url generator', () => {
     const { locator } = await setup();
     const { state } = await locator.getLocation({ dataViewSpec: dataViewSpecMock });
 
-    expect(state.dataViewSpec).toEqual(dataViewSpecMock);
+    expect((state as Record<string, unknown>).dataViewSpec).toEqual(dataViewSpecMock);
   });
 
   describe('useHash property', () => {

src/platform/plugins/shared/discover/common/app_locator.ts

@@ -9,15 +9,11 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import type { Filter, TimeRange, Query, AggregateQuery } from '@kbn/es-query';
-import { isOfAggregateQueryType } from '@kbn/es-query';
-import type { GlobalQueryStateFromUrl, RefreshInterval } from '@kbn/data-plugin/public';
+import type { RefreshInterval } from '@kbn/data-plugin/public';
 import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 import type { DiscoverGridSettings } from '@kbn/saved-search-plugin/common';
 import type { DataViewSpec } from '@kbn/data-views-plugin/common';
-import type { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/common';
 import type { VIEW_MODE } from './constants';
-import type { DiscoverAppState } from '../public';
-import { createDataViewDataSource, createEsqlDataSource } from './data_sources';
 
 export const DISCOVER_APP_LOCATOR = 'DISCOVER_APP_LOCATOR';
 
@@ -113,11 +109,6 @@ export interface DiscoverAppLocatorParams extends SerializableRecord {
 
 export type DiscoverAppLocator = LocatorPublic<DiscoverAppLocatorParams>;
 
-export interface DiscoverAppLocatorDependencies {
-  useHash: boolean;
-  setStateToKbnUrl: typeof setStateToKbnUrl;
-}
-
 /**
  * Location state of scoped history (history instance of Kibana Platform application service)
  */
@@ -126,83 +117,5 @@ export interface MainHistoryLocationState {
   isAlertResults?: boolean;
 }
 
-export class DiscoverAppLocatorDefinition implements LocatorDefinition<DiscoverAppLocatorParams> {
-  public readonly id = DISCOVER_APP_LOCATOR;
-
-  constructor(protected readonly deps: DiscoverAppLocatorDependencies) {}
-
-  public readonly getLocation = async (params: DiscoverAppLocatorParams) => {
-    const {
-      useHash = this.deps.useHash,
-      filters,
-      dataViewId,
-      indexPatternId,
-      dataViewSpec,
-      query,
-      refreshInterval,
-      savedSearchId,
-      timeRange,
-      searchSessionId,
-      columns,
-      grid,
-      savedQuery,
-      sort,
-      interval,
-      viewMode,
-      hideAggregatedPreview,
-      breakdownField,
-      isAlertResults,
-    } = params;
-    const savedSearchPath = savedSearchId ? `view/${encodeURIComponent(savedSearchId)}` : '';
-    const appState: Partial<DiscoverAppState> = {};
-    const queryState: GlobalQueryStateFromUrl = {};
-    const { isFilterPinned } = await import('@kbn/es-query');
-
-    if (query) appState.query = query;
-    if (filters && filters.length) appState.filters = filters?.filter((f) => !isFilterPinned(f));
-    if (indexPatternId)
-      appState.dataSource = createDataViewDataSource({ dataViewId: indexPatternId });
-    if (dataViewId) appState.dataSource = createDataViewDataSource({ dataViewId });
-    if (isOfAggregateQueryType(query)) appState.dataSource = createEsqlDataSource();
-    if (columns) appState.columns = columns;
-    if (grid) appState.grid = grid;
-    if (savedQuery) appState.savedQuery = savedQuery;
-    if (sort) appState.sort = sort;
-    if (interval) appState.interval = interval;
-    if (timeRange) queryState.time = timeRange;
-    if (filters && filters.length) queryState.filters = filters?.filter((f) => isFilterPinned(f));
-    if (refreshInterval) queryState.refreshInterval = refreshInterval;
-    if (viewMode) appState.viewMode = viewMode;
-    if (hideAggregatedPreview) appState.hideAggregatedPreview = hideAggregatedPreview;
-    if (breakdownField) appState.breakdownField = breakdownField;
-
-    const state: MainHistoryLocationState = {};
-    if (dataViewSpec) state.dataViewSpec = dataViewSpec;
-    if (isAlertResults) state.isAlertResults = isAlertResults;
-
-    let path = `#/${savedSearchPath}`;
-
-    if (searchSessionId) {
-      path = `${path}?searchSessionId=${searchSessionId}`;
-    }
-
-    if (Object.keys(queryState).length) {
-      path = this.deps.setStateToKbnUrl<GlobalQueryStateFromUrl>(
-        '_g',
-        queryState,
-        { useHash },
-        path
-      );
-    }
-
-    if (Object.keys(appState).length) {
-      path = this.deps.setStateToKbnUrl('_a', appState, { useHash }, path);
-    }
-
-    return {
-      app: 'discover',
-      path,
-      state,
-    };
-  };
-}
+export type DiscoverAppLocatorGetLocation =
+  LocatorDefinition<DiscoverAppLocatorParams>['getLocation'];

src/platform/plugins/shared/discover/common/app_locator_get_location.ts

@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import type { GlobalQueryStateFromUrl } from '@kbn/data-plugin/public';
+import { isFilterPinned, isOfAggregateQueryType } from '@kbn/es-query';
+import type { setStateToKbnUrl as setStateToKbnUrlCommon } from '@kbn/kibana-utils-plugin/common';
+import type { DiscoverAppLocatorGetLocation, MainHistoryLocationState } from './app_locator';
+import type { DiscoverAppState } from '../public';
+import { createDataViewDataSource, createEsqlDataSource } from './data_sources';
+
+export const appLocatorGetLocationCommon = async (
+  {
+    useHash: useHashOriginal,
+    setStateToKbnUrl,
+  }: {
+    useHash: boolean;
+    setStateToKbnUrl: typeof setStateToKbnUrlCommon;
+  },
+  ...[params]: Parameters<DiscoverAppLocatorGetLocation>
+): ReturnType<DiscoverAppLocatorGetLocation> => {
+  const {
+    useHash = useHashOriginal,
+    filters,
+    dataViewId,
+    indexPatternId,
+    dataViewSpec,
+    query,
+    refreshInterval,
+    savedSearchId,
+    timeRange,
+    searchSessionId,
+    columns,
+    grid,
+    savedQuery,
+    sort,
+    interval,
+    viewMode,
+    hideAggregatedPreview,
+    breakdownField,
+    isAlertResults,
+  } = params;
+  const savedSearchPath = savedSearchId ? `view/${encodeURIComponent(savedSearchId)}` : '';
+  const appState: Partial<DiscoverAppState> = {};
+  const queryState: GlobalQueryStateFromUrl = {};
+
+  if (query) appState.query = query;
+  if (filters && filters.length) appState.filters = filters?.filter((f) => !isFilterPinned(f));
+  if (indexPatternId)
+    appState.dataSource = createDataViewDataSource({ dataViewId: indexPatternId });
+  if (dataViewId) appState.dataSource = createDataViewDataSource({ dataViewId });
+  if (isOfAggregateQueryType(query)) appState.dataSource = createEsqlDataSource();
+  if (columns) appState.columns = columns;
+  if (grid) appState.grid = grid;
+  if (savedQuery) appState.savedQuery = savedQuery;
+  if (sort) appState.sort = sort;
+  if (interval) appState.interval = interval;
+  if (timeRange) queryState.time = timeRange;
+  if (filters && filters.length) queryState.filters = filters?.filter((f) => isFilterPinned(f));
+  if (refreshInterval) queryState.refreshInterval = refreshInterval;
+  if (viewMode) appState.viewMode = viewMode;
+  if (hideAggregatedPreview) appState.hideAggregatedPreview = hideAggregatedPreview;
+  if (breakdownField) appState.breakdownField = breakdownField;
+
+  const state: MainHistoryLocationState = {};
+  if (dataViewSpec) state.dataViewSpec = dataViewSpec;
+  if (isAlertResults) state.isAlertResults = isAlertResults;
+
+  let path = `#/${savedSearchPath}`;
+
+  if (searchSessionId) {
+    path = `${path}?searchSessionId=${searchSessionId}`;
+  }
+
+  if (Object.keys(queryState).length) {
+    path = setStateToKbnUrl<GlobalQueryStateFromUrl>('_g', queryState, { useHash }, path);
+  }
+
+  if (Object.keys(appState).length) {
+    path = setStateToKbnUrl('_a', appState, { useHash }, path);
+  }
+
+  return {
+    app: 'discover',
+    path,
+    state,
+  };
+};

src/platform/plugins/shared/discover/common/esql_locator.ts

@@ -7,36 +7,12 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { DISCOVER_ESQL_LOCATOR } from '@kbn/deeplinks-analytics';
 import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { getIndexForESQLQuery, getInitialESQLQuery, getESQLAdHocDataview } from '@kbn/esql-utils';
-import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 
 export type DiscoverESQLLocatorParams = SerializableRecord;
 
-export interface DiscoverESQLLocatorDependencies {
-  discoverAppLocator: LocatorPublic<SerializableRecord>;
-  dataViews: DataViewsPublicPluginStart;
-}
-
 export type DiscoverESQLLocator = LocatorPublic<DiscoverESQLLocatorParams>;
 
-export class DiscoverESQLLocatorDefinition implements LocatorDefinition<DiscoverESQLLocatorParams> {
-  public readonly id = DISCOVER_ESQL_LOCATOR;
-
-  constructor(protected readonly deps: DiscoverESQLLocatorDependencies) {}
-
-  public readonly getLocation = async () => {
-    const { discoverAppLocator, dataViews } = this.deps;
-    const indexName = (await getIndexForESQLQuery({ dataViews })) ?? '*';
-    const dataView = await getESQLAdHocDataview(`from ${indexName}`, dataViews);
-    const esql = getInitialESQLQuery(dataView);
-
-    const params = {
-      query: { esql },
-    };
-
-    return await discoverAppLocator.getLocation(params);
-  };
-}
+export type DiscoverESQLLocatorGetLocation =
+  LocatorDefinition<DiscoverESQLLocatorParams>['getLocation'];

src/platform/plugins/shared/discover/common/esql_locator_get_location.ts

@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import type { LocatorPublic } from '@kbn/share-plugin/common';
+import type { SerializableRecord } from '@kbn/utility-types';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { getESQLAdHocDataview, getIndexForESQLQuery, getInitialESQLQuery } from '@kbn/esql-utils';
+import type { DiscoverESQLLocatorGetLocation } from './esql_locator';
+
+export const esqlLocatorGetLocation = async ({
+  discoverAppLocator,
+  dataViews,
+}: {
+  discoverAppLocator: LocatorPublic<SerializableRecord>;
+  dataViews: DataViewsPublicPluginStart;
+}): ReturnType<DiscoverESQLLocatorGetLocation> => {
+  const indexName = (await getIndexForESQLQuery({ dataViews })) ?? '*';
+  const dataView = await getESQLAdHocDataview(`from ${indexName}`, dataViews);
+  const esql = getInitialESQLQuery(dataView);
+
+  const params = {
+    query: { esql },
+  };
+
+  return await discoverAppLocator.getLocation(params);
+};

src/platform/plugins/shared/discover/common/index.ts

@@ -10,12 +10,11 @@
 export const PLUGIN_ID = 'discover';
 export const APP_ICON = 'discoverApp';
 
-export { DISCOVER_APP_LOCATOR, DiscoverAppLocatorDefinition } from './app_locator';
+export { DISCOVER_APP_LOCATOR } from './app_locator';
 export type {
   DiscoverAppLocator,
   DiscoverAppLocatorParams,
   MainHistoryLocationState,
 } from './app_locator';
 
-export { DiscoverESQLLocatorDefinition } from './esql_locator';
 export type { DiscoverESQLLocator, DiscoverESQLLocatorParams } from './esql_locator';

src/platform/plugins/shared/discover/public/__mocks__/services.ts

@@ -46,7 +46,7 @@ import type { SearchSourceDependencies } from '@kbn/data-plugin/common';
 import type { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import { createElement } from 'react';
 import { createContextAwarenessMocks } from '../context_awareness/__mocks__';
-import { DiscoverEBTManager } from '../services/discover_ebt_manager';
+import { DiscoverEBTManager } from '../plugin_imports/discover_ebt_manager';
 import { discoverSharedPluginMock } from '@kbn/discover-shared-plugin/public/mocks';
 import { createUrlTrackerMock } from './url_tracker.mock';
 

src/platform/plugins/shared/discover/public/application/context/services/locator.test.ts

@@ -8,7 +8,9 @@
  */
 
 import { getStatesFromKbnUrl } from '@kbn/kibana-utils-plugin/public';
-import { DiscoverContextAppLocatorDefinition } from './locator';
+import type { DiscoverContextAppLocatorParams } from './locator';
+import { DISCOVER_CONTEXT_APP_LOCATOR } from './locator';
+import { contextAppLocatorGetLocation } from './locator_get_location';
 
 const dataViewId: string = 'c367b774-a4c2-11ea-bb37-0242ac130002';
 
@@ -17,7 +19,13 @@ interface SetupParams {
 }
 
 const setup = async ({ useHash = false }: SetupParams = {}) => {
-  const locator = new DiscoverContextAppLocatorDefinition({ useHash });
+  const locator = {
+    id: DISCOVER_CONTEXT_APP_LOCATOR,
+    getLocation: async (params: DiscoverContextAppLocatorParams) => {
+      return contextAppLocatorGetLocation({ useHash }, params);
+    },
+  };
+
   return { locator };
 };