map range converter

elastic · Oct 15, 2019 · 15c3f38 · 15c3f38
1 parent 1f2311d
commit 15c3f38
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/packages/kbn-es-query/src/filters/lib/meta_filter.ts b/packages/kbn-es-query/src/filters/lib/meta_filter.ts
@@ -26,8 +26,10 @@ export interface FilterState {
   store: FilterStateStore;
 }
 
+type FilterFormatterFunction = (value: any) => string;
 export interface FilterValueFormatter {
-  convert: (value: any) => string;
+  convert: FilterFormatterFunction;
+  getConverterFor: (type: string) => FilterFormatterFunction;
 }
 
 export interface FilterMeta {

diff --git a/...egacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts b/...egacy/core_plugins/data/public/filter/filter_bar/filter_editor/lib/filter_editor_utils.ts
@@ -31,7 +31,7 @@ import {
   PhrasesFilter,
   RangeFilter,
 } from '@kbn/es-query';
-import { omit } from 'lodash';
+import { omit, get } from 'lodash';
 import { Ipv4Address } from '../../../../../../../../plugins/kibana_utils/public';
 import { Field, IndexPattern, isFilterable } from '../../../../index_patterns';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
@@ -45,15 +45,19 @@ export function getIndexPatternFromFilter(
 
 function getValueFormatter(indexPattern?: IndexPattern, key?: string) {
   if (!indexPattern || !key) return;
-  const field = indexPattern.fields.getByName(key);
-  return field && field.format;
+  let format = get(indexPattern, ['fields', 'byName', key, 'format']);
+  if (!format && indexPattern.fields.getByName) {
+    // TODO: Why is indexPatterns sometimes a map and sometimes an array?
+    format = (indexPattern.fields.getByName(key) as Field).format;
+  }
+  return format;
 }
 
 export function getDisplayValueFromFilter(filter: Filter, indexPatterns: IndexPattern[]): string {
   const indexPattern = getIndexPatternFromFilter(filter, indexPatterns);
-  const valueFormatter: any = getValueFormatter(indexPattern, filter.meta.key);
 
   if (typeof filter.meta.value === 'function') {
+    const valueFormatter: any = getValueFormatter(indexPattern, filter.meta.key);
     return filter.meta.value(valueFormatter);
   } else {
     return filter.meta.value || '';

diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/lib/map_range.ts
@@ -31,7 +31,8 @@ const getFormattedValueFn = (left: any, right: any) => {
   return (formatter?: FilterValueFormatter) => {
     let displayValue = `${left} to ${right}`;
     if (formatter) {
-      displayValue = `${formatter.convert(left)} to ${formatter.convert(right)}`;
+      const convert = formatter.getConverterFor('text');
+      displayValue = `${convert(left)} to ${convert(right)}`;
     }
     return displayValue;
   };