maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[ML] Fixing use_null setting in advanced job wizard (#100028)

Browse source 
* [ML] Fixing use_null setting in advanced job wizard

* fixing types

* fixing false checks for detector fields

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
James Gowdy 2021-05-17 21:04:35 +01:00 committed by GitHub
parent f1a2e6f251
commit 7f9364ac8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
View file

@ -32,6 +32,7 @@ export interface RichDetector {
excludeFrequent: estypes.ExcludeFrequent | null;
description: string | null;
customRules: CustomRule[] | null;
useNull: boolean | null;
}
export class AdvancedJobCreator extends JobCreator {
@ -58,7 +59,8 @@ export class AdvancedJobCreator extends JobCreator {
overField: SplitField,
partitionField: SplitField,
excludeFrequent: estypes.ExcludeFrequent | null,
description: string | null
description: string | null,
useNull: boolean | null
) {
// addDetector doesn't support adding new custom rules.
// this will be added in the future once it's supported in the UI
@ -71,7 +73,8 @@ export class AdvancedJobCreator extends JobCreator {
partitionField,
excludeFrequent,
description,
customRules
customRules,
useNull
);
this._addDetector(detector, agg, field);
@ -86,7 +89,8 @@ export class AdvancedJobCreator extends JobCreator {
partitionField: SplitField,
excludeFrequent: estypes.ExcludeFrequent | null,
description: string | null,
index: number
index: number,
useNull: boolean | null
) {
const customRules =
this._detectors[index] !== undefined ? this._detectors[index].custom_rules || null : null;
@ -99,7 +103,8 @@ export class AdvancedJobCreator extends JobCreator {
partitionField,
excludeFrequent,
description,
customRules
customRules,
useNull
);
this._editDetector(detector, agg, field, index);
@ -117,7 +122,8 @@ export class AdvancedJobCreator extends JobCreator {
partitionField: SplitField,
excludeFrequent: estypes.ExcludeFrequent | null,
description: string | null,
customRules: CustomRule[] | null
customRules: CustomRule[] | null,
useNull: boolean | null
): { detector: Detector; richDetector: RichDetector } {
const detector: Detector = createBasicDetector(agg, field);
@ -139,6 +145,9 @@ export class AdvancedJobCreator extends JobCreator {
if (customRules !== null) {
detector.custom_rules = customRules;
}
if (useNull !== null) {
detector.use_null = useNull;
}
const richDetector: RichDetector = {
agg,
@ -149,6 +158,7 @@ export class AdvancedJobCreator extends JobCreator {
excludeFrequent,
description,
customRules,
useNull,
};
return { detector, richDetector };
@ -209,7 +219,8 @@ export class AdvancedJobCreator extends JobCreator {
dtr.overField,
dtr.partitionField,
dtr.excludeFrequent,
dtr.description
dtr.description,
dtr.useNull
);
}
});

5
x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/general.ts
View file

@ -79,8 +79,9 @@ export function getRichDetectors(
byField,
overField,
partitionField,
excludeFrequent: d.exclude_frequent || null,
description: d.detector_description || null,
excludeFrequent: d.exclude_frequent ?? null,
description: d.detector_description ?? null,
useNull: d.use_null ?? null,
};
});
}

1
x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
View file

@ -177,6 +177,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
: null,
description: descriptionOption !== '' ? descriptionOption : null,
customRules: null,
useNull: null,
};
setDetector(dtr);
setDescriptionPlaceholder(dtr);

7
x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_view/metric_selection.tsx
View file

@ -29,6 +29,7 @@ const emptyRichDetector: RichDetector = {
excludeFrequent: null,
description: null,
customRules: null,
useNull: null,
};
export const AdvancedDetectors: FC<Props> = ({ setIsValid }) => {
@ -51,7 +52,8 @@ export const AdvancedDetectors: FC<Props> = ({ setIsValid }) => {
dtr.overField,
dtr.partitionField,
dtr.excludeFrequent,
dtr.description
dtr.description,
dtr.useNull
);
} else {
jobCreator.editDetector(
@ -62,7 +64,8 @@ export const AdvancedDetectors: FC<Props> = ({ setIsValid }) => {
dtr.partitionField,
dtr.excludeFrequent,
dtr.description,
index
index,
dtr.useNull
);
}
jobCreatorUpdate();