always use runtime mappings if present in agg field exists check

jgowdyelastic · jgowdyelastic · commit 7f6a925ec2eb · 2021-03-22T13:35:40.000Z
diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
@@ -625,15 +625,13 @@ export class DataVisualizer {
         cardinalityField = aggs[`${safeFieldName}_cardinality`] = {
           cardinality: { script: datafeedConfig?.script_fields[field].script },
         };
-      } else if (datafeedConfig?.runtime_mappings?.hasOwnProperty(field)) {
-        cardinalityField = {
-          cardinality: { field },
-        };
-        runtimeMappings.runtime_mappings = datafeedConfig.runtime_mappings;
       } else {
         cardinalityField = {
           cardinality: { field },
         };
+        if (datafeedConfig !== undefined && isPopulatedObject(datafeedConfig?.runtime_mappings)) {
+          runtimeMappings.runtime_mappings = datafeedConfig.runtime_mappings;
+        }
       }
       aggs[`${safeFieldName}_cardinality`] = cardinalityField;
     });
