diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/mocks.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/mocks.ts index 59e31be5672fe..d6a6c85b9ac0c 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/mocks.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/mocks.ts @@ -108,7 +108,6 @@ export const mockedColumns: Record = { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '0.75', }, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/on_drop_handler.test.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/on_drop_handler.test.ts index 3c844ac8be12d..a8c6a6b58ce7d 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/on_drop_handler.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/droppable/on_drop_handler.test.ts @@ -1470,7 +1470,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: true, }, - scale: 'ratio', }, }, incompleteColumns: {}, @@ -1705,7 +1704,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: true, }, - scale: 'ratio', sourceField: 'timestamp', }, }, @@ -1749,7 +1747,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: true, }, - scale: 'ratio', sourceField: 'timestamp', }, }, @@ -1793,7 +1790,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: true, }, - scale: 'ratio', sourceField: 'timestamp', }, }, @@ -1832,7 +1828,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: true, }, - scale: 'ratio', sourceField: 'timestamp', }, }, @@ -1880,7 +1875,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { ], type: 'histogram', }, - scale: 'interval', sourceField: 'bytes', }, }, @@ -1897,7 +1891,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: true, }, - scale: 'ratio', sourceField: 'timestamp', }, }, @@ -2051,7 +2044,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -2060,7 +2052,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: 'count()' }, references: ['firstColumnX0'], } as FormulaIndexPatternColumn, @@ -2076,7 +2067,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -2085,7 +2075,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: 'count()' }, references: ['secondX0'], } as FormulaIndexPatternColumn, @@ -2140,7 +2129,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { isFormulaBroken: false, }, references: ['newColumnX0'], - scale: 'ratio', }, newColumnX0: { customLabel: true, @@ -2152,7 +2140,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: '___records___', timeScale: undefined, timeShift: undefined, @@ -2198,7 +2185,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { isFormulaBroken: false, }, references: ['secondX0'], - scale: 'ratio', }, secondX0: { customLabel: true, @@ -2210,7 +2196,6 @@ describe('FormBasedDimensionEditorPanel: onDrop', () => { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: '___records___', timeScale: undefined, timeShift: undefined, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_input.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_input.test.tsx index 619d02f0bf28f..c36ee9a0d7842 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_input.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/dimension_panel/field_input.test.tsx @@ -55,7 +55,6 @@ function getReferenceBasedOperationColumn( operationType: 'differences', isBucketed: false, references: ['colX'], - scale: 'ratio', }; } @@ -65,7 +64,6 @@ function getManagedBasedOperationColumn(): ReferenceBasedIndexPatternColumn { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: 100 }, references: [], } as ReferenceBasedIndexPatternColumn; diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.test.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.test.ts index 4fade2394e26a..cf14c647a5460 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.test.ts @@ -734,7 +734,6 @@ describe('IndexPattern Data Source', () => { operationType: 'date_histogram', sourceField: 'order_date', isBucketed: true, - scale: 'interval', params: { interval: 'auto', includeEmptyRows: true, @@ -747,7 +746,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', params: { emptyAsNull: false, @@ -761,7 +759,6 @@ describe('IndexPattern Data Source', () => { operationType: 'sum', sourceField: 'products.price', isBucketed: false, - scale: 'ratio', timeShift: '1h', params: { emptyAsNull: false, @@ -775,7 +772,6 @@ describe('IndexPattern Data Source', () => { operationType: 'average', sourceField: 'products.price', isBucketed: false, - scale: 'ratio', filter: { query: 'NOT category : * ', language: 'kuery', @@ -792,7 +788,6 @@ describe('IndexPattern Data Source', () => { operationType: 'median', sourceField: 'products.price', isBucketed: false, - scale: 'ratio', params: { emptyAsNull: false, }, @@ -804,7 +799,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst: { type: 'function', @@ -826,7 +820,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'differences', isBucketed: false, - scale: 'ratio', references: ['col2X4'], filter: { query: 'category : *', @@ -840,7 +833,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst: { type: 'function', @@ -869,7 +861,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', references: ['col2X6'], timeShift: '3h', params: { @@ -883,7 +874,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: "moving_average(count() + sum(products.price, shift='1h') + differences(average(products.price, kql='NOT category : * ') + median(products.price), kql='category : *'), shift='3h')", @@ -1368,7 +1358,6 @@ describe('IndexPattern Data Source', () => { operationType: 'date_histogram', sourceField: 'timestamp', isBucketed: true, - scale: 'interval', params: { interval: 'auto', includeEmptyRows: true, @@ -1381,7 +1370,6 @@ describe('IndexPattern Data Source', () => { operationType: 'percentile', sourceField: 'bytes', isBucketed: false, - scale: 'ratio', params: { percentile: 95, }, @@ -1392,7 +1380,6 @@ describe('IndexPattern Data Source', () => { operationType: 'percentile', sourceField: 'bytes', isBucketed: false, - scale: 'ratio', params: { percentile: 95, }, @@ -1433,7 +1420,6 @@ describe('IndexPattern Data Source', () => { operationType: 'date_histogram', sourceField: 'timestamp', isBucketed: true, - scale: 'interval', params: { interval: 'auto', includeEmptyRows: true, @@ -1446,7 +1432,6 @@ describe('IndexPattern Data Source', () => { operationType: 'percentile', sourceField: 'bytes', isBucketed: false, - scale: 'ratio', params: { percentile: 95, }, @@ -1736,7 +1721,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -1746,7 +1730,6 @@ describe('IndexPattern Data Source', () => { operationType: 'date_histogram', sourceField: 'timestamp', isBucketed: true, - scale: 'interval', params: { interval: 'auto', }, @@ -1756,7 +1739,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: 'count() + count()', isFormulaBroken: false, @@ -1768,7 +1750,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -1777,7 +1758,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst: { type: 'function', @@ -2167,7 +2147,7 @@ describe('IndexPattern Data Source', () => { isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, - scale: undefined, + scale: 'ordinal', sortingHint: undefined, interval: undefined, hasArraySupport: false, @@ -2668,7 +2648,6 @@ describe('IndexPattern Data Source', () => { dataType: 'string', isBucketed: true, operationType: 'filters', - scale: 'ordinal', params: { filters: [{ label: '', input: { language: 'kuery', query: 'bytes > 1000' } }], }, @@ -2678,7 +2657,6 @@ describe('IndexPattern Data Source', () => { dataType: 'string', isBucketed: true, operationType: 'filters', - scale: 'ordinal', params: { filters: [{ label: '', input: { language: 'lucene', query: 'memory' } }], }, @@ -2688,7 +2666,6 @@ describe('IndexPattern Data Source', () => { dataType: 'string', isBucketed: true, operationType: 'filters', - scale: 'ordinal', params: { filters: [ { label: '', input: { language: 'kuery', query: 'bytes > 5000' } }, @@ -2777,7 +2754,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: "count(kql='memory > 5000') + count()", isFormulaBroken: false, @@ -2789,7 +2765,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, filter: { language: 'kuery', query: 'memory > 5000' }, @@ -2799,7 +2774,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -2808,7 +2782,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst: { type: 'function', @@ -2850,7 +2823,6 @@ describe('IndexPattern Data Source', () => { dataType: 'string', isBucketed: true, operationType: 'filters', - scale: 'ordinal', params: { filters: [ { label: '', input: { language: 'kuery', query: 'bytes > 5000' } }, @@ -2937,7 +2909,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', filter: { language: 'kuery', query: 'bytes > 4000' }, params: { formula: "count(kql='memory > 5000') + count()", @@ -2950,7 +2921,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, filter: { language: 'kuery', query: 'bytes > 4000 AND memory > 5000' }, @@ -2960,7 +2930,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, filter: { language: 'kuery', query: 'bytes > 4000' }, @@ -2970,7 +2939,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst: { type: 'function', @@ -3903,7 +3871,6 @@ describe('IndexPattern Data Source', () => { operationType: 'static_value', params: { value: '0' }, references: [], - scale: 'ratio', }, }, }, @@ -3953,7 +3920,6 @@ describe('IndexPattern Data Source', () => { label: 'timestampLabel', operationType: 'date_histogram', params: { dropPartials: false, includeEmptyRows: true, interval: 'auto' }, - scale: 'interval', sourceField: 'timestamp', }, }, @@ -4190,7 +4156,6 @@ describe('IndexPattern Data Source', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', }, }, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.tsx index 9868f821e769a..e9cf638ae6faf 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based.tsx @@ -163,7 +163,21 @@ export function columnToOperation( uniqueLabel?: string, dataView?: IndexPattern | DataView ): OperationDescriptor { - const { dataType, label, isBucketed, scale, operationType, timeShift, reducedTimeRange } = column; + const { dataType, label, isBucketed, operationType, timeShift, reducedTimeRange } = column; + + const operationDefinition = operationDefinitionMap[operationType]; + if (!operationDefinition) { + throw new Error( + i18n.translate('xpack.lens.indexPattern.operationNotFoundErrorMessage', { + defaultMessage: 'Operation {operationType} not found', + values: { operationType }, + }) + ); + } + + const scale = operationDefinition.scale + ? operationDefinition.scale(column, dataView as IndexPattern) + : 'ratio'; return { dataType: normalizeOperationDataType(dataType), diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based_suggestions.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based_suggestions.test.tsx index 35384bbd6bc22..5f95a57fb729a 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based_suggestions.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/form_based_suggestions.test.tsx @@ -1314,7 +1314,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: '', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -1408,7 +1408,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: '', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -2258,7 +2258,7 @@ describe('IndexPattern Data Source suggestions', () => { label: 'My Op', dataType: 'string', isBucketed: true, - scale: undefined, + scale: 'ordinal', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -2284,7 +2284,7 @@ describe('IndexPattern Data Source suggestions', () => { label: 'My Op 2', dataType: 'string', isBucketed: true, - scale: undefined, + scale: 'ordinal', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -2700,7 +2700,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: 'Unique count of dest', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3212,7 +3212,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'string', isBucketed: true, label: 'My Op', - scale: undefined, + scale: 'ordinal', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3225,7 +3225,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'string', isBucketed: true, label: 'Top 5', - scale: undefined, + scale: 'ordinal', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3308,7 +3308,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: 'Cumulative sum of Records', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3322,7 +3322,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: 'Cumulative sum of (incomplete)', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3390,7 +3390,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'date', isBucketed: true, label: '', - scale: undefined, + scale: 'interval', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3404,7 +3404,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: '', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, @@ -3418,7 +3418,7 @@ describe('IndexPattern Data Source suggestions', () => { dataType: 'number', isBucketed: false, label: '', - scale: undefined, + scale: 'ratio', isStaticValue: false, hasTimeShift: false, hasReducedTimeRange: false, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/counter_rate.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/counter_rate.tsx index af563ccd4bef7..2aefd264509c6 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/counter_rate.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/counter_rate.tsx @@ -98,7 +98,6 @@ export const counterRateOperation: OperationDefinition< dataType: 'number', operationType: 'counter_rate', isBucketed: false, - scale: 'ratio', references: referenceIds, timeScale, timeShift: columnParams?.shift || previousColumn?.timeShift, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/cumulative_sum.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/cumulative_sum.tsx index 50bcd865b855d..efa3f312f7a57 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/cumulative_sum.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/cumulative_sum.tsx @@ -94,7 +94,6 @@ export const cumulativeSumOperation: OperationDefinition< dataType: 'number', operationType: 'cumulative_sum', isBucketed: false, - scale: 'ratio', timeShift: columnParams?.shift || previousColumn?.timeShift, filter: getFilter(previousColumn, columnParams), references: referenceIds, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/differences.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/differences.tsx index f91636471190e..c744c9259854b 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/differences.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/differences.tsx @@ -77,7 +77,6 @@ export const derivativeOperation: OperationDefinition< dataType: 'number', operationType: DIFFERENCES_ID, isBucketed: false, - scale: 'ratio', references: referenceIds, timeScale, filter: getFilter(previousColumn, columnParams), diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/moving_average.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/moving_average.tsx index 4d0912fd96425..7d62a6944964e 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/moving_average.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/moving_average.tsx @@ -99,7 +99,6 @@ export const movingAverageOperation: OperationDefinition< dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', references: referenceIds, timeShift: columnParams?.shift || previousColumn?.timeShift, filter: getFilter(previousColumn, columnParams), diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/overall_metric.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/overall_metric.tsx index df0e55ff40dfb..7e8b7fd60095d 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/overall_metric.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/calculations/overall_metric.tsx @@ -94,7 +94,6 @@ function buildOverallMetricOperation 'interval', operationParams: [{ name: 'interval', type: 'string', required: false }], getErrorMessage: (layer, columnId, indexPattern) => [ ...getInvalidFieldMessage(layer, columnId, indexPattern), @@ -118,7 +119,6 @@ export const dateHistogramOperation: OperationDefinition< operationType: 'date_histogram', sourceField: field.name, isBucketed: true, - scale: 'interval', params: { interval: columnParams?.interval ?? autoInterval, includeEmptyRows: columnParams?.includeEmptyRows ?? true, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.test.tsx index a742ce97168e0..651ac016d2bf5 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.test.tsx @@ -73,7 +73,6 @@ describe('filters', () => { label: 'filters', dataType: 'document', operationType: 'filters', - scale: 'ordinal', isBucketed: true, params: { filters: [ @@ -198,7 +197,6 @@ describe('filters', () => { label: 'Filters', dataType: 'string', operationType: 'filters', - scale: 'ordinal', isBucketed: true, params: { filters: [ @@ -235,7 +233,6 @@ describe('filters', () => { label: 'Filters', dataType: 'string', operationType: 'filters', - scale: 'ordinal', isBucketed: true, params: { filters: [ @@ -274,7 +271,6 @@ describe('filters', () => { label: 'Filters', dataType: 'string', operationType: 'filters', - scale: 'ordinal', isBucketed: true, params: { filters: [ diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx index 9b2a88f657f07..4df011d744e2c 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx @@ -76,6 +76,7 @@ export const filtersOperation: OperationDefinition< displayName: filtersLabel, priority: 3, // Higher than any metric input: 'none', + scale: () => 'ordinal', isTransferable: () => true, getDefaultLabel: () => filtersLabel, @@ -108,7 +109,6 @@ export const filtersOperation: OperationDefinition< label: filtersLabel, dataType: 'string', operationType: OPERATION_NAME, - scale: 'ordinal', isBucketed: true, params, }; diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.test.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.test.ts index f6278ed8a69f7..59f4b5582d647 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.test.ts @@ -34,7 +34,6 @@ function createLayer( dataType: 'number', operationType: type, isBucketed: false, - scale: 'ratio', references: [], }, }, @@ -112,7 +111,6 @@ describe('context variables', () => { operationType: 'date_histogram', sourceField: '@timestamp', isBucketed: true, - scale: 'interval', params: { interval: 'auto', includeEmptyRows: true, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.tsx index 3bb1935e24223..16d2cfe3c7dcb 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/context_variables.tsx @@ -237,7 +237,6 @@ function createContextValueBasedOperation(type: operationType: type, sourceField: field?.name ?? undefined, isBucketed: false, - scale: 'ratio', timeScale: false, }; }) as unknown as Extract['buildColumn']; diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.test.tsx index 85e15d5c4446a..c5a91efaa5440 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.test.tsx @@ -69,7 +69,6 @@ const operationDefinitionMap: Record = { dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', timeScale: undefined, params: { window: 5 }, references: referenceIds, @@ -125,7 +124,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'average', isBucketed: false, - scale: 'ratio', sourceField: 'bytes', }, }, @@ -148,7 +146,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: {}, references: [], }); @@ -166,7 +163,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'average(bytes)' }, references: [], }); @@ -190,7 +186,6 @@ describe('[Lens] formula', () => { isBucketed: false, filter: undefined, timeScale: undefined, - scale: 'ratio', params: {}, references: [], }); @@ -218,7 +213,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'average(bytes)', @@ -252,7 +246,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: `average(bytes, kql='category.keyword: "Men\\'s Clothing" or category.keyword: "Men\\'s Shoes"')`, @@ -281,7 +274,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: `count(lucene='*')`, @@ -299,7 +291,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', references: ['col2'], timeScale: 'd', params: { window: 3 }, @@ -313,7 +304,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', references: ['col2'], timeScale: 'd', params: { window: 3 }, @@ -323,7 +313,6 @@ describe('[Lens] formula', () => { isBucketed: false, label: 'col1X0', operationType: 'average', - scale: 'ratio', sourceField: 'bytes', timeScale: 'd', }, @@ -339,7 +328,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'moving_average(average(bytes), window=3)', @@ -393,7 +381,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: {}, references: [], }); @@ -420,7 +407,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: '0' }, references: [], }); @@ -481,7 +467,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: '', isFormulaBroken: false }, references: [], }; @@ -525,7 +510,6 @@ describe('[Lens] formula', () => { isBucketed: false, label: 'Part of average(bytes)', operationType: 'average', - scale: 'ratio', sourceField: 'bytes', timeScale: undefined, }, @@ -575,7 +559,6 @@ describe('[Lens] formula', () => { tinymathAst: 0, }, references: [], - scale: 'ratio', }, }, }); @@ -929,7 +912,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula, isFormulaBroken }, references: [], } as FormulaIndexPatternColumn, @@ -963,7 +945,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula, isFormulaBroken: false }, references: [], } as FormulaIndexPatternColumn, @@ -996,7 +977,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: '', isFormulaBroken }, references: [], } as FormulaIndexPatternColumn, @@ -1031,7 +1011,6 @@ describe('[Lens] formula', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula, isFormulaBroken: isBroken }, references: [], ...columnParams, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.tsx index a3539af74db05..7dde6c066b2b5 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/formula.tsx @@ -210,7 +210,6 @@ export const formulaOperation: OperationDefinition ({ label: '@timestamp', operationType: 'date_histogram', params: { interval: 'auto' }, - scale: 'interval', } as DateHistogramIndexPatternColumn, }, }); @@ -103,7 +102,6 @@ describe('createFormulaPublicApi', () => { label: '@timestamp', operationType: 'date_histogram', params: { interval: 'auto' }, - scale: 'interval', }, }, indexPatternId: undefined, @@ -153,7 +151,6 @@ describe('createFormulaPublicApi', () => { label: '@timestamp', operationType: 'date_histogram', params: { interval: 'auto' }, - scale: 'interval', }, }, indexPatternId: undefined, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.test.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.test.ts index 5ca43cb125cc8..95bda775e780f 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.test.ts @@ -19,7 +19,6 @@ function createLayerWithMathColumn(tinymathAst: string | TinymathAST): FormBased dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst, }, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.tsx index cf8116d66447a..428c17ce87bc7 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/formula/math.tsx @@ -58,7 +58,6 @@ export const mathOperation: OperationDefinition 'ratio' | 'ordinal' | 'interval'; /** * The default label is assigned by the editor */ diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.test.tsx index 2beefab2f1439..2392d568309a6 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.test.tsx @@ -974,7 +974,6 @@ describe('last_value', () => { label: 'Last value of test', operationType: 'last_value', params: { sortField: 'timestamp' }, - scale: 'ratio', sourceField: 'bytes', } as LastValueIndexPatternColumn, }, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.tsx index 337ec8052d0ed..62c57088e3553 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/last_value.tsx @@ -184,6 +184,16 @@ export const lastValueOperation: OperationDefinition< column.reducedTimeRange ), input: 'field', + scale: (column, dataview) => { + if (!dataview) { + return 'ratio'; + } + const field = dataview.getFieldByName(column.sourceField); + if (!field) { + return 'ratio'; + } + return getScale(field?.type); + }, onFieldChange: (oldColumn, field) => { const newParams = { ...oldColumn.params }; @@ -198,7 +208,6 @@ export const lastValueOperation: OperationDefinition< label: ofName(field.displayName, oldColumn.timeShift, oldColumn.reducedTimeRange), sourceField: field.name, params: newParams, - scale: getScale(field.type), filter: oldColumn.filter && comparePreviousColumnFilter(oldColumn.filter, oldColumn.sourceField) ? getExistsFilter(field.name) @@ -251,7 +260,6 @@ export const lastValueOperation: OperationDefinition< dataType: field.type as DataType, operationType: LAST_VALUE_ID, isBucketed: false, - scale: getScale(field.type), sourceField: field.name, filter: getFilter(previousColumn, columnParams) || getExistsFilter(field.name), timeShift: columnParams?.shift || previousColumn?.timeShift, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/metrics.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/metrics.tsx index 304698b1be5e9..9cd7c1c63f32a 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/metrics.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/metrics.tsx @@ -150,7 +150,6 @@ function buildMetricOperation>({ operationType: type, sourceField: field.name, isBucketed: false, - scale: 'ratio', timeScale: optionalTimeScaling ? previousColumn?.timeScale : undefined, filter: getFilter(previousColumn, columnParams), timeShift: columnParams?.shift || previousColumn?.timeShift, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile.tsx index 4adfe858f22ac..0c88e288a51ec 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile.tsx @@ -195,7 +195,6 @@ export const percentileOperation: OperationDefinition< operationType: PERCENTILE_ID, sourceField: field.name, isBucketed: false, - scale: 'ratio', filter: getFilter(previousColumn, columnParams), timeShift: columnParams?.shift || previousColumn?.timeShift, reducedTimeRange: columnParams?.reducedTimeRange || previousColumn?.reducedTimeRange, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx index da4c3f4d77d37..cb3ecc4a110c7 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx @@ -132,7 +132,6 @@ export const percentileRanksOperation: OperationDefinition< operationType: 'percentile_rank', sourceField: field.name, isBucketed: false, - scale: 'ratio', filter: getFilter(previousColumn, columnParams), timeShift: columnParams?.shift || previousColumn?.timeShift, reducedTimeRange: columnParams?.reducedTimeRange || previousColumn?.reducedTimeRange, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx index e85f6d6f7d550..078789389d494 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx @@ -137,14 +137,12 @@ describe('ranges', () => { function setToHistogramMode() { const column = layer.columns.col1 as RangeIndexPatternColumn; column.dataType = 'number'; - column.scale = 'interval'; column.params.type = MODES.Histogram; } function setToRangeMode() { const column = layer.columns.col1 as RangeIndexPatternColumn; column.dataType = 'string'; - column.scale = 'ordinal'; column.params.type = MODES.Range; } @@ -158,7 +156,6 @@ describe('ranges', () => { label: sourceField, dataType: 'number', operationType: 'range', - scale: 'interval', isBucketed: true, sourceField, params: { diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.tsx index afc48e04cf7d6..38d1d0201fe40 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/ranges/ranges.tsx @@ -82,6 +82,10 @@ export const rangeOperation: OperationDefinition< }), priority: 4, // Higher than terms, so numbers get histogram input: 'field', + scale: (column) => { + const type = column.params?.type ?? MODES.Histogram; + return type === MODES.Histogram ? 'interval' : 'ordinal'; + }, getErrorMessage: (layer, columnId, indexPattern) => getInvalidFieldMessage(layer, columnId, indexPattern), getPossibleOperationForField: ({ aggregationRestrictions, aggregatable, type }) => { @@ -110,7 +114,6 @@ export const rangeOperation: OperationDefinition< operationType: 'range', sourceField: field.name, isBucketed: true, - scale: type === MODES.Histogram ? 'interval' : 'ordinal', // ordinal for Range params: { includeEmptyRows: columnParams?.includeEmptyRows ?? true, type: columnParams?.type ?? MODES.Histogram, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.test.tsx index ffc0b176ae048..320340f883043 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.test.tsx @@ -248,7 +248,6 @@ describe('static_value', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '100' }, references: [], }); @@ -264,7 +263,6 @@ describe('static_value', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '23' }, references: [], } as StaticValueIndexPatternColumn, @@ -274,7 +272,6 @@ describe('static_value', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '23' }, references: [], }); @@ -294,7 +291,6 @@ describe('static_value', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '23' }, references: [], }); @@ -311,7 +307,6 @@ describe('static_value', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '23' }, references: [], } as StaticValueIndexPatternColumn, @@ -323,7 +318,6 @@ describe('static_value', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: '53' }, references: [], }); diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.tsx index 1dcff18f562e1..bd6d9acbba09a 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/static_value.tsx @@ -130,7 +130,6 @@ export const staticValueOperation: OperationDefinition< dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { ...previousParams, value: String(previousParams.value ?? defaultValue) }, references: [], }; diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/helpers.test.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/helpers.test.ts index f71e724ed5d25..6bc725f76049c 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/helpers.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/helpers.test.ts @@ -168,7 +168,6 @@ describe('getDisallowedTermsMessage()', () => { dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', references: ['col2'], timeShift: '3h', params: { @@ -435,7 +434,6 @@ describe('isSortableByColumn()', () => { operationType: 'differences', isBucketed: false, references: ['colX'], - scale: 'ratio', }, ]), 'col2' @@ -453,7 +451,6 @@ describe('isSortableByColumn()', () => { operationType: 'differences', isBucketed: false, references: ['col3'], - scale: 'ratio', }, { label: 'Average', @@ -477,7 +474,6 @@ describe('isSortableByColumn()', () => { dataType: 'number', operationType: 'static_value', isBucketed: false, - scale: 'ratio', params: { value: 100 }, references: [], } as ReferenceBasedIndexPatternColumn, @@ -497,7 +493,6 @@ describe('isSortableByColumn()', () => { operationType: 'percentile_rank', sourceField: 'bytes', isBucketed: false, - scale: 'ratio', params: { value: 1024.5 }, } as PercentileRanksIndexPatternColumn, ]), @@ -516,7 +511,6 @@ describe('isSortableByColumn()', () => { operationType: 'percentile_rank', sourceField: 'bytes', isBucketed: false, - scale: 'ratio', params: { value: 1024 }, } as PercentileRanksIndexPatternColumn, ]), diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/index.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/index.tsx index 62c5b777bf37b..db7c209a12d62 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/index.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/index.tsx @@ -136,6 +136,7 @@ export const termsOperation: OperationDefinition< }), priority: 3, // Higher than any metric input: 'field', + scale: () => 'ordinal', getCurrentFields: (targetColumn) => { return [targetColumn.sourceField, ...(targetColumn?.params?.secondaryFields ?? [])]; }, @@ -237,7 +238,6 @@ export const termsOperation: OperationDefinition< label: ofName(field.displayName), dataType: field.type as DataType, operationType: 'terms', - scale: 'ordinal', sourceField: field.name, isBucketed: true, params: { diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/terms.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/terms.test.tsx index aa7c75b15d022..ca9ca7b143ff0 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/terms.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/definitions/terms/terms.test.tsx @@ -316,7 +316,6 @@ describe('terms', () => { operationType: 'max', sourceField: 'price', isBucketed: false, - scale: 'ratio', }, orderBy: { type: 'custom', @@ -2424,7 +2423,6 @@ describe('terms', () => { dataType: 'number', operationType: 'median', isBucketed: false, - scale: 'ratio', sourceField: 'bytes', }, }, @@ -2488,7 +2486,6 @@ describe('terms', () => { dataType: 'number', operationType: 'median', isBucketed: false, - scale: 'ratio', sourceField: 'bytes', }, }, @@ -2556,7 +2553,6 @@ describe('terms', () => { dataType: 'number', operationType: 'median', isBucketed: false, - scale: 'ratio', sourceField: 'bytes', }, }, @@ -2638,7 +2634,6 @@ describe('terms', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', }, }, @@ -2731,7 +2726,6 @@ describe('terms', () => { otherBucket: true, size: 5, }, - scale: 'ordinal', sourceField: 'bytes', } as TermsIndexPatternColumn, }, diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/layer_helpers.test.ts b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/layer_helpers.test.ts index a7aafc0c272d7..a13cb1ad9a358 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/layer_helpers.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/operations/layer_helpers.test.ts @@ -166,7 +166,6 @@ describe('state_helpers', () => { isBucketed: false, label: 'Part of 5 + moving_average(sum(bytes), window=5)', operationType: 'sum' as const, - scale: 'ratio' as const, sourceField: 'bytes', }; const movingAvg = { @@ -1290,7 +1289,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'average(bytes)' }, references: [], } as FormulaIndexPatternColumn, @@ -1319,7 +1317,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'average(bytes)' }, references: [], } as FormulaIndexPatternColumn, @@ -1348,7 +1345,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'average(bytes)' }, references: [], } as FormulaIndexPatternColumn, @@ -1376,7 +1372,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'counter_rate', isBucketed: false, - scale: 'ratio', references: ['col2'], timeScale: 's', timeShift: '', @@ -1387,7 +1382,6 @@ describe('state_helpers', () => { label: 'Max of bytes', dataType: 'number', operationType: 'max', - scale: 'ratio', sourceField: indexPattern.fields[2].displayName, } as MaxIndexPatternColumn, }, @@ -2008,7 +2002,6 @@ describe('state_helpers', () => { isBucketed: false, label: 'formulaX0', operationType: 'sum' as const, - scale: 'ratio' as const, sourceField: 'bytes', }, formulaX1: { @@ -2307,7 +2300,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { isFormulaBroken: false, formula: 'average(bytes)', @@ -2785,7 +2777,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -2795,7 +2786,6 @@ describe('state_helpers', () => { operationType: 'date_histogram', sourceField: 'timestamp', isBucketed: true, - scale: 'interval', params: { interval: 'auto', }, @@ -2805,7 +2795,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'formula', isBucketed: false, - scale: 'ratio', params: { formula: 'count() + count()', isFormulaBroken: false, @@ -2817,7 +2806,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', customLabel: true, }, @@ -2826,7 +2814,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'math', isBucketed: false, - scale: 'ratio', params: { tinymathAst: { type: 'function', @@ -2959,7 +2946,6 @@ describe('state_helpers', () => { dataType: 'number', operationType: 'moving_average', isBucketed: false, - scale: 'ratio', references: ['col2'], timeScale: undefined, filter: undefined, @@ -3496,7 +3482,6 @@ describe('state_helpers', () => { isBucketed: false, label: 'formulaX0', operationType: 'sum' as const, - scale: 'ratio' as const, sourceField: 'bytes', }, formulaX1: { diff --git a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/utils.test.tsx b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/utils.test.tsx index 8acff913a04f0..2e42f5878a575 100644 --- a/x-pack/platform/plugins/shared/lens/public/datasources/form_based/utils.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/datasources/form_based/utils.test.tsx @@ -463,7 +463,6 @@ describe('indexpattern_datasource utils', () => { params: { emptyAsNull: true, }, - scale: 'ratio', sourceField: '___records___', }, '62f73507-09c4-4bf9-9e6f-a9692e348d94': { @@ -482,7 +481,6 @@ describe('indexpattern_datasource utils', () => { isFormulaBroken: false, }, references: ['62f73507-09c4-4bf9-9e6f-a9692e348d94X0'], - scale: 'ratio', // here's the issue - this should not be here sourceField: '___records___', }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/alerts_configs/kpi_over_time_config.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/alerts_configs/kpi_over_time_config.ts index 233cdac7e0b29..177a0275b1a0d 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/alerts_configs/kpi_over_time_config.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/alerts_configs/kpi_over_time_config.ts @@ -27,7 +27,6 @@ export function getAlertsKPIConfig({ spaceId }: ConfigProps): SeriesConfig { dataType: 'date', operationType: 'date_histogram', isBucketed: true, - scale: 'interval', sourceField: REPORT_METRIC_TIMESTAMP, }, yAxisColumns: [ diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/infra_logs/kpi_over_time_config.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/infra_logs/kpi_over_time_config.ts index 9629b3c8396f7..f7ec46341e593 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/infra_logs/kpi_over_time_config.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/infra_logs/kpi_over_time_config.ts @@ -24,7 +24,6 @@ export function getLogsKPIConfig(configProps: ConfigProps): SeriesConfig { operationType: 'date_histogram', sourceField: '@timestamp', isBucketed: true, - scale: 'interval', }, yAxisColumns: [ { @@ -34,7 +33,6 @@ export function getLogsKPIConfig(configProps: ConfigProps): SeriesConfig { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: RECORDS_FIELD, timeScale: 'm', }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts index 846044a7a7b0a..6bfcc5bc207fa 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts @@ -129,7 +129,6 @@ describe('Lens Attribute', () => { interval: 'auto', includeEmptyRows: true, }, - scale: 'interval', sourceField: '@timestamp', }, ...PERCENTILE_RANKS.reduce((acc: Record, rank, index) => { @@ -146,7 +145,6 @@ describe('Lens Attribute', () => { params: { percentile: Number(rank.slice(0, 2)), }, - scale: 'ratio', sourceField: 'transaction.duration.us', }; return acc; @@ -266,7 +264,6 @@ describe('Lens Attribute', () => { ], type: 'histogram', }, - scale: 'interval', sourceField: 'transaction.duration.us', }); }); @@ -288,7 +285,6 @@ describe('Lens Attribute', () => { ], type: 'histogram', }, - scale: 'interval', sourceField: 'transaction.duration.us', }); }); @@ -303,7 +299,6 @@ describe('Lens Attribute', () => { interval: 'auto', includeEmptyRows: true, }, - scale: 'interval', sourceField: '@timestamp', }); }); @@ -325,7 +320,6 @@ describe('Lens Attribute', () => { ], type: 'histogram', }, - scale: 'interval', sourceField: 'transaction.duration.us', }); }); @@ -513,7 +507,6 @@ describe('Lens Attribute', () => { isBucketed: false, label: 'Count of records', operationType: 'count', - scale: 'ratio', sourceField: '___records___', }, orderBy: { @@ -523,7 +516,6 @@ describe('Lens Attribute', () => { otherBucket: true, size: 10, }, - scale: 'ordinal', sourceField: 'user_agent.name', }, 'x-axis-column-layer0': { @@ -542,7 +534,6 @@ describe('Lens Attribute', () => { ], type: 'histogram', }, - scale: 'interval', sourceField: LCP_FIELD, }, 'y-axis-column-layer0-0': { @@ -583,7 +574,6 @@ describe('Lens Attribute', () => { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: RECORDS_FIELD, }, 'y-axis-column-layer0X1': { @@ -600,7 +590,6 @@ describe('Lens Attribute', () => { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: RECORDS_FIELD, }, 'y-axis-column-layer0X2': { @@ -610,7 +599,6 @@ describe('Lens Attribute', () => { label: 'Part of Pages loaded', operationType: 'overall_sum', references: ['y-axis-column-layer0X1'], - scale: 'ratio', }, 'y-axis-column-layer0X3': { customLabel: true, @@ -631,7 +619,6 @@ describe('Lens Attribute', () => { }, }, references: ['y-axis-column-layer0X0', 'y-axis-column-layer0X2'], - scale: 'ratio', }, }, incompleteColumns: {}, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.ts index 282ae5b768267..83f2ba31bfe04 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes.ts @@ -22,7 +22,6 @@ import { MaxIndexPatternColumn, MedianIndexPatternColumn, MinIndexPatternColumn, - OperationMetadata, OperationType, PercentileIndexPatternColumn, PersistedIndexPatternLayer, @@ -78,7 +77,6 @@ export function buildNumberColumn(sourceField: string) { sourceField, dataType: 'number' as DataType, isBucketed: false, - scale: 'ratio' as OperationMetadata['scale'], }; } @@ -266,7 +264,6 @@ export class LensAttributes { label: labels[sourceField], dataType: fieldMeta?.type as DataType, operationType: 'terms', - scale: 'ordinal', isBucketed: true, params: { orderBy, @@ -281,7 +278,6 @@ export class LensAttributes { dataType: 'number', operationType: 'count', isBucketed: false, - scale: 'ratio', sourceField: '___records___', }, } @@ -301,7 +297,6 @@ export class LensAttributes { dataType: 'number', operationType: 'range', isBucketed: true, - scale: 'interval', params: { type: 'histogram', ranges: [{ from: 0, to: 1000, label: '' }], @@ -321,7 +316,6 @@ export class LensAttributes { label: label ?? 'Filters', dataType: 'string', operationType: 'filters', - scale: 'ordinal', isBucketed: true, params: { filters: paramFilters, @@ -495,7 +489,6 @@ export class LensAttributes { label: '@timestamp', operationType: 'date_histogram', params: { interval: 'auto', includeEmptyRows: true }, - scale: 'interval', }; } @@ -506,7 +499,6 @@ export class LensAttributes { label: 'Top values of ' + label || sourceField, dataType: 'string', isBucketed: true, - scale: 'ordinal', params: { size: 10, orderBy: { @@ -864,7 +856,6 @@ export class LensAttributes { label: label || 'Count of records', customLabel: true, operationType: 'count', - scale: 'ratio', sourceField: RECORDS_FIELD, filter: columnFilter, ...(timeScale ? { timeScale } : {}), diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/single_metric_attributes.test.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/single_metric_attributes.test.ts index 3d57c017e6621..9d1de7fe3075e 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/single_metric_attributes.test.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/single_metric_attributes.test.ts @@ -86,7 +86,6 @@ describe('SingleMetricAttributes', () => { isBucketed: false, label: 'Page load time', operationType: 'median', - scale: 'ratio', sourceField: 'transaction.duration.us', params: { emptyAsNull: true, @@ -157,7 +156,6 @@ describe('SingleMetricAttributes', () => { params: { percentile: 99, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/mobile_test_attribute.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/mobile_test_attribute.ts index 7e479fad1db0d..5406ef2098f90 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/mobile_test_attribute.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/mobile_test_attribute.ts @@ -39,14 +39,12 @@ export const testMobileKPIAttr = { label: '@timestamp', operationType: 'date_histogram', params: { interval: 'auto', includeEmptyRows: true }, - scale: 'interval', }, 'y-axis-column-layer0-0': { isBucketed: false, label: 'test-series', operationType: 'median', params: {}, - scale: 'ratio', sourceField: 'system.memory.usage', customLabel: true, dataType: 'number', diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute.ts index 7c054a908ba3b..78cc9fe8cc67c 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute.ts @@ -58,7 +58,6 @@ export const sampleAttribute = { ], type: 'histogram', }, - scale: 'interval', sourceField: 'transaction.duration.us', }, 'y-axis-column-layer0-0': { @@ -99,7 +98,6 @@ export const sampleAttribute = { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: RECORDS_FIELD, timeScale: undefined, timeShift: undefined, @@ -118,7 +116,6 @@ export const sampleAttribute = { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: RECORDS_FIELD, timeScale: undefined, timeShift: undefined, @@ -131,7 +128,6 @@ export const sampleAttribute = { operationType: 'overall_sum', params: undefined, references: ['y-axis-column-layer0X1'], - scale: 'ratio', }, 'y-axis-column-layer0X3': { customLabel: true, @@ -152,7 +148,6 @@ export const sampleAttribute = { }, }, references: ['y-axis-column-layer0X0', 'y-axis-column-layer0X2'], - scale: 'ratio', }, }, incompleteColumns: {}, @@ -175,7 +170,6 @@ export const sampleAttribute = { params: { percentile: 50, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '75th-percentile-reference-line-layer0-reference-lines': { @@ -187,7 +181,6 @@ export const sampleAttribute = { params: { percentile: 75, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '90th-percentile-reference-line-layer0-reference-lines': { @@ -199,7 +192,6 @@ export const sampleAttribute = { params: { percentile: 90, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '95th-percentile-reference-line-layer0-reference-lines': { @@ -211,7 +203,6 @@ export const sampleAttribute = { params: { percentile: 95, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '99th-percentile-reference-line-layer0-reference-lines': { @@ -223,7 +214,6 @@ export const sampleAttribute = { params: { percentile: 99, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_cwv.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_cwv.ts index 50f316139027e..42e4e7378bb85 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_cwv.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_cwv.ts @@ -50,7 +50,6 @@ export const sampleAttributeCoreWebVital = { otherBucket: true, size: 10, }, - scale: 'ordinal', sourceField: 'user_agent.os.name', }, 'y-axis-column-1': { @@ -64,7 +63,6 @@ export const sampleAttributeCoreWebVital = { isBucketed: false, label: 'Average', operationType: 'count', - scale: 'ratio', sourceField: RECORDS_FIELD, }, 'y-axis-column-2': { @@ -77,7 +75,6 @@ export const sampleAttributeCoreWebVital = { isBucketed: false, label: 'Poor', operationType: 'count', - scale: 'ratio', sourceField: RECORDS_FIELD, }, 'y-axis-column-layer0-0': { @@ -91,7 +88,6 @@ export const sampleAttributeCoreWebVital = { isBucketed: false, label: 'Good', operationType: 'count', - scale: 'ratio', sourceField: RECORDS_FIELD, }, }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_kpi.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_kpi.ts index af5d7a91a541d..c0d8efd100c24 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_kpi.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_kpi.ts @@ -39,7 +39,6 @@ export const sampleAttributeKpi = { interval: 'auto', includeEmptyRows: true, }, - scale: 'interval', sourceField: '@timestamp', }, 'y-axis-column-layer0-0': { @@ -52,7 +51,6 @@ export const sampleAttributeKpi = { label: 'test-series', customLabel: true, operationType: 'count', - scale: 'ratio', sourceField: RECORDS_FIELD, }, }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_with_reference_lines.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_with_reference_lines.ts index 66be0cf60083d..bc447a858a6eb 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_with_reference_lines.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/sample_attribute_with_reference_lines.ts @@ -58,7 +58,6 @@ export const sampleAttributeWithReferenceLines = { ], type: 'histogram', }, - scale: 'interval', sourceField: 'transaction.duration.us', }, 'y-axis-column-layer0-0': { @@ -99,7 +98,6 @@ export const sampleAttributeWithReferenceLines = { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: RECORDS_FIELD, timeScale: undefined, timeShift: undefined, @@ -118,7 +116,6 @@ export const sampleAttributeWithReferenceLines = { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: RECORDS_FIELD, timeScale: undefined, timeShift: undefined, @@ -131,7 +128,6 @@ export const sampleAttributeWithReferenceLines = { operationType: 'overall_sum', params: undefined, references: ['y-axis-column-layer0X1'], - scale: 'ratio', }, 'y-axis-column-layer0X3': { customLabel: true, @@ -152,7 +148,6 @@ export const sampleAttributeWithReferenceLines = { }, }, references: ['y-axis-column-layer0X0', 'y-axis-column-layer0X2'], - scale: 'ratio', }, }, incompleteColumns: {}, @@ -175,7 +170,6 @@ export const sampleAttributeWithReferenceLines = { params: { percentile: 50, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '75th-percentile-reference-line-layer0-reference-lines': { @@ -187,7 +181,6 @@ export const sampleAttributeWithReferenceLines = { params: { percentile: 75, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '90th-percentile-reference-line-layer0-reference-lines': { @@ -199,7 +192,6 @@ export const sampleAttributeWithReferenceLines = { params: { percentile: 90, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '95th-percentile-reference-line-layer0-reference-lines': { @@ -211,7 +203,6 @@ export const sampleAttributeWithReferenceLines = { params: { percentile: 95, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, '99th-percentile-reference-line-layer0-reference-lines': { @@ -223,7 +214,6 @@ export const sampleAttributeWithReferenceLines = { params: { percentile: 99, }, - scale: 'ratio', sourceField: 'transaction.duration.us', }, }, diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/test_formula_metric_attribute.ts b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/test_formula_metric_attribute.ts index a269a7d4c6059..404a4bcd9d5d5 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/test_formula_metric_attribute.ts +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/configurations/test_data/test_formula_metric_attribute.ts @@ -71,7 +71,6 @@ export const sampleMetricFormulaAttribute = { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: '___records___', }, 'layer-0-column-1X1': { @@ -87,7 +86,6 @@ export const sampleMetricFormulaAttribute = { params: { emptyAsNull: false, }, - scale: 'ratio', sourceField: '___records___', }, 'layer-0-column-1X2': { @@ -121,7 +119,6 @@ export const sampleMetricFormulaAttribute = { }, }, references: ['layer-0-column-1X0', 'layer-0-column-1X1'], - scale: 'ratio', }, }, indexPatternId: 'apm-*', diff --git a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx index e8f6ee48dc206..507ef43e099d0 100644 --- a/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx +++ b/x-pack/solutions/observability/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.test.tsx @@ -45,7 +45,6 @@ const mockLensAttrs = { isBucketed: false, label: ' ', operationType: 'unique_count', - scale: 'ratio', sourceField: 'host.name', }, },