Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ML] Filtering category runtime fields in advanced wizard #132916

Merged
merged 5 commits into from May 26, 2022
Merged

[ML] Filtering category runtime fields in advanced wizard #132916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1352b73
[ML] Filtering category runtime fields in advanced wizard
jgowdyelastic May 25, 2022
4966b58
reverting accidentally commited code
jgowdyelastic May 25, 2022
c69a52d
sorting fields in dropdowns
jgowdyelastic May 26, 2022
f829bd4
removing accidentally committed code
jgowdyelastic May 26, 2022
4c39510
Merge branch 'main' into filtering-category-runtime-fields-in-advance…
jgowdyelastic May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions x-pack/plugins/ml/common/util/fields_utils.ts
View file
Open in desktop
Expand Up @@ -16,6 +16,13 @@ import {
} from '../types/fields';
import { ML_JOB_AGGREGATION } from '../constants/aggregation_types';

const categoryFieldTypes = [
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moving this into common

ES_FIELD_TYPES.TEXT,
ES_FIELD_TYPES.KEYWORD,
ES_FIELD_TYPES.IP,
ES_FIELD_TYPES.VERSION,
];

// cross reference fields and aggs.
// fields contain a list of aggs that are compatible, and vice versa.
export function combineFieldsAndAggs(
Expand Down Expand Up @@ -144,3 +151,7 @@ export function sortFields(fields: Field[]) {
}
return fields;
}

export function filterCategoryFields(fields: Field[], include = true) {
return fields.filter((f) => categoryFieldTypes.includes(f.type) === include);
}
3 changes: 2 additions & 1 deletion ...omponents/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ import {
EVENT_RATE_FIELD_ID,
mlCategory,
} from '../../../../../../../../../common/types/fields';
import { filterCategoryFields } from '../../../../../../../../../common/util/fields_utils';
import { RichDetector } from '../../../../../common/job_creator/advanced_job_creator';
import { ModalWrapper } from './modal_wrapper';
import { detectorToString } from '../../../../../../../util/string_utils';
Expand Down Expand Up @@ -104,7 +105,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
// fields available for the selected agg
const { currentFieldOptions, setCurrentFieldOptions } = useCurrentFieldOptions(
detector.agg,
jobCreator.additionalFields,
filterCategoryFields(jobCreator.additionalFields, false),
fields
);

Expand Down
13 changes: 7 additions & 6 deletions ...plication/jobs/new_job/pages/components/pick_fields_step/components/by_field/by_field.tsx
View file
Open in desktop
Expand Up @@ -10,11 +10,9 @@ import { i18n } from '@kbn/i18n';

import { SplitFieldSelect } from '../split_field_select';
import { JobCreatorContext } from '../../../job_creator_context';
import { Field } from '../../../../../../../../../common/types/fields';
import {
newJobCapsService,
filterCategoryFields,
} from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import type { Field } from '../../../../../../../../../common/types/fields';
import { filterCategoryFields } from '../../../../../../../../../common/util/fields_utils';
import { newJobCapsService } from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import { PopulationJobCreator } from '../../../../../common/job_creator';

interface Props {
Expand All @@ -27,7 +25,10 @@ export const ByFieldSelector: FC<Props> = ({ detectorIndex }) => {

const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
const allCategoryFields = useMemo(
() => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
() =>
[...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
a.name.localeCompare(b.name)
),
[]
);

Expand Down
13 changes: 7 additions & 6 deletions ...ew_job/pages/components/pick_fields_step/components/population_field/population_field.tsx
View file
Open in desktop
Expand Up @@ -9,11 +9,9 @@ import React, { FC, useContext, useEffect, useState, useMemo } from 'react';

import { SplitFieldSelect } from '../split_field_select';
import { JobCreatorContext } from '../../../job_creator_context';
import { Field } from '../../../../../../../../../common/types/fields';
import {
newJobCapsService,
filterCategoryFields,
} from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import type { Field } from '../../../../../../../../../common/types/fields';
import { filterCategoryFields } from '../../../../../../../../../common/util/fields_utils';
import { newJobCapsService } from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import { Description } from './description';
import {
PopulationJobCreator,
Expand All @@ -27,7 +25,10 @@ export const PopulationFieldSelector: FC = () => {

const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
const allCategoryFields = useMemo(
() => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
() =>
[...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
a.name.localeCompare(b.name)
),
[]
);
const categoryFields = useFilteredCategoryFields(
Expand Down
13 changes: 7 additions & 6 deletions ...ation/jobs/new_job/pages/components/pick_fields_step/components/rare_field/rare_field.tsx
View file
Open in desktop
Expand Up @@ -9,12 +9,10 @@ import React, { FC, useContext, useEffect, useState, useMemo } from 'react';

import { RareFieldSelect } from './rare_field_select';
import { JobCreatorContext } from '../../../job_creator_context';
import {
newJobCapsService,
filterCategoryFields,
} from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import { filterCategoryFields } from '../../../../../../../../../common/util/fields_utils';
import { newJobCapsService } from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import { Description } from './description';
import { Field } from '../../../../../../../../../common/types/fields';
import type { Field } from '../../../../../../../../../common/types/fields';
import { RareJobCreator } from '../../../../../common/job_creator';

export const RareFieldSelector: FC = () => {
Expand All @@ -23,7 +21,10 @@ export const RareFieldSelector: FC = () => {

const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
const allCategoryFields = useMemo(
() => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
() =>
[...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
a.name.localeCompare(b.name)
),
[]
);
const categoryFields = useFilteredCategoryFields(
Expand Down
13 changes: 7 additions & 6 deletions ...ion/jobs/new_job/pages/components/pick_fields_step/components/split_field/split_field.tsx
View file
Open in desktop
Expand Up @@ -9,12 +9,10 @@ import React, { FC, useContext, useEffect, useState, useMemo } from 'react';

import { SplitFieldSelect } from '../split_field_select';
import { JobCreatorContext } from '../../../job_creator_context';
import {
newJobCapsService,
filterCategoryFields,
} from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import { filterCategoryFields } from '../../../../../../../../../common/util/fields_utils';
import { newJobCapsService } from '../../../../../../../services/new_job_capabilities/new_job_capabilities_service';
import { Description } from './description';
import { Field } from '../../../../../../../../../common/types/fields';
import type { Field } from '../../../../../../../../../common/types/fields';
import {
MultiMetricJobCreator,
RareJobCreator,
Expand All @@ -27,7 +25,10 @@ export const SplitFieldSelector: FC = () => {

const runtimeCategoryFields = useMemo(() => filterCategoryFields(jobCreator.runtimeFields), []);
const allCategoryFields = useMemo(
() => [...newJobCapsService.categoryFields, ...runtimeCategoryFields],
() =>
[...newJobCapsService.categoryFields, ...runtimeCategoryFields].sort((a, b) =>
a.name.localeCompare(b.name)
),
[]
);
const categoryFields = useFilteredCategoryFields(
Expand Down
23 changes: 4 additions & 19 deletions ...ugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
View file
Open in desktop
Expand Up @@ -5,24 +5,13 @@
* 2.0.
*/
import { ES_FIELD_TYPES } from '@kbn/data-plugin/public';
import { DataView } from '@kbn/data-views-plugin/public';
import {
Field,
Aggregation,
AggId,
FieldId,
EVENT_RATE_FIELD_ID,
} from '../../../../common/types/fields';
import type { DataView } from '@kbn/data-views-plugin/public';
import type { Field, Aggregation, AggId, FieldId } from '../../../../common/types/fields';
import { EVENT_RATE_FIELD_ID } from '../../../../common/types/fields';
import { filterCategoryFields } from '../../../../common/util/fields_utils';
import { ml } from '../ml_api_service';
import { processTextAndKeywordFields, NewJobCapabilitiesServiceBase } from './new_job_capabilities';

const categoryFieldTypes = [
ES_FIELD_TYPES.TEXT,
ES_FIELD_TYPES.KEYWORD,
ES_FIELD_TYPES.IP,
ES_FIELD_TYPES.VERSION,
];

class NewJobCapsService extends NewJobCapabilitiesServiceBase {
private _catFields: Field[] = [];
private _dateFields: Field[] = [];
Expand Down Expand Up @@ -172,8 +161,4 @@ function addEventRateField(aggs: Aggregation[], fields: Field[]) {
fields.splice(0, 0, eventRateField);
}

export function filterCategoryFields(fields: Field[]) {
return fields.filter((f) => categoryFieldTypes.includes(f.type));
}

export const newJobCapsService = new NewJobCapsService();