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

…roperly (#52874) Closes #35235
elastic · Dec 13, 2019 · dc1a26b · dc1a26b
1 parent 4801647
commit dc1a26b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/legacy/ui/public/field_editor/field_editor.js b/src/legacy/ui/public/field_editor/field_editor.js
@@ -689,7 +689,6 @@ export class FieldEditor extends PureComponent {
   }
 
   saveField = async () => {
-    const fieldFormat = this.state.field.format;
     const field = this.state.field.toActualField();
     const { indexPattern } = this.props;
     const { fieldFormatId } = this.state;
@@ -727,7 +726,7 @@ export class FieldEditor extends PureComponent {
     if (!fieldFormatId) {
       indexPattern.fieldFormatMap[field.name] = undefined;
     } else {
-      indexPattern.fieldFormatMap[field.name] = fieldFormat;
+      indexPattern.fieldFormatMap[field.name] = field.format;
     }
 
     return indexPattern.save()

diff --git a/src/plugins/data/common/field_formats/field_format.ts b/src/plugins/data/common/field_formats/field_format.ts
@@ -194,6 +194,10 @@ export abstract class FieldFormat {
       [HTML_CONTEXT_TYPE]: htmlContentTypeSetup(this, this.htmlConvert),
     };
   }
+
+  static isInstanceOfFieldFormat(fieldFormat: any): fieldFormat is FieldFormat {
+    return Boolean(fieldFormat && fieldFormat.convert);
+  }
 }
 
 export type IFieldFormat = PublicMethodsOf<FieldFormat>;

diff --git a/src/plugins/data/public/index_patterns/fields/field.ts b/src/plugins/data/public/index_patterns/fields/field.ts
@@ -94,7 +94,8 @@ export class Field implements IFieldType {
     if (!type) type = getKbnFieldType('unknown');
 
     let format = spec.format;
-    if (!format || !(format instanceof FieldFormat)) {
+
+    if (!FieldFormat.isInstanceOfFieldFormat(format)) {
       const fieldFormats = getFieldFormats();
 
       format =