fieldify left field

Author: thomasneirynck

x-pack/legacy/plugins/maps/public/layers/fields/es_doc_field.js

@@ -18,15 +18,8 @@ export class ESDocField extends AbstractField {
   }
 
   async createTooltipProperty(value) {
-    try {
-      const indexPattern = await this._source.getIndexPattern();
-      if (!indexPattern) {
-        return null;
-      }
-      return new ESTooltipProperty(this.getName(), this.getName(), value, indexPattern);
-    } catch (e) {
-      return null;
-    }
+    const indexPattern = await this._source.getIndexPattern();
+    return new ESTooltipProperty(this.getName(), this.getName(), value, indexPattern);
   }
 
   async getType() {

x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js

@@ -10,17 +10,19 @@ import { VectorStyle } from '../styles/vector_style';
 
 export class InnerJoin {
 
-  constructor(joinDescriptor, inspectorAdapters) {
+  constructor(joinDescriptor, leftSource) {
     this._descriptor = joinDescriptor;
+    const inspectorAdapters = leftSource.getInspectorAdapters();
     this._rightSource = new ESTermSource(joinDescriptor.right, inspectorAdapters);
+    this._leftField = this._descriptor.leftField ? leftSource.createField(joinDescriptor.leftField) : null;
   }
 
   destroy() {
     this._rightSource.destroy();
   }
 
   hasCompleteConfig() {
-    if (this._descriptor.leftField && this._rightSource) {
+    if (this._leftField && this._rightSource) {
       return this._rightSource.hasCompleteConfig();
     }
 
@@ -45,7 +47,7 @@ export class InnerJoin {
   }
 
   getLeftFieldName() {
-    return this._descriptor.leftField;
+    return this._leftField ? this._leftField.getName() : null;
   }
 
   joinPropertiesToFeature(feature, propertiesMap, rightMetricFields) {
@@ -64,7 +66,7 @@ export class InnerJoin {
       });
     }
 
-    const joinKey = feature.properties[this._descriptor.leftField];
+    const joinKey = feature.properties[this._leftField.getName()];
     const coercedKey = typeof joinKey === 'undefined' || joinKey === null  ? null : joinKey.toString();
     if (propertiesMap && coercedKey !== null && propertiesMap.has(coercedKey)) {
       Object.assign(feature.properties,  propertiesMap.get(coercedKey));

x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js

@@ -45,11 +45,13 @@ export class EMSFileSource extends AbstractVectorSource {
 
   constructor(descriptor, inspectorAdapters) {
     super(EMSFileSource.createDescriptor(descriptor), inspectorAdapters);
-    this._tooltipFields = this._descriptor.tooltipProperties.map(propertyKey => {
-      return new EMSRegionLayerField({
-        fieldName: propertyKey,
-        source: this
-      });
+    this._tooltipFields = this._descriptor.tooltipProperties.map(propertyKey => this.createField(propertyKey));
+  }
+
+  createField(fieldName) {
+    return new EMSRegionLayerField({
+      fieldName,
+      source: this
     });
   }
 

x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js

@@ -68,11 +68,13 @@ export class ESSearchSource extends AbstractESSource {
       topHitsSize: _.get(descriptor, 'topHitsSize', 1),
     }, inspectorAdapters);
 
-    this._tooltipFields = this._descriptor.tooltipProperties.map((property) => {
-      return new ESDocField({
-        fieldName: property,
-        source: this
-      });
+    this._tooltipFields = this._descriptor.tooltipProperties.map((property) => this.createField(property));
+  }
+
+  createField(fieldName) {
+    return new ESDocField({
+      fieldName,
+      source: this
     });
   }
 

x-pack/legacy/plugins/maps/public/layers/sources/es_source.js

@@ -329,4 +329,8 @@ export class AbstractESSource extends AbstractVectorSource {
 
     return fieldFromIndexPattern.format.getConverterFor('text');
   }
+
+  createField() {
+    throw new Error('Child must implement Source#createField');
+  }
 }

x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js

@@ -10,7 +10,6 @@ import { AbstractESSource } from './es_source';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
-import { ESTooltipProperty } from '../tooltips/es_tooltip_property';
 import { ES_SIZE_LIMIT } from '../../../common/constants';
 import { ESDocField } from '../fields/es_doc_field';
 

x-pack/legacy/plugins/maps/public/layers/tooltips/join_tooltip_property.js

@@ -39,9 +39,13 @@ export class JoinTooltipProperty extends TooltipProperty {
     for (let i = 0; i < this._leftInnerJoins.length; i++) {
       const rightSource =  this._leftInnerJoins[i].getRightJoinSource();
       const termField = rightSource.getTermField();
-      const esTooltipProperty = await termField.createTooltipProperty(this._tooltipProperty.getRawValue());
-      if (esTooltipProperty) {
-        esFilters.push(...(await esTooltipProperty.getESFilters()));
+      try {
+        const esTooltipProperty = await termField.createTooltipProperty(this._tooltipProperty.getRawValue());
+        if (esTooltipProperty) {
+          esFilters.push(...(await esTooltipProperty.getESFilters()));
+        }
+      } catch(e) {
+        console.error('Cannot create joined filter', e);
       }
     }
 

x-pack/legacy/plugins/maps/public/layers/vector_layer.js

@@ -91,7 +91,7 @@ export class VectorLayer extends AbstractLayer {
     this._joins = [];
     if (options.layerDescriptor.joins) {
       options.layerDescriptor.joins.forEach((joinDescriptor) => {
-        const join = new InnerJoin(joinDescriptor, this._source.getInspectorAdapters());
+        const join = new InnerJoin(joinDescriptor, this._source);
         this._joins.push(join);
       });
     }