adding blocked to job summary

elastic · Aug 11, 2021 · 797c274 · 797c274
1 parent 268098f
commit 797c274
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
@@ -12,12 +12,14 @@ export type BucketSpan = string;
 
 // temporary Job override, waiting for es client to have correct types
 export type Job = estypes.MlJob & {
-  blocked: {
-    reason: 'delete' | 'revert' | 'reset';
-    task_id?: string;
-  };
+  blocked: MlJobBlocked;
 };
 
+export interface MlJobBlocked {
+  reason: 'delete' | 'revert' | 'reset';
+  task_id?: string;
+}
+
 export type AnalysisConfig = estypes.MlAnalysisConfig;
 
 export type Detector = estypes.MlDetector;

diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/summary_job.ts
@@ -7,10 +7,11 @@
 
 import { Moment } from 'moment';
 
-import { CombinedJob, CombinedJobWithStats } from './combined_job';
-import { MlAnomalyDetectionAlertRule } from '../alerts';
-export { Datafeed } from './datafeed';
-export { DatafeedStats } from './datafeed_stats';
+import type { CombinedJob, CombinedJobWithStats } from './combined_job';
+import type { MlAnomalyDetectionAlertRule } from '../alerts';
+import type { MlJobBlocked } from './job';
+export type { Datafeed } from './datafeed';
+export type { DatafeedStats } from './datafeed_stats';
 
 export interface MlSummaryJob {
   id: string;
@@ -32,6 +33,7 @@ export interface MlSummaryJob {
   isSingleMetricViewerJob: boolean;
   isNotSingleMetricViewerJobMessage?: string;
   deleting?: boolean;
+  blocked?: MlJobBlocked;
   latestTimestampSortValue?: number;
   earliestStartTimestampMs?: number;
   awaitingNodeAssignment: boolean;

diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js
@@ -16,7 +16,7 @@ import {
   isStartable,
   isStoppable,
   isClosable,
-  isResetable,
+  isResettable,
 } from '../utils';
 import { getToastNotifications } from '../../../../util/dependency_cache';
 import { i18n } from '@kbn/i18n';
@@ -112,7 +112,7 @@ export function actionsMenuContent(
       }),
       icon: 'refresh',
       enabled: (item) => isJobBlocked(item) === false && canResetJob,
-      available: (item) => isResetable([item]),
+      available: (item) => isResettable([item]),
       onClick: (item) => {
         showResetJobModal([item]);
         closeMenu(true);

diff --git a/...plugins/ml/public/application/jobs/jobs_list/components/multi_job_actions/actions_menu.js b/...plugins/ml/public/application/jobs/jobs_list/components/multi_job_actions/actions_menu.js
@@ -18,7 +18,7 @@ import {
   isStartable,
   isStoppable,
   isClosable,
-  isResetable,
+  isResettable,
 } from '../utils';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -111,7 +111,7 @@ class MultiJobActionsMenuUI extends Component {
       );
     }
 
-    if (isResetable(this.props.jobs)) {
+    if (isResettable(this.props.jobs)) {
       items.push(
         <EuiContextMenuItem
           key="reset job"

diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
@@ -77,7 +77,7 @@ export function isClosable(jobs) {
   );
 }
 
-export function isResetable(jobs) {
+export function isResettable(jobs) {
   return jobs.some((j) => j.jobState === JOB_STATE.CLOSED);
 }
 

diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -239,6 +239,7 @@ export function jobsProvider(
         isNotSingleMetricViewerJobMessage: errorMessage,
         nodeName: job.node ? job.node.name : undefined,
         deleting: job.deleting || undefined,
+        blocked: job.blocked ?? undefined,
         awaitingNodeAssignment: isJobAwaitingNodeAssignment(job),
         alertingRules: job.alerting_rules,
         jobTags: job.custom_settings?.job_tags ?? {},