Fix type errors

elastic · Jul 25, 2020 · 2260613 · 2260613
1 parent fdba80b
commit 2260613
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/plugins/data/common/index_patterns/fields/field.ts b/src/plugins/data/common/index_patterns/fields/field.ts
@@ -43,7 +43,7 @@ interface FieldDependencies {
 
 export class Field implements IFieldType {
   name: string;
-  label: string;
+  label?: string;
   type: string;
   script?: string;
   lang?: string;

diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
@@ -137,6 +137,7 @@ export interface FieldSpecExportFmt {
   lang?: string;
   conflictDescriptions?: FieldSpecConflictDescriptions;
   name: string;
+  label?: string;
   type: KBN_FIELD_TYPES;
   esTypes?: string[];
   scripted: boolean;

diff --git a/...over/public/application/angular/doc_table/components/table_header/table_header_column.tsx b/...over/public/application/angular/doc_table/components/table_header/table_header_column.tsx
@@ -24,7 +24,7 @@ import { SortOrder } from './helpers';
 interface Props {
   colLeftIdx: number; // idx of the column to the left, -1 if moving is not possible
   colRightIdx: number; // idx of the column to the right, -1 if moving is not possible
-  displayName: string;
+  displayName?: string;
   isRemoveable: boolean;
   isSortable: boolean;
   name: string;

diff --git a/...gement/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/...gement/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -76,7 +76,10 @@ export class IndexedFieldsTable extends Component<
         fields.map((field) => {
           return {
             ...field,
-            displayName: field.displayName,
+            displayName:
+              field.displayName !== field.name
+                ? `${field.name} (${field.displayName})`
+                : field.displayName,
             indexPattern: field.indexPattern,
             format: getFieldFormat(indexPattern, field.name),
             excluded: fieldWildcardMatch ? fieldWildcardMatch(field.name) : false,
@@ -95,7 +98,11 @@ export class IndexedFieldsTable extends Component<
     (fields, fieldFilter, indexedFieldTypeFilter) => {
       if (fieldFilter) {
         const normalizedFieldFilter = fieldFilter.toLowerCase();
-        fields = fields.filter((field) => field.name.toLowerCase().includes(normalizedFieldFilter));
+        fields = fields.filter(
+          (field) =>
+            field.name.toLowerCase().includes(normalizedFieldFilter) ||
+            (field.displayName && field.displayName.toLowerCase().includes(normalizedFieldFilter))
+        );
       }
 
       if (indexedFieldTypeFilter) {