From 717ba62bf56323d59b7d39f6f9c800cccf8336ec Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Fri, 18 Jun 2021 09:56:27 +0200
Subject: [PATCH] restructure fix

---
 src/plugins/data/common/search/aggs/agg_config.ts  |  5 +----
 src/plugins/data/common/search/aggs/agg_configs.ts | 11 ++++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/plugins/data/common/search/aggs/agg_config.ts b/src/plugins/data/common/search/aggs/agg_config.ts
index f3a19e2cfdeb6..9a35cf983c805 100644
--- a/src/plugins/data/common/search/aggs/agg_config.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.ts
@@ -22,7 +22,6 @@ import { IAggType } from './agg_type';
 import { writeParams } from './agg_params';
 import { IAggConfigs } from './agg_configs';
 import { parseTimeShift } from './utils';
-import { calculateBounds } from '../../query';
 
 type State = string | number | boolean | null | undefined | SerializableState;
 
@@ -193,9 +192,7 @@ export class AggConfig {
       } else if (!this.aggConfigs.timeRange) {
         return;
       }
-      const resolvedBounds = calculateBounds(this.aggConfigs.timeRange, {
-        forceNow: this.aggConfigs.forceNow,
-      });
+      const resolvedBounds = this.aggConfigs.getResolvedTimeRange()!;
       return moment.duration(moment(resolvedBounds.max).diff(resolvedBounds.min));
     }
     return parsedTimeShift;
diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts
index 8593a0b0ed0fa..1a0430f3cc08d 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.ts
@@ -23,7 +23,7 @@ import { IAggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { AggGroupNames } from './agg_groups';
 import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';
-import { TimeRange, getTime, isRangeFilter } from '../../../common';
+import { TimeRange, getTime, isRangeFilter, calculateBounds } from '../../../common';
 import { IBucketAggConfig } from './buckets';
 import { insertTimeShiftSplit, mergeTimeShifts } from './utils/time_splits';
 
@@ -127,6 +127,15 @@ export class AggConfigs {
     this.aggs.forEach(updateAggTimeRange);
   }
 
+  getResolvedTimeRange() {
+    return (
+      this.timeRange &&
+      calculateBounds(this.timeRange, {
+        forceNow: this.forceNow,
+      })
+    );
+  }
+
   // clone method will reuse existing AggConfig in the list (will not create new instances)
   clone({ enabledOnly = true } = {}) {
     const filterAggs = (agg: AggConfig) => {