Fixed comments

elastic · Apr 15, 2020 · b3544ec · b3544ec
1 parent 98c6b3a
commit b3544ec
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 63 deletions.
diff --git a/...ns/index_patterns/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx b/...ns/index_patterns/edit_index_pattern/indexed_fields_table/components/table/table.test.tsx
@@ -56,15 +56,15 @@ const items: IndexedFieldItem[] = [
 ];
 
 describe('Table', () => {
-  test('should render normally', async () => {
+  test('should render normally', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );
 
     expect(component).toMatchSnapshot();
   });
 
-  test('should render normal field name', async () => {
+  test('should render normal field name', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );
@@ -73,7 +73,7 @@ describe('Table', () => {
     expect(tableCell).toMatchSnapshot();
   });
 
-  test('should render timestamp field name', async () => {
+  test('should render timestamp field name', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );
@@ -82,7 +82,7 @@ describe('Table', () => {
     expect(tableCell).toMatchSnapshot();
   });
 
-  test('should render the boolean template (true)', async () => {
+  test('should render the boolean template (true)', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );
@@ -91,7 +91,7 @@ describe('Table', () => {
     expect(tableCell).toMatchSnapshot();
   });
 
-  test('should render the boolean template (false)', async () => {
+  test('should render the boolean template (false)', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );
@@ -100,7 +100,7 @@ describe('Table', () => {
     expect(tableCell).toMatchSnapshot();
   });
 
-  test('should render normal type', async () => {
+  test('should render normal type', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );
@@ -109,7 +109,7 @@ describe('Table', () => {
     expect(tableCell).toMatchSnapshot();
   });
 
-  test('should render conflicting type', async () => {
+  test('should render conflicting type', () => {
     const component = shallow(
       <Table indexPattern={indexPattern} items={items} editField={() => {}} />
     );

diff --git a/...ections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/table.tsx b/...ections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/table.tsx
@@ -27,110 +27,107 @@ import { IIndexPattern } from '../../../../../../../../../../../plugins/data/pub
 import { IndexedFieldItem } from '../../types';
 
 // localized labels
-const infoLabel = i18n.translate(
+const additionalInfoAriaLabel = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.additionalInfoAriaLabel',
   { defaultMessage: 'Additional field information' }
 );
 
-const timeLabel = i18n.translate(
+const primaryTimeAriaLabel = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.primaryTimeAriaLabel',
   { defaultMessage: 'Primary time field' }
 );
 
-const timeContent = i18n.translate(
+const primaryTimeTooltip = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.primaryTimeTooltip',
   { defaultMessage: 'This field represents the time that events occurred.' }
 );
 
-const label = i18n.translate('kbn.management.editIndexPattern.fields.table.multiTypeAria', {
-  defaultMessage: 'Multiple type field',
-});
-
-const content = i18n.translate('kbn.management.editIndexPattern.fields.table.multiTypeTooltip', {
-  defaultMessage:
-    'The type of this field changes across indices. It is unavailable for many analysis functions.',
-});
+const multiTypeAriaLabel = i18n.translate(
+  'kbn.management.editIndexPattern.fields.table.multiTypeAria',
+  {
+    defaultMessage: 'Multiple type field',
+  }
+);
 
-const displayNameColumn = i18n.translate(
-  'kbn.management.editIndexPattern.fields.table.nameHeader',
+const multiTypeTooltip = i18n.translate(
+  'kbn.management.editIndexPattern.fields.table.multiTypeTooltip',
   {
-    defaultMessage: 'Name',
+    defaultMessage:
+      'The type of this field changes across indices. It is unavailable for many analysis functions.',
   }
 );
 
-const typeNameColumn = i18n.translate('kbn.management.editIndexPattern.fields.table.typeHeader', {
+const nameHeader = i18n.translate('kbn.management.editIndexPattern.fields.table.nameHeader', {
+  defaultMessage: 'Name',
+});
+
+const typeHeader = i18n.translate('kbn.management.editIndexPattern.fields.table.typeHeader', {
   defaultMessage: 'Type',
 });
 
-const formatNameColumn = i18n.translate(
-  'kbn.management.editIndexPattern.fields.table.formatHeader',
-  {
-    defaultMessage: 'Format',
-  }
-);
+const formatHeader = i18n.translate('kbn.management.editIndexPattern.fields.table.formatHeader', {
+  defaultMessage: 'Format',
+});
 
-const searchableNameColumn = i18n.translate(
+const searchableHeader = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.searchableHeader',
   {
     defaultMessage: 'Searchable',
   }
 );
 
-const searchableDescriptionColumn = i18n.translate(
+const searchableDescription = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.searchableDescription',
   { defaultMessage: 'These fields can be used in the filter bar' }
 );
 
-const isSearchableLabel = i18n.translate(
+const isSearchableAriaLabel = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.isSearchableAria',
   {
     defaultMessage: 'Is searchable',
   }
 );
 
-const aggregatableNameColumn = i18n.translate(
+const aggregatableLabel = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.aggregatableLabel',
   {
     defaultMessage: 'Aggregatable',
   }
 );
 
-const aggregatableDescriptionColumn = i18n.translate(
+const aggregatableDescription = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.aggregatableDescription',
   { defaultMessage: 'These fields can be used in visualization aggregations' }
 );
 
-const isAggregatableLabel = i18n.translate(
+const isAggregatableAriaLabel = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.isAggregatableAria',
   {
     defaultMessage: 'Is aggregatable',
   }
 );
 
-const excludedNameColumn = i18n.translate(
-  'kbn.management.editIndexPattern.fields.table.excludedLabel',
-  {
-    defaultMessage: 'Excluded',
-  }
-);
+const excludedLabel = i18n.translate('kbn.management.editIndexPattern.fields.table.excludedLabel', {
+  defaultMessage: 'Excluded',
+});
 
-const excludedDescriptionColumn = i18n.translate(
+const excludedDescription = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.excludedDescription',
   { defaultMessage: 'Fields that are excluded from _source when it is fetched' }
 );
 
-const isExcludedLabel = i18n.translate(
+const isExcludedAriaLabel = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.isExcludedAria',
   {
     defaultMessage: 'Is excluded',
   }
 );
 
-const editNameAction = i18n.translate('kbn.management.editIndexPattern.fields.table.editLabel', {
+const editLabel = i18n.translate('kbn.management.editIndexPattern.fields.table.editLabel', {
   defaultMessage: 'Edit',
 });
 
-const editDescriptionAction = i18n.translate(
+const editDescription = i18n.translate(
   'kbn.management.editIndexPattern.fields.table.editDescription',
   { defaultMessage: 'Edit' }
 );
@@ -158,7 +155,7 @@ export class Table extends PureComponent<IndexedFieldProps> {
             <EuiIconTip
               type="questionInCircle"
               color="primary"
-              aria-label={infoLabel}
+              aria-label={additionalInfoAriaLabel}
               content={field.info.map((info: string, i: number) => (
                 <div key={i}>{info}</div>
               ))}
@@ -168,7 +165,12 @@ export class Table extends PureComponent<IndexedFieldProps> {
         {indexPattern.timeFieldName === name ? (
           <span>
             &nbsp;
-            <EuiIconTip type="clock" color="primary" aria-label={timeLabel} content={timeContent} />
+            <EuiIconTip
+              type="clock"
+              color="primary"
+              aria-label={primaryTimeAriaLabel}
+              content={primaryTimeTooltip}
+            />
           </span>
         ) : null}
       </span>
@@ -182,7 +184,12 @@ export class Table extends PureComponent<IndexedFieldProps> {
         {isConflict ? (
           <span>
             &nbsp;
-            <EuiIconTip type="alert" color="warning" aria-label={label} content={content} />
+            <EuiIconTip
+              type="alert"
+              color="warning"
+              aria-label={multiTypeAriaLabel}
+              content={multiTypeTooltip}
+            />
           </span>
         ) : (
           ''
@@ -202,7 +209,7 @@ export class Table extends PureComponent<IndexedFieldProps> {
     const columns: Array<EuiBasicTableColumn<IndexedFieldItem>> = [
       {
         field: 'displayName',
-        name: displayNameColumn,
+        name: nameHeader,
         dataType: 'string',
         sortable: true,
         render: (value: string, field: IndexedFieldItem) => {
@@ -213,7 +220,7 @@ export class Table extends PureComponent<IndexedFieldProps> {
       },
       {
         field: 'type',
-        name: typeNameColumn,
+        name: typeHeader,
         dataType: 'string',
         sortable: true,
         render: (value: string) => {
@@ -223,40 +230,40 @@ export class Table extends PureComponent<IndexedFieldProps> {
       },
       {
         field: 'format',
-        name: formatNameColumn,
+        name: formatHeader,
         dataType: 'string',
         sortable: true,
       },
       {
         field: 'searchable',
-        name: searchableNameColumn,
-        description: searchableDescriptionColumn,
+        name: searchableHeader,
+        description: searchableDescription,
         dataType: 'boolean',
         sortable: true,
-        render: (value: string) => this.renderBooleanTemplate(value, isSearchableLabel),
+        render: (value: string) => this.renderBooleanTemplate(value, isSearchableAriaLabel),
       },
       {
         field: 'aggregatable',
-        name: aggregatableNameColumn,
-        description: aggregatableDescriptionColumn,
+        name: aggregatableLabel,
+        description: aggregatableDescription,
         dataType: 'boolean',
         sortable: true,
-        render: (value: string) => this.renderBooleanTemplate(value, isAggregatableLabel),
+        render: (value: string) => this.renderBooleanTemplate(value, isAggregatableAriaLabel),
       },
       {
         field: 'excluded',
-        name: excludedNameColumn,
-        description: excludedDescriptionColumn,
+        name: excludedLabel,
+        description: excludedDescription,
         dataType: 'boolean',
         sortable: true,
-        render: (value: string) => this.renderBooleanTemplate(value, isExcludedLabel),
+        render: (value: string) => this.renderBooleanTemplate(value, isExcludedAriaLabel),
       },
       {
         name: '',
         actions: [
           {
-            name: editNameAction,
-            description: editDescriptionAction,
+            name: editLabel,
+            description: editDescription,
             icon: 'pencil',
             onClick: editField,
             type: 'icon',

diff --git a/.../sections/index_patterns/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/.../sections/index_patterns/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -27,8 +27,8 @@ import { IndexedFieldItem } from './types';
 interface IndexedFieldsTableProps {
   fields: IndexPatternField[];
   indexPattern: IIndexPattern;
-  fieldFilter: string;
-  indexedFieldTypeFilter: string;
+  fieldFilter?: string;
+  indexedFieldTypeFilter?: string;
   helpers: {
     redirectToRoute: (obj: any, route: string) => void;
     getFieldInfo: (indexPattern: IIndexPattern, field: string) => string[];