[8.x] [ES|QL] Apply the timerange to the fields fetch in the editor (#208490) (#208900)

# Backport This will backport the following commits from `main` to `8.x`: - [[ES|QL] Apply the timerange to the fields fetch in the editor (#208490)](https://github.com/elastic/kibana/pull/208490)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
2025-04-24 09:48:58 -04:00 · 2025-01-30 23:32:55 +11:00 · 2025-01-30 23:32:55 +11:00 · 01b15a5f58
commit 01b15a5f58
parent 14ad7170a9
7 changed files with 21 additions and 5 deletions
--- a/src/platform/packages/private/kbn-esql-editor/src/esql_editor.test.tsx
+++ b/src/platform/packages/private/kbn-esql-editor/src/esql_editor.test.tsx
@ -17,6 +17,7 @@ import { ESQLEditor } from './esql_editor';
 import type { ESQLEditorProps } from './types';
 import { ReactWrapper } from 'enzyme';
 import { coreMock } from '@kbn/core/server/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';

 describe('ESQLEditor', () => {
  const uiConfig: Record<string, any> = {};
@ -30,6 +31,7 @@ describe('ESQLEditor', () => {
      client: uiSettings,
    },
    core: coreMock.createStart(),
+    data: dataPluginMock.createStartContract(),
  };

  function renderESQLEditorComponent(testProps: ESQLEditorProps) {
--- a/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
+++ b/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
@ -23,7 +23,7 @@ import { isEqual } from 'lodash';
 import { CodeEditor, CodeEditorProps } from '@kbn/code-editor';
 import type { CoreStart } from '@kbn/core/public';
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
-import type { AggregateQuery } from '@kbn/es-query';
+import type { AggregateQuery, TimeRange } from '@kbn/es-query';
 import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
@ -127,6 +127,7 @@ export const ESQLEditor = memo(function ESQLEditor({
    fieldsMetadata,
    uiSettings,
    uiActions,
+    data,
  } = kibana.services;
  const darkMode = core.theme?.getTheme().darkMode;

@ -396,7 +397,7 @@ export const ESQLEditor = memo(function ESQLEditor({
  const { cache: esqlFieldsCache, memoizedFieldsFromESQL } = useMemo(() => {
    // need to store the timing of the first request so we can atomically clear the cache per query
    const fn = memoize(
-      (...args: [{ esql: string }, ExpressionsStart, undefined, AbortController?]) => ({
+      (...args: [{ esql: string }, ExpressionsStart, TimeRange, AbortController?]) => ({
        timestamp: Date.now(),
        result: fetchFieldsFromESQL(...args),
      }),
@ -430,11 +431,12 @@ export const ESQLEditor = memo(function ESQLEditor({
          };
          // Check if there's a stale entry and clear it
          clearCacheWhenOld(esqlFieldsCache, esqlQuery.esql);
+          const timeRange = data.query.timefilter.timefilter.getTime();
          try {
            const table = await memoizedFieldsFromESQL(
              esqlQuery,
              expressions,
-              undefined,
+              timeRange,
              abortController
            ).result;
            const columns: ESQLRealField[] =
@ -478,19 +480,21 @@ export const ESQLEditor = memo(function ESQLEditor({
    return callbacks;
  }, [
    fieldsMetadata,
+    kibana.services?.esql?.getJoinIndicesAutocomplete,
    dataSourcesCache,
    query.esql,
    memoizedSources,
    dataViews,
    core,
    esqlFieldsCache,
+    data.query.timefilter.timefilter,
    memoizedFieldsFromESQL,
    expressions,
    abortController,
    indexManagementApiService,
    histogramBarTarget,
-    variablesService,
-    kibana.services?.esql?.getJoinIndicesAutocomplete,
+    variablesService?.esqlVariables,
+    variablesService?.areSuggestionsEnabled,
  ]);

  const queryRunButtonProperties = useMemo(() => {
--- a/src/platform/packages/private/kbn-esql-editor/src/types.ts
+++ b/src/platform/packages/private/kbn-esql-editor/src/types.ts
@ -16,6 +16,7 @@ import type { FieldsMetadataPublicStart } from '@kbn/fields-metadata-plugin/publ
 import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import type { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { ESQLControlVariable } from '@kbn/esql-validation-autocomplete';

 export interface ESQLEditorProps {
@ -112,6 +113,7 @@ export interface EsqlPluginStartBase {
 export interface ESQLEditorDeps {
  core: CoreStart;
  dataViews: DataViewsPublicPluginStart;
+  data: DataPublicPluginStart;
  expressions: ExpressionsStart;
  storage: Storage;
  uiActions: UiActionsStart;
--- a/src/platform/plugins/shared/esql/public/kibana_services.ts
+++ b/src/platform/plugins/shared/esql/public/kibana_services.ts
@ -14,6 +14,7 @@ import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
 import type { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { IndexManagementPluginSetup } from '@kbn/index-management-shared-types';
 import type { FieldsMetadataPublicStart } from '@kbn/fields-metadata-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import type { EsqlPluginStart } from './plugin';
@ -23,6 +24,7 @@ export let core: CoreStart;
 interface ServiceDeps {
  core: CoreStart;
  dataViews: DataViewsPublicPluginStart;
+  data: DataPublicPluginStart;
  expressions: ExpressionsStart;
  storage: Storage;
  uiActions: UiActionsStart;
@ -49,6 +51,7 @@ export const setKibanaServices = (
  esql: EsqlPluginStart,
  kibanaCore: CoreStart,
  dataViews: DataViewsPublicPluginStart,
+  data: DataPublicPluginStart,
  expressions: ExpressionsStart,
  storage: Storage,
  uiActions: UiActionsStart,
@ -61,6 +64,7 @@ export const setKibanaServices = (
    core,
    dataViews,
    expressions,
+    data,
    storage,
    uiActions,
    indexManagementApiService: indexManagement?.apiService,
--- a/src/platform/plugins/shared/esql/public/plugin.ts
+++ b/src/platform/plugins/shared/esql/public/plugin.ts
@ -103,6 +103,7 @@ export class EsqlPlugin implements Plugin<{}, EsqlPluginStart> {
      start,
      core,
      dataViews,
+      data,
      expressions,
      storage,
      uiActions,
--- a/src/platform/plugins/shared/esql/public/triggers/esql_controls/control_flyout/value_control_form.test.tsx
+++ b/src/platform/plugins/shared/esql/public/triggers/esql_controls/control_flyout/value_control_form.test.tsx
@ -56,6 +56,7 @@ describe('ValueControlForm', () => {
      client: uiSettings,
    },
    core: coreMock.createStart(),
+    data: dataMock,
  };

  describe('Interval type', () => {
--- a/x-pack/solutions/observability/plugins/investigate_app/.storybook/mock_kibana_services.ts
+++ b/x-pack/solutions/observability/plugins/investigate_app/.storybook/mock_kibana_services.ts
@ -7,6 +7,7 @@
 import { setKibanaServices } from '@kbn/esql/public/kibana_services';
 import { coreMock } from '@kbn/core/public/mocks';
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { expressionsPluginMock } from '@kbn/expressions-plugin/public/mocks';
 import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 import type { Storage } from '@kbn/kibana-utils-plugin/public';
@ -46,6 +47,7 @@ setKibanaServices(
  },
  coreMock.createStart(),
  dataViewPluginMocks.createStartContract(),
+  dataPluginMock.createStartContract(),
  expressionsPluginMock.createStartContract(),
  storage,
  uiActionsPluginMock.createStartContract()