Backport #51, #52, #53, #54, #55, #56

(cherry picked from commit e047780)

Additional work for #54

(cherry picked from commit 6f80501)

Additional work for #55

(cherry picked from commit 54c7afb)

fix #56

(cherry picked from commit 919fb59)

update to next version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nested-fields-support",
-  "version": "6.2.1-1.0.4",
+  "version": "6.2.1-1.0.5",
   "description": "Nested Support Plugin",
   "license": "Apache-2.0",
   "authors": [

public/nested_support/agg_response/tabify/tabify.js

@@ -44,7 +44,7 @@ tabify.AggResponseTabifyProvider = function(Private, Notifier) {
           const splitting = write.canSplit && agg.schema.name === 'split';
           if (splitting) {
             write.split(agg, buckets, function forEachBucket(subBucket, key) {
-              collectBucket(write, agg.id, subBucket, agg.getKey(subBucket), key, aggScale);
+              collectBucket(write, agg.id, subBucket, agg.getKey(subBucket, key), aggScale);
             });
           } else {
             buckets.forEach(function (subBucket, key) {

public/nested_support/agg_types/buckets/terms.js

@@ -229,7 +229,11 @@ Terms.AggTypesBucketsTermsProvider = function(Private) {
             if (dir === 'asc') {
               routeBasedNotifier.warning('Sorting in Ascending order by Count in Terms aggregations is deprecated');
             }
-            order._count = dir;
+            if (agg.params.countByParent) {
+              order['count_' + agg.id] = dir;
+            } else {
+              order._count = dir;
+            }
             return;
           }
 
@@ -239,7 +243,7 @@ Terms.AggTypesBucketsTermsProvider = function(Private) {
           }
 
           // if the target aggregation is nested, refer to it by its nested location
-          if (orderAgg.nestedPath || orderAgg.reverseNested) {
+          if ((!orderAgg.params.field.nestedPath && agg.params.field.nestedPath) || orderAgg.params.field.nestedPath !== agg.params.field.nestedPath) {
             orderAggId = 'nested_' + orderAggId + '>' + orderAggId;
           }
 

public/nested_support/index_patterns/_flatten_hit.js

@@ -79,6 +79,9 @@ export function IndexPatternsNestedFlattenHitProvider(config) {
 
   return function flattenHitWrapper(indexPattern) {
     return function cachedFlatten(hit, deep = false) {
+      if (!deep) {
+        deep = indexPattern.nested;
+      }
       return hit.$$_flattened || (hit.$$_flattened = flattenHit(indexPattern, hit, deep));
     };
   };