[lodash] switch flatten() and flattenDeep()

src/kibana/components/agg_response/hierarchical/_collect_keys.js

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

src/kibana/components/agg_response/hierarchical/_create_raw_data.js

@@ -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)) {

src/kibana/components/courier/data_source/search_source.js

@@ -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');

src/kibana/components/doc_title/doc_title.js

@@ -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) {

src/kibana/components/filter_bar/lib/mapAndFlattenFilters.js

@@ -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)

src/kibana/components/filter_manager/filter_manager.js

@@ -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 === '-');

src/kibana/components/fixedScroll.js

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

src/kibana/components/index_patterns/_mapper.js

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

src/kibana/components/vislib/components/labels/flatten_series.js

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

src/kibana/components/vislib/components/zero_injection/flatten_data.js

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

src/kibana/components/vislib/components/zero_injection/ordered_x_keys.js

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

src/kibana/components/vislib/lib/data.js

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

src/kibana/components/vislib/visualizations/line_chart.js

@@ -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;

src/kibana/plugins/settings/sections/objects/_objects.js

@@ -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);

tasks/config/s3.js

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

test/unit/specs/components/agg_response/tabify/_response_writer.js

@@ -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) {
       });
     });
   }];
-});
+});

test/unit/specs/vislib/components/labels.js

@@ -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) {
     });
 
   });
-});
+});

test/unit/specs/vislib/lib/y_axis.js

@@ -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 min = _.min(_.flattenDeep(graphData));
-          var max = _.max(_.flatten(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);