[ML] indexOf checks

darnautov · darnautov · commit 70432da6cd1f · 2020-05-13T11:00:57.000+02:00
diff --git a/x-pack/plugins/ml/common/util/job_utils.ts b/x-pack/plugins/ml/common/util/job_utils.ts
@@ -91,10 +91,10 @@ export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex
       // Perform extra check to see if the detector is using a scripted field.
       const scriptFields = Object.keys(job.datafeed_config.script_fields);
       isSourceDataChartable =
-        scriptFields.indexOf(dtr.field_name) === -1 &&
-        scriptFields.indexOf(dtr.partition_field_name) === -1 &&
-        scriptFields.indexOf(dtr.by_field_name) === -1 &&
-        scriptFields.indexOf(dtr.over_field_name) === -1;
+        scriptFields.indexOf(dtr.field_name!) === -1 &&
+        scriptFields.indexOf(dtr.partition_field_name!) === -1 &&
+        scriptFields.indexOf(dtr.by_field_name!) === -1 &&
+        scriptFields.indexOf(dtr.over_field_name!) === -1;
     }
   }
 
@@ -180,14 +180,16 @@ export function isModelPlotEnabled(
           entityField => entityField.fieldName === detector.partition_field_name
         );
         isEnabled =
-          partitionEntity !== undefined && terms.indexOf(String(partitionEntity.fieldValue)) !== -1;
+          partitionEntity?.fieldValue !== undefined &&
+          terms.indexOf(String(partitionEntity.fieldValue)) !== -1;
       }
 
       if (isEnabled === true && detectorHasByField === true) {
         const byEntity = entityFields.find(
           entityField => entityField.fieldName === detector.by_field_name
         );
-        isEnabled = byEntity !== undefined && terms.indexOf(String(byEntity.fieldValue)) !== -1;
+        isEnabled =
+          byEntity?.fieldValue !== undefined && terms.indexOf(String(byEntity.fieldValue)) !== -1;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,10 @@ export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex`
`91`	`91`	`// Perform extra check to see if the detector is using a scripted field.`
`92`	`92`	`const scriptFields = Object.keys(job.datafeed_config.script_fields);`
`93`	`93`	`isSourceDataChartable =`
`94`		`- scriptFields.indexOf(dtr.field_name) === -1 &&`
`95`		`- scriptFields.indexOf(dtr.partition_field_name) === -1 &&`
`96`		`- scriptFields.indexOf(dtr.by_field_name) === -1 &&`
`97`		`- scriptFields.indexOf(dtr.over_field_name) === -1;`
	`94`	`+ scriptFields.indexOf(dtr.field_name!) === -1 &&`
	`95`	`+ scriptFields.indexOf(dtr.partition_field_name!) === -1 &&`
	`96`	`+ scriptFields.indexOf(dtr.by_field_name!) === -1 &&`
	`97`	`+ scriptFields.indexOf(dtr.over_field_name!) === -1;`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`@@ -180,14 +180,16 @@ export function isModelPlotEnabled(`
`180`	`180`	`entityField => entityField.fieldName === detector.partition_field_name`
`181`	`181`	`);`
`182`	`182`	`isEnabled =`
`183`		`- partitionEntity !== undefined && terms.indexOf(String(partitionEntity.fieldValue)) !== -1;`
	`183`	`+ partitionEntity?.fieldValue !== undefined &&`
	`184`	`+ terms.indexOf(String(partitionEntity.fieldValue)) !== -1;`
`184`	`185`	`}`
`185`	`186`
`186`	`187`	`if (isEnabled === true && detectorHasByField === true) {`
`187`	`188`	`const byEntity = entityFields.find(`
`188`	`189`	`entityField => entityField.fieldName === detector.by_field_name`
`189`	`190`	`);`
`190`		`- isEnabled = byEntity !== undefined && terms.indexOf(String(byEntity.fieldValue)) !== -1;`
	`191`	`+ isEnabled =`
	`192`	`+ byEntity?.fieldValue !== undefined && terms.indexOf(String(byEntity.fieldValue)) !== -1;`
`191`	`193`	`}`
`192`	`194`	`}`
`193`	`195`	`}`