gating trendlines if reduced time range is present

elastic · Oct 14, 2022 · 8ee436c · 8ee436c
1 parent 5b0dbe3
commit 8ee436c
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 20 deletions.
diff --git a/x-pack/plugins/lens/public/app_plugin/show_underlying_data.test.ts b/x-pack/plugins/lens/public/app_plugin/show_underlying_data.test.ts
@@ -75,6 +75,7 @@ describe('getLayerMetaInfo', () => {
         isStaticValue: false,
         sortingHint: undefined,
         hasTimeShift: true,
+        hasReducedTimeRange: true,
       })),
       getTableSpec: jest.fn(),
       getVisualDefaults: jest.fn(),

diff --git a/x-pack/plugins/lens/public/datasources/form_based/form_based.test.ts b/x-pack/plugins/lens/public/datasources/form_based/form_based.test.ts
@@ -1868,6 +1868,7 @@ describe('IndexPattern Data Source', () => {
           isBucketed: true,
           isStaticValue: false,
           hasTimeShift: false,
+          hasReducedTimeRange: false,
         } as OperationDescriptor);
       });
 

diff --git a/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx b/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
@@ -105,7 +105,7 @@ export function columnToOperation(
   uniqueLabel?: string,
   dataView?: IndexPattern
 ): OperationDescriptor {
-  const { dataType, label, isBucketed, scale, operationType, timeShift } = column;
+  const { dataType, label, isBucketed, scale, operationType, timeShift, reducedTimeRange } = column;
   const fieldTypes =
     'sourceField' in column ? dataView?.getFieldByName(column.sourceField)?.esTypes : undefined;
   return {
@@ -119,6 +119,7 @@ export function columnToOperation(
         ? 'version'
         : undefined,
     hasTimeShift: Boolean(timeShift),
+    hasReducedTimeRange: Boolean(reducedTimeRange),
     interval: isColumnOfType<DateHistogramIndexPatternColumn>('date_histogram', column)
       ? column.params.interval
       : undefined,

diff --git a/x-pack/plugins/lens/public/datasources/form_based/form_based_suggestions.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/form_based_suggestions.test.tsx
@@ -1283,6 +1283,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                   },
                 },
                 {
@@ -1294,6 +1295,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: 'ratio',
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                   },
                 },
               ],
@@ -1373,6 +1375,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                   },
                 },
                 {
@@ -1384,6 +1387,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: 'ratio',
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                   },
                 },
               ],
@@ -2198,6 +2202,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: undefined,
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                 },
               },
             ],
@@ -2222,6 +2227,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: undefined,
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                 },
               },
             ],
@@ -2272,6 +2278,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'interval',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: 'auto',
                 },
               },
@@ -2284,6 +2291,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'ratio',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -2349,6 +2357,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'ordinal',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -2361,6 +2370,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'interval',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: 'auto',
                 },
               },
@@ -2373,6 +2383,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'ratio',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -2459,6 +2470,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'ordinal',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -2471,6 +2483,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'interval',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: 'auto',
                 },
               },
@@ -2483,6 +2496,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'ratio',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -2592,6 +2606,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'ordinal',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -2604,6 +2619,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: 'interval',
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: 'auto',
                 },
               },
@@ -2616,6 +2632,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: undefined,
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                   interval: undefined,
                 },
               },
@@ -3123,6 +3140,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: undefined,
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                 },
               },
               {
@@ -3134,6 +3152,7 @@ describe('IndexPattern Data Source suggestions', () => {
                   scale: undefined,
                   isStaticValue: false,
                   hasTimeShift: false,
+                  hasReducedTimeRange: false,
                 },
               },
             ],
@@ -3201,6 +3220,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: 'interval',
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                     interval: 'auto',
                   },
                 },
@@ -3213,6 +3233,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                     interval: undefined,
                   },
                 },
@@ -3225,6 +3246,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                     interval: undefined,
                   },
                 },
@@ -3291,6 +3313,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                     interval: 'auto',
                   },
                 },
@@ -3303,6 +3326,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                     interval: undefined,
                   },
                 },
@@ -3315,6 +3339,7 @@ describe('IndexPattern Data Source suggestions', () => {
                     scale: undefined,
                     isStaticValue: false,
                     hasTimeShift: false,
+                    hasReducedTimeRange: false,
                     interval: undefined,
                   },
                 },

diff --git a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.test.ts b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.test.ts
@@ -728,6 +728,7 @@ describe('IndexPattern Data Source', () => {
           dataType: 'number',
           isBucketed: false,
           hasTimeShift: false,
+          hasReducedTimeRange: false,
         });
       });
 

diff --git a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
@@ -587,6 +587,7 @@ export function getTextBasedDatasource({
               label: columnLabelMap[columnId] ?? column?.fieldName,
               isBucketed: Boolean(column?.meta?.type !== 'number'),
               hasTimeShift: false,
+              hasReducedTimeRange: false,
             };
           }
           return null;

diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
@@ -693,6 +693,7 @@ export interface OperationMetadata {
  */
 export interface OperationDescriptor extends Operation {
   hasTimeShift: boolean;
+  hasReducedTimeRange: boolean;
 }
 
 export interface VisualizationConfigProps<T = unknown> {

diff --git a/x-pack/plugins/lens/public/visualizations/datatable/visualization.test.tsx b/x-pack/plugins/lens/public/visualizations/datatable/visualization.test.tsx
@@ -526,6 +526,7 @@ describe('Datatable Visualization', () => {
         label: 'label',
         isStaticValue: false,
         hasTimeShift: false,
+        hasReducedTimeRange: false,
       });
 
       const expression = datatableVisualization.toExpression(
@@ -577,6 +578,7 @@ describe('Datatable Visualization', () => {
         label: 'label',
         isStaticValue: false,
         hasTimeShift: false,
+        hasReducedTimeRange: false,
       });
 
       const expression = datatableVisualization.toExpression(
@@ -712,6 +714,7 @@ describe('Datatable Visualization', () => {
         label: 'label',
         isStaticValue: false,
         hasTimeShift: false,
+        hasReducedTimeRange: false,
       });
 
       const error = datatableVisualization.getErrorMessages({
@@ -737,6 +740,7 @@ describe('Datatable Visualization', () => {
         label: 'label',
         isStaticValue: false,
         hasTimeShift: false,
+        hasReducedTimeRange: false,
       });
 
       const error = datatableVisualization.getErrorMessages({

diff --git a/x-pack/plugins/lens/public/visualizations/legacy_metric/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/legacy_metric/visualization.test.ts
@@ -271,6 +271,7 @@ describe('metric_visualization', () => {
             label: 'shazm',
             isStaticValue: false,
             hasTimeShift: false,
+            hasReducedTimeRange: false,
           };
         },
       };

diff --git a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
@@ -8,7 +8,7 @@
 /* eslint-disable max-classes-per-file */
 
 import React, { FormEvent } from 'react';
-import { VisualizationDimensionEditorProps } from '../../types';
+import { OperationDescriptor, VisualizationDimensionEditorProps } from '../../types';
 import { CustomPaletteParams, PaletteOutput, PaletteRegistry } from '@kbn/coloring';
 
 import { MetricVisualizationState } from './visualization';
@@ -91,6 +91,9 @@ describe('dimension editor', () => {
       state: fullState,
       datasource: {
         hasDefaultTimeField: jest.fn(),
+        getOperationForColumnId: jest.fn(() => ({
+          hasReducedTimeRange: false,
+        })),
       } as unknown as DatasourcePublicAPI,
       removeLayer: jest.fn(),
       addLayer: jest.fn(),
@@ -305,16 +308,37 @@ describe('dimension editor', () => {
           expect(
             getHarnessWithState(stateWOTrend, {
               hasDefaultTimeField: () => false,
+              getOperationForColumnId: (id) => ({} as OperationDescriptor),
             } as DatasourcePublicAPI).isDisabled('trendline')
           ).toBeTruthy();
           expect(
             getHarnessWithState(stateWOTrend, {
               hasDefaultTimeField: () => true,
+              getOperationForColumnId: (id) => ({} as OperationDescriptor),
             } as DatasourcePublicAPI).isDisabled('trendline')
           ).toBeFalsy();
         });
       });
 
+      it('should disable trendline when a metric dimension has a reduced time range', () => {
+        expect(
+          getHarnessWithState(stateWOTrend, {
+            hasDefaultTimeField: () => true,
+            getOperationForColumnId: (id) =>
+              ({ hasReducedTimeRange: id === stateWOTrend.metricAccessor } as OperationDescriptor),
+          } as DatasourcePublicAPI).isDisabled('trendline')
+        ).toBeTruthy();
+        expect(
+          getHarnessWithState(stateWOTrend, {
+            hasDefaultTimeField: () => true,
+            getOperationForColumnId: (id) =>
+              ({
+                hasReducedTimeRange: id === stateWOTrend.secondaryMetricAccessor,
+              } as OperationDescriptor),
+          } as DatasourcePublicAPI).isDisabled('trendline')
+        ).toBeTruthy();
+      });
+
       describe('responding to buttons', () => {
         it('enables trendline', () => {
           getHarnessWithState(stateWOTrend).setSupportingVis('trendline');