[ML] Fix dv broken with time range

Author: qn895

x-pack/plugins/ml/common/util/runtime_field_utils.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { isPopulatedObject } from './object_utils';
+import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common/index_patterns';
+import type { RuntimeField, RuntimeMappings } from '../types/fields';
+import type { RuntimeType } from '../../../runtime_fields/target/types/public';
+
+export function isRuntimeField(arg: unknown): arg is RuntimeField {
+  return (
+    isPopulatedObject(arg) &&
+    ((Object.keys(arg).length === 1 && arg.hasOwnProperty('type')) ||
+      (Object.keys(arg).length === 2 &&
+        arg.hasOwnProperty('type') &&
+        arg.hasOwnProperty('script') &&
+        (typeof arg.script === 'string' ||
+          (isPopulatedObject(arg.script) &&
+            Object.keys(arg.script).length === 1 &&
+            arg.script.hasOwnProperty('source') &&
+            typeof arg.script.source === 'string')))) &&
+    RUNTIME_FIELD_TYPES.includes(arg.type as RuntimeType)
+  );
+}
+
+export function isRuntimeMappings(arg: unknown): arg is RuntimeMappings {
+  return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d));
+}

x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts

@@ -211,7 +211,7 @@ const getAggIntervals = async (
       query,
       aggs: buildSamplerAggregation(minMaxAggs, samplerShardSize),
       size: 0,
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     },
   });
 
@@ -297,7 +297,7 @@ export const getHistogramsForFields = async (
       query,
       aggs: buildSamplerAggregation(chartDataAggs, samplerShardSize),
       size: 0,
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     },
   });
 
@@ -753,7 +753,7 @@ export class DataVisualizer {
           filter: filterCriteria,
         },
       },
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
     filterCriteria.push({ exists: { field } });
 
@@ -799,7 +799,7 @@ export class DataVisualizer {
         },
       },
       aggs,
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
 
     const { body } = await this._asCurrentUser.search({
@@ -904,7 +904,7 @@ export class DataVisualizer {
         },
       },
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
 
     const { body } = await this._asCurrentUser.search({
@@ -1027,7 +1027,7 @@ export class DataVisualizer {
         },
       },
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
 
     const { body } = await this._asCurrentUser.search({
@@ -1103,7 +1103,7 @@ export class DataVisualizer {
         },
       },
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
 
     const { body } = await this._asCurrentUser.search({
@@ -1172,7 +1172,7 @@ export class DataVisualizer {
         },
       },
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
 
     const { body } = await this._asCurrentUser.search({
@@ -1237,7 +1237,7 @@ export class DataVisualizer {
           filter: filterCriteria,
         },
       },
-      ...(runtimeMappings !== undefined ? { runtime_mappings: runtimeMappings } : {}),
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     };
 
     const { body } = await this._asCurrentUser.search({

x-pack/plugins/ml/server/routes/schemas/data_visualizer_schema.ts

@@ -6,13 +6,26 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { isRuntimeField } from '../../../common/util/runtime_field_utils';
 
 export const indexPatternTitleSchema = schema.object({
   /** Title of the index pattern for which to return stats. */
   indexPatternTitle: schema.string(),
 });
 
-const runtimeMappingsSchema = schema.maybe(schema.any());
+const runtimeMappingsSchema = schema.maybe(
+  schema.object(
+    {},
+    {
+      unknowns: 'allow',
+      validate: (v: object) => {
+        if (Object.values(v).some((o) => !isRuntimeField(o))) {
+          return 'Your error message about invalid runtime definition';
+        }
+      },
+    }
+  )
+);
 
 export const dataVisualizerFieldHistogramsSchema = schema.object({
   /** Query to match documents in the index. */