github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Fixing advanced detector field selects enablement (#49348) (#49371)

Browse source
This commit is contained in:
James Gowdy 2019-10-25 20:16:58 +01:00 • committed by GitHub
parent 80aaee689f
commit 9f623ed4d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
View file

@ -83,7 +83,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
createExcludeFrequentOption(detector.excludeFrequent)
);
const [descriptionOption, setDescriptionOption] = useState(detector.description || '');
const [fieldsEnabled, setFieldsEnabled] = useState(true);
const [splitFieldsEnabled, setSplitFieldsEnabled] = useState(true);
const [excludeFrequentEnabled, setExcludeFrequentEnabled] = useState(true);
const [fieldOptionEnabled, setFieldOptionEnabled] = useState(true);
const { descriptionPlaceholder, setDescriptionPlaceholder } = useDetectorPlaceholder(detector);
@ -139,20 +139,22 @@ export const AdvancedDetectorModal: FC<Props> = ({
const partitionField = getField(partitionFieldOption.label);
if (agg !== null) {
setFieldsEnabled(true);
setCurrentFieldOptions(agg);
if (isFieldlessAgg(agg) && eventRateField !== undefined) {
setSplitFieldsEnabled(true);
setFieldOption(emptyOption);
setFieldOptionEnabled(false);
field = eventRateField;
} else {
setSplitFieldsEnabled(field !== null);
setFieldOptionEnabled(true);
// only enable exclude frequent if there is a by or over selected
setExcludeFrequentEnabled(byField !== null || overField !== null);
}
// only enable exclude frequent if there is a by or over selected
setExcludeFrequentEnabled(byField !== null || overField !== null);
} else {
setFieldsEnabled(false);
setSplitFieldsEnabled(false);
setFieldOptionEnabled(false);
}
const dtr: RichDetector = {
@ -179,7 +181,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
useEffect(() => {
const agg = getAgg(aggOption.label);
setFieldsEnabled(aggOption.label !== '');
setSplitFieldsEnabled(aggOption.label !== '');
if (agg !== null) {
setFieldOptionEnabled(isFieldlessAgg(agg) === false);
@ -202,7 +204,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
function saveEnabled() {
return (
fieldsEnabled &&
splitFieldsEnabled &&
(fieldOptionEnabled === false || (fieldOptionEnabled === true && fieldOption.label !== ''))
);
}
@ -216,7 +218,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
<EuiComboBox
singleSelection={{ asPlainText: true }}
options={aggOptions}
selectedOptions={[aggOption]}
selectedOptions={createSelectedOptions(aggOption, aggOptions)}
onChange={onOptionChange(setAggOption)}
isClearable={true}
/>
@ -230,7 +232,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
selectedOptions={createSelectedOptions(fieldOption, currentFieldOptions)}
onChange={onOptionChange(setFieldOption)}
isClearable={true}
isDisabled={fieldsEnabled === false || fieldOptionEnabled === false}
isDisabled={fieldOptionEnabled === false}
/>
</FieldDescription>
</EuiFlexItem>
@ -245,7 +247,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
selectedOptions={createSelectedOptions(byFieldOption, splitFieldOptions)}
onChange={onOptionChange(setByFieldOption)}
isClearable={true}
isDisabled={fieldsEnabled === false}
isDisabled={splitFieldsEnabled === false}
/>
</ByFieldDescription>
</EuiFlexItem>
@ -257,7 +259,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
selectedOptions={createSelectedOptions(overFieldOption, splitFieldOptions)}
onChange={onOptionChange(setOverFieldOption)}
isClearable={true}
isDisabled={fieldsEnabled === false}
isDisabled={splitFieldsEnabled === false}
/>
</OverFieldDescription>
</EuiFlexItem>
@ -269,7 +271,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
selectedOptions={createSelectedOptions(partitionFieldOption, splitFieldOptions)}
onChange={onOptionChange(setPartitionFieldOption)}
isClearable={true}
isDisabled={fieldsEnabled === false}
isDisabled={splitFieldsEnabled === false}
/>
</PartitionFieldDescription>
</EuiFlexItem>
@ -278,10 +280,13 @@ export const AdvancedDetectorModal: FC<Props> = ({
<EuiComboBox
singleSelection={{ asPlainText: true }}
options={excludeFrequentOptions}
selectedOptions={[excludeFrequentOption]}
selectedOptions={createSelectedOptions(
excludeFrequentOption,
excludeFrequentOptions
)}
onChange={onOptionChange(setExcludeFrequentOption)}
isClearable={true}
isDisabled={fieldsEnabled === false || excludeFrequentEnabled === false}
isDisabled={splitFieldsEnabled === false || excludeFrequentEnabled === false}
/>
</ExcludeFrequentDescription>
</EuiFlexItem>
@ -393,10 +398,13 @@ function createDefaultDescription(dtr: RichDetector) {
// 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,
selectedOption: EuiComboBoxOptionProps,
options: EuiComboBoxOptionProps[]
): EuiComboBoxOptionProps[] {
return options.length === 1 && options[0].label !== option.label ? [] : [option];
return (options.length === 1 && options[0].label !== selectedOption.label) ||
selectedOption.label === ''
? []
: [selectedOption];
}
function comboBoxOptionsSort(a: EuiComboBoxOptionProps, b: EuiComboBoxOptionProps) {