move conversion to handleRequest based on discussion with @ppisljar

elastic · Jan 6, 2021 · d001f1b · d001f1b
1 parent 543203e
commit d001f1b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts
@@ -28,7 +28,7 @@ import {
 import { FormatFactory } from '../../../field_formats/utils';
 import { IndexPatternExpressionType } from '../../../index_patterns/expressions';
 import { IndexPatternsContract } from '../../../index_patterns/index_patterns';
-import { getAbsoluteTimeRange } from '../../../query';
+import { calculateBounds } from '../../../query';
 
 import { AggsStart, AggExpressionType } from '../../aggs';
 import { ISearchStartSearchSource } from '../../search_source';
@@ -120,12 +120,9 @@ export async function handleEsaggsRequest(
  params: RequestHandlerParams
 ): Promise<Datatable> {
  const resolvedTimeRange =
- params.timeRange && getAbsoluteTimeRange(params.timeRange, { forceNow: params.getNow?.() });
+ input?.timeRange && calculateBounds(input.timeRange, { forceNow: params.getNow?.() });
 
- const response = await handleRequest({
- ...params,
- timeRange: resolvedTimeRange,
- });
+ const response = await handleRequest(params);
 
  const table: Datatable = {
  type: 'datatable',
@@ -144,12 +141,12 @@ export async function handleEsaggsRequest(
  indexPatternId: params.indexPattern?.id,
  appliedTimeRange:
  column.aggConfig.params.field?.name &&
- resolvedTimeRange &&
+ input?.timeRange &&
  args.timeFields &&
  args.timeFields.includes(column.aggConfig.params.field?.name)
  ? {
- from: resolvedTimeRange?.from,
- to: resolvedTimeRange?.to,
+ from: resolvedTimeRange?.min?.toISOString(),
+ to: resolvedTimeRange?.max?.toISOString(),
  }
  : undefined,
  ...column.aggConfig.serialize(),

diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
@@ -68,7 +68,9 @@ export const handleRequest = async ({
  searchSourceService,
  timeFields,
  timeRange,
+ getNow,
 }: RequestHandlerParams) => {
+ const forceNow = getNow?.();
  const searchSource = await searchSourceService.create();
 
  searchSource.setField('index', indexPattern);
@@ -116,7 +118,7 @@ export const handleRequest = async ({
  if (timeRange && allTimeFields.length > 0) {
  timeFilterSearchSource.setField('filter', () => {
  return allTimeFields
- .map((fieldName) => getTime(indexPattern, timeRange, { fieldName }))
+ .map((fieldName) => getTime(indexPattern, timeRange, { fieldName, forceNow }))
  .filter(isRangeFilter);
  });
  }
@@ -184,7 +186,7 @@ export const handleRequest = async ({
  }
  }
 
- const parsedTimeRange = timeRange ? calculateBounds(timeRange) : null;
+ const parsedTimeRange = timeRange ? calculateBounds(timeRange, { forceNow }) : null;
  const tabifyParams = {
  metricsAtAllLevels,
  partialRows,