From 62ec36745725b08db525203204abda9cb7d6a62c Mon Sep 17 00:00:00 2001 From: Yaozong Liu <750188453@qq.com> Date: Sat, 15 May 2021 22:52:37 +0800 Subject: [PATCH] fix(plugin-chart-echarts): 'SORT BY METRIC' add checkbox to Gauge (#1113) --- .../plugin-chart-echarts/src/Gauge/buildQuery.ts | 2 ++ .../plugin-chart-echarts/src/Gauge/controlPanel.tsx | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts index 077e2baf46d1c..7d070932f6eda 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/buildQuery.ts @@ -19,10 +19,12 @@ import { buildQueryContext, QueryFormData } from '@superset-ui/core'; export default function buildQuery(formData: QueryFormData) { + const { metric, sort_by_metric } = formData; return buildQueryContext(formData, baseQueryObject => [ { ...baseQueryObject, groupby: formData.groupby || [], + ...(sort_by_metric && { orderby: [[metric, false]] }), }, ]); } diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx index 22a2ba5c357b7..2866dcd361227 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx @@ -55,6 +55,16 @@ const config: ControlPanelConfig = { }, }, ], + [ + { + name: 'sort_by_metric', + config: { + type: 'CheckboxControl', + label: t('Sort by metric'), + description: t('Whether to sort results by the selected metric in descending order.'), + }, + }, + ], ], }, {