[ES|QL] Small refactoring

src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx

@@ -54,9 +54,8 @@ import { v4 as uuidv4 } from 'uuid';
 import { createPortal } from 'react-dom';
 import useObservable from 'react-use/lib/useObservable';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
-import { firstValueFrom, of } from 'rxjs';
 import { QuerySource } from '@kbn/esql-types';
-import { useCanCreateLookupIndex, useLookupIndexCommand } from './lookup_join';
+import { useLookupIndexCommand } from './lookup_join';
 import { useFieldsBrowser } from './resource_browser/use_fields_browser';
 import { EditorFooter } from './editor_footer';
 import { QuickSearchVisor } from './editor_visor';
@@ -664,8 +663,6 @@ const ESQLEditorInternal = function ESQLEditor({
     return { cache: fn.cache, memoizedHistoryStarredItems: fn };
   }, []);
 
-  const canCreateLookupIndex = useCanCreateLookupIndex();
-
   // Extract source command and build minimal query with cluster prefixes
   const minimalQuery = useMemo(() => {
     const prefix = code.match(/\b(FROM|TS)\b/i)?.[1]?.toUpperCase();
@@ -714,11 +711,6 @@ const ESQLEditorInternal = function ESQLEditor({
   });
   useEsqlEditorActionsRegistration(editorActions);
 
-  const isResourceBrowserEnabled = useCallback(async () => {
-    const currentApp = await firstValueFrom(application?.currentAppId$ ?? of(undefined));
-    return Boolean(enableResourceBrowser && currentApp === 'discover');
-  }, [application?.currentAppId$, enableResourceBrowser]);
-
   const esqlCallbacks = useEsqlCallbacks({
     core,
     data,
@@ -727,7 +719,6 @@ const ESQLEditorInternal = function ESQLEditor({
     esqlService,
     histogramBarTarget,
     activeSolutionId: activeSolutionId ?? undefined,
-    canCreateLookupIndex,
     minimalQueryRef,
     abortControllerRef,
     dataSourcesCache,
@@ -738,7 +729,7 @@ const ESQLEditorInternal = function ESQLEditor({
     memoizedHistoryStarredItems,
     favoritesClient,
     getJoinIndicesCallback,
-    isResourceBrowserEnabled,
+    enableResourceBrowser,
   });
 
   const {

src/platform/packages/private/kbn-esql-editor/src/resource_browser/use_can_suggest_resource_browser.ts

@@ -0,0 +1,24 @@
+/*
+ * 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 { useCallback } from 'react';
+import { firstValueFrom, of } from 'rxjs';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { ESQLEditorDeps } from '../types';
+
+export const useCanSuggestResourceBrowser = (enableResourceBrowser: boolean) => {
+  const {
+    services: { application },
+  } = useKibana<ESQLEditorDeps>();
+
+  return useCallback(async () => {
+    const currentApp = await firstValueFrom(application?.currentAppId$ ?? of(undefined));
+    return Boolean(enableResourceBrowser && currentApp === 'discover');
+  }, [application?.currentAppId$, enableResourceBrowser]);
+};

src/platform/packages/private/kbn-esql-editor/src/use_esql_callbacks.ts

@@ -30,6 +30,8 @@ import { clearCacheWhenOld } from './helpers';
 import { getHistoryItems } from './history_local_storage';
 import type { ESQLEditorDeps } from './types';
 import type { StarredQueryMetadata } from './editor_footer/esql_starred_queries_service';
+import { useCanCreateLookupIndex } from './lookup_join';
+import { useCanSuggestResourceBrowser } from './resource_browser/use_can_suggest_resource_browser';
 
 type MemoizedFn<TArgs extends unknown[], TResult> = (...args: TArgs) => {
   timestamp: number;
@@ -68,7 +70,6 @@ interface UseEsqlCallbacksParams {
   esqlService?: ESQLEditorDeps['esql'];
   histogramBarTarget: number;
   activeSolutionId?: Parameters<typeof getEditorExtensions>[2];
-  canCreateLookupIndex: ESQLCallbacks['canCreateLookupIndex'];
   minimalQueryRef: MutableRefObject<string>;
   abortControllerRef: MutableRefObject<AbortController>;
   dataSourcesCache: MapCache;
@@ -79,7 +80,7 @@ interface UseEsqlCallbacksParams {
   memoizedHistoryStarredItems: MemoizedHistoryStarredItems;
   favoritesClient: FavoritesClient<StarredQueryMetadata>;
   getJoinIndicesCallback: Required<ESQLCallbacks>['getJoinIndices'];
-  isResourceBrowserEnabled: () => Promise<boolean>;
+  enableResourceBrowser: boolean;
 }
 
 export const useEsqlCallbacks = ({
@@ -90,7 +91,6 @@ export const useEsqlCallbacks = ({
   esqlService,
   histogramBarTarget,
   activeSolutionId,
-  canCreateLookupIndex,
   minimalQueryRef,
   abortControllerRef,
   dataSourcesCache,
@@ -101,7 +101,7 @@ export const useEsqlCallbacks = ({
   memoizedHistoryStarredItems,
   favoritesClient,
   getJoinIndicesCallback,
-  isResourceBrowserEnabled,
+  enableResourceBrowser,
 }: UseEsqlCallbacksParams): ESQLCallbacks => {
   const getSources = useCallback(async () => {
     clearCacheWhenOld(dataSourcesCache, minimalQueryRef.current);
@@ -212,6 +212,9 @@ export const useEsqlCallbacks = ({
 
   const isServerless = Boolean(esqlService?.isServerless);
 
+  const canCreateLookupIndex = useCanCreateLookupIndex();
+  const canSuggestResourceBrowser = useCanSuggestResourceBrowser(enableResourceBrowser);
+
   const getKqlSuggestions = useCallback(
     async (kqlQuery: string, cursorPositionInKql: number) => {
       const hasQuerySuggestions = kql?.autocomplete?.hasQuerySuggestions('kuery');
@@ -264,7 +267,7 @@ export const useEsqlCallbacks = ({
       canCreateLookupIndex,
       isServerless,
       getKqlSuggestions,
-      isResourceBrowserEnabled,
+      canSuggestResourceBrowser,
     }),
     [
       getSources,
@@ -285,7 +288,7 @@ export const useEsqlCallbacks = ({
       canCreateLookupIndex,
       isServerless,
       getKqlSuggestions,
-      isResourceBrowserEnabled,
+      canSuggestResourceBrowser,
     ]
   );
 };

src/platform/packages/shared/kbn-esql-language/src/commands/definitions/utils/autocomplete/resource_browser_suggestions.ts

@@ -21,8 +21,8 @@ export async function getIndicesBrowserSuggestion({
   context?: ICommandContext;
   innerText?: string;
 }): Promise<ISuggestionItem | undefined> {
-  const isResourceBrowserEnabled = (await callbacks?.isResourceBrowserEnabled?.()) ?? false;
-  if (!isResourceBrowserEnabled || context?.isCursorInSubquery) {
+  const canSuggestResourceBrowser = (await callbacks?.canSuggestResourceBrowser?.()) ?? false;
+  if (!canSuggestResourceBrowser || context?.isCursorInSubquery) {
     return undefined;
   }
 

src/platform/packages/shared/kbn-esql-language/src/commands/registry/from/autocomplete.test.ts

@@ -73,7 +73,7 @@ describe('FROM Autocomplete', () => {
     test('suggests Browse indices in empty source slots when enabled', async () => {
       mockCallbacks = {
         ...mockCallbacks,
-        isResourceBrowserEnabled: jest.fn().mockResolvedValue(true),
+        canSuggestResourceBrowser: jest.fn().mockResolvedValue(true),
       };
 
       const suggest = async (query: string) => {

src/platform/packages/shared/kbn-esql-language/src/commands/registry/timeseries/autocomplete.test.ts

@@ -71,7 +71,7 @@ describe('TS Autocomplete', () => {
     };
 
     test('suggests Browse indices in empty source slots when enabled', async () => {
-      mockCallbacks.isResourceBrowserEnabled = jest.fn().mockResolvedValue(true);
+      mockCallbacks.canSuggestResourceBrowser = jest.fn().mockResolvedValue(true);
 
       const suggestions = await suggest('TS ');
       const labels = suggestions.map((s) => s.label);

src/platform/packages/shared/kbn-esql-language/src/commands/registry/types.ts

@@ -188,7 +188,7 @@ export interface ICommandCallbacks {
   canCreateLookupIndex?: (indexName: string) => Promise<boolean>;
   isServerless?: boolean;
   getKqlSuggestions?: ESQLCallbacks['getKqlSuggestions'];
-  isResourceBrowserEnabled?: () => Promise<boolean>;
+  canSuggestResourceBrowser?: () => Promise<boolean>;
 }
 
 export interface ICommandContext {

src/platform/packages/shared/kbn-esql-language/src/language/autocomplete/autocomplete.ts

@@ -257,14 +257,14 @@ async function getSuggestionsWithinCommandExpression(
   );
 
   const isInsideSubquery = astContext.isCursorInSubquery; // We only show resource browser suggestions in the main query
-  const isResourceBrowserEnabled = (await callbacks?.isResourceBrowserEnabled?.()) ?? false;
+  const canSuggestResourceBrowser = (await callbacks?.canSuggestResourceBrowser?.()) ?? false;
 
   const context = {
     ...references,
     ...additionalCommandContext,
     activeProduct: callbacks?.getActiveProduct?.(),
     isCursorInSubquery: astContext.isCursorInSubquery,
-    isFieldsBrowserEnabled: isResourceBrowserEnabled && !isInsideSubquery,
+    isFieldsBrowserEnabled: canSuggestResourceBrowser && !isInsideSubquery,
     unmappedFieldsStrategy,
   };
 
@@ -291,7 +291,7 @@ async function getSuggestionsWithinCommandExpression(
       hasMinimumLicenseRequired,
       getKqlSuggestions: callbacks?.getKqlSuggestions,
       canCreateLookupIndex: callbacks?.canCreateLookupIndex,
-      isResourceBrowserEnabled: callbacks?.isResourceBrowserEnabled,
+      canSuggestResourceBrowser: callbacks?.canSuggestResourceBrowser,
       isServerless: callbacks?.isServerless,
     },
     context,

src/platform/packages/shared/kbn-esql-types/src/editor_types.ts

@@ -149,7 +149,7 @@ export interface ESQLCallbacks {
   canCreateLookupIndex?: (indexName: string) => Promise<boolean>;
   isServerless?: boolean;
   /** Enables the "Browse indices" suggestion and command integration. */
-  isResourceBrowserEnabled?: () => Promise<boolean>;
+  canSuggestResourceBrowser?: () => Promise<boolean>;
   getKqlSuggestions?: (
     kqlQuery: string,
     cursorPositionInKql: number