[ES|QL] [Controls] Fixes fields values not available after editing

src/platform/packages/shared/controls/controls-schemas/src/options_list_schema.ts

@@ -192,6 +192,14 @@ export const optionsListESQLControlSchema = schema.discriminatedUnion('control_t
           description: 'A fixed list of option strings displayed in the control.',
         },
       }),
+      source_esql_query: schema.maybe(
+        schema.string({
+          meta: {
+            description:
+              'The ES|QL query the control was created from. Not evaluated at runtime; persisted only so the available identifiers list (e.g. fields) can be repopulated when the control is edited.',
+          },
+        })
+      ),
     },
     {
       meta: {

src/platform/plugins/shared/controls/public/controls/esql_control/esql_control_manager.ts

@@ -27,7 +27,7 @@ import type {
   OptionsListSelection,
 } from '@kbn/controls-schemas';
 import type { TimeRange } from '@kbn/es-query';
-import type { ESQLControlVariable, QueryESQLControl } from '@kbn/esql-types';
+import type { ESQLControlVariable, QueryESQLControl, StaticESQLControl } from '@kbn/esql-types';
 import {
   EsqlControlType,
   ESQLVariableType,
@@ -66,7 +66,7 @@ type ComparatorsReturnType<ControlType = ESQLOptionsListRuntimeState['control_ty
       | 'available_options'
     > &
       (ControlType extends EsqlControlType.STATIC_VALUES
-        ? {}
+        ? Pick<StaticESQLControl, 'source_esql_query'>
         : Pick<QueryESQLControl, 'esql_query'>)
   >;
 
@@ -83,7 +83,7 @@ export const getSelectionComparators = <Type = ESQLOptionsListRuntimeState['cont
     available_options: 'deepEquality',
     ...(controlType === EsqlControlType.VALUES_FROM_QUERY
       ? { esql_query: 'referenceEquality' }
-      : {}),
+      : { source_esql_query: 'referenceEquality' }),
   } as ComparatorsReturnType<Type>;
 };
 
@@ -109,6 +109,9 @@ export function initializeESQLControlManager(
     initialState.variable_type as ESQLVariableType
   );
   const esqlQuery$ = new BehaviorSubject<string>(isEsqlQueryControl ? initialState.esql_query : '');
+  const sourceEsqlQuery$ = new BehaviorSubject<string | undefined>(
+    isStaticControl ? initialState.source_esql_query : undefined
+  );
   let valuesColumnType: string | undefined;
   const totalCardinality$ = new BehaviorSubject<number>(
     isStaticControl ? initialState.available_options.length : 0
@@ -317,7 +320,8 @@ export function initializeESQLControlManager(
       variableName$,
       singleSelect$,
       variableType$,
-      esqlQuery$
+      esqlQuery$,
+      sourceEsqlQuery$
     ).pipe(map(() => undefined)),
     reinitializeState: (lastSaved?: ESQLOptionsListRuntimeState) => {
       setSelectedOptions(lastSaved?.selected_options ?? []);
@@ -331,6 +335,9 @@ export function initializeESQLControlManager(
       hasInitialFetch = false;
       availableOptions$.next(lastSaved?.available_options ?? []);
       esqlQuery$.next(isQueryESQLControl(lastSaved) ? lastSaved.esql_query : '');
+      sourceEsqlQuery$.next(
+        isStaticESQLControl(lastSaved) ? lastSaved.source_esql_query : undefined
+      );
     },
     getLatestState: (): OptionsListESQLControlState => {
       return {
@@ -343,6 +350,9 @@ export function initializeESQLControlManager(
           ? {
               control_type: EsqlControlType.STATIC_VALUES,
               available_options: availableOptions$.getValue(),
+              ...(sourceEsqlQuery$.getValue() !== undefined && {
+                source_esql_query: sourceEsqlQuery$.getValue(),
+              }),
             }
           : { control_type: EsqlControlType.VALUES_FROM_QUERY, esql_query: esqlQuery$.getValue() }),
       };

src/platform/plugins/shared/controls/public/controls/esql_control/get_esql_control_factory.test.tsx

@@ -36,6 +36,14 @@ jest.mock('./utils/get_esql_single_column_values', () => {
   };
 });
 
+const mockExecuteTriggerActions = jest.fn();
+jest.mock('../../services/kibana_services', () => ({
+  ...jest.requireActual('../../services/kibana_services'),
+  uiActionsService: {
+    executeTriggerActions: (...args: unknown[]) => mockExecuteTriggerActions(...args),
+  },
+}));
+
 describe('ESQLControlApi', () => {
   beforeEach(() => {
     jest.resetAllMocks();
@@ -100,6 +108,37 @@ describe('ESQLControlApi', () => {
     });
   });
 
+  describe('editing a STATIC fields control', () => {
+    test('onEdit forwards the persisted source_esql_query as queryString', async () => {
+      const sourceQuery = 'FROM logs | KEEP ';
+      const initialState: OptionsListESQLControlState = {
+        ...DEFAULT_ESQL_OPTIONS_LIST_STATE,
+        selected_options: ['column1'],
+        available_options: ['column1'],
+        variable_name: 'myField',
+        variable_type: ESQLVariableType.FIELDS,
+        control_type: EsqlControlType.STATIC_VALUES,
+        source_esql_query: sourceQuery,
+      };
+      const { api } = await factory.buildEmbeddable({
+        initializeDrilldownsManager: jest.fn(),
+        initialState,
+        finalizeApi,
+        uuid,
+        parentApi: dashboardApi,
+      });
+      await api.onEdit();
+      expect(mockExecuteTriggerActions).toHaveBeenCalledWith(
+        'ESQL_CONTROL_TRIGGER',
+        expect.objectContaining({
+          queryString: sourceQuery,
+          controlType: EsqlControlType.STATIC_VALUES,
+          variableType: ESQLVariableType.FIELDS,
+        })
+      );
+    });
+  });
+
   describe('values from query', () => {
     test('should update on load and fetch', async () => {
       const initialState: OptionsListESQLControlState = {

src/platform/plugins/shared/controls/public/controls/esql_control/get_esql_control_factory.tsx

@@ -119,7 +119,9 @@ export const getESQLControlFactory = <
           };
           try {
             await uiActionsService.executeTriggerActions('ESQL_CONTROL_TRIGGER', {
-              queryString: isStaticESQLControl(nextState) ? '' : nextState.esql_query,
+              queryString: isStaticESQLControl(nextState)
+                ? nextState.source_esql_query ?? ''
+                : nextState.esql_query,
               variableType: nextState.variable_type,
               controlType: nextState.control_type,
               esqlVariables: variablesInParent,

src/platform/plugins/shared/esql/public/triggers/esql_controls/control_flyout/identifier_control_form.test.tsx

@@ -155,7 +155,7 @@ describe('IdentifierControlForm', () => {
         selected_options: ['column2'],
         variable_name: 'myField',
         variable_type: ESQLVariableType.FIELDS,
-        esql_query: 'FROM foo | STATS BY',
+        source_esql_query: 'FROM foo | STATS BY',
         control_type: EsqlControlType.STATIC_VALUES,
       } as OptionsListESQLControlState;
       const { findByTestId } = render(
@@ -186,7 +186,7 @@ describe('IdentifierControlForm', () => {
         selected_options: ['column2'],
         variable_name: 'myField',
         variable_type: ESQLVariableType.FIELDS,
-        esql_query: 'FROM foo | STATS BY',
+        source_esql_query: 'FROM foo | STATS BY',
         control_type: EsqlControlType.STATIC_VALUES,
       } as OptionsListESQLControlState;
       const onEditControlSpy = jest.fn();

src/platform/plugins/shared/esql/public/triggers/esql_controls/control_flyout/identifier_control_form.tsx

@@ -157,6 +157,11 @@ export function IdentifierControlForm({
       variable_name: variableNameWithoutQuestionmark,
       variable_type: variableType,
       control_type: EsqlControlType.STATIC_VALUES as StaticESQLControl['control_type'],
+      // Persist the originating query for FIELDS controls so the available
+      // identifiers list can be repopulated when the control is edited.
+      ...(variableType === ESQLVariableType.FIELDS && queryString
+        ? { source_esql_query: queryString }
+        : {}),
     };
     if (!isEqual(state, initialState)) {
       setControlState(state);