[Lens] Implement time scaling function (elastic#82104)

flash1293 · Nov 6, 2020 · 77c2e0d · 77c2e0d
1 parent b8f2342
commit 77c2e0d
Show file tree

Hide file tree

Showing 8 changed files with 601 additions and 17 deletions.
diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts
@@ -94,7 +94,7 @@ export interface AggsCommonStart {
    */
   getDateMetaByDatatableColumn: (
     column: DatatableColumn
-  ) => Promise<undefined | { timeZone: string; timeRange: TimeRange; interval: string }>;
+  ) => Promise<undefined | { timeZone: string; timeRange?: TimeRange; interval: string }>;
   createAggConfigs: (
     indexPattern: IndexPattern,
     configStates?: CreateAggConfigParams[],

diff --git a/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts b/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
@@ -91,6 +91,43 @@ describe('getDateMetaByDatatableColumn', () => {
     });
   });
 
+  it('throws if unable to resolve interval', async () => {
+    await expect(
+      getDateMetaByDatatableColumn(params)({
+        id: 'test',
+        name: 'test',
+        meta: {
+          type: 'date',
+          source: 'esaggs',
+          sourceParams: {
+            type: BUCKET_TYPES.DATE_HISTOGRAM,
+            params: {
+              time_zone: 'UTC',
+              interval: 'auto',
+            },
+          },
+        },
+      })
+    ).rejects.toBeDefined();
+
+    await expect(
+      getDateMetaByDatatableColumn(params)({
+        id: 'test',
+        name: 'test',
+        meta: {
+          type: 'date',
+          source: 'esaggs',
+          sourceParams: {
+            type: BUCKET_TYPES.DATE_HISTOGRAM,
+            params: {
+              time_zone: 'UTC',
+            },
+          },
+        },
+      })
+    ).rejects.toBeDefined();
+  });
+
   it('returns resolved auto interval', async () => {
     expect(
       await getDateMetaByDatatableColumn(params)({
@@ -106,8 +143,8 @@ describe('getDateMetaByDatatableColumn', () => {
               interval: 'auto',
             },
             appliedTimeRange: {
-              from: 'now-5d',
-              to: 'now',
+              from: '2020-10-05T00:00:00.000Z',
+              to: '2020-10-10T00:00:00.000Z',
             },
           },
         },

diff --git a/src/plugins/data/common/search/aggs/utils/time_column_meta.ts b/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
@@ -38,11 +38,11 @@ export const getDateMetaByDatatableColumn = ({
   getConfig,
 }: DateMetaByColumnDeps) => async (
   column: DatatableColumn
-): Promise<undefined | { timeZone: string; timeRange: TimeRange; interval: string }> => {
+): Promise<undefined | { timeZone: string; timeRange?: TimeRange; interval: string }> => {
   if (column.meta.source !== 'esaggs') return;
   if (column.meta.sourceParams?.type !== BUCKET_TYPES.DATE_HISTOGRAM) return;
   const params = column.meta.sourceParams.params as AggParamsDateHistogram;
-  const appliedTimeRange = column.meta.sourceParams.appliedTimeRange as TimeRange;
+  const appliedTimeRange = column.meta.sourceParams.appliedTimeRange as TimeRange | undefined;
 
   const tz = inferTimeZone(
     params,
@@ -52,9 +52,11 @@ export const getDateMetaByDatatableColumn = ({
   );
 
   const interval =
-    params.interval === 'auto' ? calculateAutoTimeExpression(appliedTimeRange) : params.interval;
+    params.interval === 'auto' && appliedTimeRange
+      ? calculateAutoTimeExpression(appliedTimeRange)
+      : params.interval;
 
-  if (!interval) {
+  if (!interval || interval === 'auto') {
     throw new Error('time interval could not be determined');
   }
 

diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -267,6 +267,8 @@ export const esaggs = (): EsaggsExpressionFunctionDefinition => ({
     searchSource.setField('index', indexPattern);
     searchSource.setField('size', 0);
 
+    const resolvedTimeRange = input?.timeRange && calculateBounds(input.timeRange);
+
     const response = await handleCourierRequest({
       searchSource,
       aggs,
@@ -303,7 +305,10 @@ export const esaggs = (): EsaggsExpressionFunctionDefinition => ({
                 input?.timeRange &&
                 args.timeFields &&
                 args.timeFields.includes(column.aggConfig.params.field?.name)
-                  ? { from: input.timeRange.from, to: input.timeRange.to }
+                  ? {
+                      from: resolvedTimeRange?.min?.toISOString(),
+                      to: resolvedTimeRange?.max?.toISOString(),
+                    }
                   : undefined,
               ...column.aggConfig.serialize(),
             },

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/index.ts
@@ -33,19 +33,23 @@ export class IndexPatternDatasource {
     { expressions, editorFrame, charts }: IndexPatternDatasourceSetupPlugins
   ) {
     editorFrame.registerDatasource(async () => {
-      const { getIndexPatternDatasource, renameColumns, formatColumn } = await import(
-        '../async_services'
-      );
-      expressions.registerFunction(renameColumns);
-      expressions.registerFunction(formatColumn);
-      return core.getStartServices().then(([coreStart, { data }]) =>
-        getIndexPatternDatasource({
+      const {
+        getIndexPatternDatasource,
+        renameColumns,
+        formatColumn,
+        getTimeScaleFunction,
+      } = await import('../async_services');
+      return core.getStartServices().then(([coreStart, { data }]) => {
+        expressions.registerFunction(getTimeScaleFunction(data));
+        expressions.registerFunction(renameColumns);
+        expressions.registerFunction(formatColumn);
+        return getIndexPatternDatasource({
           core: coreStart,
           storage: new Storage(localStorage),
           data,
           charts,
-        })
-      ) as Promise<Datasource>;
+        });
+      }) as Promise<Datasource>;
     });
   }
 }
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -70,6 +70,7 @@ export function columnToOperation(column: IndexPatternColumn, uniqueLabel?: stri
 
 export * from './rename_columns';
 export * from './format_column';
+export * from './time_scale';
 
 export function getIndexPatternDatasource({
   core,