Skip to content

Commit 484334b

Browse files
jgowdyelasticjgowdyelastic
committed
[ML] Fixing missing advanced job summary items (#48537)
* [ML] Fixing missing advanced job summary items * updating translations
1 parent a85f091 commit 484334b

21 files changed

Lines changed: 276 additions & 58 deletions

File tree

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/common/job_creator/util/constants.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ export enum CREATED_BY_LABEL {
1919

2020
export const DEFAULT_MODEL_MEMORY_LIMIT = '10MB';
2121
export const DEFAULT_BUCKET_SPAN = '15m';
22+
export const DEFAULT_QUERY_DELAY = '60s';
2223

2324
export const SHARED_RESULTS_INDEX_NAME = 'shared';

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/query_delay/query_delay_input.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import { EuiFieldText } from '@elastic/eui';
99
import { JobCreatorContext } from '../../../job_creator_context';
1010
import { Description } from './description';
1111
import { useStringifiedValue } from '../hooks';
12-
13-
const DEFAULT_QUERY_DELAY = '60s';
12+
import { DEFAULT_QUERY_DELAY } from '../../../../../common/job_creator/util/constants';
1413

1514
export const QueryDelayInput: FC = () => {
1615
const { jobCreator, jobCreatorUpdate, jobValidator, jobValidatorUpdated } = useContext(

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/datafeed_step/components/scroll_size/scroll_size_input.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import React, { FC, useState, useContext, useEffect } from 'react';
88
import { EuiFieldNumber } from '@elastic/eui';
9-
import { newJobDefaults } from '../../../../../../new_job_new/utils/new_job_defaults';
9+
import { newJobDefaults } from '../../../../../utils/new_job_defaults';
1010
import { JobCreatorContext } from '../../../job_creator_context';
1111
import { Description } from './description';
1212

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/advanced_view.tsx‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@ import React, { Fragment, FC, useEffect, useState } from 'react';
88
import { EuiHorizontalRule } from '@elastic/eui';
99

1010
import { AdvancedDetectors } from './metric_selection';
11+
import { AdvancedDetectorsSummary } from './metric_selection_summary';
1112
import { AdvancedSettings } from './settings';
1213
import { ExtraSettings } from './extra';
1314

1415
interface Props {
16+
isActive: boolean;
1517
setCanProceed?: (proceed: boolean) => void;
1618
}
1719

18-
export const AdvancedView: FC<Props> = ({ setCanProceed }) => {
20+
export const AdvancedView: FC<Props> = ({ isActive, setCanProceed }) => {
1921
const [metricsValid, setMetricValid] = useState(false);
2022
const [settingsValid, setSettingsValid] = useState(false);
2123

@@ -27,13 +29,17 @@ export const AdvancedView: FC<Props> = ({ setCanProceed }) => {
2729

2830
return (
2931
<Fragment>
30-
<Fragment>
31-
<ExtraSettings />
32-
<EuiHorizontalRule margin="l" />
33-
<AdvancedDetectors setIsValid={setMetricValid} />
34-
<EuiHorizontalRule margin="l" />
35-
<AdvancedSettings setIsValid={setSettingsValid} />
36-
</Fragment>
32+
{isActive === false ? (
33+
<AdvancedDetectorsSummary />
34+
) : (
35+
<Fragment>
36+
<ExtraSettings />
37+
<EuiHorizontalRule margin="l" />
38+
<AdvancedDetectors setIsValid={setMetricValid} />
39+
<EuiHorizontalRule margin="l" />
40+
<AdvancedSettings setIsValid={setSettingsValid} />
41+
</Fragment>
42+
)}
3743
</Fragment>
3844
);
3945
};

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/detector_list.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ import { AdvancedJobCreator } from '../../../../../common/job_creator';
2424
import { detectorToString } from '../../../../../../../util/string_utils';
2525

2626
interface Props {
27+
isActive: boolean;
2728
onEditJob: (i: number) => void;
2829
onDeleteJob: (i: number) => void;
2930
}
3031

31-
export const DetectorList: FC<Props> = ({ onEditJob, onDeleteJob }) => {
32+
export const DetectorList: FC<Props> = ({ isActive, onEditJob, onDeleteJob }) => {
3233
const { jobCreator: jc, jobCreatorUpdated } = useContext(JobCreatorContext);
3334
const jobCreator = jc as AdvancedJobCreator;
3435
const [detectors, setDetectors] = useState(jobCreator.detectors);

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const AdvancedDetectors: FC<Props> = ({ setIsValid }) => {
8282

8383
return (
8484
<Fragment>
85-
<DetectorList onEditJob={onEditJob} onDeleteJob={onDeleteJob} />
85+
<DetectorList isActive={true} onEditJob={onEditJob} onDeleteJob={onDeleteJob} />
8686
<MetricSelector
8787
payload={modalPayload}
8888
fields={fields}

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/advanced_view/metric_selection_summary.tsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License;
4+
* you may not use this file except in compliance with the Elastic License.
5+
*/
6+
7+
import React, { FC } from 'react';
8+
9+
import { DetectorList } from './detector_list';
10+
11+
export const AdvancedDetectorsSummary: FC = () => (
12+
<DetectorList isActive={false} onEditJob={() => {}} onDeleteJob={() => {}} />
13+
);

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/multi_metric_view/multi_metric_view.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export const MultiMetricView: FC<Props> = ({ isActive, setCanProceed }) => {
2828

2929
return (
3030
<Fragment>
31-
{isActive === false && <MultiMetricDetectorsSummary />}
32-
33-
{isActive === true && (
31+
{isActive === false ? (
32+
<MultiMetricDetectorsSummary />
33+
) : (
3434
<Fragment>
3535
<MultiMetricDetectors setIsValid={setMetricValid} />
3636

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/population_view/population_view.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export const PopulationView: FC<Props> = ({ isActive, setCanProceed }) => {
2828

2929
return (
3030
<Fragment>
31-
{isActive === false && <PopulationDetectorsSummary />}
32-
33-
{isActive === true && (
31+
{isActive === false ? (
32+
<PopulationDetectorsSummary />
33+
) : (
3434
<Fragment>
3535
<PopulationDetectors setIsValid={setMetricValid} />
3636
{metricsValid && (

‎x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/pick_fields_step/components/single_metric_view/single_metric_view.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export const SingleMetricView: FC<Props> = ({ isActive, setCanProceed }) => {
2828

2929
return (
3030
<Fragment>
31-
{isActive === false && <SingleMetricDetectorsSummary />}
32-
33-
{isActive === true && (
31+
{isActive === false ? (
32+
<SingleMetricDetectorsSummary />
33+
) : (
3434
<Fragment>
3535
<SingleMetricDetectors setIsValid={setMetricValid} />
3636
{metricsValid && (

0 commit comments

Comments
 (0)