[ML] Fix detector modal combo box selection (elastic#48741)

* [ML] Fix detector modal combo box selection * removing old work around
spalger · Oct 21, 2019 · 28c374a · 28c374a
1 parent 3cfbfaf
commit 28c374a
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/...omponents/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx b/...omponents/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
@@ -218,7 +218,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
                 options={currentFieldOptions}
-                selectedOptions={[fieldOption]}
+                selectedOptions={createSelectedOptions(fieldOption, currentFieldOptions)}
                 onChange={onOptionChange(setFieldOption)}
                 isClearable={true}
                 isDisabled={fieldsEnabled === false || fieldOptionEnabled === false}
@@ -233,7 +233,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
                 options={splitFieldOptions}
-                selectedOptions={[byFieldOption]}
+                selectedOptions={createSelectedOptions(byFieldOption, splitFieldOptions)}
                 onChange={onOptionChange(setByFieldOption)}
                 isClearable={true}
                 isDisabled={fieldsEnabled === false}
@@ -245,7 +245,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
                 options={splitFieldOptions}
-                selectedOptions={[overFieldOption]}
+                selectedOptions={createSelectedOptions(overFieldOption, splitFieldOptions)}
                 onChange={onOptionChange(setOverFieldOption)}
                 isClearable={true}
                 isDisabled={fieldsEnabled === false}
@@ -257,7 +257,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
               <EuiComboBox
                 singleSelection={{ asPlainText: true }}
                 options={splitFieldOptions}
-                selectedOptions={[partitionFieldOption]}
+                selectedOptions={createSelectedOptions(partitionFieldOption, splitFieldOptions)}
                 onChange={onOptionChange(setPartitionFieldOption)}
                 isClearable={true}
                 isDisabled={fieldsEnabled === false}
@@ -355,12 +355,9 @@ function useDetectorPlaceholder(detector: RichDetector) {
 
 // creates list of combobox options based on an aggregation's field list
 function createFieldOptionList(agg: Aggregation | null) {
-  const options = (agg !== null && agg.fields !== undefined ? agg.fields : [])
+  return (agg !== null && agg.fields !== undefined ? agg.fields : [])
     .filter(f => f.id !== EVENT_RATE_FIELD_ID)
     .map(createFieldOption);
-
-  // working round EuiComboBox's odd behavior when the options list contains only one item
-  return options.length === 1 ? [emptyOption, ...options] : options;
 }
 
 // custom hook for storing combobox options based on an aggregation field list
@@ -387,3 +384,13 @@ function createDefaultDescription(dtr: RichDetector) {
   basicDetector.exclude_frequent = dtr.excludeFrequent ? dtr.excludeFrequent : undefined;
   return detectorToString(basicDetector);
 }
+
+// fixes issue with EuiComboBox.
+// if the options list only contains one option and nothing has been selected, set
+// selectedOptions list to be an empty array
+function createSelectedOptions(
+  option: EuiComboBoxOptionProps,
+  options: EuiComboBoxOptionProps[]
+): EuiComboBoxOptionProps[] {
+  return options.length === 1 && options[0].label !== option.label ? [] : [option];
+}