Apply label and icon to nested fields in the doc table

elastic · Jan 7, 2020 · 64f7c37 · 64f7c37
1 parent af52b29
commit 64f7c37
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
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,11 +68,22 @@ 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,6 +31,7 @@ import { DocViewTableRowIconUnderscore } from './table_row_icon_underscore';
 export interface Props {
   field: string;
   fieldMapping?: FieldMapping;
+  fieldType?: string;
   displayNoMappingWarning: boolean;
   displayUnderscoreWarning: boolean;
   isCollapsible: boolean;
@@ -46,6 +47,7 @@ export interface Props {
 export function DocViewTableRow({
   field,
   fieldMapping,
+  fieldType,
   displayNoMappingWarning,
   displayUnderscoreWarning,
   isCollapsible,
@@ -85,7 +87,7 @@ export function DocViewTableRow({
         </td>
       )}
       <td className="kbnDocViewer__field">
-        <FieldName field={fieldMapping} fieldName={field} />
+        <FieldName field={fieldMapping} fieldName={field} fieldType={fieldType} />
       </td>
       <td>
         {isCollapsible && (

diff --git a/src/legacy/ui/public/directives/field_name/field_type_name.ts b/src/legacy/ui/public/directives/field_name/field_type_name.ts
@@ -61,6 +61,10 @@ export function getFieldTypeName(type: string) {
       return i18n.translate('common.ui.directives.fieldNameIcons.stringFieldAriaLabel', {
         defaultMessage: 'String field',
       });
+    case 'nested':
+      return i18n.translate('common.ui.directives.fieldNameIcons.nestedFieldAriaLabel', {
+        defaultMessage: 'Nested field',
+      });
     default:
       return i18n.translate('common.ui.directives.fieldNameIcons.unknownFieldAriaLabel', {
         defaultMessage: 'Unknown field',