[ML] fix typing

elastic · Mar 23, 2020 · cd8c140 · cd8c140
1 parent 0e3c9e1
commit cd8c140
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/x-pack/plugins/ml/common/types/modules.ts b/x-pack/plugins/ml/common/types/modules.ts
@@ -90,9 +90,13 @@ export interface DataRecognizerConfigResponse {
   };
 }
 
-export type GeneralJobsOverride = Partial<Omit<Job, 'job_id'>>;
+export type JobOverride = Partial<Job>;
+export type GeneralJobsOverride = Omit<JobOverride, 'job_id'>;
+export type JobSpecificOverride = JobOverride & { job_id: Job['job_id'] };
 
-export type JobOverride = Partial<Job> & { job_id: Job['job_id'] };
+export function isGeneralJobOverride(override: JobOverride): override is GeneralJobsOverride {
+  return override.job_id === undefined;
+}
 
 export type GeneralDatafeedsOverride = Partial<Omit<Datafeed, 'job_id'>>;
 

diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -25,6 +25,8 @@ import {
   KibanaObjectResponse,
   DataRecognizerConfigResponse,
   GeneralDatafeedsOverride,
+  JobSpecificOverride,
+  isGeneralJobOverride,
 } from '../../../common/types/modules';
 import { getLatestDataOrBucketTimestamp, prefixDatafeedId } from '../../../common/util/job_utils';
 import { mlLog } from '../../client/log';
@@ -1090,10 +1092,10 @@ export class DataRecognizer {
     // separate all the overrides.
     // the overrides which don't contain a job id will be applied to all jobs in the module
     const generalOverrides: GeneralJobsOverride[] = [];
-    const jobSpecificOverrides: JobOverride[] = [];
+    const jobSpecificOverrides: JobSpecificOverride[] = [];
 
     overrides.forEach(override => {
-      if (override.job_id === undefined) {
+      if (isGeneralJobOverride(override)) {
         generalOverrides.push(override);
       } else {
         jobSpecificOverrides.push(override);