Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/ui/public/url/url.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ uiModules.get('kibana/url')
.service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });

function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getAppState) {
var self = this;
let self = this;

/**
* Navigate to a url
Expand Down Expand Up @@ -70,10 +70,10 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA

return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
// remove filters
var key = expr.split('|')[0].trim();
let key = expr.split('|')[0].trim();

// verify that the expression can be evaluated
var p = $parse(key)(paramObj);
let p = $parse(key)(paramObj);

// if evaluation can't be made, throw
if (_.isUndefined(p)) {
Expand Down Expand Up @@ -109,7 +109,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
* @return {string} - the computed url
*/
self.getRouteUrl = function (obj, route) {
var template = obj && obj.routes && obj.routes[route];
let template = obj && obj.routes && obj.routes[route];
if (template) return self.eval(template, obj);
};

Expand Down Expand Up @@ -143,7 +143,7 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
let reloading;

self._changeLocation = function (type, url, paramObj, replace) {
var prev = {
let prev = {
path: $location.path(),
search: $location.search()
};
Expand All @@ -152,13 +152,13 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
$location[type](url);
if (replace) $location.replace();

var next = {
let next = {
path: $location.path(),
search: $location.search()
};

if (self._shouldAutoReload(next, prev)) {
var appState = getAppState();
let appState = getAppState();
if (appState) appState.destroy();

reloading = $rootScope.$on('$locationChangeSuccess', function () {
Expand All @@ -174,13 +174,13 @@ function KbnUrlProvider($route, $location, $rootScope, globalState, $parse, getA
self._shouldAutoReload = function (next, prev) {
if (reloading) return false;

var route = $route.current && $route.current.$$route;
let route = $route.current && $route.current.$$route;
if (!route) return false;

if (next.path !== prev.path) return false;

var reloadOnSearch = route.reloadOnSearch;
var searchSame = _.isEqual(next.search, prev.search);
let reloadOnSearch = route.reloadOnSearch;
let searchSame = _.isEqual(next.search, prev.search);

return (reloadOnSearch && searchSame) || !reloadOnSearch;
};
Expand Down
66 changes: 33 additions & 33 deletions src/ui/public/vis/agg_config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import _ from 'lodash';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function AggConfigFactory(Private, fieldTypeFilter) {
var fieldFormats = Private(RegistryFieldFormatsProvider);
let fieldFormats = Private(RegistryFieldFormatsProvider);

function AggConfig(vis, opts) {
var self = this;
let self = this;

self.id = String(opts.id || AggConfig.nextId(vis.aggs));
self.vis = vis;
Expand All @@ -26,13 +26,13 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
* @return {array} - the list that was passed in
*/
AggConfig.ensureIds = function (list) {
var have = [];
var haveNot = [];
let have = [];
let haveNot = [];
list.forEach(function (obj) {
(obj.id ? have : haveNot).push(obj);
});

var nextId = AggConfig.nextId(have);
let nextId = AggConfig.nextId(have);
haveNot.forEach(function (obj) {
obj.id = String(nextId++);
});
Expand Down Expand Up @@ -97,12 +97,12 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
* @return {undefined}
*/
AggConfig.prototype.fillDefaults = function (from) {
var self = this;
let self = this;
from = from || self.params || {};
var to = self.params = {};
let to = self.params = {};

self.getAggParams().forEach(function (aggParam) {
var val = from[aggParam.name];
let val = from[aggParam.name];

if (val == null) {
if (aggParam.default == null) return;
Expand All @@ -116,11 +116,11 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
}

if (aggParam.deserialize) {
var isTyped = _.isFunction(aggParam.type);
let isTyped = _.isFunction(aggParam.type);

var isType = isTyped && (val instanceof aggParam.type);
var isObject = !isTyped && _.isObject(val);
var isDeserialized = (isType || isObject);
let isType = isTyped && (val instanceof aggParam.type);
let isObject = !isTyped && _.isObject(val);
let isDeserialized = (isType || isObject);

if (!isDeserialized) {
val = aggParam.deserialize(val, self);
Expand All @@ -140,12 +140,12 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
* @return {object} the new params object
*/
AggConfig.prototype.resetParams = function () {
var fieldParam = this.type && this.type.params.byName.field;
let fieldParam = this.type && this.type.params.byName.field;
let field;

if (fieldParam) {
var prevField = this.params.field;
var fieldOpts = fieldTypeFilter(this.vis.indexPattern.fields, fieldParam.filterFieldTypes);
let prevField = this.params.field;
let fieldOpts = fieldTypeFilter(this.vis.indexPattern.fields, fieldParam.filterFieldTypes);
field = _.contains(fieldOpts, prevField) ? prevField : null;
}

Expand All @@ -161,10 +161,10 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
throw new TypeError('The "' + this.type.title + '" aggregation does not support filtering.');
}

var field = this.field();
var label = this.fieldDisplayName();
let field = this.field();
let label = this.fieldDisplayName();
if (field && !field.filterable) {
var message = 'The "' + label + '" field can not be used for filtering.';
let message = 'The "' + label + '" field can not be used for filtering.';
if (field.scripted) {
message = 'The "' + label + '" field is scripted and can not be used for filtering.';
}
Expand All @@ -181,7 +181,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
* @return {[type]} [description]
*/
AggConfig.prototype.requesting = function () {
var self = this;
let self = this;
self.type && self.type.params.forEach(function (param) {
if (param.onRequest) param.onRequest(self);
});
Expand All @@ -198,14 +198,14 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
*/
AggConfig.prototype.toDsl = function () {
if (this.type.hasNoDsl) return;
var output = this.write();
let output = this.write();

var configDsl = {};
let configDsl = {};
configDsl[this.type.dslName || this.type.name] = output.params;

// if the config requires subAggs, write them to the dsl as well
if (output.subAggs) {
var subDslLvl = configDsl.aggs || (configDsl.aggs = {});
let subDslLvl = configDsl.aggs || (configDsl.aggs = {});
output.subAggs.forEach(function nestAdhocSubAggs(subAggConfig) {
subDslLvl[subAggConfig.id] = subAggConfig.toDsl();
});
Expand All @@ -215,11 +215,11 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
};

AggConfig.prototype.toJSON = function () {
var self = this;
var params = self.params;
let self = this;
let params = self.params;

var outParams = _.transform(self.getAggParams(), function (out, aggParam) {
var val = params[aggParam.name];
let outParams = _.transform(self.getAggParams(), function (out, aggParam) {
let val = params[aggParam.name];

// don't serialize undefined/null values
if (val == null) return;
Expand Down Expand Up @@ -264,7 +264,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
}

if (!this.type) return '';
var pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
let pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
return pre += this.type.makeLabel(this);
};

Expand All @@ -273,31 +273,31 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
};

AggConfig.prototype.fieldFormatter = function (contentType, defaultFormat) {
var format = this.type && this.type.getFormat(this);
let format = this.type && this.type.getFormat(this);
if (format) return format.getConverterFor(contentType);
return this.fieldOwnFormatter(contentType, defaultFormat);
};

AggConfig.prototype.fieldOwnFormatter = function (contentType, defaultFormat) {
var field = this.field();
var format = field && field.format;
let field = this.field();
let format = field && field.format;
if (!format) format = defaultFormat;
if (!format) format = fieldFormats.getDefaultInstance('string');
return format.getConverterFor(contentType);
};

AggConfig.prototype.fieldName = function () {
var field = this.field();
let field = this.field();
return field ? field.name : '';
};

AggConfig.prototype.fieldDisplayName = function () {
var field = this.field();
let field = this.field();
return field ? (field.displayName || this.fieldName()) : '';
};

AggConfig.prototype.fieldIsTimeField = function () {
var timeFieldName = this.vis.indexPattern.timeFieldName;
let timeFieldName = this.vis.indexPattern.timeFieldName;
return timeFieldName && this.fieldName() === timeFieldName;
};

Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/vis/agg_config_result.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define(function () {
var i = 0;
let i = 0;

function AggConfigResult(aggConfig, parent, value, key) {
this.key = key;
Expand Down
20 changes: 10 additions & 10 deletions src/ui/public/vis/agg_configs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import IndexedArray from 'ui/indexed_array';
import VisAggConfigProvider from 'ui/vis/agg_config';
import AggTypesIndexProvider from 'ui/agg_types/index';
export default function AggConfigsFactory(Private) {
var AggConfig = Private(VisAggConfigProvider);
let AggConfig = Private(VisAggConfigProvider);

AggConfig.aggTypes = Private(AggTypesIndexProvider);

_.class(AggConfigs).inherits(IndexedArray);
function AggConfigs(vis, configStates) {
var self = this;
let self = this;
self.vis = vis;

configStates = AggConfig.ensureIds(configStates || []);
Expand All @@ -36,9 +36,9 @@ export default function AggConfigsFactory(Private) {
})
.each(function (schema) {
if (!self.bySchemaName[schema.name]) {
var defaults = schema.defaults.slice(0, schema.max);
let defaults = schema.defaults.slice(0, schema.max);
_.each(defaults, function (defaultState) {
var state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
let state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
self.push(new AggConfig(vis, state));
});
}
Expand All @@ -48,7 +48,7 @@ export default function AggConfigsFactory(Private) {
}

AggConfigs.prototype.toDsl = function () {
var dslTopLvl = {};
let dslTopLvl = {};
let dslLvlCursor;
let nestedMetrics;

Expand Down Expand Up @@ -76,16 +76,16 @@ export default function AggConfigsFactory(Private) {
// start at the top level
dslLvlCursor = dslTopLvl;
} else {
var prevConfig = list[i - 1];
var prevDsl = dslLvlCursor[prevConfig.id];
let prevConfig = list[i - 1];
let prevDsl = dslLvlCursor[prevConfig.id];

// advance the cursor and nest under the previous agg, or
// put it on the same level if the previous agg doesn't accept
// sub aggs
dslLvlCursor = prevDsl.aggs || dslLvlCursor;
}

var dsl = dslLvlCursor[config.id] = config.toDsl();
let dsl = dslLvlCursor[config.id] = config.toDsl();
let subAggs;

if (config.schema.group === 'buckets' && i < list.length - 1) {
Expand Down Expand Up @@ -122,7 +122,7 @@ export default function AggConfigsFactory(Private) {
*/
AggConfigs.prototype.getResponseAggs = function () {
return this.getRequestAggs().reduce(function (responseValuesAggs, agg) {
var aggs = agg.getResponseAggs();
let aggs = agg.getResponseAggs();
return aggs ? responseValuesAggs.concat(aggs) : responseValuesAggs;
}, []);
};
Expand All @@ -137,7 +137,7 @@ export default function AggConfigsFactory(Private) {
*/
AggConfigs.prototype.getResponseAggById = function (id) {
id = String(id);
var reqAgg = _.find(this.getRequestAggs(), function (agg) {
let reqAgg = _.find(this.getRequestAggs(), function (agg) {
return id.substr(0, String(agg.id).length) === agg.id;
});
if (!reqAgg) return;
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/vis/schemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import _ from 'lodash';
import IndexedArray from 'ui/indexed_array';
import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
export default function VisTypeSchemasFactory(Private) {
var AggParams = Private(AggTypesAggParamsProvider);
let AggParams = Private(AggTypesAggParamsProvider);

function Schemas(schemas) {
var self = this;
let self = this;

_(schemas || [])
.map(function (schema) {
Expand Down
Loading