Merge branch 'main' into feature/apikey_deprecation

elastic · Jul 20, 2022 · e04f412 · e04f412
2 parents cdd908a + 0c78f8a
commit e04f412
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/plugins/data/common/search/tabify/tabify_docs.ts b/src/plugins/data/common/search/tabify/tabify_docs.ts
@@ -92,7 +92,7 @@ export function flattenHit(hit: Hit, indexPattern?: DataView, params?: TabifyDoc
         continue;
       }
 
-      const hasValidMapping = field?.type !== 'conflict';
+      const hasValidMapping = field && field.type !== 'conflict';
       const isValue = !isPlainObject(val);
 
       if (hasValidMapping || isValue) {

diff --git a/...eporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap b/...eporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap