Apply url params in vis_type_table

elastic · Dec 19, 2019 · c2a0bd2 · c2a0bd2
1 parent ba7589d
commit c2a0bd2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/legacy/core_plugins/vis_type_table/public/paginated_table/paginated_table.test.ts b/src/legacy/core_plugins/vis_type_table/public/paginated_table/paginated_table.test.ts
@@ -42,6 +42,7 @@ interface Column {
   title: string;
   formatter?: {
     convert?: (val: string) => string;
+    [key: string]: any;
   };
   sortable?: boolean;
 }
@@ -94,15 +95,19 @@ describe('Table Vis - Paginated table', () => {
 
     if (isNumber(colCount)) {
       times(colCount, i => {
-        columns.push({ id: `${i}`, title: `column${i}`, formatter: { convert: identity } });
+        columns.push({
+          id: `${i}`,
+          title: `column${i}`,
+          formatter: { convert: identity, getConverterFor: () => identity },
+        });
       });
     } else {
       columns = colCount.map(
         (col, i) =>
           ({
             id: `${i}`,
             title: col.title,
-            formatter: col.formatter || { convert: identity },
+            formatter: col.formatter || { convert: identity, getConverterFor: () => identity },
           } as Column)
       );
     }
@@ -678,6 +683,9 @@ describe('Table Vis - Paginated table', () => {
             convert: val => {
               return val === 'zzz' ? '<h1>hello</h1>' : val;
             },
+            getConverterFor: () => (val: any) => {
+              return val === 'zzz' ? '<h1>hello</h1>' : val;
+            },
           },
         },
       ];

diff --git a/src/legacy/core_plugins/vis_type_table/public/paginated_table/rows.js b/src/legacy/core_plugins/vis_type_table/public/paginated_table/rows.js
@@ -21,6 +21,15 @@ import $ from 'jquery';
 import _ from 'lodash';
 import tableCellFilterHtml from './table_cell_filter.html';
 
+function getFormattedValue(formatter, value) {
+  const parsedUrl = {
+    origin: window.location.origin,
+    pathname: window.location.pathname,
+  };
+
+  return formatter.getConverterFor('html')(value, false, false, parsedUrl);
+}
+
 export function KbnRows($compile) {
   return {
     restrict: 'A',
@@ -72,7 +81,7 @@ export function KbnRows($compile) {
 
         // An AggConfigResult can "enrich" cell contents by applying a field formatter,
         // which we want to do if possible.
-        contents = contentsIsDefined ? column.formatter.convert(contents, 'html') : '';
+        contents = contentsIsDefined ? getFormattedValue(column.formatter, contents) : '';
 
         if (_.isObject(contents)) {
           if (contents.attr) {

diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
@@ -146,7 +146,7 @@ export const getFormat: FormatFactory = mapping => {
             basePath: npStart.core.http.basePath,
           };
           // @ts-ignore
-          return format.convert(val, undefined, undefined, parsedUrl);
+          return format.getConverterFor(type)(val, false, false, parsedUrl);
         };
       },
       convert: (val: string, type: string) => {
@@ -163,7 +163,7 @@ export const getFormat: FormatFactory = mapping => {
           basePath: npStart.core.http.basePath,
         };
         // @ts-ignore
-        return format.convert(val, type, undefined, parsedUrl);
+        return format.getConverterFor(type)(val, false, false, parsedUrl);
       },
     } as FieldFormat;
   } else {