Kibana 7.0.0 URL field formatter doesn't render relative hyperlinks p…

…roperly (#53265) * Kibana 7.0.0 URL field formatter doesn't render relative hyperlinks properly * fix CI * fix PR comment / add tests
elastic · Dec 20, 2019 · 80b11a7 · 80b11a7
1 parent 9513123
commit 80b11a7
Show file tree

Hide file tree

Showing 19 changed files with 316 additions and 153 deletions.
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -21,7 +21,7 @@ import StubIndexPattern from 'test_utils/stub_index_pattern';
 import stubbedLogstashFields from 'fixtures/logstash_fields';
 
 import { getKbnFieldType } from '../plugins/data/common';
-import { mockUiSettings } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
+import { npSetup } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
 
 export default function stubbedLogstashIndexPatternService() {
   const mockLogstashFields = stubbedLogstashFields();
@@ -41,13 +41,8 @@ export default function stubbedLogstashIndexPatternService() {
     };
   });
 
-  const indexPattern = new StubIndexPattern(
-    'logstash-*',
-    cfg => cfg,
-    'time',
-    fields,
-    mockUiSettings
-  );
+  const indexPattern = new StubIndexPattern('logstash-*', cfg => cfg, 'time', fields, npSetup.core);
+
   indexPattern.id = 'logstash-*';
   indexPattern.isTimeNanosBased = () => false;
 

diff --git a/...egacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js b/...egacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
@@ -50,14 +50,18 @@ describe('Doc Table', function() {
       // Stub `getConverterFor` for a field in the indexPattern to return mock data.
       // Returns `val` if provided, otherwise generates fake data for the field.
       fakeRowVals = getFakeRowVals('formatted', 0, mapping);
-      stubFieldFormatConverter = function($root, field, val = null) {
-        $root.indexPattern.fields.getByName(field).format.getConverterFor = () => (...args) => {
+      stubFieldFormatConverter = function($root, field, val) {
+        const convertFn = (value, type, options) => {
           if (val) {
             return val;
           }
-          const fieldName = _.get(args, '[1].name', null);
+          const fieldName = _.get(options, 'field.name', null);
+
           return fakeRowVals[fieldName] || '';
         };
+
+        $root.indexPattern.fields.getByName(field).format.convert = convertFn;
+        $root.indexPattern.fields.getByName(field).format.getConverterFor = () => convertFn;
       };
     })
   );

diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
@@ -110,7 +110,7 @@ describe('Table Vis - Controller', () => {
       (cfg: any) => cfg,
       'time',
       stubFields,
-      npStart.core.uiSettings
+      npStart.core
     );
   });
 

diff --git a/src/legacy/ui/public/agg_types/buckets/terms.ts b/src/legacy/ui/public/agg_types/buckets/terms.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
 import { noop } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { SearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
@@ -80,14 +79,8 @@ export const termsBucketAgg = new BucketAggType({
           if (val === '__missing__') {
             return bucket.params.missingBucketLabel;
           }
-          const parsedUrl = {
-            origin: window.location.origin,
-            pathname: window.location.pathname,
-            basePath: chrome.getBasePath(),
-          };
-          const converter = bucket.params.field.format.getConverterFor(type);
 
-          return converter(val, undefined, undefined, parsedUrl);
+          return bucket.params.field.format.convert(val, type);
         };
       },
     } as FieldFormat;

diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
@@ -45,11 +45,18 @@ export const mockUiSettings = {
   'format:defaultTypeMap': {},
 };
 
-export const npSetup = {
-  core: {
-    chrome: {},
-    uiSettings: mockUiSettings,
+const mockCore = {
+  chrome: {},
+  uiSettings: mockUiSettings,
+  http: {
+    basePath: {
+      get: sinon.fake.returns(''),
+    },
   },
+};
+
+export const npSetup = {
+  core: mockCore,
   plugins: {
     usageCollection: {
       allowTrackUserAgent: sinon.fake(),
@@ -95,7 +102,7 @@ export const npSetup = {
           getSavedQueryCount: sinon.fake(),
         },
       },
-      fieldFormats: getFieldFormatsRegistry(mockUiSettings),
+      fieldFormats: getFieldFormatsRegistry(mockCore),
     },
     share: {
       register: () => {},
@@ -224,7 +231,7 @@ export const npStart = {
           history: sinon.fake(),
         },
       },
-      fieldFormats: getFieldFormatsRegistry(mockUiSettings),
+      fieldFormats: getFieldFormatsRegistry(mockCore),
     },
     share: {
       toggleShareContextMenu: () => {},

diff --git a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js b/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
@@ -26,7 +26,7 @@ import { createSavedObjectClass } from '../saved_object';
 import StubIndexPattern from 'test_utils/stub_index_pattern';
 import { npStart } from 'ui/new_platform';
 import { InvalidJSONProperty } from '../../../../../plugins/kibana_utils/public';
-import { mockUiSettings } from '../../new_platform/new_platform.karma_mock';
+import { npSetup } from '../../new_platform/new_platform.karma_mock';
 
 const getConfig = cfg => cfg;
 
@@ -310,7 +310,7 @@ describe('Saved Object', function() {
               getConfig,
               null,
               [],
-              mockUiSettings
+              npSetup.core
             );
             indexPattern.title = indexPattern.id;
             savedObject.searchSource.setField('index', indexPattern);
@@ -700,7 +700,7 @@ describe('Saved Object', function() {
             getConfig,
             null,
             [],
-            mockUiSettings
+            npSetup.core
           );
           indexPattern.title = indexPattern.id;
           savedObject.searchSource.setField('index', indexPattern);

diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
@@ -23,7 +23,7 @@ import { AggConfig, Vis } from 'ui/vis';
 import { npStart } from 'ui/new_platform';
 import { SerializedFieldFormat } from 'src/plugins/expressions/public';
 
-import { IFieldFormatId, FieldFormat } from '../../../../../../plugins/data/public';
+import { IFieldFormatId, FieldFormat, ContentType } from '../../../../../../plugins/data/public';
 
 import { tabifyGetColumns } from '../../../agg_response/tabify/_get_columns';
 import { DateRangeKey, convertDateRangeToString } from '../../../agg_types/buckets/date_range';
@@ -129,42 +129,23 @@ export const getFormat: FormatFactory = mapping => {
     });
     return new IpRangeFormat();
   } else if (isTermsFieldFormat(mapping) && mapping.params) {
-    const params = mapping.params;
+    const { params } = mapping;
+    const convert = (val: string, type: ContentType) => {
+      const format = getFieldFormat(params.id, mapping.params);
+
+      if (val === '__other__') {
+        return params.otherBucketLabel;
+      }
+      if (val === '__missing__') {
+        return params.missingBucketLabel;
+      }
+
+      return format.convert(val, type);
+    };
+
     return {
-      getConverterFor: (type: string) => {
-        const format = getFieldFormat(params.id, mapping.params);
-        return (val: string) => {
-          if (val === '__other__') {
-            return params.otherBucketLabel;
-          }
-          if (val === '__missing__') {
-            return params.missingBucketLabel;
-          }
-          const parsedUrl = {
-            origin: window.location.origin,
-            pathname: window.location.pathname,
-            basePath: npStart.core.http.basePath,
-          };
-          // @ts-ignore
-          return format.convert(val, undefined, undefined, parsedUrl);
-        };
-      },
-      convert: (val: string, type: string) => {
-        const format = getFieldFormat(params.id, mapping.params);
-        if (val === '__other__') {
-          return params.otherBucketLabel;
-        }
-        if (val === '__missing__') {
-          return params.missingBucketLabel;
-        }
-        const parsedUrl = {
-          origin: window.location.origin,
-          pathname: window.location.pathname,
-          basePath: npStart.core.http.basePath,
-        };
-        // @ts-ignore
-        return format.convert(val, type, undefined, parsedUrl);
-      },
+      convert,
+      getConverterFor: (type: ContentType) => (val: string) => convert(val, type),
     } as FieldFormat;
   } else {
     return getFieldFormat(id, mapping.params);

diff --git a/src/plugins/data/common/field_formats/content_types/html_content_type.ts b/src/plugins/data/common/field_formats/content_types/html_content_type.ts
@@ -26,7 +26,8 @@ const getConvertFn = (
   format: IFieldFormat,
   convert?: HtmlContextTypeConvert
 ): HtmlContextTypeConvert => {
-  const fallbackHtml: HtmlContextTypeConvert = (value, field, hit) => {
+  const fallbackHtml: HtmlContextTypeConvert = (value, options = {}) => {
+    const { field, hit } = options;
     const formatted = escape(format.convert(value, 'text'));
 
     return !field || !hit || !hit.highlight || !hit.highlight[field.name]
@@ -43,27 +44,23 @@ export const setup = (
 ): HtmlContextTypeConvert => {
   const convert = getConvertFn(format, htmlContextTypeConvert);
 
-  const recurse: HtmlContextTypeConvert = (value, field, hit, meta) => {
+  const recurse: HtmlContextTypeConvert = (value, options = {}) => {
     if (value == null) {
       return asPrettyString(value);
     }
 
     if (!value || !isFunction(value.map)) {
-      return convert.call(format, value, field, hit, meta);
+      return convert.call(format, value, options);
     }
 
-    const subValues = value.map((v: any) => {
-      return recurse(v, field, hit, meta);
-    });
-    const useMultiLine = subValues.some((sub: string) => {
-      return sub.indexOf('\n') > -1;
-    });
+    const subValues = value.map((v: any) => recurse(v, options));
+    const useMultiLine = subValues.some((sub: string) => sub.indexOf('\n') > -1);
 
     return subValues.join(',' + (useMultiLine ? '\n' : ' '));
   };
 
-  const wrap: HtmlContextTypeConvert = (value, field, hit, meta) => {
-    return `<span ng-non-bindable>${recurse(value, field, hit, meta)}</span>`;
+  const wrap: HtmlContextTypeConvert = (value, options) => {
+    return `<span ng-non-bindable>${recurse(value, options)}</span>`;
   };
 
   return wrap;

diff --git a/src/plugins/data/common/field_formats/converters/source.ts b/src/plugins/data/common/field_formats/converters/source.ts
@@ -42,7 +42,9 @@ export class SourceFormat extends FieldFormat {
 
   textConvert: TextContextTypeConvert = value => JSON.stringify(value);
 
-  htmlConvert: HtmlContextTypeConvert = (value, field, hit) => {
+  htmlConvert: HtmlContextTypeConvert = (value, options = {}) => {
+    const { field, hit } = options;
+
     if (!field) {
       const converter = this.getConverterFor('text') as Function;