Include nested fields in the index pattern so we can identify them in…

… the Discover UI
elastic · Jan 8, 2020 · 7b6ce8d · 7b6ce8d
1 parent 64f7c37
commit 7b6ce8d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
@@ -68,22 +68,11 @@ export function DocViewTable({
             const displayNoMappingWarning =
               !mapping(field) && !displayUnderscoreWarning && !isArrayOfObjects;
 
-            // Nested fields are not a part of the index pattern but their children are.
-            // Nested children are not a part of the flattened document but their nested parent is.
-            // So to detect nested fields we look through the index pattern for nested children
-            // that have the current field in their path. Knowing which fields are nested allows us
-            // to label them and apply the correct icon in the table row.
-            const isNestedField = !!indexPattern.fields.find(patternField =>
-              patternField.subType?.nested?.path.includes(field)
-            );
-            const fieldType = isNestedField ? 'nested' : undefined;
-
             return (
               <DocViewTableRow
                 key={field}
                 field={field}
                 fieldMapping={mapping(field)}
-                fieldType={fieldType}
                 displayUnderscoreWarning={displayUnderscoreWarning}
                 displayNoMappingWarning={displayNoMappingWarning}
                 isCollapsed={isCollapsed}

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
@@ -31,7 +31,6 @@ import { DocViewTableRowIconUnderscore } from './table_row_icon_underscore';
 export interface Props {
   field: string;
   fieldMapping?: FieldMapping;
-  fieldType?: string;
   displayNoMappingWarning: boolean;
   displayUnderscoreWarning: boolean;
   isCollapsible: boolean;
@@ -47,7 +46,6 @@ export interface Props {
 export function DocViewTableRow({
   field,
   fieldMapping,
-  fieldType,
   displayNoMappingWarning,
   displayUnderscoreWarning,
   isCollapsible,
@@ -87,7 +85,7 @@ export function DocViewTableRow({
         </td>
       )}
       <td className="kbnDocViewer__field">
-        <FieldName field={fieldMapping} fieldName={field} fieldType={fieldType} />
+        <FieldName field={fieldMapping} fieldName={field} />
       </td>
       <td>
         {isCollapsible && (

diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -195,6 +195,6 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
   });
 
   return kibanaFormattedCaps.filter(field => {
-    return !['object', 'nested'].includes(field.type);
+    return !['object'].includes(field.type);
   });
 }
diff --git a/src/plugins/kibana_react/public/field_icon/field_icon.tsx b/src/plugins/kibana_react/public/field_icon/field_icon.tsx
@@ -36,6 +36,7 @@ interface FieldIconProps {
     | 'number'
     | '_source'
     | 'string'
+    | 'nested'
     | string;
   label?: string;
   size?: IconSize;
@@ -61,6 +62,7 @@ export const typeToEuiIconMap: Partial<Record<string, IconMapEntry>> = {
   number: { icon: 'number', color: colors[0] },
   _source: { icon: 'editorCodeBlock', color: colors[3] },
   string: { icon: 'string', color: colors[4] },
+  nested: { icon: 'nested', color: colors[4] },
 };
 
 /**