simplify

apache · Mar 4, 2023 · 36f1ae8 · 36f1ae8
1 parent 2ce33cd
commit 36f1ae8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/operators/pivotOperator.ts b/superset-frontend/packages/superset-ui-chart-controls/src/operators/pivotOperator.ts
@@ -24,15 +24,15 @@ import {
  getXAxisLabel,
 } from '@superset-ui/core';
 import { PostProcessingFactory } from './types';
+import { extractExtraMetrics } from './utils';
 
 export const pivotOperator: PostProcessingFactory<PostProcessingPivot> = (
  formData,
  queryObject,
 ) => {
  const metricLabels = ensureIsArray(queryObject.metrics).map(getMetricLabel);
- metricLabels.push(
- ...ensureIsArray(queryObject.extra_metrics).map(getMetricLabel),
- );
+ const extraMetrics = extractExtraMetrics(formData);
+ metricLabels.push(...extraMetrics.map(getMetricLabel));
  const xAxisLabel = getXAxisLabel(formData);
  const columns = queryObject.series_columns || queryObject.columns;
 

diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/operators/pivotOperator.test.ts b/superset-frontend/packages/superset-ui-chart-controls/test/operators/pivotOperator.test.ts
@@ -192,10 +192,12 @@ test('pivot by x_axis with extra metrics', () => {
  {
  ...formData,
  x_axis: 'foo',
+ x_axis_sort: 'bar',
+ groupby: [],
+ timeseries_limit_metric: 'bar',
  },
  {
  ...queryObject,
- extra_metrics: ['bar'],
  series_columns: [],
  },
  ),

diff --git a/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts b/superset-frontend/packages/superset-ui-core/src/query/types/Query.ts
@@ -146,9 +146,6 @@ export interface QueryObject
  /** Free-form WHERE SQL: multiple clauses are concatenated by AND */
  where?: string;
 
- /** extra metrics that should not be used for series */
- extra_metrics?: QueryFormMetric[];
-
  /** Limit number of series */
  series_columns?: QueryFormColumn[];
  series_limit?: number;

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
@@ -70,14 +70,8 @@ export default function buildQuery(formData: QueryFormData) {
  formData,
  baseQueryObject,
  )
- ? timeComparePivotOperator(formData, {
- ...baseQueryObject,
- extra_metrics,
- })
- : pivotOperator(formData, {
- ...baseQueryObject,
- extra_metrics,
- });
+ ? timeComparePivotOperator(formData, baseQueryObject)
+ : pivotOperator(formData, baseQueryObject);
 
  const columns = [
  ...(isXAxisSet(formData) ? ensureIsArray(getXAxisColumn(formData)) : []),
@@ -107,7 +101,7 @@ export default function buildQuery(formData: QueryFormData) {
  resampleOperator(formData, baseQueryObject),
  renameOperator(formData, baseQueryObject),
  contributionOperator(formData, baseQueryObject),
- sortOperator(formData, { ...baseQueryObject, extra_metrics }),
+ sortOperator(formData, baseQueryObject),
  flattenOperator(formData, baseQueryObject),
  // todo: move prophet before flatten
  prophetOperator(formData, baseQueryObject),

diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
@@ -1042,14 +1042,6 @@ class Meta: # pylint: disable=too-few-public-methods
  "`ChartDataAdhocMetricSchema` for the structure of ad-hoc metrics.",
  allow_none=True,
  )
- extra_metrics = fields.List(
- fields.Raw(),
- description="Metrics that are intended to be used for other purposes"
- "than series. Note that these need to be listed in the metrics property,"
- "similarly to how series_columns also need to be listed in the columns"
- "property.",
- allow_none=True,
- )
  post_processing = fields.List(
  fields.Nested(ChartDataPostProcessingOperationSchema, allow_none=True),
  allow_none=True,