Clean up conditionals.

elastic · Jul 9, 2018 · 4318c4a · 4318c4a
1 parent a6d7501
commit 4318c4a
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/ui/public/agg_response/tabify/_buckets.js b/src/ui/public/agg_response/tabify/_buckets.js
@@ -38,8 +38,10 @@ function TabifyBuckets(aggResp, aggParams, timeRange) {
     this.length = this.buckets.length;
   }
 
-  if (this.length && aggParams) this._orderBucketsAccordingToParams(aggParams);
-  if (this.length && aggParams && timeRange) this._dropPartials(aggParams, timeRange);
+  if (this.length && aggParams) {
+    this._orderBucketsAccordingToParams(aggParams);
+    if (aggParams.drop_partials) this._dropPartials(aggParams, timeRange);
+  }
 }
 
 TabifyBuckets.prototype.forEach = function (fn) {
@@ -82,20 +84,23 @@ TabifyBuckets.prototype._orderBucketsAccordingToParams = function (params) {
   }
 };
 
+// dropPartials should only be called if the aggParam setting is enabled,
+// and the agg field is the same as the Time Range.
 TabifyBuckets.prototype._dropPartials = function (params, timeRange) {
-  if (params.drop_partials && !this.objectMode && this.buckets.length > 1) {
-    if (params.field.name !== timeRange.name) return;
+  if (!timeRange ||
+    this.buckets.length <= 1 ||
+    this.objectMode ||
+    params.field.name !== timeRange.name) return;
 
-    const interval = this.buckets[1].key - this.buckets[0].key;
+  const interval = this.buckets[1].key - this.buckets[0].key;
 
-    this.buckets = this.buckets.filter(bucket => {
-      if (bucket.key < timeRange.gte) return false;
-      if (bucket.key + interval > timeRange.lte) return false;
-      return true;
-    });
+  this.buckets = this.buckets.filter(bucket => {
+    if (bucket.key < timeRange.gte) return false;
+    if (bucket.key + interval > timeRange.lte) return false;
+    return true;
+  });
 
-    this.length = this.buckets.length;
-  }
+  this.length = this.buckets.length;
 };
 
 export { TabifyBuckets };