[ES|QL] Supports multi values variables in MV_CONTAINS

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

@@ -309,56 +309,27 @@ const ESQLEditorInternal = function ESQLEditor({
     openTimePickerPopover();
   });
 
-  monaco.editor.registerCommand('esql.control.time_literal.create', async (...args) => {
-    const position = editor1.current?.getPosition();
-    await triggerControl(
-      fixedQuery,
-      ESQLVariableType.TIME_LITERAL,
-      position,
-      uiActions,
-      esqlVariables,
-      controlsContext?.onSaveControl,
-      controlsContext?.onCancelControl
-    );
-  });
-
-  monaco.editor.registerCommand('esql.control.fields.create', async (...args) => {
-    const position = editor1.current?.getPosition();
-    await triggerControl(
-      fixedQuery,
-      ESQLVariableType.FIELDS,
-      position,
-      uiActions,
-      esqlVariables,
-      controlsContext?.onSaveControl,
-      controlsContext?.onCancelControl
-    );
-  });
-
-  monaco.editor.registerCommand('esql.control.values.create', async (...args) => {
-    const position = editor1.current?.getPosition();
-    await triggerControl(
-      fixedQuery,
-      ESQLVariableType.VALUES,
-      position,
-      uiActions,
-      esqlVariables,
-      controlsContext?.onSaveControl,
-      controlsContext?.onCancelControl
-    );
-  });
-
-  monaco.editor.registerCommand('esql.control.functions.create', async (...args) => {
-    const position = editor1.current?.getPosition();
-    await triggerControl(
-      fixedQuery,
-      ESQLVariableType.FUNCTIONS,
-      position,
-      uiActions,
-      esqlVariables,
-      controlsContext?.onSaveControl,
-      controlsContext?.onCancelControl
-    );
+  const controlCommands = [
+    { command: 'esql.control.multi_values.create', variableType: ESQLVariableType.MULTI_VALUES },
+    { command: 'esql.control.time_literal.create', variableType: ESQLVariableType.TIME_LITERAL },
+    { command: 'esql.control.fields.create', variableType: ESQLVariableType.FIELDS },
+    { command: 'esql.control.values.create', variableType: ESQLVariableType.VALUES },
+    { command: 'esql.control.functions.create', variableType: ESQLVariableType.FUNCTIONS },
+  ];
+
+  controlCommands.forEach(({ command, variableType }) => {
+    monaco.editor.registerCommand(command, async (...args) => {
+      const position = editor1.current?.getPosition();
+      await triggerControl(
+        fixedQuery,
+        variableType,
+        position,
+        uiActions,
+        esqlVariables,
+        controlsContext?.onSaveControl,
+        controlsContext?.onCancelControl
+      );
+    });
   });
 
   editor1.current?.addCommand(

src/platform/packages/shared/kbn-doc-links/src/get_doc_links.ts

@@ -506,6 +506,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       queryDsl: `${ELASTIC_DOCS}explore-analyze/query-filter/languages/querydsl`,
       queryESQL: `${ELASTIC_DOCS}explore-analyze/query-filter/languages/esql`,
       queryESQLExamples: `${ELASTIC_DOCS}explore-analyze/query-filter/languages/esql`,
+      queryESQLMultiValueControls: `${ELASTIC_DOCS}explore-analyze/dashboards/add-controls#add-esql-control`,
     },
     search: {
       sessions: `${ELASTIC_DOCS}explore-analyze/discover/search-sessions`,

src/platform/packages/shared/kbn-doc-links/src/types.ts

@@ -364,6 +364,7 @@ export interface DocLinks {
     readonly queryDsl: string;
     readonly queryESQL: string;
     readonly queryESQLExamples: string;
+    readonly queryESQLMultiValueControls: string;
   };
   readonly date: {
     readonly dateMath: string;

src/platform/packages/shared/kbn-es-types/src/search.ts

@@ -686,5 +686,10 @@ export interface ESQLSearchParams {
   dropNullColumns?: boolean;
   params?:
     | estypes.ScalarValue[]
-    | Array<Record<string, string | number | Record<string, string | number> | undefined>>;
+    | Array<
+        Record<
+          string,
+          string | number | (string | number)[] | Record<string, string | number> | undefined
+        >
+      >;
 }

src/platform/packages/shared/kbn-esql-ast/scripts/functions.ts

@@ -167,6 +167,12 @@ export function enrichFunctionParameters(functionDefinition: FunctionDefinition)
     });
   }
 
+  if (functionDefinition.name === 'mv_contains') {
+    return enrichFunctionSignatures(functionDefinition, 'superset', {
+      supportsMultiValues: true,
+    });
+  }
+
   if (functionDefinition.name === 'qstr') {
     return {
       ...functionDefinition,

src/platform/packages/shared/kbn-esql-ast/src/definitions/generated/scalar_functions.ts

@@ -7435,6 +7435,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'boolean',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7450,6 +7451,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'cartesian_point',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7465,6 +7467,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'cartesian_shape',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7480,6 +7483,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'date',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7495,6 +7499,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'date_nanos',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7510,6 +7515,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'double',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7525,6 +7531,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'geo_point',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7540,6 +7547,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'geo_shape',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7555,6 +7563,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'geohash',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7570,6 +7579,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'geohex',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7585,6 +7595,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'geotile',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7600,6 +7611,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'integer',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7615,6 +7627,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'ip',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7630,6 +7643,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'keyword',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7645,6 +7659,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'keyword',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7660,6 +7675,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'long',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7675,6 +7691,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'text',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7690,6 +7707,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'text',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7705,6 +7723,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'unsigned_long',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',
@@ -7720,6 +7739,7 @@ const mvContainsDefinition: FunctionDefinition = {
           name: 'superset',
           type: 'version',
           optional: false,
+          supportsMultiValues: true,
         },
         {
           name: 'subset',

src/platform/packages/shared/kbn-esql-ast/src/definitions/types.ts

@@ -180,6 +180,11 @@ export interface FunctionParameter {
   suggestedValues?: string[];
 
   mapParams?: string;
+
+  /** If true, this parameter supports multiple values (arrays). Default is false.
+   * This indicates that the parameter can accept multiple values, which will be passed as an array.
+   */
+  supportsMultiValues?: boolean;
 }
 
 export interface ElasticsearchCommandDefinition {

src/platform/packages/shared/kbn-esql-ast/src/definitions/utils/autocomplete/functions.ts

@@ -10,6 +10,7 @@ import type { LicenseType } from '@kbn/licensing-types';
 
 import { uniq } from 'lodash';
 import type { PricingProduct } from '@kbn/core-pricing-common/src/types';
+import { ESQLVariableType } from '@kbn/esql-types';
 import { getLocationInfo } from '../../../commands_registry/location';
 import {
   isAssignment,
@@ -190,6 +191,10 @@ export async function getFunctionArgsSuggestions(
     // If the type is explicitly a boolean condition
     typesToSuggestNext.some((t) => t && t.type === 'boolean' && t.name === 'condition');
 
+  const canBeMultiValue = typesToSuggestNext.some(
+    (t) => t && (t.supportsMultiValues === true || t.name === 'values')
+  );
+
   const shouldAddComma =
     hasMoreMandatoryArgs &&
     fnDefinition.type !== FunctionDefinitionTypes.OPERATOR &&
@@ -334,6 +339,7 @@ export async function getFunctionArgsSuggestions(
             addComma: shouldAddComma,
             advanceCursor: shouldAdvanceCursor,
             openSuggestions: shouldAdvanceCursor,
+            ...(canBeMultiValue && { variableType: ESQLVariableType.MULTI_VALUES }),
           }
         ),
         true

src/platform/packages/shared/kbn-esql-ast/src/definitions/utils/functions.ts

@@ -395,6 +395,7 @@ export const buildColumnSuggestions = (
     addComma?: boolean;
     variableType?: ESQLVariableType;
     supportsControls?: boolean;
+    supportsMultiValue?: boolean;
   },
   variables?: ESQLControlVariable[]
 ): ISuggestionItem[] => {

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

@@ -20,6 +20,7 @@ export enum ESQLVariableType {
   TIME_LITERAL = 'time_literal',
   FIELDS = 'fields',
   VALUES = 'values',
+  MULTI_VALUES = 'multi_values',
   FUNCTIONS = 'functions',
 }
 
@@ -35,7 +36,7 @@ export enum EsqlControlType {
 
 export interface ESQLControlVariable {
   key: string;
-  value: string | number;
+  value: string | number | (string | number)[];
   type: ESQLVariableType;
 }
 
@@ -48,6 +49,7 @@ export type ControlWidthOptions = 'small' | 'medium' | 'large';
 export interface ESQLControlState {
   grow?: boolean;
   width?: ControlWidthOptions;
+  singleSelect?: boolean;
   title: string;
   selectedOptions: string[];
   variableName: string;

src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/__tests__/autocomplete.command.variables.test.ts

@@ -176,6 +176,39 @@ describe('autocomplete.suggest', () => {
       });
     });
 
+    test('suggests `?multiValue` option', async () => {
+      const { suggest } = await setup();
+
+      const suggestions = await suggest('FROM index_a | WHERE MV_CONTAINS(/', {
+        callbacks: {
+          canSuggestVariables: () => true,
+          getVariables: () => [
+            {
+              key: 'interval',
+              value: '1 hour',
+              type: ESQLVariableType.TIME_LITERAL,
+            },
+            {
+              key: 'multiValue',
+              value: ['value1', 'value2'],
+              type: ESQLVariableType.MULTI_VALUES,
+            },
+          ],
+          getColumnsFor: () =>
+            Promise.resolve([{ name: '@timestamp', type: 'date', userDefined: false }]),
+        },
+      });
+
+      expect(suggestions).toContainEqual({
+        label: '?multiValue',
+        text: '?multiValue',
+        kind: 'Constant',
+        detail: 'Named parameter',
+        command: undefined,
+        sortText: '11A',
+      });
+    });
+
     test('suggests `Create control` option when ? is being typed', async () => {
       const { suggest } = await setup();