github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[lodash] switch flatten() and flattenDeep()

Browse source
This commit is contained in:
Spencer Alger 2015-06-11 19:26:51 -07:00
parent 8f6165a15c
commit a6f938866c
18 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kibana/components/agg_response/hierarchical/_collect_keys.js
View file

@ -5,7 +5,7 @@ define(function (require) {
var keys = _.pluck(children, 'name');
return _(nextChildren)
.map(collectKeys)
.flatten()
.flattenDeep()
.union(keys)
.value();
};

4
src/kibana/components/agg_response/hierarchical/_create_raw_data.js
View file

@ -22,7 +22,7 @@ define(function (require) {
// Create the columns
results.columns = _(aggs)
.flatten()
.flattenDeep()
.map(function (agg) {
return {
categoryName: agg.schema.name,
@ -61,7 +61,7 @@ define(function (require) {
// iterate through all the buckets
_.each(extractBuckets(data[agg.id]), function (bucket) {
var _record = _.flatten([record, bucket.key]);
var _record = _.flattenDeep([record, bucket.key]);
_.each(metrics, function (metric) {
var value = bucket.doc_count;
if (bucket[metric.id] && !_.isUndefined(bucket[metric.id].value)) {

2
src/kibana/components/courier/data_source/search_source.js
View file

@ -155,7 +155,7 @@ define(function (require) {
case 'filter':
// user a shallow flatten to detect if val is an array, and pull the values out if it is
state.filters = _([ state.filters || [], val ])
.flatten(true)
.flatten()
// Yo Dawg! I heard you needed to filter out your filters
.reject(function (filter) {
return !filter || _.get(filter, 'meta.disabled');

2
src/kibana/components/doc_title/doc_title.js
View file

@ -28,7 +28,7 @@ define(function (require) {
parts.push(baseTitle);
}
return _(parts).flatten().compact().join(' - ');
return _(parts).flattenDeep().compact().join(' - ');
}
self.change = function (title, complete) {

2
src/kibana/components/filter_bar/lib/mapAndFlattenFilters.js
View file

@ -4,7 +4,7 @@ define(function (require) {
var mapFilter = Private(require('components/filter_bar/lib/mapFilter'));
return function (filters) {
return _(filters)
.flatten(true)
.flatten()
.compact()
.map(mapFilter)
.thru(Promise.all)

2
src/kibana/components/filter_manager/filter_manager.js
View file

@ -8,7 +8,7 @@ define(function (require) {
filterManager.add = function (field, values, operation, index) {
values = _.isArray(values) ? values : [values];
var fieldName = _.isObject(field) ? field.name : field;
var filters = _.flatten([queryFilter.getAppFilters()], true);
var filters = _.flatten([queryFilter.getAppFilters()]);
var newFilters = [];
var negate = (operation === '-');

2
src/kibana/components/fixedScroll.js
View file

@ -42,7 +42,7 @@ define(function (require) {
};
}
unlisten = _.compose(
unlisten = _.flow(
bind($el, $scroller),
bind($scroller, $el),
function () { unlisten = _.noop; }

2
src/kibana/components/index_patterns/_mapper.js
View file

@ -94,7 +94,7 @@ define(function (require) {
return key;
}
})
.flatten()
.flattenDeep()
.sort()
.uniq(true)
.value();

2
src/kibana/components/vislib/components/labels/flatten_series.js
View file

@ -16,7 +16,7 @@ define(function (require) {
return _.chain(obj)
.pluck('series')
.flatten()
.flattenDeep()
.value();
};
};

4
src/kibana/components/vislib/components/zero_injection/flatten_data.js
View file

@ -20,9 +20,9 @@ define(function (require) {
return _(charts ? charts : [obj])
.pluck('series')
.flatten()
.flattenDeep()
.pluck('values')
.flatten()
.flattenDeep()
.filter(Boolean)
.value();
};

2
src/kibana/components/vislib/components/zero_injection/ordered_x_keys.js
View file

@ -55,7 +55,7 @@ define(function (require) {
return vals;
})
.flatten(true)
.flatten()
.value();
};
};

4
src/kibana/components/vislib/lib/data.js
View file

@ -282,9 +282,9 @@ define(function (require) {
Data.prototype.flatten = function () {
return _(this.chartData())
.pluck('series')
.flatten()
.flattenDeep()
.pluck('values')
.flatten()
.flattenDeep()
.value();
};

2
src/kibana/components/vislib/visualizations/line_chart.js
View file

@ -79,7 +79,7 @@ define(function (require) {
.map(function (series) {
return _.pluck(series, '_input.z');
})
.flatten()
.flattenDeep()
.reduce(function (result, val) {
if (result.min > val) result.min = val;
if (result.max < val) result.max = val;

4
src/kibana/plugins/settings/sections/objects/_objects.js
View file

@ -89,7 +89,7 @@ define(function (require) {
var objs = $scope.services.map(function (service) {
return service.data.map(_.partialRight(_.extend, {type: service.type}));
});
retrieveAndExportDocs(_.flatten(objs));
retrieveAndExportDocs(_.flattenDeep(objs));
};
function retrieveAndExportDocs(objs) {
@ -130,7 +130,7 @@ define(function (require) {
if (existingDocs.length === 0 || window.confirm(confirmMessage + _.pluck(existingDocs, '_id').join('\n'))) {
return es.bulk({
index: config.file.kibana_index,
body: _.flatten(docs.map(transformToBulk))
body: _.flattenDeep(docs.map(transformToBulk))
})
.then(refreshIndex)
.then(refreshData, notify.error);

2
tasks/config/s3.js
View file

@ -11,7 +11,7 @@ module.exports = function (grunt) {
basename + '.zip.sha1.txt'
];
})
.flatten()
.flattenDeep()
.map(function (filename) {
return {
src: 'target/' + filename,

4
test/unit/specs/components/agg_response/tabify/_response_writer.js
View file

@ -223,7 +223,7 @@ define(function (require) {
});
});
var tables = _.flatten(_.pluck(writer.response().tables, 'tables'));
var tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
expect(tables.length).to.be(types.length);
// collect the far left acr from each table
@ -380,4 +380,4 @@ define(function (require) {
});
});
}];
});
});

4
test/unit/specs/vislib/components/labels.js
View file

@ -123,7 +123,7 @@ define(function (require) {
rowsArr = _.isArray(rowsLabels);
uniqLabels = _.chain(rowsData.rows)
.pluck('series')
.flatten()
.flattenDeep()
.pluck('label')
.uniq()
.value();
@ -453,4 +453,4 @@ define(function (require) {
});
});
});
});

8
test/unit/specs/vislib/lib/y_axis.js
View file

@ -179,7 +179,7 @@ define(function (require) {
it('should have domain between 0 and max value', function () {
var min = 0;
var max = _.max(_.flatten(graphData));
var max = _.max(_.flattenDeep(graphData));
var domain = checkDomain(min, max);
expect(domain[1]).to.be.greaterThan(0);
checkRange();
@ -197,7 +197,7 @@ define(function (require) {
});
it('should have domain between min value and 0', function () {
var min = _.min(_.flatten(graphData));
var min = _.min(_.flattenDeep(graphData));
var max = 0;
var domain = checkDomain(min, max);
expect(domain[0]).to.be.lessThan(0);
@ -216,8 +216,8 @@ define(function (require) {
});
it('should have domain between min and max values', function () {
var min = _.min(_.flatten(graphData));
var max = _.max(_.flatten(graphData));
var min = _.min(_.flattenDeep(graphData));
var max = _.max(_.flattenDeep(graphData));
var domain = checkDomain(min, max);
expect(domain[0]).to.be.lessThan(0);
expect(domain[1]).to.be.greaterThan(0);