feat(plugin-chart-pivot-table): sort by metric (#1240)

* feat(plugin-chart-pivot-table): sort by metric * Use normalizeOrderBy func
apache · Nov 26, 2021 · 8d54c69 · 8d54c69
1 parent f36619d
commit 8d54c69
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/...mporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/buildQuery.ts b/...mporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/buildQuery.ts
@@ -16,19 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { buildQueryContext, ensureIsArray } from '@superset-ui/core';
+import { buildQueryContext, ensureIsArray, normalizeOrderBy } from '@superset-ui/core';
 import { PivotTableQueryFormData } from '../types';
 
 export default function buildQuery(formData: PivotTableQueryFormData) {
-  const { groupbyColumns = [], groupbyRows = [] } = formData;
+  const { groupbyColumns = [], groupbyRows = [], order_desc = true } = formData;
   const groupbySet = new Set([
     ...ensureIsArray<string>(groupbyColumns),
     ...ensureIsArray<string>(groupbyRows),
   ]);
-  return buildQueryContext(formData, baseQueryObject => [
-    {
-      ...baseQueryObject,
-      columns: [...groupbySet],
-    },
-  ]);
+  return buildQueryContext(formData, baseQueryObject => {
+    const queryObject = normalizeOrderBy({ ...baseQueryObject, order_desc });
+    return [
+      {
+        ...queryObject,
+        columns: [...groupbySet],
+      },
+    ];
+  });
 }
diff --git a/...orary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts b/...orary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts
@@ -94,6 +94,20 @@ const config: ControlPanelConfig = {
             },
           },
         ],
+        ['timeseries_limit_metric'],
+        [
+          {
+            name: 'order_desc',
+            config: {
+              type: 'CheckboxControl',
+              label: t('Sort descending'),
+              default: true,
+              description: t(
+                'Whether to sort descending or ascending. Takes effect only when "Sort by" is set',
+              ),
+            },
+          },
+        ],
       ],
     },
     {

diff --git a/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/types.ts b/...-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/src/types.ts
@@ -25,6 +25,7 @@ import {
   JsonObject,
   TimeFormatter,
   NumberFormatter,
+  QueryFormMetric,
 } from '@superset-ui/core';
 import { ColorFormatters } from '@superset-ui/chart-controls';
 
@@ -66,6 +67,8 @@ interface PivotTableCustomizeProps {
   metricsLayout?: MetricsLayoutEnum;
   metricColorFormatters: ColorFormatters;
   dateFormatters: Record<string, DateFormatter | undefined>;
+  timeseries_limit_metric: QueryFormMetric[] | QueryFormMetric | null;
+  order_desc: boolean;
 }
 
 export type PivotTableQueryFormData = QueryFormData &

diff --git a/...y_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/test/plugin/buildQuery.test.ts b/...y_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/test/plugin/buildQuery.test.ts
@@ -25,6 +25,8 @@ describe('PivotTableChart buildQuery', () => {
     metricColorFormatters: [],
     dateFormatters: {},
     setDataMask: () => {},
+    timeseries_limit_metric: 'count',
+    order_desc: true,
   };
 
   it('should build groupby with series in form data', () => {

diff --git a/...perset_ui/superset-ui/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts b/...perset_ui/superset-ui/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts
@@ -25,6 +25,8 @@ describe('PivotTableChart transformProps', () => {
     datasource: '',
     conditionalFormatting: [],
     dateFormat: '',
+    timeseries_limit_metric: 'count',
+    order_desc: true,
   };
   const chartProps = new ChartProps<QueryFormData>({
     formData,