[Discover] Skip fetch for non-document view modes (elastic#245663)

Author: akowalska622

src/platform/plugins/shared/discover/public/embeddable/get_search_embeddable_factory.test.tsx

@@ -144,12 +144,17 @@ describe('saved search embeddable', () => {
       });
     });
 
-    it('should render field stats table in AGGREGATED_LEVEL view mode', async () => {
-      const { search, resolveSearch } = createSearchFnMock(0);
+    it('should render field stats table in AGGREGATED_LEVEL view mode and not fetch documents', async () => {
+      const { search } = createSearchFnMock(0);
       runtimeState = getInitialRuntimeState({
         searchMock: search,
         partialState: { viewMode: VIEW_MODE.AGGREGATED_LEVEL },
       });
+
+      discoverServiceMock.uiSettings.get = jest.fn().mockImplementation((key: string) => {
+        if (key === SHOW_FIELD_STATISTICS) return true;
+      });
+
       const { Component, api } = await factory.buildEmbeddable({
         initialState: { rawState: { savedObjectId: 'id' } }, // runtimeState passed via mocked deserializeState
         finalizeApi: finalizeApiMock,
@@ -158,15 +163,10 @@ describe('saved search embeddable', () => {
       });
       await waitOneTick(); // wait for build to complete
 
-      discoverServiceMock.uiSettings.get = jest.fn().mockImplementationOnce((key: string) => {
-        if (key === SHOW_FIELD_STATISTICS) return true;
-      });
       const discoverComponent = render(<Component />);
 
-      // wait for data fetching
-      expect(api.dataLoading$.getValue()).toBe(true);
-      resolveSearch();
-      await waitOneTick();
+      // Field statistics mode should not trigger document fetching
+      expect(search).not.toHaveBeenCalled();
       expect(api.dataLoading$.getValue()).toBe(false);
 
       expect(discoverComponent.queryByTestId('dscFieldStatsEmbeddedContent')).toBeInTheDocument();
@@ -178,7 +178,7 @@ describe('saved search embeddable', () => {
       const { search, resolveSearch } = createSearchFnMock(1);
       runtimeState = getInitialRuntimeState({
         searchMock: search,
-        partialState: { viewMode: VIEW_MODE.AGGREGATED_LEVEL },
+        partialState: { viewMode: VIEW_MODE.DOCUMENT_LEVEL },
       });
       const { api } = await factory.buildEmbeddable({
         initialState: { rawState: { savedObjectId: 'id' } }, // runtimeState passed via mocked deserializeState

src/platform/plugins/shared/discover/public/embeddable/get_search_embeddable_factory.tsx

@@ -12,7 +12,7 @@ import { BehaviorSubject, firstValueFrom, merge } from 'rxjs';
 
 import { CellActionsProvider } from '@kbn/cell-actions';
 import { APPLY_FILTER_TRIGGER, generateFilters } from '@kbn/data-plugin/public';
-import { SEARCH_EMBEDDABLE_TYPE, SHOW_FIELD_STATISTICS } from '@kbn/discover-utils';
+import { SEARCH_EMBEDDABLE_TYPE } from '@kbn/discover-utils';
 import type { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import { FilterStateStore } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
@@ -26,12 +26,10 @@ import {
   useBatchedPublishingSubjects,
 } from '@kbn/presentation-publishing';
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
-import { VIEW_MODE } from '@kbn/saved-search-plugin/common';
 import type { SearchResponseIncompleteWarning } from '@kbn/search-response-warnings/src/types';
 
 import type { DocViewFilterFn } from '@kbn/unified-doc-viewer/types';
 import { initializeUnsavedChanges } from '@kbn/presentation-containers';
-import { getValidViewMode } from '../application/main/utils/get_valid_view_mode';
 import type { DiscoverServices } from '../build_services';
 import { SearchEmbeddablFieldStatsTableComponent } from './components/search_embeddable_field_stats_table_component';
 import { SearchEmbeddableGridComponent } from './components/search_embeddable_grid_component';
@@ -43,6 +41,7 @@ import type { SearchEmbeddableApi } from './types';
 import { deserializeState, serializeState } from './utils/serialization_utils';
 import { BaseAppWrapper } from '../context_awareness';
 import { ScopedServicesProvider } from '../components/scoped_services_provider';
+import { isFieldStatsMode } from './utils/is_field_stats_mode';
 
 export const getSearchEmbeddableFactory = ({
   startServices,
@@ -259,14 +258,6 @@ export const getSearchEmbeddableFactory = ({
             };
           }, []);
 
-          const viewMode = useMemo(() => {
-            if (!savedSearch.searchSource) return;
-            return getValidViewMode({
-              viewMode: savedSearch.viewMode,
-              isEsqlMode: isEsqlMode(savedSearch),
-            });
-          }, [savedSearch]);
-
           const dataView = useMemo(() => {
             const hasDataView = (dataViews ?? []).length > 0;
             if (!hasDataView) {
@@ -313,12 +304,8 @@ export const getSearchEmbeddableFactory = ({
           );
 
           const renderAsFieldStatsTable = useMemo(
-            () =>
-              Boolean(discoverServices.uiSettings.get(SHOW_FIELD_STATISTICS)) &&
-              viewMode === VIEW_MODE.AGGREGATED_LEVEL &&
-              Boolean(dataView) &&
-              Array.isArray(savedSearch.columns),
-            [savedSearch, dataView, viewMode]
+            () => isFieldStatsMode(savedSearch, dataView, discoverServices.uiSettings),
+            [savedSearch, dataView]
           );
 
           return (

src/platform/plugins/shared/discover/public/embeddable/initialize_fetch.ts

@@ -45,6 +45,7 @@ import type { PublishesSavedSearch, SearchEmbeddableStateManager } from './types
 import { getTimeRangeFromFetchContext, updateSearchSource } from './utils/update_search_source';
 import { createDataSource } from '../../common/data_sources';
 import type { ScopedProfilesManager } from '../context_awareness';
+import { isFieldStatsMode } from './utils/is_field_stats_mode';
 
 type SavedSearchPartialFetchApi = PublishesSavedSearch &
   PublishesSavedObjectId &
@@ -179,8 +180,13 @@ export function initializeFetch({
       }),
       switchMap(async ([fetchContext, savedSearch, dataViews, esqlVariables]) => {
         const dataView = dataViews?.length ? dataViews[0] : undefined;
+
         setBlockingError(undefined);
-        if (!dataView || !savedSearch.searchSource) {
+        if (
+          !dataView ||
+          !savedSearch.searchSource ||
+          isFieldStatsMode(savedSearch, dataView, discoverServices.uiSettings)
+        ) {
           return;
         }
 

src/platform/plugins/shared/discover/public/embeddable/utils/is_field_stats_mode.test.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 { VIEW_MODE } from '@kbn/saved-search-plugin/common';
+import { SHOW_FIELD_STATISTICS } from '@kbn/discover-utils';
+import { buildDataViewMock } from '@kbn/discover-utils/src/__mocks__';
+import { isFieldStatsMode } from './is_field_stats_mode';
+import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
+import type { SavedSearch } from '@kbn/saved-search-plugin/common';
+
+const dataViewMock = buildDataViewMock({ name: 'test-data-view' });
+
+const createMockUiSettings = (showFieldStats: boolean): IUiSettingsClient => {
+  return {
+    get: jest.fn((key: string) => {
+      if (key === SHOW_FIELD_STATISTICS) {
+        return showFieldStats;
+      }
+      return undefined;
+    }),
+  } as unknown as IUiSettingsClient;
+};
+
+const createMockSavedSearch = (viewMode: VIEW_MODE, columns: string[] | undefined): SavedSearch => {
+  return {
+    viewMode,
+    columns,
+    searchSource: {
+      getField: jest.fn((field: string) => {
+        if (field === 'query') {
+          return { language: 'kuery' }; // Default to non-ES|QL query
+        }
+        return undefined;
+      }),
+    },
+  } as unknown as SavedSearch;
+};
+
+const columns = ['field1', 'field2'];
+
+describe('isFieldStatsMode', () => {
+  describe('DOCUMENT_LEVEL mode', () => {
+    it('should return false when in DOCUMENT_LEVEL view mode', () => {
+      const savedSearch = createMockSavedSearch(VIEW_MODE.DOCUMENT_LEVEL, columns);
+      const uiSettings = createMockUiSettings(false);
+
+      expect(isFieldStatsMode(savedSearch, dataViewMock, uiSettings)).toBe(false);
+    });
+  });
+
+  describe('AGGREGATED_LEVEL mode (Field Statistics)', () => {
+    it('should return true when all Field Statistics conditions are met', () => {
+      const savedSearch = createMockSavedSearch(VIEW_MODE.AGGREGATED_LEVEL, columns);
+      const uiSettings = createMockUiSettings(true);
+
+      expect(isFieldStatsMode(savedSearch, dataViewMock, uiSettings)).toBe(true);
+    });
+
+    it('should return false when SHOW_FIELD_STATISTICS setting is false', () => {
+      const savedSearch = createMockSavedSearch(VIEW_MODE.AGGREGATED_LEVEL, columns);
+      const uiSettings = createMockUiSettings(false);
+
+      expect(isFieldStatsMode(savedSearch, dataViewMock, uiSettings)).toBe(false);
+    });
+
+    it('should return false when dataView is undefined', () => {
+      const savedSearch = createMockSavedSearch(VIEW_MODE.AGGREGATED_LEVEL, columns);
+      const uiSettings = createMockUiSettings(true);
+
+      expect(isFieldStatsMode(savedSearch, undefined, uiSettings)).toBe(false);
+    });
+
+    it('should return false when columns is not an array', () => {
+      const savedSearch = createMockSavedSearch(VIEW_MODE.AGGREGATED_LEVEL, undefined);
+      const uiSettings = createMockUiSettings(true);
+
+      expect(isFieldStatsMode(savedSearch, dataViewMock, uiSettings)).toBe(false);
+    });
+
+    it('should return true when columns is an empty array', () => {
+      const savedSearch = createMockSavedSearch(VIEW_MODE.AGGREGATED_LEVEL, []);
+      const uiSettings = createMockUiSettings(true);
+
+      expect(isFieldStatsMode(savedSearch, dataViewMock, uiSettings)).toBe(true);
+    });
+  });
+});

src/platform/plugins/shared/discover/public/embeddable/utils/is_field_stats_mode.ts

@@ -0,0 +1,34 @@
+/*
+ * 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 { SHOW_FIELD_STATISTICS } from '@kbn/discover-utils';
+import { VIEW_MODE } from '@kbn/saved-search-plugin/common';
+import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
+import type { SavedSearch } from '@kbn/saved-search-plugin/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { getValidViewMode } from '../../application/main/utils/get_valid_view_mode';
+import { isEsqlMode } from '../initialize_fetch';
+
+export function isFieldStatsMode(
+  savedSearch: SavedSearch,
+  dataView: DataView | undefined,
+  uiSettings: IUiSettingsClient
+): boolean {
+  const validatedViewMode = getValidViewMode({
+    viewMode: savedSearch.viewMode,
+    isEsqlMode: isEsqlMode(savedSearch),
+  });
+
+  return (
+    Boolean(uiSettings.get(SHOW_FIELD_STATISTICS)) &&
+    validatedViewMode === VIEW_MODE.AGGREGATED_LEVEL &&
+    Boolean(dataView) &&
+    Array.isArray(savedSearch.columns)
+  );
+}