[Security Solution][Exceptions] - Updates autocomplete validation for numbers and boolean

x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_exists.tsx

@@ -4,24 +4,28 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
-import { EuiComboBox } from '@elastic/eui';
+import { EuiFormRow, EuiComboBox } from '@elastic/eui';
 
 interface AutocompleteFieldExistsProps {
   placeholder: string;
+  rowLabel?: string;
 }
 
 export const AutocompleteFieldExistsComponent: React.FC<AutocompleteFieldExistsProps> = ({
   placeholder,
+  rowLabel,
 }): JSX.Element => (
-  <EuiComboBox
-    placeholder={placeholder}
-    options={[]}
-    selectedOptions={[]}
-    onChange={undefined}
-    isDisabled
-    data-test-subj="valuesAutocompleteComboBox existsComboxBox"
-    fullWidth
-  />
+  <EuiFormRow label={rowLabel} fullWidth>
+    <EuiComboBox
+      placeholder={placeholder}
+      options={[]}
+      selectedOptions={[]}
+      onChange={undefined}
+      isDisabled
+      data-test-subj="valuesAutocompleteComboBox existsComboxBox"
+      fullWidth
+    />
+  </EuiFormRow>
 );
 
 AutocompleteFieldExistsComponent.displayName = 'AutocompleteFieldExists';

x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_lists.tsx

@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { EuiComboBoxOptionOption, EuiComboBox } from '@elastic/eui';
+import { EuiFormRow, EuiComboBoxOptionOption, EuiComboBox } from '@elastic/eui';
 
 import { IFieldType } from '../../../../../../../src/plugins/data/common';
 import { useFindLists, ListSchema } from '../../../lists_plugin_deps';
 import { useKibana } from '../../../common/lib/kibana';
-import { getGenericComboBoxProps, paramIsValid } from './helpers';
+import { getGenericComboBoxProps } from './helpers';
+import * as i18n from './translations';
 
 interface AutocompleteFieldListsProps {
   placeholder: string;
@@ -19,11 +20,13 @@ interface AutocompleteFieldListsProps {
   isDisabled: boolean;
   isClearable: boolean;
   isRequired?: boolean;
+  rowLabel?: string;
   onChange: (arg: ListSchema) => void;
 }
 
 export const AutocompleteFieldListsComponent: React.FC<AutocompleteFieldListsProps> = ({
   placeholder,
+  rowLabel,
   selectedField,
   selectedValue,
   isLoading = false,
@@ -32,7 +35,7 @@ export const AutocompleteFieldListsComponent: React.FC<AutocompleteFieldListsPro
   isRequired = false,
   onChange,
 }): JSX.Element => {
-  const [touched, setIsTouched] = useState(false);
+  const [error, setError] = useState<string | undefined>(undefined);
   const { http } = useKibana().services;
   const [lists, setLists] = useState<ListSchema[]>([]);
   const { loading, result, start } = useFindLists();
@@ -75,7 +78,9 @@ export const AutocompleteFieldListsComponent: React.FC<AutocompleteFieldListsPro
     [labels, optionsMemo, onChange]
   );
 
-  const setIsTouchedValue = useCallback(() => setIsTouched(true), [setIsTouched]);
+  const setIsTouchedValue = useCallback((): void => {
+    setError(selectedValue == null ? i18n.FIELD_REQUIRED_ERR : undefined);
+  }, [selectedValue]);
 
   useEffect(() => {
     if (result != null) {
@@ -93,30 +98,27 @@ export const AutocompleteFieldListsComponent: React.FC<AutocompleteFieldListsPro
     }
   }, [selectedField, start, http]);
 
-  const isValid = useMemo(
-    (): boolean => paramIsValid(selectedValue, selectedField, isRequired, touched),
-    [selectedField, selectedValue, isRequired, touched]
-  );
-
   const isLoadingState = useMemo((): boolean => isLoading || loading, [isLoading, loading]);
 
   return (
-    <EuiComboBox
-      placeholder={placeholder}
-      isDisabled={isDisabled}
-      isLoading={isLoadingState}
-      isClearable={isClearable}
-      options={comboOptions}
-      selectedOptions={selectedComboOptions}
-      onChange={handleValuesChange}
-      isInvalid={!isValid}
-      onFocus={setIsTouchedValue}
-      singleSelection={{ asPlainText: true }}
-      sortMatchesBy="startsWith"
-      data-test-subj="valuesAutocompleteComboBox listsComboxBox"
-      fullWidth
-      async
-    />
+    <EuiFormRow label={rowLabel} error={error} isInvalid={error != null} fullWidth>
+      <EuiComboBox
+        placeholder={placeholder}
+        isDisabled={isDisabled}
+        isLoading={isLoadingState}
+        isClearable={isClearable}
+        options={comboOptions}
+        selectedOptions={selectedComboOptions}
+        onChange={handleValuesChange}
+        isInvalid={error != null}
+        onBlur={setIsTouchedValue}
+        singleSelection={{ asPlainText: true }}
+        sortMatchesBy="startsWith"
+        data-test-subj="valuesAutocompleteComboBox listsComboxBox"
+        fullWidth
+        async
+      />
+    </EuiFormRow>
   );
 };