fix(adjusted upstream break change): adjusted upstream break change

apache-superset · May 30, 2019 · bc198a6 · bc198a6
1 parent 488226a
commit bc198a6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/TableFormData.ts b/plugins/superset-ui-plugins/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/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/buildQuery.ts b/plugins/superset-ui-plugins/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/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processData.ts b/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processData.ts
@@ -1,20 +1,20 @@
 import { PlainObject } from './types';
-import { FormDataMetric, Metric } from '@superset-ui/chart';
+import { ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart';
 
 export default function processData({
   timeseriesLimitMetric,
   orderDesc,
   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/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processMetrics.ts b/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/processMetrics.ts
@@ -1,19 +1,19 @@
-import { FormDataMetric, Metric } from '@superset-ui/chart';
+import { ChartFormDataMetric, AdhocMetric } from '@superset-ui/chart';
 import { PlainObject } from './types';
 
 export default function processMetrics({
   metrics,
   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/plugins/superset-ui-plugins/packages/superset-ui-plugin-chart-table/src/transformProps.ts b/plugins/superset-ui-plugins/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) {