diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/buildQuery.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/buildQuery.ts index 257fc15faea..8b47fb5e725 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/buildQuery.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/buildQuery.ts @@ -19,9 +19,11 @@ import { buildQueryContext, QueryFormData } from '@superset-ui/core'; export default function buildQuery(formData: QueryFormData) { + const { metric, sort_by_metric } = formData; return buildQueryContext(formData, baseQueryObject => [ { ...baseQueryObject, + ...(sort_by_metric && { orderby: [[metric, false]] }), }, ]); } diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx index 5a8c88eb822..cfa20985c17 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx @@ -57,6 +57,17 @@ const config: ControlPanelConfig = { }, }, ], + [ + { + name: 'sort_by_metric', + config: { + default: true, + type: 'CheckboxControl', + label: t('Sort by metric'), + description: t('Whether to sort results by the selected metric in descending order.'), + }, + }, + ], ], }, {