diff --git a/src/ui/public/agg_types/controls/sub_agg.html b/src/ui/public/agg_types/controls/sub_agg.html
index 1378bc896ab2c3..9d882b9aa003cf 100644
--- a/src/ui/public/agg_types/controls/sub_agg.html
+++ b/src/ui/public/agg_types/controls/sub_agg.html
@@ -25,7 +25,7 @@
diff --git a/src/ui/public/agg_types/controls/sub_metric.html b/src/ui/public/agg_types/controls/sub_metric.html
index d5d53902378b51..937a25cb8c7f6e 100644
--- a/src/ui/public/agg_types/controls/sub_metric.html
+++ b/src/ui/public/agg_types/controls/sub_metric.html
@@ -5,7 +5,7 @@
diff --git a/src/ui/public/agg_types/metrics/lib/make_nested_label.js b/src/ui/public/agg_types/metrics/lib/make_nested_label.js
index 5ced0753282d79..3d65ae4ad15766 100644
--- a/src/ui/public/agg_types/metrics/lib/make_nested_label.js
+++ b/src/ui/public/agg_types/metrics/lib/make_nested_label.js
@@ -35,7 +35,7 @@ const makeNestedLabel = function (aggConfig, label) {
}
return metricLabel;
}
- const metric = aggConfig._aggs.find(agg => agg.id === aggConfig.params.metricAgg);
+ const metric = aggConfig.aggConfigs.find(agg => agg.id === aggConfig.params.metricAgg);
if (!metric) return '';
return `${uppercaseLabel} of ${metric.makeLabel()}`;
};
diff --git a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
index c9687b1c4903f1..c54a1b8e4910dd 100644
--- a/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
+++ b/src/ui/public/agg_types/metrics/lib/parent_pipeline_agg_helper.js
@@ -54,7 +54,7 @@ const parentPipelineAggHelper = {
makeAgg: function (termsAgg, state) {
state = state || { type: 'count' };
state.schema = metricAggSchema;
- const metricAgg = new AggConfig(termsAgg.vis, state);
+ const metricAgg = termsAgg.aggConfigs.createAggConfig(state, { addToAggConfigs: false });
metricAgg.id = termsAgg.id + '-metric';
return metricAgg;
},
@@ -79,7 +79,7 @@ const parentPipelineAggHelper = {
if (agg.params.customMetric) {
subAgg = agg.params.customMetric;
} else {
- subAgg = agg._aggs.byId[agg.params.metricAgg];
+ subAgg = agg.aggConfigs.byId[agg.params.metricAgg];
}
return subAgg.type.getFormat(subAgg);
}
diff --git a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
index befc8c0c95fe26..8dc36b5e10d5ee 100644
--- a/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
+++ b/src/ui/public/agg_types/metrics/lib/sibling_pipeline_agg_helper.js
@@ -68,7 +68,7 @@ const siblingPipelineAggHelper = {
makeAgg: function (agg, state) {
state = state || { type: 'date_histogram' };
state.schema = bucketAggSchema;
- const orderAgg = new AggConfig(agg.vis, state);
+ const orderAgg = agg.aggConfigs.createAggConfig(state, { addToAggConfigs: false });
orderAgg.id = agg.id + '-bucket';
return orderAgg;
},
@@ -90,7 +90,7 @@ const siblingPipelineAggHelper = {
makeAgg: function (agg, state) {
state = state || { type: 'count' };
state.schema = metricAggSchema;
- const orderAgg = new AggConfig(agg.vis, state);
+ const orderAgg = agg.aggConfigs.createAggConfig(state, { addToAggConfigs: false });
orderAgg.id = agg.id + '-metric';
return orderAgg;
},
diff --git a/src/ui/public/agg_types/metrics/top_hit.js b/src/ui/public/agg_types/metrics/top_hit.js
index 498739373d0787..c5efcb8f7717a7 100644
--- a/src/ui/public/agg_types/metrics/top_hit.js
+++ b/src/ui/public/agg_types/metrics/top_hit.js
@@ -41,12 +41,7 @@ export const topHitMetricAgg = new MetricAggType({
{
name: 'field',
onlyAggregatable: false,
- filterFieldTypes: function (vis, value) {
- if (vis.type.name === 'table' || vis.type.name === 'metric') {
- return true;
- }
- return value === 'number';
- },
+ filterFieldTypes: '*',
write(agg, output) {
const field = agg.params.field;
output.params = {};
@@ -137,7 +132,7 @@ export const topHitMetricAgg = new MetricAggType({
editor: null,
filterFieldTypes: [ 'number', 'date', 'ip', 'string' ],
default: function (agg) {
- return agg._indexPattern.timeFieldName;
+ return agg.getIndexPattern().timeFieldName;
},
write: _.noop // prevent default write, it is handled below
},
@@ -187,7 +182,7 @@ export const topHitMetricAgg = new MetricAggType({
const path = agg.params.field.name;
let values = _(hits).map(hit => {
- return path === '_source' ? hit._source : agg._indexPattern.flattenHit(hit, true)[path];
+ return path === '_source' ? hit._source : agg.getIndexPattern().flattenHit(hit, true)[path];
})
.flatten()
.value();
diff --git a/src/ui/public/vis/__tests__/_agg_config.js b/src/ui/public/vis/__tests__/_agg_config.js
index 2e87f1a9bffb81..707ccf2d6f17a2 100644
--- a/src/ui/public/vis/__tests__/_agg_config.js
+++ b/src/ui/public/vis/__tests__/_agg_config.js
@@ -414,11 +414,10 @@ describe('AggConfig', function () {
const label = aggConfig.makeLabel();
expect(label).to.be('Count');
});
- it('default label should be "Percentage of Count" when Vis is in percentage mode', function () {
+ it('default label should be "Percentage of Count" when percentageMode is set to true', function () {
const vis = new Vis(indexPattern, {});
const aggConfig = vis.aggs[0];
- aggConfig.vis.params.mode = 'percentage';
- const label = aggConfig.makeLabel();
+ const label = aggConfig.makeLabel(true);
expect(label).to.be('Percentage of Count');
});
it('empty label if the Vis type is not defined', function () {
diff --git a/src/ui/public/vis/__tests__/_agg_configs.js b/src/ui/public/vis/__tests__/_agg_configs.js
index 28f8a1bea68c81..14bf84485898a8 100644
--- a/src/ui/public/vis/__tests__/_agg_configs.js
+++ b/src/ui/public/vis/__tests__/_agg_configs.js
@@ -52,7 +52,7 @@ describe('AggConfigs', function () {
aggs: []
});
- const ac = new AggConfigs(vis);
+ const ac = new AggConfigs(vis.indexPattern, [], vis.type.schemas.all);
expect(ac).to.have.length(1);
});
@@ -62,16 +62,16 @@ describe('AggConfigs', function () {
aggs: []
});
- const ac = new AggConfigs(vis, [
+ const ac = new AggConfigs(vis.indexPattern, [
{
type: 'date_histogram',
schema: 'segment'
},
- new AggConfig(vis, {
+ new AggConfig(vis.aggs, {
type: 'terms',
schema: 'split'
})
- ]);
+ ], vis.type.schemas.all);
expect(ac).to.have.length(3);
});
@@ -94,7 +94,7 @@ describe('AggConfigs', function () {
];
const spy = sinon.spy(AggConfig, 'ensureIds');
- new AggConfigs(vis, states);
+ new AggConfigs(vis.indexPattern, states, vis.type.schemas.all);
expect(spy.callCount).to.be(1);
expect(spy.firstCall.args[0]).to.be(states);
AggConfig.ensureIds.restore();
@@ -136,17 +136,17 @@ describe('AggConfigs', function () {
});
it('should only set the number of defaults defined by the max', function () {
- const ac = new AggConfigs(vis);
+ const ac = new AggConfigs(vis.indexPattern, [], vis.type.schemas.all);
expect(ac.bySchemaName.metric).to.have.length(2);
});
it('should set the defaults defined in the schema when none exist', function () {
- const ac = new AggConfigs(vis);
+ const ac = new AggConfigs(vis.indexPattern, [], vis.type.schemas.all);
expect(ac).to.have.length(3);
});
it('should NOT set the defaults defined in the schema when some exist', function () {
- const ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
+ const ac = new AggConfigs(vis.indexPattern, [{ schema: 'segment', type: 'date_histogram' }], vis.type.schemas.all);
expect(ac).to.have.length(3);
expect(ac.bySchemaName.segment[0].type.name).to.equal('date_histogram');
});
@@ -332,7 +332,7 @@ describe('AggConfigs', function () {
});
vis.isHierarchical = _.constant(true);
- const topLevelDsl = vis.aggs.toDsl();
+ const topLevelDsl = vis.aggs.toDsl(vis.isHierarchical());
const buckets = vis.aggs.bySchemaGroup.buckets;
const metrics = vis.aggs.bySchemaGroup.metrics;
diff --git a/src/ui/public/vis/__tests__/_vis.js b/src/ui/public/vis/__tests__/_vis.js
index 81ca0d31b5a038..a5765b8b8fe947 100644
--- a/src/ui/public/vis/__tests__/_vis.js
+++ b/src/ui/public/vis/__tests__/_vis.js
@@ -48,6 +48,7 @@ describe('Vis Class', function () {
const state = (type) => ({
type: {
visConfig: { defaults: {} },
+ schemas: {},
...type,
}
});
diff --git a/src/ui/public/vis/agg_config.js b/src/ui/public/vis/agg_config.js
index 1df28693e1b520..62d24186658ac9 100644
--- a/src/ui/public/vis/agg_config.js
+++ b/src/ui/public/vis/agg_config.js
@@ -62,11 +62,9 @@ class AggConfig {
}, 0);
}
- constructor(vis, opts = {}, aggs) {
- this.id = String(opts.id || AggConfig.nextId(vis.aggs));
- this.vis = vis;
- this._indexPattern = vis.indexPattern;
- this._aggs = aggs || vis.aggs;
+ constructor(aggConfigs, opts = {}) {
+ this.aggConfigs = aggConfigs;
+ this.id = String(opts.id || AggConfig.nextId(aggConfigs));
this._opts = opts;
this.enabled = typeof opts.enabled === 'boolean' ? opts.enabled : true;
@@ -261,18 +259,22 @@ class AggConfig {
return this.params.field;
}
- makeLabel() {
+ makeLabel(percentageMode = false) {
if (this.params.customLabel) {
return this.params.customLabel;
}
if (!this.type) return '';
- let pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
+ let pre = percentageMode ? 'Percentage of ' : '';
return pre += this.type.makeLabel(this);
}
getIndexPattern() {
- return this.vis.indexPattern;
+ return _.get(this.aggConfigs, 'indexPattern', null);
+ }
+
+ getTimeRange() {
+ return _.get(this.aggConfigs, 'timeRange', null);
}
getFieldOptions() {
@@ -305,7 +307,7 @@ class AggConfig {
}
fieldIsTimeField() {
- const timeFieldName = this.vis.indexPattern.timeFieldName;
+ const timeFieldName = this.getIndexPattern().timeFieldName;
return timeFieldName && this.fieldName() === timeFieldName;
}
@@ -348,8 +350,8 @@ class AggConfig {
}
set schema(schema) {
- if (_.isString(schema)) {
- schema = this.vis.type.schemas.all.byName[schema];
+ if (_.isString(schema) && this.aggConfigs.schemas) {
+ schema = this.aggConfigs.schemas.byName[schema];
}
this.__schema = schema;
diff --git a/src/ui/public/vis/agg_configs.js b/src/ui/public/vis/agg_configs.js
index de7e805158641a..c61fae5ec740bb 100644
--- a/src/ui/public/vis/agg_configs.js
+++ b/src/ui/public/vis/agg_configs.js
@@ -47,7 +47,7 @@ function parseParentAggs(dslLvlCursor, dsl) {
}
class AggConfigs extends IndexedArray {
- constructor(vis, configStates = []) {
+ constructor(indexPattern, configStates = [], schemas) {
configStates = AggConfig.ensureIds(configStates);
super({
@@ -55,36 +55,77 @@ class AggConfigs extends IndexedArray {
group: ['schema.group', 'type.name', 'schema.name'],
});
- this.push(...configStates.map(aggConfigState => {
- if (aggConfigState instanceof AggConfig) {
- return aggConfigState;
- }
- return new AggConfig(vis, aggConfigState, this);
- }));
+ this.indexPattern = indexPattern;
+ this.schemas = schemas;
- this.vis = vis;
+ configStates.forEach(params => this.createAggConfig(params));
+ if (this.schemas) {
+ this.initializeDefaultsFromSchemas(schemas);
+ }
+ }
+
+ initializeDefaultsFromSchemas(schemas) {
// Set the defaults for any schema which has them. If the defaults
// for some reason has more then the max only set the max number
// of defaults (not sure why a someone define more...
// but whatever). Also if a schema.name is already set then don't
// set anything.
- if (vis && vis.type && vis.type.schemas && vis.type.schemas.all) {
- _(vis.type.schemas.all)
- .filter(schema => {
- return Array.isArray(schema.defaults) && schema.defaults.length > 0;
- })
- .each(schema => {
- if (!this.bySchemaName[schema.name]) {
- const defaults = schema.defaults.slice(0, schema.max);
- _.each(defaults, defaultState => {
- const state = _.defaults({ id: AggConfig.nextId(this) }, defaultState);
- this.push(new AggConfig(vis, state, this));
- });
- }
- })
- .commit();
+ _(schemas)
+ .filter(schema => {
+ return Array.isArray(schema.defaults) && schema.defaults.length > 0;
+ })
+ .each(schema => {
+ if (!this.bySchemaName[schema.name]) {
+ const defaults = schema.defaults.slice(0, schema.max);
+ _.each(defaults, defaultState => {
+ const state = _.defaults({ id: AggConfig.nextId(this) }, defaultState);
+ this.push(new AggConfig(this, state));
+ });
+ }
+ })
+ .commit();
+ }
+
+ setTimeRange(timeRange) {
+ this.timeRange = timeRange;
+
+ const updateAggTimeRange = (agg) => {
+ _.each(agg.params, param => {
+ if (param instanceof AggConfig) {
+ updateAggTimeRange(param);
+ }
+ });
+ if (agg.type.name === 'date_histogram') {
+ agg.params.timeRange = timeRange;
+ }
+ };
+
+ this.forEach(updateAggTimeRange);
+ }
+
+ // clone method will reuse existing AggConfig in the list (will not create new instances)
+ clone({ enabledOnly = true } = {}) {
+ const filterAggs = (agg) => {
+ if (!enabledOnly) return true;
+ return agg.enabled;
+ };
+ const aggConfigs = new AggConfigs(this.indexPattern, this.raw.filter(filterAggs), this.schemas);
+ return aggConfigs;
+ }
+
+ createAggConfig(params, { addToAggConfigs = true } = {}) {
+ let aggConfig;
+ if (params instanceof AggConfig) {
+ aggConfig = params;
+ params.parent = this;
+ } else {
+ aggConfig = new AggConfig(this, params);
+ }
+ if (addToAggConfigs) {
+ this.push(aggConfig);
}
+ return aggConfig;
}
/**
@@ -104,14 +145,14 @@ class AggConfigs extends IndexedArray {
return true;
}
- toDsl() {
+ toDsl(hierarchical = false) {
const dslTopLvl = {};
let dslLvlCursor;
let nestedMetrics;
- if (this.vis.isHierarchical()) {
+ if (hierarchical) {
// collect all metrics, and filter out the ones that we won't be copying
- nestedMetrics = _(this.vis.aggs.bySchemaGroup.metrics)
+ nestedMetrics = _(this.bySchemaGroup.metrics)
.filter(function (agg) {
return agg.type.name !== 'count';
})
diff --git a/src/ui/public/vis/editors/default/__tests__/agg_params.js b/src/ui/public/vis/editors/default/__tests__/agg_params.js
index 70abf6d676f736..9e84cdf4b90ada 100644
--- a/src/ui/public/vis/editors/default/__tests__/agg_params.js
+++ b/src/ui/public/vis/editors/default/__tests__/agg_params.js
@@ -76,7 +76,7 @@ describe('Vis-Editor-Agg-Params plugin directive', function () {
]
});
- $parentScope.agg = new AggConfig(vis, state);
+ $parentScope.agg = new AggConfig(vis.aggs, state);
$parentScope.vis = vis;
// make the element
diff --git a/src/ui/public/vis/editors/default/agg_add.js b/src/ui/public/vis/editors/default/agg_add.js
index 965323ccac4fd6..9c7e2c4fc1e61c 100644
--- a/src/ui/public/vis/editors/default/agg_add.js
+++ b/src/ui/public/vis/editors/default/agg_add.js
@@ -36,7 +36,7 @@ uiModules
self.submit = function (schema) {
self.form = false;
- const aggConfig = new AggConfig($scope.vis, {
+ const aggConfig = new AggConfig($scope.state.aggs, {
schema: schema,
id: AggConfig.nextId($scope.state.aggs),
});
diff --git a/src/ui/public/vis/map/convert_to_geojson.js b/src/ui/public/vis/map/convert_to_geojson.js
index 0b4193460f1e59..8ce11ede15c724 100644
--- a/src/ui/public/vis/map/convert_to_geojson.js
+++ b/src/ui/public/vis/map/convert_to_geojson.js
@@ -45,6 +45,7 @@ export function convertToGeoJson(tabifiedResponse) {
features = table.rows.map(row => {
const geohash = row[geohashColumn.id];
+ if (!geohash) return false;
const geohashLocation = decodeGeoHash(geohash);
let pointCoordinates;
@@ -94,7 +95,7 @@ export function convertToGeoJson(tabifiedResponse) {
};
- });
+ }).filter(row => row);
}
diff --git a/src/ui/public/vis/request_handlers/courier.js b/src/ui/public/vis/request_handlers/courier.js
index f39130280e49c8..fd64c225863a00 100644
--- a/src/ui/public/vis/request_handlers/courier.js
+++ b/src/ui/public/vis/request_handlers/courier.js
@@ -84,6 +84,8 @@ const CourierRequestHandlerProvider = function () {
const timeFilterSearchSource = searchSource.createChild({ callParentStartHandlers: true });
const requestSearchSource = timeFilterSearchSource.createChild({ callParentStartHandlers: true });
+ aggs.setTimeRange(timeRange);
+
// For now we need to mirror the history of the passed search source, since
// the spy panel wouldn't work otherwise.
Object.defineProperty(requestSearchSource, 'history', {
@@ -122,7 +124,7 @@ const CourierRequestHandlerProvider = function () {
return requestSearchSource.getSearchRequestBody().then(q => {
const queryHash = calculateObjectHash(q);
if (shouldQuery(queryHash)) {
- const lastAggConfig = vis.getAggConfig();
+ const lastAggConfig = aggs;
vis.API.inspectorAdapters.requests.reset();
const request = vis.API.inspectorAdapters.requests.start('Data', {
description: `This request queries Elasticsearch to fetch the data for the visualization.`,
diff --git a/src/ui/public/vis/response_handlers/vislib.js b/src/ui/public/vis/response_handlers/vislib.js
index 9cdf11596aaf41..d8359b7bdef6ae 100644
--- a/src/ui/public/vis/response_handlers/vislib.js
+++ b/src/ui/public/vis/response_handlers/vislib.js
@@ -61,7 +61,7 @@ const VislibResponseHandlerProvider = function (Private) {
}
function convertTable(vis, table) {
- return vis.type.responseConverter ? vis.type.responseConverter(vis, table) : table;
+ return vis.type.responseConverter ? vis.type.responseConverter(table) : table;
}
return {
diff --git a/src/ui/public/vis/vis.js b/src/ui/public/vis/vis.js
index 84606c5b656886..85d59bf4ccd57a 100644
--- a/src/ui/public/vis/vis.js
+++ b/src/ui/public/vis/vis.js
@@ -192,7 +192,7 @@ export function VisProvider(Private, indexPatterns, getAppState) {
updateVisualizationConfig(state.params, this.params);
- this.aggs = new AggConfigs(this, state.aggs);
+ this.aggs = new AggConfigs(this.indexPattern, state.aggs, this.type.schemas.all);
}
setState(state, updateCurrentState = true) {
@@ -237,7 +237,7 @@ export function VisProvider(Private, indexPatterns, getAppState) {
copyCurrentState(includeDisabled = false) {
const state = this.getCurrentState(includeDisabled);
- state.aggs = new AggConfigs(this, state.aggs);
+ state.aggs = new AggConfigs(this.indexPattern, state.aggs, this.type.schemas.all);
return state;
}
@@ -256,7 +256,7 @@ export function VisProvider(Private, indexPatterns, getAppState) {
}
getAggConfig() {
- return new AggConfigs(this, this.aggs.raw.filter(agg => agg.enabled));
+ return this.aggs.clone({ enabledOnly: true });
}
getState() {