From 244eca8b9b36eaf089c6ef8e67e6c942cebd6486 Mon Sep 17 00:00:00 2001 From: Conglei Shi Date: Thu, 30 May 2019 11:38:09 -0700 Subject: [PATCH] fix(adjusted upstream break change): adjusted upstream break change --- .../src/TableFormData.ts | 4 ++-- .../superset-ui-plugin-chart-table/src/buildQuery.ts | 12 ++++++------ .../src/processData.ts | 6 +++--- .../src/processMetrics.ts | 10 +++++----- .../src/transformProps.ts | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/superset-ui-plugin-chart-table/src/TableFormData.ts b/packages/superset-ui-plugin-chart-table/src/TableFormData.ts index 45e42e128..d8cf7e6eb 100644 --- a/packages/superset-ui-plugin-chart-table/src/TableFormData.ts +++ b/packages/superset-ui-plugin-chart-table/src/TableFormData.ts @@ -1,8 +1,8 @@ -import { ChartFormData, FormDataMetric } from '@superset-ui/chart'; +import { ChartFormData, ChartFormDataMetric } from '@superset-ui/chart'; type TableFormData = ChartFormData & { all_columns: string[]; - percent_metrics: FormDataMetric[]; + percent_metrics: ChartFormDataMetric[]; include_time: boolean; order_by_cols: string[]; }; diff --git a/packages/superset-ui-plugin-chart-table/src/buildQuery.ts b/packages/superset-ui-plugin-chart-table/src/buildQuery.ts index d227a396d..7ea39bb3d 100644 --- a/packages/superset-ui-plugin-chart-table/src/buildQuery.ts +++ b/packages/superset-ui-plugin-chart-table/src/buildQuery.ts @@ -1,5 +1,5 @@ -import { buildQueryContext, FormDataMetric, Metric } from '@superset-ui/chart'; -import Metrics from '@superset-ui/chart/lib/query/Metrics'; +import { buildQueryContext, ChartFormDataMetric, QueryObjectMetric } from '@superset-ui/chart'; +import convertMetric from '@superset-ui/chart/lib/query/convertMetric'; import TableFormData from './TableFormData'; export default function buildQuery(formData: TableFormData) { @@ -8,18 +8,18 @@ export default function buildQuery(formData: TableFormData) { const isTimeseries = formData.include_time; let columns: string[] = []; let groupby = baseQueryObject.groupby; - let orderby: [Metric, boolean][] = []; + let orderby: [QueryObjectMetric, boolean][] = []; const sortby = formData.timeseries_limit_metric; if (formData.all_columns && formData.all_columns.length > 0) { columns = [...formData.all_columns]; const orderByColumns = formData.order_by_cols || []; orderByColumns.forEach(columnOrder => { - const parsedColumnOrder: [FormDataMetric, boolean] = JSON.parse(columnOrder); - orderby.push([Metrics.formatMetric(parsedColumnOrder[0]), parsedColumnOrder[1]]); + const parsedColumnOrder: [ChartFormDataMetric, boolean] = JSON.parse(columnOrder); + orderby.push([convertMetric(parsedColumnOrder[0]), parsedColumnOrder[1]]); }); groupby = []; } else if (sortby) { - orderby.push([Metrics.formatMetric(sortby), !formData.order_desc]); + orderby.push([convertMetric(sortby), !formData.order_desc]); } return [ { diff --git a/packages/superset-ui-plugin-chart-table/src/processData.ts b/packages/superset-ui-plugin-chart-table/src/processData.ts index ee9dfbca3..39caf9ed9 100644 --- a/packages/superset-ui-plugin-chart-table/src/processData.ts +++ b/packages/superset-ui-plugin-chart-table/src/processData.ts @@ -1,5 +1,5 @@ import { PlainObject } from './types'; -import { FormDataMetric, Metric } from '@superset-ui/chart'; +import { ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart'; export default function processData({ timeseriesLimitMetric, @@ -7,14 +7,14 @@ export default function processData({ records, metrics, }: { - timeseriesLimitMetric: FormDataMetric; + timeseriesLimitMetric: ChartFormDataMetric; orderDesc: boolean; records: PlainObject[]; metrics: string[]; }) { const sortByKey = timeseriesLimitMetric && - ((timeseriesLimitMetric as Metric).label || (timeseriesLimitMetric as string)); + ((timeseriesLimitMetric as AdhocMetric).label || (timeseriesLimitMetric as string)); let processedData: { data: PlainObject; diff --git a/packages/superset-ui-plugin-chart-table/src/processMetrics.ts b/packages/superset-ui-plugin-chart-table/src/processMetrics.ts index 1f8e742e7..42cf0aa18 100644 --- a/packages/superset-ui-plugin-chart-table/src/processMetrics.ts +++ b/packages/superset-ui-plugin-chart-table/src/processMetrics.ts @@ -1,4 +1,4 @@ -import { FormDataMetric, Metric } from '@superset-ui/chart'; +import { ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart'; import { PlainObject } from './types'; export default function processMetrics({ @@ -6,14 +6,14 @@ export default function processMetrics({ percentMetrics, records, }: { - metrics: FormDataMetric[]; - percentMetrics: FormDataMetric[]; + metrics: ChartFormDataMetric[]; + percentMetrics: ChartFormDataMetric[]; records: PlainObject[]; }) { - const processedMetrics = (metrics || []).map(m => (m as Metric).label || (m as string)); + const processedMetrics = (metrics || []).map(m => (m as AdhocMetric).label || (m as string)); const processedPercentMetrics = (percentMetrics || []) - .map(m => (m as Metric).label || (m as string)) + .map(m => (m as AdhocMetric).label || (m as string)) .map(m => `%${m}`); return processedMetrics diff --git a/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/packages/superset-ui-plugin-chart-table/src/transformProps.ts index 8a1012eec..9fb53f83a 100644 --- a/packages/superset-ui-plugin-chart-table/src/transformProps.ts +++ b/packages/superset-ui-plugin-chart-table/src/transformProps.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ChartProps, FormDataMetric, Metric } from '@superset-ui/chart'; +import { ChartProps, ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart'; import processColumns from './processColumns'; import processMetrics from './processMetrics'; import processData from './processData'; @@ -44,7 +44,7 @@ function transformData(data: PlainObject[], formData: PlainObject) { // handle percentage columns. const percentMetrics: string[] = (formData.percentMetrics || []).map( - (metric: FormDataMetric) => (metric as Metric).label || (metric as string), + (metric: ChartFormDataMetric) => (metric as AdhocMetric).label || (metric as string), ); if (percentMetrics.length > 0) {